summaryrefslogtreecommitdiffstats
path: root/src/part
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:51:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:51:37 -0600
commit19e49186e5020deed0bcf1d5ca45a1e42b14a16e (patch)
treecc93ec749f0bad218ecf3fe1cfef2a1cb8aaa61b /src/part
parent9b3710945866c294f4d18f5b5595f8dab0fc54d1 (diff)
downloadfilelight-19e49186e5020deed0bcf1d5ca45a1e42b14a16e.tar.gz
filelight-19e49186e5020deed0bcf1d5ca45a1e42b14a16e.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/part')
-rw-r--r--src/part/Config.cpp8
-rw-r--r--src/part/Config.h2
-rw-r--r--src/part/progressBox.cpp2
-rw-r--r--src/part/radialMap/widgetEvents.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/part/Config.cpp b/src/part/Config.cpp
index 3b4a925..9564b7e 100644
--- a/src/part/Config.cpp
+++ b/src/part/Config.cpp
@@ -1,6 +1,6 @@
#include "Config.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
@@ -18,7 +18,7 @@ TQStringList Config::skipList;
inline TDEConfig&
-Filelight::Config::kconfig()
+Filelight::Config::tdeconfig()
{
TDEConfig *config = TDEGlobal::config();
config->setGroup( "filelight_part" );
@@ -28,7 +28,7 @@ Filelight::Config::kconfig()
void
Filelight::Config::read()
{
- const TDEConfig &config = kconfig();
+ const TDEConfig &config = tdeconfig();
scanAcrossMounts = config.readBoolEntry( "scanAcrossMounts", false );
scanRemoteMounts = config.readBoolEntry( "scanRemoteMounts", false );
@@ -47,7 +47,7 @@ Filelight::Config::read()
void
Filelight::Config::write()
{
- TDEConfig &config = kconfig();
+ TDEConfig &config = tdeconfig();
config.writeEntry( "scanAcrossMounts", scanAcrossMounts );
config.writeEntry( "scanRemoteMounts", scanRemoteMounts );
diff --git a/src/part/Config.h b/src/part/Config.h
index 47e6cf5..88f13b6 100644
--- a/src/part/Config.h
+++ b/src/part/Config.h
@@ -13,7 +13,7 @@ namespace Filelight
class Config
{
- static TDEConfig& kconfig();
+ static TDEConfig& tdeconfig();
public:
static void read();
diff --git a/src/part/progressBox.cpp b/src/part/progressBox.cpp
index 03c4275..cd4f789 100644
--- a/src/part/progressBox.cpp
+++ b/src/part/progressBox.cpp
@@ -3,7 +3,7 @@
#include <kglobal.h>
#include <kglobalsettings.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <klocale.h>
#include "scan.h"
diff --git a/src/part/radialMap/widgetEvents.cpp b/src/part/radialMap/widgetEvents.cpp
index 44214c1..c95d822 100644
--- a/src/part/radialMap/widgetEvents.cpp
+++ b/src/part/radialMap/widgetEvents.cpp
@@ -9,7 +9,7 @@
#include <kcursor.h> //::mouseMoveEvent()
#include <kiconeffect.h> //::mousePressEvent()
#include <kiconloader.h> //::mousePressEvent()
-#include <kio/job.h> //::mousePressEvent()
+#include <tdeio/job.h> //::mousePressEvent()
#include <klocale.h>
#include <kmessagebox.h> //::mousePressEvent()
#include <kpopupmenu.h> //::mousePressEvent()