From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- knode/articlewidget.cpp | 14 +++++++------- knode/knarticlefactory.cpp | 2 +- knode/kncomposer.cpp | 14 +++++++------- knode/kncomposer.h | 6 +++--- knode/knconfig.cpp | 28 ++++++++++++++-------------- knode/knconfig.h | 6 +++--- knode/knconvert.cpp | 6 +++--- knode/knconvert.h | 6 +++--- knode/kngroupdialog.cpp | 2 +- knode/kngroupmanager.cpp | 4 ++-- knode/knmainwidget.cpp | 4 ++-- knode/knode.cpp | 2 +- knode/knode_part.cpp | 6 +++--- knode/main.cpp | 4 ++-- knode/utilities.cpp | 2 +- 15 files changed, 53 insertions(+), 53 deletions(-) (limited to 'knode') diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 0f8291cf9..b8b58fd6f 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -192,7 +192,7 @@ void ArticleWidget::initActions() mCharsetSelect = new KSelectAction( i18n("Chars&et"), 0, mActionCollection, "set_charset" ); mCharsetSelect->setShortcutConfigurable( false ); - TQStringList cs = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList cs = TDEGlobal::charsets()->descriptiveEncodingNames(); cs.prepend( i18n("Automatic") ); mCharsetSelect->setItems( cs ); mCharsetSelect->setCurrentItem( 0 ); @@ -420,9 +420,9 @@ void ArticleWidget::displayArticle() TQStrListIterator npbit( nonPgpBlocks ); TQTextCodec *codec; if ( text ) - codec = KGlobal::charsets()->codecForName( text->contentType()->charset() ); + codec = TDEGlobal::charsets()->codecForName( text->contentType()->charset() ); else - codec = KGlobal::locale()->codecForEncoding(); + codec = TDEGlobal::locale()->codecForEncoding(); for( ; *pbit != 0; ++pbit, ++npbit ) { // handle non-pgp block @@ -607,7 +607,7 @@ void ArticleWidget::displayHeader() } } else if ( hb->is("Date") ) { KMime::Headers::Date *date=static_cast(hb); - headerHtml += toHtmlString( KGlobal::locale()->formatDateTime(date->qdt(), false, true), None ); + headerHtml += toHtmlString( TDEGlobal::locale()->formatDateTime(date->qdt(), false, true), None ); } else if ( hb->is("Newsgroups") ) { TQString groups = hb->asUnicodeString(); groups.replace( ',', ", " ); @@ -883,7 +883,7 @@ void ArticleWidget::displayAttachment( KMime::Content *att, int partNum ) TQCString mimetype = ct->mimeType(); KPIM::kAsciiToLower( mimetype.data() ); TQString iconName = KMimeType::mimeType( mimetype )->icon( TQString(), false ); - TQString iconFile = KGlobal::instance()->iconLoader()->iconPath( iconName, KIcon::Desktop ); + TQString iconFile = TDEGlobal::instance()->iconLoader()->iconPath( iconName, KIcon::Desktop ); html += "
" + label + "
" + comment + "

"; @@ -949,7 +949,7 @@ bool ArticleWidget::canDecodeText( const TQCString &charset ) const if ( charset.isEmpty() ) return false; bool ok = true; - KGlobal::charsets()->codecForName( charset,ok ); + TDEGlobal::charsets()->codecForName( charset,ok ); return ok; } @@ -1373,7 +1373,7 @@ void ArticleWidget::slotSetCharset( const TQString &charset ) mOverrideCharset = KMime::Headers::Latin1; } else { mForceCharset = true; - mOverrideCharset = KGlobal::charsets()->encodingForName( charset ).latin1(); + mOverrideCharset = TDEGlobal::charsets()->encodingForName( charset ).latin1(); } if ( mArticle && mArticle->hasContent() ) { diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index c260208e8..d3240bbfc 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -212,7 +212,7 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo name = TQString::fromLatin1(a->from()->email()); attribution.replace(TQRegExp("%NAME"),name); attribution.replace(TQRegExp("%EMAIL"),TQString::fromLatin1(a->from()->email())); - attribution.replace(TQRegExp("%DATE"),KGlobal::locale()->formatDateTime(a->date()->qdt(),false)); + attribution.replace(TQRegExp("%DATE"),TDEGlobal::locale()->formatDateTime(a->date()->qdt(),false)); attribution.replace(TQRegExp("%MSID"),a->messageID()->asUnicodeString()); attribution.replace(TQRegExp("%GROUP"),g->groupname()); attribution.replace(TQRegExp("%L"),"\n"); diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 4ea5b2ed5..ec6e61b1c 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -840,9 +840,9 @@ bool KNComposer::applyChanges() TQString tmpText = tmp; Kpgp::Block block; bool ok=true; - TQTextCodec *codec=KGlobal::charsets()->codecForName(c_harset, ok); + TQTextCodec *codec=TDEGlobal::charsets()->codecForName(c_harset, ok); if(!ok) // no suitable codec found => try local settings and hope the best ;-) - codec=KGlobal::locale()->codecForEncoding(); + codec=TDEGlobal::locale()->codecForEncoding(); block.setText( codec->fromUnicode(tmpText) ); kdDebug(5003) << "signing article from " << article()->from()->email() << endl; @@ -964,7 +964,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl { TQString temp; bool ok=true; - TQTextCodec *codec=KGlobal::charsets()->codecForName(c_harset, ok); + TQTextCodec *codec=TDEGlobal::charsets()->codecForName(c_harset, ok); TQTextStream ts(file); ts.setCodec(codec); @@ -1264,7 +1264,7 @@ void KNComposer::slotExternalEditor() } bool ok=true; - TQTextCodec *codec=KGlobal::charsets()->codecForName(c_harset, ok); + TQTextCodec *codec=TDEGlobal::charsets()->codecForName(c_harset, ok); TQString tmp; TQStringList textLines = v_iew->e_dit->processedText(); @@ -1287,7 +1287,7 @@ void KNComposer::slotExternalEditor() return; } - e_xternalEditor=new KProcess(); + e_xternalEditor=new TDEProcess(); // construct command line... TQStringList command = TQStringList::split(' ',editorCommand); @@ -1302,7 +1302,7 @@ void KNComposer::slotExternalEditor() if(!filenameAdded) // no %f in the editor command (*e_xternalEditor) << e_ditorTempfile->name(); - connect(e_xternalEditor, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotEditorFinished(KProcess *))); + connect(e_xternalEditor, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotEditorFinished(TDEProcess *))); if(!e_xternalEditor->start()) { KMessageBox::error(this, i18n("Unable to start external editor.\nPlease check your configuration in the settings dialog.")); delete e_xternalEditor; @@ -1520,7 +1520,7 @@ void KNComposer::slotGroupsBtnClicked() } -void KNComposer::slotEditorFinished(KProcess *) +void KNComposer::slotEditorFinished(TDEProcess *) { if(e_xternalEditor->normalExit()) { e_ditorTempfile->file()->close(); diff --git a/knode/kncomposer.h b/knode/kncomposer.h index 22b0b7933..e41a40f11 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -31,7 +31,7 @@ class TQGroupBox; -class KProcess; +class TDEProcess; class KSpell; class KDictSpellingHighlighter; class KSelectAction; @@ -103,7 +103,7 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface { //edit bool e_xternalEdited; - KProcess *e_xternalEditor; + TDEProcess *e_xternalEditor; KTempFile *e_ditorTempfile; KSpell *s_pellChecker; SpellingFilter* mSpellingFilter; @@ -160,7 +160,7 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface { void slotGroupsBtnClicked(); // external editor - void slotEditorFinished(KProcess *); + void slotEditorFinished(TDEProcess *); void slotCancelEditor(); // attachment list diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp index 2eecea7e1..f8d9de39f 100644 --- a/knode/knconfig.cpp +++ b/knode/knconfig.cpp @@ -131,17 +131,17 @@ TQString KNConfig::Identity::getSignature() else KMessageBox::error(knGlobals.topWidget, i18n("Cannot open the signature file.")); } else { - KProcess process; + TDEProcess process; // construct command line... TQStringList command = TQStringList::split(' ',s_igPath); for ( TQStringList::Iterator it = command.begin(); it != command.end(); ++it ) process << (*it); - connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(slotReceiveStdout(KProcess *, char *, int))); - connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(slotReceiveStderr(KProcess *, char *, int))); + connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceiveStdout(TDEProcess *, char *, int))); + connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(slotReceiveStderr(TDEProcess *, char *, int))); - if (!process.start(KProcess::Block,KProcess::AllOutput)) + if (!process.start(TDEProcess::Block,TDEProcess::AllOutput)) KMessageBox::error(knGlobals.topWidget, i18n("Cannot run the signature generator.")); } } @@ -156,13 +156,13 @@ TQString KNConfig::Identity::getSignature() } -void KNConfig::Identity::slotReceiveStdout(KProcess *, char *buffer, int buflen) +void KNConfig::Identity::slotReceiveStdout(TDEProcess *, char *buffer, int buflen) { s_igContents.append(TQString::fromLocal8Bit(buffer,buflen)); } -void KNConfig::Identity::slotReceiveStderr(KProcess *, char *buffer, int buflen) +void KNConfig::Identity::slotReceiveStderr(TDEProcess *, char *buffer, int buflen) { s_igStdErr.append(TQString::fromLocal8Bit(buffer,buflen)); } @@ -242,18 +242,18 @@ KNConfig::Appearance::Appearance() //fonts u_seFonts = c->readBoolEntry("customFonts", false); - TQFont defFont=KGlobalSettings::generalFont(); + TQFont defFont=TDEGlobalSettings::generalFont(); f_onts[article]=c->readFontEntry("articleFont",&defFont); f_ontNames[article]=i18n("Article Body"); - defFont=KGlobalSettings::fixedFont(); + defFont=TDEGlobalSettings::fixedFont(); f_onts[articleFixed]=c->readFontEntry("articleFixedFont",&defFont); f_ontNames[articleFixed]=i18n("Article Body (Fixed)"); f_onts[composer]=c->readFontEntry("composerFont",&defFont); f_ontNames[composer]=i18n("Composer"); - defFont=KGlobalSettings::generalFont(); + defFont=TDEGlobalSettings::generalFont(); f_onts[groupList]=c->readFontEntry("groupListFont",&defFont); f_ontNames[groupList]=i18n("Group List"); @@ -261,7 +261,7 @@ KNConfig::Appearance::Appearance() f_ontNames[articleList]=i18n("Article List"); //icons - KGlobal::iconLoader()->addAppDir("knode"); + TDEGlobal::iconLoader()->addAppDir("knode"); recreateLVIcons(); i_cons[newFups] = UserIcon("newsubs"); i_cons[eyes] = UserIcon("eyes"); @@ -455,7 +455,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const return kapp->palette().active().base(); case alternateBackground: - return KGlobalSettings::alternateBackgroundColor(); + return TDEGlobalSettings::alternateBackgroundColor(); case quoted1: return TQColor( 0x00, 0x80, 0x00 ); @@ -469,7 +469,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const return kapp->palette().active().text(); case url: - return KGlobalSettings::linkColor(); + return TDEGlobalSettings::linkColor(); case readThread: return kapp->palette().disabled().text(); @@ -499,9 +499,9 @@ TQColor KNConfig::Appearance::defaultColor(int i) const TQFont KNConfig::Appearance::defaultFont(int i) const { if ( i == articleFixed || i == composer ) - return KGlobalSettings::fixedFont(); + return TDEGlobalSettings::fixedFont(); else - return KGlobalSettings::generalFont(); + return TDEGlobalSettings::generalFont(); } diff --git a/knode/knconfig.h b/knode/knconfig.h index b859f6262..44a985597 100644 --- a/knode/knconfig.h +++ b/knode/knconfig.h @@ -27,7 +27,7 @@ #include class KScoringRule; -class KProcess; +class TDEProcess; class KSpellConfig; namespace Kpgp { class Config; @@ -114,8 +114,8 @@ Q_OBJECT protected slots: - void slotReceiveStdout(KProcess *proc, char *buffer, int buflen); - void slotReceiveStderr(KProcess *proc, char *buffer, int buflen); + void slotReceiveStdout(TDEProcess *proc, char *buffer, int buflen); + void slotReceiveStderr(TDEProcess *proc, char *buffer, int buflen); protected: TQString n_ame, diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index 8fdb4890c..ba95e9a30 100644 --- a/knode/knconvert.cpp +++ b/knode/knconvert.cpp @@ -173,11 +173,11 @@ void KNConvert::slotStart() } TQString dataDir=locateLocal("data","knode/"); - t_ar=new KProcess; + t_ar=new TDEProcess; *t_ar << "tar"; *t_ar << "-cz" << dataDir << "-f" << b_ackupPath->text(); - connect(t_ar, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotTarExited(KProcess*))); + connect(t_ar, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotTarExited(TDEProcess*))); if(!t_ar->start()) { delete t_ar; t_ar = 0; @@ -206,7 +206,7 @@ void KNConvert::slotBrowse() } -void KNConvert::slotTarExited(KProcess *proc) +void KNConvert::slotTarExited(TDEProcess *proc) { bool success=true; diff --git a/knode/knconvert.h b/knode/knconvert.h index 49f8e7010..59b23c9c2 100644 --- a/knode/knconvert.h +++ b/knode/knconvert.h @@ -29,7 +29,7 @@ class TQWidgetStack; class TQCheckBox; class KLineEdit; -class KProcess; +class TDEProcess; class KDE_EXPORT KNConvert : public TQDialog { @@ -111,7 +111,7 @@ class KDE_EXPORT KNConvert : public TQDialog { TQStringList l_og; bool c_onversionDone; TQString v_ersion; - KProcess *t_ar; + TDEProcess *t_ar; void convert(); @@ -119,7 +119,7 @@ class KDE_EXPORT KNConvert : public TQDialog { void slotStart(); void slotCreateBkupToggled(bool b); void slotBrowse(); - void slotTarExited(KProcess *proc); + void slotTarExited(TDEProcess *proc); }; diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index 6807979b9..4498898f9 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -291,7 +291,7 @@ void KNGroupDialog::slotUser2() TQRadioButton *takeLast = new TQRadioButton( i18n("Created since last check:"), btnGrp ); topL->addMultiCellWidget(takeLast, 0, 0, 0, 1); - TQLabel *l = new TQLabel(KGlobal::locale()->formatDate(lastDate, false),btnGrp); + TQLabel *l = new TQLabel(TDEGlobal::locale()->formatDate(lastDate, false),btnGrp); topL->addWidget(l, 1, 1, TQt::AlignLeft); connect(takeLast, TQT_SIGNAL(toggled(bool)), l, TQT_SLOT(setEnabled(bool))); diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index 271a689d3..92ed16668 100644 --- a/knode/kngroupmanager.cpp +++ b/knode/kngroupmanager.cpp @@ -677,7 +677,7 @@ void KNGroupManager::slotFetchGroupList(KNNntpAccount *a) d->path = a->path(); getSubscribed(a,d->subscribed); d->getDescriptions = a->fetchDescriptions(); - d->codecForDescriptions=KGlobal::charsets()->codecForName(knGlobals.configManager()->postNewsTechnical()->charset()); + d->codecForDescriptions=TDEGlobal::charsets()->codecForName(knGlobals.configManager()->postNewsTechnical()->charset()); emitJob( new KNJobData(KNJobData::JTFetchGroups, this, a, d) ); } @@ -691,7 +691,7 @@ void KNGroupManager::slotCheckForNewGroups(KNNntpAccount *a, TQDate date) getSubscribed(a,d->subscribed); d->getDescriptions = a->fetchDescriptions(); d->fetchSince = date; - d->codecForDescriptions=KGlobal::charsets()->codecForName(knGlobals.configManager()->postNewsTechnical()->charset()); + d->codecForDescriptions=TDEGlobal::charsets()->codecForName(knGlobals.configManager()->postNewsTechnical()->charset()); emitJob( new KNJobData(KNJobData::JTCheckNewGroups, this, a, d) ); } diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 7b7b56101..fa3b04787 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -810,7 +810,7 @@ void KNMainWidget::readOptions() a_ctArtSortHeaders->setCurrentItem( h_drView->sortColumn() ); resize(787,478); // default optimized for 800x600 - //applyMainWindowSettings(KGlobal::config(),"mainWindow_options"); + //applyMainWindowSettings(TDEGlobal::config(),"mainWindow_options"); // restore dock configuration manager()->readConfig(knGlobals.config(),"dock_configuration"); @@ -823,7 +823,7 @@ void KNMainWidget::saveOptions() conf->setGroup("APPEARANCE"); conf->writeEntry("quicksearch", q_uicksearch->isShown()); - //saveMainWindowSettings(KGlobal::config(),"mainWindow_options"); + //saveMainWindowSettings(TDEGlobal::config(),"mainWindow_options"); c_olView->writeConfig(); h_drView->writeConfig(); diff --git a/knode/knode.cpp b/knode/knode.cpp index 1af62747b..6bb741c80 100644 --- a/knode/knode.cpp +++ b/knode/knode.cpp @@ -60,7 +60,7 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget ) createGUI( "knodeui.rc" ); knGlobals.instance = 0; - applyMainWindowSettings(KGlobal::config(),"mainWindow_options"); + applyMainWindowSettings(TDEGlobal::config(),"mainWindow_options"); } KNMainWindow::~KNMainWindow() diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp index 23bb3fba3..4ada858c1 100644 --- a/knode/knode_part.cpp +++ b/knode/knode_part.cpp @@ -60,10 +60,10 @@ KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName, kdDebug(5003) << "KNodePart()..." << endl; kdDebug(5003) << " InstanceName: " << kapp->instanceName() << endl; - KGlobal::locale()->insertCatalogue("libtdepim"); - KGlobal::locale()->insertCatalogue("libkpgp"); + TDEGlobal::locale()->insertCatalogue("libtdepim"); + TDEGlobal::locale()->insertCatalogue("libkpgp"); kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet - KGlobal::iconLoader()->addAppDir("knode"); + TDEGlobal::iconLoader()->addAppDir("knode"); knGlobals.instance = KNodeFactory::instance(); // create a canvas to insert our widget diff --git a/knode/main.cpp b/knode/main.cpp index e433b5439..663ddaaca 100644 --- a/knode/main.cpp +++ b/knode/main.cpp @@ -37,8 +37,8 @@ int main(int argc, char* argv[]) return 0; KNApplication app; - KGlobal::locale()->insertCatalogue("libtdepim"); - KGlobal::locale()->insertCatalogue("libkpgp"); + TDEGlobal::locale()->insertCatalogue("libtdepim"); + TDEGlobal::locale()->insertCatalogue("libkpgp"); return app.exec(); } diff --git a/knode/utilities.cpp b/knode/utilities.cpp index 6d3493362..4ed48ea90 100644 --- a/knode/utilities.cpp +++ b/knode/utilities.cpp @@ -311,7 +311,7 @@ void KNHelper::restoreWindowSize(const TQString &name, TQWidget *d, const TQSize TQSize s=c->readSizeEntry(name,&defaultSize); if(s.isValid()) { - TQRect max = KGlobalSettings::desktopGeometry(TQCursor::pos()); + TQRect max = TDEGlobalSettings::desktopGeometry(TQCursor::pos()); if ( s.width() > max.width() ) s.setWidth( max.width()-5 ); if ( s.height() > max.height() ) s.setHeight( max.height()-5 ); d->resize(s); -- cgit v1.2.1