Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 23 insertions, 23 deletions

diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp
index 02aa5b6e2..0fc5bf72c 100644
--- a/konsolekalendar/main.cpp
+++ b/konsolekalendar/main.cpp
@@ -204,11 +204,11 @@ int main( int argc, char *argv[] )
   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
   // Default values for start date/time (today at 07:00)
-  TQDate startdate = TQDate::currentDate();
+  TQDate startdate = TQDate::tqcurrentDate();
   TQTime starttime( 7, 0 );
 
   // Default values for end date/time (today at 17:00)
-  TQDate enddate = TQDate::currentDate();
+  TQDate enddate = TQDate::tqcurrentDate();
   TQTime endtime( 17, 0 );
 
   // Default values for switches
@@ -241,22 +241,22 @@ int main( int argc, char *argv[] )
   if ( args->isSet( "export-list" ) ) {
     cout << endl;
     cout << i18n( "%1 supports these export formats:" ).
-      arg( progDisplay ).local8Bit().data()
+      tqarg( progDisplay ).local8Bit().data()
          << endl;
     cout << i18n( "  %1 [Default]" ).
-      arg( "Text" ).local8Bit().data()
+      tqarg( "Text" ).local8Bit().data()
          << endl;
     cout << i18n( "  %1 (like %2, but more compact)" ).
-      arg( "Short", "Text" ).local8Bit().data()
+      tqarg( "Short", "Text" ).local8Bit().data()
          << endl;
     cout << i18n( "  %1" ).
-      arg( "HTML" ).local8Bit().data()
+      tqarg( "HTML" ).local8Bit().data()
          << endl;
     cout << i18n( "  %1 (like %2, but in a month view)" ).
-      arg( "HTMLmonth", "HTML" ).local8Bit().data()
+      tqarg( "HTMLmonth", "HTML" ).local8Bit().data()
          << endl;
     cout << i18n( "  %1 (Comma-Separated Values)" ).
-      arg( "CSV" ).local8Bit().data()
+      tqarg( "CSV" ).local8Bit().data()
          << endl;
     cout << endl;
     return 0;
@@ -315,7 +315,7 @@ int main( int argc, char *argv[] )
       variables.setExportType( ExportTypeTextShort );
     } else {
       cout << i18n( "Invalid Export Type Specified: %1" ).
-        arg( option ).local8Bit().data()
+        tqarg( option ).local8Bit().data()
            << endl;
       return 1;
     }
@@ -475,7 +475,7 @@ int main( int argc, char *argv[] )
     startdate = TQDate::fromString( option, Qt::ISODate );
     if ( !startdate.isValid() ) {
       cout << i18n( "Invalid Start Date Specified: %1" ).
-        arg( option ).local8Bit().data()
+        tqarg( option ).local8Bit().data()
            << endl;
       return 1;
     }
@@ -500,7 +500,7 @@ int main( int argc, char *argv[] )
       starttime = TQTime::fromString( option, Qt::ISODate );
       if ( !starttime.isValid() ) {
         cout << i18n( "Invalid Start Time Specified: %1" ).
-          arg( option ).local8Bit().data()
+          tqarg( option ).local8Bit().data()
              << endl;
         return 1;
       }
@@ -530,7 +530,7 @@ int main( int argc, char *argv[] )
     enddate = TQDate::fromString( option, Qt::ISODate );
     if ( !enddate.isValid() ) {
       cout << i18n( "Invalid End Date Specified: %1" ).
-        arg( option ).local8Bit().data()
+        tqarg( option ).local8Bit().data()
            << endl;
       return 1;
     }
@@ -554,7 +554,7 @@ int main( int argc, char *argv[] )
 
     if ( !ok ) {
       cout << i18n( "Invalid Date Count Specified: %1" ).
-        arg( option ).local8Bit().data()
+        tqarg( option ).local8Bit().data()
            << endl;
       return 1;
     }
@@ -582,7 +582,7 @@ int main( int argc, char *argv[] )
       endtime = TQTime::fromString( option, Qt::ISODate );
       if ( !endtime.isValid() ) {
         cout << i18n( "Invalid End Time Specified: %1" ).
-          arg( option ).local8Bit().data()
+          tqarg( option ).local8Bit().data()
              << endl;
         return 1;
       }
@@ -682,12 +682,12 @@ int main( int argc, char *argv[] )
 
       if ( remote ) {
         cout << i18n( "Attempting to create a remote file %1" ).
-          arg( variables.getCalendarFile() ).local8Bit().data() << endl;
+          tqarg( variables.getCalendarFile() ).local8Bit().data() << endl;
         return 1;
       } else {
         if ( exists ) {
           cout << i18n( "Calendar %1 already exists" ).
-            arg( variables.getCalendarFile() ).local8Bit().data()
+            tqarg( variables.getCalendarFile() ).local8Bit().data()
                << endl;
           return 1;
         }
@@ -695,12 +695,12 @@ int main( int argc, char *argv[] )
 
       if ( konsolekalendar->createCalendar() ) {
         cout << i18n( "Calendar %1 successfully created" ).
-          arg( variables.getCalendarFile() ).local8Bit().data()
+          tqarg( variables.getCalendarFile() ).local8Bit().data()
              << endl;
         return 0;
       } else {
         cout << i18n( "Unable to create calendar: %1" ).
-          arg( variables.getCalendarFile() ).local8Bit().data()
+          tqarg( variables.getCalendarFile() ).local8Bit().data()
              << endl;
         return 1;
       }
@@ -708,7 +708,7 @@ int main( int argc, char *argv[] )
 
     if ( !exists ) {
       cout << i18n( "Calendar file not found %1" ).
-        arg( variables.getCalendarFile() ).local8Bit().data()
+        tqarg( variables.getCalendarFile() ).local8Bit().data()
            << endl;
       cout << i18n( "Try --create to create new calendar file" ).local8Bit().data()
            << endl;
@@ -894,17 +894,17 @@ int main( int argc, char *argv[] )
    */
   TQString prodId = "-//K Desktop Environment//NONSGML %1 %2//EN";
   CalFormat::setApplication( progDisplay,
-                             prodId.arg( progDisplay ).arg( progVersion ) );
+                             prodId.tqarg( progDisplay ).tqarg( progVersion ) );
 
   if ( importFile ) {
     if ( konsolekalendar->importCalendar() ) {
       cout << i18n( "Calendar %1 successfully imported" ).
-        arg( variables.getImportFile() ).local8Bit().data()
+        tqarg( variables.getImportFile() ).local8Bit().data()
            << endl;
       return 0;
     } else {
       cout << i18n( "Unable to import calendar: %1" ).
-        arg( variables.getImportFile() ).local8Bit().data()
+        tqarg( variables.getImportFile() ).local8Bit().data()
            << endl;
       return 1;
     }
@@ -971,7 +971,7 @@ int main( int argc, char *argv[] )
               << endl;
     if ( !konsolekalendar->showInstance() ) {
       cout << i18n( "Cannot open specified export file: %1" ).
-        arg( variables.getExportFile() ).local8Bit().data()
+        tqarg( variables.getExportFile() ).local8Bit().data()
            << endl;
       return 1;
     }