summaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 00:51:37 -0600
committerTimothy Pearson <[email protected]>2013-01-27 00:51:37 -0600
commit19e49186e5020deed0bcf1d5ca45a1e42b14a16e (patch)
treecc93ec749f0bad218ecf3fe1cfef2a1cb8aaa61b /src/app
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/app')
-rw-r--r--src/app/historyAction.cpp2
-rw-r--r--src/app/mainWindow.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/app/historyAction.cpp b/src/app/historyAction.cpp
index f0864a9..4b47721 100644
--- a/src/app/historyAction.cpp
+++ b/src/app/historyAction.cpp
@@ -4,7 +4,7 @@
#include "historyAction.h"
#include <kaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index b7f99ec..5bd35bf 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -10,7 +10,7 @@
#include <kaction.h>
#include <kapplication.h> //setupActions()
#include <kcombobox.h> //locationbar
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdirselectdialog.h> //slotScanDirectory
#include <kedittoolbar.h> //for editToolbar dialog
#include <kkeydialog.h>