Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

Fixed coding style and added copyright

Browse Source
This commit is contained in:
nowrep 2013-09-10 15:45:51 +02:00
parent 655bb6ffeb
commit 4280dcd9fa
4 changed files with 52 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/bookmarksimport/ieimporter.cpp
View File

@ -1,3 +1,20 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2013 Mattias Cibien <mattias@mattiascibien.net>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* ============================================================ */
#include "ieimporter.h"
#include "bookmarksimportdialog.h"
@ -5,14 +22,13 @@
#include <QDir>
#include <QSettings>
IeImporter::IeImporter(QObject *parent) :
QObject(parent)
IeImporter::IeImporter(QObject* parent)
: QObject(parent)
, m_error(false)
, m_errorString(BookmarksImportDialog::tr("No Error"))
{
}
void IeImporter::setFile(const QString &path)
{
m_path = path;
@ -27,7 +43,6 @@ bool IeImporter::openFile()
return false;
}
QStringList filters;
filters << "*.url";
@ -42,7 +57,6 @@ bool IeImporter::openFile()
return true;
}
QVector<BookmarksModel::Bookmark> IeImporter::exportBookmarks()
{
QVector<BookmarksModel::Bookmark> bookmarks;

17
src/lib/bookmarksimport/ieimporter.h
View File

@ -1,3 +1,20 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2013 Mattias Cibien <mattias@mattiascibien.net>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* ============================================================ */
#ifndef IEIMPORTER_H
#define IEIMPORTER_H

14
src/lib/network/networkmanager.cpp
View File

@ -433,12 +433,11 @@ void NetworkManager::ftpAuthentication(const QUrl &url, QAuthenticator* auth)
void NetworkManager::proxyAuthentication(const QNetworkProxy &proxy, QAuthenticator* auth)
{
QString userName = "";
QString password = "";
QVector<PasswordEntry> psws = MainApplication::getInstance()->autoFill()->getFormData(QUrl(proxy.hostName()));
QString userName;
QString password;
QVector<PasswordEntry> psws = mApp->autoFill()->getFormData(QUrl(proxy.hostName()));
if(psws.isEmpty())
{
if (psws.isEmpty()) {
QDialog* dialog = new QDialog();
dialog->setWindowTitle(tr("Proxy authorisation required"));
@ -474,14 +473,13 @@ void NetworkManager::proxyAuthentication(const QNetworkProxy &proxy, QAuthentica
}
if (rememberCheck->isChecked()) {
MainApplication::getInstance()->autoFill()->addEntry(QUrl(proxy.hostName()), user->text(), pass->text());
mApp->autoFill()->addEntry(QUrl(proxy.hostName()), user->text(), pass->text());
}
userName = user->text();
password = pass->text();
}
else
{
else {
userName = psws.at(0).username;
password = psws.at(0).password;
}