TDE
/
tdemultimedia
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 794a886cbd
commit 27430f06c6
96 changed files with 301 additions and 301 deletions
Show Stats Download Patch File Download Diff File

4
arts/gui/kde/kvolumefader_impl.cpp
Unescape View File

@ -184,8 +184,8 @@ void KVolumeFader_Widget::mousePressEvent( TQMouseEvent* ){
void KVolumeFader_Widget::mouseReleaseEvent( TQMouseEvent* qme ){ void KVolumeFader_Widget::mouseReleaseEvent( TQMouseEvent* qme ){
bool setValue = false; bool setValue = false;
if ( KGlobalSettings::mouseSettings().handed == 0 && qme->button() == Qt::LeftButton ) setValue=true; if ( TDEGlobalSettings::mouseSettings().handed == 0 && qme->button() == Qt::LeftButton ) setValue=true;
if ( KGlobalSettings::mouseSettings().handed == 1 && qme->button() == Qt::RightButton ) setValue=true; if ( TDEGlobalSettings::mouseSettings().handed == 1 && qme->button() == Qt::RightButton ) setValue=true;
if ( setValue ) if ( setValue )
{ {
switch ( _dir ) { switch ( _dir ) {

4
arts/modules/common/env_mixeritem_impl.cc
Unescape View File

@ -272,7 +272,7 @@ public:
} }
Widget initialize(MixerItem item) Widget initialize(MixerItem item)
{ {
KGlobal::locale()->insertCatalogue( "artsmodules" ); TDEGlobal::locale()->insertCatalogue( "artsmodules" );
VBox vbox; VBox vbox;
vbox._addChild(self(),"the_gui_updating_widget"); vbox._addChild(self(),"the_gui_updating_widget");
@ -301,7 +301,7 @@ class MixerGuiFactory_impl : virtual public MixerGuiFactory_skel
public: public:
Widget createGui(Object object) Widget createGui(Object object)
{ {
KGlobal::locale()->insertCatalogue( "artsmodules" ); TDEGlobal::locale()->insertCatalogue( "artsmodules" );
arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null());
std::string iface = object._interfaceName(); std::string iface = object._interfaceName();

2
arts/modules/effects/fivebandmonocomplexeq_impl.cc
Unescape View File

@ -102,7 +102,7 @@ class FiveBandMonoComplexEQGuiFactory_impl : virtual public FiveBandMonoComplexE
public: public:
Arts::Widget createGui( Arts::Object object ) Arts::Widget createGui( Arts::Object object )
{ {
KGlobal::locale()->insertCatalogue( "artsmodules" ); TDEGlobal::locale()->insertCatalogue( "artsmodules" );
arts_return_val_if_fail( !object.isNull(), Arts::Widget::null() ); arts_return_val_if_fail( !object.isNull(), Arts::Widget::null() );
FiveBandMonoComplexEQ ch = DynamicCast( object ); FiveBandMonoComplexEQ ch = DynamicCast( object );

2
arts/modules/effects/freeverbguifactory_impl.cc
Unescape View File

@ -44,7 +44,7 @@ REGISTER_IMPLEMENTATION(FreeverbGuiFactory_impl);
Widget FreeverbGuiFactory_impl::createGui(Object object) Widget FreeverbGuiFactory_impl::createGui(Object object)
{ {
KGlobal::locale()->insertCatalogue( "artsmodules" ); TDEGlobal::locale()->insertCatalogue( "artsmodules" );
arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null());
Synth_FREEVERB freeverb = DynamicCast(object); Synth_FREEVERB freeverb = DynamicCast(object);

2
arts/modules/effects/monostereoconversion_impl.cc
Unescape View File

@ -139,7 +139,7 @@ class StereoBalanceGuiFactory_impl : virtual public StereoBalanceGuiFactory_skel
public: public:
Widget createGui( Object object ) Widget createGui( Object object )
{ {
KGlobal::locale()->insertCatalogue( "artsmodules" ); TDEGlobal::locale()->insertCatalogue( "artsmodules" );
arts_return_val_if_fail( !object.isNull(), Arts::Widget::null() ); arts_return_val_if_fail( !object.isNull(), Arts::Widget::null() );
StereoBalance ch= DynamicCast( object ); StereoBalance ch= DynamicCast( object );

2
arts/modules/effects/stereocompressorguifactory_impl.cc
Unescape View File

@ -33,7 +33,7 @@ class StereoCompressorGuiFactory_impl : virtual public StereoCompressorGuiFactor
public: public:
Widget createGui( Object object ) Widget createGui( Object object )
{ {
KGlobal::locale()->insertCatalogue( "artsmodules" ); TDEGlobal::locale()->insertCatalogue( "artsmodules" );
arts_return_val_if_fail(!object.isNull(), Arts::Widget::null() ); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null() );

2
arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
Unescape View File

@ -176,7 +176,7 @@ REGISTER_IMPLEMENTATION(StereoFirEqualizerGuiFactory_impl);
Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object) Widget StereoFirEqualizerGuiFactory_impl::createGui(Object object)
{ {
KGlobal::locale()->insertCatalogue( "artsmodules" ); TDEGlobal::locale()->insertCatalogue( "artsmodules" );
arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null());
Synth_STEREO_FIR_EQUALIZER equalizer = DynamicCast(object); Synth_STEREO_FIR_EQUALIZER equalizer = DynamicCast(object);

2
arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
Unescape View File

@ -12,7 +12,7 @@ namespace Arts {
public: public:
Widget createGui(Object object) Widget createGui(Object object)
{ {
KGlobal::locale()->insertCatalogue( "artsmodules" ); TDEGlobal::locale()->insertCatalogue( "artsmodules" );
arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null());
MonoSimpleMixerChannel ch= DynamicCast(object); MonoSimpleMixerChannel ch= DynamicCast(object);
arts_return_val_if_fail(!ch.isNull(), Arts::Widget::null()); arts_return_val_if_fail(!ch.isNull(), Arts::Widget::null());

2
arts/modules/mixers/simplemixerchannelguifactory_impl.cc
Unescape View File

@ -10,7 +10,7 @@ namespace Arts {
public: public:
Widget createGui(Object object) Widget createGui(Object object)
{ {
KGlobal::locale()->insertCatalogue( "artsmodules" ); TDEGlobal::locale()->insertCatalogue( "artsmodules" );
arts_return_val_if_fail(!object.isNull(), Arts::Widget::null()); arts_return_val_if_fail(!object.isNull(), Arts::Widget::null());
SimpleMixerChannel ch = DynamicCast(object); SimpleMixerChannel ch = DynamicCast(object);
arts_return_val_if_fail(!ch.isNull(), Arts::Widget::null()); arts_return_val_if_fail(!ch.isNull(), Arts::Widget::null());

2
arts/tools/artsactions.cpp
Unescape View File

@ -47,7 +47,7 @@ ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget*
, _sv( 0 ), _am( 0 ), _asv( 0 ), _mmv( 0 ), _ev( 0 ), _mtv( 0 ) , _sv( 0 ), _am( 0 ), _asv( 0 ), _mmv( 0 ), _ev( 0 ), _mtv( 0 )
{ {
//kdDebug()<<k_funcinfo<<endl; //kdDebug()<<k_funcinfo<<endl;
KGlobal::locale()->insertCatalogue( "artscontrol" ); TDEGlobal::locale()->insertCatalogue( "artscontrol" );
if ( !_kartsserver ) _kartsserver = new KArtsServer( this ); if ( !_kartsserver ) _kartsserver = new KArtsServer( this );
} }

2
arts/tools/artscontrolapplet.cpp
Unescape View File

@ -31,7 +31,7 @@ extern "C"
{ {
KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
{ {
KGlobal::locale()->insertCatalogue("artscontrol"); TDEGlobal::locale()->insertCatalogue("artscontrol");
return new ArtsControlApplet(configFile, KPanelApplet::Normal, return new ArtsControlApplet(configFile, KPanelApplet::Normal,
KPanelApplet::About /*| KPanelApplet::Help | KPanelApplet::Preferences*/, KPanelApplet::About /*| KPanelApplet::Help | KPanelApplet::Preferences*/,
parent, "artscontrolapplet"); parent, "artscontrolapplet");

10
juk/cache.cpp
Unescape View File

@ -66,7 +66,7 @@ Cache *Cache::instance()
void Cache::save() void Cache::save()
{ {
TQString dirName = KGlobal::dirs()->saveLocation("appdata"); TQString dirName = TDEGlobal::dirs()->saveLocation("appdata");
TQString cacheFileName = dirName + "cache.new"; TQString cacheFileName = dirName + "cache.new";
TQFile f(cacheFileName); TQFile f(cacheFileName);
@ -97,7 +97,7 @@ void Cache::save()
void Cache::loadPlaylists(PlaylistCollection *collection) // static void Cache::loadPlaylists(PlaylistCollection *collection) // static
{ {
TQString playlistsFile = KGlobal::dirs()->saveLocation("appdata") + "playlists"; TQString playlistsFile = TDEGlobal::dirs()->saveLocation("appdata") + "playlists";
TQFile f(playlistsFile); TQFile f(playlistsFile);
@ -204,7 +204,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static
void Cache::savePlaylists(const PlaylistList &playlists) void Cache::savePlaylists(const PlaylistList &playlists)
{ {
TQString dirName = KGlobal::dirs()->saveLocation("appdata"); TQString dirName = TDEGlobal::dirs()->saveLocation("appdata");
TQString playlistsFile = dirName + "playlists.new"; TQString playlistsFile = dirName + "playlists.new";
TQFile f(playlistsFile); TQFile f(playlistsFile);
@ -254,7 +254,7 @@ void Cache::savePlaylists(const PlaylistList &playlists)
bool Cache::cacheFileExists() // static 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() void Cache::load()
{ {
TQString cacheFileName = KGlobal::dirs()->saveLocation("appdata") + "cache"; TQString cacheFileName = TDEGlobal::dirs()->saveLocation("appdata") + "cache";
TQFile f(cacheFileName); TQFile f(cacheFileName);

4
juk/collectionlist.cpp
Unescape View File

@ -67,7 +67,7 @@ void CollectionList::initialize(PlaylistCollection *collection)
// The CollectionList is created with sorting disabled for speed. Re-enable // The CollectionList is created with sorting disabled for speed. Re-enable
// it here, and perform the sort. // it here, and perform the sort.
KConfigGroup config(KGlobal::config(), "Playlists"); KConfigGroup config(TDEGlobal::config(), "Playlists");
SortOrder order = Descending; SortOrder order = Descending;
if(config.readBoolEntry("CollectionListSortAscending", true)) if(config.readBoolEntry("CollectionListSortAscending", true))
@ -252,7 +252,7 @@ CollectionList::CollectionList(PlaylistCollection *collection) :
CollectionList::~CollectionList() CollectionList::~CollectionList()
{ {
KConfigGroup config(KGlobal::config(), "Playlists"); KConfigGroup config(TDEGlobal::config(), "Playlists");
config.writeEntry("CollectionListSortColumn", sortColumn()); config.writeEntry("CollectionListSortColumn", sortColumn());
config.writeEntry("CollectionListSortAscending", sortOrder() == Ascending); config.writeEntry("CollectionListSortAscending", sortOrder() == Ascending);

2
juk/coverinfo.cpp
Unescape View File

@ -230,7 +230,7 @@ TQString CoverInfo::coverLocation(CoverSize size) const
fileName.replace(maskedFileNameChars, "_"); fileName.replace(maskedFileNameChars, "_");
fileName.append(".png"); fileName.append(".png");
TQString dataDir = KGlobal::dirs()->saveLocation("appdata"); TQString dataDir = TDEGlobal::dirs()->saveLocation("appdata");
TQString subDir; TQString subDir;
switch (size) { switch (size) {

4
juk/covermanager.cpp
Unescape View File

@ -232,7 +232,7 @@ void CoverManagerPrivate::loadCovers()
TQString CoverManagerPrivate::coverLocation() const 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 // 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! // Save it to file first!
TQString ext = TQString("/coverdb/coverID-%1.png").arg(id); 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; kdDebug() << "Saving pixmap to " << coverData->path << endl;
data()->createDataDir(); data()->createDataDir();

8
juk/deletedialog.cpp
Unescape View File

@ -36,7 +36,7 @@
DeleteWidget::DeleteWidget(TQWidget *parent, const char *name) DeleteWidget::DeleteWidget(TQWidget *parent, const char *name)
: DeleteDialogBase(parent, name) : DeleteDialogBase(parent, name)
{ {
KConfigGroup messageGroup(KGlobal::config(), "FileRemover"); KConfigGroup messageGroup(TDEGlobal::config(), "FileRemover");
bool deleteInstead = messageGroup.readBoolEntry("deleteInsteadOfTrash", false); bool deleteInstead = messageGroup.readBoolEntry("deleteInsteadOfTrash", false);
slotShouldDelete(deleteInstead); slotShouldDelete(deleteInstead);
@ -55,12 +55,12 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete)
if(shouldDelete) { if(shouldDelete) {
ddDeleteText->setText(i18n("<qt>These items will be <b>permanently " ddDeleteText->setText(i18n("<qt>These items will be <b>permanently "
"deleted</b> from your hard disk.</qt>")); "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)); KIcon::Desktop, KIcon::SizeLarge));
} }
else { else {
ddDeleteText->setText(i18n("<qt>These items will be moved to the Trash Bin.</qt>")); 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)); KIcon::Desktop, KIcon::SizeLarge));
} }
} }
@ -101,7 +101,7 @@ void DeleteDialog::setFiles(const TQStringList &files)
void DeleteDialog::accept() void DeleteDialog::accept()
{ {
KConfigGroup messageGroup(KGlobal::config(), "FileRemover"); KConfigGroup messageGroup(TDEGlobal::config(), "FileRemover");
// Save user's preference // Save user's preference

8
juk/filerenamer.cpp
Unescape View File

@ -101,7 +101,7 @@ public:
ConfigCategoryReader::ConfigCategoryReader() : CategoryReaderInterface(), ConfigCategoryReader::ConfigCategoryReader() : CategoryReaderInterface(),
m_currentItem(0) m_currentItem(0)
{ {
KConfigGroup config(KGlobal::config(), "FileRenamer"); KConfigGroup config(TDEGlobal::config(), "FileRenamer");
TQValueList<int> categoryOrder = config.readIntListEntry("CategoryOrder"); TQValueList<int> categoryOrder = config.readIntListEntry("CategoryOrder");
unsigned categoryCount[NumTypes] = { 0 }; // Keep track of each category encountered. unsigned categoryCount[NumTypes] = { 0 }; // Keep track of each category encountered.
@ -260,7 +260,7 @@ FileRenamerWidget::FileRenamerWidget(TQWidget *parent) :
void FileRenamerWidget::loadConfig() void FileRenamerWidget::loadConfig()
{ {
TQValueList<int> checkedSeparators; TQValueList<int> checkedSeparators;
KConfigGroup config(KGlobal::config(), "FileRenamer"); KConfigGroup config(TDEGlobal::config(), "FileRenamer");
for(unsigned i = 0; i < m_rows.count(); ++i) for(unsigned i = 0; i < m_rows.count(); ++i)
m_rows[i].options = TagRenamerOptions(m_rows[i].category); m_rows[i].options = TagRenamerOptions(m_rows[i].category);
@ -282,7 +282,7 @@ void FileRenamerWidget::loadConfig()
void FileRenamerWidget::saveConfig() void FileRenamerWidget::saveConfig()
{ {
KConfigGroup config(KGlobal::config(), "FileRenamer"); KConfigGroup config(TDEGlobal::config(), "FileRenamer");
TQValueList<int> checkedSeparators; TQValueList<int> checkedSeparators;
TQValueList<int> categoryOrder; TQValueList<int> categoryOrder;
@ -470,7 +470,7 @@ void FileRenamerWidget::addFolderSeparatorCheckbox()
void FileRenamerWidget::createTagRows() void FileRenamerWidget::createTagRows()
{ {
KConfigGroup config(KGlobal::config(), "FileRenamer"); KConfigGroup config(TDEGlobal::config(), "FileRenamer");
TQValueList<int> categoryOrder = config.readIntListEntry("CategoryOrder"); TQValueList<int> categoryOrder = config.readIntListEntry("CategoryOrder");
if(categoryOrder.isEmpty()) if(categoryOrder.isEmpty())

2
juk/gstreamerplayer.cpp
Unescape View File

@ -141,7 +141,7 @@ void GStreamerPlayer::seekPosition(int position)
void GStreamerPlayer::readConfig() void GStreamerPlayer::readConfig()
{ {
KConfigGroup config(KGlobal::config(), "GStreamerPlayer"); KConfigGroup config(TDEGlobal::config(), "GStreamerPlayer");
m_sinkName = config.readEntry("SinkName", TQString()); m_sinkName = config.readEntry("SinkName", TQString());
} }

6
juk/historyplaylist.cpp
Unescape View File

@ -94,14 +94,14 @@ HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *par
PlaylistItem(item, parent, after), PlaylistItem(item, parent, after),
m_dateTime(TQDateTime::currentDateTime()) m_dateTime(TQDateTime::currentDateTime())
{ {
setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); setText(0, TDEGlobal::locale()->formatDateTime(m_dateTime));
} }
HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent) : HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent) :
PlaylistItem(item, parent), PlaylistItem(item, parent),
m_dateTime(TQDateTime::currentDateTime()) m_dateTime(TQDateTime::currentDateTime())
{ {
setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); setText(0, TDEGlobal::locale()->formatDateTime(m_dateTime));
} }
HistoryPlaylistItem::~HistoryPlaylistItem() HistoryPlaylistItem::~HistoryPlaylistItem()
@ -112,7 +112,7 @@ HistoryPlaylistItem::~HistoryPlaylistItem()
void HistoryPlaylistItem::setDateTime(const TQDateTime &dt) void HistoryPlaylistItem::setDateTime(const TQDateTime &dt)
{ {
m_dateTime = dt; m_dateTime = dt;
setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); setText(0, TDEGlobal::locale()->formatDateTime(m_dateTime));
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

16
juk/juk.cpp
Unescape View File

@ -224,7 +224,7 @@ void JuK::setupSystemTray()
void JuK::setupGlobalAccels() 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, "Play", i18n("Play"), action("play"), TQT_SLOT(activate()));
KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), 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() void JuK::createDirs()
{ {
TQDir dir(KGlobal::dirs()->saveLocation("data", kapp->instanceName() + '/')); TQDir dir(TDEGlobal::dirs()->saveLocation("data", kapp->instanceName() + '/'));
if (!dir.exists("covers", false)) if (!dir.exists("covers", false))
dir.mkdir("covers", false); dir.mkdir("covers", false);
dir.cd("covers"); dir.cd("covers");
@ -278,7 +278,7 @@ void JuK::keyPressEvent(TQKeyEvent *e)
void JuK::readSettings() void JuK::readSettings()
{ {
KConfigGroup config(KGlobal::config(), "Settings"); KConfigGroup config(TDEGlobal::config(), "Settings");
m_showSplash = config.readBoolEntry("ShowSplashScreen", true); m_showSplash = config.readBoolEntry("ShowSplashScreen", true);
m_startDocked = config.readBoolEntry("StartDocked", false); m_startDocked = config.readBoolEntry("StartDocked", false);
} }
@ -287,7 +287,7 @@ void JuK::readConfig()
{ {
// player settings // player settings
KConfigGroup playerConfig(KGlobal::config(), "Player"); KConfigGroup playerConfig(TDEGlobal::config(), "Player");
if(m_sliderAction->volumeSlider()) { if(m_sliderAction->volumeSlider()) {
int maxVolume = m_sliderAction->volumeSlider()->maxValue(); int maxVolume = m_sliderAction->volumeSlider()->maxValue();
@ -310,7 +310,7 @@ void JuK::readConfig()
// general settings // general settings
KConfigGroup settingsConfig(KGlobal::config(), "Settings"); KConfigGroup settingsConfig(TDEGlobal::config(), "Settings");
bool dockInSystemTray = settingsConfig.readBoolEntry("DockInSystemTray", true); bool dockInSystemTray = settingsConfig.readBoolEntry("DockInSystemTray", true);
m_toggleSystemTrayAction->setChecked(dockInSystemTray); m_toggleSystemTrayAction->setChecked(dockInSystemTray);
@ -331,7 +331,7 @@ void JuK::saveConfig()
{ {
// player settings // player settings
KConfigGroup playerConfig(KGlobal::config(), "Player"); KConfigGroup playerConfig(TDEGlobal::config(), "Player");
if (m_sliderAction->volumeSlider()) if (m_sliderAction->volumeSlider())
{ {
@ -353,7 +353,7 @@ void JuK::saveConfig()
// general settings // general settings
KConfigGroup settingsConfig(KGlobal::config(), "Settings"); KConfigGroup settingsConfig(TDEGlobal::config(), "Settings");
settingsConfig.writeEntry("ShowSplashScreen", m_toggleSplashAction->isChecked()); settingsConfig.writeEntry("ShowSplashScreen", m_toggleSplashAction->isChecked());
settingsConfig.writeEntry("StartDocked", m_startDocked); settingsConfig.writeEntry("StartDocked", m_startDocked);
settingsConfig.writeEntry("DockInSystemTray", m_toggleSystemTrayAction->isChecked()); settingsConfig.writeEntry("DockInSystemTray", m_toggleSystemTrayAction->isChecked());
@ -362,7 +362,7 @@ void JuK::saveConfig()
if(m_outputSelectAction) if(m_outputSelectAction)
settingsConfig.writeEntry("MediaSystem", m_outputSelectAction->currentItem()); settingsConfig.writeEntry("MediaSystem", m_outputSelectAction->currentItem());
KGlobal::config()->sync(); TDEGlobal::config()->sync();
} }
bool JuK::queryExit() bool JuK::queryExit()

4
juk/juk.h
Unescape View File

@ -26,7 +26,7 @@ class TQListViewItem;
class KToggleAction; class KToggleAction;
class KSelectAction; class KSelectAction;
class KToolBarPopupAction; class KToolBarPopupAction;
class KGlobalAccel; class TDEGlobalAccel;
class SliderAction; class SliderAction;
class StatusLabel; class StatusLabel;
@ -91,7 +91,7 @@ private:
KSelectAction *m_outputSelectAction; KSelectAction *m_outputSelectAction;
PlayerManager *m_player; PlayerManager *m_player;
KGlobalAccel *m_accel; TDEGlobalAccel *m_accel;
bool m_startDocked; bool m_startDocked;
bool m_showSplash; bool m_showSplash;

4
juk/k3bexporter.cpp
Unescape View File

@ -164,7 +164,7 @@ void K3bExporter::exportViaCmdLine(const PlaylistItemList &items)
return; return;
} }
KProcess *process = new KProcess; TDEProcess *process = new TDEProcess;
*process << "k3b"; *process << "k3b";
*process << cmdOption; *process << cmdOption;
@ -173,7 +173,7 @@ void K3bExporter::exportViaCmdLine(const PlaylistItemList &items)
for(it = items.begin(); it != items.end(); ++it) for(it = items.begin(); it != items.end(); ++it)
*process << (*it)->file().absFilePath(); *process << (*it)->file().absFilePath();
if(!process->start(KProcess::DontCare)) if(!process->start(TDEProcess::DontCare))
KMessageBox::error(m_parent, i18n("Unable to start K3b.")); KMessageBox::error(m_parent, i18n("Unable to start K3b."));
} }

16
juk/keydialog.cpp
Unescape View File

@ -74,7 +74,7 @@ const KeyDialog::KeyInfo KeyDialog::keyInfo[] = {
const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]); 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) TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok) : KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok)
{ {
@ -82,7 +82,7 @@ KeyDialog::KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection,
int selectedButton; int selectedButton;
KConfigGroup config(KGlobal::config(), "Shortcuts"); KConfigGroup config(TDEGlobal::config(), "Shortcuts");
selectedButton = config.readNumEntry("GlobalKeys", StandardKeys); selectedButton = config.readNumEntry("GlobalKeys", StandardKeys);
// Create widgets for key chooser - widget stack used to replace key chooser // 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) int selectedButton)
{ {
m_keys = keys; m_keys = keys;
@ -137,9 +137,9 @@ int KeyDialog::configure()
int retcode = exec(); int retcode = exec();
if(retcode == Accepted) { if(retcode == Accepted) {
KConfigGroup config(KGlobal::config(), "Shortcuts"); KConfigGroup config(TDEGlobal::config(), "Shortcuts");
config.writeEntry("GlobalKeys", m_group->id(m_group->selected())); config.writeEntry("GlobalKeys", m_group->id(m_group->selected()));
KGlobal::config()->sync(); TDEGlobal::config()->sync();
m_pKeyChooser->save(); m_pKeyChooser->save();
} }
@ -148,7 +148,7 @@ int KeyDialog::configure()
void KeyDialog::slotKeys(int group) void KeyDialog::slotKeys(int group)
{ {
bool fourModKeys = KGlobalAccel::useFourModifierKeys(); bool fourModKeys = TDEGlobalAccel::useFourModifierKeys();
// Set modifier keys according to key group and modifier keys // Set modifier keys according to key group and modifier keys
@ -171,7 +171,7 @@ void KeyDialog::slotDefault()
m_pKeyChooser->allDefault(); m_pKeyChooser->allDefault();
} }
int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection, int KeyDialog::configure(TDEGlobalAccel *keys, KActionCollection *actionCollection,
TQWidget *parent) TQWidget *parent)
{ {
// Create and show dialog - update connections if accepted // Create and show dialog - update connections if accepted
@ -183,7 +183,7 @@ int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection
return retcode; 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) const TQObject *objSlot, const char *methodSlot)
{ {
KShortcut def3 = KShortcut::null(); KShortcut def3 = KShortcut::null();

12
juk/keydialog.h
Unescape View File

@ -32,7 +32,7 @@ public:
/** /**
* Constructs a KeyDialog called @p name as a child of @p parent. * 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. * Destructor. Deletes all resources used by a KeyDialog object.
@ -44,13 +44,13 @@ public:
* accelerators and actions. It behaves essentially like the functions * accelerators and actions. It behaves essentially like the functions
* in KKeyDialog. * 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 * 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); const TQObject *objSlot, const char *methodSlot);
private: private:
@ -65,7 +65,7 @@ private:
KShortcut shortcut[3][2]; KShortcut shortcut[3][2];
}; };
void newDialog(KGlobalAccel *keys, KActionCollection *actionCollection, int selectedButton = 0); void newDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection, int selectedButton = 0);
int configure(); int configure();
private slots: private slots:
@ -74,7 +74,7 @@ private slots:
private: private:
KActionCollection *m_actionCollection; KActionCollection *m_actionCollection;
KGlobalAccel *m_keys; TDEGlobalAccel *m_keys;
KKeyChooser *m_pKeyChooser; KKeyChooser *m_pKeyChooser;
TQHButtonGroup *m_group; TQHButtonGroup *m_group;
TQWidgetStack *m_widgetStack; TQWidgetStack *m_widgetStack;

2
juk/main.cpp
Unescape View File

@ -88,7 +88,7 @@ int main(int argc, char *argv[])
bool startDocked; bool startDocked;
KConfigGroup config(KGlobal::config(), "Settings"); KConfigGroup config(TDEGlobal::config(), "Settings");
startDocked = config.readBoolEntry("StartDocked", false); startDocked = config.readBoolEntry("StartDocked", false);
if(!startDocked) if(!startDocked)

22
juk/playlist.cpp
Unescape View File

@ -144,7 +144,7 @@ public:
*/ */
void setColumnOrder(const Playlist *l); void setColumnOrder(const Playlist *l);
void toggleColumnVisible(int column); void toggleColumnVisible(int column);
void setInlineCompletionMode(KGlobalSettings::Completion mode); void setInlineCompletionMode(TDEGlobalSettings::Completion mode);
/** /**
* Apply the settings. * Apply the settings.
@ -162,7 +162,7 @@ private:
static SharedSettings *m_instance; static SharedSettings *m_instance;
TQValueList<int> m_columnOrder; TQValueList<int> m_columnOrder;
TQValueVector<bool> m_columnsVisible; TQValueVector<bool> m_columnsVisible;
KGlobalSettings::Completion m_inlineCompletion; TDEGlobalSettings::Completion m_inlineCompletion;
}; };
Playlist::SharedSettings *Playlist::SharedSettings::m_instance = 0; Playlist::SharedSettings *Playlist::SharedSettings::m_instance = 0;
@ -200,7 +200,7 @@ void Playlist::SharedSettings::toggleColumnVisible(int column)
writeConfig(); writeConfig();
} }
void Playlist::SharedSettings::setInlineCompletionMode(KGlobalSettings::Completion mode) void Playlist::SharedSettings::setInlineCompletionMode(TDEGlobalSettings::Completion mode)
{ {
m_inlineCompletion = mode; m_inlineCompletion = mode;
writeConfig(); writeConfig();
@ -235,7 +235,7 @@ void Playlist::SharedSettings::apply(Playlist *l) const
Playlist::SharedSettings::SharedSettings() Playlist::SharedSettings::SharedSettings()
{ {
KConfigGroup config(KGlobal::config(), "PlaylistShared"); KConfigGroup config(TDEGlobal::config(), "PlaylistShared");
bool resizeColumnsManually = config.readBoolEntry("ResizeColumnsManually", false); bool resizeColumnsManually = config.readBoolEntry("ResizeColumnsManually", false);
action<KToggleAction>("resizeColumnsManually")->setChecked(resizeColumnsManually); action<KToggleAction>("resizeColumnsManually")->setChecked(resizeColumnsManually);
@ -275,8 +275,8 @@ Playlist::SharedSettings::SharedSettings()
} }
} }
m_inlineCompletion = KGlobalSettings::Completion( m_inlineCompletion = TDEGlobalSettings::Completion(
config.readNumEntry("InlineCompletionMode", KGlobalSettings::CompletionAuto)); config.readNumEntry("InlineCompletionMode", TDEGlobalSettings::CompletionAuto));
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -285,7 +285,7 @@ Playlist::SharedSettings::SharedSettings()
void Playlist::SharedSettings::writeConfig() void Playlist::SharedSettings::writeConfig()
{ {
KConfigGroup config(KGlobal::config(), "PlaylistShared"); KConfigGroup config(TDEGlobal::config(), "PlaylistShared");
config.writeEntry("ColumnOrder", m_columnOrder); config.writeEntry("ColumnOrder", m_columnOrder);
TQValueList<int> l; TQValueList<int> l;
@ -297,7 +297,7 @@ void Playlist::SharedSettings::writeConfig()
config.writeEntry("ResizeColumnsManually", manualResize()); 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)), connect(header(), TQT_SIGNAL(sizeChange(int, int, int)),
this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); this, TQT_SLOT(slotColumnSizeChanged(int, int, int)));
connect(renameLineEdit(), TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), connect(renameLineEdit(), TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
this, TQT_SLOT(slotInlineCompletionModeChanged(KGlobalSettings::Completion))); this, TQT_SLOT(slotInlineCompletionModeChanged(TDEGlobalSettings::Completion)));
connect(action("resizeColumnsManually"), TQT_SIGNAL(activated()), connect(action("resizeColumnsManually"), TQT_SIGNAL(activated()),
this, TQT_SLOT(slotColumnResizeModeChanged())); this, TQT_SLOT(slotColumnResizeModeChanged()));
@ -2314,7 +2314,7 @@ void Playlist::slotColumnSizeChanged(int column, int, int newSize)
m_columnFixedWidths[column] = newSize; m_columnFixedWidths[column] = newSize;
} }
void Playlist::slotInlineCompletionModeChanged(KGlobalSettings::Completion mode) void Playlist::slotInlineCompletionModeChanged(TDEGlobalSettings::Completion mode)
{ {
SharedSettings::instance()->setInlineCompletionMode(mode); SharedSettings::instance()->setInlineCompletionMode(mode);
} }

2
juk/playlist.h
Unescape View File

@ -636,7 +636,7 @@ private slots:
* magic of the SharedSettings class will apply it to the other playlists as * magic of the SharedSettings class will apply it to the other playlists as
* well. * well.
*/ */
void slotInlineCompletionModeChanged(KGlobalSettings::Completion mode); void slotInlineCompletionModeChanged(TDEGlobalSettings::Completion mode);
void slotPlayCurrent(); void slotPlayCurrent();

8
juk/playlistbox.cpp
Unescape View File

@ -256,15 +256,15 @@ void PlaylistBox::removePlaylist(Playlist *playlist)
void PlaylistBox::readConfig() void PlaylistBox::readConfig()
{ {
KConfigGroup config(KGlobal::config(), "PlaylistBox"); KConfigGroup config(TDEGlobal::config(), "PlaylistBox");
m_viewModeIndex = config.readNumEntry("ViewMode", 0); m_viewModeIndex = config.readNumEntry("ViewMode", 0);
} }
void PlaylistBox::saveConfig() void PlaylistBox::saveConfig()
{ {
KConfigGroup config(KGlobal::config(), "PlaylistBox"); KConfigGroup config(TDEGlobal::config(), "PlaylistBox");
config.writeEntry("ViewMode", action<KSelectAction>("viewModeMenu")->currentItem()); config.writeEntry("ViewMode", action<KSelectAction>("viewModeMenu")->currentItem());
KGlobal::config()->sync(); TDEGlobal::config()->sync();
} }
void PlaylistBox::remove() void PlaylistBox::remove()
@ -672,7 +672,7 @@ void PlaylistBox::setupItem(Item *item)
void PlaylistBox::setupUpcomingPlaylist() void PlaylistBox::setupUpcomingPlaylist()
{ {
KConfigGroup config(KGlobal::config(), "Playlists"); KConfigGroup config(TDEGlobal::config(), "Playlists");
bool enable = config.readBoolEntry("showUpcoming", false); bool enable = config.readBoolEntry("showUpcoming", false);
setUpcomingPlaylistEnabled(enable); setUpcomingPlaylistEnabled(enable);

4
juk/playlistcollection.cpp
Unescape View File

@ -811,7 +811,7 @@ void PlaylistCollection::newItems(const KFileItemList &list) const
void PlaylistCollection::readConfig() void PlaylistCollection::readConfig()
{ {
KConfigGroup config(KGlobal::config(), "Playlists"); KConfigGroup config(TDEGlobal::config(), "Playlists");
m_importPlaylists = config.readBoolEntry("ImportPlaylists", true); m_importPlaylists = config.readBoolEntry("ImportPlaylists", true);
m_folderList = config.readPathListEntry("DirectoryList"); m_folderList = config.readPathListEntry("DirectoryList");
@ -822,7 +822,7 @@ void PlaylistCollection::readConfig()
void PlaylistCollection::saveConfig() void PlaylistCollection::saveConfig()
{ {
KConfigGroup config(KGlobal::config(), "Playlists"); KConfigGroup config(TDEGlobal::config(), "Playlists");
config.writeEntry("ImportPlaylists", m_importPlaylists); config.writeEntry("ImportPlaylists", m_importPlaylists);
config.writeEntry("showUpcoming", action<KToggleAction>("showUpcoming")->isChecked()); config.writeEntry("showUpcoming", action<KToggleAction>("showUpcoming")->isChecked());
config.writePathEntry("DirectoryList", m_folderList); config.writePathEntry("DirectoryList", m_folderList);

4
juk/playlistsplitter.cpp
Unescape View File

@ -188,7 +188,7 @@ void PlaylistSplitter::setupLayout()
void PlaylistSplitter::readConfig() void PlaylistSplitter::readConfig()
{ {
KConfigGroup config(KGlobal::config(), "Splitter"); KConfigGroup config(TDEGlobal::config(), "Splitter");
TQValueList<int> splitterSizes = config.readIntListEntry("PlaylistSplitterSizes"); TQValueList<int> splitterSizes = config.readIntListEntry("PlaylistSplitterSizes");
if(splitterSizes.isEmpty()) { if(splitterSizes.isEmpty()) {
@ -204,7 +204,7 @@ void PlaylistSplitter::readConfig()
void PlaylistSplitter::saveConfig() void PlaylistSplitter::saveConfig()
{ {
KConfigGroup config(KGlobal::config(), "Splitter"); KConfigGroup config(TDEGlobal::config(), "Splitter");
config.writeEntry("PlaylistSplitterSizes", sizes()); config.writeEntry("PlaylistSplitterSizes", sizes());
config.writeEntry("ShowSearch", action<KToggleAction>("showSearch")->isChecked()); config.writeEntry("ShowSearch", action<KToggleAction>("showSearch")->isChecked());
} }

2
juk/systemtray.cpp
Unescape View File

@ -417,7 +417,7 @@ bool SystemTray::buttonsToLeft() const
NETRect frame, win; NETRect frame, win;
ni.kdeGeometry(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 // This seems to accurately guess what side of the icon that
// KPassivePopup will popup on. // KPassivePopup will popup on.

12
juk/tageditor.cpp
Unescape View File

@ -422,7 +422,7 @@ void TagEditor::readConfig()
{ {
// combo box completion modes // combo box completion modes
KConfigGroup config(KGlobal::config(), "TagEditor"); KConfigGroup config(TDEGlobal::config(), "TagEditor");
if(m_artistNameBox && m_albumNameBox) { if(m_artistNameBox && m_albumNameBox) {
readCompletionMode(&config, m_artistNameBox, "ArtistNameBoxMode"); readCompletionMode(&config, m_artistNameBox, "ArtistNameBoxMode");
readCompletionMode(&config, m_albumNameBox, "AlbumNameBoxMode"); readCompletionMode(&config, m_albumNameBox, "AlbumNameBoxMode");
@ -447,8 +447,8 @@ void TagEditor::readConfig()
void TagEditor::readCompletionMode(KConfigBase *config, KComboBox *box, const TQString &key) void TagEditor::readCompletionMode(KConfigBase *config, KComboBox *box, const TQString &key)
{ {
KGlobalSettings::Completion mode = TDEGlobalSettings::Completion mode =
KGlobalSettings::Completion(config->readNumEntry(key, KGlobalSettings::CompletionAuto)); TDEGlobalSettings::Completion(config->readNumEntry(key, TDEGlobalSettings::CompletionAuto));
box->setCompletionMode(mode); box->setCompletionMode(mode);
} }
@ -457,7 +457,7 @@ void TagEditor::saveConfig()
{ {
// combo box completion modes // combo box completion modes
KConfigGroup config(KGlobal::config(), "TagEditor"); KConfigGroup config(TDEGlobal::config(), "TagEditor");
if(m_artistNameBox && m_albumNameBox) { if(m_artistNameBox && m_albumNameBox) {
config.writeEntry("ArtistNameBoxMode", m_artistNameBox->completionMode()); config.writeEntry("ArtistNameBoxMode", m_artistNameBox->completionMode());
@ -498,14 +498,14 @@ void TagEditor::setupLayout()
{ // just for organization { // just for organization
m_artistNameBox = new KComboBox(true, this, "artistNameBox"); 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"); addItem(i18n("&Artist name:"), m_artistNameBox, leftColumnLayout, "personal");
m_trackNameBox = new KLineEdit(this, "trackNameBox"); m_trackNameBox = new KLineEdit(this, "trackNameBox");
addItem(i18n("&Track name:"), m_trackNameBox, leftColumnLayout, "player_play"); addItem(i18n("&Track name:"), m_trackNameBox, leftColumnLayout, "player_play");
m_albumNameBox = new KComboBox(true, this, "albumNameBox"); 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"); addItem(i18n("Album &name:"), m_albumNameBox, leftColumnLayout, "cdrom_unmount");
m_genreBox = new KComboBox(true, this, "genreBox"); m_genreBox = new KComboBox(true, this, "genreBox");

4
juk/tagguesser.cpp
Unescape View File

@ -93,7 +93,7 @@ TQString FileNameScheme::composeRegExp(const TQString &s) const
{ {
TQMap<TQChar, TQString> substitutions; TQMap<TQChar, TQString> substitutions;
KConfigGroup config(KGlobal::config(), "TagGuesser"); KConfigGroup config(TDEGlobal::config(), "TagGuesser");
substitutions[ 't' ] = config.readEntry("Title regexp", "([\\w\\s'&_,\\.]+)"); substitutions[ 't' ] = config.readEntry("Title regexp", "([\\w\\s'&_,\\.]+)");
substitutions[ 'a' ] = config.readEntry("Artist regexp", "([\\w\\s'&_,\\.]+)"); substitutions[ 'a' ] = config.readEntry("Artist regexp", "([\\w\\s'&_,\\.]+)");
@ -113,7 +113,7 @@ TQStringList TagGuesser::schemeStrings()
{ {
TQStringList schemes; TQStringList schemes;
KConfigGroup config(KGlobal::config(), "TagGuesser"); KConfigGroup config(TDEGlobal::config(), "TagGuesser");
schemes = config.readListEntry("Filename schemes"); schemes = config.readListEntry("Filename schemes");
if ( schemes.isEmpty() ) { if ( schemes.isEmpty() ) {

4
juk/tagrenameroptions.cpp
Unescape View File

@ -64,7 +64,7 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category)
// Make sure we don't use translated strings for the config file keys. // Make sure we don't use translated strings for the config file keys.
TQString typeKey = tagTypeText(category.category, false); TQString typeKey = tagTypeText(category.category, false);
KConfigGroup config(KGlobal::config(), "FileRenamer"); KConfigGroup config(TDEGlobal::config(), "FileRenamer");
if(categoryNum > 0) if(categoryNum > 0)
typeKey.append(TQString::number(categoryNum)); typeKey.append(TQString::number(categoryNum));
@ -115,7 +115,7 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const
if(categoryNum > 0) if(categoryNum > 0)
typeKey.append(TQString::number(categoryNum)); 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("%1Suffix").arg(typeKey), suffix());
config.writeEntry(TQString("%1Prefix").arg(typeKey), prefix()); config.writeEntry(TQString("%1Prefix").arg(typeKey), prefix());

4
kaboodle/conf.cpp
Unescape View File

@ -39,7 +39,7 @@ Kaboodle::Conf::Conf(TQWidget *_parent, const char *_name)
autoPlay = new TQCheckBox(i18n("Start playing automatically"), box); autoPlay = new TQCheckBox(i18n("Start playing automatically"), box);
quitAfterPlaying = new TQCheckBox(i18n("Quit when finished playing"), box); quitAfterPlaying = new TQCheckBox(i18n("Quit when finished playing"), box);
KConfig &config = *KGlobal::config(); KConfig &config = *TDEGlobal::config();
config.setGroup("core"); config.setGroup("core");
autoPlay->setChecked(config.readBoolEntry("autoPlay", true)); autoPlay->setChecked(config.readBoolEntry("autoPlay", true));
quitAfterPlaying->setChecked(config.readBoolEntry("quitAfterPlaying", true)); quitAfterPlaying->setChecked(config.readBoolEntry("quitAfterPlaying", true));
@ -47,7 +47,7 @@ Kaboodle::Conf::Conf(TQWidget *_parent, const char *_name)
void Kaboodle::Conf::accept(void) void Kaboodle::Conf::accept(void)
{ {
KConfig &config = *KGlobal::config(); KConfig &config = *TDEGlobal::config();
config.setGroup("core"); config.setGroup("core");
config.writeEntry("autoPlay", autoPlay->isChecked()); config.writeEntry("autoPlay", autoPlay->isChecked());
config.writeEntry("quitAfterPlaying", quitAfterPlaying->isChecked()); config.writeEntry("quitAfterPlaying", quitAfterPlaying->isChecked());

6
kaboodle/userinterface.cpp
Unescape View File

@ -78,7 +78,7 @@ Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile
setIcon(SmallIcon("kaboodle")); setIcon(SmallIcon("kaboodle"));
resize(320, minimumHeight()); resize(320, minimumHeight());
applyMainWindowSettings(KGlobal::config()); applyMainWindowSettings(TDEGlobal::config());
menubarAction->setChecked(!menuBar()->isHidden()); menubarAction->setChecked(!menuBar()->isHidden());
applySettings(); applySettings();
@ -104,7 +104,7 @@ void Kaboodle::UserInterface::slotConfigureKeys()
Kaboodle::UserInterface::~UserInterface(void) Kaboodle::UserInterface::~UserInterface(void)
{ {
saveMainWindowSettings(KGlobal::config()); saveMainWindowSettings(TDEGlobal::config());
} }
void Kaboodle::UserInterface::fileOpen(void) void Kaboodle::UserInterface::fileOpen(void)
@ -143,7 +143,7 @@ void Kaboodle::UserInterface::playerPreferences(void)
void Kaboodle::UserInterface::applySettings(void) void Kaboodle::UserInterface::applySettings(void)
{ {
View *view = static_cast<View *>(part->view()); View *view = static_cast<View *>(part->view());
KConfig &config = *KGlobal::config(); KConfig &config = *TDEGlobal::config();
config.setGroup("core"); config.setGroup("core");
view->setAutoPlay(config.readBoolEntry("autoPlay", true)); view->setAutoPlay(config.readBoolEntry("autoPlay", true));
view->setQuitAfterPlaying(config.readBoolEntry("quitAfterPlaying", true)); view->setQuitAfterPlaying(config.readBoolEntry("quitAfterPlaying", true));

14
kaudiocreator/encoder.cpp
Unescape View File

@ -212,11 +212,11 @@ void Encoder::tendToNewJobs() {
proc->setPriority(Prefs::niceLevel()); proc->setPriority(Prefs::niceLevel());
*proc << TQFile::encodeName(command).data(); *proc << TQFile::encodeName(command).data();
connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )), connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
this, TQT_SLOT(receivedThreadOutput(KProcess *, char *, int ))); this, TQT_SLOT(receivedThreadOutput(TDEProcess *, char *, int )));
connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int )), connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )),
this, TQT_SLOT(receivedThreadOutput(KProcess *, char *, int ))); this, TQT_SLOT(receivedThreadOutput(TDEProcess *, char *, int )));
connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(jobDone(KProcess *))); connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(jobDone(TDEProcess *)));
jobs.insert(proc, job); jobs.insert(proc, job);
threads.append(proc); threads.append(proc);
@ -230,7 +230,7 @@ void Encoder::tendToNewJobs() {
* @param buffer the output from the process * @param buffer the output from the process
* @param buflen the length of the buffer. * @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) if ( Prefs::fullDecoderDebug() && buffer)
kdDebug(60002) << buffer << endl; 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. * When the process is done encoding a file this function is called.
* @param job the job that just finished. * @param job the job that just finished.
*/ */
void Encoder::jobDone(KProcess *process ) { void Encoder::jobDone(TDEProcess *process ) {
// Normal error checking here. // Normal error checking here.
if ( !process) if ( !process)
return; return;

4
kaudiocreator/encoder.h
Unescape View File

@ -53,8 +53,8 @@ public slots:
EncoderPrefs* loadEncoder( int encoder ); EncoderPrefs* loadEncoder( int encoder );
private slots: private slots:
void receivedThreadOutput(KProcess *process, char *buffer, int buflen); void receivedThreadOutput(TDEProcess *process, char *buffer, int buflen);
void jobDone(KProcess *process); void jobDone(TDEProcess *process);
void tendToNewJobs(); void tendToNewJobs();
private: private:

6
kaudiocreator/encoderconfigimp.cpp
Unescape View File

@ -186,7 +186,7 @@ void EncoderConfigImp::configureEncoderSlot() {
return; return;
} }
TQString groupName = encoderNames[kcfg_currentEncoder->currentText()]; TQString groupName = encoderNames[kcfg_currentEncoder->currentText()];
KConfig &config = *KGlobal::config(); KConfig &config = *TDEGlobal::config();
if(!config.hasGroup(groupName)) if(!config.hasGroup(groupName))
return; return;
@ -272,13 +272,13 @@ EncoderPrefs *EncoderPrefs::prefs(const TQString &groupName)
bool EncoderPrefs::hasPrefs(const TQString &groupName) bool EncoderPrefs::hasPrefs(const TQString &groupName)
{ {
KConfig &config = *KGlobal::config(); KConfig &config = *TDEGlobal::config();
return config.hasGroup(groupName); return config.hasGroup(groupName);
} }
void EncoderPrefs::deletePrefs(const TQString &groupName) void EncoderPrefs::deletePrefs(const TQString &groupName)
{ {
KConfig &config = *KGlobal::config(); KConfig &config = *TDEGlobal::config();
config.deleteGroup(groupName); config.deleteGroup(groupName);
if (!m_prefs) if (!m_prefs)
return; return;

2
kaudiocreator/main.cpp
Unescape View File

@ -43,7 +43,7 @@ int main(int argc, char *argv[]){
KAudioCreator *app = new KAudioCreator(0, "MainWindow"); KAudioCreator *app = new KAudioCreator(0, "MainWindow");
// we need some strings from libkcddb for the cddb album dialog // we need some strings from libkcddb for the cddb album dialog
KGlobal::locale()->insertCatalogue("libkcddb"); TDEGlobal::locale()->insertCatalogue("libkcddb");
a.setMainWidget(app); a.setMainWidget(app);

2
kaudiocreator/tracksimp.h
Unescape View File

@ -38,7 +38,7 @@
using namespace KCDDB; using namespace KCDDB;
class Job; class Job;
class KProcess; class TDEProcess;
class KCompactDisc; class KCompactDisc;
class TracksItem : public KListViewItem class TracksItem : public KListViewItem

24
kioslave/audiocd/plugins/lame/collectingprocess.cpp
Unescape View File

@ -48,7 +48,7 @@ struct CollectingProcess::Private {
CollectingProcess::CollectingProcess( TQObject * parent, const char * name ) CollectingProcess::CollectingProcess( TQObject * parent, const char * name )
: KProcess( parent, name ) : TDEProcess( parent, name )
{ {
d = new Private(); d = new Private();
} }
@ -59,23 +59,23 @@ CollectingProcess::~CollectingProcess() {
bool CollectingProcess::start( RunMode runmode, Communication comm ) { bool CollectingProcess::start( RunMode runmode, Communication comm ) {
// prevent duplicate connection // prevent duplicate connection
disconnect( this, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), disconnect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) ); this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
if ( comm & Stdout ) { if ( comm & Stdout ) {
connect( this, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ), connect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) ); this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
} }
// prevent duplicate connection // prevent duplicate connection
disconnect( this, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ), disconnect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) ); this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
if ( comm & Stderr ) { if ( comm & Stderr ) {
connect( this, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ), connect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( KProcess *, 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; TQByteArray b;
b.duplicate( buf, len ); b.duplicate( buf, len );
@ -83,7 +83,7 @@ void CollectingProcess::slotReceivedStdout( KProcess *, char *buf, int len )
d->stdoutSize += len; d->stdoutSize += len;
} }
void CollectingProcess::slotReceivedStderr( KProcess *, char *buf, int len ) void CollectingProcess::slotReceivedStderr( TDEProcess *, char *buf, int len )
{ {
TQByteArray b; TQByteArray b;
b.duplicate( buf, len ); b.duplicate( buf, len );

10
kioslave/audiocd/plugins/lame/collectingprocess.h
Unescape View File

@ -36,14 +36,14 @@
#include <kprocess.h> #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. * (stdout/stderr) of the process.
* *
* @author Ingo Kloecker <kloecker@kde.org> * @author Ingo Kloecker <kloecker@kde.org>
*/ */
class CollectingProcess : public KProcess { class CollectingProcess : public TDEProcess {
Q_OBJECT Q_OBJECT
public: public:
@ -61,8 +61,8 @@ public:
TQByteArray collectedStderr(); TQByteArray collectedStderr();
private slots: private slots:
void slotReceivedStdout( KProcess *, char *, int ); void slotReceivedStdout( TDEProcess *, char *, int );
void slotReceivedStderr( KProcess *, char *, int ); void slotReceivedStderr( TDEProcess *, char *, int );
private: private:
class Private; class Private;

36
kioslave/audiocd/plugins/lame/encoderlame.cpp
Unescape View File

@ -53,7 +53,7 @@ public:
TQString lastErrorMessage; TQString lastErrorMessage;
TQStringList genreList; TQStringList genreList;
uint lastSize; uint lastSize;
KProcess *currentEncodeProcess; TDEProcess *currentEncodeProcess;
KTempFile *tempFile; KTempFile *tempFile;
}; };
@ -71,7 +71,7 @@ EncoderLame::~EncoderLame(){
TQWidget* EncoderLame::getConfigureWidget(KConfigSkeleton** manager) const { TQWidget* EncoderLame::getConfigureWidget(KConfigSkeleton** manager) const {
(*manager) = Settings::self(); (*manager) = Settings::self();
KGlobal::locale()->insertCatalogue("audiocd_encoder_lame"); TDEGlobal::locale()->insertCatalogue("audiocd_encoder_lame");
EncoderLameConfig *config = new EncoderLameConfig(); EncoderLameConfig *config = new EncoderLameConfig();
config->cbr_settings->hide(); config->cbr_settings->hide();
return config; return config;
@ -86,7 +86,7 @@ bool EncoderLame::init(){
// e.g. lame --tg 'Vocal Jazz' // e.g. lame --tg 'Vocal Jazz'
CollectingProcess proc; CollectingProcess proc;
proc << "lame" << "--genre-list"; proc << "lame" << "--genre-list";
proc.start(KProcess::Block, KProcess::Stdout); proc.start(TDEProcess::Block, TDEProcess::Stdout);
if(proc.exitStatus() != 0) if(proc.exitStatus() != 0)
return false; return false;
@ -210,8 +210,8 @@ unsigned long EncoderLame::size(long time_secs) const {
} }
long EncoderLame::readInit(long /*size*/){ long EncoderLame::readInit(long /*size*/){
// Create KProcess // Create TDEProcess
d->currentEncodeProcess = new KProcess(0); d->currentEncodeProcess = new TDEProcess(0);
TQString prefix = locateLocal("tmp", ""); TQString prefix = locateLocal("tmp", "");
d->tempFile = new KTempFile(prefix, ".mp3"); d->tempFile = new KTempFile(prefix, ".mp3");
d->tempFile->setAutoDelete(true); d->tempFile->setAutoDelete(true);
@ -237,38 +237,38 @@ long EncoderLame::readInit(long /*size*/){
//kdDebug(7117) << d->currentEncodeProcess->args() << endl; //kdDebug(7117) << d->currentEncodeProcess->args() << endl;
connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
this, TQT_SLOT(receivedStdout(KProcess *, char *, int))); this, TQT_SLOT(receivedStdout(TDEProcess *, char *, int)));
connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
this, TQT_SLOT(receivedStderr(KProcess *, char *, int))); this, TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
connect(d->currentEncodeProcess, TQT_SIGNAL(wroteStdin(KProcess *)), connect(d->currentEncodeProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)),
this, TQT_SLOT(wroteStdin(KProcess *))); this, TQT_SLOT(wroteStdin(TDEProcess *)));
connect(d->currentEncodeProcess, TQT_SIGNAL(processExited(KProcess *)), connect(d->currentEncodeProcess, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(processExited(KProcess *))); this, TQT_SLOT(processExited(TDEProcess *)));
// Launch! // Launch!
d->currentEncodeProcess->start(KProcess::NotifyOnExit, KShellProcess::All); d->currentEncodeProcess->start(TDEProcess::NotifyOnExit, KShellProcess::All);
return 0; return 0;
} }
void EncoderLame::processExited ( KProcess *process ){ void EncoderLame::processExited ( TDEProcess *process ){
kdDebug(7117) << "Lame Encoding process exited with: " << process->exitStatus() << endl; kdDebug(7117) << "Lame Encoding process exited with: " << process->exitStatus() << endl;
d->processHasExited = true; 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; kdDebug(7117) << "Lame stderr: " << buffer << endl;
if ( !d->lastErrorMessage.isEmpty() ) if ( !d->lastErrorMessage.isEmpty() )
d->lastErrorMessage += '\t'; d->lastErrorMessage += '\t';
d->lastErrorMessage += TQString::fromLocal8Bit( buffer ); 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; kdDebug(7117) << "Lame stdout: " << buffer << endl;
} }
void EncoderLame::wroteStdin( KProcess * /*procces*/ ){ void EncoderLame::wroteStdin( TDEProcess * /*procces*/ ){
d->waitingForWrite = false; d->waitingForWrite = false;
} }

10
kioslave/audiocd/plugins/lame/encoderlame.h
Unescape View File

@ -21,7 +21,7 @@
#include "audiocdencoder.h" #include "audiocdencoder.h"
class KProcess; class TDEProcess;
/** /**
* MP3 encoder using the LAME encoder. * MP3 encoder using the LAME encoder.
@ -51,10 +51,10 @@ public:
virtual TQWidget* getConfigureWidget(KConfigSkeleton** manager) const; virtual TQWidget* getConfigureWidget(KConfigSkeleton** manager) const;
protected slots: protected slots:
void wroteStdin(KProcess *proc); void wroteStdin(TDEProcess *proc);
void receivedStdout(KProcess *, char *buffer, int length); void receivedStdout(TDEProcess *, char *buffer, int length);
void receivedStderr(KProcess *proc, char *buffer, int buflen); void receivedStderr(TDEProcess *proc, char *buffer, int buflen);
void processExited(KProcess *proc); void processExited(TDEProcess *proc);
private: private:
class Private; class Private;

2
kioslave/audiocd/plugins/vorbis/encodervorbis.cpp
Unescape View File

@ -81,7 +81,7 @@ EncoderVorbis::~EncoderVorbis(){
TQWidget* EncoderVorbis::getConfigureWidget(KConfigSkeleton** manager) const { TQWidget* EncoderVorbis::getConfigureWidget(KConfigSkeleton** manager) const {
(*manager) = Settings::self(); (*manager) = Settings::self();
KGlobal::locale()->insertCatalogue("audiocd_encoder_vorbis"); TDEGlobal::locale()->insertCatalogue("audiocd_encoder_vorbis");
EncoderVorbisConfig *config = new EncoderVorbisConfig(); EncoderVorbisConfig *config = new EncoderVorbisConfig();
config->kcfg_vorbis_quality->setRange(0.0, 10.0, 0.2, true); config->kcfg_vorbis_quality->setRange(0.0, 10.0, 0.2, true);
config->vorbis_bitrate_settings->hide(); config->vorbis_bitrate_settings->hide();

2
kmid/channel.cpp
Unescape View File

@ -50,7 +50,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
penW = new TQPen (white); penW = new TQPen (white);
penT = new TQPen (colorGroup().background()); penT = new TQPen (colorGroup().background());
KConfig *kcfg=KGlobal::instance()->config(); KConfig *kcfg=TDEGlobal::instance()->config();
kcfg->setGroup("KMid"); kcfg->setGroup("KMid");
TQFont *qtextfontdefault=new TQFont("lucida",18,TQFont::Bold,TRUE); TQFont *qtextfontdefault=new TQFont("lucida",18,TQFont::Bold,TRUE);
qcvfont=new TQFont(kcfg->readFontEntry("ChannelViewFont",qtextfontdefault)); qcvfont=new TQFont(kcfg->readFontEntry("ChannelViewFont",qtextfontdefault));

12
kmid/kdisptext.cpp
Unescape View File

@ -52,14 +52,14 @@ KDisplayText::KDisplayText(TQWidget *parent,const char *name) : TQScrollView(par
first_line=NULL; first_line=NULL;
cursor=NULL; cursor=NULL;
nlines=0; nlines=0;
lyrics_codec=KGlobal::locale()->codecForEncoding(); lyrics_codec=TDEGlobal::locale()->codecForEncoding();
viewport()->setBackgroundColor(TQColor (110,110,110)); viewport()->setBackgroundColor(TQColor (110,110,110));
// setBackgroundMode(NoBackground); // setBackgroundMode(NoBackground);
KConfig *kcfg=KGlobal::instance()->config(); KConfig *kcfg=TDEGlobal::instance()->config();
kcfg->setGroup("KMid"); kcfg->setGroup("KMid");
typeoftextevents=kcfg->readNumEntry("TypeOfTextEvents",1); 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)); qtextfont=new TQFont(kcfg->readFontEntry("KaraokeFont",qtextfontdefault));
delete qtextfontdefault; delete qtextfontdefault;
qfmetr=new TQFontMetrics(*qtextfont); qfmetr=new TQFontMetrics(*qtextfont);
@ -333,7 +333,7 @@ void KDisplayText::resizeEvent(TQResizeEvent *e)
void KDisplayText::CursorToHome(void) void KDisplayText::CursorToHome(void)
{ {
/* KConfig *kcfg=KGlobal::instance()->config(); /* KConfig *kcfg=TDEGlobal::instance()->config();
kcfg->setGroup("KMid"); kcfg->setGroup("KMid");
typeoftextevents=kcfg->readNumEntry("TypeOfTextEvents",1); typeoftextevents=kcfg->readNumEntry("TypeOfTextEvents",1);
*/ */
@ -499,7 +499,7 @@ TQFont *KDisplayText::getFont(void)
void KDisplayText::fontChanged(void) void KDisplayText::fontChanged(void)
{ {
KConfig *kcfg=KGlobal::instance()->config(); KConfig *kcfg=TDEGlobal::instance()->config();
kcfg->setGroup("KMid"); kcfg->setGroup("KMid");
TQFont *qtextfontdefault=new TQFont(*qtextfont); TQFont *qtextfontdefault=new TQFont(*qtextfont);
delete qtextfont; delete qtextfont;
@ -623,7 +623,7 @@ void KDisplayText::setLyricsEncoding(const TQString &enc)
{ {
TQTextCodec *newcodec; TQTextCodec *newcodec;
if (enc.isEmpty()) if (enc.isEmpty())
newcodec=KGlobal::locale()->codecForEncoding(); newcodec=TDEGlobal::locale()->codecForEncoding();
else else
newcodec=TQTextCodec::codecForName(enc.latin1()); newcodec=TQTextCodec::codecForName(enc.latin1());

12
kmid/kmidclient.cpp
Unescape View File

@ -79,7 +79,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name
noteArray=0L; noteArray=0L;
shuttingdown=false; shuttingdown=false;
KConfig *kconf=KGlobal::instance()->config(); KConfig *kconf=TDEGlobal::instance()->config();
kconf->setGroup("KMid"); kconf->setGroup("KMid");
TQString tmp2 = locateLocal("appdata", "collections"); TQString tmp2 = locateLocal("appdata", "collections");
@ -118,7 +118,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name
comboEncodings = new TQComboBox(FALSE, this, "Encodings"); comboEncodings = new TQComboBox(FALSE, this, "Encodings");
connect (comboEncodings,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSelectEncoding(int))); connect (comboEncodings,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSelectEncoding(int)));
comboEncodings->insertItem(i18n("Default")); comboEncodings->insertItem(i18n("Default"));
comboEncodings->insertStringList( KGlobal::charsets()->descriptiveEncodingNames() ); comboEncodings->insertStringList( TDEGlobal::charsets()->descriptiveEncodingNames() );
comboEncodings->setCurrentItem(0); comboEncodings->setCurrentItem(0);
rhythmview= new RhythmView( this, "RhythmView"); 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())); connect (timer4events,TQT_SIGNAL(timeout()),this,TQT_SLOT(processSpecialEvent()));
TQString samplefile = TQString samplefile =
KGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last(); TDEGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last();
samplefile.truncate(samplefile.findRev('/')); samplefile.truncate(samplefile.findRev('/'));
FMOut::setFMPatchesDirectory(TQFile::encodeName(samplefile)); FMOut::setFMPatchesDirectory(TQFile::encodeName(samplefile));
@ -390,7 +390,7 @@ int kmidClient::openURL(const TQString _url)
{ {
r=openFile(filename_8bit.data()); r=openFile(filename_8bit.data());
KConfig *cfg=KGlobal::instance()->config(); KConfig *cfg=TDEGlobal::instance()->config();
if (cfg->readBoolEntry("deleteTmpNonLocalFiles",false)) if (cfg->readBoolEntry("deleteTmpNonLocalFiles",false))
{ {
unlink(filename_8bit.data()); unlink(filename_8bit.data());
@ -1208,7 +1208,7 @@ void kmidClient::setSLManager(SLManager *slm)
void kmidClient::setActiveCollection(int i) void kmidClient::setActiveCollection(int i)
{ {
activecollection=i; activecollection=i;
KConfig *kconf=KGlobal::instance()->config(); KConfig *kconf=TDEGlobal::instance()->config();
kconf->setGroup("KMid"); kconf->setGroup("KMid");
kconf->writeEntry("ActiveCollection",activecollection); kconf->writeEntry("ActiveCollection",activecollection);
@ -1601,6 +1601,6 @@ void kmidClient::slotSelectEncoding(int i)
if (i == 0) if (i == 0)
kdispt->setLyricsEncoding(TQString()); // Default kdispt->setLyricsEncoding(TQString()); // Default
else else
kdispt->setLyricsEncoding(KGlobal::charsets()->encodingForName(comboEncodings->text(i))); kdispt->setLyricsEncoding(TDEGlobal::charsets()->encodingForName(comboEncodings->text(i)));
} }
#include "kmidclient.moc" #include "kmidclient.moc"

2
kmid/midicfgdlg.cpp
Unescape View File

@ -104,7 +104,7 @@ void MidiConfigDialog::deviceselected(int idx)
void MidiConfigDialog::browseMap() 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('/')); path.truncate(path.findRev('/'));
KURL url = KFileDialog::getOpenURL(path,"*.map",this); KURL url = KFileDialog::getOpenURL(path,"*.map",this);

2
kmix/kmix.cpp
Unescape View File

@ -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( "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" ); (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(), m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString(),
KShortcut(TQString("XF86AudioRaiseVolume")), KShortcut(TQString("XF86AudioRaiseVolume")), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) ); KShortcut(TQString("XF86AudioRaiseVolume")), KShortcut(TQString("XF86AudioRaiseVolume")), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(), m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(),

4
kmix/kmix.h
Unescape View File

@ -38,7 +38,7 @@ class TQWidgetStack;
#include <kmainwindow.h> #include <kmainwindow.h>
class KAccel; class KAccel;
class KGlobalAccel; class TDEGlobalAccel;
class KComboBox; class KComboBox;
class KMixerWidget; class KMixerWidget;
class KMixerPrefWidget; class KMixerPrefWidget;
@ -92,7 +92,7 @@ KMixWindow : public KMainWindow
private: private:
KAccel *m_keyAccel; KAccel *m_keyAccel;
KGlobalAccel *m_globalAccel; TDEGlobalAccel *m_globalAccel;
TQPopupMenu *m_fileMenu; TQPopupMenu *m_fileMenu;
TQPopupMenu *m_viewMenu; TQPopupMenu *m_viewMenu;
TQPopupMenu *m_helpMenu; TQPopupMenu *m_helpMenu;

14
kmix/kmixapplet.cpp
Unescape View File

@ -68,7 +68,7 @@ extern "C"
{ {
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{ {
KGlobal::locale()->insertCatalogue("kmix"); TDEGlobal::locale()->insertCatalogue("kmix");
return new KMixApplet(configFile, KPanelApplet::Normal, return new KMixApplet(configFile, KPanelApplet::Normal,
parent, "kmixapplet"); parent, "kmixapplet");
} }
@ -77,8 +77,8 @@ extern "C"
int KMixApplet::s_instCount = 0; int KMixApplet::s_instCount = 0;
//<Mixer> KMixApplet::Mixer::mixers(); //<Mixer> KMixApplet::Mixer::mixers();
static const TQColor highColor = KGlobalSettings::baseColor(); static const TQColor highColor = TDEGlobalSettings::baseColor();
static const TQColor lowColor = KGlobalSettings::highlightColor(); static const TQColor lowColor = TDEGlobalSettings::highlightColor();
static const TQColor backColor = "#000000"; static const TQColor backColor = "#000000";
static const TQColor mutedHighColor = "#FFFFFF"; static const TQColor mutedHighColor = "#FFFFFF";
static const TQColor mutedLowColor = "#808080"; static const TQColor mutedLowColor = "#808080";
@ -172,7 +172,7 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t,
s_instCount++; s_instCount++;
kdDebug(67100) << "KMixApplet::KMixApplet instancing Applet, s_instCount="<< s_instCount << endl; 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(); loadConfig();
@ -521,9 +521,9 @@ void KMixApplet::applyPreferences()
void KMixApplet::paletteChange ( const TQPalette &) { void KMixApplet::paletteChange ( const TQPalette &) {
if ( ! _customColors ) { if ( ! _customColors ) {
// We take over Colors from paletteChange(), if the user has not set custom colors. // 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 // ignore the given TQPalette and use the values from TDEGlobalSettings instead
_colors.high = KGlobalSettings::highlightColor(); _colors.high = TDEGlobalSettings::highlightColor();
_colors.low = KGlobalSettings::baseColor(); _colors.low = TDEGlobalSettings::baseColor();
_colors.back = backColor; _colors.back = backColor;
setColors( _colors ); setColors( _colors );
} }

4
kmix/kmixctrl.cpp
Unescape View File

@ -73,7 +73,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
if ( args->isSet("restore") ) if ( args->isSet("restore") )
{ {
for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next()) { 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") ) if ( args->isSet("save") )
{ {
for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next()) for (Mixer *mixer=Mixer::mixers().first(); mixer!=0; mixer=Mixer::mixers().next())
mixer->volumeSave( KGlobal::config() ); mixer->volumeSave( TDEGlobal::config() );
} }
MixerToolBox::deinitMixer(); MixerToolBox::deinitMixer();

4
kmix/kmixtoolbox.cpp
Unescape View File

@ -142,7 +142,7 @@ void KMixToolBox::loadConfig(TQPtrList<TQWidget> &mdws, KConfig *config, const T
} }
mdw->setDisabled( !config->readBoolEntry("Show", true) ); mdw->setDisabled( !config->readBoolEntry("Show", true) );
KGlobalAccel *keys=mdw->keys(); TDEGlobalAccel *keys=mdw->keys();
if ( keys ) if ( keys )
{ {
TQString devgrpkeys; 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 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. today with "kmixapplet" and "kmix main application". It would really nice to rework this.
*/ */
KGlobalAccel *keys=mdw->keys(); TDEGlobalAccel *keys=mdw->keys();
if (keys) { if (keys) {
TQString devgrpkeys; TQString devgrpkeys;
devgrpkeys.sprintf( "%s.%s.Dev%i.keys", viewPrefix.ascii(), grp.ascii(), n ); devgrpkeys.sprintf( "%s.%s.Dev%i.keys", viewPrefix.ascii(), grp.ascii(), n );

4
kmix/ksmallslider.cpp
Unescape View File

@ -473,9 +473,9 @@ void KSmallSlider::paletteChange ( const TQPalette &) {
setColors(mutedLowColor2, mutedHighColor2, backColor2 ); setColors(mutedLowColor2, mutedHighColor2, backColor2 );
} }
else { 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(); //const TQColorGroup& qcg = palette().active();
setColors(KGlobalSettings::baseColor(), KGlobalSettings::highlightColor(), backColor2 ); setColors(TDEGlobalSettings::baseColor(), TDEGlobalSettings::highlightColor(), backColor2 );
} }
} }
*/ */

2
kmix/mdwenum.h
Unescape View File

@ -31,7 +31,7 @@ class TQBoxLayout;
class KAction; class KAction;
class KActionCollection; class KActionCollection;
class KComboBox; class KComboBox;
class KGlobalAccel; class TDEGlobalAccel;
class MixDevice; class MixDevice;
class Mixer; class Mixer;

2
kmix/mdwslider.h
Unescape View File

@ -42,7 +42,7 @@ class KLedButton;
class KAction; class KAction;
class KActionCollection; class KActionCollection;
class KSmallSlider; class KSmallSlider;
class KGlobalAccel; class TDEGlobalAccel;
class MixDevice; class MixDevice;
class VerticalText; class VerticalText;

2
kmix/mdwswitch.h
Unescape View File

@ -40,7 +40,7 @@ class KLedButton;
class KAction; class KAction;
class KActionCollection; class KActionCollection;
class KSmallSlider; class KSmallSlider;
class KGlobalAccel; class TDEGlobalAccel;
class MixDevice; class MixDevice;
class VerticalText; class VerticalText;

4
kmix/mixdevicewidget.cpp
Unescape View File

@ -59,7 +59,7 @@ MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md,
m_disabled( false ), _orientation( orientation ), m_small( small ) m_disabled( false ), _orientation( orientation ), m_small( small )
{ {
_mdwActions = new KActionCollection( this ); _mdwActions = new KActionCollection( this );
m_keys = new KGlobalAccel( TQT_TQOBJECT(this), "Keys" ); m_keys = new TDEGlobalAccel( TQT_TQOBJECT(this), "Keys" );
} }
MixDeviceWidget::~MixDeviceWidget() MixDeviceWidget::~MixDeviceWidget()
@ -79,7 +79,7 @@ bool MixDeviceWidget::isDisabled() const
} }
KGlobalAccel *MixDeviceWidget::keys( void ) TDEGlobalAccel *MixDeviceWidget::keys( void )
{ {
return m_keys; return m_keys;
} }

6
kmix/mixdevicewidget.h
Unescape View File

@ -43,7 +43,7 @@ class KLedButton;
class KAction; class KAction;
class KActionCollection; class KActionCollection;
class KSmallSlider; class KSmallSlider;
class KGlobalAccel; class TDEGlobalAccel;
class MixDevice; class MixDevice;
class VerticalText; class VerticalText;
@ -80,7 +80,7 @@ public:
virtual void setTicks( bool ) {}; virtual void setTicks( bool ) {};
virtual void setValueStyle( ValueStyle ) {}; virtual void setValueStyle( ValueStyle ) {};
virtual KGlobalAccel *keys(void); virtual TDEGlobalAccel *keys(void);
public slots: public slots:
virtual void setDisabled( bool value ); virtual void setDisabled( bool value );
@ -103,7 +103,7 @@ protected:
Mixer* m_mixer; Mixer* m_mixer;
MixDevice* m_mixdevice; MixDevice* m_mixdevice;
KActionCollection* _mdwActions; KActionCollection* _mdwActions;
KGlobalAccel* m_keys; TDEGlobalAccel* m_keys;
ViewBase* m_mixerwidget; ViewBase* m_mixerwidget;
bool m_disabled; bool m_disabled;
Qt::Orientation _orientation; Qt::Orientation _orientation;

4
kmix/viewswitches.cpp
Unescape View File

@ -170,8 +170,8 @@ void ViewSwitches::configurationUpdate() {
mdw->setBackgroundMode(PaletteBackground); mdw->setBackgroundMode(PaletteBackground);
} }
else { else {
// !! Should use KGlobalSettings::alternateBackgroundColor() // !! Should use TDEGlobalSettings::alternateBackgroundColor()
// or KGlobalSettings::calculateAlternateBackgroundColor() instead. // or TDEGlobalSettings::calculateAlternateBackgroundColor() instead.
mdw->setBackgroundMode( PaletteBase ); mdw->setBackgroundMode( PaletteBase );
} }
backGoundModeToggler = !backGoundModeToggler; backGoundModeToggler = !backGoundModeToggler;

2
krec/krecfileviewhelpers.h
Unescape View File

@ -105,7 +105,7 @@ signals:
void showContextMenu( const TQPoint & ); void showContextMenu( const TQPoint & );
private: private:
void init() { void init() {
setFont( KGlobalSettings::fixedFont() ); setFont( TDEGlobalSettings::fixedFont() );
} }
}; };
#endif #endif

2
kscd/cddbdlg.cpp
Unescape View File

@ -37,7 +37,7 @@ CDDBDlg::CDDBDlg( TQWidget* parent, const char* name )
: KDialogBase( parent, name, false, i18n( "CD Editor" ), : KDialogBase( parent, name, false, i18n( "CD Editor" ),
Ok|Cancel|User1|User2, Ok, true ) Ok|Cancel|User1|User2, Ok, true )
{ {
KGlobal::locale()->insertCatalogue("libkcddb"); TDEGlobal::locale()->insertCatalogue("libkcddb");
m_dlgBase = new CDInfoDialogBase( this, "m_dlgBase" ); m_dlgBase = new CDInfoDialogBase( this, "m_dlgBase" );

10
kscd/docking.cpp
Unescape View File

@ -53,11 +53,11 @@ DockWidget::DockWidget( KSCD* parent, const char *name)
// popup menu for right mouse button // popup menu for right mouse button
TQPopupMenu* popup = contextMenu(); TQPopupMenu* popup = contextMenu();
popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked())); popup->insertItem(TDEGlobal::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(TDEGlobal::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(TDEGlobal::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(TDEGlobal::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_eject", KIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked()));
TQToolTip::add(this, kapp->aboutData()->programName()); TQToolTip::add(this, kapp->aboutData()->programName());
} }

8
kscd/kscd.cpp
Unescape View File

@ -227,7 +227,7 @@ KSCD::~KSCD()
void KSCD::initGlobalShortcuts() { 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 //Definition of global shortcuts is based on 'local' shortcuts which follow
//the WIN key. //the WIN key.
@ -280,7 +280,7 @@ void KSCD::initFont()
/* int theSmallPtSize = 10; /* int theSmallPtSize = 10;
// Find a font that fits the 13 and 14 pixel widgets // 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; bool fits = false;
while (!fits && theSmallPtSize > 1) while (!fits && theSmallPtSize > 1)
{ {
@ -293,7 +293,7 @@ void KSCD::initFont()
fits = true; fits = true;
} }
} }
smallfont = TQFont(KGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold); smallfont = TQFont(TDEGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold);
*/ */
} // initFont() } // initFont()
@ -371,7 +371,7 @@ void KSCD::setupPopups()
connect( infoPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(information(int)) ); 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->insertItem(SmallIcon("help"),i18n("&Help"), helpMenu->menu());
mainPopup->insertSeparator(); mainPopup->insertSeparator();
m_actions->action(KStdAction::name(KStdAction::Quit))->plug(mainPopup); m_actions->action(KStdAction::name(KStdAction::Quit))->plug(mainPopup);

2
kscd/kscd.h
Unescape View File

@ -224,7 +224,7 @@ private:
TQStringList playlist; TQStringList playlist;
KCDDB::Client* cddb; KCDDB::Client* cddb;
KActionCollection* m_actions; KActionCollection* m_actions;
KGlobalAccel* m_globalAccel; TDEGlobalAccel* m_globalAccel;
KToggleAction* m_togglePopupsAction; KToggleAction* m_togglePopupsAction;
DockWidget* m_dockWidget; DockWidget* m_dockWidget;
void lookupDevice(); void lookupDevice();

2
kscd/kscd.kcfg
Unescape View File

@ -77,7 +77,7 @@
</entry> </entry>
<entry name="ledFont" type="Font"> <entry name="ledFont" type="Font">
<label>The font that will be used for the LCD display.</label> <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>
<entry name="BackColor" type="Color"> <entry name="BackColor" type="Color">
<label>The background color that will be used for the LCD display.</label> <label>The background color that will be used for the LCD display.</label>

2
libkcddb/cdinfodialogbase.ui.h
Unescape View File

@ -230,7 +230,7 @@ void CDInfoDialogBase::slotChangeEncoding()
if (dialog->exec()) if (dialog->exec())
{ {
KCharsets* charsets = KGlobal::charsets(); KCharsets* charsets = TDEGlobal::charsets();
TQTextCodec* codec = charsets->codecForName(charsets->encodingForName(encWidget->selectedEncoding())); TQTextCodec* codec = charsets->codecForName(charsets->encodingForName(encWidget->selectedEncoding()));
m_artist->setText(codec->toUnicode(m_artist->text().latin1())); m_artist->setText(codec->toUnicode(m_artist->text().latin1()));

4
libkcddb/cdinfoencodingwidget.cpp
Unescape View File

@ -33,7 +33,7 @@ namespace KCDDB
: CDInfoEncodingWidgetBase(parent), m_artist(artist), m_title(title), : CDInfoEncodingWidgetBase(parent), m_artist(artist), m_title(title),
m_songTitles(songTitles) m_songTitles(songTitles)
{ {
encodingCombo->insertStringList(KGlobal::charsets()->descriptiveEncodingNames()); encodingCombo->insertStringList(TDEGlobal::charsets()->descriptiveEncodingNames());
slotEncodingChanged(encodingCombo->currentText()); slotEncodingChanged(encodingCombo->currentText());
@ -48,7 +48,7 @@ namespace KCDDB
void CDInfoEncodingWidget::slotEncodingChanged(const TQString& encoding) void CDInfoEncodingWidget::slotEncodingChanged(const TQString& encoding)
{ {
KCharsets* charsets = KGlobal::charsets(); KCharsets* charsets = TDEGlobal::charsets();
TQTextCodec* codec = charsets->codecForName(charsets->encodingForName(encoding)); TQTextCodec* codec = charsets->codecForName(charsets->encodingForName(encoding));

2
libkcddb/kcmcddb/kcmcddb.cpp
Unescape View File

@ -48,7 +48,7 @@ K_EXPORT_COMPONENT_FACTORY ( kcm_cddb, KCDDBFactory( "kcmcddb" ) )
CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &) CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(parent, name) : KCModule(parent, name)
{ {
KGlobal::locale()->insertCatalogue("libkcddb"); TDEGlobal::locale()->insertCatalogue("libkcddb");
setButtons(Default | Apply); setButtons(Default | Apply);
widget_ = new CDDBConfigWidget(this); widget_ = new CDDBConfigWidget(this);

44
noatun/library/app.cpp
Unescape View File

@ -68,7 +68,7 @@ NoatunApp::NoatunApp()
// set the default config data // set the default config data
// TODO: Maybe a first time wizard instead? // TODO: Maybe a first time wizard instead?
KConfig *config=KGlobal::config(); // + KConfig *config=TDEGlobal::config(); // +
config->setGroup(TQString()); // 1 config->setGroup(TQString()); // 1
if (!config->readEntry("Modules").length()) if (!config->readEntry("Modules").length())
{ {
@ -146,7 +146,7 @@ NoatunApp::NoatunApp()
NoatunApp::~NoatunApp() NoatunApp::~NoatunApp()
{ {
saveEngineState(); saveEngineState();
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
config->writeEntry("Volume", player()->volume()); config->writeEntry("Volume", player()->volume());
config->writeEntry("LoopStyle", player()->loopStyle()); config->writeEntry("LoopStyle", player()->loopStyle());
@ -184,7 +184,7 @@ inline bool logicalXOR(bool A, bool B)
#define READBOOLOPT_EX(name, string, def, group, reversal) \ #define READBOOLOPT_EX(name, string, def, group, reversal) \
bool NoatunApp::name() const \ bool NoatunApp::name() const \
{ \ { \
KConfig *config=KGlobal::config(); \ KConfig *config=TDEGlobal::config(); \
config->setGroup(group); \ config->setGroup(group); \
return logicalXOR(config->readBoolEntry(string, def), reversal); \ return logicalXOR(config->readBoolEntry(string, def), reversal); \
} }
@ -211,14 +211,14 @@ bool NoatunApp::clearOnStart() const
int NoatunApp::startupPlayMode() const int NoatunApp::startupPlayMode() const
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
return config->readNumEntry("StartupPlayMode", autoPlay() ? Play : Restore); return config->readNumEntry("StartupPlayMode", autoPlay() ? Play : Restore);
} }
void NoatunApp::setStartupPlayMode(int mode) void NoatunApp::setStartupPlayMode(int mode)
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
config->writeEntry("StartupPlayMode", mode); config->writeEntry("StartupPlayMode", mode);
config->sync(); config->sync();
@ -226,7 +226,7 @@ void NoatunApp::setStartupPlayMode(int mode)
void NoatunApp::setHackUpPlaylist(bool b) void NoatunApp::setHackUpPlaylist(bool b)
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
config->writeEntry("HackUpPlaylist", b); config->writeEntry("HackUpPlaylist", b);
config->sync(); config->sync();
@ -237,7 +237,7 @@ void NoatunApp::setFastMixer(bool b)
bool whatBefore=fastMixer(); bool whatBefore=fastMixer();
if (whatBefore!=b) if (whatBefore!=b)
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
config->writeEntry("FastMixer", b); config->writeEntry("FastMixer", b);
config->sync(); config->sync();
@ -247,7 +247,7 @@ void NoatunApp::setFastMixer(bool b)
void NoatunApp::setOneInstance(bool b) void NoatunApp::setOneInstance(bool b)
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup("KDE"); config->setGroup("KDE");
config->writeEntry("MultipleInstances", !b); config->writeEntry("MultipleInstances", !b);
config->sync(); config->sync();
@ -255,31 +255,31 @@ void NoatunApp::setOneInstance(bool b)
void NoatunApp::setLoopList(bool b) void NoatunApp::setLoopList(bool b)
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
config->writeEntry("LoopList", b); config->writeEntry("LoopList", b);
KGlobal::config()->sync(); TDEGlobal::config()->sync();
} }
void NoatunApp::setAutoPlay(bool b) void NoatunApp::setAutoPlay(bool b)
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
config->writeEntry("AutoPlay", b); config->writeEntry("AutoPlay", b);
KGlobal::config()->sync(); TDEGlobal::config()->sync();
} }
void NoatunApp::setRememberPositions(bool b) void NoatunApp::setRememberPositions(bool b)
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
config->writeEntry("RememberPositions", b); config->writeEntry("RememberPositions", b);
KGlobal::config()->sync(); TDEGlobal::config()->sync();
} }
void NoatunApp::setSaveDirectory(const TQString &s) void NoatunApp::setSaveDirectory(const TQString &s)
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
config->writePathEntry("SaveDirectory", s); config->writePathEntry("SaveDirectory", s);
config->sync(); config->sync();
@ -287,21 +287,21 @@ void NoatunApp::setSaveDirectory(const TQString &s)
TQString NoatunApp::saveDirectory() const TQString NoatunApp::saveDirectory() const
{ {
KConfig *c=KGlobal::config(); KConfig *c=TDEGlobal::config();
c->setGroup(TQString()); c->setGroup(TQString());
return c->readPathEntry("SaveDirectory", TQString(getenv("HOME"))); return c->readPathEntry("SaveDirectory", TQString(getenv("HOME")));
} }
TQString NoatunApp::titleFormat() const TQString NoatunApp::titleFormat() const
{ {
KConfig *c=KGlobal::config(); KConfig *c=TDEGlobal::config();
c->setGroup(TQString()); c->setGroup(TQString());
return c->readEntry("TitleFormat", "$(\"[\"author\"] - \")$(title)$(\" (\"bitrate\"kbps)\")"); return c->readEntry("TitleFormat", "$(\"[\"author\"] - \")$(title)$(\" (\"bitrate\"kbps)\")");
} }
void NoatunApp::setTitleFormat(const TQString &format) void NoatunApp::setTitleFormat(const TQString &format)
{ {
KConfig *c=KGlobal::config(); KConfig *c=TDEGlobal::config();
c->setGroup(TQString()); c->setGroup(TQString());
return c->writeEntry("TitleFormat", format); return c->writeEntry("TitleFormat", format);
} }
@ -313,7 +313,7 @@ void NoatunApp::setClearOnStart(bool b)
void NoatunApp::setClearOnOpen(bool b) void NoatunApp::setClearOnOpen(bool b)
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
config->writeEntry("ClearOnOpen", b); config->writeEntry("ClearOnOpen", b);
config->sync(); config->sync();
@ -321,7 +321,7 @@ void NoatunApp::setClearOnOpen(bool b)
void NoatunApp::setDisplayRemaining(bool b) void NoatunApp::setDisplayRemaining(bool b)
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
config->writeEntry("DisplayRemaining", b); config->writeEntry("DisplayRemaining", b);
config->sync(); config->sync();
@ -501,7 +501,7 @@ TQImage NoatunApp::readPNG(const TQString &filename)
void NoatunApp::restoreEngineState() void NoatunApp::restoreEngineState()
{ {
KConfig* config = KGlobal::config(); KConfig* config = TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
int state = config->readNumEntry("EngineState", Arts::posPlaying); int state = config->readNumEntry("EngineState", Arts::posPlaying);
switch (state) switch (state)
@ -521,7 +521,7 @@ void NoatunApp::restoreEngineState()
void NoatunApp::saveEngineState() void NoatunApp::saveEngineState()
{ {
KConfig* config=KGlobal::config(); KConfig* config=TDEGlobal::config();
config->setGroup(TQString()); config->setGroup(TQString());
config->writeEntry("EngineState", player()->engine()->state()); config->writeEntry("EngineState", player()->engine()->state());
// we don't sync here since it's done in the destructor afterwards anyway // we don't sync here since it's done in the destructor afterwards anyway

2
noatun/library/noatun/plugin.h
Unescape View File

@ -77,7 +77,7 @@ class TimerThingy;
* then exec() to be able to use this. * then exec() to be able to use this.
* Its perfectly safe to create * Its perfectly safe to create
* a visualization in a binary executed by * a visualization in a binary executed by
* KProcess. * TDEProcess.
**/ **/
class Visualization class Visualization
{ {

20
noatun/library/noatuntags/tags.cpp
Unescape View File

@ -21,14 +21,14 @@ TagsGetter::TagsGetter()
int TagsGetter::interval() const int TagsGetter::interval() const
{ {
KGlobal::config()->setGroup("Tags"); TDEGlobal::config()->setGroup("Tags");
return KGlobal::config()->readNumEntry("interval", 250); return TDEGlobal::config()->readNumEntry("interval", 250);
} }
bool TagsGetter::loadAuto() const bool TagsGetter::loadAuto() const
{ {
KGlobal::config()->setGroup("Tags"); TDEGlobal::config()->setGroup("Tags");
return KGlobal::config()->readBoolEntry("LoadAuto", true); return TDEGlobal::config()->readBoolEntry("LoadAuto", true);
} }
void TagsGetter::added(PlaylistItem &i) void TagsGetter::added(PlaylistItem &i)
@ -93,17 +93,17 @@ void TagsGetter::setInterval(int ms)
killTimers(); killTimers();
startTimer(ms); startTimer(ms);
KGlobal::config()->setGroup("Tags"); TDEGlobal::config()->setGroup("Tags");
KGlobal::config()->writeEntry("interval", ms); TDEGlobal::config()->writeEntry("interval", ms);
KGlobal::config()->sync(); TDEGlobal::config()->sync();
} }
void TagsGetter::setLoadAuto(bool eh) void TagsGetter::setLoadAuto(bool eh)
{ {
KGlobal::config()->setGroup("Tags"); TDEGlobal::config()->setGroup("Tags");
KGlobal::config()->writeEntry("LoadAuto", eh); TDEGlobal::config()->writeEntry("LoadAuto", eh);
KGlobal::config()->sync(); TDEGlobal::config()->sync();
killTimers(); killTimers();

10
noatun/library/pluginloader.cpp
Unescape View File

@ -52,7 +52,7 @@ LibraryLoader::~LibraryLoader()
TQValueList<NoatunLibraryInfo> LibraryLoader::available() const TQValueList<NoatunLibraryInfo> LibraryLoader::available() const
{ {
TQValueList<NoatunLibraryInfo> items; 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) for (TQStringList::Iterator i=files.begin(); i!=files.end(); ++i)
items.append(getInfo(*i)); items.append(getInfo(*i));
@ -69,7 +69,7 @@ TQPtrList<Plugin> LibraryLoader::plugins() const
bool LibraryLoader::loadAll() bool LibraryLoader::loadAll()
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup(""); config->setGroup("");
TQStringList modules = config->readListEntry("Modules"); TQStringList modules = config->readListEntry("Modules");
return loadAll(modules); return loadAll(modules);
@ -135,7 +135,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules)
NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const
{ {
NoatunLibraryInfo info; 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)) if (!TQFile::exists(specPath))
return info; return info;
KSimpleConfig file(specPath); KSimpleConfig file(specPath);
@ -180,7 +180,7 @@ bool LibraryLoader::loadSO(const TQString &spec)
if (!listitem) 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)); KLibrary *lib = loader->library(TQFile::encodeName(filename));
if (!lib) if (!lib)
return false; return false;
@ -221,7 +221,7 @@ void LibraryLoader::add(const TQString &spec)
void LibraryLoader::setModules(const TQStringList &mods) void LibraryLoader::setModules(const TQStringList &mods)
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup(0); config->setGroup(0);
config->writeEntry("Modules", mods); config->writeEntry("Modules", mods);
config->sync(); config->sync();

2
noatun/library/pref.cpp
Unescape View File

@ -55,7 +55,7 @@ void NoatunPreferences::remove(CModule *page)
} }
CModule::CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *owner) 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))) icon, KIcon::Small,0, KIcon::DefaultState,0, true)))
{ {
if (owner) if (owner)

4
noatun/library/vequalizer.cpp
Unescape View File

@ -712,7 +712,7 @@ VPreset VEqualizer::createPreset(const TQString &name, bool smart)
TQValueList<VPreset> VEqualizer::presets() const TQValueList<VPreset> VEqualizer::presets() const
{ {
KConfig *conf=KGlobal::config(); KConfig *conf=TDEGlobal::config();
conf->setGroup("Equalizer"); conf->setGroup("Equalizer");
TQStringList list; TQStringList list;
@ -761,7 +761,7 @@ VPreset VEqualizer::presetByName(const TQString &name)
VPreset VEqualizer::presetByFile(const TQString &file) VPreset VEqualizer::presetByFile(const TQString &file)
{ {
KConfig *conf=KGlobal::config(); KConfig *conf=TDEGlobal::config();
conf->setGroup("Equalizer"); conf->setGroup("Equalizer");
TQStringList list=kapp->config()->readListEntry("presets"); TQStringList list=kapp->config()->readListEntry("presets");
if (list.contains(file)) if (list.contains(file))

8
noatun/modules/excellent/userinterface.cpp
Unescape View File

@ -157,7 +157,7 @@ Excellent::Excellent()
setMinimumWidth(250); setMinimumWidth(250);
resize(300, 75); resize(300, 75);
KConfig &config = *KGlobal::config(); KConfig &config = *TDEGlobal::config();
toolBar("main")->applySettings(&config, "Excellent main"); toolBar("main")->applySettings(&config, "Excellent main");
@ -192,7 +192,7 @@ Excellent::Excellent()
Excellent::~Excellent() Excellent::~Excellent()
{ {
KConfig &config = *KGlobal::config(); KConfig &config = *TDEGlobal::config();
saveMainWindowSettings(&config, "excellent"); saveMainWindowSettings(&config, "excellent");
toolBar("main")->saveSettings(&config, "Excellent main"); toolBar("main")->saveSettings(&config, "Excellent main");
config.setGroup("excellent"); config.setGroup("excellent");
@ -205,7 +205,7 @@ Excellent::~Excellent()
void Excellent::showEvent(TQShowEvent *e) void Excellent::showEvent(TQShowEvent *e)
{ {
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
config->setGroup("excellent"); config->setGroup("excellent");
config->writeEntry("mappingState", NET::Visible); config->writeEntry("mappingState", NET::Visible);
config->sync(); config->sync();
@ -215,7 +215,7 @@ void Excellent::showEvent(TQShowEvent *e)
void Excellent::hideEvent(TQHideEvent *e) void Excellent::hideEvent(TQHideEvent *e)
{ {
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
config->setGroup("excellent"); config->setGroup("excellent");
config->writeEntry("mappingState", NET::Withdrawn); config->writeEntry("mappingState", NET::Withdrawn);
config->sync(); config->sync();

8
noatun/modules/htmlexport/htmlexport.cpp
Unescape View File

@ -22,7 +22,7 @@ HTMLExport::HTMLExport(): TQObject(0, "HTMLExport"), Plugin()
napp->pluginActionMenu()->insert(mAction); napp->pluginActionMenu()->insert(mAction);
new Prefs(this); new Prefs(this);
config = KGlobal::config(); config = TDEGlobal::config();
} }
HTMLExport::~HTMLExport() HTMLExport::~HTMLExport()
@ -176,7 +176,7 @@ Prefs::Prefs(TQObject *parent)
{ {
// Init Config // Init Config
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
config->setGroup("HTMLExport"); config->setGroup("HTMLExport");
// Set default values // Set default values
@ -275,7 +275,7 @@ Prefs::Prefs(TQObject *parent)
void Prefs::save() void Prefs::save()
{ {
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
TQString bgRealURL = bgPicPath->url(); TQString bgRealURL = bgPicPath->url();
@ -295,7 +295,7 @@ void Prefs::save()
void Prefs::reopen() void Prefs::reopen()
{ {
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
headColorSelect->setColor(config->readColorEntry( "headColor" ) ); headColorSelect->setColor(config->readColorEntry( "headColor" ) );
hoverColorSelect->setColor( config->readColorEntry( "hoverColor" ) ); hoverColorSelect->setColor( config->readColorEntry( "hoverColor" ) );
bgColorSelect->setColor( config->readColorEntry( "bgColor" ) ); bgColorSelect->setColor( config->readColorEntry( "bgColor" ) );

8
noatun/modules/kaiman/pref.cpp
Unescape View File

@ -52,7 +52,7 @@ KaimanPrefDlg::~KaimanPrefDlg()
void KaimanPrefDlg::save() void KaimanPrefDlg::save()
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup("Kaiman"); config->setGroup("Kaiman");
config->writeEntry("SkinResource", skin() ); config->writeEntry("SkinResource", skin() );
config->sync(); config->sync();
@ -67,13 +67,13 @@ void KaimanPrefDlg::reopen()
{ {
_skinList->clear(); _skinList->clear();
// fill with available skins // fill with available skins
KGlobal::dirs()->addResourceType("skins", KStandardDirs::kde_default("data") + "noatun/skins/kaiman/"); TDEGlobal::dirs()->addResourceType("skins", KStandardDirs::kde_default("data") + "noatun/skins/kaiman/");
TQStringList list = KGlobal::dirs()->resourceDirs("skins"); TQStringList list = TDEGlobal::dirs()->resourceDirs("skins");
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++) for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++)
readSkinDir(*it); readSkinDir(*it);
// load current config // load current config
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup("Kaiman"); config->setGroup("Kaiman");
TQString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN ); TQString skin = config->readEntry( "SkinResource", Kaiman::DEFAULT_SKIN );
TQListBoxItem *item = _skinList->findItem( skin ); TQListBoxItem *item = _skinList->findItem( skin );

2
noatun/modules/kaiman/userinterface.cpp
Unescape View File

@ -80,7 +80,7 @@ Kaiman::Kaiman()
_altSkin = false; _altSkin = false;
// init config // init config
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup("Kaiman"); config->setGroup("Kaiman");
// load skin // load skin

4
noatun/modules/keyz/keyz.cpp
Unescape View File

@ -20,7 +20,7 @@ extern "C"
} }
} }
KGlobalAccel * Keyz::s_accel = 0L; TDEGlobalAccel * Keyz::s_accel = 0L;
Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0)
{ {
@ -29,7 +29,7 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0)
if ( !s_accel ) if ( !s_accel )
{ {
s_accel = new KGlobalAccel( this, "noatunglobalaccel" ); s_accel = new TDEGlobalAccel( this, "noatunglobalaccel" );
s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString(), s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString(),
CTRL+ALT+Key_P, KKey::QtWIN+CTRL+Key_P, CTRL+ALT+Key_P, KKey::QtWIN+CTRL+Key_P,
player, TQT_SLOT( playpause() )); player, TQT_SLOT( playpause() ));

4
noatun/modules/keyz/keyz.h
Unescape View File

@ -14,7 +14,7 @@ public:
Keyz(); Keyz();
~Keyz(); ~Keyz();
static KGlobalAccel *accel() { return s_accel; } static TDEGlobalAccel *accel() { return s_accel; }
public slots: public slots:
void slotVolumeUp(); void slotVolumeUp();
@ -28,7 +28,7 @@ void slotVolumeUp();
void slotCopyTitle(); void slotCopyTitle();
private: private:
static KGlobalAccel *s_accel; static TDEGlobalAccel *s_accel;
int preMuteVol; int preMuteVol;
}; };

2
noatun/modules/kjofol-skin/kjloader.cpp
Unescape View File

@ -814,7 +814,7 @@ void KJLoader::showSplash()
TQSize sh = splashScreen->sizeHint(); TQSize sh = splashScreen->sizeHint();
TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); TQRect desk = TDEGlobalSettings::splashScreenDesktopGeometry();
splashScreen->move (desk.x() + (desk.width() - sh.width())/2, splashScreen->move (desk.x() + (desk.width() - sh.width())/2,
desk.y() + (desk.height() - sh.height())/2 ); desk.y() + (desk.height() - sh.height())/2 );

12
noatun/modules/kjofol-skin/kjprefs.cpp
Unescape View File

@ -48,7 +48,7 @@ static TQString expand(TQString s);
KJPrefs::KJPrefs(TQObject* parent) KJPrefs::KJPrefs(TQObject* parent)
: CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", 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); TQVBoxLayout *vbox = new TQVBoxLayout(this);
vbox->setAutoAdd(true); 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->useSysFont->setChecked( cfg->readBoolEntry("Use SysFont", false) );
mGuiSettingsWidget->cmbSysFont->setCurrentFont( mGuiSettingsWidget->cmbSysFont->setCurrentFont(
cfg->readEntry("SysFont Family", KGlobalSettings::generalFont().family()) ); cfg->readEntry("SysFont Family", TDEGlobalSettings::generalFont().family()) );
TQColor tmpColor = TQColor(255,255,255); TQColor tmpColor = TQColor(255,255,255);
mGuiSettingsWidget->cmbSysFontColor->setColor( mGuiSettingsWidget->cmbSysFontColor->setColor(
cfg->readColorEntry("SysFont Color", &tmpColor)); cfg->readColorEntry("SysFont Color", &tmpColor));
@ -128,7 +128,7 @@ void KJPrefs::reopen() // reload config and set stuff in dialog
} }
TQStringList skins; 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 // iterate through all paths where Noatun is searching for kjofol-skins
for (uint i = 0; i < skinLocations.count(); ++i ) 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()); proc << "unzip -d " << proc.quote(tmpUnpackPath) << " " << proc.quote(srcFile.path());
kdDebug(66666) << "unzip -d " << tmpUnpackPath.latin1() << " " << srcFile.path().latin1() << endl; 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 // "unzip" spits out errorcodes > 0 only, 0 on success
if ( proc.exitStatus() != 0 ) if ( proc.exitStatus() != 0 )
@ -525,7 +525,7 @@ void KJPrefs::removeSelectedSkin( void )
// Now find the dir to delete !!! // Now find the dir to delete !!!
TQString dirToDelete = TQString (""); 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 // iterate through all paths where Noatun is searching for kjofol-skins
for (uint i = 0; i < skinLocations.count(); ++i ) for (uint i = 0; i < skinLocations.count(); ++i )
@ -601,7 +601,7 @@ static TQString expand(TQString s)
{ {
// kdDebug(66666) << "expand( "<< s.latin1() << " )" << endl; // 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 // iterate through all paths where Noatun is searching for kjofol-skins
for (uint i = 0; i < skinLocations.count(); ++i ) for (uint i = 0; i < skinLocations.count(); ++i )

6
noatun/modules/simple/userinterface.cpp
Unescape View File

@ -83,7 +83,7 @@ SimpleUI::SimpleUI()
extra_height = (height() - video->height()); extra_height = (height() - video->height());
// Load configuration // Load configuration
KConfig &config = *KGlobal::config(); KConfig &config = *TDEGlobal::config();
config.setGroup( "Simple" ); config.setGroup( "Simple" );
TQString str = config.readEntry( "View", "NormalSize" ); TQString str = config.readEntry( "View", "NormalSize" );
@ -104,7 +104,7 @@ SimpleUI::SimpleUI()
SimpleUI::~SimpleUI() SimpleUI::~SimpleUI()
{ {
KConfig &config = *KGlobal::config(); KConfig &config = *TDEGlobal::config();
saveMainWindowSettings( &config, "Simple" ); saveMainWindowSettings( &config, "Simple" );
config.setGroup( "Simple" ); config.setGroup( "Simple" );
TQString str; TQString str;
@ -359,7 +359,7 @@ void SimpleUI::slotVolumeFrame()
int y = -(volumeFrame->height() + 5); int y = -(volumeFrame->height() + 5);
TQPoint point( volumeButton->mapToGlobal( TQPoint( x, y ) ) ); 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 bottom = (point.y() + volumeFrame->height()) > (deskRect.y() + deskRect.height());
bool right = (point.x() + volumeFrame->width()) > (deskRect.x() + deskRect.width()); bool right = (point.x() + volumeFrame->width()) > (deskRect.x() + deskRect.width());

12
noatun/modules/splitplaylist/view.cpp
Unescape View File

@ -662,7 +662,7 @@ View::View(SplitPlaylist *)
mFinder = new Finder(this); mFinder = new Finder(this);
applyMainWindowSettings(KGlobal::config(), "SPL Window"); applyMainWindowSettings(TDEGlobal::config(), "SPL Window");
list->setFocus(); list->setFocus();
} }
@ -797,7 +797,7 @@ void View::init()
list->openGlobal(internalURL); list->openGlobal(internalURL);
} }
KConfig &config = *KGlobal::config(); KConfig &config = *TDEGlobal::config();
config.setGroup("splitplaylist"); config.setGroup("splitplaylist");
// this has to come after openGlobal, since openGlobal emits modified() // this has to come after openGlobal, since openGlobal emits modified()
@ -942,7 +942,7 @@ void View::setModified(void)
void View::saveState(void) void View::saveState(void)
{ {
KConfig &config = *KGlobal::config(); KConfig &config = *TDEGlobal::config();
config.setGroup("splitplaylist"); config.setGroup("splitplaylist");
config.writeEntry("modified", modified); config.writeEntry("modified", modified);
@ -955,14 +955,14 @@ void View::saveState(void)
item=SPL->getAfter(item), i++; item=SPL->getAfter(item), i++;
config.writeEntry("current", i); config.writeEntry("current", i);
saveMainWindowSettings(KGlobal::config(), "SPL Window"); saveMainWindowSettings(TDEGlobal::config(), "SPL Window");
config.sync(); config.sync();
} }
void View::configureToolBars() void View::configureToolBars()
{ {
saveMainWindowSettings(KGlobal::config(), "SPL Window"); saveMainWindowSettings(TDEGlobal::config(), "SPL Window");
KEditToolbar dlg(actionCollection(), "splui.rc"); KEditToolbar dlg(actionCollection(), "splui.rc");
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig()));
dlg.exec(); dlg.exec();
@ -971,7 +971,7 @@ void View::configureToolBars()
void View::newToolBarConfig() void View::newToolBarConfig()
{ {
createGUI("splui.rc"); createGUI("splui.rc");
applyMainWindowSettings(KGlobal::config(), "SPL Window"); applyMainWindowSettings(TDEGlobal::config(), "SPL Window");
} }
// turns the sorting on or off // turns the sorting on or off

2
noatun/modules/systray/systray.cpp
Unescape View File

@ -394,7 +394,7 @@ void NoatunSystray::showPassivePopup()
NETRect frame, win; NETRect frame, win;
ni.kdeGeometry(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()) if(win.pos.x < bounds.center().x())
{ {

4
noatun/modules/voiceprint/prefs.cpp
Unescape View File

@ -38,7 +38,7 @@ Prefs::Prefs(TQObject* parent)
void Prefs::reopen() void Prefs::reopen()
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup("VoicePrint"); config->setGroup("VoicePrint");
TQColor black(0, 0, 0); TQColor black(0, 0, 0);
TQColor blue(0, 0, 222); TQColor blue(0, 0, 222);
@ -49,7 +49,7 @@ void Prefs::reopen()
void Prefs::save() void Prefs::save()
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup("VoicePrint"); config->setGroup("VoicePrint");
config->writeEntry("Background", mBackground->color()); config->writeEntry("Background", mBackground->color());
config->writeEntry("Foreground", mForeground->color()); config->writeEntry("Foreground", mForeground->color());

4
noatun/modules/winskin/guiSpectrumAnalyser.cpp
Unescape View File

@ -51,7 +51,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser()
analyserCache = NULL; analyserCache = NULL;
winSkinVis = NULL; winSkinVis = NULL;
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
config->setGroup("Winskin"); config->setGroup("Winskin");
setVisualizationMode(config->readNumEntry("visualizationMode", MODE_ANALYSER)); setVisualizationMode(config->readNumEntry("visualizationMode", MODE_ANALYSER));
@ -61,7 +61,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser()
GuiSpectrumAnalyser::~GuiSpectrumAnalyser() GuiSpectrumAnalyser::~GuiSpectrumAnalyser()
{ {
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
config->setGroup("Winskin"); config->setGroup("Winskin");
config->writeEntry("visualizationMode", visualization_mode); config->writeEntry("visualizationMode", visualization_mode);

4
noatun/modules/winskin/waDigit.cpp
Unescape View File

@ -20,7 +20,7 @@
WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS) WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS)
{ {
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
config->setGroup("Winskin"); config->setGroup("Winskin");
reverse_time = config->readNumEntry("timeReversed", false); reverse_time = config->readNumEntry("timeReversed", false);
@ -29,7 +29,7 @@ WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS)
WaDigit::~WaDigit() WaDigit::~WaDigit()
{ {
KConfig *config = KGlobal::config(); KConfig *config = TDEGlobal::config();
config->setGroup("Winskin"); config->setGroup("Winskin");
config->writeEntry("timeReversed", reverse_time); config->writeEntry("timeReversed", reverse_time);
} }

2
noatun/modules/winskin/waInfo.cpp
Unescape View File

@ -69,7 +69,7 @@ void WaInfo::scrollerSetup()
if (completePixmap->width() > size.width()) { if (completePixmap->width() > size.width()) {
xScrollDirection = 1; xScrollDirection = 1;
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup("Winskin"); config->setGroup("Winskin");
int s = config->readNumEntry("ScrollDelay", 15); int s = config->readNumEntry("ScrollDelay", 15);
if (s!=0) if (s!=0)

2
noatun/modules/winskin/waSkin.cpp
Unescape View File

@ -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(newSong()), this, TQT_SLOT(newSong()));
connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timetick())); connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timetick()));
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup("Winskin"); config->setGroup("Winskin");
TQString skin = config->readEntry("CurrentSkin", WaSkin::defaultSkin()); TQString skin = config->readEntry("CurrentSkin", WaSkin::defaultSkin());

10
noatun/modules/winskin/waSkinManager.cpp
Unescape View File

@ -20,7 +20,7 @@ WaSkinManager::~WaSkinManager() {
} }
TQStringList WaSkinManager::availableSkins() { TQStringList WaSkinManager::availableSkins() {
TQStringList skinDirs = KGlobal::dirs()->findDirs("data", "noatun/skins/winamp"); TQStringList skinDirs = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp");
TQStringList skin_list; TQStringList skin_list;
// This loop adds them all to our skin list // This loop adds them all to our skin list
@ -55,7 +55,7 @@ TQString WaSkinManager::defaultSkin() {
} }
bool WaSkinManager::loadSkin(TQString skinName) { 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()) if (!skins.count())
mCurrentSkin = defaultSkin(); mCurrentSkin = defaultSkin();
@ -66,7 +66,7 @@ bool WaSkinManager::loadSkin(TQString skinName) {
} }
bool WaSkinManager::installSkin(TQString _url) { 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); KURL url(_url);
TQString mimetype = KMimeType::findByURL(_url)->name(); TQString mimetype = KMimeType::findByURL(_url)->name();
@ -96,7 +96,7 @@ bool WaSkinManager::removeSkin(TQString skinName) {
if (!skinRemovable(skinName)) if (!skinRemovable(skinName))
return false; 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); KIO::Job *job = KIO::del(KURL(skins[0]), false, false);
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList())); 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) { 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()) if (!skins.count())
return false; return false;

2
noatun/modules/winskin/waSkinModel.cpp
Unescape View File

@ -82,7 +82,7 @@ bool WaSkinModel::load(TQString skinDir)
if (findFile(dir, "main.bmp").isEmpty()) { if (findFile(dir, "main.bmp").isEmpty()) {
// Ack, our skin dir doesn't exist, fall back to the default // 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; success = false;
} }

4
noatun/modules/winskin/winSkinConfig.cpp
Unescape View File

@ -78,7 +78,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
void WinSkinConfig::save() void WinSkinConfig::save()
{ {
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup("Winskin"); config->setGroup("Winskin");
config->writeEntry("CurrentSkin", skin_list->currentText()); config->writeEntry("CurrentSkin", skin_list->currentText());
config->writeEntry("ScrollDelay", scrollSpeed->value()); config->writeEntry("ScrollDelay", scrollSpeed->value());
@ -123,7 +123,7 @@ void WinSkinConfig::reopen() {
skin_list->setCurrentItem( 0 ); skin_list->setCurrentItem( 0 );
} }
KConfig *config=KGlobal::config(); KConfig *config=TDEGlobal::config();
config->setGroup("Winskin"); config->setGroup("Winskin");
scrollSpeed->setValue(config->readNumEntry("ScrollDelay", 15)); scrollSpeed->setValue(config->readNumEntry("ScrollDelay", 15));
} }

Write Preview
Loading…
Cancel
Save