summaryrefslogtreecommitdiffstats
path: root/kicker/applets/trash
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kicker/applets/trash
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/applets/trash')
-rw-r--r--kicker/applets/trash/trashapplet.cpp2
-rw-r--r--kicker/applets/trash/trashbutton.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index 18962b2ea..d363f3879 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -126,7 +126,7 @@ void TrashApplet::resizeEvent( TQResizeEvent * )
mButton->widthForHeight( height() ) );
- if(orientation() == Vertical)
+ if(orientation() == Qt::Vertical)
{
mButton->resize( width(), size );
}
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index 19e6be02b..166e9164f 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(this, this),
+ : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)),
mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/")
{
KIO::UDSEntry entry;
KIO::NetAccess::stat("trash:/", entry, 0L);
mFileItem.assign(KFileItem(entry, "trash:/"));
- KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()),
+ KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
&mActions, "paste");
a->setShortcut(0);