Trinity Qt initial conversion

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

2 files changed, 36 insertions, 36 deletions

diff --git a/kwin/data/update_default_rules.cpp b/kwin/data/update_default_rules.cpp
index 78adc6164..e43323ec9 100644
--- a/kwin/data/update_default_rules.cpp
+++ b/kwin/data/update_default_rules.cpp
@@ -21,7 +21,7 @@ int main( int argc, char* argv[] )
     if( argc != 2 )
         return 1;
     KInstance inst( "kwin_update_default_rules" );
-    QString file = locate( "data", QString( "kwin/default_rules/" ) + argv[ 1 ] );
+    TQString file = locate( "data", TQString( "kwin/default_rules/" ) + argv[ 1 ] );
     if( file.isEmpty())
         {
         kdWarning() << "File " << argv[ 1 ] << " not found!" << endl;
@@ -37,11 +37,11 @@ int main( int argc, char* argv[] )
          group <= count;
          ++group )
         {
-        QMap< QString, QString > entries = src_cfg.entryMap( QString::number( group ));
+        TQMap< TQString, TQString > entries = src_cfg.entryMap( TQString::number( group ));
         ++pos;
-        dest_cfg.deleteGroup( QString::number( pos ));
-        dest_cfg.setGroup( QString::number( pos ));
-        for( QMap< QString, QString >::ConstIterator it = entries.begin();
+        dest_cfg.deleteGroup( TQString::number( pos ));
+        dest_cfg.setGroup( TQString::number( pos ));
+        for( TQMap< TQString, TQString >::ConstIterator it = entries.begin();
              it != entries.end();
              ++it )
             dest_cfg.writeEntry( it.key(), *it );
diff --git a/kwin/data/update_window_settings.cpp b/kwin/data/update_window_settings.cpp
index 369c1e4ea..0a39850d7 100644
--- a/kwin/data/update_window_settings.cpp
+++ b/kwin/data/update_window_settings.cpp
@@ -17,16 +17,16 @@ License. See the file "COPYING" for the exact licensing terms.
 
 struct SessionInfo
     {
-    QCString sessionId;
-    QCString windowRole;
-    QCString wmCommand;
-    QCString wmClientMachine;
-    QCString resourceName;
-    QCString resourceClass;
+    TQCString sessionId;
+    TQCString windowRole;
+    TQCString wmCommand;
+    TQCString wmClientMachine;
+    TQCString resourceName;
+    TQCString resourceClass;
 
-    QRect geometry;
-    QRect restore;
-    QRect fsrestore;
+    TQRect geometry;
+    TQRect restore;
+    TQRect fsrestore;
     int maximized;
     int fullscreen;
     int desktop;
@@ -43,7 +43,7 @@ struct SessionInfo
     bool fake; // fake session, i.e. 'save window settings', not SM restored
     };
 
-QPtrList<SessionInfo> fakeSession;
+TQPtrList<SessionInfo> fakeSession;
 
 static const char* const window_type_names[] = 
     {
@@ -69,28 +69,28 @@ void loadFakeSessionInfo( KConfig* config )
     int count =  config->readNumEntry( "count" );
     for ( int i = 1; i <= count; i++ ) 
         {
-        QString n = QString::number(i);
+        TQString n = TQString::number(i);
         SessionInfo* info = new SessionInfo;
         fakeSession.append( info );
-        info->windowRole = config->readEntry( QString("windowRole")+n ).latin1();
-        info->resourceName = config->readEntry( QString("resourceName")+n ).latin1();
-        info->resourceClass = config->readEntry( QString("resourceClass")+n ).lower().latin1();
-        info->wmClientMachine = config->readEntry( QString("clientMachine")+n ).latin1();
-        info->geometry = config->readRectEntry( QString("geometry")+n );
-        info->restore = config->readRectEntry( QString("restore")+n );
-        info->fsrestore = config->readRectEntry( QString("fsrestore")+n );
-        info->maximized = config->readNumEntry( QString("maximize")+n, 0 );
-        info->fullscreen = config->readNumEntry( QString("fullscreen")+n, 0 );
-        info->desktop = config->readNumEntry( QString("desktop")+n, 0 );
-        info->minimized = config->readBoolEntry( QString("iconified")+n, FALSE );
-        info->onAllDesktops = config->readBoolEntry( QString("sticky")+n, FALSE );
-        info->shaded = config->readBoolEntry( QString("shaded")+n, FALSE );
-        info->keepAbove = config->readBoolEntry( QString("staysOnTop")+n, FALSE  );
-        info->keepBelow = config->readBoolEntry( QString("keepBelow")+n, FALSE  );
-        info->skipTaskbar = config->readBoolEntry( QString("skipTaskbar")+n, FALSE  );
-        info->skipPager = config->readBoolEntry( QString("skipPager")+n, FALSE  );
-        info->userNoBorder = config->readBoolEntry( QString("userNoBorder")+n, FALSE  );
-        info->windowType = txtToWindowType( config->readEntry( QString("windowType")+n ).latin1());
+        info->windowRole = config->readEntry( TQString("windowRole")+n ).latin1();
+        info->resourceName = config->readEntry( TQString("resourceName")+n ).latin1();
+        info->resourceClass = config->readEntry( TQString("resourceClass")+n ).lower().latin1();
+        info->wmClientMachine = config->readEntry( TQString("clientMachine")+n ).latin1();
+        info->geometry = config->readRectEntry( TQString("geometry")+n );
+        info->restore = config->readRectEntry( TQString("restore")+n );
+        info->fsrestore = config->readRectEntry( TQString("fsrestore")+n );
+        info->maximized = config->readNumEntry( TQString("maximize")+n, 0 );
+        info->fullscreen = config->readNumEntry( TQString("fullscreen")+n, 0 );
+        info->desktop = config->readNumEntry( TQString("desktop")+n, 0 );
+        info->minimized = config->readBoolEntry( TQString("iconified")+n, FALSE );
+        info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, FALSE );
+        info->shaded = config->readBoolEntry( TQString("shaded")+n, FALSE );
+        info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, FALSE  );
+        info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, FALSE  );
+        info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, FALSE  );
+        info->skipPager = config->readBoolEntry( TQString("skipPager")+n, FALSE  );
+        info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, FALSE  );
+        info->windowType = txtToWindowType( config->readEntry( TQString("windowType")+n ).latin1());
         info->active = false;
         info->fake = true;
         }
@@ -106,7 +106,7 @@ void writeRules( KConfig& cfg )
         if( info->resourceName.isEmpty() && info->resourceClass.isEmpty())
             continue;
         ++pos;
-        cfg.setGroup( QString::number( pos ));
+        cfg.setGroup( TQString::number( pos ));
         cfg.writeEntry( "description", ( const char* ) ( info->resourceClass + " (KDE3.2)" ));
         cfg.writeEntry( "wmclass", ( const char* )( info->resourceName + ' ' + info->resourceClass ));
         cfg.writeEntry( "wmclasscomplete", true );