From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- korn/dockeditem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'korn/dockeditem.cpp') diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp index 9849155f1..dc55b3c08 100644 --- a/korn/dockeditem.cpp +++ b/korn/dockeditem.cpp @@ -37,7 +37,7 @@ #include DockedItem::DockedItem( TQWidget * tqparent, const char * name ) - : BoxContainerItem( tqparent, name ), + : BoxContainerItem( TQT_TQOBJECT(tqparent), name ), _systemtray( new SystemTray( tqparent, "System tray" ) ) { this->fillKPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() ); @@ -81,7 +81,7 @@ void DockedItem::slotShowPassivePopup( TQPtrList< KornMailSubject >* list, int t void DockedItem::slotShowPassivePopup( const TQString& message, const TQString& name ) { - KPassivePopup::message( i18n( "Korn - %1/%2" ).arg( objId() ).arg( name ), message, _systemtray, "Passive error message" ); + KPassivePopup::message( i18n( "Korn - %1/%2" ).tqarg( TQString(objId()) ).tqarg( name ), message, _systemtray, "Passive error message" ); } void DockedItem::doPopup() -- cgit v1.2.1