diff options
| author | Darrell Anderson <[email protected]> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdeprint/tests | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeprint/tests')
| -rw-r--r-- | tdeprint/tests/drawdemo.cpp | 4 | ||||
| -rw-r--r-- | tdeprint/tests/helpwindow.cpp | 6 | ||||
| -rw-r--r-- | tdeprint/tests/helpwindow.h | 4 | ||||
| -rw-r--r-- | tdeprint/tests/main.cpp | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp index 443cc89e8..71d4a0680 100644 --- a/tdeprint/tests/drawdemo.cpp +++ b/tdeprint/tests/drawdemo.cpp @@ -14,7 +14,7 @@ #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqbuttongroup.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tqapplication.h> #include <math.h> @@ -245,7 +245,7 @@ void DrawView::resizeEvent( TQResizeEvent * ) int main( int argc, char **argv ) { - KApplication app( argc, argv, "drawdemo" ); + TDEApplication app( argc, argv, "drawdemo" ); DrawView draw; app.setMainWidget( &draw ); draw.show(); diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp index 9f92734f4..54d160c73 100644 --- a/tdeprint/tests/helpwindow.cpp +++ b/tdeprint/tests/helpwindow.cpp @@ -13,8 +13,8 @@ #include <tqstatusbar.h> #include <tqpixmap.h> #include <tqpopupmenu.h> -#include <kmenubar.h> -#include <ktoolbar.h> +#include <tdemenubar.h> +#include <tdetoolbar.h> #include <kstatusbar.h> #include <tqtoolbutton.h> #include <tqiconset.h> @@ -39,7 +39,7 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, TQWidget* parent, const char *name ) - : KMainWindow( parent, name, WDestructiveClose ), + : TDEMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL() { readHistory(); diff --git a/tdeprint/tests/helpwindow.h b/tdeprint/tests/helpwindow.h index c444b8144..2ff3d3649 100644 --- a/tdeprint/tests/helpwindow.h +++ b/tdeprint/tests/helpwindow.h @@ -11,7 +11,7 @@ #ifndef HELPWINDOW_H #define HELPWINDOW_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqtextbrowser.h> #include <tqstringlist.h> #include <tqmap.h> @@ -20,7 +20,7 @@ class TQComboBox; class TQPopupMenu; -class HelpWindow : public KMainWindow +class HelpWindow : public TDEMainWindow { Q_OBJECT public: diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp index a1dc6b5e0..d714bcdf6 100644 --- a/tdeprint/tests/main.cpp +++ b/tdeprint/tests/main.cpp @@ -9,7 +9,7 @@ *****************************************************************************/ #include "helpwindow.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <tqwindowsstyle.h> #include <tqstylesheet.h> #include <stdlib.h> @@ -17,7 +17,7 @@ int main( int argc, char ** argv ) { - KApplication a(argc, argv, "helpviewer"); + TDEApplication a(argc, argv, "helpviewer"); TQString home; if (argc > 1) |