From 4c899296290a7499b75b1bd88267d53d7d690ffe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 13:29:01 -0600 Subject: Rename KStandard for enhanced compatibility with KDE4 --- kopete/kopete/config/appearance/appearanceconfig.cpp | 2 +- kopete/kopete/config/appearance/emoticonseditdialog.cpp | 2 +- kopete/libkopete/private/kopeteemoticons.cpp | 2 +- kopete/plugins/latex/latexplugin.cpp | 4 ++-- kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp | 2 +- kopete/protocols/winpopup/wpeditaccount.cpp | 2 +- kopete/protocols/winpopup/wpprotocol.cpp | 4 ++-- kopete/protocols/yahoo/yahoocontact.cpp | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kopete') diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 56d5d3cf..869641e9 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -504,7 +504,7 @@ void AppearanceConfig::slotLoadChatStyles() void AppearanceConfig::updateEmoticonlist() { KopetePrefs *p = KopetePrefs::prefs(); - KStandardDirs dir; + TDEStandardDirs dir; d->mPrfsEmoticons->icon_theme_list->clear(); // Wipe out old list // Get a list of directories in our icon theme dir diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp index f0510a5f..1330b566 100644 --- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp +++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp @@ -196,7 +196,7 @@ void EmoticonsEditDialog::slotEditClicked() copy = false; TQString f = mMainWidget->klvEmoticons->selectedItem()->text(2); - KStandardDirs *dir = TDEGlobal::dirs(); + TDEStandardDirs *dir = TDEGlobal::dirs(); emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f ); if( emo.isNull() ) diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index 8ea3dad4..2109a3d8 100644 --- a/kopete/libkopete/private/kopeteemoticons.cpp +++ b/kopete/libkopete/private/kopeteemoticons.cpp @@ -296,7 +296,7 @@ Emoticons::~Emoticons( ) void Emoticons::addIfPossible( const TQString& filenameNoExt, const TQStringList &emoticons ) { - KStandardDirs *dir = TDEGlobal::dirs(); + TDEStandardDirs *dir = TDEGlobal::dirs(); TQString pic; //maybe an extension was given, so try to find the exact file diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp index dd9046a2..17ef8c15 100644 --- a/kopete/plugins/latex/latexplugin.cpp +++ b/kopete/plugins/latex/latexplugin.cpp @@ -55,7 +55,7 @@ LatexPlugin::LatexPlugin( TQObject *parent, const char *name, const TQStringList connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( chatSessionCreated( Kopete::ChatSession * ) ), this, TQT_SLOT( slotNewChatSession( Kopete::ChatSession * ) ) ); - m_convScript = KStandardDirs::findExe("kopete_latexconvert.sh"); + m_convScript = TDEStandardDirs::findExe("kopete_latexconvert.sh"); slotSettingsChanged(); //Add GUI action to all already existing kmm (if the plugin is launched when kopete already rining) @@ -84,7 +84,7 @@ void LatexPlugin::slotNewChatSession( Kopete::ChatSession *KMM ) void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg ) { - TQString mMagick = KStandardDirs::findExe("convert"); + TQString mMagick = TDEStandardDirs::findExe("convert"); if ( mMagick.isEmpty() ) { // show just once diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp index 72ec92d0..64d5ffd2 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp +++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp @@ -55,7 +55,7 @@ SMPPPDCSPrefs::SMPPPDCSPrefs(TQWidget* parent, const char* name, WFlags fl) } // if netstat is NOT available, disable the option and set to SMPPPD - if(KStandardDirs::findExe("netstat") == TQString()) { + if(TDEStandardDirs::findExe("netstat") == TQString()) { autoCSTest->setEnabled(FALSE); useNetstat->setEnabled(FALSE); useNetstat->setChecked(FALSE); diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp index 414a1af6..5673ed69 100644 --- a/kopete/protocols/winpopup/wpeditaccount.cpp +++ b/kopete/protocols/winpopup/wpeditaccount.cpp @@ -52,7 +52,7 @@ WPEditAccount::WPEditAccount(TQWidget *parent, Kopete::Account *theAccount) mProtocol = WPProtocol::protocol(); - TQString tmpSmbcPath = KStandardDirs::findExe("smbclient"); + TQString tmpSmbcPath = TDEStandardDirs::findExe("smbclient"); if(account()) { mHostName->setText(account()->accountId()); diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 5d4f708a..1c52f2ee 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -138,8 +138,8 @@ void WPProtocol::installSamba() // kdDebug(14170) << "WPProtocol::installSamba()" endl; TQStringList args; - args += KStandardDirs::findExe("winpopup-install.sh"); - args += KStandardDirs::findExe("winpopup-send.sh"); + args += TDEStandardDirs::findExe("winpopup-install.sh"); + args += TDEStandardDirs::findExe("winpopup-send.sh"); if (TDEApplication::tdeinitExecWait("tdesu", args) == 0) KMessageBox::information(Kopete::UI::Global::mainWidget(), i18n("The Samba configuration file is modified."), i18n("Configuration Succeeded")); else diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index f827bba3..62b7c6c9 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -603,7 +603,7 @@ void YahooContact::inviteConference() void YahooContact::inviteWebcam() { - if ( !KStandardDirs::findExe("jasper") ) + if ( !TDEStandardDirs::findExe("jasper") ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("I cannot find the jasper image convert program.\njasper is required to render the yahoo webcam images." @@ -658,7 +658,7 @@ void YahooContact::initWebcamViewer() void YahooContact::requestWebcam() { - if ( !KStandardDirs::findExe("jasper") ) + if ( !TDEStandardDirs::findExe("jasper") ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("I cannot find the jasper image convert program.\njasper is required to render the yahoo webcam images." -- cgit v1.2.1