summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO1
-rw-r--r--src/autosaver.cpp14
-rw-r--r--src/cookiejar.cpp6
-rw-r--r--src/history.cpp16
-rw-r--r--src/webview.cpp2
5 files changed, 22 insertions, 17 deletions
diff --git a/TODO b/TODO
index dc11984b..a357e0c7 100644
--- a/TODO
+++ b/TODO
@@ -24,7 +24,6 @@ NEXT..
+------------------------
-- Kconfig::gloabl : investigate.
- contextMenu in searchbar to set different search engines
- save toolbars settings
- NEW save/load setting functions in KMainWIndow
diff --git a/src/autosaver.cpp b/src/autosaver.cpp
index 965d550b..535d8a2b 100644
--- a/src/autosaver.cpp
+++ b/src/autosaver.cpp
@@ -18,10 +18,15 @@
 *
 * ============================================================ */
+// Local Includes
#include "autosaver.h"
+// KDE Includes
+#include <KDebug>
+
+// Qt Includes
#include <QtCore>
-#include <QtDebug>
+
#define AUTOSAVE_IN 1000 * 3 // seconds
#define MAXWAIT 1000 * 15 // seconds
@@ -36,7 +41,7 @@ AutoSaver::AutoSaver(QObject *parent) : QObject(parent)
AutoSaver::~AutoSaver()
{
if (m_timer.isActive())
- qWarning() << "AutoSaver: still active when destroyed, changes not saved.";
+ kWarning() << "AutoSaver: still active when destroyed, changes not saved.";
}
@@ -69,8 +74,9 @@ void AutoSaver::saveIfNeccessary()
return;
m_timer.stop();
m_firstChange = QTime();
- if (!QMetaObject::invokeMethod(parent(), "save", Qt::DirectConnection)) {
- qWarning() << "AutoSaver: error invoking slot save() on parent";
+ if (!QMetaObject::invokeMethod(parent(), "save", Qt::DirectConnection))
+ {
+ kWarning() << "AutoSaver: error invoking slot save() on parent";
}
}
diff --git a/src/cookiejar.cpp b/src/cookiejar.cpp
index b513f88a..87d84def 100644
--- a/src/cookiejar.cpp
+++ b/src/cookiejar.cpp
@@ -26,13 +26,13 @@
// KDE Includes
#include <KConfig>
#include <KStandardDirs>
+#include <KDebug>
// Qt Includes
#include <QtCore>
#include <QtGui>
#include <QtWebKit>
-#include <QDebug>
static const unsigned int JAR_VERSION = 23;
@@ -65,7 +65,7 @@ QDataStream &operator>>(QDataStream &stream, QList<QNetworkCookie> &list)
QList<QNetworkCookie> newCookies = QNetworkCookie::parseCookies(value);
if (newCookies.count() == 0 && value.length() != 0)
{
- qWarning() << "CookieJar: Unable to parse saved cookie:" << value;
+ kWarning() << "CookieJar: Unable to parse saved cookie:" << value;
}
for (int j = 0; j < newCookies.count(); ++j)
list.append(newCookies.at(j));
@@ -282,7 +282,7 @@ bool CookieJar::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const
}
#if 0
else
- qWarning() << "setCookiesFromUrl failed" << url << cookieList.value(0).toRawForm();
+ kWarning() << "setCookiesFromUrl failed" << url << cookieList.value(0).toRawForm();
#endif
}
}
diff --git a/src/history.cpp b/src/history.cpp
index 5466963b..36a710b1 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -24,16 +24,16 @@
#include "autosaver.h"
#include "browserapplication.h"
+// KDE Includes
+#include <KConfig>
+#include <KDebug>
+
// Qt Includes
#include <QtCore>
#include <QtGui>
#include <QtWebKit>
#include <QtAlgorithms>
-#include <QDebug>
-
-// KDE Includes
-#include <KConfig>
static const unsigned int HISTORY_VERSION = 23;
@@ -235,7 +235,7 @@ void HistoryManager::load()
return;
if (!historyFile.open(QFile::ReadOnly))
{
- qWarning() << "Unable to open history file" << historyFile.fileName();
+ kWarning() << "Unable to open history file" << historyFile.fileName();
return;
}
@@ -340,7 +340,7 @@ void HistoryManager::save()
if (!open)
{
- qWarning() << "Unable to open history file for saving"
+ kWarning() << "Unable to open history file for saving"
<< (saveAll ? tempFile.fileName() : historyFile.fileName());
return;
}
@@ -359,9 +359,9 @@ void HistoryManager::save()
if (saveAll)
{
if (historyFile.exists() && !historyFile.remove())
- qWarning() << "History: error removing old history." << historyFile.errorString();
+ kWarning() << "History: error removing old history." << historyFile.errorString();
if (!tempFile.rename(historyFile.fileName()))
- qWarning() << "History: error moving new history over old." << tempFile.errorString() << historyFile.fileName();
+ kWarning() << "History: error moving new history over old." << tempFile.errorString() << historyFile.fileName();
}
m_lastSavedUrl = m_history.value(0).url;
}
diff --git a/src/webview.cpp b/src/webview.cpp
index f836b5ea..edae86eb 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -237,7 +237,7 @@ void WebView::loadFinished()
{
if (m_progress != 100)
{
- qWarning() << "Recieved finished signal while progress is still:" << progress()
+ kWarning() << "Recieved finished signal while progress is still:" << progress()
<< "Url:" << url();
}
m_progress = 0;