summaryrefslogtreecommitdiffstats
path: root/kicker/extensions/kasbar
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:11:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:11:21 -0600
commitf537c21b68e08f649b1b297bce8f3904603137e0 (patch)
treefb33065387509dea898c90022ddec9c3f8ede86d /kicker/extensions/kasbar
parentdc5f267664506a312203c26bfe9001a448b0bb0f (diff)
downloadtdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz
tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kicker/extensions/kasbar')
-rw-r--r--kicker/extensions/kasbar/kasclockitem.cpp2
-rw-r--r--kicker/extensions/kasbar/kasloaditem.cpp2
-rw-r--r--kicker/extensions/kasbar/kastasker.cpp18
-rw-r--r--kicker/extensions/kasbar/kastasker.h22
-rw-r--r--kicker/extensions/kasbar/kastaskitem.cpp6
5 files changed, 25 insertions, 25 deletions
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index 6545f57eb..912c9b0d3 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -115,6 +115,6 @@ void KasClockItem::showMenuAt( TQPoint p )
if ( !bar )
return;
- KPopupMenu *menu = bar->contextMenu();
+ TDEPopupMenu *menu = bar->contextMenu();
menu->exec( p );
}
diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp
index 6fa1f9b2a..f89e210ed 100644
--- a/kicker/extensions/kasbar/kasloaditem.cpp
+++ b/kicker/extensions/kasbar/kasloaditem.cpp
@@ -125,6 +125,6 @@ void KasLoadItem::showMenuAt( TQPoint p )
if ( !bar )
return;
- KPopupMenu *menu = bar->contextMenu();
+ TDEPopupMenu *menu = bar->contextMenu();
menu->exec( p );
}
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index 86d688b27..54ed56e4a 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -146,32 +146,32 @@ KasTasker::~KasTasker()
delete grouper;
}
-KPopupMenu *KasTasker::contextMenu()
+TDEPopupMenu *KasTasker::contextMenu()
{
if ( !menu ) {
- menu = new KPopupMenu;
+ menu = new TDEPopupMenu;
- showAllWindowsAction = new KToggleAction( i18n("Show &All Windows"), KShortcut(),
+ showAllWindowsAction = new TDEToggleAction( i18n("Show &All Windows"), TDEShortcut(),
TQT_TQOBJECT(this), "toggle_show_all_windows" );
showAllWindowsAction->setChecked( showAllWindows() );
showAllWindowsAction->plug( menu );
connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) );
connect( TQT_TQOBJECT(this), TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) );
- groupWindowsAction = new KToggleAction( i18n("&Group Windows"), KShortcut(),
+ groupWindowsAction = new TDEToggleAction( i18n("&Group Windows"), TDEShortcut(),
TQT_TQOBJECT(this), "toggle_group_windows" );
groupWindowsAction->setChecked( groupWindows() );
groupWindowsAction->plug( menu );
connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) );
connect( TQT_TQOBJECT(this), TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) );
- showClockAction = new KToggleAction( i18n("Show &Clock"), KShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" );
+ showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" );
showClockAction->setChecked( showClock() );
showClockAction->plug( menu );
connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) );
connect( TQT_TQOBJECT(this), TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) );
- showLoadAction = new KToggleAction( i18n("Show &Load Meter"), KShortcut(), TQT_TQOBJECT(this), "toggle_show_load" );
+ showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_load" );
showLoadAction->setChecked( showLoad() );
showLoadAction->plug( menu );
connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) );
@@ -180,14 +180,14 @@ KPopupMenu *KasTasker::contextMenu()
menu->insertSeparator();
if ( !standalone_ ) {
- toggleDetachedAction = new KToggleAction( i18n("&Floating"), KShortcut(), TQT_TQOBJECT(this), "toggle_detached" );
+ toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_detached" );
toggleDetachedAction->setChecked( isDetached() );
toggleDetachedAction->plug( menu );
connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) );
connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) );
}
- rotateBarAction = new KAction( i18n("R&otate Bar"), TQString("rotate"), KShortcut(),
+ rotateBarAction = new TDEAction( i18n("R&otate Bar"), TQString("rotate"), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( toggleOrientation() ),
TQT_TQOBJECT(this), "rotate_bar" );
rotateBarAction->plug( menu );
@@ -201,7 +201,7 @@ KPopupMenu *KasTasker::contextMenu()
menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), TQT_TQOBJECT(this), TQT_SLOT( showPreferences() ) );
// Help menu
- KPopupMenu *help = new KPopupMenu;
+ TDEPopupMenu *help = new TDEPopupMenu;
help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), TQT_TQOBJECT(this), TQT_SLOT( showAbout() ) );
menu->insertItem( SmallIcon("help"), i18n("&Help"), help );
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index 27dc2ff44..93cddd1ce 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -64,9 +64,9 @@
class TDEConfig;
class KPixmap;
-class KPopupMenu;
-class KAction;
-class KToggleAction;
+class TDEPopupMenu;
+class TDEAction;
+class TDEToggleAction;
class Task;
class Startup;
@@ -105,7 +105,7 @@ public:
virtual ~KasTasker();
/** Factory method that returns the default menu for items in the bar. */
- virtual KPopupMenu *contextMenu();
+ virtual TDEPopupMenu *contextMenu();
virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 );
@@ -246,15 +246,15 @@ protected slots:
void readConfig( TDEConfig *conf );
private:
- KPopupMenu *menu;
+ TDEPopupMenu *menu;
TDEConfig *conf;
KasGrouper *grouper;
- KToggleAction *toggleDetachedAction;
- KToggleAction *showAllWindowsAction;
- KToggleAction *groupWindowsAction;
- KToggleAction *showClockAction;
- KToggleAction *showLoadAction;
- KAction *rotateBarAction;
+ TDEToggleAction *toggleDetachedAction;
+ TDEToggleAction *showAllWindowsAction;
+ TDEToggleAction *groupWindowsAction;
+ TDEToggleAction *showClockAction;
+ TDEToggleAction *showLoadAction;
+ TDEAction *rotateBarAction;
bool standalone_;
bool passive_;
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index ae775171f..b986ea54a 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -377,7 +377,7 @@ void KasTaskItem::showPropertiesDialog()
//
// Title
//
- KPopupTitle *title = new KPopupTitle( dlg, "title" );
+ TDEPopupTitle *title = new TDEPopupTitle( dlg, "title" );
dlg->setCaption( i18n("Task Properties") );
title->setText( i18n("Task Properties") );
title->setIcon( icon() );
@@ -415,7 +415,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool
vb->setMargin( KDialog::marginHint() );
// Create List View
- KListView *taskprops = new KListView( vb, "props_view" );
+ TDEListView *taskprops = new TDEListView( vb, "props_view" );
taskprops->setResizeMode( TQListView::LastColumn );
taskprops->addColumn( i18n("Property"), 0 );
taskprops->addColumn( i18n("Type"), 0 );
@@ -426,7 +426,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool
for ( int i = 0; i < mo->numProperties( recursive ); i++ ) {
const TQMetaProperty *p = mo->property(i, recursive);
- (void) new KListViewItem( taskprops,
+ (void) new TDEListViewItem( taskprops,
p->name(), p->type(),
target->property( p->name() ).toString() );
}