diff options
Diffstat (limited to 'tdeui')
50 files changed, 157 insertions, 157 deletions
diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp index 2e7af38c3..5f3362067 100644 --- a/tdeui/kactivelabel.cpp +++ b/tdeui/kactivelabel.cpp @@ -49,16 +49,16 @@ void KActiveLabel::init() connect(this, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(openLink(const TQString &))); - if (kapp) + if (tdeApp) { - connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(paletteChanged())); } } void KActiveLabel::paletteChanged() { - TQPalette p = kapp ? kapp->palette() : palette(); + TQPalette p = tdeApp ? tdeApp->palette() : palette(); p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background)); p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground)); setPalette(p); @@ -74,7 +74,7 @@ void KActiveLabel::openLink(const TQString & link) TQStringList args; args << "exec" << link; - kapp->tdeinitExec("kfmclient", args); + tdeApp->tdeinitExec("kfmclient", args); } void KActiveLabel::virtual_hook( int, void* ) diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp index 210f5f1ae..8cc107834 100644 --- a/tdeui/kbugreport.cpp +++ b/tdeui/kbugreport.cpp @@ -363,8 +363,8 @@ void KBugReport::slotSetFrom() void KBugReport::slotUrlClicked(const TQString &urlText) { - if ( kapp ) - kapp->invokeBrowser( urlText ); + if ( tdeApp ) + tdeApp->invokeBrowser( urlText ); // When using the web form, a click can also close the window, as there's // not much to do. It also gives the user a direct response to his click: @@ -376,8 +376,8 @@ void KBugReport::slotUrlClicked(const TQString &urlText) void KBugReport::slotOk( void ) { if ( d->submitBugButton ) { - if ( kapp ) - kapp->invokeBrowser( d->url.url() ); + if ( tdeApp ) + tdeApp->invokeBrowser( d->url.url() ); return; } diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h index 8e6afbbe4..b403ff010 100644 --- a/tdeui/kcombobox.h +++ b/tdeui/kcombobox.h @@ -599,7 +599,7 @@ public: * You won't have the benefit of weighted completion though, so normally * you should do something like * \code - * TDEConfig *config = kapp->config(); + * TDEConfig *config = tdeApp->config(); * TQStringList list; * * // load the history and completion list after creating the history combo diff --git a/tdeui/kdcopactionproxy.cpp b/tdeui/kdcopactionproxy.cpp index 028c90883..2ce2fb4b4 100644 --- a/tdeui/kdcopactionproxy.cpp +++ b/tdeui/kdcopactionproxy.cpp @@ -94,7 +94,7 @@ TQMap<TQCString,DCOPRef> KDCOPActionProxy::actionMap( const TQCString &appId ) c TQCString id = appId; if ( id.isEmpty() ) - id = kapp->dcopClient()->appId(); + id = tdeApp->dcopClient()->appId(); TQValueList<TDEAction *> lst = actions(); TQValueList<TDEAction *>::ConstIterator it = lst.begin(); diff --git a/tdeui/kdcopactionproxy.h b/tdeui/kdcopactionproxy.h index 0bb80fec1..683a77177 100644 --- a/tdeui/kdcopactionproxy.h +++ b/tdeui/kdcopactionproxy.h @@ -73,7 +73,7 @@ public: * object id. * * You can construct a global DCOP object referenence using DCOPRef. For example like - * DCOPRef( kapp->dcopClient()->appId, actionProxy->actionObjectId( actionName ) ); + * DCOPRef( tdeApp->dcopClient()->appId, actionProxy->actionObjectId( actionName ) ); * * The action with the given name has to be available through the #action method. */ @@ -83,7 +83,7 @@ public: * Returns a map of all exported actions, with the action name as keys and a global DCOP reference * as data entries. * The appId argument is used to specify the appid component of the DCOP reference. By default the - * global application id is used ( kapp->dcopClient()->appId() ) . + * global application id is used ( tdeApp->dcopClient()->appId() ) . */ virtual TQMap<TQCString,DCOPRef> actionMap( const TQCString &appId = TQCString() ) const; diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp index 5a90b5af9..6791b4c38 100644 --- a/tdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp @@ -39,7 +39,7 @@ KDETrayProxy::KDETrayProxy() it != module.windows().end(); ++it ) windowAdded( *it ); - kapp->installX11EventFilter( this ); // XSelectInput( StructureNotifyMask ) on windows is done by KWinModule + tdeApp->installX11EventFilter( this ); // XSelectInput( StructureNotifyMask ) on windows is done by KWinModule // kdDebug() << "Init done" << endl; } diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index 68471847d..7846b9639 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -121,7 +121,7 @@ void KDialog::polish() void KDialog::setCaption( const TQString &_caption ) { - TQString caption = kapp ? kapp->makeStdCaption( _caption ) : _caption; + TQString caption = tdeApp ? tdeApp->makeStdCaption( _caption ) : _caption; setPlainCaption( caption ); } diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp index d1cec7389..72ba5e450 100644 --- a/tdeui/kdialogbase.cpp +++ b/tdeui/kdialogbase.cpp @@ -1094,8 +1094,8 @@ void KDialogBase::setIconListAllVisible( bool state ) void KDialogBase::slotHelp() { emit helpClicked(); - if ( kapp ) // may be null when used inside designer - kapp->invokeHelp( mAnchor, mHelpApp ); + if ( tdeApp ) // may be null when used inside designer + tdeApp->invokeHelp( mAnchor, mHelpApp ); } diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp index a274ec737..ac7eb4cf5 100644 --- a/tdeui/khelpmenu.cpp +++ b/tdeui/khelpmenu.cpp @@ -125,7 +125,7 @@ TDEPopupMenu* KHelpMenu::menu() connect( mMenu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(menuDestroyed())); bool need_separator = false; - if (kapp->authorizeTDEAction("help_contents")) + if (tdeApp->authorizeTDEAction("help_contents")) { mMenu->insertItem( BarIcon( "contents", TDEIcon::SizeSmall), TQString(i18n( "%1 &Handbook" ).arg( appName)) ,menuHelpContents ); @@ -134,7 +134,7 @@ TDEPopupMenu* KHelpMenu::menu() need_separator = true; } - if( mShowWhatsThis && kapp->authorizeTDEAction("help_whats_this") ) + if( mShowWhatsThis && tdeApp->authorizeTDEAction("help_whats_this") ) { TQToolButton* wtb = TQWhatsThis::whatsThisButton(0); mMenu->insertItem( wtb->iconSet(),i18n( "What's &This" ), menuWhatsThis); @@ -144,7 +144,7 @@ TDEPopupMenu* KHelpMenu::menu() need_separator = true; } - if (kapp->authorizeTDEAction("help_report_bug") && aboutData && !aboutData->bugAddress().isEmpty() ) + if (tdeApp->authorizeTDEAction("help_report_bug") && aboutData && !aboutData->bugAddress().isEmpty() ) { if (need_separator) mMenu->insertSeparator(); @@ -153,7 +153,7 @@ TDEPopupMenu* KHelpMenu::menu() need_separator = true; } - if (kapp->authorizeTDEAction("switch_application_language")) + if (tdeApp->authorizeTDEAction("switch_application_language")) { if (need_separator) mMenu->insertSeparator(); @@ -165,14 +165,14 @@ TDEPopupMenu* KHelpMenu::menu() if (need_separator) mMenu->insertSeparator(); - if (kapp->authorizeTDEAction("help_about_app")) + if (tdeApp->authorizeTDEAction("help_about_app")) { - mMenu->insertItem( kapp->miniIcon(), + mMenu->insertItem( tdeApp->miniIcon(), TQString(i18n( "&About %1" ).arg(appName)), menuAboutApp ); mMenu->connectItem( menuAboutApp, this, TQ_SLOT( aboutApplication() ) ); } - if (kapp->authorizeTDEAction("help_about_kde")) + if (tdeApp->authorizeTDEAction("help_about_kde")) { mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &TDE" ), menuAboutKDE ); mMenu->connectItem( menuAboutKDE, this, TQ_SLOT( aboutKDE() ) ); @@ -186,7 +186,7 @@ TDEPopupMenu* KHelpMenu::menu() void KHelpMenu::appHelpActivated() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } @@ -221,11 +221,11 @@ void KHelpMenu::aboutApplication() hbox->setMargin(KDialog::marginHint()*1); TQLabel *label1 = new TQLabel(hbox); - label1->setPixmap( kapp->icon() ); + label1->setPixmap( tdeApp->icon() ); TQLabel *label2 = new TQLabel(hbox); label2->setText( mAboutAppText ); - mAboutApp->setPlainCaption( i18n("About %1").arg(kapp->caption()) ); + mAboutApp->setPlainCaption( i18n("About %1").arg(tdeApp->caption()) ); mAboutApp->disableResize(); } diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp index 517730b9c..284cc3386 100644 --- a/tdeui/kiconview.cpp +++ b/tdeui/kiconview.cpp @@ -66,9 +66,9 @@ TDEIconView::TDEIconView( TQWidget *parent, const char *name, WFlags f ) connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ), this, TQ_SLOT( slotOnItem( TQIconViewItem * ) ) ); slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); - if ( kapp ) { // maybe null when used inside designer - connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); - kapp->addKipcEventMask( KIPC::SettingsChanged ); + if ( tdeApp ) { // maybe null when used inside designer + connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); + tdeApp->addKipcEventMask( KIPC::SettingsChanged ); } m_pCurrentItem = 0L; diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index a17afc59c..5344e83ca 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -196,8 +196,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) topLayout->addWidget( mPlainPage, 10 ); } - if ( kapp ) - connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); + if ( tdeApp ) + connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); mValid = true; setSwallowedWidget(0); // Set default size if 'mFace' is Swallow. diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index 052710d89..15c8ef78e 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -451,7 +451,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) //d->stdDict->setAutoDelete( true ); //if (type == Application || type == ApplicationGlobal) // readStdKeys(); - connect( kapp, TQ_SIGNAL( settingsChanged( int )), TQ_SLOT( slotSettingsChanged( int ))); + connect( tdeApp, TQ_SIGNAL( settingsChanged( int )), TQ_SLOT( slotSettingsChanged( int ))); if( allChoosers == NULL ) allChoosers = allChoosersDeleter.setObject( allChoosers, new TQValueList< KKeyChooser* > ); allChoosers->append( this ); diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index c1fc7d8f0..c19d22058 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -161,7 +161,7 @@ void KLineEdit::setCompletionMode( TDEGlobalSettings::Completion mode ) if ( echoMode() != TQLineEdit::Normal ) mode = TDEGlobalSettings::CompletionNone; // Override the request. - if ( kapp && !kapp->authorize("lineedit_text_completion") ) + if ( tdeApp && !tdeApp->authorize("lineedit_text_completion") ) mode = TDEGlobalSettings::CompletionNone; if ( mode == TDEGlobalSettings::CompletionPopupAuto || @@ -876,7 +876,7 @@ TQPopupMenu *KLineEdit::createPopupMenu() // If a completion object is present and the input // widget is not read-only, show the Text Completion // menu item. - if ( compObj() && !isReadOnly() && kapp->authorize("lineedit_text_completion") ) + if ( compObj() && !isReadOnly() && tdeApp->authorize("lineedit_text_completion") ) { TQPopupMenu *subMenu = new TQPopupMenu( popup ); connect( subMenu, TQ_SIGNAL( activated( int ) ), diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp index 22ca4428c..69483d71c 100644 --- a/tdeui/kpanelapplet.cpp +++ b/tdeui/kpanelapplet.cpp @@ -60,7 +60,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type, } setBackgroundOrigin( AncestorOrigin ); - d->sharedConfig = TDESharedConfig::openConfig(configFile, kapp && kapp->config()->isImmutable()); + d->sharedConfig = TDESharedConfig::openConfig(configFile, tdeApp && tdeApp->config()->isImmutable()); _config = d->sharedConfig; } diff --git a/tdeui/kpanelappmenu.cpp b/tdeui/kpanelappmenu.cpp index 247d844de..e8eb6faa9 100644 --- a/tdeui/kpanelappmenu.cpp +++ b/tdeui/kpanelappmenu.cpp @@ -60,7 +60,7 @@ KPanelAppMenu::KPanelAppMenu(TQObject *parent, const char *name) void KPanelAppMenu::init(const TQPixmap &icon, const TQString &title) { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if(!client->isAttached()) client->attach(); TQByteArray sendData, replyData; @@ -86,7 +86,7 @@ void KPanelAppMenu::init(const TQPixmap &icon, const TQString &title) KPanelAppMenu::~KPanelAppMenu() { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray sendData; TQDataStream stream(sendData, IO_WriteOnly); stream << realObjId; @@ -97,7 +97,7 @@ int KPanelAppMenu::insertItem(const TQPixmap &icon, const TQString &text, int id { if ( id < 0 ) id = panelmenu_get_seq_id(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray sendData; TQDataStream stream(sendData, IO_WriteOnly); stream << icon << text << id; @@ -110,7 +110,7 @@ KPanelAppMenu *KPanelAppMenu::insertMenu(const TQPixmap &icon, const TQString &t { if ( id < 0 ) id = panelmenu_get_seq_id(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray sendData, replyData; TQCString replyType; TQDataStream stream(sendData, IO_WriteOnly); @@ -135,7 +135,7 @@ int KPanelAppMenu::insertItem(const TQString &text, int id ) { if ( id < 0 ) id = panelmenu_get_seq_id(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray sendData; TQDataStream stream(sendData, IO_WriteOnly); stream << text << id; @@ -146,7 +146,7 @@ int KPanelAppMenu::insertItem(const TQString &text, int id ) void KPanelAppMenu::clear() { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray sendData; client->send("kicker", realObjId, "clear()", sendData); } diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp index 701b1f7f7..5b947cadf 100644 --- a/tdeui/kprogress.cpp +++ b/tdeui/kprogress.cpp @@ -180,7 +180,7 @@ KProgressDialog::KProgressDialog(TQWidget* parent, const char* name, d(new KProgressDialogPrivate) { #ifdef TQ_WS_X11 - KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); + KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon()); #endif mShowTimer = new TQTimer(this); @@ -215,7 +215,7 @@ void KProgressDialog::slotAutoShow() } show(); - kapp->processEvents(); + tdeApp->processEvents(); } void KProgressDialog::slotCancel() diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp index 02b60afe4..3c88b2aa5 100644 --- a/tdeui/kprogressbox.cpp +++ b/tdeui/kprogressbox.cpp @@ -68,7 +68,7 @@ KProgressBoxDialog::KProgressBoxDialog(TQWidget* parent, const char* name, d(new KProgressBoxDialogPrivate) { #ifdef TQ_WS_X11 - KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); + KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon()); #endif mShowTimer = new TQTimer(this); @@ -105,7 +105,7 @@ void KProgressBoxDialog::slotAutoShow() } show(); - kapp->processEvents(); + tdeApp->processEvents(); } void KProgressBoxDialog::slotCancel() diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp index 3c73de83e..e4efcf5e2 100644 --- a/tdeui/kpushbutton.cpp +++ b/tdeui/kpushbutton.cpp @@ -104,11 +104,11 @@ void KPushButton::init( const KGuiItem &item ) TQWhatsThis::add( this, item.whatsThis() ); - if (kapp) + if (tdeApp) { - connect( kapp, TQ_SIGNAL( settingsChanged(int) ), + connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); - kapp->addKipcEventMask( KIPC::SettingsChanged ); + tdeApp->addKipcEventMask( KIPC::SettingsChanged ); } } diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp index 5a0923566..ac54511f4 100644 --- a/tdeui/krootpixmap.cpp +++ b/tdeui/krootpixmap.cpp @@ -67,7 +67,7 @@ void KRootPixmap::init() m_bActive = false; m_bCustomPaint = false; - connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); + connect(tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint())); #ifdef TQ_WS_X11 connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); @@ -277,7 +277,7 @@ void KRootPixmap::enableExports() { #ifdef TQ_WS_X11 kdDebug(270) << k_lineinfo << "activating background exports.\n"; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); TQByteArray data; diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index 8256ad72a..8a43a5e82 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/ksconfig.cpp @@ -974,7 +974,7 @@ void KSpellConfig::activateHelp( void ) void KSpellConfig::sHelp( void ) { - kapp->invokeHelp("configuration", "tdespell"); + tdeApp->invokeHelp("configuration", "tdespell"); } /* diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp index e0bcca2eb..8152a885b 100644 --- a/tdeui/kstdaction.cpp +++ b/tdeui/kstdaction.cpp @@ -60,7 +60,7 @@ TDEAction* create( StdAction id, const char *name, const TQObject *recvr, const case Home: sLabel = i18n("beginning (of line)", "&Home"); break; case Help: sLabel = i18n("show help", "&Help"); break; - case AboutApp: iconName = kapp->miniIconName(); + case AboutApp: iconName = tdeApp->miniIconName(); case Preferences: case HelpContents: { diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index 096d9637c..192b378b5 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -75,7 +75,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) setBackgroundOrigin(WindowOrigin); hasQuit = 0; menu = new TDEPopupMenu( this ); - menu->insertTitle( kapp->miniIcon(), kapp->caption() ); + menu->insertTitle( tdeApp->miniIcon(), tdeApp->caption() ); move( -1000, -1000 ); KStdAction::quit(this, TQ_SLOT(maybeQuit()), d->actionCollection); @@ -193,12 +193,12 @@ void KSystemTray::minimizeRestoreAction() void KSystemTray::maybeQuit() { TQString query = i18n("<qt>Are you sure you want to quit <b>%1</b>?</qt>") - .arg(kapp->caption()); + .arg(tdeApp->caption()); if (KMessageBox::warningContinueCancel(this, query, i18n("Confirm Quit From System Tray"), KStdGuiItem::quit(), TQString("systemtrayquit%1") - .arg(kapp->caption())) != + .arg(tdeApp->caption())) != KMessageBox::Continue) { return; @@ -314,7 +314,7 @@ TDEActionCollection* KSystemTray::actionCollection() TQPixmap KSystemTray::loadIcon( const TQString &icon, TDEInstance *instance ) { - TDEConfig *appCfg = kapp->config(); + TDEConfig *appCfg = tdeApp->config(); TDEConfigGroupSaver configSaver(appCfg, "System Tray"); int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22); return instance->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth ); diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp index f53973352..b602570be 100644 --- a/tdeui/ktextbrowser.cpp +++ b/tdeui/ktextbrowser.cpp @@ -64,7 +64,7 @@ void KTextBrowser::setSource( const TQString& name ) { if( !mNotifyClick ) { - kapp->invokeMailer( KURL( name ) ); + tdeApp->invokeMailer( KURL( name ) ); } else { @@ -75,7 +75,7 @@ void KTextBrowser::setSource( const TQString& name ) { if( !mNotifyClick ) { - kapp->invokeBrowser( name ); + tdeApp->invokeBrowser( name ); } else { diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index 2c8a8ef08..f9202bd30 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -64,7 +64,7 @@ KTipDatabase::KTipDatabase(const TQString &_tipFile) loadTips(tipFile); if (!mTips.isEmpty()) - mCurrent = kapp->random() % mTips.count(); + mCurrent = tdeApp->random() % mTips.count(); } @@ -80,7 +80,7 @@ KTipDatabase::KTipDatabase( const TQStringList& tipsFiles ) addTips( *it ); } if (!mTips.isEmpty()) - mCurrent = kapp->random() % mTips.count(); + mCurrent = tdeApp->random() % mTips.count(); } @@ -301,7 +301,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) ok->setDefault(true); hbox2->addWidget(ok); - TDEConfigGroup config(kapp->config(), "TipOfDay"); + TDEConfigGroup config(tdeApp->config(), "TipOfDay"); mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", true)); connect(next, TQ_SIGNAL(clicked()), this, TQ_SLOT(nextTip())); @@ -322,7 +322,7 @@ KTipDialog::~KTipDialog() void KTipDialog::showTip(const TQString &tipFile, bool force) { - showTip(kapp->mainWidget(), tipFile, force); + showTip(tdeApp->mainWidget(), tipFile, force); } void KTipDialog::showTip(TQWidget *parent, const TQString &tipFile, bool force) @@ -332,7 +332,7 @@ void KTipDialog::showTip(TQWidget *parent, const TQString &tipFile, bool force) void KTipDialog::showMultiTip(TQWidget *parent, const TQStringList &tipFiles, bool force) { - TDEConfigGroup configGroup(kapp->config(), "TipOfDay"); + TDEConfigGroup configGroup(tdeApp->config(), "TipOfDay"); const bool runOnStart = configGroup.readBoolEntry("RunOnStart", true); @@ -347,11 +347,11 @@ void KTipDialog::showMultiTip(TQWidget *parent, const TQStringList &tipFiles, bo const int oneDay = 24*60*60; TQDateTime lastShown = configGroup.readDateTimeEntry("TipLastShown"); // Show tip roughly once a week - if (lastShown.secsTo(TQDateTime::currentDateTime()) < (oneDay + (kapp->random() % (10*oneDay)))) + if (lastShown.secsTo(TQDateTime::currentDateTime()) < (oneDay + (tdeApp->random() % (10*oneDay)))) return; } configGroup.writeEntry("TipLastShown", TQDateTime::currentDateTime()); - kapp->config()->sync(); + tdeApp->config()->sync(); if (!hasLastShown) return; // Don't show tip on first start } @@ -418,7 +418,7 @@ static TQString fixTip(TQString tip) void KTipDialog::setShowOnStart(bool on) { - TDEConfigGroup config(kapp->config(), "TipOfDay"); + TDEConfigGroup config(tdeApp->config(), "TipOfDay"); config.writeEntry("RunOnStart", on); config.sync(); } diff --git a/tdeui/kwhatsthismanager.cpp b/tdeui/kwhatsthismanager.cpp index 46643f6f0..e3a2fdf2e 100644 --- a/tdeui/kwhatsthismanager.cpp +++ b/tdeui/kwhatsthismanager.cpp @@ -84,7 +84,7 @@ bool KWhatsThisUndefined::clicked (const TQString& href) body . append ("\nPlease type in your what's this help between these lines: " "\n--%-----------------------------------------------------------------------\n" "\n--%-----------------------------------------------------------------------"); - kapp -> invokeMailer ("quality-whatsthis@kde.org", "", "", subj, body); + tdeApp -> invokeMailer ("quality-whatsthis@kde.org", "", "", subj, body); } return TRUE; } diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp index c3dd1c233..404df80e5 100644 --- a/tdeui/kxmlguibuilder.cpp +++ b/tdeui/kxmlguibuilder.cpp @@ -150,7 +150,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ TQCString name = element.attribute( d->attrName ).utf8(); - if (!kapp->authorizeTDEAction(name)) + if (!tdeApp->authorizeTDEAction(name)) return 0; TDEPopupMenu *popup = new TDEPopupMenu( p, name); diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp index de015b5a4..e52cc31bc 100644 --- a/tdeui/kxmlguiclient.cpp +++ b/tdeui/kxmlguiclient.cpp @@ -292,7 +292,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, { TQCString name = e.attribute( attrName ).utf8(); // WABA if ( !actionCollection->action( name.data() ) || - (kapp && !kapp->authorizeTDEAction(name))) + (tdeApp && !tdeApp->authorizeTDEAction(name))) { // remove this child as we aren't using it base.removeChild( e ); diff --git a/tdeui/tdeaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp index 636d336f2..8995b01b4 100644 --- a/tdeui/tdeaboutapplication.cpp +++ b/tdeui/tdeaboutapplication.cpp @@ -36,7 +36,7 @@ TDEAboutApplication::TDEAboutApplication( TQWidget *parent, const char *name, bool modal ) :TDEAboutDialog( AbtTabbed|AbtProduct, - kapp ? kapp->caption() : TQString::null, + tdeApp ? tdeApp->caption() : TQString::null, Close, Close, parent, name, modal ) { @@ -60,7 +60,7 @@ void TDEAboutApplication::buildDialog( const TDEAboutData *aboutData ) // //i18n "??" is displayed as (pseudo-)version when no data is known about the application - setProduct( kapp ? kapp->caption() : TQString::null, i18n("??"), TQString::null, TQString::null ); + setProduct( tdeApp ? tdeApp->caption() : TQString::null, i18n("??"), TQString::null, TQString::null ); TDEAboutContainer *appPage = addContainerPage( i18n("&About")); TQString appPageText = diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp index 57bc84d24..fddcffde4 100644 --- a/tdeui/tdeaboutdialog.cpp +++ b/tdeui/tdeaboutdialog.cpp @@ -693,13 +693,13 @@ void TDEAboutContainerBase::setProduct( const TQString &appName, return; } - if ( kapp ) + if ( tdeApp ) { - mIconLabel->setPixmap( kapp->icon() ); - kdDebug(291) << "setPixmap (iconName): " << kapp->iconName() << endl; + mIconLabel->setPixmap( tdeApp->icon() ); + kdDebug(291) << "setPixmap (iconName): " << tdeApp->iconName() << endl; } else - kdDebug(291) << "no kapp" << endl; + kdDebug(291) << "no tdeApp" << endl; const TQString msg1 = i18n("%1 %2 (Using Trinity %3)").arg(appName).arg(version). arg(TQString::fromLatin1(TDE_VERSION_STRING)); @@ -1615,8 +1615,8 @@ void TDEAboutDialog::setVersion(const TQString &_name) void TDEAboutDialog::sendEmailSlot(const TQString& /*name*/, const TQString& email) { - if ( kapp ) - kapp->invokeMailer( email, TQString::null ); + if ( tdeApp ) + tdeApp->invokeMailer( email, TQString::null ); /* kdDebug() << "TDEAboutDialog::sendEmailSlot: request to send an email to " << name << ", " << email << endl; @@ -1626,8 +1626,8 @@ void TDEAboutDialog::sendEmailSlot(const TQString& /*name*/, const TQString& ema void TDEAboutDialog::openURLSlot(const TQString& url) { - if ( kapp ) - kapp->invokeBrowser( url ); + if ( tdeApp ) + tdeApp->invokeBrowser( url ); //kdDebug() << "TDEAboutDialog::openURLSlot: request to open URL " << url << endl; //emit(openURL(url)); } diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp index d63e71feb..bd6f6d83d 100644 --- a/tdeui/tdeaction.cpp +++ b/tdeui/tdeaction.cpp @@ -452,7 +452,7 @@ bool TDEAction::setShortcut( const TDEShortcut& cut ) bool TDEAction::updateTDEAccelShortcut( TDEAccel* tdeaccel ) { // Check if action is permitted - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return false; bool b = true; @@ -644,7 +644,7 @@ int TDEAction::plug( TQWidget *w, int index ) #endif // Check if action is permitted - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; plugShortcut(); diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp index ad9c4d102..eaa9f244a 100644 --- a/tdeui/tdeactionclasses.cpp +++ b/tdeui/tdeactionclasses.cpp @@ -142,7 +142,7 @@ int TDEToggleAction::plug( TQWidget* widget, int index ) kdWarning() << "Can not plug TDEToggleAction in " << widget->className() << endl; return -1; } - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; int _index = TDEAction::plug( widget, index ); @@ -638,7 +638,7 @@ void TDESelectAction::updateItems( int id ) int TDESelectAction::plug( TQWidget *widget, int index ) { - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; kdDebug(129) << "TDESelectAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis if ( ::tqt_cast<TQPopupMenu *>( widget) ) @@ -1268,7 +1268,7 @@ void TDERecentFilesAction::menuAboutToShow() int TDERecentFilesAction::plug( TQWidget *widget, int index ) { - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; // This is very related to TDEActionMenu::plug. // In fact this class could be an interesting base class for TDEActionMenu @@ -1524,7 +1524,7 @@ void TDEFontAction::setFont( const TQString &family ) int TDEFontAction::plug( TQWidget *w, int index ) { - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; if ( ::tqt_cast<TDEToolBar *>( w ) ) { @@ -1793,7 +1793,7 @@ void TDEActionMenu::setStickyMenu(bool sticky) { int TDEActionMenu::plug( TQWidget* widget, int index ) { - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; kdDebug(129) << "TDEActionMenu::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis if ( ::tqt_cast<TQPopupMenu *>( widget ) ) @@ -1939,7 +1939,7 @@ void TDEToolBarPopupAction::setStickyMenu(bool sticky) { int TDEToolBarPopupAction::plug( TQWidget *widget, int index ) { - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; // This is very related to TDEActionMenu::plug. // In fact this class could be an interesting base class for TDEActionMenu @@ -2018,7 +2018,7 @@ TDEToggleToolBarAction::~TDEToggleToolBarAction() int TDEToggleToolBarAction::plug( TQWidget* w, int index ) { - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; if ( !m_toolBar ) { @@ -2150,7 +2150,7 @@ void KWidgetAction::setAutoSized( bool autoSized ) int KWidgetAction::plug( TQWidget* w, int index ) { - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; if ( !::tqt_cast<TDEToolBar *>( w ) ) { @@ -2283,7 +2283,7 @@ void TDEPasteTextAction::setMixedMode(bool mode) int TDEPasteTextAction::plug( TQWidget *widget, int index ) { - if (kapp && !kapp->authorizeTDEAction(name())) + if (tdeApp && !tdeApp->authorizeTDEAction(name())) return -1; if ( ::tqt_cast<TDEToolBar *>( widget ) ) { @@ -2320,7 +2320,7 @@ void TDEPasteTextAction::menuAboutToShow() { m_popup->clear(); TQStringList list; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (client->isAttached() && client->isApplicationRegistered("klipper")) { DCOPRef klipper("klipper","klipper"); DCOPReply reply = klipper.call("getClipboardHistoryMenu"); @@ -2346,7 +2346,7 @@ void TDEPasteTextAction::menuAboutToShow() void TDEPasteTextAction::menuItemActivated( int id) { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (client->isAttached() && client->isApplicationRegistered("klipper")) { DCOPRef klipper("klipper","klipper"); DCOPReply reply = klipper.call("getClipboardHistoryItem(int)", m_popup->indexOf(id)); diff --git a/tdeui/tdelistbox.cpp b/tdeui/tdelistbox.cpp index 256e1669d..186987836 100644 --- a/tdeui/tdelistbox.cpp +++ b/tdeui/tdelistbox.cpp @@ -35,10 +35,10 @@ TDEListBox::TDEListBox( TQWidget *parent, const char *name, WFlags f ) connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ), this, TQ_SLOT( slotOnItem( TQListBoxItem * ) ) ); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); - if (kapp) + if (tdeApp) { - connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); - kapp->addKipcEventMask( KIPC::SettingsChanged ); + connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); + tdeApp->addKipcEventMask( KIPC::SettingsChanged ); } m_pCurrentItem = 0L; diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp index 868be813d..cf986b538 100644 --- a/tdeui/tdelistview.cpp +++ b/tdeui/tdelistview.cpp @@ -470,10 +470,10 @@ TDEListView::TDEListView( TQWidget *parent, const char *name ) this, TQ_SLOT(cleanItemHighlighter())); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); - if (kapp) + if (tdeApp) { - connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); - kapp->addKipcEventMask( KIPC::SettingsChanged ); + connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); + tdeApp->addKipcEventMask( KIPC::SettingsChanged ); } connect(&d->autoSelect, TQ_SIGNAL( timeout() ), diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp index 817c14423..33eb53676 100644 --- a/tdeui/tdemainwindow.cpp +++ b/tdeui/tdemainwindow.cpp @@ -93,7 +93,7 @@ public: } bool saveState( TQSessionManager& ) { - TDEConfig* config = TDEApplication::kApplication()->sessionConfig(); + TDEConfig* config = tdeApp->sessionConfig(); if ( TDEMainWindow::memberList->first() ){ // According to Jochen Wilhelmy <digisnap@cs.tu-berlin.de>, this // hook is useful for better document orientation @@ -182,9 +182,9 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags) KWhatsThisManager::init (); setDockMenuEnabled( false ); mHelpMenu = 0; - kapp->setTopWidget( this ); + tdeApp->setTopWidget( this ); actionCollection()->setWidget( this ); - connect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown())); + connect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown())); if( !memberList ) memberList = new TQPtrList<TDEMainWindow>; @@ -196,7 +196,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags) int unusedNumber; if ( !name ) { // no name given - objname = kapp->instanceName() + "-mainwindow#"; + objname = tdeApp->instanceName() + "-mainwindow#"; s = objname + '1'; // start adding number immediately unusedNumber = 1; } @@ -213,7 +213,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags) unusedNumber = 0; // add numbers only when needed } for(;;) { - TQWidgetList* list = kapp->topLevelWidgets(); + TQWidgetList* list = tdeApp->topLevelWidgets(); TQWidgetListIt it( *list ); bool found = false; for( TQWidget* w = it.current(); @@ -246,13 +246,13 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags) d->shuttingDown = false; if ((d->care_about_geometry = being_first)) { being_first = false; - if ( kapp->geometryArgument().isNull() ) // if there is no geometry, it doesn't matter + if ( tdeApp->geometryArgument().isNull() ) // if there is no geometry, it doesn't matter d->care_about_geometry = false; else parseGeometry(false); } - setCaption( kapp->caption() ); + setCaption( tdeApp->caption() ); if ( cflags & NoDCOPObject) d->m_interface = 0; else @@ -260,13 +260,13 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags) if ( cflags & NewRefCountMode ) { d->newStyleRefCounting = true; - kapp->ref(); + tdeApp->ref(); } else { d->newStyleRefCounting = false; } - if (!kapp->authorize("movable_toolbars")) + if (!tdeApp->authorize("movable_toolbars")) setDockWindowsMovable(false); } @@ -287,13 +287,13 @@ void TDEMainWindow::setupToolbarMenuActions() void TDEMainWindow::parseGeometry(bool parsewidth) { - assert ( !kapp->geometryArgument().isNull() ); + assert ( !tdeApp->geometryArgument().isNull() ); assert ( d->care_about_geometry ); #if defined TQ_WS_X11 int x, y; int w, h; - int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h); + int m = XParseGeometry( tdeApp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h); if (parsewidth) { TQSize minSize = minimumSize(); TQSize maxSize = maximumSize(); @@ -360,9 +360,9 @@ TDEPopupMenu* TDEMainWindow::customHelpMenu( bool showWhatsThis ) bool TDEMainWindow::canBeRestored( int number ) { - if ( !kapp->isRestored() ) + if ( !tdeApp->isRestored() ) return false; - TDEConfig *config = kapp->sessionConfig(); + TDEConfig *config = tdeApp->sessionConfig(); if ( !config ) return false; config->setGroup( TQString::fromLatin1("Number") ); @@ -372,9 +372,9 @@ bool TDEMainWindow::canBeRestored( int number ) const TQString TDEMainWindow::classNameOfToplevel( int number ) { - if ( !kapp->isRestored() ) + if ( !tdeApp->isRestored() ) return TQString::null; - TDEConfig *config = kapp->sessionConfig(); + TDEConfig *config = tdeApp->sessionConfig(); if ( !config ) return TQString::null; TQString s; @@ -421,7 +421,7 @@ bool TDEMainWindow::restore( int number, bool show ) { if ( !canBeRestored( number ) ) return false; - TDEConfig *config = kapp->sessionConfig(); + TDEConfig *config = tdeApp->sessionConfig(); if ( readPropertiesInternal( config, number ) ){ if ( show ) TDEMainWindow::show(); @@ -589,12 +589,12 @@ bool TDEMainWindow::isHelpMenuEnabled() void TDEMainWindow::setCaption( const TQString &caption ) { - setPlainCaption( kapp->makeStdCaption(caption) ); + setPlainCaption( tdeApp->makeStdCaption(caption) ); } void TDEMainWindow::setCaption( const TQString &caption, bool modified ) { - setPlainCaption( kapp->makeStdCaption(caption, true, modified) ); + setPlainCaption( tdeApp->makeStdCaption(caption, true, modified) ); } void TDEMainWindow::setPlainCaption( const TQString &caption ) @@ -657,11 +657,11 @@ void TDEMainWindow::closeEvent ( TQCloseEvent *e ) } if ( !no_query_exit && not_withdrawn <= 0 ) { // last window close accepted? - if ( queryExit() && !kapp->sessionSaving() && !d->shuttingDown ) { // Yes, Quit app? + if ( queryExit() && !tdeApp->sessionSaving() && !d->shuttingDown ) { // Yes, Quit app? // don't call queryExit() twice - disconnect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown())); + disconnect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown())); d->shuttingDown = true; - kapp->deref(); // ...and quit application. + tdeApp->deref(); // ...and quit application. } else { // cancel closing, it's stupid to end up with no windows at all.... e->ignore(); @@ -1216,7 +1216,7 @@ TQSize TDEMainWindow::sizeForCentralWidgetSize(TQSize size) break; case TDEToolBar::Flat: - size += TQSize(0, 3+kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent )); + size += TQSize(0, 3+tdeApp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent )); break; default: diff --git a/tdeui/tdemainwindow.h b/tdeui/tdemainwindow.h index 0a624b040..82b29e548 100644 --- a/tdeui/tdemainwindow.h +++ b/tdeui/tdemainwindow.h @@ -235,7 +235,7 @@ public: * * That means clients could simply do the following: * \code - * if (kapp->isRestored()){ + * if (tdeApp->isRestored()){ * int n = 1; * while (TDEMainWindow::canBeRestored(n)){ * (new childMW)->restore(n); @@ -260,7 +260,7 @@ public: * for backwards compatibility with 3.1 and 3.0 branches: * * \code - * if (kapp->isRestored()) + * if (tdeApp->isRestored()) * RESTORE(childMW) * else { * // create default application as usual @@ -275,7 +275,7 @@ public: * use the templated kRestoreMainWindows global functions: * * \code - * if (kapp->isRestored()) + * if (tdeApp->isRestored()) * kRestoreMainWindows< childMW1, childMW2, childMW3 >(); * else { * // create default application as usual diff --git a/tdeui/tdemainwindowiface.cpp b/tdeui/tdemainwindowiface.cpp index a18fb80ed..a3c6c2282 100644 --- a/tdeui/tdemainwindowiface.cpp +++ b/tdeui/tdemainwindowiface.cpp @@ -122,7 +122,7 @@ TQCString TDEMainWindowInterface::actionToolTip( TQCString action) DCOPRef TDEMainWindowInterface::action( const TQCString &name ) { - return DCOPRef( kapp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) ); + return DCOPRef( tdeApp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) ); } TQMap<TQCString,DCOPRef> TDEMainWindowInterface::actionMap() diff --git a/tdeui/tdemenubar.cpp b/tdeui/tdemenubar.cpp index e7c901d56..c64e2c188 100644 --- a/tdeui/tdemenubar.cpp +++ b/tdeui/tdemenubar.cpp @@ -142,9 +142,9 @@ KMenuBar::KMenuBar(TQWidget *parent, const char *name) connect( tqApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( updateFallbackSize())); - if ( kapp ) + if ( tdeApp ) // toolbarAppearanceChanged(int) is sent when changing macstyle - connect( kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)), + connect( tdeApp, TQ_SIGNAL(toolbarAppearanceChanged(int)), this, TQ_SLOT(slotReadConfig())); slotReadConfig(); @@ -333,10 +333,10 @@ void KMenuBar::selectionTimeout() int screen = xineramaConfig.readNumEntry("MenubarScreen", TQApplication::desktop()->screenNumber(TQPoint(0,0)) ); TQRect area; - if (kapp->desktop()->numScreens() < 2) - area = kapp->desktop()->geometry(); + if (tdeApp->desktop()->numScreens() < 2) + area = tdeApp->desktop()->geometry(); else - area = kapp->desktop()->screenGeometry(screen); + area = tdeApp->desktop()->screenGeometry(screen); int margin = 0; move(area.left() - margin, area.top() - margin); setFixedSize(area.width() + 2* margin , heightForWidth( area.width() + 2 * margin ) ); diff --git a/tdeui/tdemessagebox.cpp b/tdeui/tdemessagebox.cpp index 49648a74d..b92e32488 100644 --- a/tdeui/tdemessagebox.cpp +++ b/tdeui/tdemessagebox.cpp @@ -972,7 +972,7 @@ KMessageBox::about(TQWidget *parent, const TQString &text, { TQString _caption = caption; if (_caption.isEmpty()) - _caption = i18n("About %1").arg(kapp->caption()); + _caption = i18n("About %1").arg(tdeApp->caption()); KDialogBase *dialog = new KDialogBase( caption, @@ -981,7 +981,7 @@ KMessageBox::about(TQWidget *parent, const TQString &text, parent, "about", true, true, KStdGuiItem::ok() ); - TQPixmap ret = TDEApplication::kApplication()->icon(); + TQPixmap ret = tdeApp->icon(); if (ret.isNull()) ret = TQMessageBox::standardIcon(TQMessageBox::Information); dialog->setIcon(ret); diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp index 5195c64a8..7c024e31a 100644 --- a/tdeui/tdepopupmenu.cpp +++ b/tdeui/tdepopupmenu.cpp @@ -86,7 +86,7 @@ void TDEPopupTitle::paintEvent(TQPaintEvent *) { TQRect r(rect()); TQPainter p(this); - kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active()); + tdeApp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active()); if (!miniicon.isNull()) p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon); diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp index be0386dea..f808cd5b3 100644 --- a/tdeui/tdeshortcutdialog.cpp +++ b/tdeui/tdeshortcutdialog.cpp @@ -122,7 +122,7 @@ TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShort updateDetails(); #ifdef TQ_WS_X11 - kapp->installX11EventFilter( this ); // Allow button to capture X Key Events. + tdeApp->installX11EventFilter( this ); // Allow button to capture X Key Events. #endif } @@ -219,7 +219,7 @@ void TDEShortcutDialog::updateDetails() m_simple->m_txtShortcut->setFocus(); m_adv->m_btnMultiKey->setChecked( false ); } - kapp->processEvents(); + tdeApp->processEvents(); adjustSize(); } diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp index 0e47a172c..a7792eaf7 100644 --- a/tdeui/tdespell.cpp +++ b/tdeui/tdespell.cpp @@ -381,7 +381,7 @@ KSpell::setUpDialog( bool reallyuseprogressbar ) ksdlg, TQ_SLOT(slotProgress(unsigned int)) ); #ifdef TQ_WS_X11 // FIXME(E): Implement for Qt/Embedded - KWin::setIcons( ksdlg->winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( ksdlg->winId(), tdeApp->icon(), tdeApp->miniIcon() ); #endif if ( modaldlg ) ksdlg->setFocus(); @@ -1403,7 +1403,7 @@ KSpell::modalCheck( TQString& text, KSpellConfig* _kcs ) 0, _kcs, true, true ); while (spell->status()!=Finished) - kapp->processEvents(); + tdeApp->processEvents(); text = modaltext; diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp index 817af5007..6f93db4fc 100644 --- a/tdeui/tdetoolbar.cpp +++ b/tdeui/tdetoolbar.cpp @@ -237,11 +237,11 @@ void TDEToolBar::init( bool readConfig, bool honorStyle ) connect( &(d->repaintTimer), TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotRepaint() ) ); - if ( kapp ) { // may be null when started inside designer - connect(kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)), this, TQ_SLOT(slotAppearanceChanged())); + if ( tdeApp ) { // may be null when started inside designer + connect(tdeApp, TQ_SIGNAL(toolbarAppearanceChanged(int)), this, TQ_SLOT(slotAppearanceChanged())); // request notification of changes in icon style - kapp->addKipcEventMask(KIPC::IconChanged); - connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int))); + tdeApp->addKipcEventMask(KIPC::IconChanged); + connect(tdeApp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int))); } // finally, read in our configurable settings @@ -1133,7 +1133,7 @@ void TDEToolBar::setXMLGUIClient( KXMLGUIClient *client ) void TDEToolBar::setText( const TQString & txt ) { - setLabel( txt + " (" + kapp->caption() + ") " ); + setLabel( txt + " (" + tdeApp->caption() + ") " ); } diff --git a/tdeui/tdetoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp index 37540ae92..aff328aca 100644 --- a/tdeui/tdetoolbarhandler.cpp +++ b/tdeui/tdetoolbarhandler.cpp @@ -181,7 +181,7 @@ void ToolBarHandler::setupActions() this, TQ_SLOT( setupActions() ) ); */ - if (kapp && kapp->authorizeTDEAction("options_show_toolbar")) + if (tdeApp && tdeApp->authorizeTDEAction("options_show_toolbar")) plugActionList( actionListName, m_actions ); connectToActionContainers(); diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp index 7e51396c1..9a8a2b3ed 100644 --- a/tdeui/tests/kcomboboxtest.cpp +++ b/tdeui/tests/kcomboboxtest.cpp @@ -212,7 +212,7 @@ void KComboBoxTest::slotReturnPressed(const TQString& item) void KComboBoxTest::quitApp() { - kapp->closeAllWindows(); + tdeApp->closeAllWindows(); } int main ( int argc, char **argv) diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp index ba3f97d74..e1583fa4a 100644 --- a/tdeui/tests/kdockwidgetdemo.cpp +++ b/tdeui/tests/kdockwidgetdemo.cpp @@ -81,7 +81,7 @@ static const char *preview_xpm[] = { SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const char* name ) :TQDialog(0L,name,true) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( TQString::fromLatin1("SFileDialogData:") + name ); if ( initially.isNull() ){ initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() ); @@ -166,7 +166,7 @@ void SFileDialog::dockChange() SFileDialog::~SFileDialog() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( TQString("SFileDialogData:") + name() ); config->writeEntry( "Bookmarks", fd->getBookmark() ); @@ -188,7 +188,7 @@ void SFileDialog::setDockDefaultPos( KDockWidget* d ) void SFileDialog::changeDir( const TQString& f ) { if ( !f.isEmpty() ){ - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup( TQString("SFileDialogData:") + name() ); config->writePathEntry( "InitiallyDir", f ); } diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp index e9601ccec..e22ea882e 100644 --- a/tdeui/tests/klineedittest.cpp +++ b/tdeui/tests/klineedittest.cpp @@ -65,7 +65,7 @@ KLineEditTest::~KLineEditTest() void KLineEditTest::quitApp() { - kapp->closeAllWindows(); + tdeApp->closeAllWindows(); } void KLineEditTest::show() diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp index a2bb2b6e8..47b432a37 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", TDEApplication::kApplication(), + fileMenu->insertItem ("&Exit", tdeApp, TQ_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( TDEApplication::kApplication()->caption() ); + setCaption( tdeApp->caption() ); smenu = new TQPopupMenu; diff --git a/tdeui/tests/tdemainwindowrestoretest.cpp b/tdeui/tests/tdemainwindowrestoretest.cpp index 559348ec0..453550b16 100644 --- a/tdeui/tests/tdemainwindowrestoretest.cpp +++ b/tdeui/tests/tdemainwindowrestoretest.cpp @@ -16,7 +16,7 @@ int main( int argc, char * argv[] ) { TDEApplication app( argc, argv, "tdemainwindowrestoretest" ); - if ( kapp->isRestored() ) { + if ( tdeApp->isRestored() ) { kRestoreMainWindows< MainWin1, MainWin2, MainWin3 >(); kRestoreMainWindows< MainWin4, MainWin5 >(); RESTORE(MainWin6); diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp index 8fd5170e0..2f43c15d8 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", TDEApplication::kApplication(), + fileMenu->insertItem ("&Exit", tdeApp, TQ_SLOT( quit() ), ALT + Key_Q ); // Another popup... @@ -148,7 +148,7 @@ setAutoSaveSettings(); // Now add another button and align it right pix = BarIcon("system-log-out"); - tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(), + tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), tdeApp, TQ_SLOT( quit() ), true, "Exit"); tb->alignItemRight (6); @@ -291,7 +291,7 @@ void testWindow::slotGoGoGoo() void testWindow::slotSave() { - kapp->beep(); + tdeApp->beep(); statusBar->changeItem("Saving properties...", 0); } @@ -408,7 +408,7 @@ void testWindow::slotExit () { TQPixmap pix; pix = BarIcon("system-log-out"); - tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(), + tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), tdeApp, TQ_SLOT( quit() ), true, "Exit"); tb->alignItemRight (6); exitB = true; diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp index 0e070f79b..5c1f977bb 100644 --- a/tdeui/twindowlistmenu.cpp +++ b/tdeui/twindowlistmenu.cpp @@ -121,7 +121,7 @@ void KWindowListMenu::init() // Make sure the popup is not too wide, otherwise clicking in the middle of kdesktop // wouldn't leave any place for the popup, and release would activate some menu entry. - int maxwidth = kapp->desktop()->screenGeometry( this ).width() / 2 - 100; + int maxwidth = tdeApp->desktop()->screenGeometry( this ).width() / 2 - 100; clear(); map.clear(); @@ -242,12 +242,12 @@ void KWindowListMenu::selectActiveWindow() void KWindowListMenu::slotUnclutterWindows() { - kapp->dcopClient()->send(twinName(), "KWinInterface", "unclutterDesktop()", TQString("")); + tdeApp->dcopClient()->send(twinName(), "KWinInterface", "unclutterDesktop()", TQString("")); } void KWindowListMenu::slotCascadeWindows() { - kapp->dcopClient()->send(twinName(), "KWinInterface", "cascadeDesktop()", TQString("")); + tdeApp->dcopClient()->send(twinName(), "KWinInterface", "cascadeDesktop()", TQString("")); } void KWindowListMenu::virtual_hook( int id, void* data ) |