kdelibs4support--

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index e88f0e5a8dd6713a3873559af3d5a7bbc53e205c..5b5ae4d7ed7076f51a5c53b865720d1062c2f243 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -21,7 +21,6 @@
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 

-#include <kmimetype.h>

 #include <KLocale>
 #include <KIO/MetaData>
 #include <QDateTime>
 #include <KLocale>
 #include <KIO/MetaData>
 #include <QDateTime>

diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index 98e867582b4dde735d6d938644d456f8d3dfa54c..e7d18a81ad6e4b8bc76d3e52a79ff2e7427fcea1 100644 (file)
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -35,7 +35,7 @@ struct KBalooRolesProviderSingleton
 {
     KBalooRolesProvider instance;
 };
 {
     KBalooRolesProvider instance;
 };

-K_GLOBAL_STATIC(KBalooRolesProviderSingleton, s_balooRolesProvider)
+Q_GLOBAL_STATIC(KBalooRolesProviderSingleton, s_balooRolesProvider)

 
 
 KBalooRolesProvider& KBalooRolesProvider::instance()
 
 
 KBalooRolesProvider& KBalooRolesProvider::instance()

diff --git a/src/panels/places/placesitemlistwidget.cpp b/src/panels/places/placesitemlistwidget.cpp
index 83b00d798684161ea2ed2aa86835a4c322496b89..18e5618640cc6e29d94d19772afbf37d5ba158eb 100644 (file)
--- a/src/panels/places/placesitemlistwidget.cpp
+++ b/src/panels/places/placesitemlistwidget.cpp
@@ -19,8 +19,6 @@
 
 #include "placesitemlistwidget.h"
 
 
 #include "placesitemlistwidget.h"
 

