From c48e769eb275917717e2b55eb869f7e559293ac8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:48:31 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kopete/kopete/chatwindow/chatmessagepart.cpp | 12 +++++------ kopete/kopete/chatwindow/chatview.cpp | 14 ++++++------- kopete/kopete/chatwindow/kopetechatwindow.cpp | 24 +++++++++++----------- .../chatwindow/kopetechatwindowstylemanager.cpp | 4 ++-- kopete/kopete/chatwindow/kopeteemailwindow.cpp | 12 +++++------ kopete/kopete/chatwindow/kopeteemoticonaction.cpp | 2 +- kopete/kopete/chatwindow/krichtexteditpart.cpp | 22 ++++++++++---------- .../tests/chatwindowstylerendering_test.cpp | 2 +- .../kopete/config/appearance/appearanceconfig.cpp | 12 +++++------ .../config/appearance/emoticonseditdialog.cpp | 8 ++++---- kopete/kopete/config/behavior/behaviorconfig.cpp | 4 ++-- kopete/kopete/contactlist/kopetelviprops.cpp | 4 ++-- kopete/kopete/contactlist/kopetemetacontactlvi.cpp | 8 ++++---- kopete/kopete/kopeteapplication.cpp | 2 +- kopete/kopete/kopeteballoon.cpp | 2 +- kopete/kopete/kopeteiface.cpp | 2 +- kopete/kopete/kopetewindow.cpp | 12 +++++------ kopete/kopete/kopetewindow.h | 4 ++-- kopete/kopete/systemtray.cpp | 4 ++-- kopete/libkopete/avdevice/videodevicepool.cpp | 4 ++-- kopete/libkopete/kautoconfig.cpp | 2 +- kopete/libkopete/kautoconfig.h | 2 +- kopete/libkopete/kcautoconfigmodule.h | 4 ++-- kopete/libkopete/knotification.cpp | 4 ++-- kopete/libkopete/kopeteaccount.cpp | 4 ++-- kopete/libkopete/kopeteaccountmanager.cpp | 6 +++--- kopete/libkopete/kopeteaway.cpp | 8 ++++---- kopete/libkopete/kopeteblacklister.cpp | 4 ++-- kopete/libkopete/kopetecommandhandler.cpp | 16 +++++++-------- kopete/libkopete/kopetecommandhandler.h | 6 +++--- kopete/libkopete/kopetecontact.cpp | 6 +++--- kopete/libkopete/kopeteonlinestatusmanager.cpp | 2 +- kopete/libkopete/kopetepassword.cpp | 4 ++-- kopete/libkopete/kopetepluginmanager.cpp | 4 ++-- kopete/libkopete/kopeteprefs.cpp | 16 +++++++-------- kopete/libkopete/private/kopeteemoticons.cpp | 6 +++--- kopete/libkopete/private/kopeteviewmanager.cpp | 2 +- kopete/libkopete/tests/kopeteemoticontest.cpp | 2 +- kopete/libkopete/ui/kopetefileconfirmdialog.cpp | 10 ++++----- .../addbookmarks/addbookmarksprefssettings.cpp | 4 ++-- kopete/plugins/alias/aliaspreferences.cpp | 6 +++--- kopete/plugins/autoreplace/autoreplaceconfig.cpp | 4 ++-- .../connectionstatus/connectionstatusplugin.cpp | 14 ++++++------- .../connectionstatus/connectionstatusplugin.h | 8 ++++---- kopete/plugins/cryptography/cryptographyplugin.cpp | 2 +- kopete/plugins/cryptography/kgpgselkey.cpp | 4 ++-- kopete/plugins/cryptography/popuppublic.cpp | 10 ++++----- kopete/plugins/history/converter.cpp | 24 +++++++++++----------- kopete/plugins/latex/latexplugin.cpp | 6 +++--- kopete/plugins/motionautoaway/motionawayplugin.cpp | 2 +- kopete/plugins/netmeeting/netmeetinginvitation.cpp | 6 +++--- kopete/plugins/netmeeting/netmeetingplugin.cpp | 2 +- .../plugins/netmeeting/netmeetingpreferences.cpp | 4 ++-- kopete/plugins/smpppdcs/detectornetstat.cpp | 14 ++++++------- kopete/plugins/smpppdcs/detectornetstat.h | 8 ++++---- kopete/plugins/smpppdcs/smpppdsearcher.cpp | 18 ++++++++-------- kopete/plugins/smpppdcs/smpppdsearcher.h | 10 ++++----- kopete/plugins/statistics/statisticsdialog.cpp | 8 ++++---- kopete/plugins/texteffect/texteffectconfig.cpp | 4 ++-- kopete/plugins/translator/translatorplugin.cpp | 2 +- kopete/plugins/webpresence/webpresenceplugin.cpp | 4 ++-- .../plugins/webpresence/webpresencepreferences.cpp | 2 +- kopete/protocols/gadu/gaduaccount.cpp | 2 +- kopete/protocols/gadu/gaduregisteraccount.cpp | 2 +- .../groupwise/ui/gwreceiveinvitationdialog.cpp | 2 +- kopete/protocols/irc/ircaccount.cpp | 2 +- kopete/protocols/irc/ircchannelcontact.cpp | 2 +- kopete/protocols/irc/ircusercontact.cpp | 2 +- kopete/protocols/irc/kcodecaction.cpp | 16 +++++++-------- kopete/protocols/irc/ui/irceditaccountwidget.cpp | 8 ++++---- kopete/protocols/jabber/jabberaccount.cpp | 6 +++--- kopete/protocols/jabber/jabberbasecontact.cpp | 2 +- .../jabber/ui/jabbereditaccountwidget.cpp | 12 +++++------ .../protocols/jabber/ui/jabberregisteraccount.cpp | 2 +- kopete/protocols/msn/msnaccount.cpp | 4 ++-- kopete/protocols/msn/msnchatsession.cpp | 10 ++++----- kopete/protocols/msn/msncontact.cpp | 2 +- kopete/protocols/msn/msnswitchboardsocket.cpp | 6 +++--- kopete/protocols/msn/ui/msneditaccountwidget.cpp | 8 ++++---- kopete/protocols/msn/webcam.cpp | 4 ++-- kopete/protocols/oscar/icq/icqprotocol.cpp | 4 ++-- .../protocols/oscar/icq/ui/icquserinfowidget.cpp | 10 ++++----- kopete/protocols/oscar/oscarversionupdater.cpp | 8 ++++---- kopete/protocols/sms/services/gsmlib.h | 2 +- kopete/protocols/sms/services/smsclient.cpp | 14 ++++++------- kopete/protocols/sms/services/smsclient.h | 6 +++--- kopete/protocols/sms/services/smssendprovider.cpp | 14 ++++++------- kopete/protocols/sms/services/smssendprovider.h | 6 +++--- kopete/protocols/sms/smsaccount.h | 2 +- .../protocols/winpopup/libwinpopup/libwinpopup.cpp | 14 ++++++------- .../protocols/winpopup/libwinpopup/libwinpopup.h | 4 ++-- kopete/protocols/winpopup/wpeditaccount.cpp | 12 +++++------ kopete/protocols/winpopup/wpprotocol.cpp | 6 +++--- kopete/protocols/winpopup/wpuserinfo.cpp | 10 ++++----- kopete/protocols/winpopup/wpuserinfo.h | 2 +- kopete/protocols/yahoo/libkyahoo/webcamtask.cpp | 4 ++-- kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp | 6 +++--- kopete/protocols/yahoo/yahoowebcam.cpp | 4 ++-- 98 files changed, 326 insertions(+), 326 deletions(-) (limited to 'kopete') diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index fbd8fa2c..341e4c47 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -296,9 +296,9 @@ void ChatMessagePart::slotImportEmoticon() TQString emo = d->activeElement.getAttribute("src").string(); TQString themeName = KopetePrefs::prefs()->iconTheme(); - KIO::copy(emo, KGlobal::dirs()->saveLocation( "emoticons", themeName, false )); + KIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false )); - TQFile *fp = new TQFile(KGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml"); + TQFile *fp = new TQFile(TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml"); TQDomDocument themeXml; @@ -356,7 +356,7 @@ void ChatMessagePart::save() for(it = d->allMessages.constBegin(); it != itEnd; ++it) { Kopete::Message tempMessage = *it; - stream << "[" << KGlobal::locale()->formatDateTime(tempMessage.timestamp()) << "] "; + stream << "[" << TDEGlobal::locale()->formatDateTime(tempMessage.timestamp()) << "] "; if( tempMessage.from() && tempMessage.from()->metaContact() ) { stream << formatName(tempMessage.from()->metaContact()->displayName()); @@ -1022,7 +1022,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const iconName = message.from()->protocol()->pluginIcon(); } - protocolIcon = KGlobal::iconLoader()->iconPath( iconName, KIcon::Small ); + protocolIcon = TDEGlobal::iconLoader()->iconPath( iconName, KIcon::Small ); nickLink=TQString::fromLatin1("") .arg( TQStyleSheet::escape(message.from()->contactId()).replace('"',"""), @@ -1038,7 +1038,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const // Replace sender (contact nick) resultHTML = resultHTML.replace( TQString::fromUtf8("%sender%"), nickLink+nick+"" ); // Replace time, by default display only time and display seconds(that was true means). - resultHTML = resultHTML.replace( TQString::fromUtf8("%time%"), KGlobal::locale()->formatTime(message.timestamp().time(), true) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%time%"), TDEGlobal::locale()->formatTime(message.timestamp().time(), true) ); // Replace %screenName% (contact ID) resultHTML = resultHTML.replace( TQString::fromUtf8("%senderScreenName%"), nickLink+TQStyleSheet::escape(contactId)+"" ); // Replace service name (protocol name) @@ -1186,7 +1186,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) // Replace %destinationName% resultHTML = resultHTML.replace( TQString::fromUtf8("%destinationName%"), formatName(destinationName) ); // For %timeOpened%, display the date and time (also the seconds). - resultHTML = resultHTML.replace( TQString::fromUtf8("%timeOpened%"), KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%timeOpened%"), TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ); // Look for %timeOpened{X}% TQRegExp timeRegExp("%timeOpened\\{([^}]*)\\}%"); diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp index 52ed7fb7..da3288b0 100644 --- a/kopete/kopete/chatwindow/chatview.cpp +++ b/kopete/kopete/chatwindow/chatview.cpp @@ -477,16 +477,16 @@ void ChatView::placeMembersList( KDockWidget::DockPosition dp ) // look up the dock width int dockWidth; - KGlobal::config()->setGroup( TQString::fromLatin1( "ChatViewDock" ) ); + TDEGlobal::config()->setGroup( TQString::fromLatin1( "ChatViewDock" ) ); if( membersDockPosition == KDockWidget::DockLeft ) { - dockWidth = KGlobal::config()->readNumEntry( + dockWidth = TDEGlobal::config()->readNumEntry( TQString::fromLatin1( "membersDock,viewDock:sepPos" ), 30); } else { - dockWidth = KGlobal::config()->readNumEntry( + dockWidth = TDEGlobal::config()->readNumEntry( TQString::fromLatin1( "viewDock,membersDock:sepPos" ), 70); } @@ -834,7 +834,7 @@ void ChatView::messageSentSuccessfully() void ChatView::saveOptions() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); writeDockConfig ( config, TQString::fromLatin1( "ChatViewDock" ) ); config->setGroup( TQString::fromLatin1( "ChatViewDock" ) ); @@ -858,7 +858,7 @@ void ChatView::saveChatSettings() if ( !mc ) return; - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); TQString contactListGroup = TQString::fromLatin1("chatwindow_") + mc->metaContactId(); @@ -878,7 +878,7 @@ void ChatView::loadChatSettings() //read settings for metacontact TQString contactListGroup = TQString::fromLatin1("chatwindow_") + contacts.first()->metaContact()->metaContactId(); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup( contactListGroup ); bool enableRichText = config->readBoolEntry( "EnableRichText", true ); editPart()->slotSetRichTextEnabled( enableRichText ); @@ -889,7 +889,7 @@ void ChatView::loadChatSettings() void ChatView::readOptions() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); /** THIS IS BROKEN !!! */ //dockManager->readConfig ( config, TQString::fromLatin1("ChatViewDock") ); diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp index 730f26cc..45ff87cf 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp @@ -214,9 +214,9 @@ KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name ) windows.append( this ); windowListChanged(); - KGlobal::config()->setGroup( TQString::fromLatin1("ChatWindowSettings") ); - m_alwaysShowTabs = KGlobal::config()->readBoolEntry( TQString::fromLatin1("AlwaysShowTabs"), false ); - m_showFormatToolbar = KGlobal::config()->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true ); + TDEGlobal::config()->setGroup( TQString::fromLatin1("ChatWindowSettings") ); + m_alwaysShowTabs = TDEGlobal::config()->readBoolEntry( TQString::fromLatin1("AlwaysShowTabs"), false ); + m_showFormatToolbar = TDEGlobal::config()->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true ); adjustingFormatToolbar = false; // kdDebug( 14010 ) << k_funcinfo << "Open Windows: " << windows.count() << endl; kapp->ref(); @@ -398,7 +398,7 @@ void KopeteChatWindow::initActions(void) //The Sending movie normalIcon = TQPixmap( BarIcon( TQString::fromLatin1( "kopete" ) ) ); - animIcon = KGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar); + animIcon = TDEGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar); // Pause the animation because otherwise it's running even when we're not // showing it. This eats resources, and also triggers a pixmap leak in @@ -590,11 +590,11 @@ void KopeteChatWindow::createTabBar() { if( !m_tabBar ) { - KGlobal::config()->setGroup( TQString::fromLatin1("ChatWindowSettings") ); + TDEGlobal::config()->setGroup( TQString::fromLatin1("ChatWindowSettings") ); m_tabBar = new KTabWidget( mainArea ); m_tabBar->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - m_tabBar->setHoverCloseButton(KGlobal::config()->readBoolEntry( TQString::fromLatin1("HoverClose"), false )); + m_tabBar->setHoverCloseButton(TDEGlobal::config()->readBoolEntry( TQString::fromLatin1("HoverClose"), false )); m_tabBar->setTabReorderingEnabled(true); #if KDE_IS_VERSION(3,4,0) m_tabBar->setAutomaticResizeTabs(true); @@ -621,7 +621,7 @@ void KopeteChatWindow::createTabBar() else setActiveView( chatViewList.first() ); - int tabPosition = KGlobal::config()->readNumEntry( TQString::fromLatin1("Tab Placement") , 0 ); + int tabPosition = TDEGlobal::config()->readNumEntry( TQString::fromLatin1("Tab Placement") , 0 ); slotPlaceTabs( tabPosition ); } } @@ -1031,7 +1031,7 @@ void KopeteChatWindow::readOptions() { // load and apply config file settings affecting the appearance of the UI // kdDebug(14010) << k_funcinfo << endl; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); applyMainWindowSettings( config, TQString::fromLatin1( "KopeteChatWindow" ) ); config->setGroup( TQString::fromLatin1("ChatWindowSettings") ); m_showFormatToolbar = config->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true ); @@ -1041,7 +1041,7 @@ void KopeteChatWindow::saveOptions() { // kdDebug(14010) << k_funcinfo << endl; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); // saves menubar,toolbar and statusbar setting saveMainWindowSettings( config, TQString::fromLatin1( "KopeteChatWindow" ) ); @@ -1214,7 +1214,7 @@ void KopeteChatWindow::slotConfKeys() void KopeteChatWindow::slotConfToolbar() { - saveMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteChatWindow" )); + saveMainWindowSettings(TDEGlobal::config(), TQString::fromLatin1( "KopeteChatWindow" )); KEditToolbar *dlg = new KEditToolbar(factory(), this ); if (dlg->exec()) { @@ -1222,7 +1222,7 @@ void KopeteChatWindow::slotConfToolbar() createGUI( m_activeView->editPart() ); else createGUI( 0L ); - applyMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteChatWindow" )); + applyMainWindowSettings(TDEGlobal::config(), TQString::fromLatin1( "KopeteChatWindow" )); } delete dlg; } @@ -1247,7 +1247,7 @@ void KopeteChatWindow::updateChatState( ChatView* cv, int newState ) break; case ChatView::Normal: default: - m_tabBar->setTabColor( cv, KGlobalSettings::textColor() ); + m_tabBar->setTabColor( cv, TDEGlobalSettings::textColor() ); break; } } diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp index 67e36f3d..cf54985f 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp @@ -96,7 +96,7 @@ ChatWindowStyleManager::~ChatWindowStyleManager() void ChatWindowStyleManager::loadStyles() { - TQStringList chatStyles = KGlobal::dirs()->findDirs( "appdata", TQString::fromUtf8( "styles" ) ); + TQStringList chatStyles = TDEGlobal::dirs()->findDirs( "appdata", TQString::fromUtf8( "styles" ) ); TQString localStyleDir( locateLocal( "appdata", TQString::fromUtf8("styles/"),true) ); if( !chatStyles.contains(localStyleDir)) chatStyles<