diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:16:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:16:24 -0600 |
| commit | 28ae138d6e8936bab8c737400ac44682d48c9196 (patch) | |
| tree | 781886ea1014318aad1524a151a3d7c042823ede | |
| parent | 7f0e392c1178ae0c8a8673f115c69f8d72d9023a (diff) | |
| download | tde-systemsettings-28ae138d6e8936bab8c737400ac44682d48c9196.tar.gz tde-systemsettings-28ae138d6e8936bab8c737400ac44682d48c9196.zip | |
Rename many classes and header files to avoid conflicts with KDE4
| -rw-r--r-- | systemsettings/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | systemsettings/mainwindow.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/systemsettings/mainwindow.cpp b/systemsettings/mainwindow.cpp index 09e267b..4369298 100644 --- a/systemsettings/mainwindow.cpp +++ b/systemsettings/mainwindow.cpp @@ -24,7 +24,7 @@ #include <tqwhatsthis.h> #include <tqlabel.h> #include <tqvbox.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqtoolbutton.h> #include <klocale.h> #include <kservicegroup.h> @@ -41,8 +41,8 @@ #include <tdecmoduleproxy.h> #include <kbugreport.h> #include <kmenubar.h> -#include <kactionclasses.h> -#include <ktoolbarbutton.h> +#include <tdeactionclasses.h> +#include <tdetoolbarbutton.h> #include <tqtabbar.h> #include "kcmsearch.h" diff --git a/systemsettings/mainwindow.h b/systemsettings/mainwindow.h index 949fdeb..b08db07 100644 --- a/systemsettings/mainwindow.h +++ b/systemsettings/mainwindow.h @@ -21,12 +21,12 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tdecmoduleinfo.h> #include <ktabwidget.h> #include <tqptrdict.h> #include <tqlabel.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <kiconviewsearchline.h> #include "kcscrollview.h" |