summaryrefslogtreecommitdiffstats
path: root/tdeui/tests/kdockwidgettest.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
commit7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch)
treec76702a7f6310fbe9d437e347535422e836e94e9 /tdeui/tests/kdockwidgettest.cpp
parenta2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff)
parent27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff)
downloadtdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz
tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeui/tests/kdockwidgettest.cpp')
-rw-r--r--tdeui/tests/kdockwidgettest.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp
index 74d8ecac4..aacac19a0 100644
--- a/tdeui/tests/kdockwidgettest.cpp
+++ b/tdeui/tests/kdockwidgettest.cpp
@@ -15,11 +15,11 @@
#include "kdockwidgettest.h"
#include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kiconloader.h>
#include <kstatusbar.h>
-#include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdemenubar.h>
+#include <tdetoolbar.h>
#include <tqvbox.h>
static const char*folder[]={
@@ -184,7 +184,7 @@ void DockApplication::initMenuBar()
void DockApplication::initToolBars()
{
TQPixmap p(folder);
- KToolBar* tool_bar_0 = toolBar(0);
+ TDEToolBar* tool_bar_0 = toolBar(0);
tool_bar_0->setFullSize(false);
tool_bar_0->insertButton( p, 1 );
tool_bar_0->insertButton(p, 2 );
@@ -242,7 +242,7 @@ void DockApplication::gSetPix2() {
}
int main(int argc, char* argv[]) {
- KApplication a(argc,argv, "kdockdemoapp1");
+ TDEApplication a(argc,argv, "kdockdemoapp1");
DockApplication* ap = new DockApplication("DockWidget demo");
ap->setCaption("DockWidget demo");
a.setMainWidget(ap);