diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:12:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:12:56 -0600 |
| commit | ece35c015c54312eb13f583cc247cdd9a4051b4d (patch) | |
| tree | 2c0599b8705e881f2b53678f48e97ffe4f616d22 /lib/kross/test | |
| 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/test')
| -rw-r--r-- | lib/kross/test/testaction.h | 4 | ||||
| -rw-r--r-- | lib/kross/test/testwindow.cpp | 2 | ||||
| -rw-r--r-- | lib/kross/test/testwindow.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/kross/test/testaction.h b/lib/kross/test/testaction.h index 32e6cdcd..8e2d355e 100644 --- a/lib/kross/test/testaction.h +++ b/lib/kross/test/testaction.h @@ -26,8 +26,8 @@ #include <tqwidget.h> #include <tqstring.h> -#include <kaction.h> -#include <kactioncollection.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> class TestAction : public TQWidget { diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp index f83d7ace..4175bc9e 100644 --- a/lib/kross/test/testwindow.cpp +++ b/lib/kross/test/testwindow.cpp @@ -30,7 +30,7 @@ #include <ktextedit.h> #include <kpushbutton.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmenubar.h> #include <kstandarddirs.h> diff --git a/lib/kross/test/testwindow.h b/lib/kross/test/testwindow.h index c3da5cc5..45f14de0 100644 --- a/lib/kross/test/testwindow.h +++ b/lib/kross/test/testwindow.h @@ -28,7 +28,7 @@ //#include <tqobject.h> #include <tqstring.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> class TQComboBox; class KTextEdit; |