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 /klettres | |
| 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 'klettres')
| -rw-r--r-- | klettres/klettres/fontsdlg.ui | 2 | ||||
| -rw-r--r-- | klettres/klettres/klettres.cpp | 6 | ||||
| -rw-r--r-- | klettres/klettres/klettres.h | 2 | ||||
| -rw-r--r-- | klettres/klettres/klnewstuff.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/klettres/klettres/fontsdlg.ui b/klettres/klettres/fontsdlg.ui index 181b9a1b..6bb42517 100644 --- a/klettres/klettres/fontsdlg.ui +++ b/klettres/klettres/fontsdlg.ui @@ -33,6 +33,6 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>kfontdialog.h</includehint> + <includehint>tdefontdialog.h</includehint> </includehints> </UI> diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index eaba8fc2..533a7714 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -29,7 +29,7 @@ #include <tqwhatsthis.h> //KDE includes -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcombobox.h> #include <tdeconfigdialog.h> @@ -40,8 +40,8 @@ #include <knuminput.h> #include <kstandarddirs.h> #include <kstatusbar.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> //Project includes #include "klnewstuff.h" #include "klettres.h" diff --git a/klettres/klettres/klettres.h b/klettres/klettres/klettres.h index 02ff5197..6814723f 100644 --- a/klettres/klettres/klettres.h +++ b/klettres/klettres/klettres.h @@ -26,7 +26,7 @@ #include <config.h> #endif -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "klettresview.h" #include "soundfactory.h" diff --git a/klettres/klettres/klnewstuff.cpp b/klettres/klettres/klnewstuff.cpp index 18bca5fd..b2a8a50d 100644 --- a/klettres/klettres/klnewstuff.cpp +++ b/klettres/klettres/klnewstuff.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <ktar.h> #include <tqdir.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kstandarddirs.h> #include "klnewstuff.h" |