diff options
47 files changed, 189 insertions, 169 deletions
diff --git a/doc/da/index.docbook b/doc/da/index.docbook index 901f73d..956995c 100644 --- a/doc/da/index.docbook +++ b/doc/da/index.docbook @@ -134,8 +134,8 @@ See <link linkend="rememberlines">Marking Channel and Query Logs</link> for more See <link linkend="logging">Logging</link> for more information See <link linkend="konvi-cmds">&konversation; commands</link> for more information See <link linkend="scripting">Scripting</link> for more information -See <link linkend="kapp-mainwindow">The main &konversation; window</link> for more information -See <link linkend="getting-kapp">How to obtain &konversation;</link> for more information +See <link linkend="tdeApp-mainwindow">The main &konversation; window</link> for more information +See <link linkend="getting-tdeApp">How to obtain &konversation;</link> for more information See <link linkend="requirements">Requirements</link> for more information --> @@ -177,7 +177,7 @@ revision history. (see installation appendix comment) --> </chapter> -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title>Brug af &konversation;</title> <!-- =================================================================== --> @@ -1978,7 +1978,7 @@ or menu bars. --> <!-- =================================================================== --> -<sect1 id="kapp-mainwindow"> +<sect1 id="tdeApp-mainwindow"> <title>Hovedvinduet for &konversation;</title> <sect2> @@ -2339,7 +2339,7 @@ distribution. --> <!-- =================================================================== --> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>Hvordan får man fat på &konversation;</title> &install.intro.documentation; <para>Den seneste version af &konversation;, inklusive kildekode og byggeinstruktioner kan også hentes fra <ulink url="&konviwebsite;">&konviwebsite; hjemmeside</ulink>. </para> diff --git a/doc/en/index.docbook b/doc/en/index.docbook index d96ea0b..845fc72 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -149,8 +149,8 @@ See <link linkend="rememberlines">Marking Channel and Query Logs</link> for more See <link linkend="logging">Logging</link> for more information See <link linkend="konvi-cmds">&konversation; commands</link> for more information See <link linkend="scripting">Scripting</link> for more information -See <link linkend="kapp-mainwindow">The main &konversation; window</link> for more information -See <link linkend="getting-kapp">How to obtain &konversation;</link> for more information +See <link linkend="tdeApp-mainwindow">The main &konversation; window</link> for more information +See <link linkend="getting-tdeApp">How to obtain &konversation;</link> for more information See <link linkend="requirements">Requirements</link> for more information --> @@ -203,7 +203,7 @@ regular expression pattern.</para></listitem> </chapter> -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title>Using &konversation;</title> <!-- =================================================================== --> @@ -2802,7 +2802,7 @@ or menu bars. --> <!-- =================================================================== --> -<sect1 id="kapp-mainwindow"> +<sect1 id="tdeApp-mainwindow"> <title>The main &konversation; window</title> <sect2> @@ -3425,7 +3425,7 @@ Documentation Copyright © 2003-2005 Gary R. Cramblitt <email>garycramblitt@ <!-- =================================================================== --> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>How to obtain &konversation;</title> <!-- This first entity contains boiler plate for applications that are diff --git a/doc/et/index.docbook b/doc/et/index.docbook index eb65e2c..271f468 100644 --- a/doc/et/index.docbook +++ b/doc/et/index.docbook @@ -134,8 +134,8 @@ See <link linkend="rememberlines">Marking Channel and Query Logs</link> for more See <link linkend="logging">Logging</link> for more information See <link linkend="konvi-cmds">&konversation; commands</link> for more information See <link linkend="scripting">Scripting</link> for more information -See <link linkend="kapp-mainwindow">The main &konversation; window</link> for more information -See <link linkend="getting-kapp">How to obtain &konversation;</link> for more information +See <link linkend="tdeApp-mainwindow">The main &konversation; window</link> for more information +See <link linkend="getting-tdeApp">How to obtain &konversation;</link> for more information See <link linkend="requirements">Requirements</link> for more information --> @@ -177,7 +177,7 @@ revision history. (see installation appendix comment) --> </chapter> -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title>&konversation;i kasutamine</title> <!-- =================================================================== --> @@ -1978,7 +1978,7 @@ or menu bars. --> <!-- =================================================================== --> -<sect1 id="kapp-mainwindow"> +<sect1 id="tdeApp-mainwindow"> <title>&konversation;i peaaken</title> <sect2> @@ -2339,7 +2339,7 @@ distribution. --> <!-- =================================================================== --> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>&konversation;i hankimine</title> &install.intro.documentation; <para>&konversation;i uusima versiooni, sealhulgas lähtekoodi ja paigaldamise juhised leiab ka <ulink url="&konviwebsite;">&konversation;i koduleheküljelt</ulink>. </para> diff --git a/doc/it/index.docbook b/doc/it/index.docbook index 4290583..de3431b 100644 --- a/doc/it/index.docbook +++ b/doc/it/index.docbook @@ -134,8 +134,8 @@ See <link linkend="rememberlines">Marking Channel and Query Logs</link> for more See <link linkend="logging">Logging</link> for more information See <link linkend="konvi-cmds">&konversation; commands</link> for more information See <link linkend="scripting">Scripting</link> for more information -See <link linkend="kapp-mainwindow">The main &konversation; window</link> for more information -See <link linkend="getting-kapp">How to obtain &konversation;</link> for more information +See <link linkend="tdeApp-mainwindow">The main &konversation; window</link> for more information +See <link linkend="getting-tdeApp">How to obtain &konversation;</link> for more information See <link linkend="requirements">Requirements</link> for more information --> @@ -177,7 +177,7 @@ revision history. (see installation appendix comment) --> </chapter> -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title>Uso di &konversation;</title> <!-- =================================================================== --> @@ -1978,7 +1978,7 @@ or menu bars. --> <!-- =================================================================== --> -<sect1 id="kapp-mainwindow"> +<sect1 id="tdeApp-mainwindow"> <title>La finestra principale di &konversation;</title> <sect2> @@ -2339,7 +2339,7 @@ distribution. --> <!-- =================================================================== --> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>Come ottenere &konversation;</title> &install.intro.documentation; <para>Le ultime versioni di &konversation;, inclusi il codice sorgente e istruzioni di compilazione, possono essere ottenute dalla <ulink url="&konviwebsite;">pagina Web di &konversation;</ulink>. </para> diff --git a/doc/pt/index.docbook b/doc/pt/index.docbook index 4fea85c..41a03e1 100644 --- a/doc/pt/index.docbook +++ b/doc/pt/index.docbook @@ -134,8 +134,8 @@ See <link linkend="rememberlines">Marking Channel and Query Logs</link> for more See <link linkend="logging">Logging</link> for more information See <link linkend="konvi-cmds">&konversation; commands</link> for more information See <link linkend="scripting">Scripting</link> for more information -See <link linkend="kapp-mainwindow">The main &konversation; window</link> for more information -See <link linkend="getting-kapp">How to obtain &konversation;</link> for more information +See <link linkend="tdeApp-mainwindow">The main &konversation; window</link> for more information +See <link linkend="getting-tdeApp">How to obtain &konversation;</link> for more information See <link linkend="requirements">Requirements</link> for more information --> @@ -177,7 +177,7 @@ revision history. (see installation appendix comment) --> </chapter> -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title>Usar o &konversation;</title> <!-- =================================================================== --> @@ -1978,7 +1978,7 @@ or menu bars. --> <!-- =================================================================== --> -<sect1 id="kapp-mainwindow"> +<sect1 id="tdeApp-mainwindow"> <title>A janela principal do &konversation;</title> <sect2> @@ -2339,7 +2339,7 @@ distribution. --> <!-- =================================================================== --> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>Como obter o &konversation;</title> &install.intro.documentation; <para>As últimas versões do &konversation;, incluindo o código-fonte e as instruções de compilação, poderão ser obtidas na <ulink url="&konviwebsite;">página Web em &konviwebsite;</ulink>. </para> diff --git a/doc/ru/index.docbook b/doc/ru/index.docbook index 7e486ce..a3b97f3 100644 --- a/doc/ru/index.docbook +++ b/doc/ru/index.docbook @@ -135,8 +135,8 @@ See <link linkend="rememberlines">Marking Channel and Query Logs</link> for more See <link linkend="logging">Logging</link> for more information See <link linkend="konvi-cmds">&kmyapplication; commands</link> for more information See <link linkend="scripting">Scripting</link> for more information -See <link linkend="kapp-mainwindow">The main &kmyapplication; window</link> for more information -See <link linkend="getting-kapp">How to obtain &kmyapplication;</link> for more information +See <link linkend="tdeApp-mainwindow">The main &kmyapplication; window</link> for more information +See <link linkend="getting-tdeApp">How to obtain &kmyapplication;</link> for more information See <link linkend="requirements">Requirements</link> for more information --> @@ -178,7 +178,7 @@ revision history. (see installation appendix comment) --> </chapter> -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title>Использование &kmyapplication;</title> <!-- =================================================================== --> @@ -1984,7 +1984,7 @@ or menu bars. --> <!-- =================================================================== --> -<sect1 id="kapp-mainwindow"> +<sect1 id="tdeApp-mainwindow"> <title>Главное окно &kmyapplication;</title> <sect2> @@ -2345,7 +2345,7 @@ distribution. --> <!-- =================================================================== --> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>Поолучение &kmyapplication;</title> &install.intro.documentation; <para>Новейшую версию &kmyapplication;, со всеми исходными кодами и инструкциями по сборке, можно получить на <ulink url="&konviwebsite;">сайте &konviwebsite;</ulink>. </para> diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook index 761ec14..179cada 100644 --- a/doc/sv/index.docbook +++ b/doc/sv/index.docbook @@ -134,8 +134,8 @@ See <link linkend="rememberlines">Marking Channel and Query Logs</link> for more See <link linkend="logging">Logging</link> for more information See <link linkend="konvi-cmds">&konversation; commands</link> for more information See <link linkend="scripting">Scripting</link> for more information -See <link linkend="kapp-mainwindow">The main &konversation; window</link> for more information -See <link linkend="getting-kapp">How to obtain &konversation;</link> for more information +See <link linkend="tdeApp-mainwindow">The main &konversation; window</link> for more information +See <link linkend="getting-tdeApp">How to obtain &konversation;</link> for more information See <link linkend="requirements">Requirements</link> for more information --> @@ -177,7 +177,7 @@ revision history. (see installation appendix comment) --> </chapter> -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title>Att använda &konversation;</title> <!-- =================================================================== --> @@ -1978,7 +1978,7 @@ or menu bars. --> <!-- =================================================================== --> -<sect1 id="kapp-mainwindow"> +<sect1 id="tdeApp-mainwindow"> <title>Huvudfönstret i &konversation;</title> <sect2> @@ -2339,7 +2339,7 @@ distribution. --> <!-- =================================================================== --> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>Hur man skaffar &konversation;</title> &install.intro.documentation; <para>Den senaste versionen av &konversation;, inklusive källkod och bygginstruktioner kan också hämtas från <ulink url="&konviwebsite;">&konviwebsite; hemsida</ulink>. </para> diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp index 0eae053..0dab9f1 100644 --- a/konversation/src/autoreplace_preferences.cpp +++ b/konversation/src/autoreplace_preferences.cpp @@ -129,7 +129,7 @@ void Autoreplace_Config::setAutoreplaceListView(const TQStringList &autoreplaceL void Autoreplace_Config::saveSettings() { // get configuration object - TDEConfig* config=kapp->config(); + TDEConfig* config=tdeApp->config(); // delete all patterns config->deleteGroup("Autoreplace List"); diff --git a/konversation/src/awaymanager.cpp b/konversation/src/awaymanager.cpp index c1f272b..f19a841 100644 --- a/konversation/src/awaymanager.cpp +++ b/konversation/src/awaymanager.cpp @@ -66,7 +66,7 @@ AwayManager::AwayManager(TQObject* parent) : TQObject(parent) d->useXidle = false; d->useMit = false; - m_connectionManager = static_cast<KonversationApplication*>(kapp)->getConnectionManager(); + m_connectionManager = static_cast<KonversationApplication*>(tdeApp)->getConnectionManager(); #ifdef TQ_WS_X11 Display* display = tqt_xdisplay(); @@ -338,7 +338,7 @@ void AwayManager::toggleGlobalAway(bool away) void AwayManager::updateGlobalAwayAction(bool away) { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); TDEToggleAction* awayAction = static_cast<TDEToggleAction*>(konvApp->getMainWindow()->actionCollection()->action("toggle_away")); if (!awayAction) return; diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp index 5edcb32..d21d076 100644 --- a/konversation/src/config/preferences.cpp +++ b/konversation/src/config/preferences.cpp @@ -527,7 +527,7 @@ void Preferences::setAutoUserhost(bool state) bool Preferences::dialogFlag(const TQString& flagName) { - TDEConfig* config=TDEApplication::kApplication()->config(); + TDEConfig* config=tdeApp->config(); config->setGroup("Notification self()->Messages"); @@ -539,7 +539,7 @@ bool Preferences::dialogFlag(const TQString& flagName) void Preferences::setDialogFlag(const TQString& flagName,bool state) { - TDEConfig* config=TDEApplication::kApplication()->config(); + TDEConfig* config=tdeApp->config(); config->setGroup("Notification self()->Messages"); diff --git a/konversation/src/connectionmanager.cpp b/konversation/src/connectionmanager.cpp index cf34905..44b20cf 100644 --- a/konversation/src/connectionmanager.cpp +++ b/konversation/src/connectionmanager.cpp @@ -102,7 +102,7 @@ void ConnectionManager::connectTo(Konversation::ConnectionFlag flag, ConnectionS if (!identity || !validateIdentity(identity)) return; - KonversationApplication* konvApp = static_cast<KonversationApplication *>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication *>(tdeApp); KonversationMainWindow* mainWindow = konvApp->getMainWindow(); Server* server = new Server(this, settings); @@ -400,7 +400,7 @@ bool ConnectionManager::reuseExistingConnection(ConnectionSettings& settings, bo ConnectionDupe dupeType; bool doReuse = true; - KonversationApplication* konvApp = static_cast<KonversationApplication *>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication *>(tdeApp); KonversationMainWindow* mainWindow = konvApp->getMainWindow(); TQMap<int, Server*>::ConstIterator it; @@ -492,7 +492,7 @@ bool ConnectionManager::reuseExistingConnection(ConnectionSettings& settings, bo bool ConnectionManager::validateIdentity(IdentityPtr identity, bool interactive) { - KonversationApplication* konvApp = static_cast<KonversationApplication *>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication *>(tdeApp); KonversationMainWindow* mainWindow = konvApp->getMainWindow(); TQString errors; diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp index 721435c..5410e14 100644 --- a/konversation/src/dcctransferpanel.cpp +++ b/konversation/src/dcctransferpanel.cpp @@ -237,7 +237,7 @@ void DccTransferPanel::updateButton() resend = false; } - if (!kapp->authorize("allow_downloading")) + if (!tdeApp->authorize("allow_downloading")) { accept = false; } diff --git a/konversation/src/dcctransferrecv.cpp b/konversation/src/dcctransferrecv.cpp index 9f9e954..6984b4b 100644 --- a/konversation/src/dcctransferrecv.cpp +++ b/konversation/src/dcctransferrecv.cpp @@ -171,7 +171,7 @@ bool DccTransferRecv::queue() if ( m_partnerIp.isEmpty() || m_partnerPort.isEmpty() ) return false; - if (!kapp->authorize("allow_downloading")) + if (!tdeApp->authorize("allow_downloading")) { //note we have this after the initialisations so that item looks okay //Do not have the rights to send the file. Shouldn't have gotten this far anyway diff --git a/konversation/src/dcctransfersend.cpp b/konversation/src/dcctransfersend.cpp index b6599cb..3f12df6 100644 --- a/konversation/src/dcctransfersend.cpp +++ b/konversation/src/dcctransfersend.cpp @@ -136,7 +136,7 @@ bool DccTransferSend::queue() if ( m_ownIp.isEmpty() ) m_ownIp = DccCommon::getOwnIp( KonversationApplication::instance()->getConnectionManager()->getServerByConnectionId( m_connectionId ) ); - if ( !kapp->authorize( "allow_downloading" ) ) + if ( !tdeApp->authorize( "allow_downloading" ) ) { //Do not have the rights to send the file. Shouldn't have gotten this far anyway //Note this is after the initialisation so the view looks correct still diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp index 6861bec..2ea1741 100644 --- a/konversation/src/highlight_preferences.cpp +++ b/konversation/src/highlight_preferences.cpp @@ -313,13 +313,13 @@ TQStringList Highlight_Config::currentHighlightList() void Highlight_Config::playSound() { - KonversationApplication *konvApp=static_cast<KonversationApplication *>(TDEApplication::kApplication()); + KonversationApplication *konvApp=static_cast<KonversationApplication *>(tdeApp); konvApp->sound()->play(KURL(soundURL->url())); } void Highlight_Config::saveSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); // Write all highlight entries TQPtrList<Highlight> hiList=getHighlightList(); diff --git a/konversation/src/identitydialog.cpp b/konversation/src/identitydialog.cpp index 8807c1c..2bf0063 100644 --- a/konversation/src/identitydialog.cpp +++ b/konversation/src/identitydialog.cpp @@ -312,7 +312,7 @@ namespace Konversation setButtonOK(KGuiItem(i18n("&OK"), "button_ok", i18n("Change identity information"))); setButtonCancel(KGuiItem(i18n("&Cancel"), "button_cancel", i18n("Discards all changes made"))); - AwayManager* awayManager = static_cast<KonversationApplication*>(kapp)->getAwayManager(); + AwayManager* awayManager = static_cast<KonversationApplication*>(tdeApp)->getAwayManager(); connect(this, TQ_SIGNAL(identitiesChanged()), awayManager, TQ_SLOT(identitiesChanged())); } @@ -500,7 +500,7 @@ namespace Konversation refreshCurrentIdentity(); Preferences::setIdentityList(m_identityList); - static_cast<KonversationApplication*>(kapp)->saveOptions(true); + static_cast<KonversationApplication*>(tdeApp)->saveOptions(true); emit identitiesChanged(); accept(); } diff --git a/konversation/src/inputfilter.cpp b/konversation/src/inputfilter.cpp index 2694b32..b020e19 100644 --- a/konversation/src/inputfilter.cpp +++ b/konversation/src/inputfilter.cpp @@ -113,7 +113,7 @@ void InputFilter::parseLine(const TQString& a_newLine) void InputFilter::parseClientCommand(const TQString &prefix, const TQString &command, const TQStringList ¶meterList, const TQString &_trailing) { - KonversationApplication* konv_app = static_cast<KonversationApplication *>(TDEApplication::kApplication()); + KonversationApplication* konv_app = static_cast<KonversationApplication *>(tdeApp); Q_ASSERT(konv_app); Q_ASSERT(server); // Extract nickname from prefix @@ -139,7 +139,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com TQString ctcpCommand=ctcp.left(ctcp.find(" ")).lower(); TQString ctcpArgument=ctcp.mid(ctcp.find(" ")+1); - ctcpArgument=static_cast<KonversationApplication*>(kapp)->doAutoreplace(ctcpArgument,false); + ctcpArgument=static_cast<KonversationApplication*>(tdeApp)->doAutoreplace(ctcpArgument,false); // If it was a ctcp action, build an action string if(ctcpCommand=="action" && isChan) @@ -1913,7 +1913,7 @@ void InputFilter::parsePrivMsg(const TQString& prefix, source = prefix; } - KonversationApplication* konv_app = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konv_app = static_cast<KonversationApplication*>(tdeApp); message = konv_app->doAutoreplace(message, false); if(isAChannel(parameterList[0])) diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp index 7e95198..e92f8e7 100644 --- a/konversation/src/ircinput.cpp +++ b/konversation/src/ircinput.cpp @@ -44,7 +44,7 @@ IRCInput::IRCInput(TQWidget* parent) : KTextEdit(parent) //nor in compensating for it if my guess is incorrect. so, cache it. m_qtBoxPadding=m_lastHeight-fontMetrics().lineSpacing(); - connect(TDEApplication::kApplication(), TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(updateAppearance())); + connect(tdeApp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(updateAppearance())); m_multiRow = Preferences::useMultiRowInputBox(); m_useSelection = false; @@ -258,7 +258,7 @@ void IRCInput::keyPressEvent(TQKeyEvent* e) } else { - setText(static_cast<KonversationApplication*>(kapp)->doAutoreplace(text(),true)); + setText(static_cast<KonversationApplication*>(tdeApp)->doAutoreplace(text(),true)); emit submit(); } } @@ -371,7 +371,7 @@ void IRCInput::paste(bool useSelection) void IRCInput::paste() { - TQClipboard *cb = TDEApplication::kApplication()->clipboard(); + TQClipboard *cb = tdeApp->clipboard(); setFocus(); // Copy text from the clipboard (paste) diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp index 660a19b..1f9102d 100644 --- a/konversation/src/ircview.cpp +++ b/konversation/src/ircview.cpp @@ -292,7 +292,7 @@ void IRCView::openLink(const TQString& url, bool newTab) { if (url.startsWith("irc://")) { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); konvApp->getConnectionManager()->connectTo(Konversation::SilentlyReuseConnection, url); } else if (!Preferences::useCustomBrowser() || url.startsWith("mailto:")) @@ -360,7 +360,7 @@ TQString IRCView::filter(const TQString& line, const TQString& defaultColor, con bool doHighlight, bool parseURL, bool self) { TQString filteredLine(line); - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); //Since we can't turn off whitespace simplification withouteliminating text wrapping, // if the line starts with a space turn it into a non-breaking space. @@ -414,7 +414,7 @@ bool doHighlight, bool parseURL, bool self) { if(Preferences::beep()) { - kapp->beep(); + tdeApp->beep(); } } @@ -1342,7 +1342,7 @@ bool IRCView::contextMenu(TQContextMenuEvent* ce) break; case CopyUrl: { - TQClipboard *cb = TDEApplication::kApplication()->clipboard(); + TQClipboard *cb = tdeApp->clipboard(); cb->setText(m_urlToCopy,TQClipboard::Selection); cb->setText(m_urlToCopy,TQClipboard::Clipboard); break; @@ -1424,7 +1424,7 @@ void IRCView::setupNickPopupMenu() m_nickPopup->insertSeparator(); m_nickPopup->insertItem(i18n("Open Query"),Konversation::OpenQuery); - if (kapp->authorize("allow_downloading")) + if (tdeApp->authorize("allow_downloading")) { m_nickPopup->insertItem(SmallIcon("2rightarrow"),i18n("Send &File..."),Konversation::DccSend); } @@ -1479,7 +1479,7 @@ void IRCView::setupQueryPopupMenu() m_nickPopup->setItemVisible(Konversation::IgnoreNick, false); m_nickPopup->setItemVisible(Konversation::UnignoreNick, false); - if (kapp->authorize("allow_downloading")) + if (tdeApp->authorize("allow_downloading")) m_nickPopup->insertItem(SmallIcon("2rightarrow"),i18n("Send &File..."),Konversation::DccSend); m_nickPopup->insertItem(i18n("Add to Watched Nicks"), Konversation::AddNotify); diff --git a/konversation/src/ircviewbox.cpp b/konversation/src/ircviewbox.cpp index 0b36017..f6b3758 100644 --- a/konversation/src/ircviewbox.cpp +++ b/konversation/src/ircviewbox.cpp @@ -21,7 +21,7 @@ static TQPixmap getIcon(const TQString& name) { - TDEIconLoader* iconLoader = kapp->iconLoader(); + TDEIconLoader* iconLoader = tdeApp->iconLoader(); return iconLoader->loadIcon(name, TDEIcon::Toolbar, 16); } diff --git a/konversation/src/konvdcop.cpp b/konversation/src/konvdcop.cpp index b31344a..850c19d 100644 --- a/konversation/src/konvdcop.cpp +++ b/konversation/src/konvdcop.cpp @@ -41,7 +41,7 @@ void KonvDCOP::raw(const TQString& server,const TQString& command) TQStringList KonvDCOP::listServers() { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); TQStringList hosts; TQPtrList<Server> serverList = konvApp->getConnectionManager()->getServerList(); @@ -55,7 +55,7 @@ TQStringList KonvDCOP::listServers() TQStringList KonvDCOP::listConnectedServers() { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); TQStringList connectedHosts; TQPtrList<Server> serverList = konvApp->getConnectionManager()->getServerList(); @@ -69,22 +69,22 @@ TQStringList KonvDCOP::listConnectedServers() void KonvDCOP::setAway(const TQString& awaymessage) { - static_cast<KonversationApplication*>(kapp)->getAwayManager()->requestAllAway(awaymessage); + static_cast<KonversationApplication*>(tdeApp)->getAwayManager()->requestAllAway(awaymessage); } void KonvDCOP::setBack() { - static_cast<KonversationApplication*>(kapp)->getAwayManager()->requestAllUnaway(); + static_cast<KonversationApplication*>(tdeApp)->getAwayManager()->requestAllUnaway(); } void KonvDCOP::setScreenSaverStarted() { - static_cast<KonversationApplication*>(kapp)->getAwayManager()->setManagedIdentitiesAway(); + static_cast<KonversationApplication*>(tdeApp)->getAwayManager()->setManagedIdentitiesAway(); } void KonvDCOP::setScreenSaverStopped() { - static_cast<KonversationApplication*>(kapp)->getAwayManager()->setManagedIdentitiesUnaway(); + static_cast<KonversationApplication*>(tdeApp)->getAwayManager()->setManagedIdentitiesUnaway(); } void KonvDCOP::sayToAll(const TQString &message) @@ -162,7 +162,7 @@ TQString KonvDCOP::getNickname(const TQString& serverName) TQString KonvDCOP::getAnyNickname() { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); Server* server = konvApp->getConnectionManager()->getAnyServer(); @@ -238,7 +238,7 @@ void KonvIdentDCOP::setNickname(const TQString &identity, int index,const TQStri { const Identity *i = Preferences::identityByName(identity); const_cast<Identity *>(i)->setNickname(index, nick); - static_cast<KonversationApplication *>(kapp)->saveOptions(true); + static_cast<KonversationApplication *>(tdeApp)->saveOptions(true); } TQString KonvIdentDCOP::getNickname(const TQString &identity, int index) @@ -250,7 +250,7 @@ void KonvIdentDCOP::setBot(const TQString &identity, const TQString& bot) { const Identity *i = Preferences::identityByName(identity); const_cast<Identity *>(i)->setBot(bot); - static_cast<KonversationApplication *>(kapp)->saveOptions(true); + static_cast<KonversationApplication *>(tdeApp)->saveOptions(true); } TQString KonvIdentDCOP::getBot(const TQString &identity) @@ -262,7 +262,7 @@ void KonvIdentDCOP::setPassword(const TQString &identity, const TQString& passwo { const Identity *i = Preferences::identityByName(identity); const_cast<Identity *>(i)->setPassword(password); - static_cast<KonversationApplication *>(kapp)->saveOptions(true); + static_cast<KonversationApplication *>(tdeApp)->saveOptions(true); } TQString KonvIdentDCOP::getPassword(const TQString &identity) @@ -274,7 +274,7 @@ void KonvIdentDCOP::setNicknameList(const TQString &identity, const TQStringList { const Identity *i = Preferences::identityByName(identity); const_cast<Identity *>(i)->setNicknameList(newList); - static_cast<KonversationApplication *>(kapp)->saveOptions(true); + static_cast<KonversationApplication *>(tdeApp)->saveOptions(true); } TQStringList KonvIdentDCOP::getNicknameList(const TQString &identity) @@ -286,7 +286,7 @@ void KonvIdentDCOP::setQuitReason(const TQString &identity, const TQString& reas { const Identity *i = Preferences::identityByName(identity); const_cast<Identity *>(i)->setQuitReason(reason); - static_cast<KonversationApplication *>(kapp)->saveOptions(true); + static_cast<KonversationApplication *>(tdeApp)->saveOptions(true); } TQString KonvIdentDCOP::getQuitReason(const TQString &identity) @@ -299,7 +299,7 @@ void KonvIdentDCOP::setPartReason(const TQString &identity, const TQString& reas { const Identity *i = Preferences::identityByName(identity); const_cast<Identity *>(i)->setPartReason(reason); - static_cast<KonversationApplication *>(kapp)->saveOptions(true); + static_cast<KonversationApplication *>(tdeApp)->saveOptions(true); } TQString KonvIdentDCOP::getPartReason(const TQString &identity) @@ -311,7 +311,7 @@ void KonvIdentDCOP::setKickReason(const TQString &identity, const TQString& reas { const Identity *i = Preferences::identityByName(identity); const_cast<Identity *>(i)->setKickReason(reason); - static_cast<KonversationApplication *>(kapp)->saveOptions(true); + static_cast<KonversationApplication *>(tdeApp)->saveOptions(true); } TQString KonvIdentDCOP::getKickReason(const TQString &identity) @@ -323,7 +323,7 @@ void KonvIdentDCOP::setShowAwayMessage(const TQString &identity, bool state) { const Identity *i = Preferences::identityByName(identity); const_cast<Identity *>(i)->setShowAwayMessage(state); - static_cast<KonversationApplication *>(kapp)->saveOptions(true); + static_cast<KonversationApplication *>(tdeApp)->saveOptions(true); } bool KonvIdentDCOP::getShowAwayMessage(const TQString &identity) @@ -335,7 +335,7 @@ void KonvIdentDCOP::setAwayMessage(const TQString &identity, const TQString& mes { const Identity *i = Preferences::identityByName(identity); const_cast<Identity *>(i)->setAwayMessage(message); - static_cast<KonversationApplication *>(kapp)->saveOptions(true); + static_cast<KonversationApplication *>(tdeApp)->saveOptions(true); } TQString KonvIdentDCOP::getAwayMessage(const TQString &identity) @@ -348,7 +348,7 @@ void KonvIdentDCOP::setReturnMessage(const TQString &identity, const TQString& m { const Identity *i = Preferences::identityByName(identity); const_cast<Identity *>(i)->setReturnMessage(message); - static_cast<KonversationApplication *>(kapp)->saveOptions(true); + static_cast<KonversationApplication *>(tdeApp)->saveOptions(true); } TQString KonvIdentDCOP::getReturnMessage(const TQString &identity) diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp index 0d3dce3..b3bb5e4 100644 --- a/konversation/src/konversationapplication.cpp +++ b/konversation/src/konversationapplication.cpp @@ -167,7 +167,7 @@ int KonversationApplication::newInstance() // prepare dcop interface dcopObject = new KonvDCOP; - kapp->dcopClient()->setDefaultObject(dcopObject->objId()); + tdeApp->dcopClient()->setDefaultObject(dcopObject->objId()); identDCOP = new KonvIdentDCOP; if (dcopObject) @@ -207,7 +207,7 @@ int KonversationApplication::newInstance() KonversationApplication* KonversationApplication::instance() { - return static_cast<KonversationApplication*>(TDEApplication::kApplication()); + return static_cast<KonversationApplication*>(tdeApp); } void KonversationApplication::prepareShutdown() @@ -274,7 +274,7 @@ void KonversationApplication::dcopInfo(const TQString& string) void KonversationApplication::readOptions() { // get standard config file - TDEConfig* config=kapp->config(); + TDEConfig* config=tdeApp->config(); // read nickname sorting order for channel nick lists config->setGroup("Sort Nicknames"); @@ -543,7 +543,7 @@ void KonversationApplication::readOptions() void KonversationApplication::saveOptions(bool updateGUI) { - TDEConfig* config=kapp->config(); + TDEConfig* config=tdeApp->config(); // Should be handled in NicklistBehaviorConfigController now // config->setGroup("Sort Nicknames"); diff --git a/konversation/src/konversationmainwindow.cpp b/konversation/src/konversationmainwindow.cpp index 84fc2e1..8189b05 100644 --- a/konversation/src/konversationmainwindow.cpp +++ b/konversation/src/konversationmainwindow.cpp @@ -164,7 +164,7 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window" action = new TDEToggleAction(i18n("&URL Catcher"), "enhanced_browsing", TDEShortcut("F6"), m_viewContainer, TQ_SLOT(addUrlCatcher()), actionCollection(), "open_url_catcher"); action->setToolTip(i18n("List all URLs that have been mentioned recently in a new tab")); - if (kapp->authorize("shell_access")) + if (tdeApp->authorize("shell_access")) { action = new TDEAction(i18n("New &Konsole"), "openterm", 0, m_viewContainer, TQ_SLOT(addKonsolePanel()), actionCollection(), "open_konsole"); action->setToolTip(i18n("Open a terminal in a new tab")); @@ -262,7 +262,7 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window" action->setEnabled(false); TDEToggleAction* awayAction = new TDEToggleAction(i18n("Global Away"), TDEShortcut("Ctrl+Shift+A"), actionCollection(), "toggle_away"); - connect(awayAction, TQ_SIGNAL(toggled(bool)), static_cast<KonversationApplication*>(kapp)->getAwayManager(), TQ_SLOT(toggleGlobalAway(bool))); + connect(awayAction, TQ_SIGNAL(toggled(bool)), static_cast<KonversationApplication*>(tdeApp)->getAwayManager(), TQ_SLOT(toggleGlobalAway(bool))); awayAction->setEnabled(false); action = new TDEAction(i18n("&Join Channel..."), "add", TDEShortcut("Ctrl+J"), m_viewContainer, TQ_SLOT(showJoinChannelDialog()), actionCollection(), "join_channel"); @@ -323,9 +323,9 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window" // set up KABC with a nice gui error dialog TDEABC::GuiErrorHandler *m_guiErrorHandler = new TDEABC::GuiErrorHandler(this); - kapp->dcopClient()->setAcceptCalls( false ); + tdeApp->dcopClient()->setAcceptCalls( false ); Konversation::Addressbook::self()->getAddressBook()->setErrorHandler(m_guiErrorHandler); - kapp->dcopClient()->setAcceptCalls( true ); + tdeApp->dcopClient()->setAcceptCalls( true ); if (Preferences::useNotify() && Preferences::openWatchedNicksAtStartup()) m_viewContainer->openNicksOnlinePanel(); @@ -339,7 +339,7 @@ KonversationMainWindow::~KonversationMainWindow() int KonversationMainWindow::confirmQuit() { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); if (konvApp->getConnectionManager()->connectionCount() == 0) return KMessageBox::Continue; @@ -382,7 +382,7 @@ void KonversationMainWindow::quitProgram() bool KonversationMainWindow::queryClose() { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); if (!konvApp->sessionSaving()) { @@ -441,7 +441,7 @@ bool KonversationMainWindow::event(TQEvent* e) { m_statusBar->clearMainLabelTempText(); - if (kapp->activeModalWidget() == 0) + if (tdeApp->activeModalWidget() == 0) emit triggerRememberLine(); } @@ -564,7 +564,7 @@ void KonversationMainWindow::openServerList() if (!m_serverListDialog) { m_serverListDialog = new Konversation::ServerListDialog(this); - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); connect(m_serverListDialog, TQ_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)), konvApp, TQ_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*))); @@ -629,7 +629,7 @@ void KonversationMainWindow::openNotifications() void KonversationMainWindow::notifyAction(const TQString& serverName, const TQString& nick) { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); Server* server = konvApp->getConnectionManager()->getServerByName(serverName); if (server) server->notifyAction(nick); } diff --git a/konversation/src/konvibookmarkhandler.cpp b/konversation/src/konvibookmarkhandler.cpp index e4d6283..2ddda30 100644 --- a/konversation/src/konvibookmarkhandler.cpp +++ b/konversation/src/konvibookmarkhandler.cpp @@ -46,7 +46,7 @@ m_mainWindow(mainWindow) } KBookmarkManager *manager = KBookmarkManager::managerForFile( m_file, false); - manager->setEditorOptions(kapp->caption(), false); + manager->setEditorOptions(tdeApp->caption(), false); manager->setUpdate( true ); manager->setShowNSBookmarks( false ); @@ -79,7 +79,7 @@ const TQString &) void KonviBookmarkHandler::openBookmarkURL(const TQString& url, const TQString& /* title */) { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); konvApp->getConnectionManager()->connectTo(Konversation::SilentlyReuseConnection, url); } diff --git a/konversation/src/linkaddressbook/addressbook.cpp b/konversation/src/linkaddressbook/addressbook.cpp index ce89caa..b2ae1fe 100644 --- a/konversation/src/linkaddressbook/addressbook.cpp +++ b/konversation/src/linkaddressbook/addressbook.cpp @@ -318,8 +318,8 @@ void Addressbook::emitContactPresenceChanged(const TQString &uid, int presence) // kdDebug() << "Addressbook::emitContactPresenceChanged was called with empty uid" << endl; return; } - Q_ASSERT(kapp->dcopClient()); - emit contactPresenceChanged(uid, kapp->dcopClient()->appId(), presence); + Q_ASSERT(tdeApp->dcopClient()); + emit contactPresenceChanged(uid, tdeApp->dcopClient()->appId(), presence); // kdDebug() << "Presence changed for uid " << uid << " to " << presence << endl; } diff --git a/konversation/src/linkaddressbook/addressbook_base.cpp b/konversation/src/linkaddressbook/addressbook_base.cpp index eee5992..d4fabbc 100644 --- a/konversation/src/linkaddressbook/addressbook_base.cpp +++ b/konversation/src/linkaddressbook/addressbook_base.cpp @@ -162,7 +162,7 @@ namespace Konversation TQString serverOrGroup; KonversationApplication::splitNick_Server(*it, ircnick, serverOrGroup); NickInfoPtr nickInfo = - dynamic_cast<KonversationApplication*>(kapp)->getNickInfo(ircnick, serverOrGroup); + dynamic_cast<KonversationApplication*>(tdeApp)->getNickInfo(ircnick, serverOrGroup); if(nickInfo) { if(!nickInfo->isAway()) @@ -235,7 +235,7 @@ namespace Konversation } void AddressbookBase::focusAndShowErrorMessage(const TQString &errorMsg) { - static_cast<KonversationApplication *>(kapp)->getMainWindow()->focusAndShowErrorMessage(errorMsg); + static_cast<KonversationApplication *>(tdeApp)->getMainWindow()->focusAndShowErrorMessage(errorMsg); } /**For a given contact, adds the ircnick if they don't already have it. If you pass an addressBook, the contact is inserted * if it has changed. */ @@ -382,7 +382,7 @@ namespace Konversation // //Because of stupid bugs in kaddressbook, first load kaddressbook using startServiceByDesktopPath // then call it on the command line to actually put it in edit mode. This is stupid :( - kapp->startServiceByDesktopName( "kaddressbook" ); + tdeApp->startServiceByDesktopName( "kaddressbook" ); TDEProcess *proc = new TDEProcess; *proc << "kaddressbook"; diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp index c37ef69..25e236c 100644 --- a/konversation/src/nick.cpp +++ b/konversation/src/nick.cpp @@ -237,7 +237,7 @@ void Nick::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int wid if(nickInfo->isAway()) { - cg2.setColor(TQColorGroup::Text, kapp->palette(listView()).disabled().text()); + cg2.setColor(TQColorGroup::Text, tdeApp->palette(listView()).disabled().text()); } TDEListViewItem::paintCell(p,cg2,column,width,align); diff --git a/konversation/src/nicklistview.cpp b/konversation/src/nicklistview.cpp index 63638b6..a363066 100644 --- a/konversation/src/nicklistview.cpp +++ b/konversation/src/nicklistview.cpp @@ -90,7 +90,7 @@ TDEListView(parent) newitem = popup->insertItem(i18n("Open DCC &Chat"),Konversation::StartDccChat); popup->setWhatsThis(newitem, "<qt>Start a private <em>D</em>irect <em>C</em>lient <em>C</em>onnection chat between you and this person.<p/><em>Technical note:</em><br />The conversation between you and this person will be sent directly. This means it is independent from the server - so if the server connection fails, or use disconnect, your DCC Chat will be unaffected. It also means that no irc server admin can view or spy on this chat.</qt>"); - if (kapp->authorize("allow_downloading")) + if (tdeApp->authorize("allow_downloading")) { newitem = popup->insertItem(SmallIcon("2rightarrow"),i18n("Send &File..."),Konversation::DccSend); popup->setWhatsThis(newitem, "<qt>Send a file to this person. If you are having problem sending files, or they are sending slowly, see the Konversation Handbook and DCC preferences page.</qt>"); diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp index e57c17a..4e5fa28 100644 --- a/konversation/src/nicksonline.cpp +++ b/konversation/src/nicksonline.cpp @@ -459,7 +459,7 @@ void NicksOnline::updateServerOnlineList(Server* servr) NickInfoPtr NicksOnline::getOnlineNickInfo(TQString& networkName, TQString& nickname) { // Get list of pointers to all servers. - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); TQPtrList<Server> serverList = konvApp->getConnectionManager()->getServerList(); for (Server* server = serverList.first(); server; server = serverList.next()) { @@ -480,7 +480,7 @@ NickInfoPtr NicksOnline::getOnlineNickInfo(TQString& networkName, TQString& nick */ void NicksOnline::requestWhois(TQString& networkName, TQString& nickname) { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); TQPtrList<Server> serverList = konvApp->getConnectionManager()->getServerList(); for (Server* server = serverList.first(); server; server = serverList.next()) { @@ -497,7 +497,7 @@ void NicksOnline::requestWhois(TQString& networkName, TQString& nickname) */ void NicksOnline::refreshAllServerOnlineLists() { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); TQPtrList<Server> serverList = konvApp->getConnectionManager()->getServerList(); Server* server; // Remove servers no longer connected. diff --git a/konversation/src/notificationhandler.cpp b/konversation/src/notificationhandler.cpp index da10278..7525738 100644 --- a/konversation/src/notificationhandler.cpp +++ b/konversation/src/notificationhandler.cpp @@ -60,7 +60,7 @@ namespace Konversation if(Preferences::oSDShowChannel() && (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); konvApp->osd->showOSD('(' + chatWin->getName() + ") <" + fromNick + "> " + cleanedMessage); } } @@ -80,7 +80,7 @@ namespace Konversation startTrayNotification(chatWin); - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); if((Preferences::oSDShowChannel() || Preferences::oSDShowOwnNick()) && (!m_mainWindow->isActiveWindow() || @@ -106,7 +106,7 @@ namespace Konversation startTrayNotification(chatWin); - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); if(Preferences::oSDShowQuery() && (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) @@ -141,7 +141,7 @@ namespace Konversation if(Preferences::oSDShowChannelEvent() && (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); konvApp->osd->showOSD(i18n("%1 joined %2").arg(nick, chatWin->getName())); } } @@ -160,7 +160,7 @@ namespace Konversation if(Preferences::oSDShowChannelEvent() && (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); konvApp->osd->showOSD(i18n("%1 parted %2").arg(nick, chatWin->getName())); } } @@ -284,7 +284,7 @@ namespace Konversation if(Preferences::oSDShowOwnNick() && (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); // if there was no nick associated, this must be a command message, so don't try displaying // an empty nick in <> if(fromNick.isEmpty()) diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp index 73798c6..c6f5432 100644 --- a/konversation/src/osd.cpp +++ b/konversation/src/osd.cpp @@ -407,7 +407,7 @@ OSDWidget::KDesktopLockStatus OSDWidget::isKDesktopLockRunning() if (!Preferences::oSDCheckDesktopLock()) return NotLocked; - DCOPClient *dcopptr = TDEApplication::kApplication()->dcopClient(); + DCOPClient *dcopptr = tdeApp->dcopClient(); // Can't tell, very weird if (!dcopptr || !dcopptr->isAttached()) diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp index 4d5d0c5..2a0145f 100644 --- a/konversation/src/osd_preferences.cpp +++ b/konversation/src/osd_preferences.cpp @@ -85,7 +85,7 @@ void OSD_Config::restorePageToDefaults() void OSD_Config::saveSettings() { //Update the current OSD. - KonversationApplication *konvApp=static_cast<KonversationApplication *>(TDEApplication::kApplication()); + KonversationApplication *konvApp=static_cast<KonversationApplication *>(tdeApp); konvApp->osd->setEnabled(kcfg_UseOSD->isChecked()); if (kcfg_UseOSD->isChecked()) diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp index 079a8f1..13b5984 100644 --- a/konversation/src/outputfilter.cpp +++ b/konversation/src/outputfilter.cpp @@ -326,7 +326,7 @@ namespace Konversation OutputFilterResult OutputFilter::parseShowTuner(const TQString ¶meter) { - KonversationApplication *konvApp = static_cast<KonversationApplication*>(TDEApplication::kApplication()); + KonversationApplication *konvApp = static_cast<KonversationApplication*>(tdeApp); OutputFilterResult result; if(parameter.isEmpty() || parameter == "on") diff --git a/konversation/src/query.cpp b/konversation/src/query.cpp index 01e5cb4..fc7ea6d 100644 --- a/konversation/src/query.cpp +++ b/konversation/src/query.cpp @@ -89,7 +89,7 @@ Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent) popup->setItemVisible(Konversation::IgnoreNick, false); popup->setItemVisible(Konversation::UnignoreNick, false); - if (kapp->authorize("allow_downloading")) + if (tdeApp->authorize("allow_downloading")) popup->insertItem(SmallIcon("2rightarrow"),i18n("Send &File..."),Konversation::DccSend); popup->insertItem(i18n("Add to Watched Nicks"), Konversation::AddNotify); @@ -634,7 +634,7 @@ void Query::serverOnline(bool online) popup->setItemEnabled(Konversation::UnignoreNick, online); popup->setItemEnabled(Konversation::AddNotify, online); - if (kapp->authorize("allow_downloading")) + if (tdeApp->authorize("allow_downloading")) popup->setItemEnabled(Konversation::DccSend, online); } } diff --git a/konversation/src/queuetuner.cpp b/konversation/src/queuetuner.cpp index a8becf5..21a9d61 100644 --- a/konversation/src/queuetuner.cpp +++ b/konversation/src/queuetuner.cpp @@ -35,7 +35,7 @@ QueueTuner::QueueTuner(TQWidget* parent, ViewContainer *container) : QueueTunerBase(parent), m_server(0), m_timer(this, "qTuner"), m_vis(Preferences::self()->showQueueTunerItem()->value()) { - m_closeButton->setIconSet(kapp->iconLoader()->loadIconSet("window-close", TDEIcon::Toolbar, 16)); + m_closeButton->setIconSet(tdeApp->iconLoader()->loadIconSet("window-close", TDEIcon::Toolbar, 16)); connect(m_closeButton, TQ_SIGNAL(clicked()), TQ_SLOT(close())); connect(container, TQ_SIGNAL(frontServerChanging(Server*)), TQ_SLOT(setServer(Server*))); connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerFired())); diff --git a/konversation/src/quickbuttons_preferences.cpp b/konversation/src/quickbuttons_preferences.cpp index 8ce1eaa..cc872da 100644 --- a/konversation/src/quickbuttons_preferences.cpp +++ b/konversation/src/quickbuttons_preferences.cpp @@ -81,7 +81,7 @@ void QuickButtons_Config::setButtonsListView(const TQStringList &buttonList) void QuickButtons_Config::saveSettings() { // get configuration object - TDEConfig* config=kapp->config(); + TDEConfig* config=tdeApp->config(); // delete all buttons config->deleteGroup("Button List"); diff --git a/konversation/src/scriptlauncher.cpp b/konversation/src/scriptlauncher.cpp index 187e936..455cb20 100644 --- a/konversation/src/scriptlauncher.cpp +++ b/konversation/src/scriptlauncher.cpp @@ -49,7 +49,7 @@ void ScriptLauncher::launchScript(const TQString& target, const TQString ¶me TQString scriptPath(kstddir.findResource("data","konversation/scripts/"+parameterList[0])); process << scriptPath // script path and name - << kapp->dcopClient()->appId() // our dcop port + << tdeApp->dcopClient()->appId() // our dcop port << TQString::number(m_server->connectionId()) // the server we are connected to << target; // the target where the call came from diff --git a/konversation/src/searchbar.cpp b/konversation/src/searchbar.cpp index 3305783..e84d026 100644 --- a/konversation/src/searchbar.cpp +++ b/konversation/src/searchbar.cpp @@ -45,7 +45,7 @@ SearchBar::SearchBar(TQWidget* parent) m_fromCursor = false; setFocusProxy(m_searchEdit); - TDEIconLoader* iconLoader = kapp->iconLoader(); + TDEIconLoader* iconLoader = tdeApp->iconLoader(); m_closeButton->setIconSet(iconLoader->loadIconSet("window-close", TDEIcon::Toolbar, 16)); m_findNextButton->setIconSet(iconLoader->loadIconSet("go-up", TDEIcon::Toolbar, 16)); m_findPreviousButton->setIconSet(iconLoader->loadIconSet("go-down", TDEIcon::Toolbar, 16)); diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp index e6627bd..47ce8b2 100644 --- a/konversation/src/server.cpp +++ b/konversation/src/server.cpp @@ -273,7 +273,7 @@ void Server::connectSignals() connect(getOutputFilter(), TQ_SIGNAL(closeRawLog()), this, TQ_SLOT(closeRawLog())); connect(getOutputFilter(), TQ_SIGNAL(encodingChanged()), this, TQ_SLOT(updateEncoding())); - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); connect(getOutputFilter(), TQ_SIGNAL(connectTo(Konversation::ConnectionFlag, const TQString&, const TQString&, const TQString&, const TQString&, const TQString&, bool)), konvApp->getConnectionManager(), TQ_SLOT(connectTo(Konversation::ConnectionFlag, @@ -602,7 +602,7 @@ void Server::broken(int state) if (getConnectionState() != Konversation::SSDeliberatelyDisconnected) { - static_cast<KonversationApplication*>(kapp)->notificationHandler()->connectionFailure(getStatusView(), getServerName()); + static_cast<KonversationApplication*>(tdeApp)->notificationHandler()->connectionFailure(getStatusView(), getServerName()); TQString error = i18n("Connection to Server %1 lost: %2.") .arg(getConnectionSettings().server().host()) @@ -1456,7 +1456,7 @@ class Query* Server::addQuery(const NickInfoPtr & nickInfo, bool weinitiated) m_queryNicks.insert(lcNickname, nickInfo); if (!weinitiated) - static_cast<KonversationApplication*>(kapp)->notificationHandler()->query(query, nickname); + static_cast<KonversationApplication*>(tdeApp)->notificationHandler()->query(query, nickname); } // try to get hostmask if there's none yet @@ -2299,7 +2299,7 @@ NickInfoPtr Server::setWatchedNickOnline(const TQString& nickname) appendMessageToFrontmost(i18n("Notify"),"<a href=\"#"+nickname+"\">"+ i18n("%1 is online (%2).").arg(nickname).arg(getServerName())+"</a>", getStatusView()); - static_cast<KonversationApplication*>(kapp)->notificationHandler()->nickOnline(getStatusView(), nickname); + static_cast<KonversationApplication*>(tdeApp)->notificationHandler()->nickOnline(getStatusView(), nickname); nickInfo->setPrintedOnline(true); return nickInfo; @@ -2316,7 +2316,7 @@ void Server::setWatchedNickOffline(const TQString& nickname, const NickInfoPtr n appendMessageToFrontmost(i18n("Notify"), i18n("%1 went offline (%2).").arg(nickname).arg(getServerName()), getStatusView()); - static_cast<KonversationApplication*>(kapp)->notificationHandler()->nickOffline(getStatusView(), nickname); + static_cast<KonversationApplication*>(tdeApp)->notificationHandler()->nickOffline(getStatusView(), nickname); } @@ -3048,7 +3048,7 @@ void Server::updateAutoJoin(Konversation::ChannelSettings channel) ViewContainer* Server::getViewContainer() const { - KonversationApplication* konvApp = static_cast<KonversationApplication *>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication *>(tdeApp); return konvApp->getMainWindow()->getViewContainer(); } diff --git a/konversation/src/serverlistdialog.cpp b/konversation/src/serverlistdialog.cpp index a46b56e..9bf0385 100644 --- a/konversation/src/serverlistdialog.cpp +++ b/konversation/src/serverlistdialog.cpp @@ -161,7 +161,7 @@ namespace Konversation updateButtons(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ServerListDialog"); TQSize newSize = size(); newSize = config->readSizeEntry("Size", &newSize); @@ -172,7 +172,7 @@ namespace Konversation ServerListDialog::~ServerListDialog() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("ServerListDialog"); config->writeEntry("Size", size()); } diff --git a/konversation/src/theme_preferences.cpp b/konversation/src/theme_preferences.cpp index 34d56dc..ee50fb6 100644 --- a/konversation/src/theme_preferences.cpp +++ b/konversation/src/theme_preferences.cpp @@ -145,7 +145,7 @@ void Theme_Config::saveSettings() if(hasChanged()) { // save icon theme name - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Themes"); config->writeEntry("IconTheme",m_currentTheme); // set in-memory theme to the saved theme @@ -209,7 +209,7 @@ void Theme_Config::installTheme() KTar themeArchive(tmpThemeFile); themeArchive.open(IO_ReadOnly); - kapp->processEvents(); + tdeApp->processEvents(); const KArchiveDirectory* themeDir = themeArchive.directory();; TQStringList allEntries = themeDir->entries(); diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp index 8d11272..d5b0add 100644 --- a/konversation/src/topiclabel.cpp +++ b/konversation/src/topiclabel.cpp @@ -134,7 +134,7 @@ namespace Konversation { if (link.startsWith("irc://")) { - KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); + KonversationApplication* konvApp = static_cast<KonversationApplication*>(tdeApp); konvApp->getConnectionManager()->connectTo(Konversation::SilentlyReuseConnection, link); } else if (link.startsWith("#") && m_server && m_server->isConnected()) @@ -199,7 +199,7 @@ namespace Konversation break; case CopyUrl: { - TQClipboard *cb = TDEApplication::kApplication()->clipboard(); + TQClipboard *cb = tdeApp->clipboard(); cb->setText(m_urlToCopy,TQClipboard::Selection); cb->setText(m_urlToCopy,TQClipboard::Clipboard); break; diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp index 0272d22..24e519e 100644 --- a/konversation/src/urlcatcher.cpp +++ b/konversation/src/urlcatcher.cpp @@ -167,7 +167,7 @@ void UrlCatcher::copyUrlClicked() TQListViewItem* item=urlListView->selectedItem(); if(item) { - TQClipboard *cb=TDEApplication::kApplication()->clipboard(); + TQClipboard *cb=tdeApp->clipboard(); cb->setText(item->text(1),TQClipboard::Selection); cb->setText(item->text(1),TQClipboard::Clipboard); } diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp index 94a8106..cf839af 100644 --- a/konversation/src/viewcontainer.cpp +++ b/konversation/src/viewcontainer.cpp @@ -1990,7 +1990,7 @@ void ViewContainer::addUrlCatcher() { m_urlCatcherPanel=new UrlCatcher(m_tabWidget); addView(m_urlCatcherPanel, i18n("URL Catcher")); - KonversationApplication *konvApp=static_cast<KonversationApplication *>(TDEApplication::kApplication()); + KonversationApplication *konvApp=static_cast<KonversationApplication *>(tdeApp); connect(konvApp,TQ_SIGNAL(catchUrl(const TQString&,const TQString&)), m_urlCatcherPanel, TQ_SLOT(addUrl(const TQString&,const TQString&)) ); connect(m_urlCatcherPanel, TQ_SIGNAL(deleteUrl(const TQString&,const TQString&)), @@ -2071,7 +2071,7 @@ void ViewContainer::addDccChat(const TQString& myNick,const TQString& nick,const { if (!listen) // Someone else initiated dcc chat { - KonversationApplication* konv_app=static_cast<KonversationApplication*>(TDEApplication::kApplication()); + KonversationApplication* konv_app=static_cast<KonversationApplication*>(tdeApp); konv_app->notificationHandler()->dccChat(m_frontView, nick); } diff --git a/konversation/src/warnings_preferences.cpp b/konversation/src/warnings_preferences.cpp index 80cd51f..ec1e101 100644 --- a/konversation/src/warnings_preferences.cpp +++ b/konversation/src/warnings_preferences.cpp @@ -56,7 +56,7 @@ void Warnings_Config::restorePageToDefaults() void Warnings_Config::saveSettings() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Notification Messages"); // prepare list @@ -122,7 +122,7 @@ void Warnings_Config::loadSettings() TQCheckListItem *item; dialogListView->clear(); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Notification Messages"); TQString flagName; for(unsigned int i=0; i<dialogDefinitions.count() ;i++) diff --git a/konversation/src/watchednicknames_preferences.cpp b/konversation/src/watchednicknames_preferences.cpp index 2e4206a..34f4075 100644 --- a/konversation/src/watchednicknames_preferences.cpp +++ b/konversation/src/watchednicknames_preferences.cpp @@ -140,7 +140,7 @@ void WatchedNicknames_Config::saveSettings() // update in-memory notify list Preferences::setNotifyList(notifyList); - static_cast<KonversationApplication*>(kapp)->saveOptions(false); + static_cast<KonversationApplication*>(tdeApp)->saveOptions(false); // remember current list for hasChanged() m_oldNotifyList=currentNotifyList(); diff --git a/translations/desktop_files/eventsrc/es_AR.po b/translations/desktop_files/eventsrc/es_AR.po index 7af3bf6..928ce08 100644 --- a/translations/desktop_files/eventsrc/es_AR.po +++ b/translations/desktop_files/eventsrc/es_AR.po @@ -1,156 +1,176 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Slávek Banko <[email protected]>, 2024. +# Alejo Fernández <[email protected]>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-11-27 10:21+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2025-01-24 17:12+0000\n" +"Last-Translator: Alejo Fernández <[email protected]>\n" +"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/" +"weblate/projects/applications/konversation-events/es_AR/>\n" "Language: es_AR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: src/eventsrc:2 +#, fuzzy msgid "Konversation" -msgstr "" +msgstr "Konversation" #. Name #: src/eventsrc:6 +#, fuzzy msgid "New message" -msgstr "" +msgstr "Nuevo mensaje" #. Comment #: src/eventsrc:7 msgid "New message arrived in a channel" -msgstr "" +msgstr "Te ha llegado un nuevo mensaje a un canal" #. Name #: src/eventsrc:11 +#, fuzzy msgid "Nick written" -msgstr "" +msgstr "Apodo escrito" #. Comment #: src/eventsrc:12 msgid "Someone wrote your nick in a message" -msgstr "" +msgstr "Alguien te ha escrito tu apodo en un mensaje" #. Name #: src/eventsrc:16 +#, fuzzy msgid "Private message" -msgstr "" +msgstr "Mensaje privado" #. Comment #: src/eventsrc:17 msgid "You received a private message" -msgstr "" +msgstr "Has recibido un mensaje privado" #. Name #: src/eventsrc:21 +#, fuzzy msgid "Nick changed" -msgstr "" +msgstr "Apodo modificado" #. Comment #: src/eventsrc:22 msgid "Someone changed their nick" -msgstr "" +msgstr "Alguien ha cambiado tu apodo" #. Name #: src/eventsrc:26 msgid "Incoming file" -msgstr "" +msgstr "Archivo entrante" #. Comment #: src/eventsrc:27 msgid "Someone wants to transmit a file to you over DCC" -msgstr "" +msgstr "Alguien quiere transmitirte un fichero a través de DCC" #. Name #: src/eventsrc:31 +#, fuzzy msgid "Nick joined channel" -msgstr "" +msgstr "Apodo se ha unido al canal" #. Comment #: src/eventsrc:32 +#, fuzzy msgid "New nick joined a channel" -msgstr "" +msgstr "Un nuevo usuario se ha unido a un canal" #. Name #: src/eventsrc:36 +#, fuzzy msgid "Nick left channel" -msgstr "" +msgstr "Apodo ha dejado el canal" #. Comment #: src/eventsrc:37 +#, fuzzy msgid "A nick left a channel" -msgstr "" +msgstr "Un usuario ha abandonado un canal" #. Name #: src/eventsrc:41 +#, fuzzy msgid "Mode change" -msgstr "" +msgstr "Cambio de modo" #. Comment #: src/eventsrc:42 +#, fuzzy msgid "A user or channel mode was changed" -msgstr "" +msgstr "Un modo de usuario o de canal ha sido modificado" #. Name #: src/eventsrc:46 +#, fuzzy msgid "Notify" -msgstr "" +msgstr "Notificar" #. Comment #: src/eventsrc:47 msgid "A user on your watched nicks list has come online" -msgstr "" +msgstr "Un usuario de tu lista de apodos vigilados se ha conectado" #. Name #: src/eventsrc:51 +#, fuzzy msgid "Query" -msgstr "" +msgstr "Consulta" #. Comment #: src/eventsrc:52 msgid "Someone started a conversation (query) with you" -msgstr "" +msgstr "Alguien empezó una conversación (consulta) con vos" #. Name #: src/eventsrc:56 msgid "Kick" -msgstr "" +msgstr "Expulsar (Kickear)" #. Comment #: src/eventsrc:57 msgid "Someone kicked you out of a channel" -msgstr "" +msgstr "Alguien te ha expulsado (kickeado) de un canal" #. Name #: src/eventsrc:61 +#, fuzzy msgid "Connection failure" -msgstr "" +msgstr "Fallo de la conexión" #. Comment #: src/eventsrc:62 +#, fuzzy msgid "Failed to connect to server" -msgstr "" +msgstr "No ha sido posible conectarse al servidor" #. Name #. Comment #: src/eventsrc:66 src/eventsrc:67 msgid "You joined a channel" -msgstr "" +msgstr "Te uniste a un canal" #. Name #: src/eventsrc:71 +#, fuzzy msgid "DCC Chat" -msgstr "" +msgstr "Charla DCC" #. Comment #: src/eventsrc:72 msgid "Someone started a DCC chat with you" -msgstr "" +msgstr "Alguien empezó una charla de tipo DCC con vos" |