Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 6 insertions, 10 deletions

diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 06ae07418..e04e0c9a9 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqwidgetstack.h>
@@ -315,11 +315,7 @@ void KOViewManager::zoomOutVertically()
 void KOViewManager::addView(KOrg::BaseView *view)
 {
   connectView( view );
-#if QT_VERSION >= 300
   mMainView->viewStack()->addWidget( view );
-#else
-  mMainView->viewStack()->addWidget( view, 1 );
-#endif
 }
 
 void KOViewManager::showWhatsNextView()
@@ -358,12 +354,12 @@ void KOViewManager::showAgendaView()
 
   const bool showSideBySide = !isLocalFile && ( showBoth || mode == KOPrefs::CalendarsSideBySide );
 
-  TQWidget *parent = mMainView->viewStack();
+  TQWidget *tqparent = mMainView->viewStack();
   if ( !mAgendaViewTabs && showBoth ) {
     mAgendaViewTabs = new TQTabWidget( mMainView->viewStack() );
     connect( mAgendaViewTabs, TQT_SIGNAL( currentChanged( TQWidget* ) ),
              this, TQT_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) );
-    parent = mAgendaViewTabs;
+    tqparent = mAgendaViewTabs;
 
     KConfig *config = KOGlobals::self()->config();
     config->setGroup( "Views" );
@@ -373,7 +369,7 @@ void KOViewManager::showAgendaView()
   if ( !mAgendaView && showMerged ) {
     mAgendaView = new KOAgendaView( mMainView->calendar(),
                                     mMainView,
-                                    parent,
+                                    tqparent,
                                     "KOViewManager::AgendaView" );
 
     addView(mAgendaView);
@@ -390,7 +386,7 @@ void KOViewManager::showAgendaView()
 
   if ( !mAgendaSideBySideView && showSideBySide ) {
     mAgendaSideBySideView =
-      new MultiAgendaView( mMainView->calendar(), mMainView, parent,
+      new MultiAgendaView( mMainView->calendar(), mMainView, tqparent,
                         "KOViewManager::AgendaSideBySideView" );
 
     addView(mAgendaSideBySideView);