summaryrefslogtreecommitdiffstats
path: root/configdialog
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:45 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:45 -0600
commit5c2673b2c03a832bef135b4361e03fb87cd5ce6f (patch)
tree4f80f4e4c18c9e81f5892852b1f5964f18a13fed /configdialog
parent968c1336d5c84cab8afc437d6771010052625bae (diff)
downloadkbfx-5c2673b2c03a832bef135b4361e03fb87cd5ce6f.tar.gz
kbfx-5c2673b2c03a832bef135b4361e03fb87cd5ce6f.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'configdialog')
-rw-r--r--configdialog/kbfxconfigapp.h2
-rw-r--r--configdialog/kbfxconfigdlgplugins.ui2
2 files changed, 2 insertions, 2 deletions
diff --git a/configdialog/kbfxconfigapp.h b/configdialog/kbfxconfigapp.h
index b4fc74b..7876e32 100644
--- a/configdialog/kbfxconfigapp.h
+++ b/configdialog/kbfxconfigapp.h
@@ -53,7 +53,7 @@
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kmessagebox.h>
#include <kpushbutton.h>
#include <krun.h>
diff --git a/configdialog/kbfxconfigdlgplugins.ui b/configdialog/kbfxconfigdlgplugins.ui
index fcfe392..d262944 100644
--- a/configdialog/kbfxconfigdlgplugins.ui
+++ b/configdialog/kbfxconfigdlgplugins.ui
@@ -385,6 +385,6 @@
<includehints>
<includehint>kactivelabel.h</includehint>
<includehint>kcombobox.h</includehint>
- <includehint>kactionselector.h</includehint>
+ <includehint>tdeactionselector.h</includehint>
</includehints>
</UI>