diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
| commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
| tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /korn/dockeditem.cpp | |
| parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
| download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip | |
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
Diffstat (limited to 'korn/dockeditem.cpp')
| -rw-r--r-- | korn/dockeditem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 <tqmovie.h> 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() |