diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:03:10 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:03:10 -0600 |
commit | 782ea254f2b2cc59c01c9fa9c26df3262b05648a (patch) | |
tree | ea2570417efdc330ee127513e1ca90180ab59311 /keduca | |
parent | c7c2e1330f7496d86e25cd9e408ae9f62f2d9bcb (diff) | |
download | tdeedu-782ea254f2b2cc59c01c9fa9c26df3262b05648a.tar.gz tdeedu-782ea254f2b2cc59c01c9fa9c26df3262b05648a.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'keduca')
-rw-r--r-- | keduca/keduca/keduca.cpp | 2 | ||||
-rw-r--r-- | keduca/keduca/keduca_part.cpp | 2 | ||||
-rw-r--r-- | keduca/keduca/keducaprefs.cpp | 2 | ||||
-rw-r--r-- | keduca/keduca/keducaview.cpp | 4 | ||||
-rw-r--r-- | keduca/keducabuilder/kcontroladdedit.cpp | 2 | ||||
-rw-r--r-- | keduca/keducabuilder/keducabuilder.cpp | 4 | ||||
-rw-r--r-- | keduca/keducabuilder/keducaeditorstartdialog.cpp | 2 | ||||
-rw-r--r-- | keduca/libkeduca/fileread.cpp | 2 | ||||
-rw-r--r-- | keduca/libkeduca/fileread.h | 2 | ||||
-rw-r--r-- | keduca/libkeduca/kgallerydialog.cpp | 4 | ||||
-rw-r--r-- | keduca/libkeduca/kgallerydialog.h | 4 |
11 files changed, 15 insertions, 15 deletions
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index ca6de0d9..9092eb00 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -23,7 +23,7 @@ #include <kapplication.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <tdeparts/componentfactory.h> diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp index 04dd5deb..2f54eb71 100644 --- a/keduca/keduca/keduca_part.cpp +++ b/keduca/keduca/keduca_part.cpp @@ -29,7 +29,7 @@ #include <kaboutdata.h> #include <tdeparts/genericfactory.h> #include <kstdaction.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> typedef KParts::GenericFactory<KEducaPart> KEducaPartFactory; K_EXPORT_COMPONENT_FACTORY( libkeducapart, KEducaPartFactory ) diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index b2c28e34..c4b8f373 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqlayout.h> #include <tqvbox.h> diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp index 69020fe1..5ba5bda0 100644 --- a/keduca/keduca/keducaview.cpp +++ b/keduca/keduca/keducaview.cpp @@ -27,10 +27,10 @@ #include <klocale.h> #include <kstandarddirs.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kpushbutton.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqtimer.h> #include <tqlayout.h> diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp index 913f9ff7..832c59ac 100644 --- a/keduca/keducabuilder/kcontroladdedit.cpp +++ b/keduca/keducabuilder/kcontroladdedit.cpp @@ -20,7 +20,7 @@ // KDE includes #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurlrequester.h> #include <kcombobox.h> #include <knuminput.h> diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index 560677ae..3f498c51 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -25,10 +25,10 @@ #include <kiconloader.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kedittoolbar.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmessagebox.h> #include <kprinter.h> diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp index 6ff7038b..2c69c146 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.cpp +++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp @@ -21,7 +21,7 @@ #include <kurlrequester.h> #include <kmessagebox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include "keducaeditorstartdialog.h" diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp index 24d66339..94d6d95d 100644 --- a/keduca/libkeduca/fileread.cpp +++ b/keduca/libkeduca/fileread.cpp @@ -19,7 +19,7 @@ #include <assert.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <kmimetype.h> #include <kdebug.h> diff --git a/keduca/libkeduca/fileread.h b/keduca/libkeduca/fileread.h index 8a823303..9a34c1a8 100644 --- a/keduca/libkeduca/fileread.h +++ b/keduca/libkeduca/fileread.h @@ -18,7 +18,7 @@ #ifndef FILEREAD_H #define FILEREAD_H -#include <kio/job.h> +#include <tdeio/job.h> #include <tqdom.h> diff --git a/keduca/libkeduca/kgallerydialog.cpp b/keduca/libkeduca/kgallerydialog.cpp index f7e11da3..1ea3180b 100644 --- a/keduca/libkeduca/kgallerydialog.cpp +++ b/keduca/libkeduca/kgallerydialog.cpp @@ -19,10 +19,10 @@ #include "kgallerydialog.moc" #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqlineedit.h> #include <tqlistview.h> diff --git a/keduca/libkeduca/kgallerydialog.h b/keduca/libkeduca/kgallerydialog.h index 227acd3f..9be42034 100644 --- a/keduca/libkeduca/kgallerydialog.h +++ b/keduca/libkeduca/kgallerydialog.h @@ -21,8 +21,8 @@ #include "kgallerydialogbase.h" #include <kurl.h> -// #include <kio/global.h> -// #include <kio/job.h> +// #include <tdeio/global.h> +// #include <tdeio/job.h> /**Gallery *@author Javier Campos |