diff options
45 files changed, 97 insertions, 102 deletions
diff --git a/admin b/admin -Subproject 12bb2cad8e2982bd842d168158e391d6c12fb6a +Subproject 4185112a621d8c5bc88984b117f434c9560e2cc diff --git a/doc/kommander/installation.docbook b/doc/kommander/installation.docbook index 2cc83ac8..aeaa78ab 100644 --- a/doc/kommander/installation.docbook +++ b/doc/kommander/installation.docbook @@ -3,7 +3,7 @@ <appendix id="installation"> <title>Installation</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>How to obtain &kommander;</title> <!-- This first entity contains boiler plate for applications that are diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 8e92947d..5d94591f 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -806,7 +806,7 @@ void KImageMapEditor::slotUpdateSelectionCoords() { selectionStatusText = i18n(" Selection: x: %1, y: %2, w: %3, h: %4 ").arg(r.left()).arg(r.top()).arg(r.width()).arg(r.height()); // ,STATUS_SELECTION); - kapp->processEvents(); + tdeApp->processEvents(); } else selectionStatusText = i18n(" Selection: - "); //statusBar()->changeItem(" Selection : - ",STATUS_SELECTION); @@ -818,12 +818,12 @@ void KImageMapEditor::slotUpdateSelectionCoords( const TQRect & r ) { selectionStatusText = i18n(" Selection: x: %1, y: %2, w: %3, h: %4 ").arg(r.left()).arg(r.top()).arg(r.width()).arg(r.height()); updateStatusBar(); - kapp->processEvents(); + tdeApp->processEvents(); } TDEApplication* KImageMapEditor::app() const { - return kapp; + return tdeApp; } diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp index fe389c1a..3635cadd 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -800,14 +800,14 @@ PreferencesDialog::PreferencesDialog(TQWidget *parent, TDEConfig* conf) colorizeAreaChk = new TQCheckBox(hbox); colorizeAreaChk->setFixedWidth(60); - colorizeAreaChk->setChecked(kapp->config()->readBoolEntry("highlightareas",true)); + colorizeAreaChk->setChecked(tdeApp->config()->readBoolEntry("highlightareas",true)); hbox= new TQHBox(page); (void)new TQLabel(i18n("Show alternative text")+" ",hbox); showAltChk = new TQCheckBox(hbox); showAltChk->setFixedWidth(60); - showAltChk->setChecked(kapp->config()->readBoolEntry("showalt",true)); + showAltChk->setChecked(tdeApp->config()->readBoolEntry("showalt",true)); */ } diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index 2c69ab22..6352f1ff 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -101,7 +101,7 @@ bool KimeShell::queryClose() bool KimeShell::queryExit() { // writeConfig(); - saveProperties(kapp->config()); + saveProperties(tdeApp->config()); return true; } @@ -187,7 +187,7 @@ void KimeShell::fileOpen() void KimeShell::readConfig() { TDEConfig *config; - config = kapp->config(); + config = tdeApp->config(); config->setGroup("General Options"); readConfig(config); @@ -203,7 +203,7 @@ void KimeShell::readConfig(TDEConfig* config) { void KimeShell::writeConfig() { TDEConfig *config; - config = kapp->config(); + config = tdeApp->config(); config->setGroup("General Options"); writeConfig(config); diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp index e05087d1..6e4f656a 100644 --- a/klinkstatus/src/engine/searchmanager.cpp +++ b/klinkstatus/src/engine/searchmanager.cpp @@ -314,7 +314,7 @@ vector<LinkStatus*> SearchManager::children(LinkStatus* link) } if(count == 50) { - kapp->processEvents(); + tdeApp->processEvents(); count = 0; } } @@ -374,7 +374,7 @@ LinkStatus const* SearchManager::linkStatus(TQString const& s_url) const if(count == 50) { count = 0; - kapp->processEvents(); + tdeApp->processEvents(); } } @@ -599,7 +599,7 @@ void SearchManager::addLevel() } emit signalAddingLevelProgress(); -// kapp->processEvents(); +// tdeApp->processEvents(); } } if( (search_results_[search_results_.size() - 1]).size() == 0 ) diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp index 4103056f..f214a85b 100644 --- a/klinkstatus/src/global.cpp +++ b/klinkstatus/src/global.cpp @@ -44,7 +44,7 @@ Global::Global(TQObject *parent, const char *name) : TQObject(parent, name), loop_started_(false) { m_self_ = this; - dcop_client_ = kapp->dcopClient(); + dcop_client_ = tdeApp->dcopClient(); } Global::~Global() @@ -89,7 +89,7 @@ bool Global::isQuantaAvailableViaDCOP() TQCString Global::quantaDCOPAppId() { - DCOPClient* client = kapp->dcopClient(); + DCOPClient* client = tdeApp->dcopClient(); TQCString app_id; if(client->isApplicationRegistered("quanta")) // quanta is unnique application @@ -168,7 +168,7 @@ void Global::execCommand(TQString const& command) self(), TQ_SLOT(slotProcessTimeout())); timer->start(120*1000, true); self()->loop_started_ = true; - kapp->enter_loop(); + tdeApp->enter_loop(); delete timer; } } @@ -196,7 +196,7 @@ void Global::slotProcessTimeout() { if (loop_started_) { - kapp->exit_loop(); + tdeApp->exit_loop(); loop_started_ = false; } } diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index 7a125bb5..be1d4b0e 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -73,8 +73,8 @@ KLinkStatus::KLinkStatus() // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, i18n("Could not find the KLinkStatus part; did you configure with '--prefix=/$TDEDIR' and perform 'make install'?")); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -97,13 +97,13 @@ void KLinkStatus::load(const KURL& url) void KLinkStatus::setupActions() { - // KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + // KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); // The above causes a segfault when using File->Quit. // Here's Waldo's explanation: /* I had a look. The problem is due to the SessionWidget destructor calling KLSConfig. If you use the window button, the window and the SessionWidget is destructed first and then later the application is destructed. - If you use File->Quit it calls kapp->quit which destructs the application + If you use File->Quit it calls tdeApp->quit which destructs the application without destructing the window first. The application first destructs all static deleters and its administration, and then goes on to kill the remaining windows that it owns. Therein lies the problem because by then the diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp index 28ac2aa0..de8d2f38 100644 --- a/klinkstatus/src/ui/tablelinkstatus.cpp +++ b/klinkstatus/src/ui/tablelinkstatus.cpp @@ -314,7 +314,7 @@ void TableLinkstatus::slotCopyUrlToClipboard() const { TableItem* _item = myItem(currentRow(), currentColumn()); TQString content(_item->linkStatus()->absoluteUrl().prettyURL()); - TQClipboard* cb = kapp->clipboard(); + TQClipboard* cb = tdeApp->clipboard(); cb->setText(content); } @@ -322,14 +322,14 @@ void TableLinkstatus::slotCopyParentUrlToClipboard() const { TableItem* _item = myItem(currentRow(), currentColumn()); TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL()); - TQClipboard* cb = kapp->clipboard(); + TQClipboard* cb = tdeApp->clipboard(); cb->setText(content); } void TableLinkstatus::slotCopyCellTextToClipboard() const { TQString cell_text(text(currentRow(), currentColumn())); - TQClipboard* cb = kapp->clipboard(); + TQClipboard* cb = tdeApp->clipboard(); cb->setText(cell_text); } diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index c0cebe68..1ce7d009 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -219,7 +219,7 @@ void TreeView::slotCopyUrlToClipboard() const { TreeViewItem* _item = myItem(currentItem()); TQString content(_item->linkStatus()->absoluteUrl().prettyURL()); - TQClipboard* cb = kapp->clipboard(); + TQClipboard* cb = tdeApp->clipboard(); cb->setText(content); } @@ -227,7 +227,7 @@ void TreeView::slotCopyParentUrlToClipboard() const { TreeViewItem* _item = myItem(currentItem()); TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL()); - TQClipboard* cb = kapp->clipboard(); + TQClipboard* cb = tdeApp->clipboard(); cb->setText(content); } @@ -235,7 +235,7 @@ void TreeView::slotCopyCellTextToClipboard() const { TreeViewItem* _item = myItem(currentItem()); TQString cell_text(_item->text(current_column_)); - TQClipboard* cb = kapp->clipboard(); + TQClipboard* cb = tdeApp->clipboard(); cb->setText(cell_text); } diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp index 69366c5f..8ec1352f 100644 --- a/klinkstatus/src/utils/xsl.cpp +++ b/klinkstatus/src/utils/xsl.cpp @@ -141,7 +141,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe { if ( styleSheet ) { - static TQCString appPath( TQString::fromLatin1("\"%1\"").arg( TDEApplication::kApplication()->dirs()->findDirs("appdata", TQString::fromLatin1("styles/data") ).front() ).utf8() ); + static TQCString appPath( TQString::fromLatin1("\"%1\"").arg( tdeApp->dirs()->findDirs("appdata", TQString::fromLatin1("styles/data") ).front() ).utf8() ); static const char* params[3] = { "appdata", diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp index 78936267..a9cdb783 100644 --- a/kommander/editor/main.cpp +++ b/kommander/editor/main.cpp @@ -57,7 +57,7 @@ int main( int argc, char *argv[] ) TDELocale::setMainCatalogue("kommander"); TDEApplication a(true, true); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); bool splashScreen = config->readBoolEntry("SplashScreen", true); KSplashScreen* splash = 0; diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 9f926a95..1d0c3cfb 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -136,7 +136,7 @@ MainWindow::MainWindow(bool asClient) setupPlugins(); - kapp->setMainWidget(this); + tdeApp->setMainWidget(this); self = this; prefDia = 0; @@ -171,13 +171,13 @@ MainWindow::MainWindow(bool asClient) emit hasActiveWindow(false); lastPressWidget = 0; - kapp->installEventFilter(this); + tdeApp->installEventFilter(this); - TQSize as(kapp->desktop()->size()); + TQSize as(tdeApp->desktop()->size()); as -= TQSize(30, 30); resize(TQSize(1200, 1000).boundedTo(as)); - connect(kapp->clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardChanged())); + connect(tdeApp->clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardChanged())); clipboardChanged(); layoutChilds = false; layoutSelected = false; @@ -926,7 +926,7 @@ void MainWindow::popupFormWindowMenu(const TQPoint & gp, FormWindow *fw) setupRMBSpecialCommands(ids, commands, fw); setupRMBProperties(ids, commands, fw); - kapp->processEvents(); + tdeApp->processEvents(); int r = rmbFormWindow->exec(gp); handleRMBProperties(r, commands, fw); @@ -944,7 +944,7 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge setupRMBSpecialCommands(ids, commands, w); setupRMBProperties(ids, commands, w); - kapp->processEvents(); + tdeApp->processEvents(); int r = rmbWidgets->exec(gp); handleRMBProperties(r, commands, w); @@ -1257,7 +1257,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands void MainWindow::clipboardChanged() { - TQString text(kapp->clipboard()->text()); + TQString text(tdeApp->clipboard()->text()); TQString start("<!DOCTYPE UI-SELECTION>"); actionEditPaste->setEnabled(text.left(start.length()) == start); } @@ -1392,7 +1392,7 @@ void MainWindow::selectionChanged() void MainWindow::writeConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("General"); config->writeEntry("RestoreWorkspace", restoreConfig); @@ -1429,7 +1429,7 @@ void MainWindow::writeConfig() void MainWindow::readConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); restoreConfig = config->readBoolEntry("RestoreWorkspace", true); diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index d0ccda3f..68e197ec 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -457,7 +457,7 @@ void MainWindow::setupFileActions() fileMenu->insertSeparator(); - a = KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection()); + a = KStdAction::quit(tdeApp, TQ_SLOT(closeAllWindows()), actionCollection()); a->setToolTip(i18n("Quits the application and prompts to save any changed dialogs")); a->setWhatsThis(whatsThisFrom("File|Exit")); a->plug(fileMenu); diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp index 31af80f0..28c33c33 100644 --- a/kommander/editor/messagelog.cpp +++ b/kommander/editor/messagelog.cpp @@ -108,12 +108,12 @@ void MessageLog::clearContent() void MessageLog::copyLine() { if (m_lists[currentPageIndex()]->count()) - kapp->clipboard()->setText(m_lists[currentPageIndex()]->currentText(), TQClipboard::Clipboard); + tdeApp->clipboard()->setText(m_lists[currentPageIndex()]->currentText(), TQClipboard::Clipboard); } void MessageLog::copyContent() { - kapp->clipboard()->setText(content(), TQClipboard::Clipboard); + tdeApp->clipboard()->setText(content(), TQClipboard::Clipboard); } void MessageLog::saveToFile() diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index b746ec97..013949e4 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -162,9 +162,9 @@ bool Instance::run() dynamic_cast<TQDialog*>((TQWidget*)m_instance)->exec(); else if (m_instance->inherits("TQMainWindow")) { - kapp->setMainWidget(m_instance); + tdeApp->setMainWidget(m_instance); dynamic_cast<TQMainWindow*>((TQWidget*)m_instance)->show(); - kapp->exec(); + tdeApp->exec(); } else return false; return true; diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index 47db3bd0..ddfe8a86 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -283,7 +283,7 @@ static ParseNode f_executeSlot(Parser* parser, const ParameterList& params) /******************* DCOP function ********************************/ static ParseNode f_dcopid(Parser*, const ParameterList& ) { - return TQString(kapp->dcopClient()->appId()); + return TQString(tdeApp->dcopClient()->appId()); } static ParseNode f_pid(Parser*, const ParameterList& ) diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp index 59aaec07..7d56f0af 100644 --- a/kommander/widget/kommanderfunctions.cpp +++ b/kommander/widget/kommanderfunctions.cpp @@ -41,7 +41,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL case Kommander::selectedWidgetText: return handleDCOP(DCOP::selection); case Kommander::dcopid: - return kapp->dcopClient()->appId(); + return tdeApp->dcopClient()->appId(); case Kommander::pid: return TQString().setNum(getpid()); case Kommander::null: diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp index 9c215f7d..bcea2b11 100644 --- a/kommander/widget/kommanderwidget.cpp +++ b/kommander/widget/kommanderwidget.cpp @@ -347,7 +347,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) TQString KommanderWidget::localDCOPQuery(const TQString function, const TQStringList& args) { TQStringList pArgs; - pArgs.append(kapp->dcopClient()->appId()); + pArgs.append(tdeApp->dcopClient()->appId()); pArgs.append("KommanderIf"); pArgs.append(function); for (uint i=0; i<args.count(); i++) @@ -359,7 +359,7 @@ TQString KommanderWidget::localDCOPQuery(const TQString function, const TQString const TQString& arg2, const TQString& arg3, const TQString& arg4) { TQStringList pArgs; - pArgs.append(kapp->dcopClient()->appId()); + pArgs.append(tdeApp->dcopClient()->appId()); pArgs.append("KommanderIf"); pArgs.append(function); pArgs.append(arg1); @@ -419,7 +419,7 @@ void KommanderWidget::printError(const TQString& a_error) const exit(-1); } else if (parentDialog()->inherits("TQMainWindow")) - kapp->quit(); + tdeApp->quit(); } } else diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp index aaeca1fd..1bd2ae0e 100644 --- a/kxsldbg/kxsldbg.cpp +++ b/kxsldbg/kxsldbg.cpp @@ -54,7 +54,7 @@ KXsldbg::KXsldbg() createGUI(m_part); // connect up signals - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); connectDCOPSignal(0, 0, "debuggerPositionChanged(TQString,int)", "newDebuggerPosition(TQString,int)", false ); connectDCOPSignal(0, 0, "editorPositionChanged(TQString,int,int)", "newCursorPosition(TQString,int,int)", false ); @@ -74,7 +74,7 @@ KXsldbg::KXsldbg() // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, i18n("Could not find our part.")); - kapp->quit(); + tdeApp->quit(); } } @@ -102,7 +102,7 @@ bool KXsldbg::closeURL() void KXsldbg::setupActions() { - TDEAction *act = KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + TDEAction *act = KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); connect(act, TQ_SIGNAL(activated()), this, TQ_SLOT(quit())); m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); @@ -184,7 +184,7 @@ void KXsldbg::newDebuggerPosition(const TQString &file, int lineNumber) void KXsldbg::showXSLDbgHelp() { - kapp->invokeHelp(TQString(), "xsldbg"); + tdeApp->invokeHelp(TQString(), "xsldbg"); } #include "kxsldbg.moc" diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp index 738711e7..755b7cb9 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp @@ -596,7 +596,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) for ( ;it1.current() != 0;++it1 ) m_tb->setTab( it1.current() ->id(), false ); - kapp->syncX(); + tdeApp->syncX(); m_delayedRaise = -1; for ( TQMap<KDockWidget*, KDockButton_Private*>::iterator it = m_overlapButtons.begin(); @@ -721,7 +721,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix ) { m_tb->setTab( it1.current() ->id(), false ); } - kapp->syncX(); + tdeApp->syncX(); m_delayedRaise = -1; for ( TQMap<KDockWidget*, KDockButton_Private*>::iterator it = m_overlapButtons.begin(); @@ -738,8 +738,8 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix ) m_tb->setTab(it.data(),true); tabClicked(it.data()); m_ws->raiseWidget(it.key()); - kapp->sendPostedEvents(); - kapp->syncX();*/ + tdeApp->sendPostedEvents(); + tdeApp->syncX();*/ m_delayedRaise = it.data(); TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) ); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp index d718601b..22d31db8 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp @@ -166,13 +166,13 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQ_SLOT( nextToolViewInDock() ), actionCollection(), "tdemdi_next_toolview" ) ); - actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() ); + actionCollection() ->readShortcutSettings( "Shortcuts", tdeApp->config() ); } KMDIGUIClient::~KMDIGUIClient() { - // actionCollection()->writeShortcutSettings( "KMDI Shortcuts", kapp->config() ); + // actionCollection()->writeShortcutSettings( "KMDI Shortcuts", tdeApp->config() ); for ( uint i = 0;i < m_toolViewActions.count();i++ ) disconnect( m_toolViewActions.at( i ), 0, this, 0 ); @@ -251,7 +251,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) // try to read the action shortcut TDEShortcut sc; - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); TQString _grp = cfg->group(); cfg->setGroup( "Shortcuts" ); // if ( cfg->hasKey( aname ) ) diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index 34ea4a23..47379268 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -183,7 +183,7 @@ void CSSEditor::hidePreviewer(){ void CSSEditor::initialize(){ - m_config = kapp->config(); + m_config = tdeApp->config(); connect(pbOk, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleShortendForm())); m_config->setGroup("CSSEditor Options"); SHckb->setChecked(m_config->readBoolEntry("Shorthand form enabled",false)); diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index 96c5ccf8..08fe60b1 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -1242,7 +1242,7 @@ void TableEditor::slotEditChildTable() void TableEditor::slotHelpInvoked() { - kapp->invokeHelp("table-editor","quanta"); + tdeApp->invokeHelp("table-editor","quanta"); } void TableEditor::configureTable( TQTable * table ) diff --git a/quanta/data/templates/pages/docbook/tde-doc-template.docbook b/quanta/data/templates/pages/docbook/tde-doc-template.docbook index 1a45a424..5f90131d 100644 --- a/quanta/data/templates/pages/docbook/tde-doc-template.docbook +++ b/quanta/data/templates/pages/docbook/tde-doc-template.docbook @@ -138,7 +138,7 @@ any problems or feature requests to the &tde; mailing lists. </para> </chapter> -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title>Using &tdemyapplication;</title> <!-- This chapter should tell the user how to use your app. You should use as @@ -167,7 +167,7 @@ patent issues. --> </para> -<sect1 id="kapp-features"> +<sect1 id="tdeApp-features"> <title>More &tdemyapplication; features</title> <para>It slices! It dices! and it comes with a free toaster!</para> @@ -198,7 +198,7 @@ Also include any keys that have a special function but have no equivalent in the menus or toolbars. This may not be necessary for small apps or apps with no tool or menu bars. --> -<sect1 id="kapp-mainwindow"> +<sect1 id="tdeApp-mainwindow"> <title>The main &tdemyapplication; window</title> <sect2> @@ -486,7 +486,7 @@ Documentation Copyright © 1999 George N. Ugnacious <email>gnu@trinitydeskto <appendix id="installation"> <title>Installation</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>How to obtain &tdemyapplication;</title> <!-- This first entity contains boiler plate for applications that are @@ -518,11 +518,6 @@ about 5 megs of memory to run, but this may vary depending on your platform and configuration. </para> -<para> -All required libraries as well as &tdemyapplication; itself can be found -on <ulink url="ftp://ftp.kapp.org">The &tdemyapplication; home page</ulink>. -</para> - <!-- For a list of updates, you may refer to the application web site or the ChangeLog file, or ... --> <para> diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 1abab263..6aae9836 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -146,7 +146,7 @@ TQString MessageOutput::content() void MessageOutput::copyContent() { - kapp->clipboard()->setText(content(), TQClipboard::Clipboard); + tdeApp->clipboard()->setText(content(), TQClipboard::Clipboard); } void MessageOutput::saveContent() diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index f789f911..775fa3ec 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -1751,7 +1751,7 @@ void Parser::synchParseInDetail() void Parser::setSAParserEnabled(bool enabled) { m_saParser->setParsingEnabled(enabled); - //kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); //this makes sure that the parsing is really disabled + //tdeApp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); //this makes sure that the parsing is really disabled } #include "parser.moc" diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp index 1e53946c..163eb24c 100644 --- a/quanta/parts/kafka/undoredo.cpp +++ b/quanta/parts/kafka/undoredo.cpp @@ -190,7 +190,7 @@ void undoRedo::addNewModifsSet(NodeModifsSet *modifs, int modifLocation, NodeSel return; } - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Kate Document Defaults"); int indentationWidth = config->readNumEntry("Indentation Width", 4); diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index 48e13beb..32db4b11 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -997,7 +997,7 @@ KURL Project::projectBaseURL() void Project::savePassword(const TQString &entry, const TQString &passwd, bool store) { d->m_passwdList[entry] = passwd; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Projects"); if (store) { @@ -1017,7 +1017,7 @@ TQString Project::password(const TQString &entry) return d->m_passwdList[entry]; else { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Projects"); TQString passwd = KStringHandler::obscure(config->readEntry(d->projectName + " | " + entry,"")); // TQString passwd = config->readEntry(d->projectName + " | " + entry,""); @@ -1027,7 +1027,7 @@ TQString Project::password(const TQString &entry) bool Project::passwordSaved(const TQString &entry) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Projects"); TQString passwd = KStringHandler::obscure(config->readEntry(d->projectName + " | " + entry,"")); // TQString passwd = config->readEntry(d->projectName + " | " + entry,""); @@ -1281,7 +1281,7 @@ bool Project::queryClose() d->adjustActions(); d->m_projectRecent->setCurrentItem(-1); newStatus(); -// kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); +// tdeApp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } } return canExit; diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index f1e13c5d..fe505ff7 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -1231,7 +1231,7 @@ void ProjectPrivate::slotProceedWithCloseProject(bool success) adjustActions(); m_projectRecent->setCurrentItem(-1); parent->newStatus(); - kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + tdeApp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } @@ -1669,7 +1669,7 @@ bool ProjectPrivate::uploadProjectFile() void ProjectPrivate::slotNewProjectHelpClicked() { - kapp->invokeHelp("create-new-project-3-2", "quanta"); + tdeApp->invokeHelp("create-new-project-3-2", "quanta"); } #include "projectprivate.moc" diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index 49b3d195..8e667b3b 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -2793,7 +2793,7 @@ void Document::convertCase() progressDlg.setLabel(i18n("Changing tag and attribute case. This may take some time, depending on the document complexity.")); progressDlg.setAllowCancel(false); progressDlg.show(); - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); KProgress *pBar = progressDlg.progressBar(); pBar->setValue(0); pBar->setTotalSteps(nodeNum); diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index bf257a0c..c9e8e83c 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -239,7 +239,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) if (!TQFile::exists(dtd->fileName)) return false; - kapp->setOverrideCursor( TQCursor(TQt::WaitCursor) ); + tdeApp->setOverrideCursor( TQCursor(TQt::WaitCursor) ); TDEConfig *dtdConfig = new TDEConfig(dtd->fileName, true); @@ -610,7 +610,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) delete dtdConfig; dtd->loaded = true; resolveInherited(dtd); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return true; } diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index 5b0a8e2b..e4aab4b3 100644 --- a/quanta/src/kqapp.cpp +++ b/quanta/src/kqapp.cpp @@ -77,7 +77,7 @@ KQApplication::KQApplication() } else */ { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode); TQString layout = config->readEntry("Window layout", "Default"); @@ -148,7 +148,7 @@ int KQUniqueApplication::newInstance() else { splash = 0L; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode); TQString layout = config->readEntry("Window layout", "Default"); diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 49457eda..de24c83a 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -217,7 +217,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( userToolbarsCount = 0; baseNode = 0L; currentToolbarDTD = TQString(); - m_config=kapp->config(); + m_config=tdeApp->config(); idleTimer = new TQTimer(this); connect(idleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotIdleTimerExpired())); m_idleTimerEnabled = true; @@ -230,7 +230,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( kdWarning() << i18n("Quanta data files were not found.") << endl; kdWarning() << i18n("You may have forgotten to run \"make install\", or your TDEDIR, TDEDIRS or PATH are not set correctly.") << endl; kdWarning() << "***************************************************************************" << endl; - TQTimer::singleShot(20, kapp, TQ_SLOT(quit())); + TQTimer::singleShot(20, tdeApp, TQ_SLOT(quit())); return; } qConfig.enableDTDToolbar = true; @@ -715,7 +715,7 @@ void QuantaApp::slotStatusMsg(const TQString &msg) statusbarTimer->stop(); statusBar()->changeItem(" " + KStringHandler::cPixelSqueeze(msg, statusBar()->fontMetrics(), progressBar->x() - 20), IDS_STATUS); statusBar()->repaint(); - kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + tdeApp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); statusbarTimer->start(10000, true); } @@ -2763,7 +2763,7 @@ void QuantaApp::slotSendToolbar() return; } - kapp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), toolbarFile); + tdeApp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), toolbarFile); } delete mailDlg; } @@ -3619,7 +3619,7 @@ void QuantaApp::slotEmailDTEP() return; } - kapp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), dtdFile); + tdeApp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), dtdFile); } delete mailDlg; } diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index a3de6154..f9026761 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -1601,7 +1601,7 @@ void QuantaInit::readAbbreviations() int QuantaInit::runningQuantas() { - QCStringList list = kapp->dcopClient()->registeredApplications(); + QCStringList list = tdeApp->dcopClient()->registeredApplications(); int i = 0; for (QCStringList::iterator it = list.begin(); it != list.end(); ++it) { diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index e8929f84..cd5cb30b 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -265,7 +265,7 @@ void BaseTreeBranch::updateOpenFolder() while (item) { if (item->isDir() && item->isOpen()) { updateDirectory( item->url() ); - kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + tdeApp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); // dive into the tree first newItem = dynamic_cast<KFileTreeViewItem *>(item->firstChild()); if (newItem) { diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index 886bd511..1fad326c 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -179,7 +179,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) connect(this, TQ_SIGNAL(open(TQListViewItem *)), this, TQ_SLOT(slotSelectFile(TQListViewItem *))); - restoreLayout(kapp->config(), className()); + restoreLayout(tdeApp->config(), className()); // the restored size of the first column might be too large for the current content // we set it to 10 and the listview will adjust it to the size of the largest entry setColumnWidth(0, 10); diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index bd951b06..7a062ee7 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -102,7 +102,7 @@ ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name ) connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - restoreLayout( kapp->config(), className() ); + restoreLayout( tdeApp->config(), className() ); // the restored size of the first column might be too large for the current content // we set it to 10 and the listview will adjust it to the size of the largest entry setColumnWidth(0, 10); @@ -293,7 +293,7 @@ void ScriptTreeView::slotSendScriptInMail() delete mailDlg; return; } - kapp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), attachmentFile); + tdeApp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), attachmentFile); } delete mailDlg; diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index a03f13a3..e11944cc 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -66,7 +66,7 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name ) lastTag = 0L; groupsCount = 0; followCursorFlag = true; - config = kapp->config(); + config = tdeApp->config(); topOpened = true; useOpenLevelSetting = true; diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 463a56e4..7096f87e 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -192,7 +192,7 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name ) setSelectionMode(TQListView::Single); setDragEnabled(true); setSaveOpenFolder(true); - restoreLayout( kapp->config(), className() ); + restoreLayout( tdeApp->config(), className() ); // the restored size of the first column might be too large for the current content // we set it to 10 and the listview will adjust it to the size of the largest entry setColumnWidth(0, 10); @@ -1006,7 +1006,7 @@ void TemplatesTreeView::slotSendInMail() delete mailDlg; return; } - kapp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), attachmentFile); + tdeApp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), attachmentFile); } delete mailDlg; } diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp index 87ec17d9..71eb79b3 100644 --- a/quanta/utility/qpevents.cpp +++ b/quanta/utility/qpevents.cpp @@ -260,7 +260,7 @@ bool QPEvents::handleEvent(const EventAction& ev) TQString body; for (uint i = 2; i < ev.arguments.count(); i++) body += ev.arguments[i] + "\n"; - kapp->invokeMailer(member.name + "<" + member.email + ">", "", "", ev.arguments[1], body, "", TQStringList(), ""); + tdeApp->invokeMailer(member.name + "<" + member.email + ">", "", "", ev.arguments[1], body, "", TQStringList(), ""); return true; } diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index 87e953fb..b2b7d744 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -241,7 +241,7 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse void QuantaBookmarks::bookmarkMenuAboutToShow() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); if (config->hasGroup("Kate View Defaults")) { config->setGroup("Kate View Defaults"); diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp index 44a6d5f0..5df1fdaf 100644 --- a/quanta/utility/quantacommon.cpp +++ b/quanta/utility/quantacommon.cpp @@ -593,7 +593,7 @@ DCOPReply QuantaCommon::callDCOPMethod(const TQString& interface, const TQString { TQStringList argumentList = TQStringList::split(",", arguments, true); TQString app = "quanta"; - if (!kapp->inherits("TDEUniqueApplication")) + if (!tdeApp->inherits("TDEUniqueApplication")) { pid_t pid = ::getpid(); app += TQString("-%1").arg(pid); diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index 95f1dc3e..1f4bf8eb 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -336,7 +336,7 @@ bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::But } pid_t pid = ::getpid(); - if (kapp->inherits("TDEUniqueApplication")) + if (tdeApp->inherits("TDEUniqueApplication")) { command.replace("%pid", TQString("unique %1").arg(pid)); } else @@ -590,7 +590,7 @@ bool TagAction::slotActionActivated() } pid_t pid = ::getpid(); - if (kapp->inherits("TDEUniqueApplication")) + if (tdeApp->inherits("TDEUniqueApplication")) { command.replace("%pid", TQString("unique %1").arg(pid)); } else diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index 72c764ea..bfa29f09 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -186,7 +186,7 @@ void TagActionSet::slotApplySourceIndentation() QuantaView* view = ViewManager::ref()->activeView(); NodeModifsSet *modifs = new NodeModifsSet(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Kate Document Defaults"); int indentationWidth = config->readNumEntry("Indentation Width", 4); |