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 /tderesources/scalix/scalixadmin | |
| 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 'tderesources/scalix/scalixadmin')
| -rw-r--r-- | tderesources/scalix/scalixadmin/jobs.cpp | 2 | ||||
| -rw-r--r-- | tderesources/scalix/scalixadmin/jobs.h | 2 | ||||
| -rw-r--r-- | tderesources/scalix/scalixadmin/passwordpage.cpp | 2 | ||||
| -rw-r--r-- | tderesources/scalix/scalixadmin/settings.cpp | 4 | ||||
| -rw-r--r-- | tderesources/scalix/scalixadmin/settings.h | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp index 49b0a8fe..e7dd9445 100644 --- a/tderesources/scalix/scalixadmin/jobs.cpp +++ b/tderesources/scalix/scalixadmin/jobs.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kio/scheduler.h> +#include <tdeio/scheduler.h> #include <klocale.h> #include "jobs.h" diff --git a/tderesources/scalix/scalixadmin/jobs.h b/tderesources/scalix/scalixadmin/jobs.h index 0c73fb50..832db070 100644 --- a/tderesources/scalix/scalixadmin/jobs.h +++ b/tderesources/scalix/scalixadmin/jobs.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kio/job.h> +#include <tdeio/job.h> #ifndef JOBS_H #define JOBS_H diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp index 6dd8ab10..9bdc1377 100644 --- a/tderesources/scalix/scalixadmin/passwordpage.cpp +++ b/tderesources/scalix/scalixadmin/passwordpage.cpp @@ -24,7 +24,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kmessagebox.h> #include <kstringhandler.h> diff --git a/tderesources/scalix/scalixadmin/settings.cpp b/tderesources/scalix/scalixadmin/settings.cpp index 279491c5..277a0631 100644 --- a/tderesources/scalix/scalixadmin/settings.cpp +++ b/tderesources/scalix/scalixadmin/settings.cpp @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kconfig.h> -#include <kio/scheduler.h> +#include <tdeconfig.h> +#include <tdeio/scheduler.h> #include <kstringhandler.h> #include "settings.h" diff --git a/tderesources/scalix/scalixadmin/settings.h b/tderesources/scalix/scalixadmin/settings.h index 29028f3b..490b98a7 100644 --- a/tderesources/scalix/scalixadmin/settings.h +++ b/tderesources/scalix/scalixadmin/settings.h @@ -22,8 +22,8 @@ #define SETTINGS_H #include <kurl.h> -#include <kio/global.h> -#include <kio/slave.h> +#include <tdeio/global.h> +#include <tdeio/slave.h> class Settings { |