From 64df902cf71a8ee258fb85f6be26248f399aa01f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:05:15 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- wizards/egroupwareconfig.kcfgc | 2 +- wizards/egroupwarewizard.h | 2 +- wizards/exchangewizard.h | 2 +- wizards/groupwiseconfig.kcfgc | 2 +- wizards/groupwisewizard.h | 2 +- wizards/kmailchanges.h | 4 ++-- wizards/kolabconfig.kcfgc | 2 +- wizards/kolabkmailchanges.cpp | 2 +- wizards/kolabkmailchanges.h | 2 +- wizards/kolabwizard.h | 2 +- wizards/scalixconfig.kcfgc | 2 +- wizards/scalixkmailchanges.cpp | 2 +- wizards/scalixkmailchanges.h | 2 +- wizards/scalixwizard.h | 2 +- wizards/servertype.h | 2 +- wizards/sloxconfig.kcfgc | 2 +- wizards/sloxwizard.h | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) (limited to 'wizards') diff --git a/wizards/egroupwareconfig.kcfgc b/wizards/egroupwareconfig.kcfgc index 47927939..5869e009 100644 --- a/wizards/egroupwareconfig.kcfgc +++ b/wizards/egroupwareconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=egroupware.kcfg ClassName=EGroupwareConfig Singleton=true diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h index 2a920467..431c61d3 100644 --- a/wizards/egroupwarewizard.h +++ b/wizards/egroupwarewizard.h @@ -21,7 +21,7 @@ #ifndef EGROUPWAREWIZARD_H #define EGROUPWAREWIZARD_H -#include +#include #include class KLineEdit; diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h index f453356d..ffa35d02 100644 --- a/wizards/exchangewizard.h +++ b/wizards/exchangewizard.h @@ -20,7 +20,7 @@ #ifndef EXCHANGEWIZARD_H #define EXCHANGEWIZARD_H -#include +#include #include class KLineEdit; diff --git a/wizards/groupwiseconfig.kcfgc b/wizards/groupwiseconfig.kcfgc index 09231e2e..8034a0ec 100644 --- a/wizards/groupwiseconfig.kcfgc +++ b/wizards/groupwiseconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=groupwise.kcfg ClassName=GroupwiseConfig Singleton=true diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h index 073de386..7960a39b 100644 --- a/wizards/groupwisewizard.h +++ b/wizards/groupwisewizard.h @@ -20,7 +20,7 @@ #ifndef GROUPWISEWIZARD_H #define GROUPWISEWIZARD_H -#include +#include #include class KLineEdit; diff --git a/wizards/kmailchanges.h b/wizards/kmailchanges.h index f238b362..3fc412a1 100644 --- a/wizards/kmailchanges.h +++ b/wizards/kmailchanges.h @@ -22,8 +22,8 @@ #ifndef KMAILCHANGES_H #define KMAILCHANGES_H -#include -#include +#include +#include namespace KWallet { class Wallet; diff --git a/wizards/kolabconfig.kcfgc b/wizards/kolabconfig.kcfgc index 4c265d26..c2177b86 100644 --- a/wizards/kolabconfig.kcfgc +++ b/wizards/kolabconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kolab.kcfg ClassName=KolabConfig Singleton=true diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp index 0adfc46b..6227383f 100644 --- a/wizards/kolabkmailchanges.cpp +++ b/wizards/kolabkmailchanges.cpp @@ -25,7 +25,7 @@ #include "kmailchanges.h" #include -#include +#include #include class KolabCustomWriter : public CreateDisconnectedImapAccount::CustomWriter diff --git a/wizards/kolabkmailchanges.h b/wizards/kolabkmailchanges.h index 74d07691..c4c9ad89 100644 --- a/wizards/kolabkmailchanges.h +++ b/wizards/kolabkmailchanges.h @@ -21,7 +21,7 @@ #ifndef KOLABKMAILCHANGES_H #define KOLABKMAILCHANGES_H -#include +#include void createKMailChanges( TDEConfigPropagator::Change::List& ); diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h index eec25233..99fd0c0d 100644 --- a/wizards/kolabwizard.h +++ b/wizards/kolabwizard.h @@ -22,7 +22,7 @@ #ifndef KOLABWIZARD_H #define KOLABWIZARD_H -#include +#include #include class KLineEdit; diff --git a/wizards/scalixconfig.kcfgc b/wizards/scalixconfig.kcfgc index f4893ca0..82be4432 100644 --- a/wizards/scalixconfig.kcfgc +++ b/wizards/scalixconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=scalix.kcfg ClassName=ScalixConfig Singleton=true diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp index 4926678e..89ea65d5 100644 --- a/wizards/scalixkmailchanges.cpp +++ b/wizards/scalixkmailchanges.cpp @@ -25,7 +25,7 @@ #include "kmailchanges.h" #include -#include +#include #include class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter diff --git a/wizards/scalixkmailchanges.h b/wizards/scalixkmailchanges.h index 91ae7b30..e3f23aa1 100644 --- a/wizards/scalixkmailchanges.h +++ b/wizards/scalixkmailchanges.h @@ -21,7 +21,7 @@ #ifndef SCALIXKMAILCHANGES_H #define SCALIXKMAILCHANGES_H -#include +#include void createKMailChanges( TDEConfigPropagator::Change::List& ); diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h index 6ff44b05..273f6c4a 100644 --- a/wizards/scalixwizard.h +++ b/wizards/scalixwizard.h @@ -22,7 +22,7 @@ #ifndef SCALIXWIZARD_H #define SCALIXWIZARD_H -#include +#include #include class KComboBox; diff --git a/wizards/servertype.h b/wizards/servertype.h index c7d8e7ea..700de0e8 100644 --- a/wizards/servertype.h +++ b/wizards/servertype.h @@ -22,7 +22,7 @@ #ifndef SERVERTYPE #define SERVERTYPE -#include +#include #include #include diff --git a/wizards/sloxconfig.kcfgc b/wizards/sloxconfig.kcfgc index be275788..5ca5414c 100644 --- a/wizards/sloxconfig.kcfgc +++ b/wizards/sloxconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=slox.kcfg ClassName=SloxConfig Singleton=true diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h index f43525d1..d9b24c60 100644 --- a/wizards/sloxwizard.h +++ b/wizards/sloxwizard.h @@ -20,7 +20,7 @@ #ifndef SLOXWIZARD_H #define SLOXWIZARD_H -#include +#include #include class KLineEdit; -- cgit v1.2.3