diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:55:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:55:17 -0600 |
| commit | 45e371f7ffece317ed9466f032cb0fe9520461f1 (patch) | |
| tree | 2f292babc95fbea695a578de46bed15fb2b61fc8 /conduits/popmail | |
| parent | 5e4f00a9911f1b6360a49f869fe10620325beaba (diff) | |
| download | kpilot-45e371f7ffece317ed9466f032cb0fe9520461f1.tar.gz kpilot-45e371f7ffece317ed9466f032cb0fe9520461f1.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'conduits/popmail')
| -rw-r--r-- | conduits/popmail/popmail-conduit.cc | 2 | ||||
| -rw-r--r-- | conduits/popmail/setupDialog.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conduits/popmail/popmail-conduit.cc b/conduits/popmail/popmail-conduit.cc index 1fbaf71..057a07c 100644 --- a/conduits/popmail/popmail-conduit.cc +++ b/conduits/popmail/popmail-conduit.cc @@ -67,7 +67,7 @@ unsigned long version_conduit_popmail = Pilot::PLUGIN_API; #include <kapplication.h> #include <kmessagebox.h> #include <ksock.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ksimpleconfig.h> #include <dcopclient.h> #include <ktempfile.h> diff --git a/conduits/popmail/setupDialog.cc b/conduits/popmail/setupDialog.cc index ea8b113..eb7a89c 100644 --- a/conduits/popmail/setupDialog.cc +++ b/conduits/popmail/setupDialog.cc @@ -37,7 +37,7 @@ #include <sys/stat.h> #include <stdlib.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <klineedit.h> #include <kaboutdata.h> @@ -46,7 +46,7 @@ #include <tqdir.h> #include <tqcombobox.h> -#include "kfiledialog.h" +#include "tdefiledialog.h" #include <kurlrequester.h> |