From 73fd51d45ccea8e66e8c079d7e4e15b5d6d45432 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:19:48 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kaffeine/src/input/audiobrowser/playlist.cpp | 10 +++---- .../src/input/audiobrowser/urllistview.cpp | 16 +++++----- kaffeine/src/input/disc/disc.cpp | 10 +++---- kaffeine/src/input/disc/paranoia.cpp | 4 +-- kaffeine/src/input/dvb/dvbconfig.cpp | 10 +++---- kaffeine/src/input/dvb/dvbpanel.cpp | 30 +++++++++---------- kaffeine/src/input/dvb/kevents.cpp | 8 ++--- kaffeine/src/input/dvb/krecord.cpp | 4 +-- kaffeine/src/input/dvbclient/cdwidget.cpp | 4 +-- kaffeine/src/instwizard.cpp | 24 +++++++-------- kaffeine/src/instwizard.h | 4 +-- kaffeine/src/kaffeine.cpp | 22 +++++++------- .../gstreamer-part/gstreamerconfig.cpp | 6 ++-- .../player-parts/xine-part/filterdialog.cpp | 4 +-- .../xine-part/screenshotpreview.cpp | 2 +- .../src/player-parts/xine-part/xine_part.cpp | 6 ++-- .../src/player-parts/xine-part/xineconfig.cpp | 2 +- kaffeine/src/pref.cpp | 14 ++++----- kaffeine/src/startwindow.cpp | 2 +- kaffeine/src/systemtray.cpp | 2 +- 20 files changed, 92 insertions(+), 92 deletions(-) diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp index 0a3b103..2d3ad9a 100644 --- a/kaffeine/src/input/audiobrowser/playlist.cpp +++ b/kaffeine/src/input/audiobrowser/playlist.cpp @@ -319,7 +319,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : view->setSelectionMode( KFile::Multi ); fileBrowser->setMode( KFile::Files ); fileBrowser->setView( view ); - fileBrowser->setViewConfig( KGlobal::config(), "PlaylistFileBrowser" ); + fileBrowser->setViewConfig( TDEGlobal::config(), "PlaylistFileBrowser" ); fileBrowser->setOnlyDoubleClickSelectsFiles( true ); v1->addWidget( fileBrowser ); v->addLayout( v1 ); @@ -390,7 +390,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : searchBtn = new TQToolButton( playlist ); searchBtn->setAutoRaise( true ); TQToolTip::add( searchBtn, i18n("Search")); - searchBtn->setIconSet( KGlobal::iconLoader()->loadIconSet("locationbar_erase", KIcon::Small) ); + searchBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("locationbar_erase", KIcon::Small) ); h1->addWidget( searchBtn ); TQLabel* filterLabel = new TQLabel(i18n("Filter") + ":", playlist); h1->addWidget(filterLabel); @@ -419,7 +419,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected())); m_isCurrentEntry = UserIcon("playing"); - m_cdPixmap = KGlobal::iconLoader()->loadIcon("cdtrack", KIcon::Small); + m_cdPixmap = TDEGlobal::iconLoader()->loadIcon("cdtrack", KIcon::Small); setXMLFile("kaffeineplaylist.rc"); setupActions(); @@ -433,7 +433,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : } } - loadConfig( KGlobal::config() ); + loadConfig( TDEGlobal::config() ); connect(coverFrame, TQT_SIGNAL(changeCurrentCover()), this, TQT_SLOT(chooseCurrentCover())); connect(coverFrame, TQT_SIGNAL(gallery()), this, TQT_SLOT(showGallery())); @@ -646,7 +646,7 @@ void PlayList::loadConfig(KConfig* config) void PlayList::saveConfig() { - saveConfig( KGlobal::config() ); + saveConfig( TDEGlobal::config() ); } void PlayList::saveConfig(KConfig* config) diff --git a/kaffeine/src/input/audiobrowser/urllistview.cpp b/kaffeine/src/input/audiobrowser/urllistview.cpp index dd4ad2d..a58fad5 100644 --- a/kaffeine/src/input/audiobrowser/urllistview.cpp +++ b/kaffeine/src/input/audiobrowser/urllistview.cpp @@ -41,23 +41,23 @@ UrlListView::UrlListView(TQWidget *parent, const char *name ) : KListView(parent m_listCleared(true), m_itemOfContextMenu(NULL) { m_contextMenu = new KPopupMenu(this); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play"), this, TQT_SLOT(slotPlayItem())); + m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play"), this, TQT_SLOT(slotPlayItem())); m_contextMenu->insertItem(i18n("Play Next/Add to Queue"), this, TQT_SLOT(slotPlayNext())); m_contextMenu->insertSeparator(); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("editcut", KIcon::Small), i18n("C&ut"), this, TQT_SIGNAL(signalCut()), CTRL+Key_X); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("editcopy", KIcon::Small), i18n("&Copy"), this, TQT_SIGNAL(signalCopy()), CTRL+Key_C); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("editpaste", KIcon::Small), i18n("&Paste"), this, TQT_SIGNAL(signalPaste()), CTRL+Key_V); + m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editcut", KIcon::Small), i18n("C&ut"), this, TQT_SIGNAL(signalCut()), CTRL+Key_X); + m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editcopy", KIcon::Small), i18n("&Copy"), this, TQT_SIGNAL(signalCopy()), CTRL+Key_C); + m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editpaste", KIcon::Small), i18n("&Paste"), this, TQT_SIGNAL(signalPaste()), CTRL+Key_V); m_contextMenu->insertItem(i18n("Select &All"), this, TQT_SIGNAL(signalSelectAll()), CTRL+Key_A); m_contextMenu->insertItem(i18n("Create Playlist From Selected"), this, TQT_SIGNAL(signalPlaylistFromSelected())); m_contextMenu->insertSeparator(); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("indent", KIcon::Small), i18n("Add Sub&title..."), this, TQT_SLOT(slotAddSubtitle()),TQKeySequence(),100 ); + m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("indent", KIcon::Small), i18n("Add Sub&title..."), this, TQT_SLOT(slotAddSubtitle()),TQKeySequence(),100 ); m_contextMenu->insertSeparator(); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("edit", KIcon::Small), i18n("&Edit Title"), this, TQT_SLOT(slotEditTitle())); - m_contextMenu->insertItem(KGlobal::iconLoader()->loadIconSet("info", KIcon::Small), i18n("&Info"), this, TQT_SLOT(slotShowInfo())); + m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit", KIcon::Small), i18n("&Edit Title"), this, TQT_SLOT(slotEditTitle())); + m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("info", KIcon::Small), i18n("&Info"), this, TQT_SLOT(slotShowInfo())); /* width of the "length"-column */ - TQFontMetrics met(KGlobalSettings::generalFont()); + TQFontMetrics met(TDEGlobalSettings::generalFont()); int w1 = met.width(i18n("Length")); int w2 = met.width("5:55:55") + 2; diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp index 31bba0c..dc66a77 100644 --- a/kaffeine/src/input/disc/disc.cpp +++ b/kaffeine/src/input/disc/disc.cpp @@ -113,8 +113,8 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine h1->addWidget( ripBtn ); vb->addLayout( h1 ); - cdBtn->setIconSet( KGlobal::iconLoader()->loadIconSet("cdaudio_unmount", KIcon::Toolbar) ); - ripBtn->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Toolbar) ); + cdBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("cdaudio_unmount", KIcon::Toolbar) ); + ripBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Toolbar) ); connect( cdBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startCD()) ); connect( ripBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startRIP()) ); @@ -160,7 +160,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine enc->setTextLabel( i18n("Encode...") ); enc->setTextPosition( TQToolButton::Under ); enc->setUsesTextLabel( true ); - enc->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) ); + enc->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) ); enc->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) ); vb->addWidget( encodeWidget ); @@ -180,7 +180,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine setXMLFile("kaffeinedisc.rc"); setupActions(); - loadConfig( KGlobal::config() ); + loadConfig( TDEGlobal::config() ); para = NULL; trackCurrent = 0; @@ -248,7 +248,7 @@ void Disc::loadConfig( KConfig* config ) void Disc::saveConfig() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Disc"); config->writeEntry( "SplitSizes", split->sizes() ); diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp index 36b052a..ee86993 100644 --- a/kaffeine/src/input/disc/paranoia.cpp +++ b/kaffeine/src/input/disc/paranoia.cpp @@ -250,7 +250,7 @@ bool Paranoia::encode( const TQStringList &list, TQWidget *parent ) return false; } - KiloConfig dlg( myParent, KGlobal::config(), encoderName ); + KiloConfig dlg( myParent, TDEGlobal::config(), encoderName ); int ret = dlg.exec(); if ( ret!=TQDialog::Accepted ) return false; @@ -269,7 +269,7 @@ bool Paranoia::encode( const TQStringList &list, TQWidget *parent ) if ( !loadEncoder( myParent ) ) return false; - if ( !currentEncoder->options( myParent, KGlobal::config() ) ) { + if ( !currentEncoder->options( myParent, TDEGlobal::config() ) ) { unloadEncoder(); return false; } diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp index fa59aea..b1b69bb 100644 --- a/kaffeine/src/input/dvb/dvbconfig.cpp +++ b/kaffeine/src/input/dvb/dvbconfig.cpp @@ -590,7 +590,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent for ( i=0; i<(int)dvbConfig->devList.count(); i++ ) { page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").arg(dvbConfig->devList.at(i)->adapter).arg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"), - KGlobal::instance()->iconLoader()->loadIcon( "hwinfo", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "hwinfo", KIcon::NoGroup, KIcon::SizeMedium ) ); vb = new TQVBoxLayout( page, 6, 6 ); gb = new TQGroupBox( "", page ); grid = new TQGridLayout( gb, 1, 1, 20, 6 ); @@ -827,7 +827,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent } page = addPage(i18n("Recording"),i18n("DVB Recording Options"), - KGlobal::instance()->iconLoader()->loadIcon( "hdd_unmount", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "hdd_unmount", KIcon::NoGroup, KIcon::SizeMedium ) ); vb = new TQVBoxLayout( page, 6, 6 ); gb = new TQGroupBox( "", page ); grid = new TQGridLayout( gb, 1, 1, 20, 6 ); @@ -907,7 +907,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent filenameFormatLe->setText( dvbConfig->filenameFormat ); page = addPage(i18n("Broadcasting"),i18n("DVB Broadcasting"), - KGlobal::instance()->iconLoader()->loadIcon( "network_local", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "network_local", KIcon::NoGroup, KIcon::SizeMedium ) ); vb = new TQVBoxLayout( page, 6, 6 ); gb = new TQGroupBox( "", page ); grid = new TQGridLayout( gb, 1, 1, 20, 6 ); @@ -933,7 +933,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent sportSpin->setValue( dvbConfig->senderPort ); page = addPage(i18n("Misc"),i18n("Misc"), - KGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) ); vb = new TQVBoxLayout( page, 6, 6 ); gb = new TQGroupBox( "", page ); grid = new TQGridLayout( gb, 1, 1, 20, 6 ); @@ -976,7 +976,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent if ( p ) { page = addPage(i18n("DVB plugins"),i18n("DVB plugins"), - KGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) ); vb = new TQVBoxLayout( page, 6, 6 ); gb = new TQGroupBox( "", page ); grid = new TQGridLayout( gb, 1, 1, 20, 6 ); diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp index e63bd2b..38a6fb7 100644 --- a/kaffeine/src/input/dvb/dvbpanel.cpp +++ b/kaffeine/src/input/dvb/dvbpanel.cpp @@ -580,7 +580,7 @@ void DvbPanel::catContextMenu( TQIconViewItem *it, const TQPoint &p ) ok = false; } if ( ok ) { - KIconViewItem* item = new DIconViewItem(this, iconView, name, KGlobal::iconLoader()->loadIcon("kaffeine", KIcon::NoGroup, KIcon::SizeSmallMedium)); + KIconViewItem* item = new DIconViewItem(this, iconView, name, TDEGlobal::iconLoader()->loadIcon("kaffeine", KIcon::NoGroup, KIcon::SizeSmallMedium)); item->setDropEnabled( true ); dvbConfig->addCategory( name, "kaffeine" ); } @@ -588,7 +588,7 @@ void DvbPanel::catContextMenu( TQIconViewItem *it, const TQPoint &p ) case 1 : icon = KIconDialog::getIcon(); if ( !icon.isEmpty() ) { - it->setPixmap( KGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeSmallMedium) ); + it->setPixmap( TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeSmallMedium) ); dvbConfig->changeIconCategory( it->text(), icon ); } break; @@ -1027,12 +1027,12 @@ void DvbPanel::setConfig() TQString s = locateLocal("appdata", ""); dvbConfig = new DVBconfig( s ); - item = new DIconViewItem(this, iconView, i18n("All"), KGlobal::iconLoader()->loadIcon(dvbConfig->allIcon, KIcon::NoGroup, KIcon::SizeSmallMedium)); + item = new DIconViewItem(this, iconView, i18n("All"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->allIcon, KIcon::NoGroup, KIcon::SizeSmallMedium)); iconView->setFixedHeight( item->height()+iconView->horizontalScrollBar()->height() ); item->setDropEnabled( true ); - item = new DIconViewItem(this, iconView, i18n("Radio"), KGlobal::iconLoader()->loadIcon(dvbConfig->radioIcon, KIcon::NoGroup, KIcon::SizeSmallMedium)); + item = new DIconViewItem(this, iconView, i18n("Radio"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->radioIcon, KIcon::NoGroup, KIcon::SizeSmallMedium)); item->setDropEnabled( false ); - item = new DIconViewItem(this, iconView, i18n("TV"), KGlobal::iconLoader()->loadIcon(dvbConfig->tvIcon, KIcon::NoGroup, KIcon::SizeSmallMedium)); + item = new DIconViewItem(this, iconView, i18n("TV"), TDEGlobal::iconLoader()->loadIcon(dvbConfig->tvIcon, KIcon::NoGroup, KIcon::SizeSmallMedium)); item->setDropEnabled( false ); KTrader::OfferList offers = KTrader::self()->query("KaffeineDvbPlugin"); @@ -1051,7 +1051,7 @@ void DvbPanel::setConfig() } for ( i=0; i<(int)dvbConfig->categories.count(); i++ ) { - item = new DIconViewItem(this, iconView, dvbConfig->categories.at(i)->name, KGlobal::iconLoader()->loadIcon(dvbConfig->categories.at(i)->icon, KIcon::NoGroup, KIcon::SizeSmallMedium)); + item = new DIconViewItem(this, iconView, dvbConfig->categories.at(i)->name, TDEGlobal::iconLoader()->loadIcon(dvbConfig->categories.at(i)->icon, KIcon::NoGroup, KIcon::SizeSmallMedium)); item->setDropEnabled( true ); } @@ -1065,7 +1065,7 @@ void DvbPanel::setConfig() connect( d, TQT_SIGNAL(isRecording(bool)), this, TQT_SLOT(setRecordLed(bool)) ); connect( d, TQT_SIGNAL(playDvb()), this, TQT_SLOT(pipeOpened()) ); } - fifoName = KGlobal::dirs()->saveLocation("tmp")+".kaxtv.ts"; + fifoName = TDEGlobal::dirs()->saveLocation("tmp")+".kaxtv.ts"; TQFile f( fifoName ); if ( f.exists() ) f.remove(); @@ -1073,7 +1073,7 @@ void DvbPanel::setConfig() perror( fifoName.latin1() ); fifoName = ""; } - fifoName1 = KGlobal::dirs()->saveLocation("tmp")+".kaxtv1.ts"; + fifoName1 = TDEGlobal::dirs()->saveLocation("tmp")+".kaxtv1.ts"; TQFile f1( fifoName1 ); if ( f1.exists() ) f1.remove(); @@ -1349,10 +1349,10 @@ void DvbPanel::checkTimers() emit dvbStop(); } if ( d->startTimer( chan, dvbConfig->recordDir, dvbConfig->sizeFile, t, dvbConfig->filenameFormat ) ) { - KProcess proc; + TDEProcess proc; proc << TQDir::homeDirPath()+"/bin/kaffeine_recording"; proc << "On"; - proc.start( KProcess::DontCare ); + proc.start( TDEProcess::DontCare ); t->running = 1; if ( timersDialog ) emit timersChanged(); @@ -1423,10 +1423,10 @@ void DvbPanel::setRecord() ret = d->canStartTimer( live, &curchan ); if ( ret==0 ) { if ( d->startTimer( &curchan, dvbConfig->recordDir, dvbConfig->sizeFile, rt, dvbConfig->filenameFormat ) ) { - KProcess proc; + TDEProcess proc; proc << TQDir::homeDirPath()+"/bin/kaffeine_recording"; proc << "On"; - proc.start( KProcess::DontCare ); + proc.start( TDEProcess::DontCare ); for ( i=0; i<(int)timers.count(); i++ ) { t = timers.at(i); @@ -1526,14 +1526,14 @@ void DvbPanel::killTimer( RecTimer *t ) for ( i=0; i<(int)timers.count(); i++ ) { if ( timers.at(i)==t ) { - KProcess proc; + TDEProcess proc; proc << TQDir::homeDirPath()+"/bin/kaffeine_recording"; if ( recordLed->state()==KLed::On ) proc << "On"; else proc << "Off"; - proc << KProcess::quote( t->fullPath ); - proc.start( KProcess::DontCare ); + proc << TDEProcess::quote( t->fullPath ); + proc.start( TDEProcess::DontCare ); if ( t->mode ) updateModeTimer( t ); diff --git a/kaffeine/src/input/dvb/kevents.cpp b/kaffeine/src/input/dvb/kevents.cpp index e47bb60..746e1b4 100644 --- a/kaffeine/src/input/dvb/kevents.cpp +++ b/kaffeine/src/input/dvb/kevents.cpp @@ -248,7 +248,7 @@ void KEvents::checkEpgSearch(TQString searchword) if(!found) break; - begin = KGlobal::locale()->formatDateTime( desc->startDateTime ); + begin = TDEGlobal::locale()->formatDateTime( desc->startDateTime ); duration = desc->duration.toString("hh:mm"); title = desc->title; @@ -348,7 +348,7 @@ void KEvents::mouseClickedSlot( int btn, TQListViewItem *it, const TQPoint &p, i s = s+"
"; } s = s+"
"; - s = s+KGlobal::locale()->formatDateTime( ei->event->startDateTime, false )+"
"; + s = s+TDEGlobal::locale()->formatDateTime( ei->event->startDateTime, false )+"
"; s = s+ei->event->duration.toString("hh:mm"); s = s+"

