1 files changed, 11 insertions, 11 deletions

diff --git a/ksirc/ksopts.cpp b/ksirc/ksopts.cpp
index c0d6a927..de03ab79 100644
--- a/ksirc/ksopts.cpp
+++ b/ksirc/ksopts.cpp
@@ -142,7 +142,7 @@ void KSOptions::load( int sections )
 {
     KConfig *conf = kapp->config();
     conf->setGroup( "ServerController" );
-    tqgeometry = conf->readRectEntry( "Size" );
+    geometry = conf->readRectEntry( "Size" );
 
     // Using the fields itself as default values as they are already
     // set to the defaults.
@@ -232,17 +232,17 @@ void KSOptions::load( int sections )
             colourTheme = conf->readEntry("ColourTheme", colourTheme );
 	    for ( int i = 0; i < 16; ++i ) {
 		ircColors[i] =
-		    conf->readColorEntry(TQString::tqfromLatin1( "IRC-%1" ).tqarg( i ),
+		    conf->readColorEntry(TQString::fromLatin1( "IRC-%1" ).arg( i ),
 					 &ircColors[i] );
                 nickHighlight[i] =
-		    conf->readBoolEntry(TQString::tqfromLatin1( "nickHighlight-%1" ).tqarg( i ),
+		    conf->readBoolEntry(TQString::fromLatin1( "nickHighlight-%1" ).arg( i ),
 					 &nickHighlight[i] );
 	    }
         }
 	conf->setGroup( "GlobalOptions" );
         TQFont df = kapp->font((TQWidget*)0);
         defaultFont = conf->readFontEntry( "MainFont", &df);
-        TQApplication::tqsetFont( defaultFont, true, "KSirc::TextView" );
+        TQApplication::setFont( defaultFont, true, "KSirc::TextView" );
     }
     if ( sections & Channels )
     {
@@ -268,7 +268,7 @@ void KSOptions::load( int sections )
 	    channel["global"]["global"].encoding = conf->readEntry("globalglobalEncoding", "Default");
         }
 
-	TQDateTime now(TQDateTime::tqcurrentDateTime());
+	TQDateTime now(TQDateTime::currentDateTime());
         TQStringList servers = conf->readListEntry("Servers");
         TQStringList::ConstIterator ser = servers.begin();
         for( ; ser != servers.end(); ser++){
@@ -422,8 +422,8 @@ void KSOptions::save( int sections )
 	conf->writeEntry( "nickColourization", nickColourization );
         conf->writeEntry( "ColourTheme", colourTheme );
 	for ( int i = 0; i < 16; ++i ) {
-	    conf->writeEntry( TQString::tqfromLatin1( "IRC-%1" ).tqarg( i ), ircColors[i] );
-	    conf->writeEntry( TQString::tqfromLatin1( "nickHighlight-%1" ).tqarg( i ), nickHighlight[i] );
+	    conf->writeEntry( TQString::fromLatin1( "IRC-%1" ).arg( i ), ircColors[i] );
+	    conf->writeEntry( TQString::fromLatin1( "nickHighlight-%1" ).arg( i ), nickHighlight[i] );
 	}
         /* Store the font setting */
         conf->setGroup( "GlobalOptions" );
@@ -500,10 +500,10 @@ void KSOptions::channelSetup(TQString serv, TQString chan)
         channel[serv].insert(chan, ksoc);
         channel[serv][chan].server = serv;
 	channel[serv][chan].channel = chan;
-	channel[serv][chan].lastUsed = TQDateTime::tqcurrentDateTime();
+	channel[serv][chan].lastUsed = TQDateTime::currentDateTime();
     }
     else {
-	channel[serv][chan].lastUsed = TQDateTime::tqcurrentDateTime();
+	channel[serv][chan].lastUsed = TQDateTime::currentDateTime();
     }
 }
 
@@ -530,10 +530,10 @@ void KSOptions::serverSetup(TQString serv)
         server.insert(serv, ksos);
 	server[serv].server = serv;
         server[serv].globalCopy = true;
-	server[serv].lastUsed = TQDateTime::tqcurrentDateTime();
+	server[serv].lastUsed = TQDateTime::currentDateTime();
     }
     else {
-	server[serv].lastUsed = TQDateTime::tqcurrentDateTime();
+	server[serv].lastUsed = TQDateTime::currentDateTime();
     }
 }