SVN_SILENT #include cleanups

svn path=/trunk/KDE/kdebase/apps/; revision=1050546

keditbookmarks/actionsimpl.cpp

@@ -34,14 +34,12 @@
 
 #include <QtGui/QClipboard>
 #include <QtCore/QMimeData>
-#include <QtGui/QPainter>
+#include <QApplication>
 
 #include <kdebug.h>
-#include <kapplication.h>
 
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <kedittoolbar.h>
 #include <kicon.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
@@ -49,14 +47,8 @@
 #include <klocale.h>
 #include <kstandardaction.h>
 #include <kfiledialog.h>
-#include <kmessagebox.h>
 #include <krun.h>
 #include <kstandarddirs.h>
-#include <ktemporaryfile.h>
-#include <ktoggleaction.h>
-
-#include <kparts/part.h>
-#include <kservicetypetrader.h>
 
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>

keditbookmarks/bookmarkinfo.cpp

@@ -20,7 +20,7 @@
 #include "bookmarklistview.h"
 #include "commands.h"
 #include "commandhistory.h"
-#include "toplevel.h"
+#include "toplevel.h" // for CurrentMgr
 #include "bookmarkmodel.h"
 
 #include <stdlib.h>
@@ -33,18 +33,9 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-#include <kapplication.h>
-#include <kstandardaction.h>
-#include <kaction.h>
-
-#include <kedittoolbar.h>
-#include <kmessagebox.h>
 #include <klineedit.h>
-#include <kfiledialog.h>
 
 #include <kbookmark.h>
-#include <kbookmarkmanager.h>
-#include <QtCore/QEvent>
 
 // SHUFFLE all these functions around, the order is just plain stupid
 void BookmarkInfoWidget::showBookmark(const KBookmark &bk) {

keditbookmarks/exporters.cpp

@@ -21,13 +21,11 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
 
 #include <QtCore/QFile>
-//Added by qt3to4:
 #include <QtCore/QTextStream>
 
-HTMLExporter::HTMLExporter() 
+HTMLExporter::HTMLExporter()
     : m_out(&m_string, QIODevice::WriteOnly) {
 }
 
@@ -82,7 +80,7 @@ void HTMLExporter::visitEnter(const KBookmarkGroup &grp) {
     // kDebug() << "visitEnter(" << grp.text() << ")";
     m_out << "<b>" << grp.fullText() << "</b><br>" << endl;
     m_out << "<div style=\"margin-left: 2em\">"<< endl;
-} 
+}
 
 void HTMLExporter::visitLeave(const KBookmarkGroup &) {
     // kDebug() << "visitLeave()";

keditbookmarks/favicons.cpp

@@ -29,11 +29,10 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
 
 FavIconsItrHolder *FavIconsItrHolder::s_self = 0;
 
-FavIconsItrHolder::FavIconsItrHolder() 
+FavIconsItrHolder::FavIconsItrHolder()
     : BookmarkIteratorHolder() {
     // do stuff
 }
@@ -93,7 +92,7 @@ void FavIconsItr::doAction() {
     //FIXME ensure that this gets overwritten
     setStatus(i18n("Updating favicon..."));
     if (!m_updater) {
-        m_updater = new FavIconUpdater(kapp);
+        m_updater = new FavIconUpdater(qApp);
         connect(m_updater, SIGNAL( done(bool) ),
                 this,     SLOT( slotDone(bool) ) );
     }

keditbookmarks/toplevel.cpp

@@ -37,11 +37,11 @@
 #include <QtGui/QSplitter>
 #include <QtGui/QLayout>
 #include <QtGui/QLabel>
+#include <QtGui/QApplication>
 
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <ktoggleaction.h>
-#include <kapplication.h>
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
 #include <kdebug.h>

keditbookmarks/updater.cpp

@@ -26,7 +26,6 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
 
 #include <kio/job.h>
 
@@ -34,7 +33,6 @@
 #include <kparts/part.h>
 #include <kparts/browserextension.h>
 #include <kservicetypetrader.h>
-#include <assert.h>
 
 FavIconUpdater::FavIconUpdater(QObject *parent)
     : QObject(parent),
@@ -102,7 +100,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
                 this, SLOT( slotCompleted() ));
 
         KParts::BrowserExtension *ext = KParts::BrowserExtension::childObject(part);
-        assert(ext);
+        Q_ASSERT(ext);
 
         m_browserIface = new FavIconBrowserInterface(this);
         ext->setBrowserInterface(m_browserIface);
@@ -132,7 +130,7 @@ void FavIconUpdater::notifyChange(bool isHost,
 
     if(iconName.isNull() && !webupdate)
     {
-        // no icon found, try webupdater 
+        // no icon found, try webupdater
         downloadIconActual(m_bk);
     }
     else
@@ -140,7 +138,7 @@ void FavIconUpdater::notifyChange(bool isHost,
         // Either we have an icon or we already tried the webupdater
         m_bk.internalElement().setAttribute("icon", iconName);
         emit done(!iconName.isNull());
-    } 
+    }
 }
 
 /* -------------------------- */