"; for ( i=0; i<(int)ei->event->shortEvents.count(); i++ ) { @@ -442,7 +442,7 @@ void KEvents::checkNewEvent() i = 0; while ( (desc=es->getEventDesc(i)) ) { ++i; - begin = KGlobal::locale()->formatDateTime( desc->startDateTime ); + begin = TDEGlobal::locale()->formatDateTime( desc->startDateTime ); duration = desc->duration.toString("hh:mm"); title = desc->title; if ( title.isEmpty() ) @@ -457,7 +457,7 @@ void KEvents::checkNewEvent() for ( i=0; i<(int)channels->count(); i++ ) { ch = channels->at(i); if ( (desc=events->getEventDesc( ch->tp.source, ch->tp.nid, ch->tp.tsid, ch->sid, 0 )) ) { - begin = KGlobal::locale()->formatDateTime( desc->startDateTime ); + begin = TDEGlobal::locale()->formatDateTime( desc->startDateTime ); duration = desc->duration.toString("hh:mm"); title = desc->title; if ( title.isEmpty() ) diff --git a/kaffeine/src/input/dvb/krecord.cpp b/kaffeine/src/input/dvb/krecord.cpp index e6d5b9b..ef05fe1 100644 --- a/kaffeine/src/input/dvb/krecord.cpp +++ b/kaffeine/src/input/dvb/krecord.cpp @@ -125,7 +125,7 @@ void KRecord::refresh() else s = ""; s = s+ti->name;*/ s = ti->name; - itt = new KListViewItem( (TQListView*)list, "", s, ti->channel, KGlobal::locale()->formatDateTime( ti->begin ), ti->duration.toString("hh:mm") ); + itt = new KListViewItem( (TQListView*)list, "", s, ti->channel, TDEGlobal::locale()->formatDateTime( ti->begin ), ti->duration.toString("hh:mm") ); if ( ti->mode ) itt->setPixmap( 0, yesRepeat ); if ( ti->running ) @@ -150,7 +150,7 @@ void KRecord::newTimer() if ( ret==KTimerEditor::Accepted ) { *t = dlg.timer; after = where( t, true ); - itt = new KListViewItem( (TQListView*)list, "", t->name, t->channel, KGlobal::locale()->formatDateTime( t->begin ), t->duration.toString("hh:mm") ); + itt = new KListViewItem( (TQListView*)list, "", t->name, t->channel, TDEGlobal::locale()->formatDateTime( t->begin ), t->duration.toString("hh:mm") ); if ( t->mode ) itt->setPixmap( 0, yesRepeat ); if ( t->running ) diff --git a/kaffeine/src/input/dvbclient/cdwidget.cpp b/kaffeine/src/input/dvbclient/cdwidget.cpp index ede428f..c0c7ad7 100644 --- a/kaffeine/src/input/dvbclient/cdwidget.cpp +++ b/kaffeine/src/input/dvbclient/cdwidget.cpp @@ -78,7 +78,7 @@ CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspa lastChannel = 0; enableLive( false ); - loadConfig( KGlobal::config() ); + loadConfig( TDEGlobal::config() ); } @@ -157,7 +157,7 @@ void CdWidget::loadConfig( KConfig* config ) void CdWidget::saveConfig() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("DVBClient"); config->writeEntry( "SplitSizes", split->sizes() ); } diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp index 21336c2..a6d72a6 100644 --- a/kaffeine/src/instwizard.cpp +++ b/kaffeine/src/instwizard.cpp @@ -144,10 +144,10 @@ void InstWizard::internalWizard() //DVD-DRIVE info << "
" << i18n("DVD Drive") << "...
"; - KProcess process; + TDEProcess process; process << "/sbin/hdparm" << "-d" << "/dev/dvd"; - connect(&process, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), this, TQT_SLOT(slotStdout(KProcess*, char*, int))); - process.start(KProcess::Block, KProcess::Stdout); + connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), this, TQT_SLOT(slotStdout(TDEProcess*, char*, int))); + process.start(TDEProcess::Block, TDEProcess::Stdout); if (stdout.contains('1')) info << "" << i18n("Ok.") << ""; @@ -226,10 +226,10 @@ void InstWizard::internalWizard() if (exec() == TQDialog::Accepted) { kdDebug() << "WizardDialog: finished pressed" << endl; - KProcess process; + TDEProcess process; - TQStringList dirs = KGlobal::dirs()->findDirs("data", "kaffeine"); - TQString homePath = KGlobal::dirs()->localtdedir(); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kaffeine"); + TQString homePath = TDEGlobal::dirs()->localtdedir(); kdDebug() << "WizardDialog: TDE homedir: " << homePath << endl; TQString dataPath; if (dirs[0].left(homePath.length()) != homePath) /* global data path */ @@ -241,7 +241,7 @@ void InstWizard::internalWizard() { process << "cp" << dataPath + "mms.protocol" << locateLocal("services", "mms.protocol"); kdDebug() << "WizardDialog: cp " << dataPath + "mms.protocol" << " " << locateLocal("services", "mms.protocol") << endl; - process.start(KProcess::Block); + process.start(TDEProcess::Block); process.clearArguments(); } @@ -249,12 +249,12 @@ void InstWizard::internalWizard() { process << "cp" << dataPath + "rtsp.protocol" << locateLocal("services", "rtsp.protocol"); kdDebug() << "WizardDialog: cp " << dataPath + "rtsp.protocol" << " " << locateLocal("services", "rtsp.protocol") << endl; - process.start(KProcess::Block); + process.start(TDEProcess::Block); process.clearArguments(); } - //dirs = KGlobal::dirs()->findDirs("apps", "Multimedia"); - dirs = KGlobal::dirs()->findDirs("xdgdata-apps", "kde"); + //dirs = TDEGlobal::dirs()->findDirs("apps", "Multimedia"); + dirs = TDEGlobal::dirs()->findDirs("xdgdata-apps", "kde"); if (!dirs.isEmpty()) dataPath = dirs[0]; else @@ -264,13 +264,13 @@ void InstWizard::internalWizard() { process << "cp" << dataPath + "kaffeine.desktop" << TQDir::homeDirPath() + "/Desktop/kaffeine.desktop"; kdDebug() << "WizardDialog: cp " << dataPath + "kaffeine.desktop" << " " << TQDir::homeDirPath() + "/Desktop/kaffeine.desktop" << endl; - process.start(KProcess::Block); + process.start(TDEProcess::Block); process.clearArguments(); } } } -void InstWizard::slotStdout(KProcess *, char *buffer, int buflen) +void InstWizard::slotStdout(TDEProcess *, char *buffer, int buflen) { TQString output = TQString::fromLatin1(buffer, buflen); kdDebug() << "WizardDialog: got from hdparm: " << output << "\n"; diff --git a/kaffeine/src/instwizard.h b/kaffeine/src/instwizard.h index 520e071..3addec2 100644 --- a/kaffeine/src/instwizard.h +++ b/kaffeine/src/instwizard.h @@ -27,7 +27,7 @@ #include -class KProcess; +class TDEProcess; class InstWizard : private KWizard { @@ -51,7 +51,7 @@ private: InstWizard operator=(const InstWizard &); private slots: - void slotStdout(KProcess *, char *, int); + void slotStdout(TDEProcess *, char *, int); }; #endif /* INSTWIZARD_H */ diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp index e12b24c..a4630d6 100644 --- a/kaffeine/src/kaffeine.cpp +++ b/kaffeine/src/kaffeine.cpp @@ -163,9 +163,9 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"), { InstWizard::showWizard(); - KProcess process; + TDEProcess process; process << "touch" << stamp; - process.start(KProcess::Block, KProcess::Stderr); + process.start(TDEProcess::Block, TDEProcess::Stderr); process.clearArguments(); } @@ -180,20 +180,20 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"), inplug = new InputManager( this, stack, mtBar ); m_startWindow = new StartWindow( stack ); - inplug->addStartWindow( m_startWindow, KGlobal::iconLoader()->loadIcon("kmenu", KIcon::Small), i18n("Start") ); + inplug->addStartWindow( m_startWindow, TDEGlobal::iconLoader()->loadIcon("kmenu", KIcon::Small), i18n("Start") ); playerWidget = new TQVBox( stack ); playerWidget->setMouseTracking( true ); - inplug->addPlayerWidget( playerWidget, KGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Small), i18n("Player Window") ); + inplug->addPlayerWidget( playerWidget, TDEGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Small), i18n("Player Window") ); // playlist m_playlist = new PlayList( stack, TQT_TQOBJECT(this) ); - inplug->add( m_playlist, KGlobal::iconLoader()->loadIcon("view_text", KIcon::Small), i18n( "Playlist") ); + inplug->add( m_playlist, TDEGlobal::iconLoader()->loadIcon("view_text", KIcon::Small), i18n( "Playlist") ); m_playlist->setFileFilter(DEFAULT_FILTER); guiFactory()->addClient( m_playlist ); cddisc = new Disc( stack, TQT_TQOBJECT(this) ); - inplug->add( cddisc, KGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Small), i18n( "Audio CD") ); + inplug->add( cddisc, TDEGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Small), i18n( "Audio CD") ); guiFactory()->addClient( cddisc ); connect(m_playlist, TQT_SIGNAL(signalRequestForDVD(const TQString&)), cddisc, TQT_SLOT(startDVD(const TQString&))); @@ -203,7 +203,7 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"), #ifdef HAVE_DVB if ( dvbPanel ) { - inplug->add( dvbPanel, KGlobal::iconLoader()->loadIcon("tv", KIcon::Small), i18n( "Digital TV") ); + inplug->add( dvbPanel, TDEGlobal::iconLoader()->loadIcon("tv", KIcon::Small), i18n( "Digital TV") ); guiFactory()->addClient( dvbPanel ); dvbPanel->checkFirstRun(); } @@ -797,7 +797,7 @@ void Kaffeine::loadConfig() if ( m_dvbClientEnabled ) { dvbClient = new CdWidget( m_dvbClientAddress, m_dvbClientPort, m_dvbClientInfo, m_dvbClientShiftPath, this, TQT_TQOBJECT(this), "cdwidget"); - inplug->add( dvbClient, KGlobal::iconLoader()->loadIcon("network", KIcon::Small), i18n( "DVB client") ); + inplug->add( dvbClient, TDEGlobal::iconLoader()->loadIcon("network", KIcon::Small), i18n( "DVB client") ); } else dvbClient = 0; @@ -913,7 +913,7 @@ void Kaffeine::slotDvbClient( bool enabled, const TQString &address, int port, i connect( dvbClient, TQT_SIGNAL(setTimeShiftFilename(const TQString&)), m_mediaPart, TQT_SLOT(getTimeShiftFilename(const TQString&)) ); dvbClient->enableLive( true ); } - inplug->add( dvbClient, KGlobal::iconLoader()->loadIcon("network", KIcon::Small), i18n( "DVB client") ); + inplug->add( dvbClient, TDEGlobal::iconLoader()->loadIcon("network", KIcon::Small), i18n( "DVB client") ); } } else @@ -955,7 +955,7 @@ void Kaffeine::optionsConfigureKeys() void Kaffeine::optionsConfigureToolbars() { - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); // use the standard toolbar editor KEditToolbar dlg(factory()); @@ -966,7 +966,7 @@ void Kaffeine::optionsConfigureToolbars() void Kaffeine::applyNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void Kaffeine::slotSystemTray(bool embed) diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp index b7e88c7..abaec57 100644 --- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp +++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp @@ -44,7 +44,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin TQLabel* label = NULL; //Audio Page - frame = addPage(i18n("Audio"), i18n("Audio Options"), KGlobal::iconLoader()->loadIcon("sound", KIcon::Panel, + frame = addPage(i18n("Audio"), i18n("Audio Options"), TDEGlobal::iconLoader()->loadIcon("sound", KIcon::Panel, KIcon::SizeMedium)); layout = new TQGridLayout(frame, 10, 2); layout->setMargin(10); @@ -57,7 +57,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1); //Video Page - frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel, + frame = addPage(i18n("Video"), i18n("Video Options"), TDEGlobal::iconLoader()->loadIcon("video", KIcon::Panel, KIcon::SizeMedium)); layout = new TQGridLayout(frame, 10, 2); layout->setMargin(10); @@ -71,7 +71,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin layout->addWidget(new TQLabel(TQString("") + i18n("* Restart required!") + "", frame), 10, 1); //Media page - frame = addPage(i18n("Media"), i18n("Media Options"), KGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Panel, + frame = addPage(i18n("Media"), i18n("Media Options"), TDEGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Panel, KIcon::SizeMedium)); layout = new TQGridLayout(frame, 10, 2); layout->setMargin(10); diff --git a/kaffeine/src/player-parts/xine-part/filterdialog.cpp b/kaffeine/src/player-parts/xine-part/filterdialog.cpp index 9281527..8d1e14a 100644 --- a/kaffeine/src/player-parts/xine-part/filterdialog.cpp +++ b/kaffeine/src/player-parts/xine-part/filterdialog.cpp @@ -43,7 +43,7 @@ FilterDialog::FilterDialog(const TQStringList& audioFilters, const TQStringList& /****** Audio Filters ******/ TQWidget* audioPage = addPage(i18n("Audio"), i18n("Audio Filters"), - KGlobal::iconLoader()->loadIcon("sound", KIcon::Panel, KIcon::SizeMedium)); + TDEGlobal::iconLoader()->loadIcon("sound", KIcon::Panel, KIcon::SizeMedium)); TQGridLayout* audioGrid = new TQGridLayout( audioPage, 3, 3 ); audioGrid->setSpacing( 5 ); @@ -76,7 +76,7 @@ FilterDialog::FilterDialog(const TQStringList& audioFilters, const TQStringList& /****** Video Filters ******/ TQWidget* videoPage = addPage(i18n("Video"), i18n("Video Filters"), - KGlobal::iconLoader()->loadIcon("video", KIcon::Panel, KIcon::SizeMedium)); + TDEGlobal::iconLoader()->loadIcon("video", KIcon::Panel, KIcon::SizeMedium)); TQGridLayout* videoGrid = new TQGridLayout( videoPage, 3, 3 ); videoGrid->setSpacing( 5 ); diff --git a/kaffeine/src/player-parts/xine-part/screenshotpreview.cpp b/kaffeine/src/player-parts/xine-part/screenshotpreview.cpp index 14e757d..9c14482 100644 --- a/kaffeine/src/player-parts/xine-part/screenshotpreview.cpp +++ b/kaffeine/src/player-parts/xine-part/screenshotpreview.cpp @@ -58,7 +58,7 @@ void ScreenshotPreview::paintEvent(TQPaintEvent*) TQString info = TQString::number(m_previewImg.width()) + "x" + TQString::number(m_previewImg.height()); - TQFont font = KGlobalSettings::generalFont(); + TQFont font = TDEGlobalSettings::generalFont(); font.setPointSize(10); TQFontMetrics met(font); diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp index bb9ec59..2b11777 100644 --- a/kaffeine/src/player-parts/xine-part/xine_part.cpp +++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp @@ -1308,10 +1308,10 @@ void XinePart::slotLaunchExternally() void XinePart::slotLaunchDelayed() { kdDebug() << "XinePart: Start Kaffeine with argument: " << m_mrl.url() << endl; - KProcess process; + TDEProcess process; process << "kaffeine" << m_mrl.url(); kdDebug() << "XinePart: Launching Kaffeine externaly..." << endl; - process.start(KProcess::DontCare); + process.start(TDEProcess::DontCare); process.detach(); } @@ -1440,7 +1440,7 @@ void XinePart::initActions() m_playTime = new TQPushButton(0); TQToolTip::add (m_playTime, i18n("Short click: Toggle Timer Forward/Backward\nLong click: Toggle Timer OSD")); - TQFontMetrics met(KGlobalSettings::generalFont()); + TQFontMetrics met(TDEGlobalSettings::generalFont()); m_playTime->setFixedWidth(met.width("-55:55:55") + 6); m_playTime->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_playTime->setFocusPolicy(TQ_NoFocus); diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp index 1281911..4a88626 100644 --- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp +++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp @@ -272,7 +272,7 @@ XineConfig::XineConfig(const xine_t* const xine) : else icon = "edit"; - xineFrame = addPage(*it, i18n("%1 Options").arg(*it), KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, + xineFrame = addPage(*it, i18n("%1 Options").arg(*it), TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, KIcon::SizeMedium)); xineLayout = new TQVBoxLayout(xineFrame, marginHint(), spacingHint()); tabWidget = new TQTabWidget(xineFrame); diff --git a/kaffeine/src/pref.cpp b/kaffeine/src/pref.cpp index 4359f15..7c61531 100644 --- a/kaffeine/src/pref.cpp +++ b/kaffeine/src/pref.cpp @@ -55,7 +55,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine setInitialSize(TQSize(400,400), false); //-----------behavior---------------- - TQFrame *behavior = addPage(i18n("Behavior"), i18n("Behavior"), KGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Panel, KIcon::SizeMedium)); + TQFrame *behavior = addPage(i18n("Behavior"), i18n("Behavior"), TDEGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Panel, KIcon::SizeMedium)); vb = new TQVBoxLayout( behavior, 6, 6 ); gb = new TQGroupBox( "", behavior ); grid = new TQGridLayout( gb, 1, 1, 20, 6 ); @@ -66,7 +66,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); //-----------appearance-------------- - TQFrame *looknfeel = addPage(i18n("Appearance"), i18n("Appearance"),KGlobal::iconLoader()->loadIcon("looknfeel", KIcon::Panel, KIcon::SizeMedium)); + TQFrame *looknfeel = addPage(i18n("Appearance"), i18n("Appearance"),TDEGlobal::iconLoader()->loadIcon("looknfeel", KIcon::Panel, KIcon::SizeMedium)); vb = new TQVBoxLayout( looknfeel, 6, 6 ); gb = new TQGroupBox( "", looknfeel ); grid = new TQGridLayout( gb, 1, 1, 20, 6 ); @@ -88,7 +88,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); //-----------dvbclient-------------- - TQFrame *dc = addPage(i18n("DVB Client"), i18n("DVB Client"),KGlobal::iconLoader()->loadIcon("network_local", KIcon::Panel, KIcon::SizeMedium)); + TQFrame *dc = addPage(i18n("DVB Client"), i18n("DVB Client"),TDEGlobal::iconLoader()->loadIcon("network_local", KIcon::Panel, KIcon::SizeMedium)); vb = new TQVBoxLayout( dc, 6, 6 ); m_dcEnabled = new TQCheckBox(i18n("Enable DVB client"), dc); vb->addWidget( m_dcEnabled ); @@ -123,7 +123,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) ); //-----------misc---------------- - TQFrame *misc = addPage(i18n("Misc"), i18n("Miscellaneous Options"),KGlobal::iconLoader()->loadIcon("misc", KIcon::Panel, KIcon::SizeMedium)); + TQFrame *misc = addPage(i18n("Misc"), i18n("Miscellaneous Options"),TDEGlobal::iconLoader()->loadIcon("misc", KIcon::Panel, KIcon::SizeMedium)); vb = new TQVBoxLayout( misc, 6, 6 ); gb = new TQGroupBox(1, Qt::Horizontal, "", misc); gb->setInsideMargin(20); @@ -133,7 +133,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine connect(m_useAlternateEncoding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUseAlternateEncodingToggled(bool))); m_alternateEncoding = new TQComboBox(gb); - TQStringList codecNames = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList codecNames = TDEGlobal::charsets()->descriptiveEncodingNames(); codecNames.sort(); m_alternateEncoding->insertStringList(codecNames); vb->addWidget( gb ); @@ -164,7 +164,7 @@ void KaffeinePreferences::setConfig(bool pauseVideo, bool tray, uint duration, b bool m_useEncoding = false; for (int i = 0; i < m_alternateEncoding->count(); ++i) { - if (KGlobal::charsets()->encodingForName(m_alternateEncoding->text(i)).lower() == encoding.lower()) { + if (TDEGlobal::charsets()->encodingForName(m_alternateEncoding->text(i)).lower() == encoding.lower()) { m_useEncoding = useEncoding; m_alternateEncoding->setCurrentItem(i); break; @@ -189,7 +189,7 @@ void KaffeinePreferences::slotApplyPressed() { emit signalEmbedSystemTray(m_systemTray->isChecked()); emit signalUseAlternateEncoding(m_useAlternateEncoding->isChecked()); - emit signalAlternateEncoding(KGlobal::charsets()->encodingForName(m_alternateEncoding->currentText())); + emit signalAlternateEncoding(TDEGlobal::charsets()->encodingForName(m_alternateEncoding->currentText())); emit signalSetOSDTimeout(m_osdTimeout->value()); emit signalPauseVideo(m_pauseVideo->isChecked()); emit signalDvbClient(m_dcEnabled->isChecked(), m_dcAddress->text().stripWhiteSpace(), m_dcPort->value(), m_dcInfo->value(), m_shiftDirLe->text() ); diff --git a/kaffeine/src/startwindow.cpp b/kaffeine/src/startwindow.cpp index 67948a9..c63653f 100644 --- a/kaffeine/src/startwindow.cpp +++ b/kaffeine/src/startwindow.cpp @@ -117,7 +117,7 @@ void StartWindow::registerTarget( const TQString& uiName, const TQString& pixNam TQToolTip::add(btn, uiName); btn->setTextPosition( TQToolButton::Under ); btn->setUsesTextLabel( true ); - btn->setIconSet( KGlobal::iconLoader()->loadIconSet(pixName, KIcon::Panel) ); + btn->setIconSet( TDEGlobal::iconLoader()->loadIconSet(pixName, KIcon::Panel) ); TQSize size = btn->sizeHint(); size.setHeight( size.height()+5 ); btn->resize( size ); diff --git a/kaffeine/src/systemtray.cpp b/kaffeine/src/systemtray.cpp index e781ba0..02a77a5 100644 --- a/kaffeine/src/systemtray.cpp +++ b/kaffeine/src/systemtray.cpp @@ -75,7 +75,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name ) : KSystemTray(parent m_osd->setAlignment(SingleLine); connect(&m_hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotHideOSD())); - setPixmap(KGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Panel, 22)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Panel, 22)); TQToolTip::add(this, i18n("Kaffeine Player")); }