diff options
96 files changed, 301 insertions, 301 deletions
diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index 97ea35a6..11a94ae0 100644 --- a/arts/gui/kde/kvolumefader_impl.cpp +++ b/arts/gui/kde/kvolumefader_impl.cpp @@ -184,8 +184,8 @@ void KVolumeFader_Widget::mousePressEvent( TQMouseEvent* ){ void KVolumeFader_Widget::mouseReleaseEvent( TQMouseEvent* qme ){ bool setValue = false; - if ( KGlobalSettings::mouseSettings().handed == 0 && qme->button() == Qt::LeftButton ) setValue=true; - if ( KGlobalSettings::mouseSettings().handed == 1 && qme->button() == Qt::RightButton ) setValue=true; + if ( TDEGlobalSettings::mouseSettings().handed == 0 && qme->button() == Qt::LeftButton ) setValue=true; + if ( TDEGlobalSettings::mouseSettings().handed == 1 && qme->button() == Qt::RightButton ) setValue=true; if ( setValue ) { switch ( _dir ) { diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc index 0f4db5e8..6f4e0e48 100644 --- a/arts/modules/common/env_mixeritem_impl.cc +++ b/arts/modules/common/env_mixeritem_impl.cc @@ -272,7 +272,7 @@ public: } Widget initialize(MixerItem item) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); VBox vbox; vbox._addChild(self(),"the_gui_updating_widget"); @@ -301,7 +301,7 @@ class MixerGuiFactory_impl : virtual public MixerGuiFactory_skel public: Widget createGui(Object object) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); std::string iface = object._interfaceName(); diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cc index 56ca6037..148f1a0d 100644 --- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc +++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cc @@ -102,7 +102,7 @@ class FiveBandMonoComplexEQGuiFactory_impl : virtual public FiveBandMonoComplexE public: Arts::Widget createGui( Arts::Object object ) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail( !object.isNull(), Arts::Widget::null() ); FiveBandMonoComplexEQ ch = DynamicCast( object ); diff --git a/arts/modules/effects/freeverbguifactory_impl.cc b/arts/modules/effects/freeverbguifactory_impl.cc index 7af1f471..c15a5bfd 100644 --- a/arts/modules/effects/freeverbguifactory_impl.cc +++ b/arts/modules/effects/freeverbguifactory_impl.cc @@ -44,7 +44,7 @@ REGISTER_IMPLEMENTATION(FreeverbGuiFactory_impl); Widget FreeverbGuiFactory_impl::createGui(Object object) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); Synth_FREEVERB freeverb = DynamicCast(object); diff --git a/arts/modules/effects/monostereoconversion_impl.cc b/arts/modules/effects/monostereoconversion_impl.cc index 49643eed..deee99fd 100644 --- a/arts/modules/effects/monostereoconversion_impl.cc +++ b/arts/modules/effects/monostereoconversion_impl.cc @@ -139,7 +139,7 @@ class StereoBalanceGuiFactory_impl : virtual public StereoBalanceGuiFactory_skel public: Widget createGui( Object object ) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail( !object.isNull(), Arts::Widget::null() ); StereoBalance ch= DynamicCast( object ); diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cc index e5a985fc..3c05ab9f 100644 --- a/arts/modules/effects/stereocompressorguifactory_impl.cc +++ b/arts/modules/effects/stereocompressorguifactory_impl.cc @@ -33,7 +33,7 @@ class StereoCompressorGuiFactory_impl : virtual public StereoCompressorGuiFactor public: Widget createGui( Object object ) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null() ); diff --git a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc index ece106c2..364375c2 100644 --- a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc +++ b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc @@ -176,7 +176,7 @@ REGISTER_IMPLEMENTATION(StereoFirEqualizerGuiFactory_impl); Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); Synth_STEREO_FIR_EQUALIZER equalizer = DynamicCast(object); diff --git a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc index d97f1aa4..64b48ad7 100644 --- a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc +++ b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc @@ -12,7 +12,7 @@ namespace Arts { public: Widget createGui(Object object) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); MonoSimpleMixerChannel ch= DynamicCast(object); arts_return_val_if_fail(!ch.isNull(), Arts::Widget::null()); diff --git a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc b/arts/modules/mixers/simplemixerchannelguifactory_impl.cc index 0f585eb1..370865bf 100644 --- a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc +++ b/arts/modules/mixers/simplemixerchannelguifactory_impl.cc @@ -10,7 +10,7 @@ namespace Arts { public: Widget createGui(Object object) { - KGlobal::locale()->insertCatalogue( "artsmodules" ); + TDEGlobal::locale()->insertCatalogue( "artsmodules" ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); SimpleMixerChannel ch = DynamicCast(object); arts_return_val_if_fail(!ch.isNull(), Arts::Widget::null()); diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp index c483beb0..2a85fc45 100644 --- a/arts/tools/artsactions.cpp +++ b/arts/tools/artsactions.cpp @@ -47,7 +47,7 @@ ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* , _sv( 0 ), _am( 0 ), _asv( 0 ), _mmv( 0 ), _ev( 0 ), _mtv( 0 ) { //kdDebug()<<k_funcinfo<<endl; - KGlobal::locale()->insertCatalogue( "artscontrol" ); + TDEGlobal::locale()->insertCatalogue( "artscontrol" ); if ( !_kartsserver ) _kartsserver = new KArtsServer( this ); } diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index e086749a..dc495322 100644 --- a/arts/tools/artscontrolapplet.cpp +++ b/arts/tools/artscontrolapplet.cpp @@ -31,7 +31,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { - KGlobal::locale()->insertCatalogue("artscontrol"); + TDEGlobal::locale()->insertCatalogue("artscontrol"); return new ArtsControlApplet(configFile, KPanelApplet::Normal, KPanelApplet::About /*| KPanelApplet::Help | KPanelApplet::Preferences*/, parent, "artscontrolapplet"); 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() @@ -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()); diff --git a/kaboodle/conf.cpp b/kaboodle/conf.cpp index 370946e4..cd524c2b 100644 --- a/kaboodle/conf.cpp +++ b/kaboodle/conf.cpp @@ -39,7 +39,7 @@ Kaboodle::Conf::Conf(TQWidget *_parent, const char *_name) autoPlay = new TQCheckBox(i18n("Start playing automatically"), box); quitAfterPlaying = new TQCheckBox(i18n("Quit when finished playing"), box); - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup("core"); autoPlay->setChecked(config.readBoolEntry("autoPlay", true)); quitAfterPlaying->setChecked(config.readBoolEntry("quitAfterPlaying", true)); @@ -47,7 +47,7 @@ Kaboodle::Conf::Conf(TQWidget *_parent, const char *_name) void Kaboodle::Conf::accept(void) { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup("core"); config.writeEntry("autoPlay", autoPlay->isChecked()); config.writeEntry("quitAfterPlaying", quitAfterPlaying->isChecked()); diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp index 10f7e56e..aa82479b 100644 --- a/kaboodle/userinterface.cpp +++ b/kaboodle/userinterface.cpp @@ -78,7 +78,7 @@ Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile setIcon(SmallIcon("kaboodle")); resize(320, minimumHeight()); - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); menubarAction->setChecked(!menuBar()->isHidden()); applySettings(); @@ -104,7 +104,7 @@ void Kaboodle::UserInterface::slotConfigureKeys() Kaboodle::UserInterface::~UserInterface(void) { - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); } void Kaboodle::UserInterface::fileOpen(void) @@ -143,7 +143,7 @@ void Kaboodle::UserInterface::playerPreferences(void) void Kaboodle::UserInterface::applySettings(void) { View *view = static_cast<View *>(part->view()); - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup("core"); view->setAutoPlay(config.readBoolEntry("autoPlay", true)); view->setQuitAfterPlaying(config.readBoolEntry("quitAfterPlaying", true)); diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp index cd4b93ea..dfad467f 100644 --- a/kaudiocreator/encoder.cpp +++ b/kaudiocreator/encoder.cpp @@ -212,11 +212,11 @@ void Encoder::tendToNewJobs() { proc->setPriority(Prefs::niceLevel()); *proc << TQFile::encodeName(command).data(); - connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )), - this, TQT_SLOT(receivedThreadOutput(KProcess *, char *, int ))); - connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int )), - this, TQT_SLOT(receivedThreadOutput(KProcess *, char *, int ))); - connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(jobDone(KProcess *))); + connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQT_SLOT(receivedThreadOutput(TDEProcess *, char *, int ))); + connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )), + this, TQT_SLOT(receivedThreadOutput(TDEProcess *, char *, int ))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(jobDone(TDEProcess *))); jobs.insert(proc, job); threads.append(proc); @@ -230,7 +230,7 @@ void Encoder::tendToNewJobs() { * @param buffer the output from the process * @param buflen the length of the buffer. */ -void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length ) { +void Encoder::receivedThreadOutput(TDEProcess *process, char *buffer, int length ) { if ( Prefs::fullDecoderDebug() && buffer) kdDebug(60002) << buffer << endl; @@ -271,7 +271,7 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length ) * When the process is done encoding a file this function is called. * @param job the job that just finished. */ -void Encoder::jobDone(KProcess *process ) { +void Encoder::jobDone(TDEProcess *process ) { // Normal error checking here. if ( !process) return; diff --git a/kaudiocreator/encoder.h b/kaudiocreator/encoder.h index 243276e6..b891e0b5 100644 --- a/kaudiocreator/encoder.h +++ b/kaudiocreator/encoder.h @@ -53,8 +53,8 @@ public slots: EncoderPrefs* loadEncoder( int encoder ); private slots: - void receivedThreadOutput(KProcess *process, char *buffer, int buflen); - void jobDone(KProcess *process); + void receivedThreadOutput(TDEProcess *process, char *buffer, int buflen); + void jobDone(TDEProcess *process); void tendToNewJobs(); private: diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp index e49dd6a9..96c7810f 100644 --- a/kaudiocreator/encoderconfigimp.cpp +++ b/kaudiocreator/encoderconfigimp.cpp @@ -186,7 +186,7 @@ void EncoderConfigImp::configureEncoderSlot() { return; } TQString groupName = encoderNames[kcfg_currentEncoder->currentText()]; - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); if(!config.hasGroup(groupName)) return; @@ -272,13 +272,13 @@ EncoderPrefs *EncoderPrefs::prefs(const TQString &groupName) bool EncoderPrefs::hasPrefs(const TQString &groupName) { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); return config.hasGroup(groupName); } void EncoderPrefs::deletePrefs(const TQString &groupName) { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.deleteGroup(groupName); if (!m_prefs) return; diff --git a/kaudiocreator/main.cpp b/kaudiocreator/main.cpp index 8bd6c94b..2f5ebb54 100644 --- a/kaudiocreator/main.cpp +++ b/kaudiocreator/main.cpp @@ -43,7 +43,7 @@ int main(int argc, char *argv[]){ KAudioCreator *app = new KAudioCreator(0, "MainWindow"); // we need some strings from libkcddb for the cddb album dialog - KGlobal::locale()->insertCatalogue("libkcddb"); + TDEGlobal::locale()->insertCatalogue("libkcddb"); a.setMainWidget(app); diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h index ac7ddb7e..3cc2a09e 100644 --- a/kaudiocreator/tracksimp.h +++ b/kaudiocreator/tracksimp.h @@ -38,7 +38,7 @@ using namespace KCDDB; class Job; -class KProcess; +class TDEProcess; class KCompactDisc; class TracksItem : public KListViewItem diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.cpp b/kioslave/audiocd/plugins/lame/collectingprocess.cpp index ae121db4..4eaf5304 100644 --- a/kioslave/audiocd/plugins/lame/collectingprocess.cpp +++ b/kioslave/audiocd/plugins/lame/collectingprocess.cpp @@ -48,7 +48,7 @@ struct CollectingProcess::Private { CollectingProcess::CollectingProcess( TQObject * parent, const char * name ) - : KProcess( parent, name ) + : TDEProcess( parent, name ) { d = new Private(); } @@ -59,23 +59,23 @@ CollectingProcess::~CollectingProcess() { bool CollectingProcess::start( RunMode runmode, Communication comm ) { // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) ); + disconnect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); if ( comm & Stdout ) { - connect( this, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) ); + connect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); } // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) ); + disconnect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); if ( comm & Stderr ) { - connect( this, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) ); + connect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); } - return KProcess::start( runmode, comm ); + return TDEProcess::start( runmode, comm ); } -void CollectingProcess::slotReceivedStdout( KProcess *, char *buf, int len ) +void CollectingProcess::slotReceivedStdout( TDEProcess *, char *buf, int len ) { TQByteArray b; b.duplicate( buf, len ); @@ -83,7 +83,7 @@ void CollectingProcess::slotReceivedStdout( KProcess *, char *buf, int len ) d->stdoutSize += len; } -void CollectingProcess::slotReceivedStderr( KProcess *, char *buf, int len ) +void CollectingProcess::slotReceivedStderr( TDEProcess *, char *buf, int len ) { TQByteArray b; b.duplicate( buf, len ); diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.h b/kioslave/audiocd/plugins/lame/collectingprocess.h index a98c4b47..df5c180d 100644 --- a/kioslave/audiocd/plugins/lame/collectingprocess.h +++ b/kioslave/audiocd/plugins/lame/collectingprocess.h @@ -36,14 +36,14 @@ #include <kprocess.h> /** - * @short An output collecting KProcess class. + * @short An output collecting TDEProcess class. * - * This class simplifies the usage of KProcess by collecting all output + * This class simplifies the usage of TDEProcess by collecting all output * (stdout/stderr) of the process. * * @author Ingo Kloecker <kloecker@kde.org> */ -class CollectingProcess : public KProcess { +class CollectingProcess : public TDEProcess { Q_OBJECT public: @@ -61,8 +61,8 @@ public: TQByteArray collectedStderr(); private slots: - void slotReceivedStdout( KProcess *, char *, int ); - void slotReceivedStderr( KProcess *, char *, int ); + void slotReceivedStdout( TDEProcess *, char *, int ); + void slotReceivedStderr( TDEProcess *, char *, int ); private: class Private; diff --git a/kioslave/audiocd/plugins/lame/encoderlame.cpp b/kioslave/audiocd/plugins/lame/encoderlame.cpp index 1b8568a2..6e3d3ff3 100644 --- a/kioslave/audiocd/plugins/lame/encoderlame.cpp +++ b/kioslave/audiocd/plugins/lame/encoderlame.cpp @@ -53,7 +53,7 @@ public: TQString lastErrorMessage; TQStringList genreList; uint lastSize; - KProcess *currentEncodeProcess; + TDEProcess *currentEncodeProcess; KTempFile *tempFile; }; @@ -71,7 +71,7 @@ EncoderLame::~EncoderLame(){ TQWidget* EncoderLame::getConfigureWidget(KConfigSkeleton** manager) const { (*manager) = Settings::self(); - KGlobal::locale()->insertCatalogue("audiocd_encoder_lame"); + TDEGlobal::locale()->insertCatalogue("audiocd_encoder_lame"); EncoderLameConfig *config = new EncoderLameConfig(); config->cbr_settings->hide(); return config; @@ -86,7 +86,7 @@ bool EncoderLame::init(){ // e.g. lame --tg 'Vocal Jazz' CollectingProcess proc; proc << "lame" << "--genre-list"; - proc.start(KProcess::Block, KProcess::Stdout); + proc.start(TDEProcess::Block, TDEProcess::Stdout); if(proc.exitStatus() != 0) return false; @@ -210,8 +210,8 @@ unsigned long EncoderLame::size(long time_secs) const { } long EncoderLame::readInit(long /*size*/){ - // Create KProcess - d->currentEncodeProcess = new KProcess(0); + // Create TDEProcess + d->currentEncodeProcess = new TDEProcess(0); TQString prefix = locateLocal("tmp", ""); d->tempFile = new KTempFile(prefix, ".mp3"); d->tempFile->setAutoDelete(true); @@ -237,38 +237,38 @@ long EncoderLame::readInit(long /*size*/){ //kdDebug(7117) << d->currentEncodeProcess->args() << endl; - connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(receivedStdout(KProcess *, char *, int))); - connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(receivedStderr(KProcess *, char *, int))); - connect(d->currentEncodeProcess, TQT_SIGNAL(wroteStdin(KProcess *)), - this, TQT_SLOT(wroteStdin(KProcess *))); + connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(receivedStdout(TDEProcess *, char *, int))); + connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); + connect(d->currentEncodeProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)), + this, TQT_SLOT(wroteStdin(TDEProcess *))); - connect(d->currentEncodeProcess, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(processExited(KProcess *))); + connect(d->currentEncodeProcess, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(processExited(TDEProcess *))); // Launch! - d->currentEncodeProcess->start(KProcess::NotifyOnExit, KShellProcess::All); + d->currentEncodeProcess->start(TDEProcess::NotifyOnExit, KShellProcess::All); return 0; } -void EncoderLame::processExited ( KProcess *process ){ +void EncoderLame::processExited ( TDEProcess *process ){ kdDebug(7117) << "Lame Encoding process exited with: " << process->exitStatus() << endl; d->processHasExited = true; } -void EncoderLame::receivedStderr( KProcess * /*process*/, char *buffer, int /*buflen*/ ){ +void EncoderLame::receivedStderr( TDEProcess * /*process*/, char *buffer, int /*buflen*/ ){ kdDebug(7117) << "Lame stderr: " << buffer << endl; if ( !d->lastErrorMessage.isEmpty() ) d->lastErrorMessage += '\t'; d->lastErrorMessage += TQString::fromLocal8Bit( buffer ); } -void EncoderLame::receivedStdout( KProcess * /*process*/, char *buffer, int /*length*/ ){ +void EncoderLame::receivedStdout( TDEProcess * /*process*/, char *buffer, int /*length*/ ){ kdDebug(7117) << "Lame stdout: " << buffer << endl; } -void EncoderLame::wroteStdin( KProcess * /*procces*/ ){ +void EncoderLame::wroteStdin( TDEProcess * /*procces*/ ){ d->waitingForWrite = false; } diff --git a/kioslave/audiocd/plugins/lame/encoderlame.h b/kioslave/audiocd/plugins/lame/encoderlame.h index c7c26ea4..5ef7d761 100644 --- a/kioslave/audiocd/plugins/lame/encoderlame.h +++ b/kioslave/audiocd/plugins/lame/encoderlame.h @@ -21,7 +21,7 @@ #include "audiocdencoder.h" -class KProcess; +class TDEProcess; /** * MP3 encoder using the LAME encoder. @@ -51,10 +51,10 @@ public: virtual TQWidget* getConfigureWidget(KConfigSkeleton** manager) const; protected slots: - void wroteStdin(KProcess *proc); - void receivedStdout(KProcess *, char *buffer, int length); - void receivedStderr(KProcess *proc, char *buffer, int buflen); - void processExited(KProcess *proc); + void wroteStdin(TDEProcess *proc); + void receivedStdout(TDEProcess *, char *buffer, int length); + void receivedStderr(TDEProcess *proc, char *buffer, int buflen); + void processExited(TDEProcess *proc); private: class Private; diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp index 5c88f844..1aacbc24 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp +++ b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp @@ -81,7 +81,7 @@ EncoderVorbis::~EncoderVorbis(){ TQWidget* EncoderVorbis::getConfigureWidget(KConfigSkeleton** manager) const { (*manager) = Settings::self(); - KGlobal::locale()->insertCatalogue("audiocd_encoder_vorbis"); + TDEGlobal::locale()->insertCatalogue("audiocd_encoder_vorbis"); EncoderVorbisConfig *config = new EncoderVorbisConfig(); config->kcfg_vorbis_quality->setRange(0.0, 10.0, 0.2, true); config->vorbis_bitrate_settings->hide(); diff --git a/kmid/channel.cpp b/kmid/channel.cpp index 7d077dd7..c8bdb48d 100644 --- a/kmid/channel.cpp +++ b/kmid/channel.cpp @@ -50,7 +50,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent) penW = new TQPen (white); penT = new TQPen (colorGroup().background()); - KConfig *kcfg=KGlobal::instance()->config(); + KConfig *kcfg=TDEGlobal::instance()->config(); kcfg->setGroup("KMid"); TQFont *qtextfontdefault=new TQFont("lucida",18,TQFont::Bold,TRUE); qcvfont=new TQFont(kcfg->readFontEntry("ChannelViewFont",qtextfontdefault)); diff --git a/kmid/kdisptext.cpp b/kmid/kdisptext.cpp index 3eabda50..073c7715 100644 --- a/kmid/kdisptext.cpp +++ b/kmid/kdisptext.cpp @@ -52,14 +52,14 @@ KDisplayText::KDisplayText(TQWidget *parent,const char *name) : TQScrollView(par first_line=NULL; cursor=NULL; nlines=0; - lyrics_codec=KGlobal::locale()->codecForEncoding(); + lyrics_codec=TDEGlobal::locale()->codecForEncoding(); viewport()->setBackgroundColor(TQColor (110,110,110)); // setBackgroundMode(NoBackground); - KConfig *kcfg=KGlobal::instance()->config(); + KConfig *kcfg=TDEGlobal::instance()->config(); kcfg->setGroup("KMid"); typeoftextevents=kcfg->readNumEntry("TypeOfTextEvents",1); - TQFont *qtextfontdefault=new TQFont(KGlobalSettings::fixedFont().family(),22); + TQFont *qtextfontdefault=new TQFont(TDEGlobalSettings::fixedFont().family(),22); qtextfont=new TQFont(kcfg->readFontEntry("KaraokeFont",qtextfontdefault)); delete qtextfontdefault; qfmetr=new TQFontMetrics(*qtextfont); @@ -333,7 +333,7 @@ void KDisplayText::resizeEvent(TQResizeEvent *e) void KDisplayText::CursorToHome(void) { -/* KConfig *kcfg=KGlobal::instance()->config(); +/* KConfig *kcfg=TDEGlobal::instance()->config(); kcfg->setGroup("KMid"); typeoftextevents=kcfg->readNumEntry("TypeOfTextEvents",1); */ @@ -499,7 +499,7 @@ TQFont *KDisplayText::getFont(void) void KDisplayText::fontChanged(void) { - KConfig *kcfg=KGlobal::instance()->config(); + KConfig *kcfg=TDEGlobal::instance()->config(); kcfg->setGroup("KMid"); TQFont *qtextfontdefault=new TQFont(*qtextfont); delete qtextfont; @@ -623,7 +623,7 @@ void KDisplayText::setLyricsEncoding(const TQString &enc) { TQTextCodec *newcodec; if (enc.isEmpty()) - newcodec=KGlobal::locale()->codecForEncoding(); + newcodec=TDEGlobal::locale()->codecForEncoding(); else newcodec=TQTextCodec::codecForName(enc.latin1()); diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp index a83e002f..cc89e36b 100644 --- a/kmid/kmidclient.cpp +++ b/kmid/kmidclient.cpp @@ -79,7 +79,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name noteArray=0L; shuttingdown=false; - KConfig *kconf=KGlobal::instance()->config(); + KConfig *kconf=TDEGlobal::instance()->config(); kconf->setGroup("KMid"); TQString tmp2 = locateLocal("appdata", "collections"); @@ -118,7 +118,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name comboEncodings = new TQComboBox(FALSE, this, "Encodings"); connect (comboEncodings,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSelectEncoding(int))); comboEncodings->insertItem(i18n("Default")); - comboEncodings->insertStringList( KGlobal::charsets()->descriptiveEncodingNames() ); + comboEncodings->insertStringList( TDEGlobal::charsets()->descriptiveEncodingNames() ); comboEncodings->setCurrentItem(0); rhythmview= new RhythmView( this, "RhythmView"); @@ -146,7 +146,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name connect (timer4events,TQT_SIGNAL(timeout()),this,TQT_SLOT(processSpecialEvent())); TQString samplefile = - KGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last(); + TDEGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last(); samplefile.truncate(samplefile.findRev('/')); FMOut::setFMPatchesDirectory(TQFile::encodeName(samplefile)); @@ -390,7 +390,7 @@ int kmidClient::openURL(const TQString _url) { r=openFile(filename_8bit.data()); - KConfig *cfg=KGlobal::instance()->config(); + KConfig *cfg=TDEGlobal::instance()->config(); if (cfg->readBoolEntry("deleteTmpNonLocalFiles",false)) { unlink(filename_8bit.data()); @@ -1208,7 +1208,7 @@ void kmidClient::setSLManager(SLManager *slm) void kmidClient::setActiveCollection(int i) { activecollection=i; - KConfig *kconf=KGlobal::instance()->config(); + KConfig *kconf=TDEGlobal::instance()->config(); kconf->setGroup("KMid"); kconf->writeEntry("ActiveCollection",activecollection); @@ -1601,6 +1601,6 @@ void kmidClient::slotSelectEncoding(int i) if (i == 0) kdispt->setLyricsEncoding(TQString()); // Default else - kdispt->setLyricsEncoding(KGlobal::charsets()->encodingForName(comboEncodings->text(i))); + kdispt->setLyricsEncoding(TDEGlobal::charsets()->encodingForName(comboEncodings->text(i))); } #include "kmidclient.moc" diff --git a/kmid/midicfgdlg.cpp b/kmid/midicfgdlg.cpp index 855de04a..481c4922 100644 --- a/kmid/midicfgdlg.cpp +++ b/kmid/midicfgdlg.cpp @@ -104,7 +104,7 @@ void MidiConfigDialog::deviceselected(int idx) void MidiConfigDialog::browseMap() { - TQString path = KGlobal::dirs()->findAllResources("appdata", "maps/*.map").last(); + TQString path = TDEGlobal::dirs()->findAllResources("appdata", "maps/*.map").last(); path.truncate(path.findRev('/')); KURL url = KFileDialog::getOpenURL(path,"*.map",this); diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index 65c6f560..c20c9443 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -119,7 +119,7 @@ KMixWindow::initActions() (void) new KAction( i18n( "Hardware &Information" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" ); (void) new KAction( i18n( "Hide Mixer Window" ), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" ); - m_globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) ); + m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) ); m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString(), KShortcut(TQString("XF86AudioRaiseVolume")), KShortcut(TQString("XF86AudioRaiseVolume")), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) ); m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(), diff --git a/kmix/kmix.h b/kmix/kmix.h index b116af22..870fcb2e 100644 --- a/kmix/kmix.h +++ b/kmix/kmix.h @@ -38,7 +38,7 @@ class TQWidgetStack; #include <kmainwindow.h> class KAccel; -class KGlobalAccel; +class TDEGlobalAccel; class KComboBox; class KMixerWidget; class KMixerPrefWidget; @@ -92,7 +92,7 @@ KMixWindow : public KMainWindow private: KAccel *m_keyAccel; - KGlobalAccel *m_globalAccel; + TDEGlobalAccel *m_globalAccel; TQPopupMenu *m_fileMenu; TQPopupMenu *m_viewMenu; TQPopupMenu *m_helpMenu; diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp index be672b2c..63b376e7 100644 --- a/kmix/kmixapplet.cpp +++ b/kmix/kmixapplet.cpp @@ -68,7 +68,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("kmix"); + TDEGlobal::locale()->insertCatalogue("kmix"); return new KMixApplet(configFile, KPanelApplet::Normal, parent, "kmixapplet"); } @@ -77,8 +77,8 @@ extern "C" int KMixApplet::s_instCount = 0; //<Mixer> KMixApplet::Mixer::mixers(); -static const TQColor highColor = KGlobalSettings::baseColor(); -static const TQColor lowColor = KGlobalSettings::highlightColor(); +static const TQColor highColor = TDEGlobalSettings::baseColor(); +static const TQColor lowColor = TDEGlobalSettings::highlightColor(); static const TQColor backColor = "#000000"; static const TQColor mutedHighColor = "#FFFFFF"; static const TQColor mutedLowColor = "#808080"; @@ -172,7 +172,7 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t, s_instCount++; kdDebug(67100) << "KMixApplet::KMixApplet instancing Applet, s_instCount="<< s_instCount << endl; - KGlobal::dirs()->addResourceType( "appicon", KStandardDirs::kde_default("data") + "kmix/pics" ); + TDEGlobal::dirs()->addResourceType( "appicon", KStandardDirs::kde_default("data") + "kmix/pics" ); loadConfig(); @@ -521,9 +521,9 @@ void KMixApplet::applyPreferences() void KMixApplet::paletteChange ( const TQPalette &) { if ( ! _customColors ) { // We take over Colors from paletteChange(), if the user has not set custom colors. - // ignore the given TQPalette and use the values from KGlobalSettings instead - _colors.high = KGlobalSettings::highlightColor(); - _colors.low = KGlobalSettings::baseColor(); + // ignore the given TQPalette and use the values from TDEGlobalSettings instead + _colors.high = TDEGlobalSettings::highlightColor(); + _colors.low = TDEGlobalSettings::baseColor(); _colors.back = backColor; setColors( _colors ); } diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp index 60c27c48..8cf04523 100644 --- a/kmix/kmixctrl.cpp +++ b/kmix/kmixctrl.cpp @@ -73,7 +73,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) if ( args->isSet("restore") ) { for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next()) { - mixer->volumeLoad( KGlobal::config() ); + mixer->volumeLoad( TDEGlobal::config() ); } } @@ -81,7 +81,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) if ( args->isSet("save") ) { for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next()) - mixer->volumeSave( KGlobal::config() ); + mixer->volumeSave( TDEGlobal::config() ); } MixerToolBox::deinitMixer(); diff --git a/kmix/kmixtoolbox.cpp b/kmix/kmixtoolbox.cpp index 02292a89..397aa320 100644 --- a/kmix/kmixtoolbox.cpp +++ b/kmix/kmixtoolbox.cpp @@ -142,7 +142,7 @@ void KMixToolBox::loadConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const T } mdw->setDisabled( !config->readBoolEntry("Show", true) ); - KGlobalAccel *keys=mdw->keys(); + TDEGlobalAccel *keys=mdw->keys(); if ( keys ) { TQString devgrpkeys; @@ -200,7 +200,7 @@ void KMixToolBox::saveConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const T If you think about this aspect more deeply, you will find out that this is the case already today with "kmixapplet" and "kmix main application". It would really nice to rework this. */ - KGlobalAccel *keys=mdw->keys(); + TDEGlobalAccel *keys=mdw->keys(); if (keys) { TQString devgrpkeys; devgrpkeys.sprintf( "%s.%s.Dev%i.keys", viewPrefix.ascii(), grp.ascii(), n ); diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp index b1f6569e..08bee03b 100644 --- a/kmix/ksmallslider.cpp +++ b/kmix/ksmallslider.cpp @@ -473,9 +473,9 @@ void KSmallSlider::paletteChange ( const TQPalette &) { setColors(mutedLowColor2, mutedHighColor2, backColor2 ); } else { - // ignore the TQPalette and use the values from KGlobalSettings instead + // ignore the TQPalette and use the values from TDEGlobalSettings instead //const TQColorGroup& qcg = palette().active(); - setColors(KGlobalSettings::baseColor(), KGlobalSettings::highlightColor(), backColor2 ); + setColors(TDEGlobalSettings::baseColor(), TDEGlobalSettings::highlightColor(), backColor2 ); } } */ diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h index 28415133..b25b116b 100644 --- a/kmix/mdwenum.h +++ b/kmix/mdwenum.h @@ -31,7 +31,7 @@ class TQBoxLayout; class KAction; class KActionCollection; class KComboBox; -class KGlobalAccel; +class TDEGlobalAccel; class MixDevice; class Mixer; diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h index 0bd8c059..0f8c70a5 100644 --- a/kmix/mdwslider.h +++ b/kmix/mdwslider.h @@ -42,7 +42,7 @@ class KLedButton; class KAction; class KActionCollection; class KSmallSlider; -class KGlobalAccel; +class TDEGlobalAccel; class MixDevice; class VerticalText; diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h index 442ef174..d584bda4 100644 --- a/kmix/mdwswitch.h +++ b/kmix/mdwswitch.h @@ -40,7 +40,7 @@ class KLedButton; class KAction; class KActionCollection; class KSmallSlider; -class KGlobalAccel; +class TDEGlobalAccel; class MixDevice; class VerticalText; diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp index f90a9455..9096c2c0 100644 --- a/kmix/mixdevicewidget.cpp +++ b/kmix/mixdevicewidget.cpp @@ -59,7 +59,7 @@ MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md, m_disabled( false ), _orientation( orientation ), m_small( small ) { _mdwActions = new KActionCollection( this ); - m_keys = new KGlobalAccel( TQT_TQOBJECT(this), "Keys" ); + m_keys = new TDEGlobalAccel( TQT_TQOBJECT(this), "Keys" ); } MixDeviceWidget::~MixDeviceWidget() @@ -79,7 +79,7 @@ bool MixDeviceWidget::isDisabled() const } -KGlobalAccel *MixDeviceWidget::keys( void ) +TDEGlobalAccel *MixDeviceWidget::keys( void ) { return m_keys; } diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h index fe35c482..c9c62d6a 100644 --- a/kmix/mixdevicewidget.h +++ b/kmix/mixdevicewidget.h @@ -43,7 +43,7 @@ class KLedButton; class KAction; class KActionCollection; class KSmallSlider; -class KGlobalAccel; +class TDEGlobalAccel; class MixDevice; class VerticalText; @@ -80,7 +80,7 @@ public: virtual void setTicks( bool ) {}; virtual void setValueStyle( ValueStyle ) {}; - virtual KGlobalAccel *keys(void); + virtual TDEGlobalAccel *keys(void); public slots: virtual void setDisabled( bool value ); @@ -103,7 +103,7 @@ protected: Mixer* m_mixer; MixDevice* m_mixdevice; KActionCollection* _mdwActions; - KGlobalAccel* m_keys; + TDEGlobalAccel* m_keys; ViewBase* m_mixerwidget; bool m_disabled; Qt::Orientation _orientation; diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp index 15b555ac..2bb39a6d 100644 --- a/kmix/viewswitches.cpp +++ b/kmix/viewswitches.cpp @@ -170,8 +170,8 @@ void ViewSwitches::configurationUpdate() { mdw->setBackgroundMode(PaletteBackground); } else { - // !! Should use KGlobalSettings::alternateBackgroundColor() - // or KGlobalSettings::calculateAlternateBackgroundColor() instead. + // !! Should use TDEGlobalSettings::alternateBackgroundColor() + // or TDEGlobalSettings::calculateAlternateBackgroundColor() instead. mdw->setBackgroundMode( PaletteBase ); } backGoundModeToggler = !backGoundModeToggler; diff --git a/krec/krecfileviewhelpers.h b/krec/krecfileviewhelpers.h index 88b5b79c..c7f16131 100644 --- a/krec/krecfileviewhelpers.h +++ b/krec/krecfileviewhelpers.h @@ -105,7 +105,7 @@ signals: void showContextMenu( const TQPoint & ); private: void init() { - setFont( KGlobalSettings::fixedFont() ); + setFont( TDEGlobalSettings::fixedFont() ); } }; #endif diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp index e574ba92..2faa6cdf 100644 --- a/kscd/cddbdlg.cpp +++ b/kscd/cddbdlg.cpp @@ -37,7 +37,7 @@ CDDBDlg::CDDBDlg( TQWidget* parent, const char* name ) : KDialogBase( parent, name, false, i18n( "CD Editor" ), Ok|Cancel|User1|User2, Ok, true ) { - KGlobal::locale()->insertCatalogue("libkcddb"); + TDEGlobal::locale()->insertCatalogue("libkcddb"); m_dlgBase = new CDInfoDialogBase( this, "m_dlgBase" ); diff --git a/kscd/docking.cpp b/kscd/docking.cpp index 3759ab7b..1483611c 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -53,11 +53,11 @@ DockWidget::DockWidget( KSCD* parent, const char *name) // popup menu for right mouse button TQPopupMenu* popup = contextMenu(); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked())); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked())); TQToolTip::add(this, kapp->aboutData()->programName()); } diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index cc9bc389..49ab2950 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -227,7 +227,7 @@ KSCD::~KSCD() void KSCD::initGlobalShortcuts() { - m_globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) ); + m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) ); //Definition of global shortcuts is based on 'local' shortcuts which follow //the WIN key. @@ -280,7 +280,7 @@ void KSCD::initFont() /* int theSmallPtSize = 10; // Find a font that fits the 13 and 14 pixel widgets - TQFont fn( KGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold ); + TQFont fn( TDEGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold ); bool fits = false; while (!fits && theSmallPtSize > 1) { @@ -293,7 +293,7 @@ void KSCD::initFont() fits = true; } } - smallfont = TQFont(KGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold); + smallfont = TQFont(TDEGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold); */ } // initFont() @@ -371,7 +371,7 @@ void KSCD::setupPopups() connect( infoPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(information(int)) ); - KHelpMenu* helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), false); + KHelpMenu* helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false); mainPopup->insertItem(SmallIcon("help"),i18n("&Help"), helpMenu->menu()); mainPopup->insertSeparator(); m_actions->action(KStdAction::name(KStdAction::Quit))->plug(mainPopup); diff --git a/kscd/kscd.h b/kscd/kscd.h index 98531cd0..8ed84a37 100644 --- a/kscd/kscd.h +++ b/kscd/kscd.h @@ -224,7 +224,7 @@ private: TQStringList playlist; KCDDB::Client* cddb; KActionCollection* m_actions; - KGlobalAccel* m_globalAccel; + TDEGlobalAccel* m_globalAccel; KToggleAction* m_togglePopupsAction; DockWidget* m_dockWidget; void lookupDevice(); diff --git a/kscd/kscd.kcfg b/kscd/kscd.kcfg index f781cfe1..0da4d53e 100644 --- a/kscd/kscd.kcfg +++ b/kscd/kscd.kcfg @@ -77,7 +77,7 @@ </entry> <entry name="ledFont" type="Font"> <label>The font that will be used for the LCD display.</label> - <default><code>TQFont(KGlobalSettings::generalFont().family(), 10, TQFont::Bold)</code></default> + <default><code>TQFont(TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold)</code></default> </entry> <entry name="BackColor" type="Color"> <label>The background color that will be used for the LCD display.</label> diff --git a/libkcddb/cdinfodialogbase.ui.h b/libkcddb/cdinfodialogbase.ui.h index 24eaa6df..93d3b2cc 100644 --- a/libkcddb/cdinfodialogbase.ui.h +++ b/libkcddb/cdinfodialogbase.ui.h @@ -230,7 +230,7 @@ void CDInfoDialogBase::slotChangeEncoding() if (dialog->exec()) { - KCharsets* charsets = KGlobal::charsets(); + KCharsets* charsets = TDEGlobal::charsets(); TQTextCodec* codec = charsets->codecForName(charsets->encodingForName(encWidget->selectedEncoding())); m_artist->setText(codec->toUnicode(m_artist->text().latin1())); diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp index 42d0e506..18b08363 100644 --- a/libkcddb/cdinfoencodingwidget.cpp +++ b/libkcddb/cdinfoencodingwidget.cpp @@ -33,7 +33,7 @@ namespace KCDDB : CDInfoEncodingWidgetBase(parent), m_artist(artist), m_title(title), m_songTitles(songTitles) { - encodingCombo->insertStringList(KGlobal::charsets()->descriptiveEncodingNames()); + encodingCombo->insertStringList(TDEGlobal::charsets()->descriptiveEncodingNames()); slotEncodingChanged(encodingCombo->currentText()); @@ -48,7 +48,7 @@ namespace KCDDB void CDInfoEncodingWidget::slotEncodingChanged(const TQString& encoding) { - KCharsets* charsets = KGlobal::charsets(); + KCharsets* charsets = TDEGlobal::charsets(); TQTextCodec* codec = charsets->codecForName(charsets->encodingForName(encoding)); diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp index 3688ba6a..5235d40a 100644 --- a/libkcddb/kcmcddb/kcmcddb.cpp +++ b/libkcddb/kcmcddb/kcmcddb.cpp @@ -48,7 +48,7 @@ K_EXPORT_COMPONENT_FACTORY ( kcm_cddb, KCDDBFactory( "kcmcddb" ) ) CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &) : KCModule(parent, name) { - KGlobal::locale()->insertCatalogue("libkcddb"); + TDEGlobal::locale()->insertCatalogue("libkcddb"); setButtons(Default | Apply); widget_ = new CDDBConfigWidget(this); diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index 2db96950..3b03971b 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -68,7 +68,7 @@ NoatunApp::NoatunApp() // set the default config data // TODO: Maybe a first time wizard instead? - KConfig *config=KGlobal::config(); // + + KConfig *config=TDEGlobal::config(); // + config->setGroup(TQString()); // 1 if (!config->readEntry("Modules").length()) { @@ -146,7 +146,7 @@ NoatunApp::NoatunApp() NoatunApp::~NoatunApp() { saveEngineState(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("Volume", player()->volume()); config->writeEntry("LoopStyle", player()->loopStyle()); @@ -184,7 +184,7 @@ inline bool logicalXOR(bool A, bool B) #define READBOOLOPT_EX(name, string, def, group, reversal) \ bool NoatunApp::name() const \ { \ - KConfig *config=KGlobal::config(); \ + KConfig *config=TDEGlobal::config(); \ config->setGroup(group); \ return logicalXOR(config->readBoolEntry(string, def), reversal); \ } @@ -211,14 +211,14 @@ bool NoatunApp::clearOnStart() const int NoatunApp::startupPlayMode() const { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); return config->readNumEntry("StartupPlayMode", autoPlay() ? Play : Restore); } void NoatunApp::setStartupPlayMode(int mode) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("StartupPlayMode", mode); config->sync(); @@ -226,7 +226,7 @@ void NoatunApp::setStartupPlayMode(int mode) void NoatunApp::setHackUpPlaylist(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("HackUpPlaylist", b); config->sync(); @@ -237,7 +237,7 @@ void NoatunApp::setFastMixer(bool b) bool whatBefore=fastMixer(); if (whatBefore!=b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("FastMixer", b); config->sync(); @@ -247,7 +247,7 @@ void NoatunApp::setFastMixer(bool b) void NoatunApp::setOneInstance(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("KDE"); config->writeEntry("MultipleInstances", !b); config->sync(); @@ -255,31 +255,31 @@ void NoatunApp::setOneInstance(bool b) void NoatunApp::setLoopList(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("LoopList", b); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); } void NoatunApp::setAutoPlay(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("AutoPlay", b); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); } void NoatunApp::setRememberPositions(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("RememberPositions", b); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); } void NoatunApp::setSaveDirectory(const TQString &s) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writePathEntry("SaveDirectory", s); config->sync(); @@ -287,21 +287,21 @@ void NoatunApp::setSaveDirectory(const TQString &s) TQString NoatunApp::saveDirectory() const { - KConfig *c=KGlobal::config(); + KConfig *c=TDEGlobal::config(); c->setGroup(TQString()); return c->readPathEntry("SaveDirectory", TQString(getenv("HOME"))); } TQString NoatunApp::titleFormat() const { - KConfig *c=KGlobal::config(); + KConfig *c=TDEGlobal::config(); c->setGroup(TQString()); return c->readEntry("TitleFormat", "$(\"[\"author\"] - \")$(title)$(\" (\"bitrate\"kbps)\")"); } void NoatunApp::setTitleFormat(const TQString &format) { - KConfig *c=KGlobal::config(); + KConfig *c=TDEGlobal::config(); c->setGroup(TQString()); return c->writeEntry("TitleFormat", format); } @@ -313,7 +313,7 @@ void NoatunApp::setClearOnStart(bool b) void NoatunApp::setClearOnOpen(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("ClearOnOpen", b); config->sync(); @@ -321,7 +321,7 @@ void NoatunApp::setClearOnOpen(bool b) void NoatunApp::setDisplayRemaining(bool b) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("DisplayRemaining", b); config->sync(); @@ -501,7 +501,7 @@ TQImage NoatunApp::readPNG(const TQString &filename) void NoatunApp::restoreEngineState() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup(TQString()); int state = config->readNumEntry("EngineState", Arts::posPlaying); switch (state) @@ -521,7 +521,7 @@ void NoatunApp::restoreEngineState() void NoatunApp::saveEngineState() { - KConfig* config=KGlobal::config(); + KConfig* config=TDEGlobal::config(); config->setGroup(TQString()); config->writeEntry("EngineState", player()->engine()->state()); // we don't sync here since it's done in the destructor afterwards anyway diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h index 14b53ec8..23b6e481 100644 --- a/noatun/library/noatun/plugin.h +++ b/noatun/library/noatun/plugin.h @@ -77,7 +77,7 @@ class TimerThingy; * then exec() to be able to use this. * Its perfectly safe to create * a visualization in a binary executed by - * KProcess. + * TDEProcess. **/ class Visualization { diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp index b1ea94d5..add75782 100644 --- a/noatun/library/noatuntags/tags.cpp +++ b/noatun/library/noatuntags/tags.cpp @@ -21,14 +21,14 @@ TagsGetter::TagsGetter() int TagsGetter::interval() const { - KGlobal::config()->setGroup("Tags"); - return KGlobal::config()->readNumEntry("interval", 250); + TDEGlobal::config()->setGroup("Tags"); + return TDEGlobal::config()->readNumEntry("interval", 250); } bool TagsGetter::loadAuto() const { - KGlobal::config()->setGroup("Tags"); - return KGlobal::config()->readBoolEntry("LoadAuto", true); + TDEGlobal::config()->setGroup("Tags"); + return TDEGlobal::config()->readBoolEntry("LoadAuto", true); } void TagsGetter::added(PlaylistItem &i) @@ -93,17 +93,17 @@ void TagsGetter::setInterval(int ms) killTimers(); startTimer(ms); - KGlobal::config()->setGroup("Tags"); - KGlobal::config()->writeEntry("interval", ms); - KGlobal::config()->sync(); + TDEGlobal::config()->setGroup("Tags"); + TDEGlobal::config()->writeEntry("interval", ms); + TDEGlobal::config()->sync(); } void TagsGetter::setLoadAuto(bool eh) { - KGlobal::config()->setGroup("Tags"); - KGlobal::config()->writeEntry("LoadAuto", eh); - KGlobal::config()->sync(); + TDEGlobal::config()->setGroup("Tags"); + TDEGlobal::config()->writeEntry("LoadAuto", eh); + TDEGlobal::config()->sync(); killTimers(); diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp index 0897e76d..f715590a 100644 --- a/noatun/library/pluginloader.cpp +++ b/noatun/library/pluginloader.cpp @@ -52,7 +52,7 @@ LibraryLoader::~LibraryLoader() TQValueList<NoatunLibraryInfo> LibraryLoader::available() const { TQValueList<NoatunLibraryInfo> items; - TQStringList files=KGlobal::dirs()->findAllResources("appdata", "*.plugin", false, true); + TQStringList files=TDEGlobal::dirs()->findAllResources("appdata", "*.plugin", false, true); for (TQStringList::Iterator i=files.begin(); i!=files.end(); ++i) items.append(getInfo(*i)); @@ -69,7 +69,7 @@ TQPtrList<Plugin> LibraryLoader::plugins() const bool LibraryLoader::loadAll() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(""); TQStringList modules = config->readListEntry("Modules"); return loadAll(modules); @@ -135,7 +135,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules) NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const { NoatunLibraryInfo info; - TQString specPath = (spec[0]=='/') ? spec : KGlobal::dirs()->findResource("appdata", spec); + TQString specPath = (spec[0]=='/') ? spec : TDEGlobal::dirs()->findResource("appdata", spec); if (!TQFile::exists(specPath)) return info; KSimpleConfig file(specPath); @@ -180,7 +180,7 @@ bool LibraryLoader::loadSO(const TQString &spec) if (!listitem) { - TQString filename = KGlobal::dirs()->findResource("module", info.filename); + TQString filename = TDEGlobal::dirs()->findResource("module", info.filename); KLibrary *lib = loader->library(TQFile::encodeName(filename)); if (!lib) return false; @@ -221,7 +221,7 @@ void LibraryLoader::add(const TQString &spec) void LibraryLoader::setModules(const TQStringList &mods) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup(0); config->writeEntry("Modules", mods); config->sync(); diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp index 98c05453..73285ad1 100644 --- a/noatun/library/pref.cpp +++ b/noatun/library/pref.cpp @@ -55,7 +55,7 @@ void NoatunPreferences::remove(CModule *page) } CModule::CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *owner) - : TQWidget(napp->preferencesBox()->addPage(name, description, KGlobal::iconLoader()->loadIcon( + : TQWidget(napp->preferencesBox()->addPage(name, description, TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Small,0, KIcon::DefaultState,0, true))) { if (owner) diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp index 71a40663..76c2215d 100644 --- a/noatun/library/vequalizer.cpp +++ b/noatun/library/vequalizer.cpp @@ -712,7 +712,7 @@ VPreset VEqualizer::createPreset(const TQString &name, bool smart) TQValueList<VPreset> VEqualizer::presets() const { - KConfig *conf=KGlobal::config(); + KConfig *conf=TDEGlobal::config(); conf->setGroup("Equalizer"); TQStringList list; @@ -761,7 +761,7 @@ VPreset VEqualizer::presetByName(const TQString &name) VPreset VEqualizer::presetByFile(const TQString &file) { - KConfig *conf=KGlobal::config(); + KConfig *conf=TDEGlobal::config(); conf->setGroup("Equalizer"); TQStringList list=kapp->config()->readListEntry("presets"); if (list.contains(file)) diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index 9c255485..9876b3c1 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -157,7 +157,7 @@ Excellent::Excellent() setMinimumWidth(250); resize(300, 75); - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); toolBar("main")->applySettings(&config, "Excellent main"); @@ -192,7 +192,7 @@ Excellent::Excellent() Excellent::~Excellent() { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); saveMainWindowSettings(&config, "excellent"); toolBar("main")->saveSettings(&config, "Excellent main"); config.setGroup("excellent"); @@ -205,7 +205,7 @@ Excellent::~Excellent() void Excellent::showEvent(TQShowEvent *e) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("excellent"); config->writeEntry("mappingState", NET::Visible); config->sync(); @@ -215,7 +215,7 @@ void Excellent::showEvent(TQShowEvent *e) void Excellent::hideEvent(TQHideEvent *e) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("excellent"); config->writeEntry("mappingState", NET::Withdrawn); config->sync(); diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp index 2a4c53eb..19097212 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -22,7 +22,7 @@ HTMLExport::HTMLExport(): TQObject(0, "HTMLExport"), Plugin() napp->pluginActionMenu()->insert(mAction); new Prefs(this); - config = KGlobal::config(); + config = TDEGlobal::config(); } HTMLExport::~HTMLExport() @@ -176,7 +176,7 @@ Prefs::Prefs(TQObject *parent) { // Init Config - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("HTMLExport"); // Set default values @@ -275,7 +275,7 @@ Prefs::Prefs(TQObject *parent) void Prefs::save() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString bgRealURL = bgPicPath->url(); @@ -295,7 +295,7 @@ void Prefs::save() void Prefs::reopen() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); headColorSelect->setColor(config->readColorEntry( "headColor" ) ); hoverColorSelect->setColor( config->readColorEntry( "hoverColor" ) ); bgColorSelect->setColor( config->readColorEntry( "bgColor" ) ); diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index 1077613b..eea42474 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -52,7 +52,7 @@ KaimanPrefDlg::~KaimanPrefDlg() void KaimanPrefDlg::save() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Kaiman"); config->writeEntry("SkinResource", skin() ); config->sync(); @@ -67,13 +67,13 @@ void KaimanPrefDlg::reopen() { _skinList->clear(); // fill with available skins - KGlobal::dirs()->addResourceType("skins", KStandardDirs::kde_default("data") + "noatun/skins/kaiman/"); - TQStringList list = KGlobal::dirs()->resourceDirs("skins"); + TDEGlobal::dirs()->addResourceType("skins", KStandardDirs::kde_default("data") + "noatun/skins/kaiman/"); + TQStringList list = TDEGlobal::dirs()->resourceDirs("skins"); for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++) readSkinDir(*it); // load current config - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Kaiman"); TQString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN ); TQListBoxItem *item = _skinList->findItem( skin ); diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index 7faecc3b..e5dec5b5 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -80,7 +80,7 @@ Kaiman::Kaiman() _altSkin = false; // init config - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Kaiman"); // load skin diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index 0229f619..3a3bb547 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -20,7 +20,7 @@ extern "C" } } -KGlobalAccel * Keyz::s_accel = 0L; +TDEGlobalAccel * Keyz::s_accel = 0L; Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) { @@ -29,7 +29,7 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) if ( !s_accel ) { - s_accel = new KGlobalAccel( this, "noatunglobalaccel" ); + s_accel = new TDEGlobalAccel( this, "noatunglobalaccel" ); s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString(), CTRL+ALT+Key_P, KKey::QtWIN+CTRL+Key_P, player, TQT_SLOT( playpause() )); diff --git a/noatun/modules/keyz/keyz.h b/noatun/modules/keyz/keyz.h index ad3fe550..2145448b 100644 --- a/noatun/modules/keyz/keyz.h +++ b/noatun/modules/keyz/keyz.h @@ -14,7 +14,7 @@ public: Keyz(); ~Keyz(); - static KGlobalAccel *accel() { return s_accel; } + static TDEGlobalAccel *accel() { return s_accel; } public slots: void slotVolumeUp(); @@ -28,7 +28,7 @@ void slotVolumeUp(); void slotCopyTitle(); private: - static KGlobalAccel *s_accel; + static TDEGlobalAccel *s_accel; int preMuteVol; }; diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index ad843376..4401ee01 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -814,7 +814,7 @@ void KJLoader::showSplash() TQSize sh = splashScreen->sizeHint(); - TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = TDEGlobalSettings::splashScreenDesktopGeometry(); splashScreen->move (desk.x() + (desk.width() - sh.width())/2, desk.y() + (desk.height() - sh.height())/2 ); diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index 4231d0ff..6fa576f5 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -48,7 +48,7 @@ static TQString expand(TQString s); KJPrefs::KJPrefs(TQObject* parent) : CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", parent) { - cfg = KGlobal::config(); + cfg = TDEGlobal::config(); TQVBoxLayout *vbox = new TQVBoxLayout(this); vbox->setAutoAdd(true); @@ -87,7 +87,7 @@ void KJPrefs::reopen() // reload config and set stuff in dialog mGuiSettingsWidget->useSysFont->setChecked( cfg->readBoolEntry("Use SysFont", false) ); mGuiSettingsWidget->cmbSysFont->setCurrentFont( - cfg->readEntry("SysFont Family", KGlobalSettings::generalFont().family()) ); + cfg->readEntry("SysFont Family", TDEGlobalSettings::generalFont().family()) ); TQColor tmpColor = TQColor(255,255,255); mGuiSettingsWidget->cmbSysFontColor->setColor( cfg->readColorEntry("SysFont Color", &tmpColor)); @@ -128,7 +128,7 @@ void KJPrefs::reopen() // reload config and set stuff in dialog } TQStringList skins; - TQStringList skinLocations = KGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); + TQStringList skinLocations = TDEGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); // iterate through all paths where Noatun is searching for kjofol-skins for (uint i = 0; i < skinLocations.count(); ++i ) { @@ -416,7 +416,7 @@ void KJPrefs::installNewSkin( void ) proc << "unzip -d " << proc.quote(tmpUnpackPath) << " " << proc.quote(srcFile.path()); kdDebug(66666) << "unzip -d " << tmpUnpackPath.latin1() << " " << srcFile.path().latin1() << endl; - proc.start( KProcess::Block, KProcess::NoCommunication ); + proc.start( TDEProcess::Block, TDEProcess::NoCommunication ); // "unzip" spits out errorcodes > 0 only, 0 on success if ( proc.exitStatus() != 0 ) @@ -525,7 +525,7 @@ void KJPrefs::removeSelectedSkin( void ) // Now find the dir to delete !!! TQString dirToDelete = TQString (""); - TQStringList skinLocations = KGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); + TQStringList skinLocations = TDEGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); // iterate through all paths where Noatun is searching for kjofol-skins for (uint i = 0; i < skinLocations.count(); ++i ) @@ -601,7 +601,7 @@ static TQString expand(TQString s) { // kdDebug(66666) << "expand( "<< s.latin1() << " )" << endl; - TQStringList skinLocations = KGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); + TQStringList skinLocations = TDEGlobal::dirs()->findDirs("data", "noatun/skins/kjofol"); // iterate through all paths where Noatun is searching for kjofol-skins for (uint i = 0; i < skinLocations.count(); ++i ) diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 2661f27c..d89c1e3f 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -83,7 +83,7 @@ SimpleUI::SimpleUI() extra_height = (height() - video->height()); // Load configuration - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup( "Simple" ); TQString str = config.readEntry( "View", "NormalSize" ); @@ -104,7 +104,7 @@ SimpleUI::SimpleUI() SimpleUI::~SimpleUI() { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); saveMainWindowSettings( &config, "Simple" ); config.setGroup( "Simple" ); TQString str; @@ -359,7 +359,7 @@ void SimpleUI::slotVolumeFrame() int y = -(volumeFrame->height() + 5); TQPoint point( volumeButton->mapToGlobal( TQPoint( x, y ) ) ); - TQRect deskRect = KGlobalSettings::desktopGeometry( point ); + TQRect deskRect = TDEGlobalSettings::desktopGeometry( point ); bool bottom = (point.y() + volumeFrame->height()) > (deskRect.y() + deskRect.height()); bool right = (point.x() + volumeFrame->width()) > (deskRect.x() + deskRect.width()); diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index 15963929..764cbc7e 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -662,7 +662,7 @@ View::View(SplitPlaylist *) mFinder = new Finder(this); - applyMainWindowSettings(KGlobal::config(), "SPL Window"); + applyMainWindowSettings(TDEGlobal::config(), "SPL Window"); list->setFocus(); } @@ -797,7 +797,7 @@ void View::init() list->openGlobal(internalURL); } - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup("splitplaylist"); // this has to come after openGlobal, since openGlobal emits modified() @@ -942,7 +942,7 @@ void View::setModified(void) void View::saveState(void) { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup("splitplaylist"); config.writeEntry("modified", modified); @@ -955,14 +955,14 @@ void View::saveState(void) item=SPL->getAfter(item), i++; config.writeEntry("current", i); - saveMainWindowSettings(KGlobal::config(), "SPL Window"); + saveMainWindowSettings(TDEGlobal::config(), "SPL Window"); config.sync(); } void View::configureToolBars() { - saveMainWindowSettings(KGlobal::config(), "SPL Window"); + saveMainWindowSettings(TDEGlobal::config(), "SPL Window"); KEditToolbar dlg(actionCollection(), "splui.rc"); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); dlg.exec(); @@ -971,7 +971,7 @@ void View::configureToolBars() void View::newToolBarConfig() { createGUI("splui.rc"); - applyMainWindowSettings(KGlobal::config(), "SPL Window"); + applyMainWindowSettings(TDEGlobal::config(), "SPL Window"); } // turns the sorting on or off diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index 255dd6c9..9a45212b 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -394,7 +394,7 @@ void NoatunSystray::showPassivePopup() 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)); if(win.pos.x < bounds.center().x()) { diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp index b90d4b03..4a252d75 100644 --- a/noatun/modules/voiceprint/prefs.cpp +++ b/noatun/modules/voiceprint/prefs.cpp @@ -38,7 +38,7 @@ Prefs::Prefs(TQObject* parent) void Prefs::reopen() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("VoicePrint"); TQColor black(0, 0, 0); TQColor blue(0, 0, 222); @@ -49,7 +49,7 @@ void Prefs::reopen() void Prefs::save() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("VoicePrint"); config->writeEntry("Background", mBackground->color()); config->writeEntry("Foreground", mForeground->color()); diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp index cab5be35..16d01a96 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp +++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp @@ -51,7 +51,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser() analyserCache = NULL; winSkinVis = NULL; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Winskin"); setVisualizationMode(config->readNumEntry("visualizationMode", MODE_ANALYSER)); @@ -61,7 +61,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser() GuiSpectrumAnalyser::~GuiSpectrumAnalyser() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Winskin"); config->writeEntry("visualizationMode", visualization_mode); diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp index b81a0da2..f19266b1 100644 --- a/noatun/modules/winskin/waDigit.cpp +++ b/noatun/modules/winskin/waDigit.cpp @@ -20,7 +20,7 @@ WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Winskin"); reverse_time = config->readNumEntry("timeReversed", false); @@ -29,7 +29,7 @@ WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS) WaDigit::~WaDigit() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Winskin"); config->writeEntry("timeReversed", reverse_time); } diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index 5f670953..2692a742 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -69,7 +69,7 @@ void WaInfo::scrollerSetup() if (completePixmap->width() > size.width()) { xScrollDirection = 1; - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Winskin"); int s = config->readNumEntry("ScrollDelay", 15); if (s!=0) diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index fdf2e768..d6d8fe58 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -95,7 +95,7 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() connect(napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong())); connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timetick())); - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Winskin"); TQString skin = config->readEntry("CurrentSkin", WaSkin::defaultSkin()); diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp index 08804885..4288119e 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -20,7 +20,7 @@ WaSkinManager::~WaSkinManager() { } TQStringList WaSkinManager::availableSkins() { - TQStringList skinDirs = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp"); + TQStringList skinDirs = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp"); TQStringList skin_list; // This loop adds them all to our skin list @@ -55,7 +55,7 @@ TQString WaSkinManager::defaultSkin() { } bool WaSkinManager::loadSkin(TQString skinName) { - TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); + TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); if (!skins.count()) mCurrentSkin = defaultSkin(); @@ -66,7 +66,7 @@ bool WaSkinManager::loadSkin(TQString skinName) { } bool WaSkinManager::installSkin(TQString _url) { - TQString location = KGlobal::dirs()->saveLocation("data", "noatun/skins/winamp"); + TQString location = TDEGlobal::dirs()->saveLocation("data", "noatun/skins/winamp"); KURL url(_url); TQString mimetype = KMimeType::findByURL(_url)->name(); @@ -96,7 +96,7 @@ bool WaSkinManager::removeSkin(TQString skinName) { if (!skinRemovable(skinName)) return false; - TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); + TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); KIO::Job *job = KIO::del(KURL(skins[0]), false, false); connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList())); @@ -105,7 +105,7 @@ bool WaSkinManager::removeSkin(TQString skinName) { } bool WaSkinManager::skinRemovable(TQString skinName) { - TQStringList skins = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); + TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); if (!skins.count()) return false; diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp index e7562c04..88c1f460 100644 --- a/noatun/modules/winskin/waSkinModel.cpp +++ b/noatun/modules/winskin/waSkinModel.cpp @@ -82,7 +82,7 @@ bool WaSkinModel::load(TQString skinDir) if (findFile(dir, "main.bmp").isEmpty()) { // Ack, our skin dir doesn't exist, fall back to the default - dir = TQDir(KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + WaSkin::defaultSkin())[0]); + dir = TQDir(TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + WaSkin::defaultSkin())[0]); success = false; } diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 70a22ea5..13e626fa 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -78,7 +78,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : void WinSkinConfig::save() { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Winskin"); config->writeEntry("CurrentSkin", skin_list->currentText()); config->writeEntry("ScrollDelay", scrollSpeed->value()); @@ -123,7 +123,7 @@ void WinSkinConfig::reopen() { skin_list->setCurrentItem( 0 ); } - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Winskin"); scrollSpeed->setValue(config->readNumEntry("ScrollDelay", 15)); } |