summaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:09:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:09:51 -0600
commitcf94951d4cb0dd12b9904a87db01b5185d5f11c5 (patch)
treef59e493636f1bfd657b0d3677f722d38791e689f /src/app
parent1d88613b6be64c0b6588952dd1f81396168be44b (diff)
downloadfilelight-cf94951d4cb0dd12b9904a87db01b5185d5f11c5.tar.gz
filelight-cf94951d4cb0dd12b9904a87db01b5185d5f11c5.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/app')
-rw-r--r--src/app/historyAction.cpp2
-rw-r--r--src/app/historyAction.h2
-rw-r--r--src/app/mainWindow.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/app/historyAction.cpp b/src/app/historyAction.cpp
index 5bb1309..6729087 100644
--- a/src/app/historyAction.cpp
+++ b/src/app/historyAction.cpp
@@ -3,7 +3,7 @@
#include "historyAction.h"
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <tdeconfig.h>
#include <klocale.h>
diff --git a/src/app/historyAction.h b/src/app/historyAction.h
index 350b165..cd9b60a 100644
--- a/src/app/historyAction.h
+++ b/src/app/historyAction.h
@@ -4,7 +4,7 @@
#ifndef HISTORYACTION_H
#define HISTORYACTION_H
-#include <kaction.h>
+#include <tdeaction.h>
#include <kurl.h>
#include <tqstringlist.h>
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index cb617e9..18457b7 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -6,8 +6,8 @@
#include "historyAction.h"
#include <cstdlib> //std::exit()
-#include <kaccel.h> //TDEStdAccel namespace
-#include <kaction.h>
+#include <tdeaccel.h> //TDEStdAccel namespace
+#include <tdeaction.h>
#include <kapplication.h> //setupActions()
#include <kcombobox.h> //locationbar
#include <tdeconfig.h>
@@ -19,7 +19,7 @@
#include <kmessagebox.h>
#include <kshell.h>
#include <kstatusbar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <kurl.h>
#include <kurlcompletion.h> //locationbar
#include <tqobjectlist.h>