From 27430f06c6cc2187c639f59f342f07f1fde91a8b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:46 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- juk/playlist.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'juk/playlist.cpp') diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 1a83797b..1edf7330 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -144,7 +144,7 @@ public: */ void setColumnOrder(const Playlist *l); void toggleColumnVisible(int column); - void setInlineCompletionMode(KGlobalSettings::Completion mode); + void setInlineCompletionMode(TDEGlobalSettings::Completion mode); /** * Apply the settings. @@ -162,7 +162,7 @@ private: static SharedSettings *m_instance; TQValueList m_columnOrder; TQValueVector m_columnsVisible; - KGlobalSettings::Completion m_inlineCompletion; + TDEGlobalSettings::Completion m_inlineCompletion; }; Playlist::SharedSettings *Playlist::SharedSettings::m_instance = 0; @@ -200,7 +200,7 @@ void Playlist::SharedSettings::toggleColumnVisible(int column) writeConfig(); } -void Playlist::SharedSettings::setInlineCompletionMode(KGlobalSettings::Completion mode) +void Playlist::SharedSettings::setInlineCompletionMode(TDEGlobalSettings::Completion mode) { m_inlineCompletion = mode; writeConfig(); @@ -235,7 +235,7 @@ void Playlist::SharedSettings::apply(Playlist *l) const Playlist::SharedSettings::SharedSettings() { - KConfigGroup config(KGlobal::config(), "PlaylistShared"); + KConfigGroup config(TDEGlobal::config(), "PlaylistShared"); bool resizeColumnsManually = config.readBoolEntry("ResizeColumnsManually", false); action("resizeColumnsManually")->setChecked(resizeColumnsManually); @@ -275,8 +275,8 @@ Playlist::SharedSettings::SharedSettings() } } - m_inlineCompletion = KGlobalSettings::Completion( - config.readNumEntry("InlineCompletionMode", KGlobalSettings::CompletionAuto)); + m_inlineCompletion = TDEGlobalSettings::Completion( + config.readNumEntry("InlineCompletionMode", TDEGlobalSettings::CompletionAuto)); } //////////////////////////////////////////////////////////////////////////////// @@ -285,7 +285,7 @@ Playlist::SharedSettings::SharedSettings() void Playlist::SharedSettings::writeConfig() { - KConfigGroup config(KGlobal::config(), "PlaylistShared"); + KConfigGroup config(TDEGlobal::config(), "PlaylistShared"); config.writeEntry("ColumnOrder", m_columnOrder); TQValueList l; @@ -297,7 +297,7 @@ void Playlist::SharedSettings::writeConfig() config.writeEntry("ResizeColumnsManually", manualResize()); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); } //////////////////////////////////////////////////////////////////////////////// @@ -1573,8 +1573,8 @@ void Playlist::polish() connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); - connect(renameLineEdit(), TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), - this, TQT_SLOT(slotInlineCompletionModeChanged(KGlobalSettings::Completion))); + connect(renameLineEdit(), TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + this, TQT_SLOT(slotInlineCompletionModeChanged(TDEGlobalSettings::Completion))); connect(action("resizeColumnsManually"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotColumnResizeModeChanged())); @@ -2314,7 +2314,7 @@ void Playlist::slotColumnSizeChanged(int column, int, int newSize) m_columnFixedWidths[column] = newSize; } -void Playlist::slotInlineCompletionModeChanged(KGlobalSettings::Completion mode) +void Playlist::slotInlineCompletionModeChanged(TDEGlobalSettings::Completion mode) { SharedSettings::instance()->setInlineCompletionMode(mode); } -- cgit v1.2.3