Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 9ac093212c
commit 76a6704302

@ -66,7 +66,7 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) :
Settings::setSkin("default"); Settings::setSkin("default");
// Initialize access key. // 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"), global_key->insert("AccessKey", i18n("Open/Retract Yakuake"),
i18n("Slides the Yakuake window in and out"), i18n("Slides the Yakuake window in and out"),
Key_F12, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleState())); Key_F12, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleState()));
@ -724,7 +724,7 @@ TQRect MainWindow::getDesktopGeometry()
TQRect result; TQRect result;
result = desk_info.workArea(); result = desk_info.workArea();
KConfigGroup group(KGlobal::config(), "Windows"); KConfigGroup group(TDEGlobal::config(), "Windows");
if (TQApplication::desktop()->isVirtualDesktop() && if (TQApplication::desktop()->isVirtualDesktop() &&
group.readBoolEntry("XineramaEnabled", true) && group.readBoolEntry("XineramaEnabled", true) &&

@ -190,7 +190,7 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
KPopupMenu* height_menu; KPopupMenu* height_menu;
/* Global Key shortcut. */ /* Global Key shortcut. */
KGlobalAccel* global_key; TDEGlobalAccel* global_key;
/* Background widget. */ /* Background widget. */
TQWidget* back_widget; TQWidget* back_widget;

@ -92,8 +92,8 @@ void SkinListItem::paintCell(TQPainter* p, const TQColorGroup& /* cg */, int /*
{ {
if (width <= 0) return; if (width <= 0) return;
TQColor textColor = isSelected() ? KGlobalSettings::highlightedTextColor() : KGlobalSettings::textColor(); TQColor textColor = isSelected() ? TDEGlobalSettings::highlightedTextColor() : TDEGlobalSettings::textColor();
TQColor background = isSelected() ? KGlobalSettings::highlightColor() : listView()->paletteBackgroundColor(); TQColor background = isSelected() ? TDEGlobalSettings::highlightColor() : listView()->paletteBackgroundColor();
TQColorGroup colors; TQColorGroup colors;
colors.setColor(TQColorGroup::Foreground, textColor); colors.setColor(TQColorGroup::Foreground, textColor);

@ -89,8 +89,8 @@ void SkinSettings::showEvent(TQShowEvent* e)
void SkinSettings::slotPopulate() void SkinSettings::slotPopulate()
{ {
TQStringList skins_dirs; TQStringList skins_dirs;
TQStringList titles_dirs = KGlobal::dirs()->findAllResources("data","yakuake/*/title.skin"); TQStringList titles_dirs = TDEGlobal::dirs()->findAllResources("data","yakuake/*/title.skin");
TQStringList tabs_dirs = KGlobal::dirs()->findAllResources("data","yakuake/*/tabs.skin"); TQStringList tabs_dirs = TDEGlobal::dirs()->findAllResources("data","yakuake/*/tabs.skin");
for (TQStringList::Iterator it = titles_dirs.begin(); it != titles_dirs.end(); ++it) for (TQStringList::Iterator it = titles_dirs.begin(); it != titles_dirs.end(); ++it)
{ {

Loading…
Cancel
Save