┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2011-02-04 15:43:21 +0100
committerPeter Penz <[email protected]>2011-02-04 15:43:21 +0100
commit8eb9b508ca87fb1d634d8b8ba62c054ed04466d2 (patch)
treed9712ac782edaed308c3b1fc0ddb8dac873dfc39 /src/settings
parentb1843402863d0473b00d872daec4ab382ddec030 (diff)
Use capitalized KDE includes
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/additionalinfodialog.cpp2
-rw-r--r--src/settings/additionalinfodialog.h4
-rw-r--r--src/settings/applyviewpropsjob.h6
-rw-r--r--src/settings/dolphinsettings.cpp8
-rw-r--r--src/settings/dolphinsettingsdialog.cpp6
-rw-r--r--src/settings/general/behaviorsettingspage.cpp4
-rw-r--r--src/settings/general/behaviorsettingspage.h2
-rw-r--r--src/settings/general/contextmenusettingspage.cpp6
-rw-r--r--src/settings/general/generalsettingspage.cpp8
-rw-r--r--src/settings/general/previewssettingspage.cpp10
-rw-r--r--src/settings/general/statusbarsettingspage.cpp6
-rw-r--r--src/settings/kcm/kcmdolphingeneral.cpp6
-rw-r--r--src/settings/kcm/kcmdolphinnavigation.cpp10
-rw-r--r--src/settings/kcm/kcmdolphinservices.cpp10
-rw-r--r--src/settings/kcm/kcmdolphinviewmodes.cpp10
-rw-r--r--src/settings/navigation/navigationsettingspage.cpp8
-rw-r--r--src/settings/services/servicessettingspage.cpp16
-rw-r--r--src/settings/settingspagebase.h2
-rw-r--r--src/settings/startup/startupsettingspage.cpp10
-rw-r--r--src/settings/startup/startupsettingspage.h2
-rw-r--r--src/settings/trash/trashsettingspage.cpp4
-rw-r--r--src/settings/viewmodes/columnviewsettingspage.cpp6
-rw-r--r--src/settings/viewmodes/detailsviewsettingspage.cpp4
-rw-r--r--src/settings/viewmodes/dolphinfontrequester.cpp6
-rw-r--r--src/settings/viewmodes/iconsizegroupbox.cpp2
-rw-r--r--src/settings/viewmodes/iconsviewsettingspage.cpp8
-rw-r--r--src/settings/viewmodes/viewsettingspage.cpp6
-rw-r--r--src/settings/viewmodes/viewsettingspagebase.h2
-rw-r--r--src/settings/viewpropertiesdialog.cpp14
-rw-r--r--src/settings/viewpropertiesdialog.h2
-rw-r--r--src/settings/viewpropsprogressinfo.cpp10
-rw-r--r--src/settings/viewpropsprogressinfo.h4
32 files changed, 102 insertions, 102 deletions
diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index ef08795e5..2e7d33cb3 100644
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -19,7 +19,7 @@
#include "additionalinfodialog.h"
-#include <klocale.h>
+#include <KLocale>
#include <QCheckBox>
#include <QLabel>
diff --git a/src/settings/additionalinfodialog.h b/src/settings/additionalinfodialog.h
index 54d23f2e3..eca2c86c6 100644
--- a/src/settings/additionalinfodialog.h
+++ b/src/settings/additionalinfodialog.h
@@ -20,8 +20,8 @@
#ifndef ADDITIONALINFODIALOG_H
#define ADDITIONALINFODIALOG_H
-#include <kdialog.h>
-#include <kfileitemdelegate.h>
+#include <KDialog>
+#include <KFileItemDelegate>
#include <QList>
class QCheckBox;
diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h
index da18af966..423181761 100644
--- a/src/settings/applyviewpropsjob.h
+++ b/src/settings/applyviewpropsjob.h
@@ -23,9 +23,9 @@
#ifndef APPLYVIEWPROPSJOB_H
#define APPLYVIEWPROPSJOB_H
-#include <kio/job.h>
-#include <kfileitem.h>
-#include <kurl.h>
+#include <KIO/Job>
+#include <KFileItem>
+#include <KUrl>
class ViewProperties;
diff --git a/src/settings/dolphinsettings.cpp b/src/settings/dolphinsettings.cpp
index 5b91001ef..7f160b141 100644
--- a/src/settings/dolphinsettings.cpp
+++ b/src/settings/dolphinsettings.cpp
@@ -20,10 +20,10 @@
#include "dolphinsettings.h"
-#include <kfileplacesmodel.h>
-#include <kcomponentdata.h>
-#include <klocale.h>
-#include <kstandarddirs.h>
+#include <KFilePlacesModel>
+#include <KComponentData>
+#include <KLocale>
+#include <KStandardDirs>
#include "dolphin_columnmodesettings.h"
#include "dolphin_detailsmodesettings.h"
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 2a62fc1cf..611648561 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -31,9 +31,9 @@
#include "viewmodes/viewsettingspage.h"
#include "trash/trashsettingspage.h"
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kicon.h>
+#include <KLocale>
+#include <KMessageBox>
+#include <KIcon>
DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
KPageDialog(parent),
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index 6d9fa9c0e..814304801 100644
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -23,8 +23,8 @@
#include "dolphin_generalsettings.h"
#include <settings/dolphinsettings.h>
-#include <kdialog.h>
-#include <klocale.h>
+#include <KDialog>
+#include <KLocale>
#include <QCheckBox>
#include <QGroupBox>
diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h
index d92feb939..c9b825128 100644
--- a/src/settings/general/behaviorsettingspage.h
+++ b/src/settings/general/behaviorsettingspage.h
@@ -21,7 +21,7 @@
#define BEHAVIORSETTINGSPAGE_H
#include <settings/settingspagebase.h>
-#include <kurl.h>
+#include <KUrl>
class QCheckBox;
class QLabel;
diff --git a/src/settings/general/contextmenusettingspage.cpp b/src/settings/general/contextmenusettingspage.cpp
index 592e25ba7..1b9f3a482 100644
--- a/src/settings/general/contextmenusettingspage.cpp
+++ b/src/settings/general/contextmenusettingspage.cpp
@@ -22,9 +22,9 @@
#include <settings/dolphinsettings.h>
#include <dolphin_generalsettings.h>
-#include <kdialog.h>
-#include <klocale.h>
-#include <kvbox.h>
+#include <KDialog>
+#include <KLocale>
+#include <KVBox>
#include <QCheckBox>
#include <QVBoxLayout>
diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp
index e156dadfc..dddefdd5c 100644
--- a/src/settings/general/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@@ -26,10 +26,10 @@
#include <settings/settingspagebase.h>
#include "statusbarsettingspage.h"
-#include <kdialog.h>
-#include <klocale.h>
-#include <kiconloader.h>
-#include <ktabwidget.h>
+#include <KDialog>
+#include <KLocale>
+#include <KIconLoader>
+#include <KTabWidget>
#include <QVBoxLayout>
diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index ff5a878f6..1333df5e9 100644
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -21,13 +21,13 @@
#include "dolphin_generalsettings.h"
-#include <kconfiggroup.h>
-#include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <KConfigGroup>
+#include <KDialog>
+#include <KGlobal>
+#include <KLocale>
#include <KNumInput>
#include <kservicetypetrader.h>
-#include <kservice.h>
+#include <KService>
#include <settings/dolphinsettings.h>
diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp
index 4d9b9a3f2..8c3833ec4 100644
--- a/src/settings/general/statusbarsettingspage.cpp
+++ b/src/settings/general/statusbarsettingspage.cpp
@@ -21,9 +21,9 @@
#include <dolphin_generalsettings.h>
-#include <kdialog.h>
-#include <klocale.h>
-#include <kvbox.h>
+#include <KDialog>
+#include <KLocale>
+#include <KVBox>
#include <settings/dolphinsettings.h>
diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index fb4a643ea..587c4df29 100644
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -19,9 +19,9 @@
#include "kcmdolphingeneral.h"
-#include <ktabwidget.h>
-#include <kdialog.h>
-#include <klocale.h>
+#include <KTabWidget>
+#include <KDialog>
+#include <KLocale>
#include <kpluginfactory.h>
#include <kpluginloader.h>
diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index fdf9de550..f4861b065 100644
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -19,11 +19,11 @@
#include "kcmdolphinnavigation.h"
-#include <ktabwidget.h>
-#include <kdialog.h>
-#include <klocale.h>
-#include <kpluginfactory.h>
-#include <kpluginloader.h>
+#include <KTabWidget>
+#include <KDialog>
+#include <KLocale>
+#include <KPluginFactory>
+#include <KPluginLoader>
#include <settings/navigation/navigationsettingspage.h>
diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 22e4e32cc..82c4275a3 100644
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@@ -19,11 +19,11 @@
#include "kcmdolphinservices.h"
-#include <ktabwidget.h>
-#include <kdialog.h>
-#include <klocale.h>
-#include <kpluginfactory.h>
-#include <kpluginloader.h>
+#include <KTabWidget>
+#include <KDialog>
+#include <KLocale>
+#include <KPluginFactory>
+#include <KPluginLoader>
#include <settings/services/servicessettingspage.h>
diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index e24d549e0..2a3666d80 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -19,11 +19,11 @@
#include "kcmdolphinviewmodes.h"
-#include <ktabwidget.h>
-#include <kdialog.h>
-#include <klocale.h>
-#include <kpluginfactory.h>
-#include <kpluginloader.h>
+#include <KTabWidget>
+#include <KDialog>
+#include <KLocale>
+#include <KPluginFactory>
+#include <KPluginLoader>
#include <settings/viewmodes/columnviewsettingspage.h>
#include <settings/viewmodes/detailsviewsettingspage.h>
diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp
index 00ea3aad3..062edc24a 100644
--- a/src/settings/navigation/navigationsettingspage.cpp
+++ b/src/settings/navigation/navigationsettingspage.cpp
@@ -23,10 +23,10 @@
#include "dolphin_generalsettings.h"
-#include <kdialog.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kvbox.h>
+#include <KDialog>
+#include <KGlobalSettings>
+#include <KLocale>
+#include <KVBox>
#include <QCheckBox>
#include <QGroupBox>
diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index 17560714c..bc4de0939 100644
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@@ -21,17 +21,17 @@
#include "dolphin_versioncontrolsettings.h"
-#include <kconfig.h>
-#include <kconfiggroup.h>
-#include <kdesktopfile.h>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KDesktopFile>
#include <kdesktopfileactions.h>
-#include <kicon.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <KIcon>
+#include <KLocale>
+#include <KMessageBox>
#include <knewstuff3/knewstuffbutton.h>
-#include <kservice.h>
+#include <KService>
#include <kservicetypetrader.h>
-#include <kstandarddirs.h>
+#include <KStandardDirs>
#include <QCheckBox>
#include <QGridLayout>
diff --git a/src/settings/settingspagebase.h b/src/settings/settingspagebase.h
index 05f907aac..65b8782f9 100644
--- a/src/settings/settingspagebase.h
+++ b/src/settings/settingspagebase.h
@@ -21,7 +21,7 @@
#ifndef SETTINGSPAGEBASE_H
#define SETTINGSPAGEBASE_H
-#include <QtGui/QWidget>
+#include <QWidget>
/**
* @brief Base class for the settings pages of the Dolphin settings dialog.
diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index c3fdbc656..47da64d0a 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -25,12 +25,12 @@
#include "dolphin_generalsettings.h"
-#include <kdialog.h>
+#include <KDialog>
#include <kfiledialog.h>
-#include <klocale.h>
-#include <klineedit.h>
-#include <kmessagebox.h>
-#include <kvbox.h>
+#include <KLocale>
+#include <KLineEdit>
+#include <KMessageBox>
+#include <KVBox>
#include <QCheckBox>
#include <QGroupBox>
diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h
index d749e5e0e..1c53cccdf 100644
--- a/src/settings/startup/startupsettingspage.h
+++ b/src/settings/startup/startupsettingspage.h
@@ -20,7 +20,7 @@
#define STARTUPSETTINGSPAGE_H
#include <settings/settingspagebase.h>
-#include <kurl.h>
+#include <KUrl>
class KLineEdit;
class QCheckBox;
diff --git a/src/settings/trash/trashsettingspage.cpp b/src/settings/trash/trashsettingspage.cpp
index f507cbab5..b8294bffd 100644
--- a/src/settings/trash/trashsettingspage.cpp
+++ b/src/settings/trash/trashsettingspage.cpp
@@ -20,8 +20,8 @@
#include "trashsettingspage.h"
#include <KCModuleProxy>
-#include <kdialog.h>
-#include <kvbox.h>
+#include <KDialog>
+#include <KVBox>
#include <settings/dolphinsettings.h>
diff --git a/src/settings/viewmodes/columnviewsettingspage.cpp b/src/settings/viewmodes/columnviewsettingspage.cpp
index 0919e1618..3bacca4ba 100644
--- a/src/settings/viewmodes/columnviewsettingspage.cpp
+++ b/src/settings/viewmodes/columnviewsettingspage.cpp
@@ -23,9 +23,9 @@
#include <dolphin_columnmodesettings.h>
#include "iconsizegroupbox.h"
-#include <kdialog.h>
-#include <klocale.h>
-#include <kcombobox.h>
+#include <KDialog>
+#include <KLocale>
+#include <KComboBox>
#include <settings/dolphinsettings.h>
diff --git a/src/settings/viewmodes/detailsviewsettingspage.cpp b/src/settings/viewmodes/detailsviewsettingspage.cpp
index 79fedd510..321f7eb0e 100644
--- a/src/settings/viewmodes/detailsviewsettingspage.cpp
+++ b/src/settings/viewmodes/detailsviewsettingspage.cpp
@@ -23,8 +23,8 @@
#include "dolphinfontrequester.h"
#include "dolphin_detailsmodesettings.h"
-#include <kdialog.h>
-#include <klocale.h>
+#include <KDialog>
+#include <KLocale>
#include <settings/dolphinsettings.h>
diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index 04c5ed586..4e23b2d47 100644
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -20,9 +20,9 @@
#include "dolphinfontrequester.h"
#include <kfontdialog.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kcombobox.h>
+#include <KGlobalSettings>
+#include <KLocale>
+#include <KComboBox>
#include <QEvent>
#include <QPushButton>
diff --git a/src/settings/viewmodes/iconsizegroupbox.cpp b/src/settings/viewmodes/iconsizegroupbox.cpp
index 900c75b2c..76fb1fb57 100644
--- a/src/settings/viewmodes/iconsizegroupbox.cpp
+++ b/src/settings/viewmodes/iconsizegroupbox.cpp
@@ -19,7 +19,7 @@
#include "iconsizegroupbox.h"
-#include <klocale.h>
+#include <KLocale>
#include <QApplication>
#include <QGridLayout>
diff --git a/src/settings/viewmodes/iconsviewsettingspage.cpp b/src/settings/viewmodes/iconsviewsettingspage.cpp
index a711254c3..8c146f014 100644
--- a/src/settings/viewmodes/iconsviewsettingspage.cpp
+++ b/src/settings/viewmodes/iconsviewsettingspage.cpp
@@ -25,10 +25,10 @@
#include "dolphin_iconsmodesettings.h"
-#include <kdialog.h>
-#include <kiconloader.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <KDialog>
+#include <KIconLoader>
+#include <KGlobalSettings>
+#include <KLocale>
#include <kcombobox.h>
#include <KNumInput>
diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index deb7a31bb..6d9a70466 100644
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -26,9 +26,9 @@
#include <QVBoxLayout>
-#include <kdialog.h>
-#include <klocale.h>
-#include <kiconloader.h>
+#include <KDialog>
+#include <KLocale>
+#include <KIconLoader>
#include <ktabwidget.h>
ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
diff --git a/src/settings/viewmodes/viewsettingspagebase.h b/src/settings/viewmodes/viewsettingspagebase.h
index 3e85e25cb..541253355 100644
--- a/src/settings/viewmodes/viewsettingspagebase.h
+++ b/src/settings/viewmodes/viewsettingspagebase.h
@@ -20,7 +20,7 @@
#ifndef VIEWSETTINGSPAGEBASE_H
#define VIEWSETTINGSPAGEBASE_H
-#include <kvbox.h>
+#include <KVBox>
/**
* @brief Base class for view settings configuration pages.
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 7830616d0..f52bd12d2 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -32,13 +32,13 @@
#include <nepomuk/resourcemanager.h>
#endif
-#include <kcomponentdata.h>
-#include <klocale.h>
-#include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kmessagebox.h>
-#include <kstandarddirs.h>
-#include <kurl.h>
+#include <KComponentData>
+#include <KLocale>
+#include <KIconLoader>
+#include <KIO/NetAccess>
+#include <KMessageBox>
+#include <KStandardDirs>
+#include <KUrl>
#include <kcombobox.h>
#include <QAction>
diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
index ce0c3e5b8..d2170f331 100644
--- a/src/settings/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
@@ -23,7 +23,7 @@
#include "libdolphin_export.h"
-#include <kdialog.h>
+#include <KDialog>
class QCheckBox;
class KComboBox;
diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index 436dcdef6..c98b23866 100644
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@@ -21,12 +21,12 @@
#include "viewpropsprogressinfo.h"
#include "applyviewpropsjob.h"
-#include <QtGui/QLabel>
-#include <QtGui/QProgressBar>
-#include <QtCore/QTimer>
-#include <QtGui/QBoxLayout>
+#include <QLabel>
+#include <QProgressBar>
+#include <QTimer>
+#include <QBoxLayout>
-#include <klocale.h>
+#include <KLocale>
#include <kio/jobclasses.h>
#include <views/viewproperties.h>
diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h
index d07d16d67..6f8c763c3 100644
--- a/src/settings/viewpropsprogressinfo.h
+++ b/src/settings/viewpropsprogressinfo.h
@@ -20,9 +20,9 @@
#ifndef VIEWPROPSPROGRESSINFO_H
#define VIEWPROPSPROGRESSINFO_H
-#include <kdialog.h>
+#include <KDialog>
#include <kio/directorysizejob.h>
-#include <kurl.h>
+#include <KUrl>
class ApplyViewPropsJob;
class QLabel;