summaryrefslogtreecommitdiffstats
path: root/juk
diff options
context:
space:
mode:
Diffstat (limited to 'juk')
-rw-r--r--juk/cache.cpp10
-rw-r--r--juk/collectionlist.cpp4
-rw-r--r--juk/coverinfo.cpp2
-rw-r--r--juk/covermanager.cpp4
-rw-r--r--juk/deletedialog.cpp8
-rw-r--r--juk/filerenamer.cpp8
-rw-r--r--juk/gstreamerplayer.cpp2
-rw-r--r--juk/historyplaylist.cpp6
-rw-r--r--juk/juk.cpp16
-rw-r--r--juk/juk.h4
-rw-r--r--juk/k3bexporter.cpp4
-rw-r--r--juk/keydialog.cpp16
-rw-r--r--juk/keydialog.h12
-rw-r--r--juk/main.cpp2
-rw-r--r--juk/playlist.cpp22
-rw-r--r--juk/playlist.h2
-rw-r--r--juk/playlistbox.cpp8
-rw-r--r--juk/playlistcollection.cpp4
-rw-r--r--juk/playlistsplitter.cpp4
-rw-r--r--juk/systemtray.cpp2
-rw-r--r--juk/tageditor.cpp12
-rw-r--r--juk/tagguesser.cpp4
-rw-r--r--juk/tagrenameroptions.cpp4
23 files changed, 80 insertions, 80 deletions
diff --git a/juk/cache.cpp b/juk/cache.cpp
index 34d59b46..0183c560 100644
--- a/juk/cache.cpp
+++ b/juk/cache.cpp
@@ -66,7 +66,7 @@ Cache *Cache::instance()
void Cache::save()
{
- TQString dirName = KGlobal::dirs()->saveLocation("appdata");
+ TQString dirName = TDEGlobal::dirs()->saveLocation("appdata");
TQString cacheFileName = dirName + "cache.new";
TQFile f(cacheFileName);
@@ -97,7 +97,7 @@ void Cache::save()
void Cache::loadPlaylists(PlaylistCollection *collection) // static
{
- TQString playlistsFile = KGlobal::dirs()->saveLocation("appdata") + "playlists";
+ TQString playlistsFile = TDEGlobal::dirs()->saveLocation("appdata") + "playlists";
TQFile f(playlistsFile);
@@ -204,7 +204,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static
void Cache::savePlaylists(const PlaylistList &playlists)
{
- TQString dirName = KGlobal::dirs()->saveLocation("appdata");
+ TQString dirName = TDEGlobal::dirs()->saveLocation("appdata");
TQString playlistsFile = dirName + "playlists.new";
TQFile f(playlistsFile);
@@ -254,7 +254,7 @@ void Cache::savePlaylists(const PlaylistList &playlists)
bool Cache::cacheFileExists() // static
{
- return TQFile::exists(KGlobal::dirs()->saveLocation("appdata") + "cache");
+ return TQFile::exists(TDEGlobal::dirs()->saveLocation("appdata") + "cache");
}
////////////////////////////////////////////////////////////////////////////////
@@ -268,7 +268,7 @@ Cache::Cache() : FileHandleHash()
void Cache::load()
{
- TQString cacheFileName = KGlobal::dirs()->saveLocation("appdata") + "cache";
+ TQString cacheFileName = TDEGlobal::dirs()->saveLocation("appdata") + "cache";
TQFile f(cacheFileName);
diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp
index eb1b5d42..4e58f425 100644
--- a/juk/collectionlist.cpp
+++ b/juk/collectionlist.cpp
@@ -67,7 +67,7 @@ void CollectionList::initialize(PlaylistCollection *collection)
// The CollectionList is created with sorting disabled for speed. Re-enable
// it here, and perform the sort.
- KConfigGroup config(KGlobal::config(), "Playlists");
+ KConfigGroup config(TDEGlobal::config(), "Playlists");
SortOrder order = Descending;
if(config.readBoolEntry("CollectionListSortAscending", true))
@@ -252,7 +252,7 @@ CollectionList::CollectionList(PlaylistCollection *collection) :
CollectionList::~CollectionList()
{
- KConfigGroup config(KGlobal::config(), "Playlists");
+ KConfigGroup config(TDEGlobal::config(), "Playlists");
config.writeEntry("CollectionListSortColumn", sortColumn());
config.writeEntry("CollectionListSortAscending", sortOrder() == Ascending);
diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp
index e6b7691a..bc48fa0d 100644
--- a/juk/coverinfo.cpp
+++ b/juk/coverinfo.cpp
@@ -230,7 +230,7 @@ TQString CoverInfo::coverLocation(CoverSize size) const
fileName.replace(maskedFileNameChars, "_");
fileName.append(".png");
- TQString dataDir = KGlobal::dirs()->saveLocation("appdata");
+ TQString dataDir = TDEGlobal::dirs()->saveLocation("appdata");
TQString subDir;
switch (size) {
diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp
index 59c488d2..710a465d 100644
--- a/juk/covermanager.cpp
+++ b/juk/covermanager.cpp
@@ -232,7 +232,7 @@ void CoverManagerPrivate::loadCovers()
TQString CoverManagerPrivate::coverLocation() const
{
- return KGlobal::dirs()->saveLocation("appdata") + "coverdb/covers";
+ return TDEGlobal::dirs()->saveLocation("appdata") + "coverdb/covers";
}
// XXX: This could probably use some improvement, I don't like the linear
@@ -396,7 +396,7 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c
// Save it to file first!
TQString ext = TQString("/coverdb/coverID-%1.png").arg(id);
- coverData->path = KGlobal::dirs()->saveLocation("appdata") + ext;
+ coverData->path = TDEGlobal::dirs()->saveLocation("appdata") + ext;
kdDebug() << "Saving pixmap to " << coverData->path << endl;
data()->createDataDir();
diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp
index e780eec0..8912b2fd 100644
--- a/juk/deletedialog.cpp
+++ b/juk/deletedialog.cpp
@@ -36,7 +36,7 @@
DeleteWidget::DeleteWidget(TQWidget *parent, const char *name)
: DeleteDialogBase(parent, name)
{
- KConfigGroup messageGroup(KGlobal::config(), "FileRemover");
+ KConfigGroup messageGroup(TDEGlobal::config(), "FileRemover");
bool deleteInstead = messageGroup.readBoolEntry("deleteInsteadOfTrash", false);
slotShouldDelete(deleteInstead);
@@ -55,12 +55,12 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete)
if(shouldDelete) {
ddDeleteText->setText(i18n("<qt>These items will be <b>permanently "
"deleted</b> from your hard disk.</qt>"));
- ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning",
+ ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning",
KIcon::Desktop, KIcon::SizeLarge));
}
else {
ddDeleteText->setText(i18n("<qt>These items will be moved to the Trash Bin.</qt>"));
- ddWarningIcon->setPixmap(KGlobal::iconLoader()->loadIcon("trashcan_full",
+ ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full",
KIcon::Desktop, KIcon::SizeLarge));
}
}
@@ -101,7 +101,7 @@ void DeleteDialog::setFiles(const TQStringList &files)
void DeleteDialog::accept()
{
- KConfigGroup messageGroup(KGlobal::config(), "FileRemover");
+ KConfigGroup messageGroup(TDEGlobal::config(), "FileRemover");
// Save user's preference
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index 4c83fbd6..b6777840 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -101,7 +101,7 @@ public:
ConfigCategoryReader::ConfigCategoryReader() : CategoryReaderInterface(),
m_currentItem(0)
{
- KConfigGroup config(KGlobal::config(), "FileRenamer");
+ KConfigGroup config(TDEGlobal::config(), "FileRenamer");
TQValueList<int> categoryOrder = config.readIntListEntry("CategoryOrder");
unsigned categoryCount[NumTypes] = { 0 }; // Keep track of each category encountered.
@@ -260,7 +260,7 @@ FileRenamerWidget::FileRenamerWidget(TQWidget *parent) :
void FileRenamerWidget::loadConfig()
{
TQValueList<int> checkedSeparators;
- KConfigGroup config(KGlobal::config(), "FileRenamer");
+ KConfigGroup config(TDEGlobal::config(), "FileRenamer");
for(unsigned i = 0; i < m_rows.count(); ++i)
m_rows[i].options = TagRenamerOptions(m_rows[i].category);
@@ -282,7 +282,7 @@ void FileRenamerWidget::loadConfig()
void FileRenamerWidget::saveConfig()
{
- KConfigGroup config(KGlobal::config(), "FileRenamer");
+ KConfigGroup config(TDEGlobal::config(), "FileRenamer");
TQValueList<int> checkedSeparators;
TQValueList<int> categoryOrder;
@@ -470,7 +470,7 @@ void FileRenamerWidget::addFolderSeparatorCheckbox()
void FileRenamerWidget::createTagRows()
{
- KConfigGroup config(KGlobal::config(), "FileRenamer");
+ KConfigGroup config(TDEGlobal::config(), "FileRenamer");
TQValueList<int> categoryOrder = config.readIntListEntry("CategoryOrder");
if(categoryOrder.isEmpty())
diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp
index 12bffe35..2b431cc8 100644
--- a/juk/gstreamerplayer.cpp
+++ b/juk/gstreamerplayer.cpp
@@ -141,7 +141,7 @@ void GStreamerPlayer::seekPosition(int position)
void GStreamerPlayer::readConfig()
{
- KConfigGroup config(KGlobal::config(), "GStreamerPlayer");
+ KConfigGroup config(TDEGlobal::config(), "GStreamerPlayer");
m_sinkName = config.readEntry("SinkName", TQString());
}
diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp
index 204197c0..ead67edc 100644
--- a/juk/historyplaylist.cpp
+++ b/juk/historyplaylist.cpp
@@ -94,14 +94,14 @@ HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *par
PlaylistItem(item, parent, after),
m_dateTime(TQDateTime::currentDateTime())
{
- setText(0, KGlobal::locale()->formatDateTime(m_dateTime));
+ setText(0, TDEGlobal::locale()->formatDateTime(m_dateTime));
}
HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent) :
PlaylistItem(item, parent),
m_dateTime(TQDateTime::currentDateTime())
{
- setText(0, KGlobal::locale()->formatDateTime(m_dateTime));
+ setText(0, TDEGlobal::locale()->formatDateTime(m_dateTime));
}
HistoryPlaylistItem::~HistoryPlaylistItem()
@@ -112,7 +112,7 @@ HistoryPlaylistItem::~HistoryPlaylistItem()
void HistoryPlaylistItem::setDateTime(const TQDateTime &dt)
{
m_dateTime = dt;
- setText(0, KGlobal::locale()->formatDateTime(m_dateTime));
+ setText(0, TDEGlobal::locale()->formatDateTime(m_dateTime));
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/juk/juk.cpp b/juk/juk.cpp
index 5c2e6db5..60d69eae 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -224,7 +224,7 @@ void JuK::setupSystemTray()
void JuK::setupGlobalAccels()
{
- m_accel = new KGlobalAccel(TQT_TQOBJECT(this));
+ m_accel = new TDEGlobalAccel(TQT_TQOBJECT(this));
KeyDialog::insert(m_accel, "Play", i18n("Play"), action("play"), TQT_SLOT(activate()));
KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), TQT_SLOT(activate()));
@@ -257,7 +257,7 @@ void JuK::slotProcessArgs()
void JuK::createDirs()
{
- TQDir dir(KGlobal::dirs()->saveLocation("data", kapp->instanceName() + '/'));
+ TQDir dir(TDEGlobal::dirs()->saveLocation("data", kapp->instanceName() + '/'));
if (!dir.exists("covers", false))
dir.mkdir("covers", false);
dir.cd("covers");
@@ -278,7 +278,7 @@ void JuK::keyPressEvent(TQKeyEvent *e)
void JuK::readSettings()
{
- KConfigGroup config(KGlobal::config(), "Settings");
+ KConfigGroup config(TDEGlobal::config(), "Settings");
m_showSplash = config.readBoolEntry("ShowSplashScreen", true);
m_startDocked = config.readBoolEntry("StartDocked", false);
}
@@ -287,7 +287,7 @@ void JuK::readConfig()
{
// player settings
- KConfigGroup playerConfig(KGlobal::config(), "Player");
+ KConfigGroup playerConfig(TDEGlobal::config(), "Player");
if(m_sliderAction->volumeSlider()) {
int maxVolume = m_sliderAction->volumeSlider()->maxValue();
@@ -310,7 +310,7 @@ void JuK::readConfig()
// general settings
- KConfigGroup settingsConfig(KGlobal::config(), "Settings");
+ KConfigGroup settingsConfig(TDEGlobal::config(), "Settings");
bool dockInSystemTray = settingsConfig.readBoolEntry("DockInSystemTray", true);
m_toggleSystemTrayAction->setChecked(dockInSystemTray);
@@ -331,7 +331,7 @@ void JuK::saveConfig()
{
// player settings
- KConfigGroup playerConfig(KGlobal::config(), "Player");
+ KConfigGroup playerConfig(TDEGlobal::config(), "Player");
if (m_sliderAction->volumeSlider())
{
@@ -353,7 +353,7 @@ void JuK::saveConfig()
// general settings
- KConfigGroup settingsConfig(KGlobal::config(), "Settings");
+ KConfigGroup settingsConfig(TDEGlobal::config(), "Settings");
settingsConfig.writeEntry("ShowSplashScreen", m_toggleSplashAction->isChecked());
settingsConfig.writeEntry("StartDocked", m_startDocked);
settingsConfig.writeEntry("DockInSystemTray", m_toggleSystemTrayAction->isChecked());
@@ -362,7 +362,7 @@ void JuK::saveConfig()
if(m_outputSelectAction)
settingsConfig.writeEntry("MediaSystem", m_outputSelectAction->currentItem());
- KGlobal::config()->sync();
+ TDEGlobal::config()->sync();
}
bool JuK::queryExit()
diff --git a/juk/juk.h b/juk/juk.h
index 597e639e..de51350f 100644
--- a/juk/juk.h
+++ b/juk/juk.h
@@ -26,7 +26,7 @@ class TQListViewItem;
class KToggleAction;
class KSelectAction;
class KToolBarPopupAction;
-class KGlobalAccel;
+class TDEGlobalAccel;
class SliderAction;
class StatusLabel;
@@ -91,7 +91,7 @@ private:
KSelectAction *m_outputSelectAction;
PlayerManager *m_player;
- KGlobalAccel *m_accel;
+ TDEGlobalAccel *m_accel;
bool m_startDocked;
bool m_showSplash;
diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp
index ab480268..91164c93 100644
--- a/juk/k3bexporter.cpp
+++ b/juk/k3bexporter.cpp
@@ -164,7 +164,7 @@ void K3bExporter::exportViaCmdLine(const PlaylistItemList &items)
return;
}
- KProcess *process = new KProcess;
+ TDEProcess *process = new TDEProcess;
*process << "k3b";
*process << cmdOption;
@@ -173,7 +173,7 @@ void K3bExporter::exportViaCmdLine(const PlaylistItemList &items)
for(it = items.begin(); it != items.end(); ++it)
*process << (*it)->file().absFilePath();
- if(!process->start(KProcess::DontCare))
+ if(!process->start(TDEProcess::DontCare))
KMessageBox::error(m_parent, i18n("Unable to start K3b."));
}
diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp
index 80e7c1bd..be469a6c 100644
--- a/juk/keydialog.cpp
+++ b/juk/keydialog.cpp
@@ -74,7 +74,7 @@ const KeyDialog::KeyInfo KeyDialog::keyInfo[] = {
const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]);
-KeyDialog::KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection,
+KeyDialog::KeyDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection,
TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok)
{
@@ -82,7 +82,7 @@ KeyDialog::KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection,
int selectedButton;
- KConfigGroup config(KGlobal::config(), "Shortcuts");
+ KConfigGroup config(TDEGlobal::config(), "Shortcuts");
selectedButton = config.readNumEntry("GlobalKeys", StandardKeys);
// Create widgets for key chooser - widget stack used to replace key chooser
@@ -114,7 +114,7 @@ KeyDialog::~KeyDialog()
}
-void KeyDialog::newDialog(KGlobalAccel *keys, KActionCollection *actionCollection,
+void KeyDialog::newDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection,
int selectedButton)
{
m_keys = keys;
@@ -137,9 +137,9 @@ int KeyDialog::configure()
int retcode = exec();
if(retcode == Accepted) {
- KConfigGroup config(KGlobal::config(), "Shortcuts");
+ KConfigGroup config(TDEGlobal::config(), "Shortcuts");
config.writeEntry("GlobalKeys", m_group->id(m_group->selected()));
- KGlobal::config()->sync();
+ TDEGlobal::config()->sync();
m_pKeyChooser->save();
}
@@ -148,7 +148,7 @@ int KeyDialog::configure()
void KeyDialog::slotKeys(int group)
{
- bool fourModKeys = KGlobalAccel::useFourModifierKeys();
+ bool fourModKeys = TDEGlobalAccel::useFourModifierKeys();
// Set modifier keys according to key group and modifier keys
@@ -171,7 +171,7 @@ void KeyDialog::slotDefault()
m_pKeyChooser->allDefault();
}
-int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection,
+int KeyDialog::configure(TDEGlobalAccel *keys, KActionCollection *actionCollection,
TQWidget *parent)
{
// Create and show dialog - update connections if accepted
@@ -183,7 +183,7 @@ int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection
return retcode;
}
-void KeyDialog::insert(KGlobalAccel *keys, const TQString &action, const TQString &label,
+void KeyDialog::insert(TDEGlobalAccel *keys, const TQString &action, const TQString &label,
const TQObject *objSlot, const char *methodSlot)
{
KShortcut def3 = KShortcut::null();
diff --git a/juk/keydialog.h b/juk/keydialog.h
index 87979302..09c4853a 100644
--- a/juk/keydialog.h
+++ b/juk/keydialog.h
@@ -32,7 +32,7 @@ public:
/**
* Constructs a KeyDialog called @p name as a child of @p parent.
*/
- KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0, const char* name = 0);
+ KeyDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0, const char* name = 0);
/**
* Destructor. Deletes all resources used by a KeyDialog object.
@@ -44,13 +44,13 @@ public:
* accelerators and actions. It behaves essentially like the functions
* in KKeyDialog.
*/
- static int configure(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0);
+ static int configure(TDEGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0);
/**
* This is a member function, provided to create a global accelerator with
- * standard keys. It behaves like the function in KGlobalAccel.
+ * standard keys. It behaves like the function in TDEGlobalAccel.
*/
- static void insert(KGlobalAccel *keys, const TQString &action, const TQString &label,
+ static void insert(TDEGlobalAccel *keys, const TQString &action, const TQString &label,
const TQObject *objSlot, const char *methodSlot);
private:
@@ -65,7 +65,7 @@ private:
KShortcut shortcut[3][2];
};
- void newDialog(KGlobalAccel *keys, KActionCollection *actionCollection, int selectedButton = 0);
+ void newDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection, int selectedButton = 0);
int configure();
private slots:
@@ -74,7 +74,7 @@ private slots:
private:
KActionCollection *m_actionCollection;
- KGlobalAccel *m_keys;
+ TDEGlobalAccel *m_keys;
KKeyChooser *m_pKeyChooser;
TQHButtonGroup *m_group;
TQWidgetStack *m_widgetStack;
diff --git a/juk/main.cpp b/juk/main.cpp
index 99f3ca61..24982a70 100644
--- a/juk/main.cpp
+++ b/juk/main.cpp
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
bool startDocked;
- KConfigGroup config(KGlobal::config(), "Settings");
+ KConfigGroup config(TDEGlobal::config(), "Settings");
startDocked = config.readBoolEntry("StartDocked", false);
if(!startDocked)
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<int> m_columnOrder;
TQValueVector<bool> 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<KToggleAction>("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<int> 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);
}
diff --git a/juk/playlist.h b/juk/playlist.h
index 80b10ef8..6016a3cb 100644
--- a/juk/playlist.h
+++ b/juk/playlist.h
@@ -636,7 +636,7 @@ private slots:
* magic of the SharedSettings class will apply it to the other playlists as
* well.
*/
- void slotInlineCompletionModeChanged(KGlobalSettings::Completion mode);
+ void slotInlineCompletionModeChanged(TDEGlobalSettings::Completion mode);
void slotPlayCurrent();
diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp
index f3701edb..17528917 100644
--- a/juk/playlistbox.cpp
+++ b/juk/playlistbox.cpp
@@ -256,15 +256,15 @@ void PlaylistBox::removePlaylist(Playlist *playlist)
void PlaylistBox::readConfig()
{
- KConfigGroup config(KGlobal::config(), "PlaylistBox");
+ KConfigGroup config(TDEGlobal::config(), "PlaylistBox");
m_viewModeIndex = config.readNumEntry("ViewMode", 0);
}
void PlaylistBox::saveConfig()
{
- KConfigGroup config(KGlobal::config(), "PlaylistBox");
+ KConfigGroup config(TDEGlobal::config(), "PlaylistBox");
config.writeEntry("ViewMode", action<KSelectAction>("viewModeMenu")->currentItem());
- KGlobal::config()->sync();
+ TDEGlobal::config()->sync();
}
void PlaylistBox::remove()
@@ -672,7 +672,7 @@ void PlaylistBox::setupItem(Item *item)
void PlaylistBox::setupUpcomingPlaylist()
{
- KConfigGroup config(KGlobal::config(), "Playlists");
+ KConfigGroup config(TDEGlobal::config(), "Playlists");
bool enable = config.readBoolEntry("showUpcoming", false);
setUpcomingPlaylistEnabled(enable);
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index 0b0a5c50..b070b8a6 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -811,7 +811,7 @@ void PlaylistCollection::newItems(const KFileItemList &list) const
void PlaylistCollection::readConfig()
{
- KConfigGroup config(KGlobal::config(), "Playlists");
+ KConfigGroup config(TDEGlobal::config(), "Playlists");
m_importPlaylists = config.readBoolEntry("ImportPlaylists", true);
m_folderList = config.readPathListEntry("DirectoryList");
@@ -822,7 +822,7 @@ void PlaylistCollection::readConfig()
void PlaylistCollection::saveConfig()
{
- KConfigGroup config(KGlobal::config(), "Playlists");
+ KConfigGroup config(TDEGlobal::config(), "Playlists");
config.writeEntry("ImportPlaylists", m_importPlaylists);
config.writeEntry("showUpcoming", action<KToggleAction>("showUpcoming")->isChecked());
config.writePathEntry("DirectoryList", m_folderList);
diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp
index d79b8d1b..feac5c24 100644
--- a/juk/playlistsplitter.cpp
+++ b/juk/playlistsplitter.cpp
@@ -188,7 +188,7 @@ void PlaylistSplitter::setupLayout()
void PlaylistSplitter::readConfig()
{
- KConfigGroup config(KGlobal::config(), "Splitter");
+ KConfigGroup config(TDEGlobal::config(), "Splitter");
TQValueList<int> splitterSizes = config.readIntListEntry("PlaylistSplitterSizes");
if(splitterSizes.isEmpty()) {
@@ -204,7 +204,7 @@ void PlaylistSplitter::readConfig()
void PlaylistSplitter::saveConfig()
{
- KConfigGroup config(KGlobal::config(), "Splitter");
+ KConfigGroup config(TDEGlobal::config(), "Splitter");
config.writeEntry("PlaylistSplitterSizes", sizes());
config.writeEntry("ShowSearch", action<KToggleAction>("showSearch")->isChecked());
}
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index b9a3fd0c..e7c2a90e 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -417,7 +417,7 @@ bool SystemTray::buttonsToLeft() const
NETRect frame, win;
ni.kdeGeometry(frame, win);
- TQRect bounds = KGlobalSettings::desktopGeometry(TQPoint(win.pos.x, win.pos.y));
+ TQRect bounds = TDEGlobalSettings::desktopGeometry(TQPoint(win.pos.x, win.pos.y));
// This seems to accurately guess what side of the icon that
// KPassivePopup will popup on.
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index cabdd462..323274d8 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -422,7 +422,7 @@ void TagEditor::readConfig()
{
// combo box completion modes
- KConfigGroup config(KGlobal::config(), "TagEditor");
+ KConfigGroup config(TDEGlobal::config(), "TagEditor");
if(m_artistNameBox && m_albumNameBox) {
readCompletionMode(&config, m_artistNameBox, "ArtistNameBoxMode");
readCompletionMode(&config, m_albumNameBox, "AlbumNameBoxMode");
@@ -447,8 +447,8 @@ void TagEditor::readConfig()
void TagEditor::readCompletionMode(KConfigBase *config, KComboBox *box, const TQString &key)
{
- KGlobalSettings::Completion mode =
- KGlobalSettings::Completion(config->readNumEntry(key, KGlobalSettings::CompletionAuto));
+ TDEGlobalSettings::Completion mode =
+ TDEGlobalSettings::Completion(config->readNumEntry(key, TDEGlobalSettings::CompletionAuto));
box->setCompletionMode(mode);
}
@@ -457,7 +457,7 @@ void TagEditor::saveConfig()
{
// combo box completion modes
- KConfigGroup config(KGlobal::config(), "TagEditor");
+ KConfigGroup config(TDEGlobal::config(), "TagEditor");
if(m_artistNameBox && m_albumNameBox) {
config.writeEntry("ArtistNameBoxMode", m_artistNameBox->completionMode());
@@ -498,14 +498,14 @@ void TagEditor::setupLayout()
{ // just for organization
m_artistNameBox = new KComboBox(true, this, "artistNameBox");
- m_artistNameBox->setCompletionMode(KGlobalSettings::CompletionAuto);
+ m_artistNameBox->setCompletionMode(TDEGlobalSettings::CompletionAuto);
addItem(i18n("&Artist name:"), m_artistNameBox, leftColumnLayout, "personal");
m_trackNameBox = new KLineEdit(this, "trackNameBox");
addItem(i18n("&Track name:"), m_trackNameBox, leftColumnLayout, "player_play");
m_albumNameBox = new KComboBox(true, this, "albumNameBox");
- m_albumNameBox->setCompletionMode(KGlobalSettings::CompletionAuto);
+ m_albumNameBox->setCompletionMode(TDEGlobalSettings::CompletionAuto);
addItem(i18n("Album &name:"), m_albumNameBox, leftColumnLayout, "cdrom_unmount");
m_genreBox = new KComboBox(true, this, "genreBox");
diff --git a/juk/tagguesser.cpp b/juk/tagguesser.cpp
index bc195995..3881d124 100644
--- a/juk/tagguesser.cpp
+++ b/juk/tagguesser.cpp
@@ -93,7 +93,7 @@ TQString FileNameScheme::composeRegExp(const TQString &s) const
{
TQMap<TQChar, TQString> substitutions;
- KConfigGroup config(KGlobal::config(), "TagGuesser");
+ KConfigGroup config(TDEGlobal::config(), "TagGuesser");
substitutions[ 't' ] = config.readEntry("Title regexp", "([\\w\\s'&_,\\.]+)");
substitutions[ 'a' ] = config.readEntry("Artist regexp", "([\\w\\s'&_,\\.]+)");
@@ -113,7 +113,7 @@ TQStringList TagGuesser::schemeStrings()
{
TQStringList schemes;
- KConfigGroup config(KGlobal::config(), "TagGuesser");
+ KConfigGroup config(TDEGlobal::config(), "TagGuesser");
schemes = config.readListEntry("Filename schemes");
if ( schemes.isEmpty() ) {
diff --git a/juk/tagrenameroptions.cpp b/juk/tagrenameroptions.cpp
index c25f3dd1..5003d616 100644
--- a/juk/tagrenameroptions.cpp
+++ b/juk/tagrenameroptions.cpp
@@ -64,7 +64,7 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category)
// Make sure we don't use translated strings for the config file keys.
TQString typeKey = tagTypeText(category.category, false);
- KConfigGroup config(KGlobal::config(), "FileRenamer");
+ KConfigGroup config(TDEGlobal::config(), "FileRenamer");
if(categoryNum > 0)
typeKey.append(TQString::number(categoryNum));
@@ -115,7 +115,7 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const
if(categoryNum > 0)
typeKey.append(TQString::number(categoryNum));
- KConfigGroup config(KGlobal::config(), "FileRenamer");
+ KConfigGroup config(TDEGlobal::config(), "FileRenamer");
config.writeEntry(TQString("%1Suffix").arg(typeKey), suffix());
config.writeEntry(TQString("%1Prefix").arg(typeKey), prefix());
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 21:03:35 +0000