diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:30 -0600 |
| commit | 29df04c24350cc76a41e2410d1c92445f9338b98 (patch) | |
| tree | c2b9cde128e24275393a83d9eaec58b2ef12d109 /klinkstatus/src/ui | |
| parent | c70534eef6085384ef7ddff369a154dbc8901917 (diff) | |
| download | tdewebdev-29df04c24350cc76a41e2410d1c92445f9338b98.tar.gz tdewebdev-29df04c24350cc76a41e2410d1c92445f9338b98.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'klinkstatus/src/ui')
| -rw-r--r-- | klinkstatus/src/ui/klshistorycombo.cpp | 2 | ||||
| -rw-r--r-- | klinkstatus/src/ui/resultssearchbar.cpp | 10 | ||||
| -rw-r--r-- | klinkstatus/src/ui/sessionwidget.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index 1267671d..c29ae53d 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -71,7 +71,7 @@ void KLSHistoryCombo::loadItems() completionObject()->setItems(items); - setCompletionMode(KGlobalSettings::completionMode()); + setCompletionMode(TDEGlobalSettings::completionMode()); } bool KLSHistoryCombo::eventFilter( TQObject *o, TQEvent *ev ) diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp index 1841a5c6..eed8df79 100644 --- a/klinkstatus/src/ui/resultssearchbar.cpp +++ b/klinkstatus/src/ui/resultssearchbar.cpp @@ -84,11 +84,11 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) d->layout->addWidget(statusLabel); d->searchCombo = new KComboBox(this, "searchcombo"); - TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small); - TQPixmap iconGood = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small); - TQPixmap iconBroken = KGlobal::iconLoader()->loadIcon("no", KIcon::Small); - TQPixmap iconMalformed = KGlobal::iconLoader()->loadIcon("bug", KIcon::Small); - TQPixmap iconUndetermined = KGlobal::iconLoader()->loadIcon("help", KIcon::Small); + TQPixmap iconAll = TDEGlobal::iconLoader()->loadIcon("exec", KIcon::Small); + TQPixmap iconGood = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); + TQPixmap iconBroken = TDEGlobal::iconLoader()->loadIcon("no", KIcon::Small); + TQPixmap iconMalformed = TDEGlobal::iconLoader()->loadIcon("bug", KIcon::Small); + TQPixmap iconUndetermined = TDEGlobal::iconLoader()->loadIcon("help", KIcon::Small); d->searchCombo->insertItem(iconAll, i18n("All Links")); d->searchCombo->insertItem(iconGood, i18n("Good Links")); diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index 43a80aa6..7c611bc0 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -104,8 +104,8 @@ void SessionWidget::init() toolButton_clear_combo->setIconSet(SmallIconSet("locationbar_erase")); - pushbutton_url->setIconSet(KGlobal::iconLoader()->loadIconSet("fileopen", KIcon::Small)); - TQPixmap pixMap = KGlobal::iconLoader()->loadIcon("fileopen", KIcon::Small); + pushbutton_url->setIconSet(TDEGlobal::iconLoader()->loadIconSet("fileopen", KIcon::Small)); + TQPixmap pixMap = TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::Small); pushbutton_url->setFixedSize(pixMap.width() + 8, pixMap.height() + 8); connect(pushbutton_url, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChooseUrlDialog())); |