Trinity Qt initial conversion

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

4 files changed, 27 insertions, 27 deletions

diff --git a/ktalkd/ktalkd/machines/forwmach.cpp b/ktalkd/ktalkd/machines/forwmach.cpp
index 4d6b2146..402e4f01 100644
--- a/ktalkd/ktalkd/machines/forwmach.cpp
+++ b/ktalkd/ktalkd/machines/forwmach.cpp
@@ -428,7 +428,7 @@ char * ForwMachine::forwMachFindMatch(TABLE_ENTRY * table, NEW_CTL_MSG * mp)
 
 void sig_handler(int signum)
 {
-    ktalk_debug("SIGNAL received : %d",signum);
+    ktalk_debug("TQT_SIGNAL received : %d",signum);
     ForwMachine * fwm = ForwMachine::getForwMachine();
     fwm->processDelete();
 }
diff --git a/ktalkd/ktalkd/machines/talkconn.cpp b/ktalkd/ktalkd/machines/talkconn.cpp
index 2836bc62..b2e5710a 100644
--- a/ktalkd/ktalkd/machines/talkconn.cpp
+++ b/ktalkd/ktalkd/machines/talkconn.cpp
@@ -164,7 +164,7 @@ struct in_addr TalkConnection::getReplyAddr (struct in_addr destination) {
   unsigned char *help1;
   unsigned char *help2;
 
- /* disabled caching - I don't have QIntDict ...
+ /* disabled caching - I don't have TQIntDict ...
   result = replyAddrList [(long) destination.s_addr];
   if (result) {
     return *result;
@@ -215,7 +215,7 @@ struct in_addr TalkConnection::getReplyAddr (struct in_addr destination) {
   }
   return *result;
 }
-/* QIntDict <in_addr> TalkConnection::replyAddrList; */
+/* TQIntDict <in_addr> TalkConnection::replyAddrList; */
 
 /** Check the remote protocol. Result stored in <protocol>.
  * @return 1 if succeeded to find at least 1 protocol */
diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp
index 07a10dc2..b18edbff 100644
--- a/ktalkd/ktalkd/readcfg++.cpp
+++ b/ktalkd/ktalkd/readcfg++.cpp
@@ -53,7 +53,7 @@
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
-#include <qfile.h>
+#include <tqfile.h>
 
 /* Ktalkd includes */
 #include "readconf.h"
@@ -89,7 +89,7 @@ int init_user_config(const char * l_name)
   if (!pw) return 0;
   else {
       struct stat buf;
-      QString cfgFileName, tkannFileName;
+      TQString cfgFileName, tkannFileName;
 
       /* Set $HOME, because KInstance uses it */
       setenv("HOME",pw->pw_dir,1 /* overwrite */); 
@@ -103,14 +103,14 @@ ktalk_debug("%s",pw->pw_dir);
 ktalk_debug("%s","endpwent");
  
 //WABA: New KConfig should be able to handle this gracefully:
-     if (stat(QFile::encodeName(tkannFileName),&buf)!=-1) {
+     if (stat(TQFile::encodeName(tkannFileName),&buf)!=-1) {
           // check if it exists, 'cause otherwise it would be created empty with
           // root as owner !
           ktkanncfg = new KConfig(tkannFileName);
           ktkanncfg -> setGroup("ktalkannounce");
           ktkanncfg -> setDollarExpansion(true);
       } else ktkanncfg = 0L;
-      if (stat(QFile::encodeName(cfgFileName),&buf)!=-1) {
+      if (stat(TQFile::encodeName(cfgFileName),&buf)!=-1) {
           // check if it exists, 'cause otherwise it would be created empty with
           // root as owner !
           ktalkdcfg = new KConfig(cfgFileName);
@@ -142,7 +142,7 @@ int read_user_config(const char * key, char * result, int max)
         cfg = ktalkdcfg;
 
     if (!cfg) return 0; // file doesn't exist
-    QString Qresult;
+    TQString Qresult;
     if ((Qresult = cfg -> readEntry(key, "unset")) != "unset")
     {
         qstrncpy( result, Qresult.ascii(), max);
@@ -180,20 +180,20 @@ void end_user_config()
 int process_config_file(void)
 { 
   // Where is ktalkdlg installed ?
-  QString ktalkdlg_dir = locate("exe", "ktalkdlg");
+  TQString ktalkdlg_dir = locate("exe", "ktalkdlg");
   ktalkdlg_dir.truncate( ktalkdlg_dir.findRev('/') );
   // Has to be done, for any $KDEBINDIR in ktalkdrc.
-  setenv("KDEBINDIR", QFile::encodeName(ktalkdlg_dir), 0/*don't overwrite*/);
+  setenv("KDEBINDIR", TQFile::encodeName(ktalkdlg_dir), 0/*don't overwrite*/);
 
   KConfig * syscfg = new KConfig( "ktalkdrc" );
 
   syscfg -> setGroup("ktalkd");
   syscfg -> setDollarExpansion(true);
 
-  QString result;
+  TQString result;
     
 #define found(k) (!(result = syscfg -> readEntry(k)).isEmpty())
-  //    QString cfgStr = cfgStr0.stripWhiteSpace();
+  //    TQString cfgStr = cfgStr0.stripWhiteSpace();
   
   if (found("AnswMach")) {
     Options.answmach=booleanresult(result.ascii()); 
@@ -212,19 +212,19 @@ int process_config_file(void)
     ktalk_debug("Sound : %d",Options.sound); }
   
   if (found("SoundFile")) { 
-    qstrncpy(Options.soundfile,QFile::encodeName(result),S_CFGLINE);
+    qstrncpy(Options.soundfile,TQFile::encodeName(result),S_CFGLINE);
     ktalk_debug("SoundFile = %s",Options.soundfile); }
   
   if (found("SoundPlayer")) { 
-    qstrncpy(Options.soundplayer,QFile::encodeName(result),S_CFGLINE); 
+    qstrncpy(Options.soundplayer,TQFile::encodeName(result),S_CFGLINE); 
     ktalk_debug("SoundPlayer = %s",Options.soundplayer); }
   
   if (found("SoundPlayerOpt")) { 
-    qstrncpy(Options.soundplayeropt,QFile::encodeName(result),S_CFGLINE);
+    qstrncpy(Options.soundplayeropt,TQFile::encodeName(result),S_CFGLINE);
     ktalk_debug("SoundPlayerOpt = %s",Options.soundplayeropt); }
   
   if (found("MailProg")) { 
-    qstrncpy(Options.mailprog,QFile::encodeName(result),S_CFGLINE);
+    qstrncpy(Options.mailprog,TQFile::encodeName(result),S_CFGLINE);
     ktalk_debug("Mail prog = %s",Options.mailprog); }
   
   /* text based announcement */
@@ -246,11 +246,11 @@ int process_config_file(void)
   }
   
   if (found("ExtPrg")) { 
-    qstrncpy(Options.extprg,QFile::encodeName(result),S_CFGLINE);
+    qstrncpy(Options.extprg,TQFile::encodeName(result),S_CFGLINE);
     ktalk_debug("Ext prg = %s",Options.extprg); }
   else {   /* has to work even without config file at all */
     KStandardDirs stddirs;
-    qstrncpy(Options.extprg, QFile::encodeName(stddirs.findResource("exe","ktalkdlg")), S_CFGLINE-1);
+    qstrncpy(Options.extprg, TQFile::encodeName(stddirs.findResource("exe","ktalkdlg")), S_CFGLINE-1);
   }
 
   delete syscfg;
diff --git a/ktalkd/ktalkd/unixsock.cpp b/ktalkd/ktalkd/unixsock.cpp
index 34272405..9547ccf5 100644
--- a/ktalkd/ktalkd/unixsock.cpp
+++ b/ktalkd/ktalkd/unixsock.cpp
@@ -45,8 +45,8 @@
 #include <sys/select.h>		// Needed on some systems.
 #endif
 
-#include <qstrlist.h>
-#include <qfile.h>
+#include <tqstrlist.h>
+#include <tqfile.h>
 
 #include "includ.h"
 #include "proto.h"
@@ -80,8 +80,8 @@ bool sendToKtalk (const char *username, const char *announce)
     }
 
     // find sockets of running ktalk clients
-    QString tempDir = "/tmp";
-    QString templ = QString ("ktalk-") + username + "-";
+    TQString tempDir = "/tmp";
+    TQString templ = TQString ("ktalk-") + username + "-";
     bool announceok = FALSE;
     char buffer [N_CHARS+2];
     buffer [0] = 1;
@@ -89,9 +89,9 @@ bool sendToKtalk (const char *username, const char *announce)
     unsigned int announcelen = strlen(buffer);
     unsigned int len;
 
-    DIR *dir = opendir (QFile::encodeName(tempDir));
+    DIR *dir = opendir (TQFile::encodeName(tempDir));
     struct dirent *entry;
-    QStrList dirList;
+    TQStrList dirList;
     struct sockaddr_un ktalkAddr;
     ktalkAddr.sun_family = AF_UNIX;
     while ((entry = readdir (dir))) {
@@ -109,9 +109,9 @@ bool sendToKtalk (const char *username, const char *announce)
 	// out who's talking to janet, all I need is to write
 	// a small app that listens on /tmp/ktalk-janet-foo
 	//
-        if (templ == QFile::decodeName(entry->d_name).left(templ.length())) {
-            QString path = tempDir + "/" + QFile::decodeName(entry->d_name);
-            strncpy (ktalkAddr.sun_path, QFile::encodeName(path), sizeof (ktalkAddr.sun_path));
+        if (templ == TQFile::decodeName(entry->d_name).left(templ.length())) {
+            TQString path = tempDir + "/" + TQFile::decodeName(entry->d_name);
+            strncpy (ktalkAddr.sun_path, TQFile::encodeName(path), sizeof (ktalkAddr.sun_path));
             len = sendto (sock, buffer, announcelen, 0,
                           (struct sockaddr *) &ktalkAddr, sizeof (ktalkAddr));
             if (len == announcelen)