diff options
Diffstat (limited to 'kicker/applets/media')
-rw-r--r-- | kicker/applets/media/mediaapplet.cpp | 34 | ||||
-rw-r--r-- | kicker/applets/media/mediaapplet.h | 2 | ||||
-rw-r--r-- | kicker/applets/media/mediumbutton.cpp | 12 | ||||
-rw-r--r-- | kicker/applets/media/mediumbutton.h | 2 | ||||
-rw-r--r-- | kicker/applets/media/preferencesdialog.h | 2 |
5 files changed, 26 insertions, 26 deletions
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index c3b964ce1..f1d6c6e2a 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -33,7 +33,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) + TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { TDEGlobal::locale()->insertCatalogue("mediaapplet"); return new MediaApplet(configFile, KPanelApplet::Normal, @@ -57,18 +57,18 @@ MediaApplet::MediaApplet(const TQString& configFile, Type type, int actions, TQW mpDirLister = new KDirLister(); - connect( mpDirLister, TQT_SIGNAL( clear() ), - this, TQT_SLOT( slotClear() ) ); - connect( mpDirLister, TQT_SIGNAL( started(const KURL&) ), - this, TQT_SLOT( slotStarted(const KURL&) ) ); - connect( mpDirLister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( mpDirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( mpDirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) ); + connect( mpDirLister, TQ_SIGNAL( clear() ), + this, TQ_SLOT( slotClear() ) ); + connect( mpDirLister, TQ_SIGNAL( started(const KURL&) ), + this, TQ_SLOT( slotStarted(const KURL&) ) ); + connect( mpDirLister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( mpDirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( mpDirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) ); reloadList(); } @@ -154,7 +154,7 @@ void MediaApplet::arrangeButtons() MediumButton *button = *it; button_size = std::max(button_size, - orientation() == Qt::Vertical ? + orientation() == TQt::Vertical ? button->heightForWidth(width()) : button->widthForHeight(height()) ); // button->widthForHeight(height()) : @@ -162,7 +162,7 @@ void MediaApplet::arrangeButtons() } int kicker_size; - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { kicker_size = width(); } @@ -200,7 +200,7 @@ void MediaApplet::arrangeButtons() ++pack_count; - if(orientation() == Qt::Vertical) + if(orientation() == TQt::Vertical) { if (pack_count < max_packed_buttons) { @@ -425,7 +425,7 @@ void MediaApplet::reloadList() void MediaApplet::mousePressEvent(TQMouseEvent *e) { - if(e->button()==Qt::RightButton) + if(e->button()==TQt::RightButton) { TDEPopupMenu menu(this); diff --git a/kicker/applets/media/mediaapplet.h b/kicker/applets/media/mediaapplet.h index 4c57b508d..1703d98f0 100644 --- a/kicker/applets/media/mediaapplet.h +++ b/kicker/applets/media/mediaapplet.h @@ -38,7 +38,7 @@ typedef TQValueList<MediumButton*> MediumButtonList; class MediaApplet : public KPanelApplet { -Q_OBJECT +TQ_OBJECT public: MediaApplet(const TQString& configFile, Type t = Normal, int actions = 0, diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index b87f73ab1..4cc27ffe8 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -30,7 +30,7 @@ #include <tdemessagebox.h> #include <kmimetype.h> #include <tdelocale.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <krun.h> #include <tdeglobalsettings.h> #include <kcursor.h> @@ -45,13 +45,13 @@ #include <konq_drag.h> MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) - : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0, + : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0, "MediumButton::mOpenTimer") { - TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), + TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()), &mActions, "pasteto"); a->setShortcut(0); - a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy"); + a = KStdAction::copy(this, TQ_SLOT(slotCopy()), &mActions, "copy"); a->setShortcut(0); setBackgroundOrigin(AncestorOrigin); @@ -64,11 +64,11 @@ MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) refreshType(); - connect(&mOpenTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDragOpen())); + connect(&mOpenTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDragOpen())); // Activate this code only if we find a way to have both an // action and a popup menu for the same kicker button - //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); + //connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); setPopup(new TQPopupMenu()); } diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h index 76e448b27..40ee85ebd 100644 --- a/kicker/applets/media/mediumbutton.h +++ b/kicker/applets/media/mediumbutton.h @@ -32,7 +32,7 @@ class MediumButton : public PanelPopupButton { -Q_OBJECT +TQ_OBJECT public: MediumButton(TQWidget *parent, const KFileItem &fileItem); diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h index b29f697ae..2354a73a2 100644 --- a/kicker/applets/media/preferencesdialog.h +++ b/kicker/applets/media/preferencesdialog.h @@ -30,7 +30,7 @@ class PreferencesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PreferencesDialog(KFileItemList media, TQWidget *parent=0, const char *name=0); ~PreferencesDialog(); |