From d3eec0f20c7196c2c346089f2fb0fd8a759aba4f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:55:11 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- src/Makefile.am | 2 +- src/otrguiclient.h | 2 +- src/otrplugin.cpp | 2 +- src/otrpreferences.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 01bec5c..47584b4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,7 +26,7 @@ servicedir = $(kde_servicesdir) kde_kcfg_DATA = kopete_otr.kcfg kcm_DATA = kopete_otr_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog kopete_otr_la_LIBADD = libkotr.la -lotr diff --git a/src/otrguiclient.h b/src/otrguiclient.h index eb9ee5b..e6e1e28 100644 --- a/src/otrguiclient.h +++ b/src/otrguiclient.h @@ -25,7 +25,7 @@ #include #include -//#include +//#include #include #include diff --git a/src/otrplugin.cpp b/src/otrplugin.cpp index 7478c59..47fdcb0 100644 --- a/src/otrplugin.cpp +++ b/src/otrplugin.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/otrpreferences.cpp b/src/otrpreferences.cpp index f591113..b72ed4c 100644 --- a/src/otrpreferences.cpp +++ b/src/otrpreferences.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.1