diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:48:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:48:31 -0600 |
| commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
| tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kdict/applet/kdictapplet.cpp | |
| parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
| download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kdict/applet/kdictapplet.cpp')
| -rw-r--r-- | kdict/applet/kdictapplet.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp index 054bf953..51f02faf 100644 --- a/kdict/applet/kdictapplet.cpp +++ b/kdict/applet/kdictapplet.cpp @@ -76,7 +76,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("kdictapplet"); + TDEGlobal::locale()->insertCatalogue("kdictapplet"); return new DictApplet(configFile, KPanelApplet::Stretch, 0, parent, "kdictapplet"); } } @@ -99,7 +99,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid iconLabel = new TQLabel(baseWidget); iconLabel->setBackgroundOrigin(AncestorOrigin); - TQPixmap pm = KGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, KIcon::SizeSmall, KIcon::DefaultState, 0L, true); + TQPixmap pm = TDEGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, KIcon::SizeSmall, KIcon::DefaultState, 0L, true); iconLabel->setPixmap(pm); baseLay->addWidget(iconLabel,1,0); iconLabel->setAlignment(TQt::AlignCenter | TQt::AlignVCenter); @@ -162,10 +162,10 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid connect(externalCombo, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(startQuery(const TQString&))); externalCombo->setFixedSize(160, externalCombo->sizeHint().height()); - connect(internalCombo, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - this, TQT_SLOT(updateCompletionMode(KGlobalSettings::Completion))); - connect(externalCombo, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - this, TQT_SLOT(updateCompletionMode(KGlobalSettings::Completion))); + connect(internalCombo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + this, TQT_SLOT(updateCompletionMode(TDEGlobalSettings::Completion))); + connect(externalCombo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + this, TQT_SLOT(updateCompletionMode(TDEGlobalSettings::Completion))); // restore history and completion list KConfig *c = config(); @@ -174,9 +174,9 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid TQStringList list = c->readListEntry("Completion list"); completionObject->setItems(list); int mode = c->readNumEntry("Completion mode", - KGlobalSettings::completionMode()); - internalCombo->setCompletionMode((KGlobalSettings::Completion)mode); - externalCombo->setCompletionMode((KGlobalSettings::Completion)mode); + TDEGlobalSettings::completionMode()); + internalCombo->setCompletionMode((TDEGlobalSettings::Completion)mode); + externalCombo->setCompletionMode((TDEGlobalSettings::Completion)mode); list = c->readListEntry("History list"); internalCombo->setHistoryItems(list); @@ -252,7 +252,7 @@ void DictApplet::resizeEvent(TQResizeEvent*) verticalBtn->setFixedSize(width(),width()); KIcon::StdSizes sz = width() < 32 ? KIcon::SizeSmall : (width() < 48 ? KIcon::SizeMedium : KIcon::SizeLarge); - TQPixmap pm = KGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, sz, KIcon::DefaultState, 0L, true); + TQPixmap pm = TDEGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, sz, KIcon::DefaultState, 0L, true); verticalBtn->setPixmap(pm); } } @@ -394,7 +394,7 @@ void DictApplet::externalComboHidden() verticalBtn->setDown(false); } -void DictApplet::updateCompletionMode(KGlobalSettings::Completion mode) +void DictApplet::updateCompletionMode(TDEGlobalSettings::Completion mode) { internalCombo->setCompletionMode(mode); externalCombo->setCompletionMode(mode); |