summaryrefslogtreecommitdiffstats
path: root/kbarcode/databasebrowser.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:41 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:41 -0600
commit0390e450286b795524fe86bbc2a0aa0963cf080e (patch)
treed89d3cf84057ef1b8ba2d1ddf5e68b1e27a5e91f /kbarcode/databasebrowser.cpp
parent23fba05091f327928f24fc10537725c92f930803 (diff)
downloadkbarcode-0390e450286b795524fe86bbc2a0aa0963cf080e.tar.gz
kbarcode-0390e450286b795524fe86bbc2a0aa0963cf080e.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kbarcode/databasebrowser.cpp')
-rw-r--r--kbarcode/databasebrowser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kbarcode/databasebrowser.cpp b/kbarcode/databasebrowser.cpp
index 7637201..b59fff9 100644
--- a/kbarcode/databasebrowser.cpp
+++ b/kbarcode/databasebrowser.cpp
@@ -25,12 +25,12 @@
#include <tqclipboard.h>
// KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <keditcl.h>
#include <klocale.h>
#include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstatusbar.h>
#define CUR_TABLE_ID 6666