Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

6 files changed, 11 insertions, 11 deletions

diff --git a/kooka/kocrbase.h b/kooka/kocrbase.h
index 5f7e55a9..3597908f 100644
--- a/kooka/kocrbase.h
+++ b/kooka/kocrbase.h
@@ -107,7 +107,7 @@ protected:
      * ocr engine used.
      * It calls the virtual subs ocrEngineName, ocrEngineLogo and ocrEngineDesc which
      * must return the approbiate values for the engines.
-     * @return a pointer to a VBox in which further elements can be tqlayouted
+     * @return a pointer to a VBox in which further elements can be layouted
      */
     virtual void ocrIntro();
 
diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp
index 31c3bc40..ff675231 100644
--- a/kooka/kocrocrad.cpp
+++ b/kooka/kocrocrad.cpp
@@ -92,7 +92,7 @@ TQString ocradDialog::ocrEngineDesc() const
 }
 
 
-int ocradDialog::tqlayoutDetectionMode() const
+int ocradDialog::layoutDetectionMode() const
 {
     return m_layoutMode->currentItem();
 }
@@ -131,8 +131,8 @@ EngineError ocradDialog::setupGui()
 
     /** tqlayout detection button **/
     conf->setGroup( CFG_GROUP_OCRAD );
-    int tqlayoutDetect = conf->readNumEntry( CFG_OCRAD_LAYOUT_DETECTION, 0 );
-    kdDebug(28000) << "Layout detection from config: " << tqlayoutDetect << endl;
+    int layoutDetect = conf->readNumEntry( CFG_OCRAD_LAYOUT_DETECTION, 0 );
+    kdDebug(28000) << "Layout detection from config: " << layoutDetect << endl;
 
     (void) new KSeparator( KSeparator::HLine, page);
     TQHBox *hb1 = new TQHBox(page);
@@ -142,7 +142,7 @@ EngineError ocradDialog::setupGui()
     m_layoutMode->insertItem(i18n("No Layout Detection"), 0 );
     m_layoutMode->insertItem(i18n("Column Detection"), 1 );
     m_layoutMode->insertItem(i18n("Full Layout Detection"), 2);
-    m_layoutMode->setCurrentItem(tqlayoutDetect);
+    m_layoutMode->setCurrentItem(layoutDetect);
 
     /** stating the ocrad binary **/
     (void) new KSeparator( KSeparator::HLine, page);
diff --git a/kooka/kocrocrad.h b/kooka/kocrocrad.h
index d33f03a3..dc6000ca 100644
--- a/kooka/kocrocrad.h
+++ b/kooka/kocrocrad.h
@@ -38,7 +38,7 @@
 #include "kocrbase.h"
 
 #define CFG_GROUP_OCRAD "ocrad"
-#define CFG_OCRAD_LAYOUT_DETECTION "tqlayoutDetection"
+#define CFG_OCRAD_LAYOUT_DETECTION "layoutDetection"
 #define CFG_OCRAD_EXTRA_ARGUMENTS  "extraArguments"
 #define CFG_OCRAD_FORMAT "format"
 #define CFG_OCRAD_CHARSET "charset"
@@ -71,7 +71,7 @@ public:
 
     TQString orfUrl() const;
 
-    int tqlayoutDetectionMode() const;
+    int layoutDetectionMode() const;
 
     /**
      * returns the numeric version of the ocrad program.
diff --git a/kooka/kookaimage.cpp b/kooka/kookaimage.cpp
index a89a97cb..4bf7976c 100644
--- a/kooka/kookaimage.cpp
+++ b/kooka/kookaimage.cpp
@@ -205,7 +205,7 @@ void KookaImage::extractNow()
 {
    kdDebug(28000) << "extracting a subimage number " << m_subNo << endl;
 
-   KookaImage *tqparent = tqparentImage();
+   KookaImage *tqparent = parentImage();
 
    if( tqparent )
    {
@@ -328,7 +328,7 @@ KookaImage::~KookaImage()
 
 }
 
-KookaImage* KookaImage::tqparentImage() const
+KookaImage* KookaImage::parentImage() const
 {
    return( m_parent );
 }
diff --git a/kooka/kookaimage.h b/kooka/kookaimage.h
index 53ae5eaf..559f1469 100644
--- a/kooka/kookaimage.h
+++ b/kooka/kookaimage.h
@@ -78,7 +78,7 @@ public:
     /**
      * the tqparent image.
      */
-    KookaImage*  tqparentImage() const;
+    KookaImage*  parentImage() const;
 
     /**
      * returns true if this is a subimage.
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index 9e687ff5..54d37244 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -401,7 +401,7 @@ void KSANEOCR::startOCRAD( )
     *daemon <<  m_tmpOrfName;                   // the orf result file
     *daemon << TQFile::encodeName( m_ocrImagePBM ).data();      // The name of the image
     *daemon << TQString("-l");
-    *daemon << TQString::number( ocrDia->tqlayoutDetectionMode());
+    *daemon << TQString::number( ocrDia->layoutDetectionMode());
 
     KConfig *konf = KGlobal::config ();
     KConfigGroupSaver( konf, CFG_GROUP_OCRAD );