Fix includes

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 2eb16fe2dd0c28397358843fb82feff46cff41f9..4ed32ed434bf0e4954135e7997cdc55d78e1fede 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -24,26 +24,21 @@
 
 #include <QAbstractItemView>
 #include <QApplication>
 
 #include <QAbstractItemView>
 #include <QApplication>

-#include <QBoxLayout>

 #include <QClipboard>
 #include <QDropEvent>
 #include <QGraphicsSceneDragDropEvent>
 #include <QClipboard>
 #include <QDropEvent>
 #include <QGraphicsSceneDragDropEvent>

-#include <QKeyEvent>
-#include <QItemSelection>

 #include <QTimer>
 #include <QScrollBar>
 #include <QPointer>
 #include <QMenu>
 #include <QTimer>
 #include <QScrollBar>
 #include <QPointer>
 #include <QMenu>

-
+#include <QVBoxLayout>

 #include <KDesktopFile>
 #include <KProtocolManager>
 #include <KDesktopFile>
 #include <KProtocolManager>

-#include <KActionCollection>

 #include <KColorScheme>
 #include <KDirModel>
 #include <KColorScheme>
 #include <KDirModel>

-#include <KIconEffect>

 #include <KFileItem>
 #include <KFileItemListProperties>
 #include <KFileItem>
 #include <KFileItemListProperties>

-#include <KLocale>
+#include <KLocalizedString>

 #include <kitemviews/kfileitemmodel.h>
 #include <kitemviews/kfileitemlistview.h>
 #include <kitemviews/kitemlistcontainer.h>
 #include <kitemviews/kfileitemmodel.h>
 #include <kitemviews/kfileitemlistview.h>
 #include <kitemviews/kitemlistcontainer.h>


@@ -58,12 +53,10 @@
 #include <KIO/PreviewJob>
 #include <KIO/Paste>
 #include <KJob>
 #include <KIO/PreviewJob>
 #include <KIO/Paste>
 #include <KJob>

-#include <KMenu>
-#include <KGlobal>
+#include <QMenu>

 #include <KMessageBox>
 #include <KJobWidgets>
 #include <konq_operations.h>
 #include <KMessageBox>
 #include <KJobWidgets>
 #include <konq_operations.h>

-#include <KToggleAction>

 #include <KUrl>
 
 #include "dolphinnewfilemenuobserver.h"
 #include <KUrl>
 
 #include "dolphinnewfilemenuobserver.h"


@@ -81,6 +74,7 @@
 #ifdef HAVE_BALOO
     #include <Baloo/IndexerConfig>
 #endif
 #ifdef HAVE_BALOO
     #include <Baloo/IndexerConfig>
 #endif

+#include <KFormat>

 
 namespace {
     const int MaxModeEnum = DolphinView::CompactView;
 
 namespace {
     const int MaxModeEnum = DolphinView::CompactView;


@@ -489,7 +483,7 @@ void DolphinView::readSettings()
 {
     const int oldZoomLevel = m_view->zoomLevel();
 
 {
     const int oldZoomLevel = m_view->zoomLevel();
 

-    GeneralSettings::self()->readConfig();
+    GeneralSettings::self()->load();

     m_view->readSettings();
     applyViewProperties();
 
     m_view->readSettings();
     applyViewProperties();
 


@@ -504,7 +498,7 @@ void DolphinView::readSettings()
 
 void DolphinView::writeSettings()
 {
 
 void DolphinView::writeSettings()
 {

-    GeneralSettings::self()->writeConfig();
+    GeneralSettings::self()->save();

     m_view->writeSettings();
 }
 
     m_view->writeSettings();
 }
 


@@ -567,11 +561,11 @@ QString DolphinView::statusBarText() const
     if (fileCount > 0 && folderCount > 0) {
         summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
                         foldersText, filesText,
     if (fileCount > 0 && folderCount > 0) {
         summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
                         foldersText, filesText,

-                        KGlobal::locale()->formatByteSize(totalFileSize));
+                        KFormat().formatByteSize(totalFileSize));

     } else if (fileCount > 0) {
         summary = i18nc("@info:status files (size)", "%1 (%2)",
                         filesText,
     } else if (fileCount > 0) {
         summary = i18nc("@info:status files (size)", "%1 (%2)",
                         filesText,

-                        KGlobal::locale()->formatByteSize(totalFileSize));
+                        KFormat().formatByteSize(totalFileSize));

     } else if (folderCount > 0) {
         summary = foldersText;
     } else {
     } else if (folderCount > 0) {
         summary = foldersText;
     } else {


@@ -873,7 +867,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
 {
     ViewProperties props(viewPropertiesUrl());
 
 {
     ViewProperties props(viewPropertiesUrl());
 

-    QPointer<KMenu> menu = new KMenu(QApplication::activeWindow());
+    QPointer<QMenu> menu = new QMenu(QApplication::activeWindow());

 
     KItemListView* view = m_container->controller()->view();
     const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();
 
     KItemListView* view = m_container->controller()->view();
     const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();