From c48e769eb275917717e2b55eb869f7e559293ac8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:48:31 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kdict/options.cpp | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'kdict/options.cpp') diff --git a/kdict/options.cpp b/kdict/options.cpp index efb5f962..e7ff3339 100644 --- a/kdict/options.cpp +++ b/kdict/options.cpp @@ -44,7 +44,7 @@ void GlobalData::read() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); // general... config->setGroup("General"); @@ -67,27 +67,27 @@ void GlobalData::read() config->setGroup("Colors"); useCustomColors=config->readBoolEntry("customColors", false); - TQColor defCol=KGlobalSettings::textColor(); + TQColor defCol=TDEGlobalSettings::textColor(); c_olors[Ctext]=config->readColorEntry("textColor",&defCol); c_olorNames[Ctext]=i18n("Text"); - defCol=KGlobalSettings::baseColor(); + defCol=TDEGlobalSettings::baseColor(); c_olors[Cbackground]=config->readColorEntry("backgroundColor",&defCol); c_olorNames[Cbackground]=i18n("Background"); - defCol=KGlobalSettings::highlightedTextColor(); + defCol=TDEGlobalSettings::highlightedTextColor(); c_olors[CheadingsText]=config->readColorEntry("headingsTextColor",&defCol); c_olorNames[CheadingsText]=i18n("Heading Text"); - defCol=KGlobalSettings::highlightColor(); + defCol=TDEGlobalSettings::highlightColor(); c_olors[CheadingsBackground]=config->readColorEntry("headingsBackgroundColor",&defCol); c_olorNames[CheadingsBackground]=i18n("Heading Background"); - defCol=KGlobalSettings::linkColor(); + defCol=TDEGlobalSettings::linkColor(); c_olors[Clinks]=config->readColorEntry("linksColor",&defCol); c_olorNames[Clinks]=i18n("Link"); - defCol=KGlobalSettings::visitedLinkColor(); + defCol=TDEGlobalSettings::visitedLinkColor(); c_olors[CvisitedLinks]=config->readColorEntry("linksColor",&defCol); c_olorNames[CvisitedLinks]=i18n("Followed Link"); @@ -95,7 +95,7 @@ void GlobalData::read() config->setGroup("Fonts"); useCustomFonts=config->readBoolEntry("customFonts", false); - TQFont defFont=KGlobalSettings::generalFont(); + TQFont defFont=TDEGlobalSettings::generalFont(); f_onts[Ftext]=config->readFontEntry("textFont",&defFont); f_ontNames[Ftext]=i18n("Text"); @@ -114,8 +114,8 @@ void GlobalData::read() splitterSizes = config->readIntListEntry("Splitter_Sizes"); config->setGroup("Query Combo"); - queryComboCompletionMode = (KGlobalSettings::Completion)config->readNumEntry("Completion_mode", - KGlobalSettings::completionMode()); + queryComboCompletionMode = (TDEGlobalSettings::Completion)config->readNumEntry("Completion_mode", + TDEGlobalSettings::completionMode()); config->setGroup("Query_History"); queryHistory = config->readListEntry("History"); @@ -182,7 +182,7 @@ void GlobalData::read() void GlobalData::write() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("General"); config->writeEntry("Lookup_Clipboard",defineClipboard); @@ -249,32 +249,32 @@ TQColor GlobalData::defaultColor(int i) { switch(i) { case Ctext: - return KGlobalSettings::textColor(); + return TDEGlobalSettings::textColor(); break; case Cbackground: - return KGlobalSettings::baseColor(); + return TDEGlobalSettings::baseColor(); break; case CheadingsText: - return KGlobalSettings::highlightedTextColor(); + return TDEGlobalSettings::highlightedTextColor(); break; case CheadingsBackground: - return KGlobalSettings::highlightColor(); + return TDEGlobalSettings::highlightColor(); break; case Clinks: - return KGlobalSettings::linkColor(); + return TDEGlobalSettings::linkColor(); break; case CvisitedLinks: - return KGlobalSettings::visitedLinkColor(); + return TDEGlobalSettings::visitedLinkColor(); break; } - return KGlobalSettings::baseColor(); + return TDEGlobalSettings::baseColor(); } @@ -334,7 +334,7 @@ TQColor GlobalData::visitedLinksColor() TQFont GlobalData::defaultFont(int i) { - TQFont font = KGlobalSettings::generalFont(); + TQFont font = TDEGlobalSettings::generalFont(); if (font.pointSize() < 5) font.setPointSize(12); @@ -535,10 +535,10 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) grid->addWidget(w_pipesize,4,1); connect( w_pipesize, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) ); - TQStringList encodingNames = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodingNames = TDEGlobal::charsets()->descriptiveEncodingNames(); int i=0,x=0; for ( TQStringList::Iterator it = encodingNames.begin(); it != encodingNames.end(); ++it ) { - if (KGlobal::charsets()->encodingForName(*it)==global->encoding) { + if (TDEGlobal::charsets()->encodingForName(*it)==global->encoding) { x = i; break; } @@ -743,7 +743,7 @@ void OptionsDialog::slotApply() global->timeout = w_timeout->value(); global->idleHold = w_idleHold->value(); global->pipeSize = w_pipesize->value(); - global->encoding = KGlobal::charsets()->encodingForName(w_encoding->currentText()); + global->encoding = TDEGlobal::charsets()->encodingForName(w_encoding->currentText()); global->authEnabled = w_auth->isChecked(); global->user = w_user->text(); global->secret = w_secret->text(); @@ -792,9 +792,9 @@ void OptionsDialog::slotDefault() w_idleHold->setValue(30); w_timeout->setValue(60); w_pipesize->setValue(256); - encodingNames = KGlobal::charsets()->descriptiveEncodingNames(); + encodingNames = TDEGlobal::charsets()->descriptiveEncodingNames(); for ( TQStringList::Iterator it = encodingNames.begin(); it != encodingNames.end(); ++it ) { - if (KGlobal::charsets()->encodingForName(*it)=="utf8") + if (TDEGlobal::charsets()->encodingForName(*it)=="utf8") x = i; i++; } -- cgit v1.2.1