diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:20:21 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:20:21 -0600 |
commit | fccf6d244a4d60c3138afa81266e22ac65adddbc (patch) | |
tree | ce62ccdaca3fffebeb33ad213dc5cea82ceff580 /kiten | |
parent | 273ccce287bccee117bbfff8ca3386d613aec467 (diff) | |
download | tdeedu-fccf6d244a4d60c3138afa81266e22ac65adddbc.tar.gz tdeedu-fccf6d244a4d60c3138afa81266e22ac65adddbc.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kiten')
-rw-r--r-- | kiten/configdictionaries.cpp | 2 | ||||
-rw-r--r-- | kiten/configdictionariesbase.ui | 4 | ||||
-rw-r--r-- | kiten/configfont.ui | 2 | ||||
-rw-r--r-- | kiten/kiten.cpp | 4 | ||||
-rw-r--r-- | kiten/learn.cpp | 4 | ||||
-rw-r--r-- | kiten/main.cpp | 2 | ||||
-rw-r--r-- | kiten/optiondialog.cpp | 2 | ||||
-rw-r--r-- | kiten/rad.cpp | 2 | ||||
-rw-r--r-- | kiten/widgets.cpp | 4 | ||||
-rw-r--r-- | kiten/widgets.h | 4 |
10 files changed, 15 insertions, 15 deletions
diff --git a/kiten/configdictionaries.cpp b/kiten/configdictionaries.cpp index e6ec117d..c7edcc80 100644 --- a/kiten/configdictionaries.cpp +++ b/kiten/configdictionaries.cpp @@ -19,7 +19,7 @@ **/ #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdefiledialog.h> #include <tqpushbutton.h> #include <tqstringlist.h> diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui index 77bb52ad..1df05174 100644 --- a/kiten/configdictionariesbase.ui +++ b/kiten/configdictionariesbase.ui @@ -307,7 +307,7 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kiten/configfont.ui b/kiten/configfont.ui index 90b5ac72..c439108a 100644 --- a/kiten/configfont.ui +++ b/kiten/configfont.ui @@ -28,6 +28,6 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>kfontdialog.h</includehint> + <includehint>tdefontdialog.h</includehint> </includehints> </UI> diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index c5609c21..d952285d 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -19,7 +19,7 @@ USA **/ -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdeconfig.h> #include <tdeconfigdialog.h> @@ -30,7 +30,7 @@ #include <kiconloader.h> #include <kkeydialog.h> #include <klocale.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kstandarddirs.h> #include <kstatusbar.h> diff --git a/kiten/learn.cpp b/kiten/learn.cpp index cc85487e..0a76d8ec 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -19,11 +19,11 @@ USA **/ -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kpushbutton.h> diff --git a/kiten/main.cpp b/kiten/main.cpp index e391ec50..25f8e54c 100644 --- a/kiten/main.cpp +++ b/kiten/main.cpp @@ -22,7 +22,7 @@ #include <kcmdlineargs.h> #include <kaboutdata.h> #include <kapplication.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqsqlpropertymap.h> #include "kiten.h" diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp index ae97a29c..cba25ffc 100644 --- a/kiten/optiondialog.cpp +++ b/kiten/optiondialog.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <kapplication.h> #include <tqvgroupbox.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <tqtextcodec.h> #include <klocale.h> #include <tqcombobox.h> diff --git a/kiten/rad.cpp b/kiten/rad.cpp index 602cdf6a..49f300f0 100644 --- a/kiten/rad.cpp +++ b/kiten/rad.cpp @@ -23,7 +23,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> #include <kmessagebox.h> #include <kpushbutton.h> diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp index 9a278ecb..506cde60 100644 --- a/kiten/widgets.cpp +++ b/kiten/widgets.cpp @@ -19,10 +19,10 @@ USA **/ -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdeconfig.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kprinter.h> diff --git a/kiten/widgets.h b/kiten/widgets.h index 1bf0782a..44ae4447 100644 --- a/kiten/widgets.h +++ b/kiten/widgets.h @@ -23,9 +23,9 @@ #include <tqguardedptr.h> -#include <kaction.h> +#include <tdeaction.h> #include <klineedit.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <ktextbrowser.h> class TDEListView; |