1 files changed, 54 insertions, 54 deletions

diff --git a/ksirc/ksopts.h b/ksirc/ksopts.h
index 5739f6fd..9bd96192 100644
--- a/ksirc/ksopts.h
+++ b/ksirc/ksopts.h
@@ -1,15 +1,15 @@
 
 #ifndef _KSOPTS_H_
 #define _KSOPTS_H_
-#include <qmap.h>
-#include <qdict.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qcolor.h>
-#include <qfont.h>
-#include <qrect.h>
-#include <qpixmap.h>
-#include <qdatetime.h>
+#include <tqmap.h>
+#include <tqdict.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqcolor.h>
+#include <tqfont.h>
+#include <tqrect.h>
+#include <tqpixmap.h>
+#include <tqdatetime.h>
 
 #define IRC_SAFE_MAX_LINE 450
 
@@ -45,12 +45,12 @@ public:
     bool dockPopups : 1;
     bool autoSaveHistory : 1;
     int windowLength;
-    QString backgroundFile;
+    TQString backgroundFile;
 
-    QPixmap backgroundPixmap();
+    TQPixmap backgroundPixmap();
 
 private:
-    QPixmap m_backgroundPixmap;
+    TQPixmap m_backgroundPixmap;
 };
 
 class KSOChannel
@@ -58,8 +58,8 @@ class KSOChannel
 public:
     KSOChannel();
 
-    QString server;
-    QString channel;
+    TQString server;
+    TQString channel;
 
     bool timeStamp : 1;
     bool beepNotify : 1;
@@ -67,9 +67,9 @@ public:
     bool logging : 1;
     bool topicShow : 1;
     bool filterJoinPart : 1;
-    QString encoding;
+    TQString encoding;
 
-    QDateTime lastUsed;
+    TQDateTime lastUsed;
 
     static bool applyGlobally;
 
@@ -82,16 +82,16 @@ class KSOServer
 public:
     KSOServer();
 
-    QString server;
+    TQString server;
     bool globalCopy;
 
-    QString nick;
-    QString altNick;
-    QString realName;
-    QString userID;
-    QStringList notifyList;
+    TQString nick;
+    TQString altNick;
+    TQString realName;
+    TQString userID;
+    TQStringList notifyList;
 
-    QDateTime lastUsed;
+    TQDateTime lastUsed;
 };
 
 class KSOStartup
@@ -99,12 +99,12 @@ class KSOStartup
 public:
     KSOStartup();
 
-    QRect geometry;
-//    QString nick;
-//    QString altNick;
-//    QString realName;
-//    QString userID;
-//    QStringList notifyList;
+    TQRect geometry;
+//    TQString nick;
+//    TQString altNick;
+//    TQString realName;
+//    TQString userID;
+//    TQStringList notifyList;
 };
 
 class KSOColors
@@ -114,36 +114,36 @@ public:
 
     KSOColors();
 
-    QColor textColor;
-    QColor linkColor;
-    QColor infoColor;
-    QColor channelColor;
-    QColor errorColor;
-    QColor ownNickColor;
+    TQColor textColor;
+    TQColor linkColor;
+    TQColor infoColor;
+    TQColor channelColor;
+    TQColor errorColor;
+    TQColor ownNickColor;
     bool ownNickBold : 1;
     bool ownNickUl : 1;
     bool ownNickRev : 1;
 
-    QColor msgContainNick; // needs config + impl
-    QColor msg1Contain;    // needs config
-    QString msg1String;    // needs config
+    TQColor msgContainNick; // needs config + impl
+    TQColor msg1Contain;    // needs config
+    TQString msg1String;    // needs config
     bool   msg1Regex;
-    QColor msg2Contain;    // need config
-    QString msg2String;    // needs config
+    TQColor msg2Contain;    // need config
+    TQString msg2String;    // needs config
     bool   msg2Regex;
 
-    QColor nickForeground;
-    QColor nickBackground;
-    QColor backgroundColor;
-    QColor selBackgroundColor;
-    QColor selForegroundColor;
-    //QColor ircColors[numColors];
-    BoundsCheckingArray<QColor, numColors> ircColors;
+    TQColor nickForeground;
+    TQColor nickBackground;
+    TQColor backgroundColor;
+    TQColor selBackgroundColor;
+    TQColor selForegroundColor;
+    //TQColor ircColors[numColors];
+    BoundsCheckingArray<TQColor, numColors> ircColors;
     BoundsCheckingArray<bool, numColors> nickHighlight;
 
-    QString colourTheme;
+    TQString colourTheme;
 
-    QFont defaultFont;
+    TQFont defaultFont;
     bool ksircColors : 1;
     bool mircColors : 1;
     bool nickColourization : 1;
@@ -162,9 +162,9 @@ public:
     KSOServChan();
 };
 
-typedef QMap<QString, KSOChannel> ChannelOpMap;
-typedef QMap<QString, ChannelOpMap> ServerChannelOpMap;
-typedef QMap<QString, KSOServer> ServerOpMap;
+typedef TQMap<TQString, KSOChannel> ChannelOpMap;
+typedef TQMap<TQString, ChannelOpMap> ServerChannelOpMap;
+typedef TQMap<TQString, KSOServer> ServerOpMap;
 
 class KSOptions
     : public KSOGeneral,
@@ -194,10 +194,10 @@ public:
         return server[servInfo.server()];
     }
 
-    void channelSetup(QString serv, QString chan);
+    void channelSetup(TQString serv, TQString chan);
     void applyChannelGlobal(void);
 
-    void serverSetup(QString server);
+    void serverSetup(TQString server);
     void serverSetup( const KSircServer &servInfo )
     {
         serverSetup(servInfo.server());