From e192d1b3be27a26e344ae48cc6aea31185fe0a99 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 13 Jun 2011 00:26:14 +0000
Subject: Finish TQt4 porting of kdesdk (kbabel)

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236386 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kbabel/common/catalog.cpp            | 10 +++++-----
 kbabel/common/catalogsettings.h      |  2 +-
 kbabel/common/kbproject.cpp          |  2 +-
 kbabel/common/libgettext/Makefile.am |  2 ++
 kbabel/common/poinfo.cpp             |  6 +++---
 5 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'kbabel/common')

diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index 3639748c..6ca18cba 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -1541,7 +1541,7 @@ int Catalog::prevError(uint startIndex, DocPosition& pos) const
 
 void Catalog::registerView(CatalogView* view)
 {
-   if(d->_views.containsRef(view)==0)
+   if(d->_views.tqcontainsRef(view)==0)
    {
       d->_views.append(view);
    }
@@ -2549,7 +2549,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
         int contextInfoPos = -1;
 		TQString targetStr;
 
-		kapp->processEvents(10);
+		kapp->tqprocessEvents(10);
 
 		if( d->_stop || endReached)
 		{
@@ -2798,7 +2798,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
         int contextInfoPos = -1;
 		TQString targetStr;
 
-		kapp->processEvents(10);
+		kapp->tqprocessEvents(10);
 
 		if( d->_stop || beginReached)
 		{
@@ -3155,7 +3155,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
                 bestId = (*it);
             }
 
-            kapp->processEvents(10);
+            kapp->tqprocessEvents(10);
 
 	    if( d->_stop )
 	    {
@@ -3232,7 +3232,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
         {
             oldPercent = percent;
             emit signalProgress(percent);
-            kapp->processEvents(10);
+            kapp->tqprocessEvents(10);
         }
 
         TQString id = (*it).msgid;
diff --git a/kbabel/common/catalogsettings.h b/kbabel/common/catalogsettings.h
index 552f88c5..f1426a3c 100644
--- a/kbabel/common/catalogsettings.h
+++ b/kbabel/common/catalogsettings.h
@@ -63,7 +63,7 @@ struct KDE_EXPORT SaveSettings
     int encoding;
     bool useOldEncoding;
 
-    TQt::DateFormat dateFormat;
+    Qt::DateFormat dateFormat;
     TQString customDateFormat;
     
     TQString projectString;
diff --git a/kbabel/common/kbproject.cpp b/kbabel/common/kbproject.cpp
index 99fece7e..743b26d9 100644
--- a/kbabel/common/kbproject.cpp
+++ b/kbabel/common/kbproject.cpp
@@ -250,7 +250,7 @@ SaveSettings Project::saveSettings ()
     settings.autoSyntaxCheck = _settings->autoSyntaxCheck();
     settings.saveObsolete = _settings->saveObsolete();
     settings.customDateFormat = _settings->customDateFormat();
-    settings.dateFormat = (TQt::DateFormat)_settings->dateFormat();
+    settings.dateFormat = (Qt::DateFormat)_settings->dateFormat();
     settings.updateDescription = _settings->updateDescription();
     settings.descriptionString = _settings->descriptionString();
     settings.updateTranslatorCopyright = _settings->updateTranslatorCopyright();
diff --git a/kbabel/common/libgettext/Makefile.am b/kbabel/common/libgettext/Makefile.am
index eca54fda..6f5f4fe2 100644
--- a/kbabel/common/libgettext/Makefile.am
+++ b/kbabel/common/libgettext/Makefile.am
@@ -1,3 +1,5 @@
+INCLUDES=$(all_includes)
+
 # this might be a naive way of seeing it, but
 # automake does not support C++ flex files.
 #LEX_OUTPUT_ROOT = lex.GettextBase
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index f7245141..173c369d 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -1,6 +1,6 @@
 /*  
   This file is part of KBabel
-  Copyright (C) 2002 Stefan Asserhäll <stefan.asserhall@telia.com>
+  Copyright (C) 2002 Stefan Asserh�ll <stefan.asserhall@telia.com>
 		2003-2005 Stanislav Visnovsky <visnovsky@kde.org>
 
   This program is free software; you can redistribute it and/or modify
@@ -399,7 +399,7 @@ ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList
 	   
            while( lexer->lastToken != T_EOF && success==OK)
            {
-               if( interactive ) kapp->processEvents(10);
+               if( interactive ) kapp->tqprocessEvents(10);
 	       
 	       if( stopStaticRead )
 	       {
@@ -639,7 +639,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 		   }
 		   case T_MSGID: 
 		   case T_MSGIDPLURAL: {
-	    		kapp->processEvents(10);
+	    		kapp->tqprocessEvents(10);
 			
 			// if stopped, return not found
 			if( stopStaticRead ) 
-- 
cgit v1.2.3