diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:56:40 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:56:40 -0600 |
commit | 4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e (patch) | |
tree | 8bdb18e6838f1eb1357e22b6e50b2948d33868a6 /keduca | |
parent | d5f01dcc48ac3af828089b8810ef30a245e0346b (diff) | |
download | tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.tar.gz tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'keduca')
-rw-r--r-- | keduca/keduca/keduca.cpp | 2 | ||||
-rw-r--r-- | keduca/keduca/keducaprefs.cpp | 2 | ||||
-rw-r--r-- | keduca/keduca/keducaview.cpp | 4 | ||||
-rw-r--r-- | keduca/keduca/kgroupeduca.cpp | 2 | ||||
-rw-r--r-- | keduca/keduca/kquestion.cpp | 2 | ||||
-rw-r--r-- | keduca/keducabuilder/kcontroladdedit.cpp | 2 | ||||
-rw-r--r-- | keduca/keducabuilder/kcontrolheader.cpp | 2 | ||||
-rw-r--r-- | keduca/keducabuilder/keducabuilder.cpp | 4 | ||||
-rw-r--r-- | keduca/keducabuilder/keducaeditorstartdialog.cpp | 4 | ||||
-rw-r--r-- | keduca/libkeduca/fileread.cpp | 2 | ||||
-rw-r--r-- | keduca/libkeduca/kgallerydialog.cpp | 4 |
11 files changed, 15 insertions, 15 deletions
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index bf3a96d5..ed021225 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -21,7 +21,7 @@ #include "../libkeduca/kgallerydialog.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdefiledialog.h> #include <kdebug.h> diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index c4b8f373..c8f3ce0d 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -18,7 +18,7 @@ #include "keducaprefs.h" #include "keducaprefs.moc" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeconfig.h> diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp index 5ba5bda0..a5e5c22b 100644 --- a/keduca/keduca/keducaview.cpp +++ b/keduca/keduca/keducaview.cpp @@ -24,9 +24,9 @@ #include <stdlib.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <kpushbutton.h> #include <kdebug.h> diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp index 3c3482fc..a6637ef6 100644 --- a/keduca/keduca/kgroupeduca.cpp +++ b/keduca/keduca/kgroupeduca.cpp @@ -20,7 +20,7 @@ #include "kcheckeduca.h" #include "tderadioeduca.h" -#include <klocale.h> +#include <tdelocale.h> KGroupEduca::KGroupEduca(TQWidget *parent, const char *name ) : TQVButtonGroup(i18n("Answers"), parent, name) { diff --git a/keduca/keduca/kquestion.cpp b/keduca/keduca/kquestion.cpp index 7b549168..46a8322f 100644 --- a/keduca/keduca/kquestion.cpp +++ b/keduca/keduca/kquestion.cpp @@ -25,7 +25,7 @@ #include <tqtimer.h> #include <kprogress.h> -#include <klocale.h> +#include <tdelocale.h> KQuestion::KQuestion( TQWidget *parent, const char *name ) : TQHBox( parent, name ), _countdownTimer( 0 ) diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp index 1646e249..190c561a 100644 --- a/keduca/keducabuilder/kcontroladdedit.cpp +++ b/keduca/keducabuilder/kcontroladdedit.cpp @@ -19,7 +19,7 @@ #include "kcontroladdedit.moc" // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kurlrequester.h> #include <kcombobox.h> diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index ee9b6e35..197a552f 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -18,7 +18,7 @@ #include "kcontrolheader.h" #include "kcontrolheader.moc" -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> #include <klineedit.h> diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index 1d2eb280..3550b9b7 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -24,12 +24,12 @@ #include "../libkeduca/kgallerydialog.h" #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kedittoolbar.h> #include <kdebug.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprinter.h> #include <tqlayout.h> diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp index 34d6a82c..b75d4f40 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.cpp +++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp @@ -19,8 +19,8 @@ #include <kdebug.h> #include <kurlrequester.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kcombobox.h> diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp index 94d6d95d..8ba07b50 100644 --- a/keduca/libkeduca/fileread.cpp +++ b/keduca/libkeduca/fileread.cpp @@ -23,7 +23,7 @@ #include <kstandarddirs.h> #include <kmimetype.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqfileinfo.h> #include <tqpixmap.h> diff --git a/keduca/libkeduca/kgallerydialog.cpp b/keduca/libkeduca/kgallerydialog.cpp index 1ea3180b..f4f8f03d 100644 --- a/keduca/libkeduca/kgallerydialog.cpp +++ b/keduca/libkeduca/kgallerydialog.cpp @@ -20,8 +20,8 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <tqlineedit.h> |