4 files changed, 16 insertions, 16 deletions
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index f431b8aed..b86b5ef9d 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -31,7 +31,7 @@
 
 extern "C"
 {
-	KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile)
+	TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile)
 	{
 		TDEGlobal::locale()->insertCatalogue("trashapplet");
 		return new TrashApplet(configFile, KPanelApplet::Normal,
@@ -53,12 +53,12 @@ TrashApplet::TrashApplet(const TQString& configFile, Type type, int actions, TQW
 
 	mpDirLister = new KDirLister();
 
-	connect( mpDirLister, TQT_SIGNAL( clear() ),
-	         this, TQT_SLOT( slotClear() ) );
-	connect( mpDirLister, TQT_SIGNAL( completed() ),
-	         this, TQT_SLOT( slotCompleted() ) );
-	connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
-	         this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
+	connect( mpDirLister, TQ_SIGNAL( clear() ),
+	         this, TQ_SLOT( slotClear() ) );
+	connect( mpDirLister, TQ_SIGNAL( completed() ),
+	         this, TQ_SLOT( slotCompleted() ) );
+	connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),
+	         this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
 
 	mpDirLister->openURL("trash:/");
 }
@@ -67,8 +67,8 @@ TrashApplet::~TrashApplet()
 {
 	// disconnect the dir lister before quitting so as not to crash
 	// on kicker exit
-	disconnect( mpDirLister, TQT_SIGNAL( clear() ),
-	            this, TQT_SLOT( slotClear() ) );
+	disconnect( mpDirLister, TQ_SIGNAL( clear() ),
+	            this, TQ_SLOT( slotClear() ) );
 	delete mpDirLister;
 	TDEGlobal::locale()->removeCatalogue("trashapplet");
 }
@@ -121,12 +121,12 @@ void TrashApplet::resizeEvent( TQResizeEvent * )
 	int size = 1;
 
 	size = std::max( size, 
-			 orientation() == Qt::Vertical ?
+			 orientation() == TQt::Vertical ?
 			 	mButton->heightForWidth( width() ) :
 				mButton->widthForHeight( height() ) );
 
 	
-	if(orientation() == Qt::Vertical)
+	if(orientation() == TQt::Vertical)
 	{
 		mButton->resize( width(), size );
 	}
diff --git a/kicker/applets/trash/trashapplet.h b/kicker/applets/trash/trashapplet.h
index c77cf3755..124ae4310 100644
--- a/kicker/applets/trash/trashapplet.h
+++ b/kicker/applets/trash/trashapplet.h
@@ -33,7 +33,7 @@
 
 class TrashApplet : public KPanelApplet
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	TrashApplet(const TQString& configFile, Type t = Normal, int actions = 0,
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index 85c0eef62..96efb7436 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -32,14 +32,14 @@
 #include <konq_popupmenu.h>
 
 TrashButton::TrashButton(TQWidget *parent)
-	: PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)),
+	: PanelPopupButton(parent), mActions(this, this),
 	  mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/")
 {
 	TDEIO::UDSEntry entry;
 	TDEIO::NetAccess::stat("trash:/", entry, 0L);
 	mFileItem.assign(KFileItem(entry, "trash:/"));
 
-	TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
+	TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()),
 	                               &mActions, "paste");
 	a->setShortcut(0);
 
@@ -53,7 +53,7 @@ TrashButton::TrashButton(TQWidget *parent)
 
 	// 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/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h
index bbf596a0c..fa1ce7077 100644
--- a/kicker/applets/trash/trashbutton.h
+++ b/kicker/applets/trash/trashbutton.h
@@ -32,7 +32,7 @@
 
 class TrashButton : public PanelPopupButton
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	TrashButton(TQWidget *parent);