From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kicker/extensions/kasbar/ChangeLog | 4 ++-- kicker/extensions/kasbar/kasaboutdlg.cpp | 4 ++-- kicker/extensions/kasbar/kasbar.cpp | 2 +- kicker/extensions/kasbar/kasbarapp.cpp | 2 +- kicker/extensions/kasbar/kasbarextension.cpp | 4 ++-- kicker/extensions/kasbar/kasclockitem.cpp | 4 ++-- kicker/extensions/kasbar/kasgroupitem.cpp | 4 ++-- kicker/extensions/kasbar/kasitem.cpp | 4 ++-- kicker/extensions/kasbar/kasprefsdlg.cpp | 4 ++-- kicker/extensions/kasbar/kasstartupitem.cpp | 12 ++++++------ kicker/extensions/kasbar/kastaskitem.cpp | 6 +++--- kicker/extensions/kasbar/kastaskpopup.cpp | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) (limited to 'kicker/extensions/kasbar') diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog index 8cbb33868..c8ee55166 100644 --- a/kicker/extensions/kasbar/ChangeLog +++ b/kicker/extensions/kasbar/ChangeLog @@ -594,7 +594,7 @@ 2002-08-30 Friday 10:37 pfeiffer - * use KGlobal::taskbarFont(), patch by CCMAIL: Luciano Montanaro + * use TDEGlobal::taskbarFont(), patch by CCMAIL: Luciano Montanaro 2002-08-29 Thursday 17:38 mueller @@ -656,7 +656,7 @@ * grrr, I fixed that before 2.2.2 and it's back :( - + KGlobal::locale()->insertCatalogue("kasbarextension"); + + TDEGlobal::locale()->insertCatalogue("kasbarextension"); 2002-02-26 Tuesday 17:04 elter diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index 35028d9e0..4d51d92ef 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -80,8 +80,8 @@ #include "kasaboutdlg.h" #include "version.h" -#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) -#define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) +#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) +#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) KasAboutDialog::KasAboutDialog( TQWidget *parent ) : KDialogBase( KDialogBase::IconList, i18n("About Kasbar"), diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 89fcad751..430d98c84 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -717,7 +717,7 @@ void KasBar::addTestItems() KasItem *i = new KasItem( this ); insert( 0, i ); i->setText( "Animated" ); - i->setIcon( KGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) ); + i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) ); i->setAnimation( resources()->startupAnimation() ); TQTimer *aniTimer = new TQTimer( i, "aniTimer" ); connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) ); diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index 169fe5b52..708aeb1e6 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -77,7 +77,7 @@ int main( int argc, char **argv ) { TDECmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING ); TDECmdLineArgs::addCmdLineOptions( options ); - KGlobal::locale()->setMainCatalogue( "kasbarextension" ); + TDEGlobal::locale()->setMainCatalogue( "kasbarextension" ); TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 3a3a023fb..6e011cc71 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -76,7 +76,7 @@ extern "C" { KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) { - KGlobal::locale()->insertCatalogue("kasbarextension"); + TDEGlobal::locale()->insertCatalogue("kasbarextension"); return new KasBarExtension( configFile, KPanelExtension::Normal, KPanelExtension::About | KPanelExtension::Preferences, @@ -109,7 +109,7 @@ KasBarExtension::~KasBarExtension() { if ( detached_ && (!kasbar.isNull()) ) kasbar->deleteLater(); - KGlobal::locale()->removeCatalogue("kasbarextension"); + TDEGlobal::locale()->removeCatalogue("kasbarextension"); } void KasBarExtension::setDetached( bool detach ) diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 51dac687d..6545f57eb 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -75,8 +75,8 @@ KasPopup *KasClockItem::createPopup() void KasClockItem::updateTime() { - setText( KGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) ); - lcd->display( KGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) ); + setText( TDEGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) ); + lcd->display( TDEGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) ); update(); } diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index 7e23ce7fd..638213e8e 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -144,7 +144,7 @@ void KasGroupItem::updateIcon() bool usedIconLoader = false; Task::Ptr t = items.first(); if (!t) - p = KGlobal::iconLoader()->loadIcon( "kicker", + p = TDEGlobal::iconLoader()->loadIcon( "kicker", KIcon::NoGroup, KIcon::SizeSmall ); @@ -157,7 +157,7 @@ void KasGroupItem::updateIcon() p = t->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader ); if ( p.isNull() ) - p = KGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall ); + p = TDEGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall ); setIcon( p ); } diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 323148713..866f6eb57 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -341,7 +341,7 @@ void KasItem::paintLabel( TQPainter *p ) } } - p->setFont( KGlobalSettings::taskbarFont() ); + p->setFont( TDEGlobalSettings::taskbarFont() ); p->setPen( resources()->labelPenColor() ); if ( fontMetrics().width( text ) > extent()-4 ) @@ -405,7 +405,7 @@ void KasItem::paintArrowLabel( TQPainter *p, int arrowSize, bool arrowOnLeft ) w -= arrowSize; } - p->setFont( KGlobalSettings::taskbarFont() ); + p->setFont( TDEGlobalSettings::taskbarFont() ); p->setPen( resources()->labelPenColor() ); if ( fontMetrics().width( text ) > w ) p->drawText( lx, ly, w, h-1, AlignLeft | AlignVCenter, text ); diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 6dd39517f..42199272a 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -75,8 +75,8 @@ #include "kasprefsdlg.h" #include "kasprefsdlg.moc" -#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) -#define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) +#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) +#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) KasPrefsDialog::KasPrefsDialog( KasTasker *kas, TQWidget *parent ) diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp index 41adc5249..6011612e3 100644 --- a/kicker/extensions/kasbar/kasstartupitem.cpp +++ b/kicker/extensions/kasbar/kasstartupitem.cpp @@ -98,33 +98,33 @@ TQPixmap KasStartupItem::icon() const switch( kasbar()->itemSize() ) { case KasBar::Small: /* ***** NOP ****** - pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(), + pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), KIcon::NoGroup, KIcon::SizeSmall ); */ break; case KasBar::Medium: - pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(), + pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), KIcon::NoGroup, KIcon::SizeMedium ); break; case KasBar::Large: - pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(), + pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), KIcon::NoGroup, KIcon::SizeLarge ); break; case KasBar::Huge: - pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(), + pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), KIcon::NoGroup, KIcon::SizeHuge ); break; case KasBar::Enormous: - pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(), + pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), KIcon::NoGroup, KIcon::SizeEnormous ); break; default: - pixmap = KGlobal::iconLoader()->loadIcon( "error", + pixmap = TDEGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall ); } diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index 8b6714cad..ae775171f 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -85,7 +85,7 @@ #include "kastaskitem.h" #include "kasbarextension.h" -#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) +#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) static const int CHECK_ATTENTION_DELAY = 2000; @@ -350,11 +350,11 @@ void KasTaskItem::sendToTray() TQString s; s.setNum( task_->window() ); - KProcess proc; + TDEProcess proc; proc << "ksystraycmd"; proc << "--wid" << s << "--hidden"; - bool ok = proc.start( KProcess::DontCare ); + bool ok = proc.start( TDEProcess::DontCare ); if ( !ok ) { kdWarning(1345) << "Unable to launch ksystraycmd" << endl; KPassivePopup::message( i18n("Could Not Send to Tray"), diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 25c096a65..6529fafec 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -73,7 +73,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) { this->item = item; - setFont(KGlobalSettings::generalFont()); + setFont(TDEGlobalSettings::generalFont()); setMouseTracking( true ); TQString text = item->task()->visibleIconicName(); -- cgit v1.2.3