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

1 files changed, 19 insertions, 18 deletions

diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp
index f8c5fa998..3fbb5aed2 100644
--- a/konsolekalendar/konsolekalendar.cpp
+++ b/konsolekalendar/konsolekalendar.cpp
@@ -3,7 +3,8 @@
  *                                                                             *
  * KonsoleKalendar is a command line interface to KDE calendars                *
  * Copyright (C) 2002-2004  Tuukka Pasanen <illuusio@mailcity.com>             *
- * Copyright (C) 2003-2005  Allen Winter <winter@kde.org>
+ * Copyright (C) 2003-2005  Allen Winter <winter@kde.org>                      *
+ * Copyright (C) 2010-2011  Timothy Pearson <kb9vqf@pearsoncomputing.net>      *
  *                                                                             *
  * This program is free software; you can redistribute it and/or modify        *
  * it under the terms of the GNU General Public License as published by        *
@@ -20,8 +21,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 TQt, and distribute the resulting executable,            *
- * without including the source code for TQt 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.       *
  *                                                                             *
  ******************************************************************************/
 /**
@@ -83,17 +84,17 @@ bool KonsoleKalendar::createCalendar()
 
   if ( m_variables->isDryRun() ) {
     cout << i18n( "Create Calendar <Dry Run>: %1" ).
-      arg( m_variables->getCalendarFile() ).local8Bit()
+      tqarg( m_variables->getCalendarFile() ).local8Bit().data()
          << endl;
   } else {
     kdDebug() << "konsolekalendar.cpp::createCalendar() | "
               << "Creating calendar file: "
-              << m_variables->getCalendarFile().local8Bit()
+              << m_variables->getCalendarFile().local8Bit().data()
               << endl;
 
     if ( m_variables->isVerbose() ) {
       cout << i18n( "Create Calendar <Verbose>: %1" ).
-        arg( m_variables->getCalendarFile() ).local8Bit()
+        tqarg( m_variables->getCalendarFile() ).local8Bit().data()
            << endl;
     }
 
@@ -113,7 +114,7 @@ bool KonsoleKalendar::showInstance()
   Event *event;
 
   if ( m_variables->isDryRun() ) {
-    cout << i18n( "View Events <Dry Run>:" ).local8Bit()
+    cout << i18n( "View Events <Dry Run>:" ).local8Bit().data()
          << endl;
     printSpecs();
   } else {
@@ -141,7 +142,7 @@ bool KonsoleKalendar::showInstance()
                 << endl;
 
       if ( m_variables->isVerbose() ) {
-	cout << i18n( "View Event <Verbose>:" ).local8Bit()
+	cout << i18n( "View Event <Verbose>:" ).local8Bit().data()
              << endl;
 	printSpecs();
       }
@@ -244,7 +245,7 @@ bool KonsoleKalendar::showInstance()
 	  kdDebug() << "konsolekalendar.cpp::showInstance() | "
                     << "HTML view events by uid list" << endl;
 	  cout << i18n("Sorry, export to HTML by UID is not supported yet")
-            .local8Bit() << endl;
+            .local8Bit().data() << endl;
 	  return( false );
 	} else {
 	  kdDebug() << "konsolekalendar.cpp::showInstance() | "
@@ -271,11 +272,11 @@ bool KonsoleKalendar::showInstance()
         } else {
           if ( firstdate == lastdate ) {
             title = i18n( "Events: %1" )
-                    .arg(  firstdate.toString( TQt::TextDate ) );
+                    .tqarg(  firstdate.toString( Qt::TextDate ) );
           } else {
             title = i18n( "Events: %1 - %2" )
-                    .arg( firstdate.toString( TQt::TextDate ) )
-                    .arg( lastdate.toString( TQt::TextDate ) );
+                    .tqarg( firstdate.toString( Qt::TextDate ) )
+                    .tqarg( lastdate.toString( Qt::TextDate ) );
           }
           htmlSettings.setEventView( true );
         }
@@ -434,27 +435,27 @@ bool KonsoleKalendar::isEvent( TQDateTime startdate,
 void KonsoleKalendar::printSpecs()
 {
   cout << i18n( "  What:  %1" ).
-    arg( m_variables->getSummary() ).local8Bit()
+    tqarg( m_variables->getSummary() ).local8Bit().data()
        << endl;
 
   cout << i18n( "  Begin: %1" ).
-    arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit()
+    tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data()
        << endl;
 
   cout << i18n( "  End:   %1" ).
-    arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit()
+    tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data()
        << endl;
 
   if ( m_variables->getFloating() == true ) {
-    cout << i18n( "  No Time Associated with Event" ).local8Bit()
+    cout << i18n( "  No Time Associated with Event" ).local8Bit().data()
          << endl;
   }
 
   cout << i18n( "  Desc:  %1" ).
-    arg( m_variables->getDescription() ).local8Bit()
+    tqarg( m_variables->getDescription() ).local8Bit().data()
        << endl;
 
   cout << i18n( "  Location:  %1" ).
-    arg( m_variables->getLocation() ).local8Bit()
+    tqarg( m_variables->getLocation() ).local8Bit().data()
        << endl;
 }