summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:14:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:14:04 -0600
commit16cdaafa9062de80d1eeae9e96dfac5f8a75f5ae (patch)
treefda2ca46b0cda050565bd5791f4ecbd3d414ed54
parentb90b805733bdb1846e6058f7b065f5f886d7e203 (diff)
downloadkopete-otr-16cdaafa9062de80d1eeae9e96dfac5f8a75f5ae.tar.gz
kopete-otr-16cdaafa9062de80d1eeae9e96dfac5f8a75f5ae.zip
Rename many classes and header files to avoid conflicts with KDE4
-rw-r--r--src/otrguiclient.cpp4
-rw-r--r--src/otrplugin.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/otrguiclient.cpp b/src/otrguiclient.cpp
index 3182898..f3bf8de 100644
--- a/src/otrguiclient.cpp
+++ b/src/otrguiclient.cpp
@@ -19,9 +19,9 @@
***************************************************************************/
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
#include <kopetechatsession.h>
#include <kopeteview.h>
#include <kopetemessage.h>
diff --git a/src/otrplugin.cpp b/src/otrplugin.cpp
index ab8da0a..7aaf9f4 100644
--- a/src/otrplugin.cpp
+++ b/src/otrplugin.cpp
@@ -25,9 +25,9 @@
#include <tqcolor.h>
#include <kdebug.h>
-#include <kaction.h>
-#include <kactionclasses.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
+#include <tdepopupmenu.h>
#include <tdeconfig.h>
#include <kgenericfactory.h>
#include <tdeversion.h>