diff options
Diffstat (limited to 'kopete')
98 files changed, 326 insertions, 326 deletions
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("<a href=\"kopetemessage://%1/?protocolId=%2&accountId=%3\" class=\"KopeteDisplayName\">") .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+"</a>" ); // 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)+"</a>" ); // 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<<localStyleDir; @@ -319,7 +319,7 @@ ChatWindowStyle *ChatWindowStyleManager::getStyleFromPool(const TQString &styleP // NOTE: This is a hidden config switch for style developers // Check in the config if the cache is disabled. // if the cache is disabled, reload the style everytime it's getted. - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("KopeteStyleDebug"); bool disableCache = config->readBoolEntry("disableStyleCache", false); if(disableCache) diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp index bb70481f..ef51c020 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp +++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp @@ -175,7 +175,7 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP else toggleMode( Send ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); applyMainWindowSettings( config, TQString::fromLatin1( "KopeteEmailWindow" ) ); d->sendInProgress = false; @@ -195,7 +195,7 @@ KopeteEmailWindow::~KopeteEmailWindow() emit( closing( this ) ); // saves menubar, toolbar and statusbar setting - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); saveMainWindowSettings( config, TQString::fromLatin1( "KopeteEmailWindow" ) ); config->sync(); @@ -239,7 +239,7 @@ void KopeteEmailWindow::initActions(void) // The animated toolbarbutton d->normalIcon = TQPixmap( BarIcon( TQString::fromLatin1( "kopete" ) ) ); - d->animIcon = KGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar); + d->animIcon = TDEGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar); d->animIcon.pause(); d->anim = new TQLabel( this, "kde toolbar widget" ); @@ -280,12 +280,12 @@ void KopeteEmailWindow::slotSmileyActivated(const TQString &sm ) void KopeteEmailWindow::slotConfToolbar() { - saveMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteEmailWindow" )); + saveMainWindowSettings(TDEGlobal::config(), TQString::fromLatin1( "KopeteEmailWindow" )); KEditToolbar *dlg = new KEditToolbar(actionCollection(), TQString::fromLatin1("kopeteemailwindow.rc") ); if (dlg->exec()) { createGUI( d->editPart ); - applyMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteEmailWindow" )); + applyMainWindowSettings(TDEGlobal::config(), TQString::fromLatin1( "KopeteEmailWindow" )); } delete dlg; } @@ -334,7 +334,7 @@ void KopeteEmailWindow::updateNextButton() { d->btnReadNext->setEnabled( false ); - d->btnReadNext->setPaletteForegroundColor( KGlobalSettings::textColor() ); + d->btnReadNext->setPaletteForegroundColor( TDEGlobalSettings::textColor() ); } else d->btnReadNext->setEnabled( true ); diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp index 6cdfedbd..4be23dd4 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp @@ -177,7 +177,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotActivated() ), isEnabled(), plainText(), diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp index ed05e036..16ebe584 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.cpp +++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp @@ -300,19 +300,19 @@ void KopeteRichTextEditPart::readConfig() { // Don't update config untill we read whole config first m_configWriteLock = true; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("RichTextEditor"); - TQColor tmpColor = KGlobalSettings::textColor(); + TQColor tmpColor = TDEGlobalSettings::textColor(); setFgColor( config->readColorEntry("FgColor", &tmpColor ) ); - tmpColor = KGlobalSettings::baseColor(); + tmpColor = TDEGlobalSettings::baseColor(); setBgColor( config->readColorEntry("BgColor", &tmpColor ) ); TQFont tmpFont = KopetePrefs::prefs()->fontFace(); setFont( config->readFontEntry("Font", &tmpFont ) ); - int tmp = KGlobalSettings::generalFont().pixelSize(); + int tmp = TDEGlobalSettings::generalFont().pixelSize(); setFontSize( config->readNumEntry( "FontSize", tmp ) ); action_bold->setChecked( config->readBoolEntry( "FontBold" ) ); @@ -342,7 +342,7 @@ void KopeteRichTextEditPart::writeConfig() // If true we're still reading the conf write now, so don't write. if( m_configWriteLock ) return; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("RichTextEditor"); config->writeEntry("Font", mFont ); config->writeEntry("FontSize", mFont.pointSize() ); @@ -359,9 +359,9 @@ void KopeteRichTextEditPart::setFgColor() { TQColor col=editor->color(); - int s = KColorDialog::getColor( col, KGlobalSettings::textColor() , editor ); + int s = KColorDialog::getColor( col, TDEGlobalSettings::textColor() , editor ); if(!col.isValid()) - col= KGlobalSettings::textColor() ; + col= TDEGlobalSettings::textColor() ; if ( s != TQDialog::Accepted ) return; @@ -391,7 +391,7 @@ void KopeteRichTextEditPart::setFgColor( const TQColor &newColor ) TQColor KopeteRichTextEditPart::fgColor() { - if( mFgColor == KGlobalSettings::textColor()) + if( mFgColor == TDEGlobalSettings::textColor()) return TQColor(); return mFgColor; } @@ -400,10 +400,10 @@ void KopeteRichTextEditPart::setBgColor() { TQColor col=mBgColor; - int s = KColorDialog::getColor( col, KGlobalSettings::baseColor(), editor ); + int s = KColorDialog::getColor( col, TDEGlobalSettings::baseColor(), editor ); if(!col.isValid()) { - col=KGlobalSettings::baseColor(); + col=TDEGlobalSettings::baseColor(); } if ( s != TQDialog::Accepted ) @@ -431,7 +431,7 @@ void KopeteRichTextEditPart::setBgColor( const TQColor &newColor ) TQColor KopeteRichTextEditPart::bgColor() { - if( mBgColor == KGlobalSettings::baseColor()) + if( mBgColor == TDEGlobalSettings::baseColor()) return TQColor(); return mBgColor; } diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index fad57bb2..d195434d 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -205,7 +205,7 @@ void ChatWindowStyleRendering_Test::testHeaderRendering() "<div>Outgoing/buddy_icon.png</div>\n" "<div>%1</div>\n" "<div>%2</div>" - ).arg(KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ) + ).arg(TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ) .arg(TQDateTime::currentDateTime().toString("hh:mm")); TQString headerHtml = d->testStyle->getHeaderHtml(); diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 4ce921aa..aff81a39 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -188,7 +188,7 @@ AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const (new TQVBoxLayout(this))->setAutoAdd(true); d->mAppearanceTabCtl = new TQTabWidget(this, "mAppearanceTabCtl"); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "ChatWindowSettings" ); // "Emoticons" TAB ========================================================== @@ -337,7 +337,7 @@ AppearanceConfig::~AppearanceConfig() void AppearanceConfig::updateEmoticonsButton(bool _b) { TQString themeName = d->mPrfsEmoticons->icon_theme_list->currentText(); - TQFileInfo fileInf(KGlobal::dirs()->findResource("emoticons", themeName+"/")); + TQFileInfo fileInf(TDEGlobal::dirs()->findResource("emoticons", themeName+"/")); d->mPrfsEmoticons->btnRemoveTheme->setEnabled( _b && fileInf.isWritable()); d->mPrfsEmoticons->btnGetThemes->setEnabled( false ); } @@ -508,7 +508,7 @@ void AppearanceConfig::updateEmoticonlist() d->mPrfsEmoticons->icon_theme_list->clear(); // Wipe out old list // Get a list of directories in our icon theme dir - TQStringList themeDirs = KGlobal::dirs()->findDirs("emoticons", ""); + TQStringList themeDirs = TDEGlobal::dirs()->findDirs("emoticons", ""); // loop adding themes from all dirs into theme-list for(unsigned int x = 0;x < themeDirs.count();x++) { @@ -540,7 +540,7 @@ void AppearanceConfig::updateEmoticonlist() void AppearanceConfig::slotSelectedEmoticonsThemeChanged() { TQString themeName = d->mPrfsEmoticons->icon_theme_list->currentText(); - TQFileInfo fileInf(KGlobal::dirs()->findResource("emoticons", themeName+"/")); + TQFileInfo fileInf(TDEGlobal::dirs()->findResource("emoticons", themeName+"/")); d->mPrfsEmoticons->btnRemoveTheme->setEnabled( fileInf.isWritable() ); Kopete::Emoticons emoticons( themeName ); @@ -845,7 +845,7 @@ void AppearanceConfig::removeSelectedEmoticonTheme() if (res!=KMessageBox::Continue) return; - KURL themeUrl(KGlobal::dirs()->findResource("emoticons", themeName+"/")); + KURL themeUrl(TDEGlobal::dirs()->findResource("emoticons", themeName+"/")); KIO::NetAccess::del(themeUrl, this); updateEmoticonlist(); @@ -853,7 +853,7 @@ void AppearanceConfig::removeSelectedEmoticonTheme() void AppearanceConfig::slotGetEmoticonThemes() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup( "KNewStuff" ); config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/emoticons-providers.xml" ); diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp index ea2fff3d..4bfb0468 100644 --- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp +++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp @@ -111,7 +111,7 @@ EmoticonsEditDialog::EmoticonsEditDialog(TQWidget *parent, TQString theme, const itm->setText(1, text); } - TQFile *fp = new TQFile(KGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml"); + TQFile *fp = new TQFile(TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml"); if( !fp->exists() ) { kdWarning() << "EmoticonsEditDialog::EmoticonsEditDialog() " << fp->name() << " doesn't exist!" << endl; @@ -142,7 +142,7 @@ EmoticonsEditDialog::EmoticonsEditDialog(TQWidget *parent, TQString theme, const void EmoticonsEditDialog::slotOkClicked() { - TQFile *fp = new TQFile(KGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml"); + TQFile *fp = new TQFile(TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml"); if( !fp->exists() ) { kdWarning() << "EmoticonsEditDialog::slotOkClicked() " << fp->name() << " doesn't exist!" << endl; @@ -196,7 +196,7 @@ void EmoticonsEditDialog::slotEditClicked() copy = false; TQString f = mMainWidget->klvEmoticons->selectedItem()->text(2); - KStandardDirs *dir = KGlobal::dirs(); + KStandardDirs *dir = TDEGlobal::dirs(); emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f ); if( emo.isNull() ) @@ -226,7 +226,7 @@ void EmoticonsEditDialog::slotRemoveClicked() void EmoticonsEditDialog::addEmoticon(TQString emo, TQString text, bool copy) { if(copy) - KIO::copy(emo, KGlobal::dirs()->saveLocation( "emoticons", themeName, false )); + KIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false )); KListViewItem *itm = new KListViewItem(mMainWidget->klvEmoticons); itm->setPixmap(0, TQPixmap(emo)); diff --git a/kopete/kopete/config/behavior/behaviorconfig.cpp b/kopete/kopete/config/behavior/behaviorconfig.cpp index b133a64b..dc21e28a 100644 --- a/kopete/kopete/config/behavior/behaviorconfig.cpp +++ b/kopete/kopete/config/behavior/behaviorconfig.cpp @@ -159,7 +159,7 @@ void BehaviorConfig::save() // kdDebug(14000) << k_funcinfo << "called." << endl; KopetePrefs *p = KopetePrefs::prefs(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); // "General" TAB ============================================================ p->setShowTray(mPrfsGeneral->mShowTrayChk->isChecked()); @@ -219,7 +219,7 @@ void BehaviorConfig::load() { // kdDebug(14000) << k_funcinfo << "called" << endl; KopetePrefs *p = KopetePrefs::prefs(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); awayInstance = Kopete::Away::getInstance(); // "General" TAB ============================================================ diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index 0c66892c..a731b504 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -535,8 +535,8 @@ void KopeteMetaLVIProps::slotOpenSoundDialog( KURLRequester *requester ) // find the first "sound"-resource that contains files TQStringList soundDirs = - KGlobal::dirs()->findDirs("data", "kopete/sounds"); - soundDirs += KGlobal::dirs()->resourceDirs( "sound" ); + TDEGlobal::dirs()->findDirs("data", "kopete/sounds"); + soundDirs += TDEGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { KURL soundURL; diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index 51334e8d..7daabb61 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -254,7 +254,7 @@ void KopeteMetaContactLVI::initLVI() mIsBlinkIcon = false; //if ( !mBlinkIcon ) - // mBlinkIcon = new TQPixmap( KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "newmsg" ), KIcon::Small ) ); + // mBlinkIcon = new TQPixmap( TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "newmsg" ), KIcon::Small ) ); slotConfigChanged(); // this calls slotIdleStateChanged(), which sets up the constituent components, spacing, fonts and indirectly, the contact icon slotDisplayNameChanged(); @@ -515,7 +515,7 @@ void KopeteMetaContactLVI::slotPhotoChanged() { m_oldStatusIcon= d->metaContactIcon->pixmap(); TQPixmap photoPixmap; - //TQPixmap defaultIcon( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); + //TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); TQImage photoImg = m_metaContact->photo(); if ( !photoImg.isNull() && (photoImg.width() > 0) && (photoImg.height() > 0) ) { @@ -884,8 +884,8 @@ void KopeteMetaContactLVI::updateContactIcons() void KopeteMetaContactLVI::updateContactIcon( Kopete::Contact *c ) { - KGlobal::config()->setGroup( TQString::fromLatin1("ContactList") ); - bool bHideOffline = KGlobal::config()->readBoolEntry( + TDEGlobal::config()->setGroup( TQString::fromLatin1("ContactList") ); + bool bHideOffline = TDEGlobal::config()->readBoolEntry( TQString::fromLatin1("HideOfflineContacts"), false ); if ( KopetePrefs::prefs()->showOffline() ) bHideOffline = false; diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp index 4c37e059..8dba350d 100644 --- a/kopete/kopete/kopeteapplication.cpp +++ b/kopete/kopete/kopeteapplication.cpp @@ -118,7 +118,7 @@ void KopeteApplication::slotLoadPlugins() Kopete::AccountManager::self()->load(); Kopete::ContactList::self()->load(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); // Parse command-line arguments TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp index d7d6d096..c961a91a 100644 --- a/kopete/kopete/kopeteballoon.cpp +++ b/kopete/kopete/kopeteballoon.cpp @@ -161,7 +161,7 @@ void KopeteBalloon::updateMask() // get screen-geometry for screen our anchor is on // (geometry can differ from screen to screen! - TQRect deskRect = KGlobalSettings::desktopGeometry(mAnchor); + TQRect deskRect = TDEGlobalSettings::desktopGeometry(mAnchor); bool bottom = (mAnchor.y() + height()) > ((deskRect.y() + deskRect.height()-48)); bool right = (mAnchor.x() + width()) > ((deskRect.x() + deskRect.width()-48)); diff --git a/kopete/kopete/kopeteiface.cpp b/kopete/kopete/kopeteiface.cpp index a197c649..46049498 100644 --- a/kopete/kopete/kopeteiface.cpp +++ b/kopete/kopete/kopeteiface.cpp @@ -35,7 +35,7 @@ KopeteIface::KopeteIface() : DCOPObject( "KopeteIface" ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("AutoAway"); if (config->readBoolEntry("UseAutoAway", true)) diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index 87581866..d55caa81 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -326,7 +326,7 @@ void KopeteWindow::initActions() connect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), TQT_TQOBJECT(this), TQT_SLOT(slotConfigChanged()) ); slotConfigChanged(); - globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) ); + globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) ); globalAccel->insert( TQString::fromLatin1("Read Message"), i18n("Read Message"), i18n("Read the next pending message"), CTRL+SHIFT+Key_I, KKey::QtWIN+CTRL+Key_I, Kopete::ChatSessionManager::self(), TQT_SLOT(slotReadMessage()) ); @@ -422,7 +422,7 @@ bool KopeteWindow::eventFilter( TQObject* target, TQEvent* event ) void KopeteWindow::loadOptions() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); toolBar("mainToolBar")->applySettings( config, "ToolBar Settings" ); toolBar("quickSearchBar")->applySettings( config, "QuickSearchBar Settings" ); @@ -469,7 +469,7 @@ void KopeteWindow::loadOptions() void KopeteWindow::saveOptions() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); toolBar("mainToolBar")->saveSettings ( config, "ToolBar Settings" ); toolBar("quickSearchBar")->saveSettings( config, "QuickSearchBar Settings" ); @@ -576,7 +576,7 @@ void KopeteWindow::slotConfGlobalKeys() void KopeteWindow::slotConfToolbar() { - saveMainWindowSettings(KGlobal::config(), "General Options"); + saveMainWindowSettings(TDEGlobal::config(), "General Options"); KEditToolbar *dlg = new KEditToolbar(factory()); connect( dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotUpdateToolbar()) ); connect( dlg, TQT_SIGNAL(finished()) , dlg, TQT_SLOT(deleteLater())); @@ -585,7 +585,7 @@ void KopeteWindow::slotConfToolbar() void KopeteWindow::slotUpdateToolbar() { - applyMainWindowSettings(KGlobal::config(), "General Options"); + applyMainWindowSettings(TDEGlobal::config(), "General Options"); } void KopeteWindow::slotGlobalAway() @@ -828,7 +828,7 @@ void KopeteWindow::slotAccountStatusIconChanged( Kopete::Contact *contact ) // Because we want null pixmaps to detect the need for a loadMovie // we can't use the SmallIcon() method directly - KIconLoader *loader = KGlobal::instance()->iconLoader(); + KIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQMovie mv = loader->loadMovie( status.overlayIcons().first(), KIcon::Small ); diff --git a/kopete/kopete/kopetewindow.h b/kopete/kopete/kopetewindow.h index 0a687831..a9625931 100644 --- a/kopete/kopete/kopetewindow.h +++ b/kopete/kopete/kopetewindow.h @@ -35,7 +35,7 @@ class TQPoint; class KAction; class KActionMenu; -class KGlobalAccel; +class TDEGlobalAccel; class KSelectAction; class KSqueezedTextLabel; class KToggleAction; @@ -220,7 +220,7 @@ public: KToggleAction *statusbarAction; KToggleAction *actionShowOffliners; KToggleAction *actionShowEmptyGroups; - KGlobalAccel *globalAccel; + TDEGlobalAccel *globalAccel; KopeteEditGlobalIdentityWidget *editGlobalIdentityWidget; private: diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp index 89ce1351..75fef262 100644 --- a/kopete/kopete/systemtray.cpp +++ b/kopete/kopete/systemtray.cpp @@ -132,7 +132,7 @@ void KopeteSystemTray::contextMenuAboutToShow( KPopupMenu *me ) void KopeteSystemTray::startBlink( const TQString &icon ) { - startBlink( KGlobal::iconLoader()->loadIcon( icon , KIcon::Panel ) ); + startBlink( TDEGlobal::iconLoader()->loadIcon( icon , KIcon::Panel ) ); } void KopeteSystemTray::startBlink( const TQPixmap &icon ) @@ -164,7 +164,7 @@ void KopeteSystemTray::startBlink( const TQMovie &movie ) void KopeteSystemTray::startBlink() { if ( mMovie.isNull() ) - mMovie = KGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Panel ); + mMovie = TDEGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Panel ); startBlink( mMovie ); } diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp index cbfe7cb1..a229937c 100644 --- a/kopete/libkopete/avdevice/videodevicepool.cpp +++ b/kopete/libkopete/avdevice/videodevicepool.cpp @@ -756,7 +756,7 @@ void VideoDevicePool::loadConfig() kdDebug(14010) << k_funcinfo << "called" << endl; if((hasDevices())&&(m_clients==0)) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Video Device Settings"); const TQString currentdevice = config->readEntry("Current Device", TQString()); kdDebug(14010) << k_funcinfo << "Current device: " << currentdevice << endl; @@ -817,7 +817,7 @@ void VideoDevicePool::saveConfig() kdDebug(14010) << k_funcinfo << "called" << endl; if(hasDevices()) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Video Device Settings"); /* if(m_modelvector.size()) diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index c1347d75..c6c0b2c0 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -107,7 +107,7 @@ KAutoConfig::KAutoConfig(KConfig *kconfig, TQObject *parent, } KAutoConfig::KAutoConfig(TQObject *parent, const char *name) : - TQObject(parent, name), config(KGlobal::config()) { + TQObject(parent, name), config(TDEGlobal::config()) { d = new KAutoConfigPrivate(); } diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h index c9b4fa2a..0aecd380 100644 --- a/kopete/libkopete/kautoconfig.h +++ b/kopete/libkopete/kautoconfig.h @@ -128,7 +128,7 @@ public: /** * Constructor. - * Uses KGlobal::config() when retrieving/saving the widgets that + * Uses TDEGlobal::config() when retrieving/saving the widgets that * KAutoConfig knows about. * @param parent - Parent object. * @param name - Object name. diff --git a/kopete/libkopete/kcautoconfigmodule.h b/kopete/libkopete/kcautoconfigmodule.h index 91ce9886..be76dc26 100644 --- a/kopete/libkopete/kcautoconfigmodule.h +++ b/kopete/libkopete/kcautoconfigmodule.h @@ -56,12 +56,12 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule public: /** - * Standard KCModule constructor. Use KGlobal::config() + * Standard KCModule constructor. Use TDEGlobal::config() */ KCAutoConfigModule( TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); /** - * Standard KCModule constructor. Use KGlobal::config() + * Standard KCModule constructor. Use TDEGlobal::config() */ KCAutoConfigModule( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp index f072254f..5bae36fb 100644 --- a/kopete/libkopete/knotification.cpp +++ b/kopete/libkopete/knotification.cpp @@ -92,10 +92,10 @@ void KNotification::notifyByExecute(const TQString &command, const TQString& eve if ( execLine.isEmpty() ) execLine = command; // fallback - KProcess p; + TDEProcess p; p.setUseShell(true); p << execLine; - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); // return true; } //return false; diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index bb8b3d36..f549d1f0 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -86,7 +86,7 @@ public: Account::Account( Protocol *parent, const TQString &accountId, const char *name ) : TQObject( parent, name ), d( new Private( parent, accountId ) ) { - d->configGroup=new KConfigGroup(KGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id )); + d->configGroup=new KConfigGroup(TDEGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id )); d->excludeconnect = d->configGroup->readBoolEntry( "ExcludeConnect", false ); d->color = d->configGroup->readColorEntry( "Color", &d->color ); @@ -185,7 +185,7 @@ TQPixmap Account::accountIcon(const int size) const TQString icon= d->customIcon.isEmpty() ? d->protocol->pluginIcon() : d->customIcon; // FIXME: this code is duplicated with OnlineStatus, can we merge it somehow? - TQPixmap base = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap base = TDEGlobal::instance()->iconLoader()->loadIcon( icon, KIcon::Small, size ); if ( d->color.isValid() ) diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp index 7f014519..69f741cb 100644 --- a/kopete/libkopete/kopeteaccountmanager.cpp +++ b/kopete/libkopete/kopeteaccountmanager.cpp @@ -352,7 +352,7 @@ void AccountManager::save() config->writeEntry( "AccountId", it.current()->accountId() ); } - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); } void AccountManager::load() @@ -364,7 +364,7 @@ void AccountManager::load() // and load the required protocols if the account is enabled. // Don't try to optimize duplicate calls out, the plugin queue is smart enough // (and fast enough) to handle that without adding complexity here - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) ); for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it ) { @@ -387,7 +387,7 @@ void AccountManager::slotPluginLoaded( Plugin *plugin ) // Iterate over all groups that start with "Account_" as those are accounts // and parse them if they are from this protocol - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) ); for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it ) { diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp index 2b18da9c..13b4ca5d 100644 --- a/kopete/libkopete/kopeteaway.cpp +++ b/kopete/libkopete/kopeteaway.cpp @@ -143,9 +143,9 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") load(); - KSettings::Dispatcher::self()->registerInstance( KGlobal::instance(), this, TQT_SLOT( load() ) ); + KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), this, TQT_SLOT( load() ) ); // Set up the config object - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); /* Load the saved away messages */ config->setGroup("Away Messages"); @@ -255,7 +255,7 @@ void Kopete::Away::setGlobalAway(bool status) void Kopete::Away::save() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); /* Set the away message settings in the Away Messages config group */ config->setGroup("Away Messages"); config->writeEntry("Messages", d->awayMessageList); @@ -267,7 +267,7 @@ void Kopete::Away::save() void Kopete::Away::load() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("AutoAway"); d->awayTimeout=config->readNumEntry("Timeout", 600); d->goAvailable=config->readBoolEntry("GoAvailable", true); diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp index 29dbf727..88fbd0ce 100644 --- a/kopete/libkopete/kopeteblacklister.cpp +++ b/kopete/libkopete/kopeteblacklister.cpp @@ -37,7 +37,7 @@ public: BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *parent, const char *name) : TQObject(parent, name), d( new Private ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); d->owner = accountId; d->protocol = protocolId; @@ -87,7 +87,7 @@ void BlackLister::removeContact(Contact *contact) void BlackLister::saveToDisk() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("BlackLister"); config->writeEntry( d->protocol + TQString::fromLatin1("_") + d->owner, d->blacklist ); diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp index 2b0aeb4d..eba7c4ed 100644 --- a/kopete/libkopete/kopetecommandhandler.cpp +++ b/kopete/libkopete/kopetecommandhandler.cpp @@ -87,7 +87,7 @@ struct CommandHandlerPrivate { PluginCommandMap pluginCommands; Kopete::CommandHandler *s_handler; - TQMap<KProcess*,ManagerPair> processMap; + TQMap<TDEProcess*,ManagerPair> processMap; bool inCommand; TQPtrList<KAction> m_commands; }; @@ -274,9 +274,9 @@ void Kopete::CommandHandler::slotExecCommand( const TQString &args, Kopete::Chat { if( !args.isEmpty() ) { - KProcess *proc = 0L; + TDEProcess *proc = 0L; if ( kapp->authorize( TQString::fromLatin1( "shell_access" ) ) ) - proc = new KProcess(manager); + proc = new TDEProcess(manager); if( proc ) { @@ -294,9 +294,9 @@ void Kopete::CommandHandler::slotExecCommand( const TQString &args, Kopete::Chat *proc << args; } - connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(KProcess *, char *, int))); - connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(KProcess *, char *, int))); - proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(TDEProcess *, char *, int))); + connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(TDEProcess *, char *, int))); + proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); } else { @@ -350,7 +350,7 @@ void Kopete::CommandHandler::slotCloseCommand( const TQString &, Kopete::ChatSes manager->view()->closeView(); } -void Kopete::CommandHandler::slotExecReturnedData(KProcess *proc, char *buff, int bufflen ) +void Kopete::CommandHandler::slotExecReturnedData(TDEProcess *proc, char *buff, int bufflen ) { kdDebug(14010) << k_funcinfo << endl; TQString buffer = TQString::fromLocal8Bit( buff, bufflen ); @@ -362,7 +362,7 @@ void Kopete::CommandHandler::slotExecReturnedData(KProcess *proc, char *buff, in mgrPair.first->appendMessage( msg ); } -void Kopete::CommandHandler::slotExecFinished(KProcess *proc) +void Kopete::CommandHandler::slotExecFinished(TDEProcess *proc) { delete proc; p->processMap.remove( proc ); diff --git a/kopete/libkopete/kopetecommandhandler.h b/kopete/libkopete/kopetecommandhandler.h index 143a0fc6..7c26ace5 100644 --- a/kopete/libkopete/kopetecommandhandler.h +++ b/kopete/libkopete/kopetecommandhandler.h @@ -23,7 +23,7 @@ #include "kopete_export.h" -class KProcess; +class TDEProcess; struct CommandHandlerPrivate; @@ -183,8 +183,8 @@ class KOPETE_EXPORT CommandHandler : public TQObject private slots: void slotPluginLoaded( Kopete::Plugin * ); void slotPluginDestroyed( TQObject * ); - void slotExecReturnedData(KProcess *proc, char *buff, int bufflen ); - void slotExecFinished(KProcess *proc); + void slotExecReturnedData(TDEProcess *proc, char *buff, int bufflen ); + void slotExecFinished(TDEProcess *proc); void slotViewCreated( KopeteView *view ); void slotHelpCommand( const TQString & args, Kopete::ChatSession *manager ); diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp index e692b6f5..85387709 100644 --- a/kopete/libkopete/kopetecontact.cpp +++ b/kopete/libkopete/kopetecontact.cpp @@ -721,15 +721,15 @@ TQString Contact::toolTip() const switch(val.type()) { case TQVariant::DateTime: - valueText = KGlobal::locale()->formatDateTime(val.toDateTime()); + valueText = TDEGlobal::locale()->formatDateTime(val.toDateTime()); valueText = Kopete::Message::escape( valueText ); break; case TQVariant::Date: - valueText = KGlobal::locale()->formatDate(val.toDate()); + valueText = TDEGlobal::locale()->formatDate(val.toDate()); valueText = Kopete::Message::escape( valueText ); break; case TQVariant::Time: - valueText = KGlobal::locale()->formatTime(val.toTime()); + valueText = TDEGlobal::locale()->formatTime(val.toTime()); valueText = Kopete::Message::escape( valueText ); break; default: diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp index 1ecd1d00..07b23e81 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.cpp +++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp @@ -324,7 +324,7 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const TQStringList overlays = statusFor.overlayIcons(); if ( !( overlays.isEmpty() ) ) // otherwise leave the basis as-is { - KIconLoader *loader = KGlobal::instance()->iconLoader(); + KIconLoader *loader = TDEGlobal::instance()->iconLoader(); int i = 0; for( TQStringList::iterator it = overlays.begin(), end = overlays.end(); it != end; ++it ) diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp index ab2bc683..5fb1b847 100644 --- a/kopete/libkopete/kopetepassword.cpp +++ b/kopete/libkopete/kopetepassword.cpp @@ -380,7 +380,7 @@ Kopete::Password &Kopete::Password::operator=( Password &other ) void Kopete::Password::readConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( d->configGroup ); TQString passwordCrypted = config->readEntry( "Password" ); @@ -395,7 +395,7 @@ void Kopete::Password::readConfig() void Kopete::Password::writeConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if(!config->hasGroup(d->configGroup)) { //### (KOPETE) diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index 12b3822a..4322dc34 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -258,7 +258,7 @@ void PluginManager::loadAllPlugins() { // FIXME: We need session management here - Martijn - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if ( config->hasGroup( TQString::fromLatin1( "Plugins" ) ) ) { TQMap<TQString, bool> pluginsMap; @@ -502,7 +502,7 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /* { TQString pluginId = _pluginId; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Plugins" ); // FIXME: What is this for? This sort of thing is kconf_update's job - Richard diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp index 6e9072d0..353ea46d 100644 --- a/kopete/libkopete/kopeteprefs.cpp +++ b/kopete/libkopete/kopeteprefs.cpp @@ -39,7 +39,7 @@ KopetePrefs *KopetePrefs::prefs() KopetePrefs::KopetePrefs() : TQObject( kapp, "KopetePrefs" ) { - config = KGlobal::config(); + config = TDEGlobal::config(); load(); } @@ -82,20 +82,20 @@ void KopetePrefs::load() mChatViewBufferSize = config->readNumEntry("ChatView BufferSize", 250); - TQColor tmpColor = KGlobalSettings::highlightColor(); + TQColor tmpColor = TDEGlobalSettings::highlightColor(); mHighlightBackground = config->readColorEntry("Highlight Background Color", &tmpColor); - tmpColor = KGlobalSettings::highlightedTextColor(); + tmpColor = TDEGlobalSettings::highlightedTextColor(); mHighlightForeground = config->readColorEntry("Highlight Foreground Color", &tmpColor); mHighlightEnabled = config->readBoolEntry("Highlighting Enabled", true); mBgOverride = config->readBoolEntry("ChatView Override Background", false); mFgOverride = config->readBoolEntry("ChatView Override Foreground", false); mRtfOverride = config->readBoolEntry("ChatView Override RTF", false); mInterfacePreference = config->readEntry("View Plugin", TQString::fromLatin1("kopete_chatwindow") ); - tmpColor = KGlobalSettings::textColor(); + tmpColor = TDEGlobalSettings::textColor(); mTextColor = config->readColorEntry("Text Color", &tmpColor ); - tmpColor = KGlobalSettings::baseColor(); + tmpColor = TDEGlobalSettings::baseColor(); mBgColor = config->readColorEntry("Bg Color", &tmpColor ); - tmpColor = KGlobalSettings::linkColor(); + tmpColor = TDEGlobalSettings::linkColor(); mLinkColor = config->readColorEntry("Link Color", &tmpColor ); mFontFace = config->readFontEntry("Font Face"); tmpColor = darkGray; @@ -137,7 +137,7 @@ void KopetePrefs::load() mContactListIconMode = (IconDisplayMode) metaObject()->property( n )->keyToValue( value.latin1() ); mContactListIndentContacts = config->readBoolEntry("IndentContacts", false); mContactListUseCustomFonts = config->readBoolEntry("UseCustomFonts", false); - TQFont font = KGlobalSettings::generalFont(); + TQFont font = TDEGlobalSettings::generalFont(); mContactListGroupFont = config->readFontEntry("GroupFont", &font); mContactListNormalFont = config->readFontEntry("NormalFont", &font); if ( font.pixelSize() != -1 ) @@ -616,7 +616,7 @@ TQFont KopetePrefs::contactListSmallFont() const { if ( mContactListUseCustomFonts ) return contactListCustomSmallFont(); - TQFont smallFont = KGlobalSettings::generalFont(); + TQFont smallFont = TDEGlobalSettings::generalFont(); if ( smallFont.pixelSize() != -1 ) smallFont.setPixelSize( (smallFont.pixelSize() * 3) / 4 ); else diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index f7fbb373..8ea3dad4 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 = KGlobal::dirs(); + KStandardDirs *dir = TDEGlobal::dirs(); TQString pic; //maybe an extension was given, so try to find the exact file @@ -365,10 +365,10 @@ void Emoticons::initEmoticons( const TQString &theme ) d->emoticonAndPicList.clear(); d->emoticonMap.clear(); - TQString filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/emoticons.xml" ) ); + TQString filename= TDEGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/emoticons.xml" ) ); if(!filename.isEmpty()) return initEmoticon_emoticonsxml( filename ); - filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/icondef.xml" ) ); + filename= TDEGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/icondef.xml" ) ); if(!filename.isEmpty()) return initEmoticon_JEP0038( filename ); kdWarning(14010) << k_funcinfo << "emotiucon XML theme description not found" <<endl; diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 783c399c..2a5074f8 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -205,7 +205,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi && msg.direction() != Kopete::Message::Internal ) { TQWidget *w=dynamic_cast<TQWidget*>(manager->view(false)); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); if( (!manager->view(false) || !w || manager->view() != d->activeView || config->readBoolEntry("EventIfActive", true) || !w->isActiveWindow()) diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp index 08910d46..83c0e64c 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.cpp +++ b/kopete/libkopete/tests/kopeteemoticontest.cpp @@ -94,7 +94,7 @@ void KopeteEmoticonTest::testEmoticonParser() inputFile.close(); expectedFile.close(); - TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString() ); + TQString path = TDEGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString() ); Kopete::Emoticons::self(); TQString result = emo.parse( inputData ).replace( path, TQString() ); diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp index fffeec66..7291feb9 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp @@ -42,12 +42,12 @@ KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo m_view=new FileConfirmBase(this, "FileConfirmView"); m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::fromLatin1( " <" ) + info.contact()->contactId() + TQString::fromLatin1( "> " ) ); - m_view->m_size->setText( KGlobal::locale()->formatNumber( long( info.size() ), 0 ) ); + m_view->m_size->setText( TDEGlobal::locale()->formatNumber( long( info.size() ), 0 ) ); m_view->m_description->setText( description ); m_view->m_filename->setText( info.file() ); - KGlobal::config()->setGroup("File Transfer"); - const TQString defaultPath=KGlobal::config()->readEntry("defaultPath" , TQDir::homeDirPath() ); + TDEGlobal::config()->setGroup("File Transfer"); + const TQString defaultPath=TDEGlobal::config()->readEntry("defaultPath" , TQDir::homeDirPath() ); m_view->m_saveto->setText(defaultPath + TQString::fromLatin1( "/" ) + info.file() ); setMainWidget(m_view); @@ -77,8 +77,8 @@ void KopeteFileConfirmDialog::slotUser2() const TQString directory=url.directory(); if(!directory.isEmpty()) { - KGlobal::config()->setGroup("File Transfer"); - KGlobal::config()->writeEntry("defaultPath" , directory ); + TDEGlobal::config()->setGroup("File Transfer"); + TDEGlobal::config()->writeEntry("defaultPath" , directory ); } if(TQFile(m_view->m_saveto->text()).exists()) diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp index 34d921c3..acb1b1b1 100644 --- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp @@ -28,7 +28,7 @@ BookmarksPrefsSettings::~BookmarksPrefsSettings() void BookmarksPrefsSettings::load() { - KConfig * configfile = KGlobal::config(); + KConfig * configfile = TDEGlobal::config(); m_isfolderforeachcontact = Always; m_contactslist.clear(); m_addbookmarksfromunknowns = false; @@ -48,7 +48,7 @@ void BookmarksPrefsSettings::load() void BookmarksPrefsSettings::save() { - KConfig * configfile = KGlobal::config(); + KConfig * configfile = TDEGlobal::config(); if( configfile->getConfigState() != KConfigBase::ReadWrite ){ kdDebug( 14501 ) << "save: failed to open config file for writing" << endl; diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp index 9a1a0594..60c4b0f2 100644 --- a/kopete/plugins/alias/aliaspreferences.cpp +++ b/kopete/plugins/alias/aliaspreferences.cpp @@ -158,7 +158,7 @@ AliasPreferences::~AliasPreferences() // reload configuration reading it from kopeterc void AliasPreferences::load() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if( config->hasGroup( "AliasPlugin" ) ) { config->setGroup("AliasPlugin"); @@ -189,7 +189,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin ) Kopete::Protocol *protocol = static_cast<Kopete::Protocol*>( plugin ); if( protocol ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if( config->hasGroup( "AliasPlugin" ) ) { config->setGroup("AliasPlugin"); @@ -240,7 +240,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin ) // save list to kopeterc and creates map out of it void AliasPreferences::save() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->deleteGroup( TQString::fromLatin1("AliasPlugin") ); config->setGroup( TQString::fromLatin1("AliasPlugin") ); diff --git a/kopete/plugins/autoreplace/autoreplaceconfig.cpp b/kopete/plugins/autoreplace/autoreplaceconfig.cpp index 2537f44a..96de543f 100644 --- a/kopete/plugins/autoreplace/autoreplaceconfig.cpp +++ b/kopete/plugins/autoreplace/autoreplaceconfig.cpp @@ -30,7 +30,7 @@ AutoReplaceConfig::AutoReplaceConfig() // reload configuration reading it from kopeterc void AutoReplaceConfig::load() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "AutoReplace Plugin" ); TQStringList wordsList = config->readListEntry( "WordsToReplace" ); @@ -113,7 +113,7 @@ AutoReplaceConfig::WordsToReplace AutoReplaceConfig::map() const void AutoReplaceConfig::save() { - KConfig * config = KGlobal::config(); + KConfig * config = TDEGlobal::config(); config->setGroup( "AutoReplace Plugin" ); TQStringList newWords; diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp index d6365c0a..fbbe7c8b 100644 --- a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp +++ b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp @@ -63,16 +63,16 @@ void ConnectionStatusPlugin::slotCheckStatus() m_buffer = TQString(); - // Use KProcess to run netstat -rn. We'll then parse the output of + // Use TDEProcess to run netstat -rn. We'll then parse the output of // netstat -rn in slotProcessStdout() to see if it mentions the // default gateway. If so, we're connected, if not, we're offline - m_process = new KProcess; + m_process = new TDEProcess; *m_process << "netstat" << "-r"; - connect( m_process, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), this, TQT_SLOT( slotProcessStdout( KProcess *, char *, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( KProcess * ) ), this, TQT_SLOT( slotProcessExited( KProcess * ) ) ); + connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), this, TQT_SLOT( slotProcessStdout( TDEProcess *, char *, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( TDEProcess * ) ), this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) ); - if ( !m_process->start( KProcess::NotifyOnExit, KProcess::Stdout ) ) + if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) ) { kdWarning( 14301 ) << k_funcinfo << "Unable to start netstat process!" << endl; @@ -81,7 +81,7 @@ void ConnectionStatusPlugin::slotCheckStatus() } } -void ConnectionStatusPlugin::slotProcessExited( KProcess *process ) +void ConnectionStatusPlugin::slotProcessExited( TDEProcess *process ) { kdDebug( 14301 ) << m_buffer << endl; @@ -94,7 +94,7 @@ void ConnectionStatusPlugin::slotProcessExited( KProcess *process ) } } -void ConnectionStatusPlugin::slotProcessStdout( KProcess *, char *buffer, int buflen ) +void ConnectionStatusPlugin::slotProcessStdout( TDEProcess *, char *buffer, int buflen ) { // Look for a default gateway //kdDebug( 14301 ) << k_funcinfo << endl; diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.h b/kopete/plugins/connectionstatus/connectionstatusplugin.h index 6240e11e..9920bec2 100644 --- a/kopete/plugins/connectionstatus/connectionstatusplugin.h +++ b/kopete/plugins/connectionstatus/connectionstatusplugin.h @@ -21,7 +21,7 @@ #include "kopeteplugin.h" class TQTimer; -class KProcess; +class TDEProcess; /** * @author Chris Howells <howells@kde.org> @@ -37,18 +37,18 @@ public: private slots: void slotCheckStatus(); - void slotProcessStdout( KProcess *process, char *buffer, int len ); + void slotProcessStdout( TDEProcess *process, char *buffer, int len ); /** * Notify when the netstat process has exited */ - void slotProcessExited( KProcess *process ); + void slotProcessExited( TDEProcess *process ); private: void setConnectedStatus( bool newStatus ); bool m_pluginConnected; - KProcess *m_process; + TDEProcess *m_process; TQTimer *m_timer; TQString m_buffer; }; diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index 903e73d3..f76fae2f 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -94,7 +94,7 @@ CryptographyPlugin::~CryptographyPlugin() void CryptographyPlugin::loadSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Cryptography Plugin"); mPrivateKeyID = config->readEntry("PGP_private_key"); diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp index 88078ece..37a0d8ab 100644 --- a/kopete/plugins/cryptography/kgpgselkey.cpp +++ b/kopete/plugins/cryptography/kgpgselkey.cpp @@ -43,7 +43,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo TQString keyname; TQWidget *page = new TQWidget(this); TQLabel *labeltxt; - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20); @@ -69,7 +69,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo TQString tst,tst2; char line[130]; - // FIXME: Why use popen instead of KProcess, TQProcess or KProcIO?!? + // FIXME: Why use popen instead of TDEProcess, TQProcess or KProcIO?!? // Are we interested in having buffer overflows now? - Martijn fp = popen( "gpg --no-tty --with-colon --list-secret-keys", "r" ); while ( fgets( line, sizeof(line), fp)) diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index 116abd4a..39560eeb 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -102,7 +102,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent /* if (KGpgSettings::allowCustomEncryptionOptions()) customOptions=KGpgSettings::customEncryptionOptions();*/ - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20); keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20); @@ -194,7 +194,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent CBuntrusted->setChecked( KGpgSettings::allowUntrustedKeys() ); CBhideid->setChecked( KGpgSettings::hideUserID() ); if (filemode) CBshred->setChecked( KGpgSettings::shredSource() );*/ - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Cryptography Plugin"); CBarmor->hide(); @@ -350,9 +350,9 @@ void popupPublic::refreshkeys() KProcIO *encid=new KProcIO(); *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; ///////// when process ends, update dialog infos - TQObject::connect(encid, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotpreselect())); + TQObject::connect(encid, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotpreselect())); TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *))); - encid->start(KProcess::NotifyOnExit,true); + encid->start(TDEProcess::NotifyOnExit,true); } void popupPublic::slotpreselect() @@ -467,7 +467,7 @@ void popupPublic::slotprocread(KProcIO *p) void popupPublic::slotOk() { //BEGIN modified for Kopete - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Cryptography Plugin"); config->writeEntry("UntrustedKeys", CBuntrusted->isChecked()); diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp index 2bf748ce..1c5c573d 100644 --- a/kopete/plugins/history/converter.cpp +++ b/kopete/plugins/history/converter.cpp @@ -71,32 +71,32 @@ void HistoryPlugin::convertOldHistory() if(fi->fileName() == "MSNProtocol" || fi->fileName() == "msn_logs" ) { protocolId="MSNProtocol"; - KGlobal::config()->setGroup("MSN"); - accountId=KGlobal::config()->readEntry( "UserID" ); + TDEGlobal::config()->setGroup("MSN"); + accountId=TDEGlobal::config()->readEntry( "UserID" ); } else if(fi->fileName() == "ICTQProtocol" || fi->fileName() == "icq_logs" ) { protocolId="ICTQProtocol"; - KGlobal::config()->setGroup("ICQ"); - accountId=KGlobal::config()->readEntry( "UIN" ); + TDEGlobal::config()->setGroup("ICQ"); + accountId=TDEGlobal::config()->readEntry( "UIN" ); } else if(fi->fileName() == "AIMProtocol" || fi->fileName() == "aim_logs" ) { protocolId="AIMProtocol"; - KGlobal::config()->setGroup("AIM"); - accountId=KGlobal::config()->readEntry( "UserID" ); + TDEGlobal::config()->setGroup("AIM"); + accountId=TDEGlobal::config()->readEntry( "UserID" ); } else if(fi->fileName() == "OscarProtocol" ) { protocolId="AIMProtocol"; - KGlobal::config()->setGroup("OSCAR"); - accountId=KGlobal::config()->readEntry( "UserID" ); + TDEGlobal::config()->setGroup("OSCAR"); + accountId=TDEGlobal::config()->readEntry( "UserID" ); } else if(fi->fileName() == "JabberProtocol" || fi->fileName() == "jabber_logs") { protocolId="JabberProtocol"; - KGlobal::config()->setGroup("Jabber"); - accountId=KGlobal::config()->readEntry( "UserID" ); + TDEGlobal::config()->setGroup("Jabber"); + accountId=TDEGlobal::config()->readEntry( "UserID" ); } //TODO: gadu, wp } @@ -303,8 +303,8 @@ void HistoryPlugin::convertOldHistory() bool HistoryPlugin::detectOldHistory() { - KGlobal::config()->setGroup("History Plugin"); - TQString version=KGlobal::config()->readEntry( "Version" ,"0.6" ); + TDEGlobal::config()->setGroup("History Plugin"); + TQString version=TDEGlobal::config()->readEntry( "Version" ,"0.6" ); if(version != "0.6") return false; diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp index 11537aba..d8169311 100644 --- a/kopete/plugins/latex/latexplugin.cpp +++ b/kopete/plugins/latex/latexplugin.cpp @@ -180,7 +180,7 @@ void LatexPlugin::slotMessageAboutToSend( Kopete::Message& msg) Q_UNUSED(msg) //disabled because to work correctly, we need to find what special has the gif we can send over MSN #if 0 - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Latex Plugin"); if(!config->readBoolEntry("ParseOutgoing", false)) @@ -222,7 +222,7 @@ TQString LatexPlugin::handleLatex(const TQString &latexFormula) m_tempFiles.setAutoDelete(true); TQString fileName = tempFile->name(); - KProcess p; + TDEProcess p; TQString argumentRes = "-r %1x%2"; TQString argumentOut = "-o %1"; @@ -235,7 +235,7 @@ TQString LatexPlugin::handleLatex(const TQString &latexFormula) kdDebug() << k_funcinfo << " Rendering " << m_convScript << " " << argumentRes.arg(TQString::number(hDPI), TQString::number(vDPI)) << " " << argumentOut.arg(fileName) << endl; // FIXME our sucky sync filter API limitations :-) - p.start(KProcess::Block); + p.start(TDEProcess::Block); return fileName; } diff --git a/kopete/plugins/motionautoaway/motionawayplugin.cpp b/kopete/plugins/motionautoaway/motionawayplugin.cpp index ea37878d..56958bec 100644 --- a/kopete/plugins/motionautoaway/motionawayplugin.cpp +++ b/kopete/plugins/motionautoaway/motionawayplugin.cpp @@ -159,7 +159,7 @@ MotionAwayPlugin::~MotionAwayPlugin() } void MotionAwayPlugin::loadSettings(){ - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup("MotionAway Plugin"); awayTimeout = kconfig->readNumEntry("AwayTimeout", 1); diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp index 5fb799c1..8d310bc0 100644 --- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp +++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp @@ -158,9 +158,9 @@ void NetMeetingInvitation::slotTimeout() void NetMeetingInvitation::startMeeting(const TQString & ip_address) { - //TODO: use KProcess + //TODO: use TDEProcess - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Netmeeting Plugin"); TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address); @@ -168,7 +168,7 @@ void NetMeetingInvitation::startMeeting(const TQString & ip_address) TQStringList args=TQStringList::split(" ", app); - KProcess p; + TDEProcess p; for(TQStringList::Iterator it=args.begin() ; it != args.end() ; ++it) { p << *it; diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp index 827270f7..2f76b09a 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.cpp +++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp @@ -36,7 +36,7 @@ static const TDEAboutData aboutdata("kopete_netmeeting", I18N_NOOP("NetMeeting") K_EXPORT_COMPONENT_FACTORY( kopete_netmeeting, KGenericFactory<NetMeetingPlugin>( &aboutdata ) ) NetMeetingPlugin::NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) -: Kopete::Plugin( KGlobal::instance(), parent, name ) +: Kopete::Plugin( TDEGlobal::instance(), parent, name ) { if(MSNProtocol::protocol()) slotPluginLoaded(MSNProtocol::protocol()); diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp index 313eb197..a1801fbf 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp +++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp @@ -56,7 +56,7 @@ NetmeetingPreferences::~NetmeetingPreferences() void NetmeetingPreferences::load() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Netmeeting Plugin"); preferencesDialog->m_app->setCurrentText(config->readEntry("NetmeetingApplication","ekiga -c callto://%1")); emit KCModule::changed(false); @@ -64,7 +64,7 @@ void NetmeetingPreferences::load() void NetmeetingPreferences::save() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Netmeeting Plugin"); config->writeEntry("NetmeetingApplication",preferencesDialog->m_app->currentText()); emit KCModule::changed(false); diff --git a/kopete/plugins/smpppdcs/detectornetstat.cpp b/kopete/plugins/smpppdcs/detectornetstat.cpp index f1ed21b5..6cb85d0e 100644 --- a/kopete/plugins/smpppdcs/detectornetstat.cpp +++ b/kopete/plugins/smpppdcs/detectornetstat.cpp @@ -39,16 +39,16 @@ void DetectorNetstat::checkStatus() const { m_buffer = TQString(); - // Use KProcess to run netstat -r. We'll then parse the output of + // Use TDEProcess to run netstat -r. We'll then parse the output of // netstat -r in slotProcessStdout() to see if it mentions the // default gateway. If so, we're connected, if not, we're offline - m_process = new KProcess; + m_process = new TDEProcess; *m_process << "netstat" << "-r"; - connect(m_process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(slotProcessStdout( KProcess *, char *, int))); - connect(m_process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotProcessStdout( TDEProcess *, char *, int))); + connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); - if(!m_process->start(KProcess::NotifyOnExit, KProcess::Stdout)) { + if(!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout)) { kdWarning(14312) << k_funcinfo << "Unable to start netstat process!" << endl; delete m_process; @@ -56,14 +56,14 @@ void DetectorNetstat::checkStatus() const { } } -void DetectorNetstat::slotProcessStdout(KProcess *, char *buffer, int buflen) { +void DetectorNetstat::slotProcessStdout(TDEProcess *, char *buffer, int buflen) { // Look for a default gateway kdDebug(14312) << k_funcinfo << endl; m_buffer += TQString::fromLatin1(buffer, buflen); kdDebug(14312) << m_buffer << endl; } -void DetectorNetstat::slotProcessExited(KProcess *process) { +void DetectorNetstat::slotProcessExited(TDEProcess *process) { kdDebug(14312) << k_funcinfo << m_buffer << endl; if(process == m_process) { m_connector->setConnectedStatus(m_buffer.contains("default")); diff --git a/kopete/plugins/smpppdcs/detectornetstat.h b/kopete/plugins/smpppdcs/detectornetstat.h index 959cf7fc..9542c58b 100644 --- a/kopete/plugins/smpppdcs/detectornetstat.h +++ b/kopete/plugins/smpppdcs/detectornetstat.h @@ -21,7 +21,7 @@ #include "detector.h" -class KProcess; +class TDEProcess; class IConnector; /** @@ -42,16 +42,16 @@ public: private slots: // Original cs-plugin code - void slotProcessStdout(KProcess * process, char * buffer, int len); + void slotProcessStdout(TDEProcess * process, char * buffer, int len); /** * Notify when the netstat process has exited */ - void slotProcessExited(KProcess *process); + void slotProcessExited(TDEProcess *process); private: mutable TQString m_buffer; - mutable KProcess * m_process; + mutable TDEProcess * m_process; }; #endif diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.cpp b/kopete/plugins/smpppdcs/smpppdsearcher.cpp index a06e30a9..8f4c92de 100644 --- a/kopete/plugins/smpppdcs/smpppdsearcher.cpp +++ b/kopete/plugins/smpppdcs/smpppdsearcher.cpp @@ -42,12 +42,12 @@ void SMPPPDSearcher::searchNetwork() { // the first point to search is localhost if(!scan("127.0.0.1", "255.0.0.0")) { - m_procNetstat = new KProcess; + m_procNetstat = new TDEProcess; m_procNetstat->setEnvironment("LANG", "C"); // we want to force english output *m_procNetstat << "/bin/netstat" << "-rn"; - connect(m_procNetstat, TQT_SIGNAL(receivedStdout(KProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedNetstat(KProcess *,char *,int))); - if(!m_procNetstat->start(KProcess::Block, KProcess::Stdout)) { + connect(m_procNetstat, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedNetstat(TDEProcess *,char *,int))); + if(!m_procNetstat->start(TDEProcess::Block, TDEProcess::Stdout)) { kdDebug(14312) << k_funcinfo << "Couldn't execute /sbin/netstat -rn" << endl << "Perhaps the package net-tools isn't installed." << endl; emit smpppdNotFound(); @@ -59,9 +59,9 @@ void SMPPPDSearcher::searchNetwork() { } /*! - \fn SMPPPDSearcher::slotStdoutReceived(KProcess * proc, char * buf, int len) + \fn SMPPPDSearcher::slotStdoutReceived(TDEProcess * proc, char * buf, int len) */ -void SMPPPDSearcher::slotStdoutReceivedIfconfig(KProcess * /* proc */, char * buf, int len) { +void SMPPPDSearcher::slotStdoutReceivedIfconfig(TDEProcess * /* proc */, char * buf, int len) { kdDebug(14312) << k_funcinfo << endl; TQString myBuf = TQString::fromLatin1(buf,len); @@ -78,7 +78,7 @@ void SMPPPDSearcher::slotStdoutReceivedIfconfig(KProcess * /* proc */, char * bu emit smpppdNotFound(); } -void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf, int len) { +void SMPPPDSearcher::slotStdoutReceivedNetstat(TDEProcess * /* proc */, char * buf, int len) { kdDebug(14312) << k_funcinfo << endl; TQRegExp rexGW(".*\\n0.0.0.0[ ]*([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*"); @@ -86,12 +86,12 @@ void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf if(!(rexGW.exactMatch(myBuf) && scan(rexGW.cap(1), "255.255.255.255"))) { // if netstat -r found no gateway we search the network - m_procIfconfig = new KProcess; + m_procIfconfig = new TDEProcess; m_procIfconfig->setEnvironment("LANG", "C"); // we want to force english output *m_procIfconfig << "/sbin/ifconfig"; - connect(m_procIfconfig, TQT_SIGNAL(receivedStdout(KProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedIfconfig(KProcess *,char *,int))); - if(!m_procIfconfig->start(KProcess::Block, KProcess::Stdout)) { + connect(m_procIfconfig, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedIfconfig(TDEProcess *,char *,int))); + if(!m_procIfconfig->start(TDEProcess::Block, TDEProcess::Stdout)) { kdDebug(14312) << k_funcinfo << "Couldn't execute /sbin/ifconfig" << endl << "Perhaps the package net-tools isn't installed." << endl; emit smpppdNotFound(); diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.h b/kopete/plugins/smpppdcs/smpppdsearcher.h index 36c4ac9c..e6c0b8ea 100644 --- a/kopete/plugins/smpppdcs/smpppdsearcher.h +++ b/kopete/plugins/smpppdcs/smpppdsearcher.h @@ -20,7 +20,7 @@ #include <kresolver.h> -class KProcess; +class TDEProcess; /** * @brief Searches a network for a smpppd @@ -86,13 +86,13 @@ signals: void scanFinished(); protected slots: - void slotStdoutReceivedIfconfig(KProcess * proc, char * buf, int len); - void slotStdoutReceivedNetstat (KProcess * proc, char * buf, int len); + void slotStdoutReceivedIfconfig(TDEProcess * proc, char * buf, int len); + void slotStdoutReceivedNetstat (TDEProcess * proc, char * buf, int len); private: bool m_cancelSearchNow; - KProcess * m_procIfconfig; - KProcess * m_procNetstat; + TDEProcess * m_procIfconfig; + TDEProcess * m_procNetstat; }; inline void SMPPPDSearcher::cancelSearch() { diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp index 0e775405..a4bd07cf 100644 --- a/kopete/plugins/statistics/statisticsdialog.cpp +++ b/kopete/plugins/statistics/statisticsdialog.cpp @@ -404,8 +404,8 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T generalHTMLPart->write(TQString("</div>")); generalHTMLPart->write(TQString("<div class=\"statgroup\">")); - generalHTMLPart->write(i18n("<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>").arg(m_contact->metaContact()->displayName()).arg(KGlobal::locale()->formatDateTime(m_contact->lastTalk()))); - generalHTMLPart->write(i18n("<b title=\"The last time I have seen %1 online or away\">Last time contact was present :</b> %2").arg(m_contact->metaContact()->displayName()).arg(KGlobal::locale()->formatDateTime(m_contact->lastPresent()))); + generalHTMLPart->write(i18n("<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>").arg(m_contact->metaContact()->displayName()).arg(TDEGlobal::locale()->formatDateTime(m_contact->lastTalk()))); + generalHTMLPart->write(i18n("<b title=\"The last time I have seen %1 online or away\">Last time contact was present :</b> %2").arg(m_contact->metaContact()->displayName()).arg(TDEGlobal::locale()->formatDateTime(m_contact->lastPresent()))); generalHTMLPart->write(TQString("</div>")); //generalHTMLPart->write(TQString("<div class=\"statgroup\">")); @@ -418,7 +418,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T generalHTMLPart->write("<div title=\"" +i18n("Current status") + "\" class=\"statgroup\">"); generalHTMLPart->write(i18n("Is <b>%1</b> since <b>%2</b>").arg( Kopete::OnlineStatus(m_contact->oldStatus()).description(), - KGlobal::locale()->formatDateTime(m_contact->oldStatusDateTime()))); + TDEGlobal::locale()->formatDateTime(m_contact->oldStatusDateTime()))); generalHTMLPart->write(TQString("</div>")); } @@ -524,7 +524,7 @@ void StatisticsDialog::slotAskButtonClicked() if (mainWidget->questionComboBox->currentItem()==0) { TQString text = i18n("1 is date, 2 is contact name, 3 is online status", "%1, %2 was %3") - .arg(KGlobal::locale()->formatDateTime(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time()))) + .arg(TDEGlobal::locale()->formatDateTime(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time()))) .arg(m_contact->metaContact()->displayName()) .arg(m_contact->statusAt(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time()))); mainWidget->answerEdit->setText(text); diff --git a/kopete/plugins/texteffect/texteffectconfig.cpp b/kopete/plugins/texteffect/texteffectconfig.cpp index 2f6da206..bf05d59a 100644 --- a/kopete/plugins/texteffect/texteffectconfig.cpp +++ b/kopete/plugins/texteffect/texteffectconfig.cpp @@ -30,7 +30,7 @@ TextEffectConfig::TextEffectConfig() void TextEffectConfig::load() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("TextEffect Plugin"); mColors = config->readListEntry("Colors"); @@ -54,7 +54,7 @@ TQStringList TextEffectConfig::defaultColorList() void TextEffectConfig::save() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("TextEffect Plugin"); config->writeEntry("Colors", mColors ); diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index f4a9e8a0..d331f8f2 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -107,7 +107,7 @@ TranslatorPlugin* TranslatorPlugin::pluginStatic_ = 0L; void TranslatorPlugin::loadSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); int mode = 0; config->setGroup( "Translator Plugin" ); diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp index bb7b9d4c..59cf8315 100644 --- a/kopete/plugins/webpresence/webpresenceplugin.cpp +++ b/kopete/plugins/webpresence/webpresenceplugin.cpp @@ -73,7 +73,7 @@ WebPresencePlugin::~WebPresencePlugin() void WebPresencePlugin::loadSettings() { - KConfig *kconfig = KGlobal::config(); + KConfig *kconfig = TDEGlobal::config(); kconfig->setGroup( "Web Presence Plugin" ); frequency = kconfig->readNumEntry("UploadFrequency", 15); @@ -228,7 +228,7 @@ KTempFile* WebPresencePlugin::generateFile() // insert the current date/time TQDomElement date = doc.createElement( "listdate" ); TQDomText t = doc.createTextNode( - KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); date.appendChild( t ); root.appendChild( date ); diff --git a/kopete/plugins/webpresence/webpresencepreferences.cpp b/kopete/plugins/webpresence/webpresencepreferences.cpp index e25458ee..e62e63bc 100644 --- a/kopete/plugins/webpresence/webpresencepreferences.cpp +++ b/kopete/plugins/webpresence/webpresencepreferences.cpp @@ -37,7 +37,7 @@ WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*n preferencesDialog->formatStylesheetURL->setFilter( "*.xsl" ); // KAutoConfig stuff - kautoconfig = new KAutoConfig(KGlobal::config(), TQT_TQOBJECT(this), "kautoconfig"); + kautoconfig = new KAutoConfig(TDEGlobal::config(), TQT_TQOBJECT(this), "kautoconfig"); connect(kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(widgetModified())); connect(kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified())); kautoconfig->addWidget(preferencesDialog, "Web Presence Plugin"); diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 19db0db7..76ec8b4f 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -128,7 +128,7 @@ static const char* const servers_ip[] = { p->textcodec_ = TQTextCodec::codecForName( "CP1250" ); p->session_ = new GaduSession( this, "GaduSession" ); - KGlobal::config()->setGroup( "Gadu" ); + TDEGlobal::config()->setGroup( "Gadu" ); setMyself( new GaduContact( accountId().toInt(), accountId(), this, Kopete::ContactList::self()->myself() ) ); diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index e33b4959..a5eb3dce 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -49,7 +49,7 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name ) cRegister = new RegisterCommand( TQT_TQOBJECT(this) ); emailRegexp = new TQRegExp( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); - hintPixmap = KGlobal::iconLoader()->loadIcon ( "gadu_protocol", KIcon::Small ); + hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "gadu_protocol", KIcon::Small ); connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( doRegister() ) ); connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotClose() ) ); diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index 6005f61a..d4c65412 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -49,7 +49,7 @@ ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, co else //something is very wrong m_wid->m_contactName->setText( event.user ); - m_wid->m_dateTime->setText( KGlobal::locale()->formatDateTime( event.timeStamp ) ); + m_wid->m_dateTime->setText( TDEGlobal::locale()->formatDateTime( event.timeStamp ) ); m_wid->m_message->setText( TQString("<b>%1</b>").arg( event.message ) ); setMainWidget( m_wid ); diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index 318a8f20..ffede29f 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -757,7 +757,7 @@ void IRCAccount::slotJoinChannel() comp.insertItems( chans ); dlg.lineEdit()->setCompletionObject( &comp ); - dlg.lineEdit()->setCompletionMode( KGlobalSettings::CompletionPopup ); + dlg.lineEdit()->setCompletionMode( TDEGlobalSettings::CompletionPopup ); while( true ) { diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index 94d67d3a..cab34817 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -495,7 +495,7 @@ void IRCChannelContact::topicUser(const TQString &nick, const TQDateTime &time) Kopete::Message msg(account->myServer(), mMyself, i18n("Topic set by %1 at %2").arg(nick).arg( - KGlobal::locale()->formatDateTime(time, true) + TDEGlobal::locale()->formatDateTime(time, true) ), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); msg.setImportance(Kopete::Message::Low); //set the importance manualy to low appendMessage(msg); diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index c4607cb9..54c40132 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -472,7 +472,7 @@ void IRCUserContact::whoWasComplete() .arg(mInfo.realName); msg += i18n("Last Online: %1\n").arg( - KGlobal::locale()->formatDateTime( + TDEGlobal::locale()->formatDateTime( property( m_protocol->propLastSeen ).value().toDateTime() ) ); diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index 5dca8771..97964885 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -34,9 +34,9 @@ void KCodecAction::slotActivated( const TQString & text ) /* text is something like "Western European ( iso-8859-1 )", but we must give * codecForName() only the "iso-8859-1" part. */ - TQString encoding = KGlobal::charsets()->encodingForName(text); + TQString encoding = TDEGlobal::charsets()->encodingForName(text); - emit activated( KGlobal::charsets()->codecForName(encoding) ); + emit activated( TDEGlobal::charsets()->codecForName(encoding) ); } void KCodecAction::setCodec( const TQTextCodec *codec ) @@ -44,9 +44,9 @@ void KCodecAction::setCodec( const TQTextCodec *codec ) TQStringList items = this->items(); int i = 0; for (TQStringList::ConstIterator it = items.begin(), end = items.end(); it != end; ++it, ++i) { - TQString encoding = KGlobal::charsets()->encodingForName(*it); + TQString encoding = TDEGlobal::charsets()->encodingForName(*it); - if (KGlobal::charsets()->codecForName(encoding)->mibEnum() == codec->mibEnum()) { + if (TDEGlobal::charsets()->codecForName(encoding)->mibEnum() == codec->mibEnum()) { setCurrentItem(i); break; } @@ -61,25 +61,25 @@ void KCodecAction::setCodec( const TQTextCodec *codec ) TQStringList KCodecAction::supportedEncodings(bool usAscii) { - TQStringList encodingNames = KGlobal::charsets()->availableEncodingNames(); + TQStringList encodingNames = TDEGlobal::charsets()->availableEncodingNames(); TQStringList encodings; TQMap<TQString, bool> mimeNames; for (TQStringList::ConstIterator it = encodingNames.begin(); it != encodingNames.end(); ++it) { - TQTextCodec *codec = KGlobal::charsets()->codecForName(*it); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName(*it); TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it); if (mimeNames.find(mimeName) == mimeNames.end()) { - encodings.append(KGlobal::charsets()->languageForEncoding(*it) + encodings.append(TDEGlobal::charsets()->languageForEncoding(*it) + " ( " + mimeName + " )"); mimeNames.insert(mimeName, true); } } encodings.sort(); - if (usAscii) encodings.prepend(KGlobal::charsets() + if (usAscii) encodings.prepend(TDEGlobal::charsets() ->languageForEncoding("us-ascii") + " ( us-ascii )"); return encodings; } diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index c0d5a87a..1b268027 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -98,9 +98,9 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident charset->insertStringList( KCodecAction::supportedEncodings() ); for (int i = 0; i < charset->count(); ++i) { - TQString encoding = KGlobal::charsets()->encodingForName(charset->text(i)); + TQString encoding = TDEGlobal::charsets()->encodingForName(charset->text(i)); - if (KGlobal::charsets()->codecForName(encoding)->mibEnum() == currentCodec) { + if (TDEGlobal::charsets()->codecForName(encoding)->mibEnum() == currentCodec) { charset->setCurrentItem( i ); break; } @@ -208,7 +208,7 @@ void IRCEditAccountWidget::slotAddCtcp() TQString IRCEditAccountWidget::generateAccountId( const TQString &network ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString nextId = network; uint accountNumber = 1; @@ -262,7 +262,7 @@ Kopete::Account *IRCEditAccountWidget::apply() account()->setCustomCtcpReplies( replies ); account()->setConnectCommands( cmds ); - KCharsets *c = KGlobal::charsets(); + KCharsets *c = TDEGlobal::charsets(); account()->setCodec( c->codecForName( c->encodingForName( charset->currentText() ) ) ); return account(); diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index d46f8707..bb4766e8 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -348,9 +348,9 @@ void JabberAccount::connectWithPassword ( const TQString &password ) m_jabberClient->setAllowPlainTextPassword ( configGroup()->readBoolEntry ( "AllowPlainTextPassword", false ) ); // enable file transfer (if empty, IP will be set after connection has been established) - KGlobal::config()->setGroup ( "Jabber" ); - m_jabberClient->setFileTransfersEnabled ( true, KGlobal::config()->readEntry ( "LocalIP" ) ); - setS5BServerPort ( KGlobal::config()->readNumEntry ( "LocalPort", 8010 ) ); + TDEGlobal::config()->setGroup ( "Jabber" ); + m_jabberClient->setFileTransfersEnabled ( true, TDEGlobal::config()->readEntry ( "LocalIP" ) ); + setS5BServerPort ( TDEGlobal::config()->readNumEntry ( "LocalPort", 8010 ) ); // // Determine system name diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index 5dac2e18..6ed0bcfd 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -277,7 +277,7 @@ void JabberBaseContact::updateResourceList () // resource timestamp resourceListStr += TQString ( "<tr><td>%1: %2</td></tr>" ). - arg ( i18n ( "Timestamp" ), KGlobal::locale()->formatDateTime ( (*it)->resource().status().timeStamp(), true, true ) ); + arg ( i18n ( "Timestamp" ), TDEGlobal::locale()->formatDateTime ( (*it)->resource().status().timeStamp(), true, true ) ); // message, if any if ( !(*it)->resource().status().status().stripWhiteSpace().isEmpty () ) diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index b8a9c080..71ad871f 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -115,9 +115,9 @@ void JabberEditAccountWidget::reopen () cbAllowPlainTextPassword->setChecked (account()->configGroup()->readBoolEntry("AllowPlainTextPassword", true)); - KGlobal::config()->setGroup("Jabber"); - leLocalIP->setText (KGlobal::config()->readEntry("LocalIP", "")); - sbLocalPort->setValue (KGlobal::config()->readNumEntry("LocalPort", 8010)); + TDEGlobal::config()->setGroup("Jabber"); + leLocalIP->setText (TDEGlobal::config()->readEntry("LocalIP", "")); + sbLocalPort->setValue (TDEGlobal::config()->readNumEntry("LocalPort", 8010)); leProxyJID->setText (account()->configGroup()->readEntry("ProxyJID", TQString())); @@ -178,9 +178,9 @@ void JabberEditAccountWidget::writeConfig () account()->setExcludeConnect(cbAutoConnect->isChecked()); - KGlobal::config()->setGroup("Jabber"); - KGlobal::config()->writeEntry("LocalIP", leLocalIP->text()); - KGlobal::config()->writeEntry("LocalPort", sbLocalPort->value()); + TDEGlobal::config()->setGroup("Jabber"); + TDEGlobal::config()->writeEntry("LocalIP", leLocalIP->text()); + TDEGlobal::config()->writeEntry("LocalPort", sbLocalPort->value()); account()->configGroup()->writeEntry("ProxyJID", leProxyJID->text()); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index 00f228d5..7cb869e9 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -73,7 +73,7 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, connect ( jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); jidRegExp.setPattern ( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); - hintPixmap = KGlobal::iconLoader()->loadIcon ( "jabber_online", KIcon::Small ); + hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "jabber_online", KIcon::Small ); mSuccess = false; diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index c4dcabf2..034f2548 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -1184,8 +1184,8 @@ void MSNAccount::slotCreateChat( const TQString& ID, const TQString& address, co * see MSNChatSession::receivedTypingMsg * - KGlobal::config()->setGroup( "MSN" ); - bool notifyNewChat = KGlobal::config()->readBoolEntry( "NotifyNewChat", false ); + TDEGlobal::config()->setGroup( "MSN" ); + bool notifyNewChat = TDEGlobal::config()->readBoolEntry( "NotifyNewChat", false ); if ( !ID.isEmpty() && notifyNewChat ) { // this temporary message should open the window if they not exist diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 6709f0f1..8e2113a1 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -173,7 +173,7 @@ void MSNChatSession::createChat( const TQString &handle, this, TQT_SLOT( slotSwitchBoardClosed() ) ); connect( m_chatService, TQT_SIGNAL( receivedTypingMsg( const TQString &, bool ) ), this, TQT_SLOT( receivedTypingMsg( const TQString &, bool ) ) ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if(config->readBoolEntry( "SendTypingNotification" , true) ) { @@ -223,7 +223,7 @@ void MSNChatSession::slotUserJoined( const TQString &handle, const TQString &pub if(!m_messagesQueue.empty() || !m_invitations.isEmpty()) sendMessageQueue(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( members().count()==1 && config->readNumEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() && !c->hasProperty(Kopete::Global::Properties::self()->photo().key())) slotRequestPicture(); @@ -584,7 +584,7 @@ void MSNChatSession::slotDisplayPictureChanged() } else { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readNumEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() ) slotRequestPicture(); @@ -616,8 +616,8 @@ void MSNChatSession::receivedTypingMsg( const TQString &contactId, bool b ) if(c && m_newSession && !view(false)) { //this was originaly in MSNAccount::slotCreateChat - KGlobal::config()->setGroup( "MSN" ); - bool notifyNewChat = KGlobal::config()->readBoolEntry( "NotifyNewChat", false ); + TDEGlobal::config()->setGroup( "MSN" ); + bool notifyNewChat = TDEGlobal::config()->readBoolEntry( "NotifyNewChat", false ); if ( notifyNewChat ) { // this internal message should open the window if they not exist diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 700bf213..e77ba2ff 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -700,7 +700,7 @@ void MSNContact::setObject(const TQString &obj) removeProperty( Kopete::Global::Properties::self()->photo() ) ; emit displayPictureChanged(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty() && account()->myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible ) diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index 3298e46e..f2a7e667 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -419,7 +419,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) else if( type== "text/x-mms-emoticon" || type== "text/x-mms-animemoticon") { // TODO remove Displatcher. - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readBoolEntry( "useCustomEmoticons", true ) ) { @@ -466,7 +466,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) if(!m_clientcapsSent) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); TQString JabberID; @@ -667,7 +667,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) } #endif - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if ( config->readBoolEntry( "exportEmoticons", false ) ) { diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index 4bb246a2..60672824 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -84,8 +84,8 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account d->autoConfig->retrieveSettings( true ); //Get a list of all jabber accounts - KGlobal::config()->setGroup("MSN"); - TQString jab_account=KGlobal::config()->readEntry("JabberAccount"); + TDEGlobal::config()->setGroup("MSN"); + TQString jab_account=TDEGlobal::config()->readEntry("JabberAccount"); TQPtrList<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts(); for(Kopete::Account *a=accounts.first() ; a; a=accounts.next() ) @@ -192,8 +192,8 @@ MSNEditAccountWidget::~MSNEditAccountWidget() Kopete::Account * MSNEditAccountWidget::apply() { d->autoConfig->saveSettings(); - KGlobal::config()->setGroup("MSN"); - KGlobal::config()->writeEntry("JabberAccount", d->ui->JabberAccount->currentText()); + TDEGlobal::config()->setGroup("MSN"); + TDEGlobal::config()->writeEntry("JabberAccount", d->ui->JabberAccount->currentText()); if ( !account() ) setAccount( new MSNAccount( d->protocol, d->ui->m_login->text() ) ); diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index 88fe7d33..43b0f33e 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -54,7 +54,7 @@ Webcam::Webcam(Who who, const TQString& to, Dispatcher *parent, TQ_UINT32 sessio m_mimic=0L; m_widget=0L; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); // Read the configuration to get the number of frame per second to send @@ -519,7 +519,7 @@ TQString Webcam::xml(uint session , uint rid) int Webcam::getAvailablePort() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); TQString basePort=config->readEntry("WebcamPort"); if(basePort.isEmpty() || basePort == "0" ) diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index cf86118f..a7e3f001 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -219,7 +219,7 @@ void ICQProtocol::initGenders() void ICQProtocol::initCountries() { mCountries.insert(0, ""); // unspecified - KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); + KLocale *kl = TDEGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); mCountries.insert(93, kl->twoAlphaToCountryName("af")); mCountries.insert(355, kl->twoAlphaToCountryName("al")); @@ -468,7 +468,7 @@ void ICQProtocol::initCountries() void ICQProtocol::initLang() { - KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); + KLocale *kl = TDEGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); mLanguages.insert(0 , ""); mLanguages.insert(1 , kl->twoAlphaToLanguageName("ar") /*i18n("Arabic")*/); diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp index 44fd5afd..4d09d70f 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp @@ -47,28 +47,28 @@ ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name ) TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General ICQ Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo ); m_genInfoWidget = new ICQGeneralInfoWidget( genInfo, "Basic Information" ); genLayout->addWidget( m_genInfoWidget ); TQFrame* workInfo = addPage( i18n( "Work Info" ), i18n( "Work Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo ); m_workInfoWidget = new ICQWorkInfoWidget( workInfo, "Work Information" ); workLayout->addWidget( m_workInfoWidget ); TQFrame* otherInfo = addPage( i18n( "Other Info" ), i18n( "Other ICQ Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo ); m_otherInfoWidget = new ICQOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); TQFrame* interestInfo = addPage( i18n( "Interest Info" ), i18n( "Interest" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* interestLayout = new TQVBoxLayout( interestInfo ); m_interestInfoWidget = new ICQInterestInfoWidget( interestInfo, "Other Information" ); interestLayout->addWidget( m_interestInfoWidget ); @@ -165,7 +165,7 @@ void ICQUserInfoWidget::fillMoreInfo( const ICQMoreUserInfo& ui ) TQTextCodec* codec = m_contact->contactCodec(); m_genInfoWidget->ageSpinBox->setValue( ui.age ); if ( ui.birthday.isValid() ) - m_genInfoWidget->birthday->setText( KGlobal::locale()->formatDate( ui.birthday,true ) ); + m_genInfoWidget->birthday->setText( TDEGlobal::locale()->formatDate( ui.birthday,true ) ); TQString gender = static_cast<ICQProtocol*>( m_contact->protocol() )->genders()[ui.gender]; m_genInfoWidget->genderEdit->setText( gender ); diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp index 90981434..d79e47fc 100644 --- a/kopete/protocols/oscar/oscarversionupdater.cpp +++ b/kopete/protocols/oscar/oscarversionupdater.cpp @@ -66,7 +66,7 @@ bool OscarVersionUpdater::update( unsigned int stamp ) { mVersionData.resize( 0 ); - KConfigGroup config( KGlobal::config(), "Oscar" ); + KConfigGroup config( TDEGlobal::config(), "Oscar" ); TQString url = config.readEntry( "NewVersionURL", "http://kopete.kde.org/oscarversions.xml" ); mTransferJob = KIO::get ( url ); kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Download version info from server."<< endl; @@ -87,7 +87,7 @@ unsigned int OscarVersionUpdater::stamp() const void OscarVersionUpdater::initICQVersionInfo() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - KConfigGroup config( KGlobal::config(), "ICQVersion" ); + KConfigGroup config( TDEGlobal::config(), "ICQVersion" ); mICQVersion.clientString = config.readEntry( "ClientString", "ICQ Client" ); mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" ).toUShort( 0, 0 ); @@ -104,7 +104,7 @@ void OscarVersionUpdater::initAIMVersionInfo() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - KConfigGroup config( KGlobal::config(), "AIMVersion" ); + KConfigGroup config( TDEGlobal::config(), "AIMVersion" ); mAIMVersion.clientString = config.readEntry( "ClientString", "AOL Instant Messenger (SM), version 5.1.3036/WIN32" ); mAIMVersion.clientId = config.readEntry( "ClientId", "0x0109" ).toUShort( 0, 0 ); @@ -264,7 +264,7 @@ bool OscarVersionUpdater::parseVersion( Oscar::ClientVersion& version, TQDomElem void OscarVersionUpdater::storeVersionInfo( const TQString& group, const Oscar::ClientVersion& version ) const { kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Storing version info to group: " << group << endl; - KConfigGroup config( KGlobal::config(), group ); + KConfigGroup config( TDEGlobal::config(), group ); config.writeEntry( "ClientString", version.clientString ); config.writeEntry( "ClientId", version.clientId ); diff --git a/kopete/protocols/sms/services/gsmlib.h b/kopete/protocols/sms/services/gsmlib.h index c49e26b7..5f7b9257 100644 --- a/kopete/protocols/sms/services/gsmlib.h +++ b/kopete/protocols/sms/services/gsmlib.h @@ -40,7 +40,7 @@ class GSMLibPrefsUI; class SMSContact; class TQListViewItem; -class KProcess; +class TDEProcess; class GSMLibThread; class GSMLib : public SMSService diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 984e8435..9a1898a8 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -71,7 +71,7 @@ void SMSClient::send(const Kopete::Message& msg) if (programName.isNull()) programName = "/usr/bin/sms_client"; - KProcess* p = new KProcess; + TDEProcess* p = new TDEProcess; TQString message = msg.plainBody(); TQString nr = msg.to().first()->contactId(); @@ -80,11 +80,11 @@ void SMSClient::send(const Kopete::Message& msg) *p << provider + ":" + nr; *p << message; - TQObject::connect(p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess*))); - TQObject::connect(p, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - TQObject::connect(p, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + TQObject::connect(p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess*))); + TQObject::connect(p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + TQObject::connect(p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - p->start(KProcess::Block, KProcess::AllOutput); + p->start(TDEProcess::Block, TDEProcess::AllOutput); } TQWidget* SMSClient::configureWidget(TQWidget* parent) @@ -152,14 +152,14 @@ TQStringList SMSClient::providers() return p; } -void SMSClient::slotReceivedOutput(KProcess*, char *buffer, int buflen) +void SMSClient::slotReceivedOutput(TDEProcess*, char *buffer, int buflen) { TQStringList lines = TQStringList::split("\n", TQString::fromLocal8Bit(buffer, buflen)); for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) output.append(*it); } -void SMSClient::slotSendFinished(KProcess* p) +void SMSClient::slotSendFinished(TDEProcess* p) { if (p->exitStatus() == 0) emit messageSent(m_msg); diff --git a/kopete/protocols/sms/services/smsclient.h b/kopete/protocols/sms/services/smsclient.h index 988565b1..ffb146c6 100644 --- a/kopete/protocols/sms/services/smsclient.h +++ b/kopete/protocols/sms/services/smsclient.h @@ -26,7 +26,7 @@ class SMSClientPrefsUI; class SMSContact; class TQListViewItem; -class KProcess; +class TDEProcess; class SMSClient : public SMSService { @@ -46,8 +46,8 @@ public slots: void savePreferences(); private slots: - void slotReceivedOutput(KProcess*, char *buffer, int buflen); - void slotSendFinished(KProcess* p); + void slotReceivedOutput(TDEProcess*, char *buffer, int buflen); + void slotSendFinished(TDEProcess* p); signals: void messageSent(const Kopete::Message &); diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index 8feb94a9..e2095d25 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -237,21 +237,21 @@ void SMSSendProvider::send(const Kopete::Message& msg) values[messagePos] = message; values[telPos] = nr; - KProcess* p = new KProcess; + TDEProcess* p = new TDEProcess; kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").arg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl; *p << TQString("%1/bin/smssend").arg(prefix) << provider << values; output = ""; - connect( p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess *))); - connect( p, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(KProcess *, char *, int))); -// connect( p, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(KProcess *, char *, int))); + connect( p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess *))); + connect( p, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); +// connect( p, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); - p->start(KProcess::NotifyOnExit, KProcess::AllOutput); + p->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } -void SMSSendProvider::slotSendFinished(KProcess *p) +void SMSSendProvider::slotSendFinished(TDEProcess *p) { kdWarning( 14160 ) << k_funcinfo << "this = " << this << ", es = " << p->exitStatus() << ", p = " << p << " (should be non-zero!!)" << endl; if (p->exitStatus() == 0) @@ -262,7 +262,7 @@ void SMSSendProvider::slotSendFinished(KProcess *p) p->deleteLater(); } -void SMSSendProvider::slotReceivedOutput(KProcess *, char *buffer, int buflen) +void SMSSendProvider::slotReceivedOutput(TDEProcess *, char *buffer, int buflen) { // TQStringList lines = TQStringList::split("\n", TQString::fromLocal8Bit(buffer, buflen)); // for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) diff --git a/kopete/protocols/sms/services/smssendprovider.h b/kopete/protocols/sms/services/smssendprovider.h index 97d60542..fbe238e1 100644 --- a/kopete/protocols/sms/services/smssendprovider.h +++ b/kopete/protocols/sms/services/smssendprovider.h @@ -29,7 +29,7 @@ #include "smsaccount.h" -class KProcess; +class TDEProcess; namespace Kopete { class Account; } class SMSContact; @@ -54,8 +54,8 @@ public: int maxSize(); private slots: - void slotReceivedOutput(KProcess*, char *buffer, int buflen); - void slotSendFinished(KProcess*); + void slotReceivedOutput(TDEProcess*, char *buffer, int buflen); + void slotSendFinished(TDEProcess*); private: TQStringList names; TQStringList descriptions; diff --git a/kopete/protocols/sms/smsaccount.h b/kopete/protocols/sms/smsaccount.h index f127759f..b543d191 100644 --- a/kopete/protocols/sms/smsaccount.h +++ b/kopete/protocols/sms/smsaccount.h @@ -23,7 +23,7 @@ class KActionMenu; class SMSProtocol; class SMSContact; class SMSService; -class KProcess; +class TDEProcess; enum SMSMsgAction { ACT_ASK = 0, ACT_CANCEL, ACT_SPLIT }; diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index c408d0ad..05eabee7 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -163,9 +163,9 @@ void WinPopupLib::startReadProcess(const TQString &Host) *reader << smbClientBin << "-N" << "-E" << "-g" << "-L" << Host << "-"; connect(reader, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotReadProcessReady(KProcIO *))); - connect(reader, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotReadProcessExited(KProcess *))); + connect(reader, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotReadProcessExited(TDEProcess *))); - if (!reader->start(KProcess::NotifyOnExit, true)) { + if (!reader->start(TDEProcess::NotifyOnExit, true)) { // still to come kdDebug(14170) << "ReadProcess not started!" << endl; } @@ -189,7 +189,7 @@ void WinPopupLib::slotReadProcessReady(KProcIO *r) } } -void WinPopupLib::slotReadProcessExited(KProcess *r) +void WinPopupLib::slotReadProcessExited(TDEProcess *r) { delete r; @@ -327,13 +327,13 @@ void WinPopupLib::readMessages(const KFileItemList &items) */ void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination) { - KProcess *sender = new KProcess(this); + TDEProcess *sender = new TDEProcess(this); *sender << smbClientBin << "-M" << Destination; *sender << "-N" << "-"; - connect(sender, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendProcessExited(KProcess *))); + connect(sender, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendProcessExited(TDEProcess *))); - if (sender->start(KProcess::NotifyOnExit, KProcess::Stdin)) { + if (sender->start(TDEProcess::NotifyOnExit, TDEProcess::Stdin)) { sender->writeStdin(Body.local8Bit(), Body.local8Bit().length()); if (!sender->closeStdin()) { delete sender; @@ -343,7 +343,7 @@ void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination) } } -void WinPopupLib::slotSendProcessExited(KProcess *p) +void WinPopupLib::slotSendProcessExited(TDEProcess *p) { // emit sendJobDone(p->pid()); delete p; diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h index c4789ebc..1213b3cf 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h @@ -77,8 +77,8 @@ private slots: void slotUpdateGroupData(); void startReadProcess(const TQString &Host); void slotReadProcessReady(KProcIO *r); - void slotReadProcessExited(KProcess *r); - void slotSendProcessExited(KProcess *p); + void slotReadProcessExited(TDEProcess *r); + void slotSendProcessExited(TDEProcess *p); void slotStartDirLister(); void slotListCompleted(); void slotNewMessages(const KFileItemList &items); diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp index 217ac462..0e0b6f43 100644 --- a/kopete/protocols/winpopup/wpeditaccount.cpp +++ b/kopete/protocols/winpopup/wpeditaccount.cpp @@ -58,9 +58,9 @@ WPEditAccount::WPEditAccount(TQWidget *parent, Kopete::Account *theAccount) mHostName->setText(account()->accountId()); // mAutoConnect->setChecked(account()->excludeConnect()); mHostName->setReadOnly(true); - KGlobal::config()->setGroup("WinPopup"); - mHostCheckFreq->setValue(KGlobal::config()->readNumEntry("HostCheckFreq", 60)); - mSmbcPath->setURL(KGlobal::config()->readEntry("SmbcPath", tmpSmbcPath)); + TDEGlobal::config()->setGroup("WinPopup"); + mHostCheckFreq->setValue(TDEGlobal::config()->readNumEntry("HostCheckFreq", 60)); + mSmbcPath->setURL(TDEGlobal::config()->readEntry("SmbcPath", tmpSmbcPath)); } else { @@ -112,9 +112,9 @@ bool WPEditAccount::validateData() void WPEditAccount::writeConfig() { - KGlobal::config()->setGroup("WinPopup"); - KGlobal::config()->writeEntry("SmbcPath", mSmbcPath->url()); - KGlobal::config()->writeEntry("HostCheckFreq", mHostCheckFreq->text()); + TDEGlobal::config()->setGroup("WinPopup"); + TDEGlobal::config()->writeEntry("SmbcPath", mSmbcPath->url()); + TDEGlobal::config()->writeEntry("HostCheckFreq", mHostCheckFreq->text()); } Kopete::Account *WPEditAccount::apply() diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 8e21a16d..5d4f708a 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -128,9 +128,9 @@ void WPProtocol::settingsChanged() void WPProtocol::readConfig() { - KGlobal::config()->setGroup("WinPopup"); - smbClientBin = KGlobal::config()->readEntry("SmbcPath", "/usr/bin/smbclient"); - groupCheckFreq = KGlobal::config()->readNumEntry("HostCheckFreq", 60); + TDEGlobal::config()->setGroup("WinPopup"); + smbClientBin = TDEGlobal::config()->readEntry("SmbcPath", "/usr/bin/smbclient"); + groupCheckFreq = TDEGlobal::config()->readNumEntry("HostCheckFreq", 60); } void WPProtocol::installSamba() diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index 162374b7..39651475 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -59,16 +59,16 @@ WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *pa // if we would do this in libwinpopup. GF void WPUserInfo::startDetailsProcess(const TQString &host) { - KGlobal::config()->setGroup("WinPopup"); - TQString theSMBClientPath = KGlobal::config()->readEntry("SMBClientPath", "/usr/bin/smbclient"); + TDEGlobal::config()->setGroup("WinPopup"); + TQString theSMBClientPath = TDEGlobal::config()->readEntry("SMBClientPath", "/usr/bin/smbclient"); KProcIO *details = new KProcIO; *details << theSMBClientPath << "-N" << "-E" << "-g" << "-L" << host << "-"; connect(details, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotDetailsProcessReady(KProcIO *))); - connect(details, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotDetailsProcessExited(KProcess *))); + connect(details, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotDetailsProcessExited(TDEProcess *))); - if (!details->start(KProcess::NotifyOnExit, KProcess::Stderr)) { + if (!details->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) { slotDetailsProcessExited(details); kdDebug(14170) << "DetailsProcess not started!" << endl; } @@ -91,7 +91,7 @@ void WPUserInfo::slotDetailsProcessReady(KProcIO *d) } } -void WPUserInfo::slotDetailsProcessExited(KProcess *d) +void WPUserInfo::slotDetailsProcessExited(TDEProcess *d) { delete d; diff --git a/kopete/protocols/winpopup/wpuserinfo.h b/kopete/protocols/winpopup/wpuserinfo.h index 09d2f332..f70f9c8d 100644 --- a/kopete/protocols/winpopup/wpuserinfo.h +++ b/kopete/protocols/winpopup/wpuserinfo.h @@ -43,7 +43,7 @@ class WPUserInfo : public KDialogBase private slots: void slotDetailsProcessReady(KProcIO *d); - void slotDetailsProcessExited(KProcess *d); + void slotDetailsProcessExited(TDEProcess *d); void slotCloseClicked(); signals: diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index 90245b29..e90b45f2 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -470,11 +470,11 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket ) file->writeBlock((info->buffer->buffer()).data(), info->buffer->size()); file->close(); - KProcess p; + TDEProcess p; p << "jasper"; p << "--input" << jpcTmpImageFile.name() << "--output" << bmpTmpImageFile.name() << "--output-format" << "bmp"; - p.start( KProcess::Block ); + p.start( TDEProcess::Block ); if( p.exitStatus() != 0 ) { kdDebug(YAHOO_RAW_DEBUG) << " jasper exited with status " << p.exitStatus() << " " << info->sender << endl; diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index 700c91e5..7b1839d4 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -47,21 +47,21 @@ YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, co showButton( User2, false ); TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General Yahoo Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo ); m_genInfoWidget = new YahooGeneralInfoWidget( genInfo, "Basic Information" ); genLayout->addWidget( m_genInfoWidget ); TQFrame* workInfo = addPage( i18n( "Work Info" ), i18n( "Work Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo ); m_workInfoWidget = new YahooWorkInfoWidget( workInfo, "Work Information" ); workLayout->addWidget( m_workInfoWidget ); TQFrame* otherInfo = addPage( i18n( "Other Info" ), i18n( "Other Yahoo Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); + TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo ); m_otherInfoWidget = new YahooOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); diff --git a/kopete/protocols/yahoo/yahoowebcam.cpp b/kopete/protocols/yahoo/yahoowebcam.cpp index 1e22b89c..0ddf8a45 100644 --- a/kopete/protocols/yahoo/yahoowebcam.cpp +++ b/kopete/protocols/yahoo/yahoowebcam.cpp @@ -97,12 +97,12 @@ void YahooWebcam::sendImage() m_img->save( origImg->name(), "JPEG"); - KProcess p; + TDEProcess p; p << "jasper"; p << "--input" << origImg->name() << "--output" << convertedImg->name() << "--output-format" << "jpc" << "-O" <<"cblkwidth=64\ncblkheight=64\nnumrlvls=4\nrate=0.0165\nprcheight=128\nprcwidth=2048\nmode=real"; - p.start( KProcess::Block ); + p.start( TDEProcess::Block ); if( p.exitStatus() != 0 ) { kdDebug(YAHOO_GEN_DEBUG) << " jasper exited with status " << p.exitStatus() << endl; |