diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
| commit | ece35c015c54312eb13f583cc247cdd9a4051b4d (patch) | |
| tree | 2c0599b8705e881f2b53678f48e97ffe4f616d22 /lib/kross/main | |
| parent | c260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff) | |
| download | koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/kross/main')
| -rw-r--r-- | lib/kross/main/mainmodule.h | 2 | ||||
| -rw-r--r-- | lib/kross/main/scriptaction.h | 2 | ||||
| -rw-r--r-- | lib/kross/main/scriptguiclient.cpp | 2 | ||||
| -rw-r--r-- | lib/kross/main/wdgscriptsmanager.cpp | 4 | ||||
| -rw-r--r-- | lib/kross/main/wdgscriptsmanagerbase.ui | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/lib/kross/main/mainmodule.h b/lib/kross/main/mainmodule.h index 06a4836d..6465a070 100644 --- a/lib/kross/main/mainmodule.h +++ b/lib/kross/main/mainmodule.h @@ -34,7 +34,7 @@ #include <tqobject.h> #include <ksharedptr.h> -#include <kaction.h> +#include <tdeaction.h> namespace Kross { namespace Api { diff --git a/lib/kross/main/scriptaction.h b/lib/kross/main/scriptaction.h index 4d60d4dc..ce6544bc 100644 --- a/lib/kross/main/scriptaction.h +++ b/lib/kross/main/scriptaction.h @@ -21,7 +21,7 @@ #define KROSS_API_SCRIPTACTION_H #include <tqdom.h> -#include <kaction.h> +#include <tdeaction.h> #include "scriptcontainer.h" diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index 9dd304ae..ae449a42 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -23,7 +23,7 @@ #include "wdgscriptsmanager.h" #include <kapplication.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kmimetype.h> #include <kmessagebox.h> diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index de653fbd..4cbae081 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -28,12 +28,12 @@ #include <tdeversion.h> #include <tdefiledialog.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kpushbutton.h> #include <kstandarddirs.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #if KDE_IS_VERSION(3, 4, 0) // The KNewStuffSecure we use internaly for the GetHotNewStuff-functionality diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui index 116b1ca3..1c9e7247 100644 --- a/lib/kross/main/wdgscriptsmanagerbase.ui +++ b/lib/kross/main/wdgscriptsmanagerbase.ui @@ -213,7 +213,7 @@ <customwidgets> <customwidget> <class>TDEToolBar</class> - <header location="local">ktoolbar.h</header> + <header location="local">tdetoolbar.h</header> <sizehint> <width>20</width> <height>100</height> @@ -235,8 +235,8 @@ </images> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>ktoolbar.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdetoolbar.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> |