-#include "kdebug.h"
-

 PlacesItemListWidget::PlacesItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
     KStandardItemListWidget(informant, parent)
 {
 PlacesItemListWidget::PlacesItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
     KStandardItemListWidget(informant, parent)
 {

diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 9e5f18cc734a3c01fc47caf66a64a9c5496d5130..431722b62f824196c865daa3603e014e07f809e1 100644 (file)
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -25,7 +25,6 @@
 #include <KConfigGroup>
 #include <KGlobal>
 #include <KLocalizedString>
 #include <KConfigGroup>
 #include <KGlobal>
 #include <KLocalizedString>

-#include <KNumInput>

 #include <KServiceTypeTrader>
 #include <KService>
 
 #include <KServiceTypeTrader>
 #include <KService>
 


@@ -41,6 +40,7 @@
 #include <QScrollBar>
 #include <QShowEvent>
 #include <QSlider>
 #include <QScrollBar>
 #include <QShowEvent>
 #include <QSlider>

+#include <QSpinBox>

 #include <QSortFilterProxyModel>
 #include <QVBoxLayout>
 
 #include <QSortFilterProxyModel>
 #include <QVBoxLayout>
 

diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index b56ce40c1ae8dff15bb069ca04cdb011d58d0a08..0b2729c330e07e929ac9e0a698922199e695f615 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -35,9 +35,6 @@ DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, co
 {
     Q_UNUSED(args);
 
 {
     Q_UNUSED(args);
 

-    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
-//KLocale::global()->insertCatalog("dolphin");
-

     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);

diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 619e44cc5c8bc4cd79b84e129c58c07ac3c5e39b..8bfdefebbe8c44df49fbc54b8edb645bf7583bca 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@@ -35,9 +35,6 @@ DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const
 {
     Q_UNUSED(args);
 
 {
     Q_UNUSED(args);
 

-    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
-//KLocale::global()->insertCatalog("dolphin");
-

     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);

diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index f013180ad54aab40c6475ee15ef19634d60d4d28..0859e568abfe5d1c3146172a028c291cfea05d8d 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -41,9 +41,6 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons
 {
     Q_UNUSED(args);
 
 {
     Q_UNUSED(args);
 

-    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
-//KLocale::global()->insertCatalog("dolphin");
-

     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);

diff --git a/src/statusbar/mountpointobservercache.cpp b/src/statusbar/mountpointobservercache.cpp
index 5be2a9f9553c6b45d2b0e297d703090f31e23585..ab3744eac89011e2e335fb3a791e0211a667438d 100644 (file)
--- a/src/statusbar/mountpointobservercache.cpp
+++ b/src/statusbar/mountpointobservercache.cpp
@@ -21,7 +21,6 @@
 
 #include "mountpointobserver.h"
 
 
 #include "mountpointobserver.h"
 

-#include <KGlobal>

 #include <KMountPoint>
 
 #include <QTimer>
 #include <KMountPoint>
 
 #include <QTimer>


@@ -31,7 +30,7 @@ class MountPointObserverCacheSingleton
 public:
     MountPointObserverCache instance;
 };
 public:
     MountPointObserverCache instance;
 };

-K_GLOBAL_STATIC(MountPointObserverCacheSingleton, s_MountPointObserverCache)
+Q_GLOBAL_STATIC(MountPointObserverCacheSingleton, s_MountPointObserverCache)

 
 
 MountPointObserverCache::MountPointObserverCache() :
 
 
 MountPointObserverCache::MountPointObserverCache() :

diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index 2ba7cbf0b25488a843faf6a00a4ff8aa999beb12..326c419ab3dc709f5bc4ab23f73e727d1106b3a4 100644 (file)
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -23,7 +23,7 @@
 #include <QUrl>
 
 
 #include <QUrl>
 
 

-#include <kcapacitybar.h>
+#include <KCapacityBar>

 
 class QHideEvent;
 class QShowEvent;
 
 class QHideEvent;
 class QShowEvent;

diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp
index 855f2675a5178d35ee5e2c3adb61ddb6b6139748..275e1c4fb0445752bbe7cf016413eaf12f68c100 100644 (file)
--- a/src/views/dolphinnewfilemenuobserver.cpp
+++ b/src/views/dolphinnewfilemenuobserver.cpp
@@ -19,7 +19,6 @@
 
 #include "dolphinnewfilemenuobserver.h"
 
 
 #include "dolphinnewfilemenuobserver.h"
 

-#include <KGlobal>

 #include "dolphinnewfilemenu.h"
 
 class DolphinNewFileMenuObserverSingleton
 #include "dolphinnewfilemenu.h"
 
 class DolphinNewFileMenuObserverSingleton


@@ -27,7 +26,7 @@ class DolphinNewFileMenuObserverSingleton
 public:
     DolphinNewFileMenuObserver instance;
 };
 public:
     DolphinNewFileMenuObserver instance;
 };

-K_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver)
+Q_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver)

 
 DolphinNewFileMenuObserver& DolphinNewFileMenuObserver::instance()
 {
 
 DolphinNewFileMenuObserver& DolphinNewFileMenuObserver::instance()
 {

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index f558f3c5fa29a09c6566b9f037193c1e89d9bd04..6d009ba9a6f05d9524a4642351c37ebe08018e29 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -24,8 +24,6 @@
 #include <KIO/CopyJob>
 #include <KIO/FileUndoManager>
 #include <kstringhandler_deprecated.h> //TODO port to QCollator
 #include <KIO/CopyJob>
 #include <KIO/FileUndoManager>
 #include <kstringhandler_deprecated.h> //TODO port to QCollator

-#include <knuminput.h>
-#include <kmimetype.h>

 #include <KJobUiDelegate>
 
 #include <QHBoxLayout>
 #include <KJobUiDelegate>
 
 #include <QHBoxLayout>


@@ -35,6 +33,7 @@
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QLineEdit>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QLineEdit>

+#include <QSpinBox>

 #include <KGuiItem>
 
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
 #include <KGuiItem>
 
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :