From 278de55ad646130a388732309549c48b62a14b03 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 12 Jun 2012 16:04:07 +0200
Subject: Cleans up

- set initial icon to have properly dimensions set
- properly calculate needed icon's height
- calm down some kDebug messages
---
 src/adblock/adblockmanager.cpp | 1 -
 src/application.cpp            | 2 --
 src/mainview.cpp               | 3 ---
 src/sync/ftpsynchandler.cpp    | 6 ------
 src/urlbar/urlbar.cpp          | 5 ++++-
 src/webview.cpp                | 1 -
 6 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index 967f103c..f2c71640 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -105,7 +105,6 @@ void AdBlockManager::loadSettings()
 
     KConfigGroup settingsGroup(_adblockConfig, "Settings");
     _isAdblockEnabled = settingsGroup.readEntry("adBlockEnabled", false);
-    kDebug() << "ADBLOCK ENABLED = " << _isAdblockEnabled;
 
     // no need to load filters if adblock is not enabled :)
     if (!_isAdblockEnabled)
diff --git a/src/application.cpp b/src/application.cpp
index c36aeeb8..9daf5fa2 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -200,7 +200,6 @@ int Application::newInstance()
     {
         isFirstLoad = false;
 
-        kDebug() << "EXIT VALUE: " << exitValue;
         return 0;
     }
 
@@ -343,7 +342,6 @@ int Application::newInstance()
     KStartupInfo::appStarted();
     isFirstLoad = false;
 
-    kDebug() << "EXIT VALUE: " << exitValue;
     return 0;
 }
 
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 773f4ab3..e3e82989 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -450,9 +450,6 @@ void MainView::closeTab(int index, bool del)
             return;
     }
 
-    kDebug() << "URL: " << tabToClose->url();
-    kDebug() << "rekonq page: " << tabToClose->page()->isOnRekonqPage();
-
     if (!tabToClose->url().isEmpty()
             && tabToClose->url().scheme() != QL1S("about")
             && !tabToClose->page()->isOnRekonqPage()
diff --git a/src/sync/ftpsynchandler.cpp b/src/sync/ftpsynchandler.cpp
index dcff4eb5..ad845d09 100644
--- a/src/sync/ftpsynchandler.cpp
+++ b/src/sync/ftpsynchandler.cpp
@@ -63,11 +63,9 @@ void FTPSyncHandler::initialLoadAndCheck()
         _remoteBookmarksUrl.setPassword(ReKonfig::syncPass());
         _remoteBookmarksUrl.setPort(ReKonfig::syncPort());
         _remoteBookmarksUrl.setPath(ReKonfig::syncPath() + QL1S("/bookmarks.xml"));
-        kDebug() << "REMOTE BK URL: " << _remoteBookmarksUrl;
 
         const QString bookmarksFilePath = KStandardDirs::locateLocal("data", QL1S("konqueror/bookmarks.xml"));
         _localBookmarksUrl = KUrl(bookmarksFilePath);
-        kDebug() << "LOCAL BK URL: " << _localBookmarksUrl;
 
         KIO::StatJob *job = KIO::stat(_remoteBookmarksUrl, KIO::StatJob::DestinationSide, 0, KIO::HideProgressInfo);
         connect(job, SIGNAL(finished(KJob*)), this, SLOT(onBookmarksStatFinished(KJob*)));
@@ -83,11 +81,9 @@ void FTPSyncHandler::initialLoadAndCheck()
         _remoteHistoryUrl.setPassword(ReKonfig::syncPass());
         _remoteHistoryUrl.setPort(ReKonfig::syncPort());
         _remoteHistoryUrl.setPath(ReKonfig::syncPath() + QL1S("/history"));
-        kDebug() << "REMOTE HISTORY URL: " << _remoteHistoryUrl;
 
         const QString historyFilePath = KStandardDirs::locateLocal("appdata", "history");
         _localHistoryUrl = KUrl(historyFilePath);
-        kDebug() << "LOCAL HISTORY URL: " << _localHistoryUrl;
 
         KIO::StatJob *job = KIO::stat(_remoteHistoryUrl, KIO::StatJob::DestinationSide, 0, KIO::HideProgressInfo);
         connect(job, SIGNAL(finished(KJob*)), this, SLOT(onHistoryStatFinished(KJob*)));
@@ -103,11 +99,9 @@ void FTPSyncHandler::initialLoadAndCheck()
         _remotePasswordsUrl.setPassword(ReKonfig::syncPass());
         _remotePasswordsUrl.setPort(ReKonfig::syncPort());
         _remotePasswordsUrl.setPath(ReKonfig::syncPath() + QL1S("/kdewallet.kwl"));
-        kDebug() << "REMOTE PSWD URL: " << _remotePasswordsUrl;
 
         const QString passwordsFilePath = KStandardDirs::locateLocal("data", QL1S("kwallet/kdewallet.kwl"));
         _localPasswordsUrl = KUrl(passwordsFilePath);
-        kDebug() << "LOCAL PSWD URL: " << _localPasswordsUrl;
 
         KIO::StatJob *job = KIO::stat(_remotePasswordsUrl, KIO::StatJob::DestinationSide, 0, KIO::HideProgressInfo);
         connect(job, SIGNAL(finished(KJob*)), this, SLOT(onPasswordsStatFinished(KJob*)));
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index abbf1296..8535e045 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -109,6 +109,9 @@ UrlBar::UrlBar(QWidget *parent)
 {
     setLayoutDirection(Qt::LeftToRight);
 
+    // set initial icon
+    _icon->setIcon(KIcon("arrow-right"));
+    
     // initial style
     setStyleSheet(QString("UrlBar { padding: 2px 0 2px %1px; height: %1px } ").arg(_icon->sizeHint().width()));
 
@@ -619,7 +622,7 @@ void UrlBar::clearRightIcons()
 
 void UrlBar::resizeEvent(QResizeEvent *event)
 {
-    int ih = _icon->height();
+    int ih = _icon->sizeHint().height();
     int iconsCount = _rightIconsList.count();
     int iconHeight = (height() - ih) / 2;  
 
diff --git a/src/webview.cpp b/src/webview.cpp
index f8f44b6a..9d2d72aa 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -1214,7 +1214,6 @@ void WebView::sendByMail()
 {
     KAction *a = qobject_cast<KAction*>(sender());
     QString url = a->data().toString();
-    kDebug() << "URL " << url;
 
     KToolInvocation::invokeMailer("", "", "", "", url);
 }
-- 
cgit v1.2.1