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 --- kmail/kmmainwin.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kmail/kmmainwin.cpp') diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp index 21879c55e..fb2b28b27 100644 --- a/kmail/kmmainwin.cpp +++ b/kmail/kmmainwin.cpp @@ -36,10 +36,10 @@ KMMainWin::KMMainWin(TQWidget *) kapp->ref(); (void) new KAction( i18n("New &Window"), "window_new", 0, - this, TQT_SLOT(slotNewMailReader()), + TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()), actionCollection(), "new_mail_client" ); - mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() ); + mKMMainWidget = new KMMainWidget( TQT_TQWIDGET(this), "KMMainWidget", this, actionCollection() ); mKMMainWidget->resize( 450, 600 ); setCentralWidget(mKMMainWidget); setupStatusBar(); @@ -51,13 +51,13 @@ KMMainWin::KMMainWin(TQWidget *) setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); - KStdAction::keyBindings(mKMMainWidget, TQT_SLOT(slotEditKeys()), + KStdAction::keyBindings(TQT_TQOBJECT(mKMMainWidget), TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); createGUI( "kmmainwin.rc", false ); // Don't use conserveMemory() because this renders dynamic plugging // of actions unusable! @@ -96,7 +96,7 @@ KMMainWin::~KMMainWin() if ( !it.current()->isHidden() && it.current()->isTopLevel() && it.current() != this && - ::qt_cast( it.current() ) + ::tqqt_cast( it.current() ) ) not_withdrawn++; } -- cgit v1.2.1