TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

2 files changed, 19 insertions, 19 deletions

diff --git a/kbabel/addons/preview/pothumbcreator.cpp b/kbabel/addons/preview/pothumbcreator.cpp
index 0883025c..87eb5dbf 100644
--- a/kbabel/addons/preview/pothumbcreator.cpp
+++ b/kbabel/addons/preview/pothumbcreator.cpp
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -110,7 +110,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
        int w = pix.width()-2*xBorder;
        int h = pix.height()*2/3-2*yBorder;
 
-       int d = QMIN(w,h);
+       int d = TQMIN(w,h);
        xBorder = (pix.width()-d)/2;
        yBorder = (pix.height()*2/3-d)/2;
        
@@ -118,7 +118,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
        
        if(fuzzyAngle>0)
        {
-           p.setBrush(Qt::blue);
+           p.setBrush(TQt::blue);
            
            if(poInfo.total == poInfo.fuzzy)
            {
@@ -132,7 +132,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
        
        if(untransAngle>0)
        {
-           p.setBrush(Qt::red);
+           p.setBrush(TQt::red);
 
            if(poInfo.untranslated == poInfo.total)
            {
@@ -146,7 +146,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
        
        if(circle - fuzzyAngle - untransAngle>0)
        {
-           p.setBrush(Qt::darkGreen);
+           p.setBrush(TQt::darkGreen);
 
            if(poInfo.fuzzy==0 && poInfo.untranslated==0)
            {
@@ -180,9 +180,9 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
        int numLines = (int) (canvasHeight / chSize.height());
 
         int rest = pix.width() - (numCharsPerLine * chSize.width());
-        xBorder = QMAX( xBorder, rest/2); // center horizontally
+        xBorder = TQMAX( xBorder, rest/2); // center horizontally
         rest = pix.height()/3 - (numLines * chSize.height());
-        yBorder = QMAX( yBorder, rest/2); // center vertically
+        yBorder = TQMAX( yBorder, rest/2); // center vertically
         // end centering
 
 
@@ -207,7 +207,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
             if(!poInfo.encoding.isEmpty())
                 text += poInfo.encoding+'\n';
  
-            int lines = text.contains('\n')+1;
+            int lines = text.tqcontains('\n')+1;
             if(lines < numLines)
             {
                 text = poInfo.headerComment+'\n'+text;
@@ -259,9 +259,9 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
                 max = (*it).length();
         }        
         rest = pix.width() - (max * chSize.width());
-        xBorder = QMAX( xBorder, rest/2); // center horizontally
+        xBorder = TQMAX( xBorder, rest/2); // center horizontally
         rest = pix.height()/3 - (lineList.count() * chSize.height());
-        yBorder = QMAX( yBorder, rest/2); // center vertically
+        yBorder = TQMAX( yBorder, rest/2); // center vertically
 
         // where to paint the characters
         int x = xBorder, y = pix.height()*2/3; 
@@ -286,7 +286,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
                 // physical newline in the file if we don't come from one
                 if ( !newLine )
                 {
-                    int pos = text.find( '\n', i );
+                    int pos = text.tqfind( '\n', i );
                     if ( pos > (int) i )
                         i = pos +1;
                 }
@@ -311,7 +311,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
            rect = m_splitter->coordinates( ch );
            if ( !rect.isEmpty() )
            {
-               bitBlt( &pix, TQPoint(x,y), fontPixmap, rect, Qt::CopyROP );
+               bitBlt( &pix, TQPoint(x,y), fontPixmap, rect, TQt::CopyROP );
            }
 
            x += xOffset; // next character
@@ -339,11 +339,11 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
            }
            
            int x = pix.width()-kbabelPix.width()-4;
-           x = QMAX(x,0);
+           x = TQMAX(x,0);
            if(!kbabelPix.isNull())
            {
                bitBlt(&pix, TQPoint(x,4), &kbabelPix, kbabelPix.rect()
-                       , Qt::CopyROP);
+                       , TQt::CopyROP);
            }
         }
 
diff --git a/kbabel/addons/preview/pothumbcreator.h b/kbabel/addons/preview/pothumbcreator.h
index 25a1f7ab..f975b554 100644
--- a/kbabel/addons/preview/pothumbcreator.h
+++ b/kbabel/addons/preview/pothumbcreator.h
@@ -22,11 +22,11 @@
   
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.