From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:21:02 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- tdeui/AUTHORS | 2 +- tdeui/kaction.cpp | 2 +- tdeui/kdetrayproxy/kdetrayproxy.cpp | 2 +- tdeui/kiconview.cpp | 8 ++++---- tdeui/kkeydialog.cpp | 2 +- tdeui/klistbox.cpp | 8 ++++---- tdeui/klistview.cpp | 12 ++++++------ tdeui/kmainwindow.cpp | 8 ++++---- tdeui/kmainwindow.h | 18 +++++++++--------- tdeui/kmessagebox.cpp | 2 +- tdeui/kmessagebox.h | 2 +- tdeui/kpanelapplet.h | 2 +- tdeui/kpanelextension.h | 2 +- tdeui/ktoolbar.h | 2 +- tdeui/ktoolbarbutton.cpp | 2 +- tdeui/tests/itemcontainertest.cpp | 4 ++-- tdeui/tests/kaboutdialogtest.cpp | 2 +- tdeui/tests/kactiontest.cpp | 2 +- tdeui/tests/kblendtest.cpp | 2 +- tdeui/tests/kbuttonboxtest.cpp | 2 +- tdeui/tests/kcharselecttest.cpp | 2 +- tdeui/tests/kcolordlgtest.cpp | 2 +- tdeui/tests/kcolortest.cpp | 2 +- tdeui/tests/kcomboboxtest.cpp | 2 +- tdeui/tests/kcompletiontest.cpp | 2 +- tdeui/tests/kdatepicktest.cpp | 2 +- tdeui/tests/kdatetimewidgettest.cpp | 2 +- tdeui/tests/kdatewidgettest.cpp | 2 +- tdeui/tests/kdesattest.cpp | 2 +- tdeui/tests/kdialogbasetest.cpp | 2 +- tdeui/tests/kdocktest.cpp | 2 +- tdeui/tests/kdockwidgetdemo.cpp | 2 +- tdeui/tests/kdockwidgettest.cpp | 2 +- tdeui/tests/kdualcolortest.cpp | 2 +- tdeui/tests/keditlistboxtest.cpp | 2 +- tdeui/tests/kedittest.cpp | 2 +- tdeui/tests/kfontdialogtest.cpp | 2 +- tdeui/tests/kgradienttest.cpp | 2 +- tdeui/tests/khashtest.cpp | 2 +- tdeui/tests/kinputdialogtest.cpp | 2 +- tdeui/tests/kjanuswidgettest.cpp | 2 +- tdeui/tests/kledtest.cpp | 2 +- tdeui/tests/klineeditdlgtest.cpp | 2 +- tdeui/tests/klineedittest.cpp | 4 ++-- tdeui/tests/klistviewtest.cpp | 2 +- tdeui/tests/kmainwindowrestoretest.cpp | 2 +- tdeui/tests/kmainwindowtest.cpp | 2 +- tdeui/tests/kmessageboxtest.cpp | 2 +- tdeui/tests/knuminputtest.cpp | 4 ++-- tdeui/tests/kpalettetest.cpp | 2 +- tdeui/tests/kpanelmenutest.cpp | 2 +- tdeui/tests/kpixmapregionselectordialogtest.cpp | 2 +- tdeui/tests/kpopuptest.cpp | 2 +- tdeui/tests/kprogresstest.cpp | 2 +- tdeui/tests/krulertest.cpp | 4 ++-- tdeui/tests/kspelltest.cpp | 2 +- tdeui/tests/ksqueezedtextlabeltest.cpp | 2 +- tdeui/tests/kstatusbartest.cpp | 6 +++--- tdeui/tests/ksystemtraytest.cpp | 2 +- tdeui/tests/ktabctltest.cpp | 4 ++-- tdeui/tests/ktabwidgettest.cpp | 2 +- tdeui/tests/ktextedittest.cpp | 2 +- tdeui/tests/ktimewidgettest.cpp | 2 +- tdeui/tests/ktoolbarlabelactiontest.cpp | 2 +- tdeui/tests/kunbalancedgrdtest.cpp | 2 +- tdeui/tests/kwizardtest.cpp | 2 +- tdeui/tests/kwordwraptest.cpp | 2 +- tdeui/tests/kxmlguitest.cpp | 2 +- tdeui/tests/twindowtest.cpp | 8 ++++---- 69 files changed, 101 insertions(+), 101 deletions(-) (limited to 'tdeui') diff --git a/tdeui/AUTHORS b/tdeui/AUTHORS index 9e7ce9592..7d64d96b1 100644 --- a/tdeui/AUTHORS +++ b/tdeui/AUTHORS @@ -10,7 +10,7 @@ Maintainer of KPixmapEffect, KStyle, KThemeStyle, and KThemeBase - as well as general misc coding here and there. Matthias Kalle Dalheimer : -classes KApplication, KConfig, KTextStream, KColorSet, +classes TDEApplication, KConfig, KTextStream, KColorSet, automake, autoconf, maintenance Richard Moore : diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp index 270c00ec4..4937b3a87 100644 --- a/tdeui/kaction.cpp +++ b/tdeui/kaction.cpp @@ -1133,7 +1133,7 @@ void KAction::slotPopupActivated() state = kpm->state(); else { // just a QPopupMenu? We'll ask for the state now then (small race condition?) kdDebug(129) << "KAction::slotPopupActivated not a KPopupMenu -> using keyboardMouseState()" << endl; - state = KApplication::keyboardMouseState(); + state = TDEApplication::keyboardMouseState(); } emit activated( KAction::PopupMenuActivation, state ); slotActivated(); diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp index c13d87b27..f1e6995ee 100644 --- a/tdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp @@ -186,7 +186,7 @@ void KDETrayProxy::withdrawWindow( Window w ) int main( int argc, char* argv[] ) { TDECmdLineArgs::init( argc, argv, "a", "b", "c", "d" ); - KApplication app( false ); // no styles + TDEApplication app( false ); // no styles app.disableSessionManagement(); KDETrayProxy proxy; return app.exec(); diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp index a26519729..0392f7d50 100644 --- a/tdeui/kiconview.cpp +++ b/tdeui/kiconview.cpp @@ -65,7 +65,7 @@ KIconView::KIconView( TQWidget *parent, const char *name, WFlags f ) this, TQT_SLOT( slotOnViewport() ) ); connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) ); - slotSettingsChanged( KApplication::SETTINGS_MOUSE ); + slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); if ( kapp ) { // maybe null when used inside designer connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); @@ -123,7 +123,7 @@ void KIconView::slotOnViewport() void KIconView::slotSettingsChanged(int category) { - if ( category != KApplication::SETTINGS_MOUSE ) + if ( category != TDEApplication::SETTINGS_MOUSE ) return; m_bUseSingle = KGlobalSettings::singleClick(); //kdDebug() << "KIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl; @@ -167,7 +167,7 @@ void KIconView::slotAutoSelect() if( !hasFocus() ) setFocus(); - ButtonState keybstate = KApplication::keyboardMouseState(); + ButtonState keybstate = TDEApplication::keyboardMouseState(); TQIconViewItem* previousItem = currentItem(); setCurrentItem( m_pCurrentItem ); @@ -243,7 +243,7 @@ void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos ) return; } - ButtonState keybstate = KApplication::keyboardMouseState(); + ButtonState keybstate = TDEApplication::keyboardMouseState(); m_pAutoSelect->stop(); diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index 0518d870c..6d197d813 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -595,7 +595,7 @@ void KKeyChooser::readGlobalKeys( TQMap< TQString, KShortcut >& map ) void KKeyChooser::slotSettingsChanged( int category ) { - if( category == KApplication::SETTINGS_SHORTCUTS ) + if( category == TDEApplication::SETTINGS_SHORTCUTS ) readGlobalKeys(); // reread } diff --git a/tdeui/klistbox.cpp b/tdeui/klistbox.cpp index 13c5ab325..04705ad36 100644 --- a/tdeui/klistbox.cpp +++ b/tdeui/klistbox.cpp @@ -34,7 +34,7 @@ KListBox::KListBox( TQWidget *parent, const char *name, WFlags f ) this, TQT_SLOT( slotOnViewport() ) ); connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ), this, TQT_SLOT( slotOnItem( TQListBoxItem * ) ) ); - slotSettingsChanged(KApplication::SETTINGS_MOUSE); + slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) { connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); @@ -71,7 +71,7 @@ void KListBox::slotOnViewport() void KListBox::slotSettingsChanged(int category) { - if (category != KApplication::SETTINGS_MOUSE) + if (category != TDEApplication::SETTINGS_MOUSE) return; m_bUseSingle = KGlobalSettings::singleClick(); @@ -116,7 +116,7 @@ void KListBox::slotAutoSelect() if( !hasFocus() ) setFocus(); - ButtonState keybstate = KApplication::keyboardMouseState(); + ButtonState keybstate = TDEApplication::keyboardMouseState(); TQListBoxItem* previousItem = item( currentItem() ); setCurrentItem( m_pCurrentItem ); @@ -178,7 +178,7 @@ void KListBox::slotAutoSelect() void KListBox::emitExecute( TQListBoxItem *item, const TQPoint &pos ) { - ButtonState keybstate = KApplication::keyboardMouseState(); + ButtonState keybstate = TDEApplication::keyboardMouseState(); m_pAutoSelect->stop(); diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp index b52fe6876..29f255c3a 100644 --- a/tdeui/klistview.cpp +++ b/tdeui/klistview.cpp @@ -438,7 +438,7 @@ KListView::KListView( TQWidget *parent, const char *name ) connect (this, TQT_SIGNAL(contentsMoving(int,int)), this, TQT_SLOT(cleanItemHighlighter())); - slotSettingsChanged(KApplication::SETTINGS_MOUSE); + slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) { connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); @@ -543,7 +543,7 @@ void KListView::slotSettingsChanged(int category) { switch (category) { - case KApplication::SETTINGS_MOUSE: + case TDEApplication::SETTINGS_MOUSE: d->dragDelay = KGlobalSettings::dndEventDelay(); d->bUseSingle = KGlobalSettings::singleClick(); @@ -563,7 +563,7 @@ void KListView::slotSettingsChanged(int category) break; - case KApplication::SETTINGS_POPUPMENU: + case TDEApplication::SETTINGS_POPUPMENU: d->contextMenuKey = KGlobalSettings::contextMenuKey (); d->showContextMenusOnPress = KGlobalSettings::showContextMenusOnPress (); @@ -604,7 +604,7 @@ void KListView::slotAutoSelect() if( !hasFocus() ) setFocus(); - ButtonState keybstate = KApplication::keyboardMouseState(); + ButtonState keybstate = TDEApplication::keyboardMouseState(); TQListViewItem* previousItem = currentItem(); setCurrentItem( d->pCurrentItem ); @@ -646,7 +646,7 @@ void KListView::slotAutoSelect() if( selectionMode() == TQListView::Single ) emit selectionChanged( d->pCurrentItem ); } - else if( (keybstate & KApplication::ControlModifier) ) + else if( (keybstate & TDEApplication::ControlModifier) ) setSelected( d->pCurrentItem, !d->pCurrentItem->isSelected() ); else { bool block = signalsBlocked(); @@ -691,7 +691,7 @@ void KListView::emitExecute( TQListViewItem *item, const TQPoint &pos, int c ) } else { - ButtonState keybstate = KApplication::keyboardMouseState(); + ButtonState keybstate = TDEApplication::keyboardMouseState(); d->autoSelect.stop(); diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp index ffb59588b..5d2a1e705 100644 --- a/tdeui/kmainwindow.cpp +++ b/tdeui/kmainwindow.cpp @@ -92,7 +92,7 @@ public: } bool saveState( TQSessionManager& ) { - KConfig* config = KApplication::kApplication()->sessionConfig(); + KConfig* config = TDEApplication::kApplication()->sessionConfig(); if ( KMainWindow::memberList->first() ){ // According to Jochen Wilhelmy , this // hook is useful for better document orientation @@ -303,9 +303,9 @@ void KMainWindow::parseGeometry(bool parsewidth) if ( parsewidth && !(m & YValue) ) y = geometry().y(); if ( (m & XNegative) ) - x = KApplication::desktop()->width() + x - w; + x = TDEApplication::desktop()->width() + x - w; if ( (m & YNegative) ) - y = KApplication::desktop()->height() + y - h; + y = TDEApplication::desktop()->height() + y - h; move(x, y); } #endif @@ -1226,7 +1226,7 @@ void KMainWindow::setIcon( const TQPixmap& p ) { TQMainWindow::setIcon( p ); #ifdef Q_WS_X11 - // Qt3 doesn't support _NET_WM_ICON, but KApplication::setTopWidget(), which + // Qt3 doesn't support _NET_WM_ICON, but TDEApplication::setTopWidget(), which // is used by KMainWindow, sets it KWin::setIcons( winId(), p, TQPixmap()); #endif diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h index 8aba596f1..d03a2efcf 100644 --- a/tdeui/kmainwindow.h +++ b/tdeui/kmainwindow.h @@ -73,7 +73,7 @@ class DCOPObject; * not supported. * * KMainWindow will set icon, mini icon and caption, which it gets - * from KApplication. It provides full session management, and + * from TDEApplication. It provides full session management, and * will save its position, geometry and positions of toolbars and * menubar on logout. If you want to save additional data, reimplement * saveProperties() and (to read them again on next login) @@ -90,7 +90,7 @@ class DCOPObject; * window is closed. If you do not want this behavior, specify 0 as * widget flag in the constructor. * - * @see KApplication + * @see TDEApplication * @author Reginald Stadlbauer (reggie@kde.org) Stephan Kulow (coolo@kde.org), Matthias Ettrich (ettrich@kde.org), Chris Schlaeger (cs@kde.org), Sven Radej (radej@kde.org). Maintained by Sven Radej (radej@kde.org) */ @@ -798,9 +798,9 @@ protected: // would be useful only for the annoying 'really quit' dialog, which // also doesn't make sense in apps with multiple mainwindows. // And saving configuration in something called queryExit()? IMHO - // one can e.g. use KApplication::shutDown(), which if nothing else + // one can e.g. use TDEApplication::shutDown(), which if nothing else // has at least better fitting name. - // See also KApplication::sessionSaving(). + // See also TDEApplication::sessionSaving(). // This stuff should get changed somehow, so that it at least doesn't // mess with session management. /** @@ -820,15 +820,15 @@ protected: If you need to do serious things on exit (like shutting a dial-up connection down), connect to the signal - KApplication::shutDown(). + TDEApplication::shutDown(). Default implementation returns @p true. Returning @p false will cancel the exiting. In the latter case, the last window will - remain visible. If KApplication::sessionSaving() is true, refusing + remain visible. If TDEApplication::sessionSaving() is true, refusing the exit will also cancel KDE logout. @see queryClose() - @see KApplication::sessionSaving() + @see TDEApplication::sessionSaving() */ virtual bool queryExit(); @@ -840,7 +840,7 @@ protected: safe to close it, i.e. without the user losing some data. Default implementation returns true. Returning @p false will cancel - the closing, and, if KApplication::sessionSaving() is true, it will also + the closing, and, if TDEApplication::sessionSaving() is true, it will also cancel KDE logout. Reimplement this function to prevent the user from losing data. @@ -864,7 +864,7 @@ protected: may be canceled, in which case the document should remain open. @see queryExit() - @see KApplication::sessionSaving() + @see TDEApplication::sessionSaving() */ virtual bool queryClose(); diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp index ee526dcdb..2dd4c8ca5 100644 --- a/tdeui/kmessagebox.cpp +++ b/tdeui/kmessagebox.cpp @@ -981,7 +981,7 @@ KMessageBox::about(TQWidget *parent, const TQString &text, parent, "about", true, true, KStdGuiItem::ok() ); - TQPixmap ret = KApplication::kApplication()->icon(); + TQPixmap ret = TDEApplication::kApplication()->icon(); if (ret.isNull()) ret = TQMessageBox::standardIcon(TQMessageBox::Information); dialog->setIcon(ret); diff --git a/tdeui/kmessagebox.h b/tdeui/kmessagebox.h index 419d1edc7..f9d76688c 100644 --- a/tdeui/kmessagebox.h +++ b/tdeui/kmessagebox.h @@ -74,7 +74,7 @@ public: Notify = 1, ///< Emit a KNotifyClient event AllowLink = 2, ///< The message may contain links. Dangerous = 4, ///< The action to be confirmed by the dialog is a potentially destructive one - PlainCaption = 8, /**< Do not use KApplication::makeStdCaption() + PlainCaption = 8, /**< Do not use TDEApplication::makeStdCaption() @since 3.4 */ NoExec = 16 /**< Do not call exec() in createKMessageBox() diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h index 11af50f43..5209c515f 100644 --- a/tdeui/kpanelapplet.h +++ b/tdeui/kpanelapplet.h @@ -55,7 +55,7 @@ class TQPopupMenu; * * \b X-TDE-UniqueApplet \n * - * Similar to KApplication and KUniqueApplication there are + * Similar to TDEApplication and KUniqueApplication there are * two types of panel applets. Use unique applets when it makes no * sence to run more than one instance of a applet in the panel. A * good example for unique applets is the taskbar applet. Use normal diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h index fec6bd2ee..e8d7e5a28 100644 --- a/tdeui/kpanelextension.h +++ b/tdeui/kpanelextension.h @@ -56,7 +56,7 @@ class KPanelExtensionPrivate; * * \b X-TDE-UniqueExtension \n * - * Similar to KApplication and KUniqueApplication there are + * Similar to TDEApplication and KUniqueApplication there are * two types of panel extensions. Use unique extensions when it makes no * sence to run more than one instance of an extension in the panel. A * good example for unique extensions is the taskbar extension. Use normal diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h index aa447ed5c..1f233f23d 100644 --- a/tdeui/ktoolbar.h +++ b/tdeui/ktoolbar.h @@ -96,7 +96,7 @@ private: * * KToolBar uses a global config group to load toolbar settings on * construction. It will reread this config group on a - * KApplication::appearanceChanged() signal. + * TDEApplication::appearanceChanged() signal. * * @author Reginald Stadlbauer , Stephan Kulow , Sven Radej . */ diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp index a2d3c27fe..1316081c6 100644 --- a/tdeui/ktoolbarbutton.cpp +++ b/tdeui/ktoolbarbutton.cpp @@ -670,7 +670,7 @@ void KToolBarButton::slotClicked() // emit buttonClicked when the button was clicked while being in an extension popupmenu if ( d->m_parent && !d->m_parent->rect().contains( geometry().center() ) ) { - ButtonState state = KApplication::keyboardMouseState(); + ButtonState state = TDEApplication::keyboardMouseState(); if ( ( state & Qt::MouseButtonMask ) == Qt::NoButton ) state = ButtonState( Qt::LeftButton | state ); emit buttonClicked( d->m_id, state ); // Doesn't work with MidButton diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp index 1767bec5f..b8b7d40f8 100644 --- a/tdeui/tests/itemcontainertest.cpp +++ b/tdeui/tests/itemcontainertest.cpp @@ -54,7 +54,7 @@ static const char * item_xpm[] = { " ...... "}; -KApplication *app; +TDEApplication *app; TopLevel::TopLevel(TQWidget *parent, const char *name) : TQWidget(parent, name) @@ -212,7 +212,7 @@ void TopLevel::slotToggleSingleColumn( bool b ) int main( int argc, char ** argv ) { - app = new KApplication ( argc, argv, "ItemContainerTest" ); + app = new TDEApplication ( argc, argv, "ItemContainerTest" ); TopLevel *toplevel = new TopLevel(0, "itemcontainertest"); diff --git a/tdeui/tests/kaboutdialogtest.cpp b/tdeui/tests/kaboutdialogtest.cpp index 6103c6ba4..e87c7ebf2 100644 --- a/tdeui/tests/kaboutdialogtest.cpp +++ b/tdeui/tests/kaboutdialogtest.cpp @@ -16,7 +16,7 @@ int main(int argc, char** argv) { - (void)new KApplication(argc, argv, "KAboutDialogTest"); + (void)new TDEApplication(argc, argv, "KAboutDialogTest"); TQImage logo; TQImage bg; TQPixmap pix; diff --git a/tdeui/tests/kactiontest.cpp b/tdeui/tests/kactiontest.cpp index ea97883c8..238f912c5 100644 --- a/tdeui/tests/kactiontest.cpp +++ b/tdeui/tests/kactiontest.cpp @@ -8,7 +8,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "kactiontest" ); + TDEApplication app( argc, argv, "kactiontest" ); KActionCollection coll( static_cast( 0 ) ); diff --git a/tdeui/tests/kblendtest.cpp b/tdeui/tests/kblendtest.cpp index 59a57dc6a..dc708f2b5 100644 --- a/tdeui/tests/kblendtest.cpp +++ b/tdeui/tests/kblendtest.cpp @@ -89,7 +89,7 @@ void KBlendWidget::paintEvent(TQPaintEvent */*ev*/) int main(int argc, char **argv) { - KApplication app(argc, argv, "KBlendTest"); + TDEApplication app(argc, argv, "KBlendTest"); KBlendWidget w; app.setMainWidget(&w); w.show(); diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp index 1773c47f9..8f2052b28 100644 --- a/tdeui/tests/kbuttonboxtest.cpp +++ b/tdeui/tests/kbuttonboxtest.cpp @@ -24,7 +24,7 @@ #include int main(int argc, char **argv) { - KApplication a(argc, argv, "dummy"); + TDEApplication a(argc, argv, "dummy"); // example 1 { diff --git a/tdeui/tests/kcharselecttest.cpp b/tdeui/tests/kcharselecttest.cpp index facd17bca..019f6bd43 100644 --- a/tdeui/tests/kcharselecttest.cpp +++ b/tdeui/tests/kcharselecttest.cpp @@ -4,7 +4,7 @@ int main (int argc,char **argv) { - KApplication app( argc, argv, "kcharselecttest" ); + TDEApplication app( argc, argv, "kcharselecttest" ); KCharSelect selector( 0, "char selector" ); selector.resize( selector.sizeHint() ); diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp index f372e6a96..83f29a70e 100644 --- a/tdeui/tests/kcolordlgtest.cpp +++ b/tdeui/tests/kcolordlgtest.cpp @@ -28,7 +28,7 @@ int main( int argc, char *argv[] ) KLocale::setMainCatalogue("tdelibs"); TQApplication::setColorMode( TQApplication::CustomColors ); - KApplication a( argc, argv, "KColorDialogTest" ); + TDEApplication a( argc, argv, "KColorDialogTest" ); KConfig aConfig; aConfig.setGroup( "KColorDialog-test" ); diff --git a/tdeui/tests/kcolortest.cpp b/tdeui/tests/kcolortest.cpp index 68f50371b..3f61da00f 100644 --- a/tdeui/tests/kcolortest.cpp +++ b/tdeui/tests/kcolortest.cpp @@ -160,7 +160,7 @@ int main(int argc, char **argv) else printf("Usage: %s [int_vs_fade | fullscreen [old_way]]\n ", argv[0]); } - KApplication *app = new KApplication(argc, argv, "KColorTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KColorTest"); KColorWidget w; app->setMainWidget(&w); w.show(); diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp index 44b849b44..234f62543 100644 --- a/tdeui/tests/kcomboboxtest.cpp +++ b/tdeui/tests/kcomboboxtest.cpp @@ -217,7 +217,7 @@ void KComboBoxTest::quitApp() int main ( int argc, char **argv) { - KApplication a(argc, argv, "kcomboboxtest"); + TDEApplication a(argc, argv, "kcomboboxtest"); KComboBoxTest* t= new KComboBoxTest; a.setMainWidget (t); t->show (); diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp index 3e60a0ddd..617957b4c 100644 --- a/tdeui/tests/kcompletiontest.cpp +++ b/tdeui/tests/kcompletiontest.cpp @@ -186,7 +186,7 @@ TQStringList Form1::defaultItems() const int main(int argc, char **argv ) { - KApplication app( argc, argv, "kcompletiontest" ); + TDEApplication app( argc, argv, "kcompletiontest" ); Form1 *form = new Form1(); form->show(); diff --git a/tdeui/tests/kdatepicktest.cpp b/tdeui/tests/kdatepicktest.cpp index bea01a434..da5e872e1 100644 --- a/tdeui/tests/kdatepicktest.cpp +++ b/tdeui/tests/kdatepicktest.cpp @@ -6,7 +6,7 @@ int main(int argc, char** argv) { KLocale::setMainCatalogue("tdelibs"); - KApplication app(argc, argv, "KDatePickertest"); + TDEApplication app(argc, argv, "KDatePickertest"); KDatePicker picker; app.setMainWidget(&picker); picker.show(); diff --git a/tdeui/tests/kdatetimewidgettest.cpp b/tdeui/tests/kdatetimewidgettest.cpp index ab55b0a32..55ba7cbea 100644 --- a/tdeui/tests/kdatetimewidgettest.cpp +++ b/tdeui/tests/kdatetimewidgettest.cpp @@ -5,7 +5,7 @@ int main(int argc, char** argv) { KLocale::setMainCatalogue("tdelibs"); - KApplication app(argc, argv, "KDateTimeWidgettest"); + TDEApplication app(argc, argv, "KDateTimeWidgettest"); KDateTimeWidget dateTimeWidget; app.setMainWidget(&dateTimeWidget); dateTimeWidget.show(); diff --git a/tdeui/tests/kdatewidgettest.cpp b/tdeui/tests/kdatewidgettest.cpp index af75b42bc..6e1c8d504 100644 --- a/tdeui/tests/kdatewidgettest.cpp +++ b/tdeui/tests/kdatewidgettest.cpp @@ -6,7 +6,7 @@ int main(int argc, char** argv) { KLocale::setMainCatalogue("tdelibs"); - KApplication app(argc, argv, "KDateWidgettest"); + TDEApplication app(argc, argv, "KDateWidgettest"); KDateWidget dateWidget; app.setMainWidget(&dateWidget); dateWidget.show(); diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp index 28f7d4cf2..fbf93bfe8 100644 --- a/tdeui/tests/kdesattest.cpp +++ b/tdeui/tests/kdesattest.cpp @@ -55,7 +55,7 @@ void KDesatWidget::paintEvent(TQPaintEvent */*ev*/) int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "KDesatTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KDesatTest"); KDesatWidget w; app->setMainWidget(&w); w.show(); diff --git a/tdeui/tests/kdialogbasetest.cpp b/tdeui/tests/kdialogbasetest.cpp index c3653b59f..b1c7d422c 100644 --- a/tdeui/tests/kdialogbasetest.cpp +++ b/tdeui/tests/kdialogbasetest.cpp @@ -6,7 +6,7 @@ int main(int argc, char** argv) { - KApplication app(argc, argv, "DialogBaseTest"); + TDEApplication app(argc, argv, "DialogBaseTest"); // ----- TQString text= // the explanation shown by the example dialog "

DialogBase Example


" diff --git a/tdeui/tests/kdocktest.cpp b/tdeui/tests/kdocktest.cpp index 84895c414..fbbb799fc 100644 --- a/tdeui/tests/kdocktest.cpp +++ b/tdeui/tests/kdocktest.cpp @@ -54,7 +54,7 @@ DockTest::DockTest( TQWidget* parent ) int main( int argc, char** argv ) { - KApplication a( argc,argv, "docktest" ); + TDEApplication a( argc,argv, "docktest" ); DockTest* ap = new DockTest(); ap->setCaption("DockWidget demo"); a.setMainWidget( ap ); diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp index 7847a6299..1720ca09a 100644 --- a/tdeui/tests/kdockwidgetdemo.cpp +++ b/tdeui/tests/kdockwidgetdemo.cpp @@ -768,7 +768,7 @@ TQString DirectoryView::selectedDir() /**********************************************************************************************/ int main(int argc, char* argv[]) { - KApplication app(argc,argv,"kdockwidgetdemo"); + TDEApplication app(argc,argv,"kdockwidgetdemo"); #if 0 SFileDialog* openfile = new SFileDialog(); diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp index 74d8ecac4..dfe9bfff7 100644 --- a/tdeui/tests/kdockwidgettest.cpp +++ b/tdeui/tests/kdockwidgettest.cpp @@ -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); diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp index 6fa2d1571..ea749cd6e 100644 --- a/tdeui/tests/kdualcolortest.cpp +++ b/tdeui/tests/kdualcolortest.cpp @@ -51,7 +51,7 @@ void KDualColorWidget::slotCurrentChanged(KDualColorButton::DualColor current) int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "KDualColorTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KDualColorTest"); KDualColorWidget w; app->setMainWidget(&w); w.show(); diff --git a/tdeui/tests/keditlistboxtest.cpp b/tdeui/tests/keditlistboxtest.cpp index 90dbb74d0..177a8b6ec 100644 --- a/tdeui/tests/keditlistboxtest.cpp +++ b/tdeui/tests/keditlistboxtest.cpp @@ -4,7 +4,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "keditlistboxtest" ); + TDEApplication app( argc, argv, "keditlistboxtest" ); KEditListBox::CustomEditor editor( new KComboBox( true, 0L, "test" ) ); KEditListBox *box = new KEditListBox( TQString::fromLatin1("KEditListBox"), diff --git a/tdeui/tests/kedittest.cpp b/tdeui/tests/kedittest.cpp index 17a593e74..42d6f659f 100644 --- a/tdeui/tests/kedittest.cpp +++ b/tdeui/tests/kedittest.cpp @@ -4,7 +4,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "kedittest" ); + TDEApplication app( argc, argv, "kedittest" ); KEdit *edit = new KEdit( 0L ); TQPopupMenu *pop = new TQPopupMenu( 0L ); pop->insertItem( "Popupmenu item" ); diff --git a/tdeui/tests/kfontdialogtest.cpp b/tdeui/tests/kfontdialogtest.cpp index 205fd48f7..4ef49fec7 100644 --- a/tdeui/tests/kfontdialogtest.cpp +++ b/tdeui/tests/kfontdialogtest.cpp @@ -31,7 +31,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "KFontDialogTest" ); + TDEApplication app( argc, argv, "KFontDialogTest" ); KConfig aConfig; aConfig.setGroup( "KFontDialog-test" ); diff --git a/tdeui/tests/kgradienttest.cpp b/tdeui/tests/kgradienttest.cpp index 6942ca55d..dcd45673c 100644 --- a/tdeui/tests/kgradienttest.cpp +++ b/tdeui/tests/kgradienttest.cpp @@ -98,7 +98,7 @@ void KGradientWidget::paintEvent(TQPaintEvent */*ev*/) int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "KGradientTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KGradientTest"); KGradientWidget w; w.resize(250 * cols, 250 * rows); app->setMainWidget(&w); diff --git a/tdeui/tests/khashtest.cpp b/tdeui/tests/khashtest.cpp index 2f00c9296..af7cc60cd 100644 --- a/tdeui/tests/khashtest.cpp +++ b/tdeui/tests/khashtest.cpp @@ -126,7 +126,7 @@ void KHashWidget::paintEvent(TQPaintEvent * /*ev*/) int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "KHashTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KHashTest"); KHashWidget w; w.resize(250 * cols, 250 * rows); app->setMainWidget(&w); diff --git a/tdeui/tests/kinputdialogtest.cpp b/tdeui/tests/kinputdialogtest.cpp index 66db4617a..5db3babff 100644 --- a/tdeui/tests/kinputdialogtest.cpp +++ b/tdeui/tests/kinputdialogtest.cpp @@ -12,7 +12,7 @@ int main( int argc, char *argv[] ) { - KApplication app( argc, argv, "kinputdialogtest" ); + TDEApplication app( argc, argv, "kinputdialogtest" ); bool ok; TQString svalue; diff --git a/tdeui/tests/kjanuswidgettest.cpp b/tdeui/tests/kjanuswidgettest.cpp index 59db252e2..12a267a02 100644 --- a/tdeui/tests/kjanuswidgettest.cpp +++ b/tdeui/tests/kjanuswidgettest.cpp @@ -7,7 +7,7 @@ int main(int argc, char** argv) { - KApplication app(argc, argv, "JanusWidgetTest"); + TDEApplication app(argc, argv, "JanusWidgetTest"); // ----- KJanusWidget* janus = new KJanusWidget( 0, 0, KJanusWidget::IconList ); diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp index 54ae8b6e1..48f2f1430 100644 --- a/tdeui/tests/kledtest.cpp +++ b/tdeui/tests/kledtest.cpp @@ -134,7 +134,7 @@ KLedTest::timeout() int main( int argc, char **argv ) { - KApplication a( argc, argv, "KLedTest" ); + TDEApplication a( argc, argv, "KLedTest" ); KLedTest widget; // ----- /* diff --git a/tdeui/tests/klineeditdlgtest.cpp b/tdeui/tests/klineeditdlgtest.cpp index 7db673bb1..012a22b7f 100644 --- a/tdeui/tests/klineeditdlgtest.cpp +++ b/tdeui/tests/klineeditdlgtest.cpp @@ -6,7 +6,7 @@ int main(int argc, char** argv) { - KApplication app(argc, argv, "klineedittest"); + TDEApplication app(argc, argv, "klineedittest"); KLineEditDlg dialog( "_text", "_value", 0L ); if(dialog.exec()) { diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp index 409476c20..c9b3485cc 100644 --- a/tdeui/tests/klineedittest.cpp +++ b/tdeui/tests/klineedittest.cpp @@ -120,9 +120,9 @@ int main ( int argc, char **argv) { KAboutData aboutData( "klineedittest", "klineedittest", "1.0" ); TDECmdLineArgs::init(argc, argv, &aboutData); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); - KApplication a; + TDEApplication a; KLineEditTest *t = new KLineEditTest(); //t->lineEdit()->setTrapReturnKey( true ); //t->lineEdit()->completionBox()->setTabHandling( false ); diff --git a/tdeui/tests/klistviewtest.cpp b/tdeui/tests/klistviewtest.cpp index 6189c76e9..582ae19e9 100644 --- a/tdeui/tests/klistviewtest.cpp +++ b/tdeui/tests/klistviewtest.cpp @@ -6,7 +6,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "klistviewtest" ); + TDEApplication app( argc, argv, "klistviewtest" ); KDialogBase dialog; KListView *view = new KListView( dialog.makeVBoxMainWidget() ); view->setSelectionModeExt( KListView::FileManager ); diff --git a/tdeui/tests/kmainwindowrestoretest.cpp b/tdeui/tests/kmainwindowrestoretest.cpp index 7415085ac..1ef265d92 100644 --- a/tdeui/tests/kmainwindowrestoretest.cpp +++ b/tdeui/tests/kmainwindowrestoretest.cpp @@ -14,7 +14,7 @@ int main( int argc, char * argv[] ) { - KApplication app( argc, argv, "kmainwindowrestoretest" ); + TDEApplication app( argc, argv, "kmainwindowrestoretest" ); if ( kapp->isRestored() ) { kRestoreMainWindows< MainWin1, MainWin2, MainWin3 >(); diff --git a/tdeui/tests/kmainwindowtest.cpp b/tdeui/tests/kmainwindowtest.cpp index 5b7afd36f..6606680e9 100644 --- a/tdeui/tests/kmainwindowtest.cpp +++ b/tdeui/tests/kmainwindowtest.cpp @@ -24,7 +24,7 @@ void MainWindow::showMessage() int main( int argc, char **argv ) { - KApplication app( argc, argv, "kmainwindowtest" ); + TDEApplication app( argc, argv, "kmainwindowtest" ); MainWindow* mw = new MainWindow; // deletes itself when closed mw->show(); diff --git a/tdeui/tests/kmessageboxtest.cpp b/tdeui/tests/kmessageboxtest.cpp index 3603edf57..69f28e8c6 100644 --- a/tdeui/tests/kmessageboxtest.cpp +++ b/tdeui/tests/kmessageboxtest.cpp @@ -63,7 +63,7 @@ void showResult(int test, int i) int main( int argc, char *argv[] ) { int i, test; - new KApplication( argc, argv, "MyApplication" ); + new TDEApplication( argc, argv, "MyApplication" ); ExampleWidget *w = new ExampleWidget(); w->show(); diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp index fdf8697e9..fad4cd50a 100644 --- a/tdeui/tests/knuminputtest.cpp +++ b/tdeui/tests/knuminputtest.cpp @@ -16,7 +16,7 @@ #include "knuminputtest.h" -KApplication *a; +TDEApplication *a; #include void TopLevel::slotPrint( int n ) { @@ -132,7 +132,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) int main( int argc, char ** argv ) { - a = new KApplication ( argc, argv, "KNuminputTest" ); + a = new TDEApplication ( argc, argv, "KNuminputTest" ); TopLevel *toplevel = new TopLevel(0, "knuminputtest"); diff --git a/tdeui/tests/kpalettetest.cpp b/tdeui/tests/kpalettetest.cpp index 32b91ff96..8edb97a57 100644 --- a/tdeui/tests/kpalettetest.cpp +++ b/tdeui/tests/kpalettetest.cpp @@ -12,7 +12,7 @@ int main( int argc, char **argv ) { - KApplication a( argc, argv, "KPalettetest" ); + TDEApplication a( argc, argv, "KPalettetest" ); TQStringList palettes = KPalette::getPaletteList(); for(TQStringList::ConstIterator it = palettes.begin(); diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp index 678a1eeb6..1890ff13e 100644 --- a/tdeui/tests/kpanelmenutest.cpp +++ b/tdeui/tests/kpanelmenutest.cpp @@ -57,7 +57,7 @@ void TestWidget::slotSubMenuCalled(int id) int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "menutest"); + TDEApplication *app = new TDEApplication(argc, argv, "menutest"); TestWidget w; app->setMainWidget(&w); diff --git a/tdeui/tests/kpixmapregionselectordialogtest.cpp b/tdeui/tests/kpixmapregionselectordialogtest.cpp index 41dfd0a57..84cc7ae65 100644 --- a/tdeui/tests/kpixmapregionselectordialogtest.cpp +++ b/tdeui/tests/kpixmapregionselectordialogtest.cpp @@ -15,7 +15,7 @@ int main(int argc, char**argv) { TDECmdLineArgs::init(argc, argv, "test", "test" ,"test" ,"1.0"); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app("test"); + TDEApplication app("test"); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count()!=1) diff --git a/tdeui/tests/kpopuptest.cpp b/tdeui/tests/kpopuptest.cpp index 3db71106b..e5d01c985 100644 --- a/tdeui/tests/kpopuptest.cpp +++ b/tdeui/tests/kpopuptest.cpp @@ -30,7 +30,7 @@ public: int main(int argc, char **argv) { - KApplication app(argc, argv, "kpopupmenutest"); + TDEApplication app(argc, argv, "kpopupmenutest"); DemoWidget w; app.setMainWidget(&w); w.setFont(TQFont("helvetica", 12, TQFont::Bold), true); diff --git a/tdeui/tests/kprogresstest.cpp b/tdeui/tests/kprogresstest.cpp index 7b7024135..c3665865d 100644 --- a/tdeui/tests/kprogresstest.cpp +++ b/tdeui/tests/kprogresstest.cpp @@ -46,7 +46,7 @@ void MyWidget::timerEvent(TQTimerEvent *) int main(int argc, char *argv[]) { - KApplication app(argc, argv, "KProgressTest"); + TDEApplication app(argc, argv, "KProgressTest"); MyWidget w; app.setMainWidget(&w); diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp index 2f16605d9..f227301b9 100644 --- a/tdeui/tests/krulertest.cpp +++ b/tdeui/tests/krulertest.cpp @@ -358,10 +358,10 @@ KRulerTest::slotSetYTrans(double d) /* --- MAIN -----------------------*/ int main(int argc, char **argv) { - KApplication *testapp; + TDEApplication *testapp; KRulerTest *window; - testapp = new KApplication(argc, argv,"krulertest"); + testapp = new TDEApplication(argc, argv,"krulertest"); testapp->setFont(TQFont("Helvetica",12),true); window = new KRulerTest("main"); diff --git a/tdeui/tests/kspelltest.cpp b/tdeui/tests/kspelltest.cpp index 9180ed376..7941ade87 100644 --- a/tdeui/tests/kspelltest.cpp +++ b/tdeui/tests/kspelltest.cpp @@ -26,7 +26,7 @@ int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "KSpellTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KSpellTest"); // test ASCII //TQString text( "I have noo idee of how to wride englisch or englisch" ); diff --git a/tdeui/tests/ksqueezedtextlabeltest.cpp b/tdeui/tests/ksqueezedtextlabeltest.cpp index 62f3c1a76..a0a0e400f 100644 --- a/tdeui/tests/ksqueezedtextlabeltest.cpp +++ b/tdeui/tests/ksqueezedtextlabeltest.cpp @@ -3,7 +3,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "KSqueezedTextLabelTest" ); + TDEApplication app( argc, argv, "KSqueezedTextLabelTest" ); KSqueezedTextLabel l( "This is a rather long string", 0); app.setMainWidget( &l ); diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp index 669044c55..742490aae 100644 --- a/tdeui/tests/kstatusbartest.cpp +++ b/tdeui/tests/kstatusbartest.cpp @@ -22,7 +22,7 @@ testWindow::testWindow (TQWidget *, const char *name) menuBar = new KMenuBar (this); fileMenu = new TQPopupMenu; menuBar->insertItem ("&File", fileMenu); - fileMenu->insertItem ("&Exit", KApplication::kApplication(), + fileMenu->insertItem ("&Exit", TDEApplication::kApplication(), TQT_SLOT( quit() ), ALT + Key_Q ); statusbar = new KStatusBar (this); statusbar->insertItem("Zoom: XXXX", 0); @@ -41,7 +41,7 @@ testWindow::testWindow (TQWidget *, const char *name) setCentralWidget(widget); - setCaption( KApplication::kApplication()->caption() ); + setCaption( TDEApplication::kApplication()->caption() ); smenu = new TQPopupMenu; @@ -104,7 +104,7 @@ testWindow::~testWindow () int main( int argc, char *argv[] ) { - KApplication *myApp = new KApplication( argc, argv, "KStatusBarTest" ); + TDEApplication *myApp = new TDEApplication( argc, argv, "KStatusBarTest" ); testWindow *test = new testWindow; myApp->setMainWidget(test); diff --git a/tdeui/tests/ksystemtraytest.cpp b/tdeui/tests/ksystemtraytest.cpp index dcee78346..07572f8d3 100644 --- a/tdeui/tests/ksystemtraytest.cpp +++ b/tdeui/tests/ksystemtraytest.cpp @@ -3,7 +3,7 @@ int main(int argc, char **argv) { - KApplication app( argc, argv, "ksystemtraytest" ); + TDEApplication app( argc, argv, "ksystemtraytest" ); TQLabel *l = new TQLabel("System Tray Main Window", 0L); KSystemTray *tray = new KSystemTray( l ); tray->setText("Test"); diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp index 33e7fc5b7..b864017b0 100644 --- a/tdeui/tests/ktabctltest.cpp +++ b/tdeui/tests/ktabctltest.cpp @@ -30,7 +30,7 @@ TQFont default_font("Helvetica", 12); -KApplication *a; +TDEApplication *a; TopLevel::TopLevel(TQWidget *parent, const char *name) : TQWidget(parent, name) @@ -90,7 +90,7 @@ void TopLevel::okPressed() int main( int argc, char ** argv ) { - a = new KApplication ( argc, argv, "KTabCtlTest" ); + a = new TDEApplication ( argc, argv, "KTabCtlTest" ); a->setFont(default_font); diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp index 0fd72851b..84a35952f 100644 --- a/tdeui/tests/ktabwidgettest.cpp +++ b/tdeui/tests/ktabwidgettest.cpp @@ -355,7 +355,7 @@ void Test::toggleLabels(bool state) int main(int argc, char** argv ) { TDECmdLineArgs::init(argc, argv, "ktabwidgettest", "ktabwidget test app", "1.0"); - KApplication app(argc, argv); + TDEApplication app(argc, argv); Test *t = new Test(); app.setMainWidget( t ); diff --git a/tdeui/tests/ktextedittest.cpp b/tdeui/tests/ktextedittest.cpp index d43f77260..6af109d5a 100644 --- a/tdeui/tests/ktextedittest.cpp +++ b/tdeui/tests/ktextedittest.cpp @@ -24,7 +24,7 @@ int main( int argc, char **argv ) { - KApplication app( argc, argv, "ktextedittest" ); + TDEApplication app( argc, argv, "ktextedittest" ); KTextEdit *edit = new KTextEdit(); edit->setReadOnly( true ); edit->setCheckSpellingEnabled( true ); diff --git a/tdeui/tests/ktimewidgettest.cpp b/tdeui/tests/ktimewidgettest.cpp index 324accc7d..fe56c6df7 100644 --- a/tdeui/tests/ktimewidgettest.cpp +++ b/tdeui/tests/ktimewidgettest.cpp @@ -5,7 +5,7 @@ int main(int argc, char** argv) { KLocale::setMainCatalogue("tdelibs"); - KApplication app(argc, argv, "KTimeWidgettest"); + TDEApplication app(argc, argv, "KTimeWidgettest"); KTimeWidget timeWidget; app.setMainWidget(&timeWidget); timeWidget.show(); diff --git a/tdeui/tests/ktoolbarlabelactiontest.cpp b/tdeui/tests/ktoolbarlabelactiontest.cpp index 020834605..5c1ffa757 100644 --- a/tdeui/tests/ktoolbarlabelactiontest.cpp +++ b/tdeui/tests/ktoolbarlabelactiontest.cpp @@ -84,7 +84,7 @@ public: int main( int argc, char **argv ) { - KApplication app( argc, argv, "ktoolbarlabelactiontest" ); + TDEApplication app( argc, argv, "ktoolbarlabelactiontest" ); KGlobal::instance()->dirs()->addResourceDir("data", "."); diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp index 7f5b2cc78..d9e7448d8 100644 --- a/tdeui/tests/kunbalancedgrdtest.cpp +++ b/tdeui/tests/kunbalancedgrdtest.cpp @@ -166,7 +166,7 @@ void myTopWidget::rebalance() int main(int argc, char **argv) { - KApplication *app = new KApplication(argc, argv, "KUnbalancedGradientTest"); + TDEApplication *app = new TDEApplication(argc, argv, "KUnbalancedGradientTest"); myTopWidget w; app->setMainWidget(&w); w.show(); diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp index 91974263e..f103a114f 100644 --- a/tdeui/tests/kwizardtest.cpp +++ b/tdeui/tests/kwizardtest.cpp @@ -25,7 +25,7 @@ int main(int argc, char **argv) { - KApplication a(argc,argv,"kwizardtest"); + TDEApplication a(argc,argv,"kwizardtest"); KWizard *wiz = new KWizard(0, "kwizardtest", false); TQObject::connect((TQObject*) wiz->cancelButton(), TQT_SIGNAL(clicked()), &a, TQT_SLOT(quit())); diff --git a/tdeui/tests/kwordwraptest.cpp b/tdeui/tests/kwordwraptest.cpp index ad60bd897..bd51800e8 100644 --- a/tdeui/tests/kwordwraptest.cpp +++ b/tdeui/tests/kwordwraptest.cpp @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) { - KApplication app(argc, argv, "KWordWrapTest"); + TDEApplication app(argc, argv, "KWordWrapTest"); TQFont font( "helvetica", 12 ); // let's hope we all have the same... TQFontMetrics fm( font ); diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp index a903aeb3f..dbe688ebf 100644 --- a/tdeui/tests/kxmlguitest.cpp +++ b/tdeui/tests/kxmlguitest.cpp @@ -18,7 +18,7 @@ void Client::slotSec() int main( int argc, char **argv ) { - KApplication app( argc, argv, "kxmlguitest" ); + TDEApplication app( argc, argv, "kxmlguitest" ); // KXMLGUIClient looks in the "data" resource for the .rc files // Let's add $PWD (ideally $srcdir instead...) to it diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp index b967987bf..32027bce1 100644 --- a/tdeui/tests/twindowtest.cpp +++ b/tdeui/tests/twindowtest.cpp @@ -55,7 +55,7 @@ setAutoSaveSettings(); menuBar->insertItem ("&File", fileMenu); // We insert item "Exit" with accelerator ALT-Q, and connect // it to application's exit-slot. - fileMenu->insertItem ("&Exit", KApplication::kApplication(), + fileMenu->insertItem ("&Exit", TDEApplication::kApplication(), TQT_SLOT( quit() ), ALT + Key_Q ); // Another popup... @@ -148,7 +148,7 @@ setAutoSaveSettings(); // Now add another button and align it right pix = BarIcon("exit"); - tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), KApplication::kApplication(), + tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(), TQT_SLOT( quit() ), true, "Exit"); tb->alignItemRight (6); @@ -408,7 +408,7 @@ void testWindow::slotExit () { TQPixmap pix; pix = BarIcon("exit"); - tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), KApplication::kApplication(), + tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(), TQT_SLOT( quit() ), true, "Exit"); tb->alignItemRight (6); exitB = true; @@ -504,7 +504,7 @@ int main( int argc, char *argv[] ) int i; TDECmdLineArgs::init(argc, argv, "KWindowTest", "description", "version"); - KApplication *myApp = new KApplication(); + TDEApplication *myApp = new TDEApplication(); testWindow *test = new testWindow; myApp->setMainWidget(test); -- cgit v1.2.1