summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:44:35 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:44:35 -0600
commitce769d5ff82f5e410853b665b21e6dca43876ba0 (patch)
tree1b174439cfd456a2c3686552361a410510240d84 /src
parentf18f782743d9c7465d85be4e109015542bb95cc2 (diff)
downloadfilelight-ce769d5ff82f5e410853b665b21e6dca43876ba0.tar.gz
filelight-ce769d5ff82f5e410853b665b21e6dca43876ba0.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/app/historyAction.cpp2
-rw-r--r--src/app/main.cpp2
-rw-r--r--src/app/mainWindow.cpp4
-rw-r--r--src/part/Config.cpp2
-rw-r--r--src/part/fileTree.cpp4
-rw-r--r--src/part/part.cpp4
-rw-r--r--src/part/progressBox.cpp6
-rw-r--r--src/part/radialMap/builder.cpp4
-rw-r--r--src/part/radialMap/map.cpp2
-rw-r--r--src/part/radialMap/segmentTip.cpp6
-rw-r--r--src/part/radialMap/widget.cpp2
-rw-r--r--src/part/radialMap/widgetEvents.cpp4
-rw-r--r--src/part/settingsDialog.cpp4
-rw-r--r--src/part/summaryWidget.cpp2
14 files changed, 24 insertions, 24 deletions
diff --git a/src/app/historyAction.cpp b/src/app/historyAction.cpp
index 6729087..7ff421d 100644
--- a/src/app/historyAction.cpp
+++ b/src/app/historyAction.cpp
@@ -5,7 +5,7 @@
#include <tdeaccel.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
inline
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 630371f..e4c59f3 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -5,7 +5,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include "mainWindow.h"
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index 0924f9a..9508b43 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -15,8 +15,8 @@
#include <kedittoolbar.h> //for editToolbar dialog
#include <kkeydialog.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kshell.h>
#include <kstatusbar.h>
#include <tdetoolbar.h>
diff --git a/src/part/Config.cpp b/src/part/Config.cpp
index 9564b7e..9dd15d1 100644
--- a/src/part/Config.cpp
+++ b/src/part/Config.cpp
@@ -1,7 +1,7 @@
#include "Config.h"
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
bool Config::scanAcrossMounts;
diff --git a/src/part/fileTree.cpp b/src/part/fileTree.cpp
index 5409b33..70497c5 100644
--- a/src/part/fileTree.cpp
+++ b/src/part/fileTree.cpp
@@ -2,8 +2,8 @@
//Copyright: See COPYING file that comes with this distribution
#include "fileTree.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqfile.h>
diff --git a/src/part/part.cpp b/src/part/part.cpp
index 2e1f20d..ce8a78b 100644
--- a/src/part/part.cpp
+++ b/src/part/part.cpp
@@ -14,8 +14,8 @@
#include <tdeaboutdata.h> //::createAboutData()
#include <tdeaction.h>
-#include <klocale.h>
-#include <kmessagebox.h> //::start()
+#include <tdelocale.h>
+#include <tdemessagebox.h> //::start()
//#include <konq_operations.h>
#include <tdeparts/genericfactory.h>
#include <kstatusbar.h>
diff --git a/src/part/progressBox.cpp b/src/part/progressBox.cpp
index cd4f789..2b0d093 100644
--- a/src/part/progressBox.cpp
+++ b/src/part/progressBox.cpp
@@ -1,10 +1,10 @@
//Author: Max Howell <max.howell@methylblue.com>, (C) 2003-4
//Copyright: See COPYING file that comes with this distribution
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "scan.h"
#include "progressBox.h"
diff --git a/src/part/radialMap/builder.cpp b/src/part/radialMap/builder.cpp
index e993453..c78ba8b 100644
--- a/src/part/radialMap/builder.cpp
+++ b/src/part/radialMap/builder.cpp
@@ -4,8 +4,8 @@
#include "builder.h"
#include "Config.h"
#include "fileTree.h"
-#include <kglobal.h> //locale object
-#include <klocale.h>
+#include <tdeglobal.h> //locale object
+#include <tdelocale.h>
#include "widget.h"
diff --git a/src/part/radialMap/map.cpp b/src/part/radialMap/map.cpp
index 34a1c6c..72d105d 100644
--- a/src/part/radialMap/map.cpp
+++ b/src/part/radialMap/map.cpp
@@ -2,7 +2,7 @@
//Copyright: See COPYING file that comes with this distribution
#include <kcursor.h> //make()
-#include <kglobalsettings.h> //kdeColours
+#include <tdeglobalsettings.h> //kdeColours
#include <kimageeffect.h> //desaturate()
#include <tqapplication.h> //make()
#include <tqimage.h> //make() & paint()
diff --git a/src/part/radialMap/segmentTip.cpp b/src/part/radialMap/segmentTip.cpp
index 3c8f3f4..fcc9cec 100644
--- a/src/part/radialMap/segmentTip.cpp
+++ b/src/part/radialMap/segmentTip.cpp
@@ -6,9 +6,9 @@
#include <cstdlib>
#include <tdeapplication.h> //installing eventFilters
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kpixmapeffect.h>
#include <tqpainter.h>
#include <tqtooltip.h> //for its palette
diff --git a/src/part/radialMap/widget.cpp b/src/part/radialMap/widget.cpp
index e1b606f..0520f9e 100644
--- a/src/part/radialMap/widget.cpp
+++ b/src/part/radialMap/widget.cpp
@@ -2,7 +2,7 @@
//Copyright: See COPYING file that comes with this distribution
#include <kcursor.h> //ctor
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <tqapplication.h> //sendEvent
#include <tqbitmap.h> //ctor - finding cursor size
diff --git a/src/part/radialMap/widgetEvents.cpp b/src/part/radialMap/widgetEvents.cpp
index 7e3a5de..69ba3e5 100644
--- a/src/part/radialMap/widgetEvents.cpp
+++ b/src/part/radialMap/widgetEvents.cpp
@@ -10,8 +10,8 @@
#include <kiconeffect.h> //::mousePressEvent()
#include <kiconloader.h> //::mousePressEvent()
#include <tdeio/job.h> //::mousePressEvent()
-#include <klocale.h>
-#include <kmessagebox.h> //::mousePressEvent()
+#include <tdelocale.h>
+#include <tdemessagebox.h> //::mousePressEvent()
#include <tdepopupmenu.h> //::mousePressEvent()
#include <krun.h> //::mousePressEvent()
#include <kurldrag.h>
diff --git a/src/part/settingsDialog.cpp b/src/part/settingsDialog.cpp
index 9597541..6fa88dc 100644
--- a/src/part/settingsDialog.cpp
+++ b/src/part/settingsDialog.cpp
@@ -10,8 +10,8 @@
#include <kdirselectdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include "settingsDialog.h"
diff --git a/src/part/summaryWidget.cpp b/src/part/summaryWidget.cpp
index 75f01a6..ad9c093 100644
--- a/src/part/summaryWidget.cpp
+++ b/src/part/summaryWidget.cpp
@@ -7,7 +7,7 @@
#include <kcursor.h>
#include <kiconeffect.h> //MyRadialMap::mousePressEvent()
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqtextstream.h>