diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:27:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:27:25 -0600 |
| commit | 76a6704302dfb029dbde89678f39399e009a9ffb (patch) | |
| tree | 56afb463ad316e3b6cc71619aa4ab2074c0e429f | |
| parent | 9ac093212c391228f163c9022b3c337c34dca2a2 (diff) | |
| download | yakuake-76a6704302dfb029dbde89678f39399e009a9ffb.tar.gz yakuake-76a6704302dfb029dbde89678f39399e009a9ffb.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
| -rw-r--r-- | yakuake/src/main_window.cpp | 4 | ||||
| -rw-r--r-- | yakuake/src/main_window.h | 2 | ||||
| -rw-r--r-- | yakuake/src/skin_list_item.cpp | 4 | ||||
| -rw-r--r-- | yakuake/src/skin_settings.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/yakuake/src/main_window.cpp b/yakuake/src/main_window.cpp index 7d7b886..558b15a 100644 --- a/yakuake/src/main_window.cpp +++ b/yakuake/src/main_window.cpp @@ -66,7 +66,7 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) : Settings::setSkin("default"); // Initialize access key. - global_key = new KGlobalAccel(TQT_TQOBJECT(this)); + global_key = new TDEGlobalAccel(TQT_TQOBJECT(this)); global_key->insert("AccessKey", i18n("Open/Retract Yakuake"), i18n("Slides the Yakuake window in and out"), Key_F12, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleState())); @@ -724,7 +724,7 @@ TQRect MainWindow::getDesktopGeometry() TQRect result; result = desk_info.workArea(); - KConfigGroup group(KGlobal::config(), "Windows"); + KConfigGroup group(TDEGlobal::config(), "Windows"); if (TQApplication::desktop()->isVirtualDesktop() && group.readBoolEntry("XineramaEnabled", true) && diff --git a/yakuake/src/main_window.h b/yakuake/src/main_window.h index a67e736..3aa327c 100644 --- a/yakuake/src/main_window.h +++ b/yakuake/src/main_window.h @@ -190,7 +190,7 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface KPopupMenu* height_menu; /* Global Key shortcut. */ - KGlobalAccel* global_key; + TDEGlobalAccel* global_key; /* Background widget. */ TQWidget* back_widget; diff --git a/yakuake/src/skin_list_item.cpp b/yakuake/src/skin_list_item.cpp index 294a08b..d9f3543 100644 --- a/yakuake/src/skin_list_item.cpp +++ b/yakuake/src/skin_list_item.cpp @@ -92,8 +92,8 @@ void SkinListItem::paintCell(TQPainter* p, const TQColorGroup& /* cg */, int /* { if (width <= 0) return; - TQColor textColor = isSelected() ? KGlobalSettings::highlightedTextColor() : KGlobalSettings::textColor(); - TQColor background = isSelected() ? KGlobalSettings::highlightColor() : listView()->paletteBackgroundColor(); + TQColor textColor = isSelected() ? TDEGlobalSettings::highlightedTextColor() : TDEGlobalSettings::textColor(); + TQColor background = isSelected() ? TDEGlobalSettings::highlightColor() : listView()->paletteBackgroundColor(); TQColorGroup colors; colors.setColor(TQColorGroup::Foreground, textColor); diff --git a/yakuake/src/skin_settings.cpp b/yakuake/src/skin_settings.cpp index a9d6928..d727d6f 100644 --- a/yakuake/src/skin_settings.cpp +++ b/yakuake/src/skin_settings.cpp @@ -89,8 +89,8 @@ void SkinSettings::showEvent(TQShowEvent* e) void SkinSettings::slotPopulate() { TQStringList skins_dirs; - TQStringList titles_dirs = KGlobal::dirs()->findAllResources("data","yakuake/*/title.skin"); - TQStringList tabs_dirs = KGlobal::dirs()->findAllResources("data","yakuake/*/tabs.skin"); + TQStringList titles_dirs = TDEGlobal::dirs()->findAllResources("data","yakuake/*/title.skin"); + TQStringList tabs_dirs = TDEGlobal::dirs()->findAllResources("data","yakuake/*/tabs.skin"); for (TQStringList::Iterator it = titles_dirs.begin(); it != titles_dirs.end(); ++it) { |