diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
| commit | 64df902cf71a8ee258fb85f6be26248f399aa01f (patch) | |
| tree | dba58f705042c22cea26b678d5b0e4e9a34bf202 /libkpgp | |
| parent | de53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff) | |
| download | tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'libkpgp')
| -rw-r--r-- | libkpgp/Makefile.am | 2 | ||||
| -rw-r--r-- | libkpgp/kpgp.cpp | 4 | ||||
| -rw-r--r-- | libkpgp/kpgpui.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libkpgp/Makefile.am b/libkpgp/Makefile.am index e8b89f728..d17105bba 100644 --- a/libkpgp/Makefile.am +++ b/libkpgp/Makefile.am @@ -20,7 +20,7 @@ libkpgp_la_LIBADD = $(LIB_TDEUI) $(LIB_POLL) METASOURCES = AUTO -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update update_DATA = kpgp.upd update_SCRIPTS = kpgp-3.1-upgrade-address-data.pl diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp index 18060ec6d..33aa89954 100644 --- a/libkpgp/kpgp.cpp +++ b/libkpgp/kpgp.cpp @@ -37,8 +37,8 @@ #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> -#include <kconfigbase.h> -#include <kconfig.h> +#include <tdeconfigbase.h> +#include <tdeconfig.h> #include <kstaticdeleter.h> #include "kpgpbase.h" diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 164225d19..f468cb926 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -38,8 +38,8 @@ #include <kseparator.h> #include <kiconloader.h> #include <klistview.h> -#include <kconfigbase.h> -#include <kconfig.h> +#include <tdeconfigbase.h> +#include <tdeconfig.h> #include <kprogress.h> #include <kapplication.h> #include <twin.h> |