From f636ba5ba2df9d34d56b1c85f24c6598fa1cb645 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 27 Jun 2011 05:58:16 +0000
Subject: TQt4 port kdiff3 This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1238464 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/main.cpp | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 6e19b58..218740e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,9 +21,9 @@
 #include "kdiff3_shell.h"
 #include <kstandarddirs.h>
 #include "version.h"
-#include <qtextcodec.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqtextcodec.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
 #include <vector>
 
 #ifdef KREPLACEMENTS_H
@@ -62,28 +62,28 @@ static KCmdLineOptions options2[] =
 };
 
 
-void initialiseCmdLineArgs(std::vector<KCmdLineOptions>& vOptions, QStringList& ignorableOptions)
+void initialiseCmdLineArgs(std::vector<KCmdLineOptions>& vOptions, TQStringList& ignorableOptions)
 {
    vOptions.insert( vOptions.end(), options, (KCmdLineOptions*)((char*)options+sizeof(options)));
-   QString configFileName = KStandardDirs().findResource("config","kdiff3rc");
-   QFile configFile( configFileName );
+   TQString configFileName = KStandardDirs().findResource("config","kdiff3rc");
+   TQFile configFile( configFileName );
    if ( configFile.open( IO_ReadOnly ) )
    {
-      QTextStream ts( &configFile );
+      TQTextStream ts( &configFile );
       while(!ts.atEnd())
       {
-         QString line = ts.readLine();
+         TQString line = ts.readLine();
          if ( line.startsWith("IgnorableCmdLineOptions=") )
          {
-            int pos = line.find('=');
+            int pos = line.tqfind('=');
             if (pos>=0)
             {
-               QString s = line.mid(pos+1);
-               QStringList sl = QStringList::split( '|', s );
+               TQString s = line.mid(pos+1);
+               TQStringList sl = TQStringList::split( '|', s );
                if (!sl.isEmpty())
                {
-                  ignorableOptions = QStringList::split( ';', sl.front() );
-                  for (QStringList::iterator i=ignorableOptions.begin(); i!=ignorableOptions.end(); ++i)
+                  ignorableOptions = TQStringList::split( ';', sl.front() );
+                  for (TQStringList::iterator i=ignorableOptions.begin(); i!=ignorableOptions.end(); ++i)
                   {
                      KCmdLineOptions ignoreOption;
                      (*i).remove('-');
@@ -112,7 +112,7 @@ void initialiseCmdLineArgs(std::vector<KCmdLineOptions>& vOptions, QStringList&
 #ifdef _WIN32
 #include <process.h>
 // This command checks the comm
-static bool isOptionUsed(const QString& s, int argc, char* argv[])
+static bool isOptionUsed(const TQString& s, int argc, char* argv[])
 {
    for(int j=0; j<argc; ++j )
    {
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
    }
 
 #endif
-   //QApplication::setColorSpec( QApplication::ManyColor ); // Grab all 216 colors
+   //TQApplication::setColorSpec( TQApplication::ManyColor ); // Grab all 216 colors
 
    KAboutData aboutData( "kdiff3", I18N_NOOP("KDiff3"),
       VERSION, description, KAboutData::License_GPL,
@@ -192,29 +192,29 @@ int main(int argc, char *argv[])
 
    KCmdLineArgs::init( argc, argv, &aboutData );
    std::vector<KCmdLineOptions> vOptions;
-   QStringList ignorableOptions;
+   TQStringList ignorableOptions;
    initialiseCmdLineArgs(vOptions, ignorableOptions);
 
    KApplication app;
 
 #ifdef KREPLACEMENTS_H
-   QString locale;
+   TQString locale;
 
    locale = app.config()->readEntry("Language", "Auto");
-   int spacePos = locale.find(' ');
+   int spacePos = locale.tqfind(' ');
    if (spacePos>0) locale = locale.left(spacePos);
-   QTranslator kdiff3Translator( 0 );
-   QTranslator qtTranslator( 0 );
+   TQTranslator kdiff3Translator( 0 );
+   TQTranslator qtTranslator( 0 );
    if (locale != "en_orig")
    {
       if ( locale == "Auto" || locale.isEmpty() )
-         locale = QTextCodec::locale();
+         locale = TQTextCodec::locale();
          
-      QString translationDir = getTranslationDir();
-      kdiff3Translator.load( QString("kdiff3_")+locale, translationDir );
+      TQString translationDir = getTranslationDir();
+      kdiff3Translator.load( TQString("kdiff3_")+locale, translationDir );
       app.installTranslator( &kdiff3Translator );
       
-      qtTranslator.load( QString("qt_")+locale, translationDir );
+      qtTranslator.load( TQString("qt_")+locale, translationDir );
       app.installTranslator( &qtTranslator );
    }
 #endif
-- 
cgit v1.2.1