summaryrefslogtreecommitdiffstats
path: root/conduits/malconduit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:55:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:55:17 -0600
commit45e371f7ffece317ed9466f032cb0fe9520461f1 (patch)
tree2f292babc95fbea695a578de46bed15fb2b61fc8 /conduits/malconduit
parent5e4f00a9911f1b6360a49f869fe10620325beaba (diff)
downloadkpilot-45e371f7ffece317ed9466f032cb0fe9520461f1.tar.gz
kpilot-45e371f7ffece317ed9466f032cb0fe9520461f1.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'conduits/malconduit')
-rw-r--r--conduits/malconduit/mal-conduit.cc2
-rw-r--r--conduits/malconduit/mal-setup.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/conduits/malconduit/mal-conduit.cc b/conduits/malconduit/mal-conduit.cc
index 5aa5883..cddf09f 100644
--- a/conduits/malconduit/mal-conduit.cc
+++ b/conduits/malconduit/mal-conduit.cc
@@ -35,7 +35,7 @@
#include "options.h"
#include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include "mal-factory.h"
diff --git a/conduits/malconduit/mal-setup.cc b/conduits/malconduit/mal-setup.cc
index 61441f0..57f07c4 100644
--- a/conduits/malconduit/mal-setup.cc
+++ b/conduits/malconduit/mal-setup.cc
@@ -43,7 +43,7 @@
#include <kpassdlg.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "mal-setup_dialog.h"