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 /kwordquiz | |
| 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 'kwordquiz')
| -rw-r--r-- | kwordquiz/src/kwordquiz.cpp | 4 | ||||
| -rw-r--r-- | kwordquiz/src/kwordquiz.h | 4 | ||||
| -rw-r--r-- | kwordquiz/src/kwordquizprefs.cpp | 2 | ||||
| -rw-r--r-- | kwordquiz/src/prefcardappearance.cpp | 2 | ||||
| -rw-r--r-- | kwordquiz/src/prefcardappearancebase.ui | 2 | ||||
| -rw-r--r-- | kwordquiz/src/qaview.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index a55ea93e..4206a476 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -27,8 +27,8 @@ #include <klocale.h> #include <kedittoolbar.h> #include <kstandarddirs.h> //locate -#include <kfontdialog.h> -#include <kpopupmenu.h> +#include <tdefontdialog.h> +#include <tdepopupmenu.h> #include <knotifydialog.h> #include <kiconloader.h> //#include <keduvocdata.h> diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index 86d4772b..56d305ff 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -28,8 +28,8 @@ // include files for KDE #include <kapplication.h> -#include <kmainwindow.h> -#include <kaction.h> +#include <tdemainwindow.h> +#include <tdeaction.h> #include <kdirwatch.h> #include <kurl.h> diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp index b96c66f6..1047a280 100644 --- a/kwordquiz/src/kwordquizprefs.cpp +++ b/kwordquiz/src/kwordquizprefs.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <tdeconfigskeleton.h> #include <kcolorbutton.h> -#include <kfontrequester.h> +#include <tdefontrequester.h> #include "kwordquizprefs.h" #include "prefeditor.h" diff --git a/kwordquiz/src/prefcardappearance.cpp b/kwordquiz/src/prefcardappearance.cpp index e2e08f2a..ae968059 100644 --- a/kwordquiz/src/prefcardappearance.cpp +++ b/kwordquiz/src/prefcardappearance.cpp @@ -12,7 +12,7 @@ #include <tqwidgetstack.h> #include <tqlabel.h> -#include <kfontrequester.h> +#include <tdefontrequester.h> #include <kcolorbutton.h> #include <klocale.h> diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui index 257c246a..31adb29d 100644 --- a/kwordquiz/src/prefcardappearancebase.ui +++ b/kwordquiz/src/prefcardappearancebase.ui @@ -545,7 +545,7 @@ <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> - <includehint>kfontrequester.h</includehint> + <includehint>tdefontrequester.h</includehint> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kwordquiz/src/qaview.h b/kwordquiz/src/qaview.h index 0b293a72..1deb4049 100644 --- a/kwordquiz/src/qaview.h +++ b/kwordquiz/src/qaview.h @@ -19,7 +19,7 @@ #ifndef TQAVIEW_H #define TQAVIEW_H -#include <kaction.h> +#include <tdeaction.h> #include "qaviewbase.h" |