diff --git a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui index eb313afb..4cefc758 100644 --- a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui @@ -400,7 +400,7 @@ groupselectdlg.ui.h - QString groupKind; + TQString groupKind; int access; TQStringList selectedGroups; diff --git a/kopete/KABC_INTEG_NOTES b/kopete/KABC_INTEG_NOTES index ea053dbe..d87b91a5 100644 --- a/kopete/KABC_INTEG_NOTES +++ b/kopete/KABC_INTEG_NOTES @@ -51,7 +51,7 @@ ONLY the actual linking and one-way storage from kopete in tdeabc and retrieval Also ability to add tdeabc contained contacts to kopete ( selected ones only ) Linking -use KMC UID to store KABC uid, QString::null if no link. +use KMC UID to store KABC uid, TQString::null if no link. Establish the link using KMC Props dialog (mETz: Alt+return shortcut to open pls). Policy: One way kopete->tdeabc contacts @@ -502,7 +502,7 @@ We should never store nicknames in tdeabc. The metacontact name should be taken Of course every fields shouldn't be stored in KABC (for example: MSN's groups, or others) to know what can be saved or not in tdeabc, i see two ways: -1) KopeteMetaContact::setData( QString key , QString data , bool saveToKAB); +1) KopeteMetaContact::setData( TQString key , TQString data , bool saveToKAB); 2) if the key is or not recognized by KABC. example, if i save "messaging/msn-groups" KAB is not able to store it, so don't store it in KABC diff --git a/kopete/libkopete/API-TODO b/kopete/libkopete/API-TODO index 4914b00c..65e81dc1 100644 --- a/kopete/libkopete/API-TODO +++ b/kopete/libkopete/API-TODO @@ -206,7 +206,7 @@ Richard's proposal: (email questions to the list or to kde@metafoo.co.uk) ones from the new chain, but it's probably not essential. - interactions with a chat view - the ChatWindow component above is actually the ChatWindowFilter. it's - owned by the filter chain, and so should not be a QWidget. + owned by the filter chain, and so should not be a TQWidget. - when a chat view is closed, it drops its reference to the various message chains. but the receive chain will still exist if there's an incoming message that's still being processed. therefore: diff --git a/kopete/libkopete/PORTING b/kopete/libkopete/PORTING index 21634bba..4f094482 100644 --- a/kopete/libkopete/PORTING +++ b/kopete/libkopete/PORTING @@ -2,7 +2,7 @@ Porting from Kopete 0.9 to Kopete 0.10 *) KopetePluginManager has been renamed Kopete::PluginManager - .) QMap loadedPlugins( const QString &category = QString::null ) const; + .) QMap loadedPlugins( const TQString &category = TQString::null ) const; the QMap has been replaced by a QPtrList the KPluginInfo is not interesting here. .) addressBookFields( KopetePlugin *p ) has been removed .) pluginName, pluginId, pluginIcon has been removed (they are acessible from pluginInfo) diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll index ba2a6c55..52d11494 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.ll +++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll @@ -64,9 +64,9 @@ void ParStyle::clearFormatting() // dir is not a formatting item. } -QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) +TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) { - QString str = _str; + TQString str = _str; str.replace(QRegExp("&"), "&"); str.replace(QRegExp("<"), "<"); str.replace(QRegExp(">"), ">"); @@ -91,7 +91,7 @@ QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) if (len == 1) continue; - QString s = " "; + TQString s = " "; for (int i = 1; i < len; i++) s += " "; str.replace(pos, len, s); @@ -127,7 +127,7 @@ void RTF2HTML::FlushOutTags() // RTF colors are 1-based; colors[] is a 0-based array. if (t.param > colors.size() || t.param == 0) break; - QColor &c = colors[t.param-1]; + TQColor &c = colors[t.param-1]; PrintUnquoted("", c.red(), c.green(), c.blue()); } break; @@ -146,7 +146,7 @@ void RTF2HTML::FlushOutTags() case TAG_BG_COLOR:{ if (t.param > colors.size() || t.param == 0) break; - QColor &c = colors[t.param-1]; + TQColor &c = colors[t.param-1]; PrintUnquoted("", c.red(), c.green(), c.blue()); break; } @@ -317,7 +317,7 @@ void RTF2HTML::PrintUnquoted(const char *str, ...) sParagraph += buff; } -void RTF2HTML::PrintQuoted(const QString &str) +void RTF2HTML::PrintQuoted(const TQString &str) { sParagraph += quoteString(str); } @@ -549,7 +549,7 @@ void Level::reset() resetTag(TAG_ALL); if (m_bColors){ if (m_bColorInit){ - QColor c(m_nRed, m_nGreen, m_nBlue); + TQColor c(m_nRed, m_nGreen, m_nBlue); p->colors.push_back(c); resetColors(); } @@ -684,7 +684,7 @@ static char h2d(char c) return 0; } -QString RTF2HTML::Parse(const char *rtf, const char *_encoding) +TQString RTF2HTML::Parse(const char *rtf, const char *_encoding) { encoding = _encoding; YY_BUFFER_STATE yy_current_buffer = yy_scan_string(rtf); @@ -752,7 +752,7 @@ QString RTF2HTML::Parse(const char *rtf, const char *_encoding) break; case UNICODE_CHAR:{ cur_level.flush(); - sParagraph += QChar((unsigned short)(atol(yytext + 2))); + sParagraph += TQChar((unsigned short)(atol(yytext + 2))); break; } case HEX:{ @@ -851,7 +851,7 @@ QString RTF2HTML::Parse(const char *rtf, const char *_encoding) } /* -bool ICQClient::parseRTF(const char *rtf, const char *encoding, QString &res) +bool ICQClient::parseRTF(const char *rtf, const char *encoding, TQString &res) { char _RTF[] = "{\\rtf"; if ((strlen(rtf) > strlen(_RTF)) && !memcmp(rtf, _RTF, strlen(_RTF))){ diff --git a/kopete/protocols/jabber/jingle/DESIGN b/kopete/protocols/jabber/jingle/DESIGN index 4698ca5d..3a3a9636 100644 --- a/kopete/protocols/jabber/jingle/DESIGN +++ b/kopete/protocols/jabber/jingle/DESIGN @@ -5,7 +5,7 @@ In JabberAccount: -Account is connected: * Init the JingleSessionManager (accessible via account()->jingleSessionManager()) * Add voice extension to client features. -* Connect to incomingSession(const QString &sessionType, JingleSession *session) signal in JabberAccount. +* Connect to incomingSession(const TQString &sessionType, JingleSession *session) signal in JabberAccount. -On incoming session * Create and show VoiceConversationDialog. @@ -61,11 +61,11 @@ JingleSessionManager manage the JingleSession pointers. Do not delete it in user * JingleSessionManager(JabberAccount *) * public Q_SLOTS: -* JingleSession *createSession(const QString &sessionType, const JidList &peers); +* JingleSession *createSession(const TQString &sessionType, const JidList &peers); * void removeSession(JingleSession *); Q_SIGNALS: -* void incomingSession(const QString &sessionType, JingleSession *session); +* void incomingSession(const TQString &sessionType, JingleSession *session); JingleSession ------------- @@ -87,10 +87,10 @@ Base class for Jingle session. A session is a * virtual void terminate() = 0; // Return Session XML namespace -* virtual QString sessionType() = 0; +* virtual TQString sessionType() = 0; protected Q_SLOTS: - void sendStanza(const QString &stanza) { account()->client->send(stanza); + void sendStanza(const TQString &stanza) { account()->client->send(stanza); Q_SIGNALS: void accepted(); @@ -102,11 +102,11 @@ JingleVoiceSession : public JingleSession Define a VoIP voice session between two peers(for the moment). Hold the PhoneSessionClient object. -connect(account()->client(),SIGNAL(xmlIncoming(const QString&)),SLOT(receiveStanza(const QString&))); +connect(account()->client(),SIGNAL(xmlIncoming(const TQString&)),SLOT(receiveStanza(const TQString&))); private Q_SLOTS: - void receiveStanza(const QString &stanza); + void receiveStanza(const TQString &stanza); VoiceConversationDialog ----------------------- diff --git a/kopete/protocols/oscar/liboscar/rtf.ll b/kopete/protocols/oscar/liboscar/rtf.ll index c9aea7db..bd403390 100644 --- a/kopete/protocols/oscar/liboscar/rtf.ll +++ b/kopete/protocols/oscar/liboscar/rtf.ll @@ -64,9 +64,9 @@ void ParStyle::clearFormatting() // dir is not a formatting item. } -QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) +TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) { - QString str = _str; + TQString str = _str; str.replace(QRegExp("&"), "&"); str.replace(QRegExp("<"), "<"); str.replace(QRegExp(">"), ">"); @@ -91,7 +91,7 @@ QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) if (len == 1) continue; - QString s = " "; + TQString s = " "; for (int i = 1; i < len; i++) s += " "; str.replace(pos, len, s); @@ -127,7 +127,7 @@ void RTF2HTML::FlushOutTags() // RTF colors are 1-based; colors[] is a 0-based array. if (t.param > colors.size() || t.param == 0) break; - QColor &c = colors[t.param-1]; + TQColor &c = colors[t.param-1]; PrintUnquoted("", c.red(), c.green(), c.blue()); } break; @@ -144,7 +144,7 @@ void RTF2HTML::FlushOutTags() case TAG_BG_COLOR:{ if (t.param > colors.size()) break; - QColor &c = colors[t.param]; + TQColor &c = colors[t.param]; PrintUnquoted("", c.red(), c.green(), c.blue()); break; } @@ -315,7 +315,7 @@ void RTF2HTML::PrintUnquoted(const char *str, ...) sParagraph += buff; } -void RTF2HTML::PrintQuoted(const QString &str) +void RTF2HTML::PrintQuoted(const TQString &str) { sParagraph += quoteString(str); } @@ -547,7 +547,7 @@ void Level::reset() resetTag(TAG_ALL); if (m_bColors){ if (m_bColorInit){ - QColor c(m_nRed, m_nGreen, m_nBlue); + TQColor c(m_nRed, m_nGreen, m_nBlue); p->colors.push_back(c); resetColors(); } @@ -682,7 +682,7 @@ static char h2d(char c) return 0; } -QString RTF2HTML::Parse(const char *rtf, const char *_encoding) +TQString RTF2HTML::Parse(const char *rtf, const char *_encoding) { encoding = _encoding; YY_BUFFER_STATE yy_current_buffer = yy_scan_string(rtf); @@ -750,7 +750,7 @@ QString RTF2HTML::Parse(const char *rtf, const char *_encoding) break; case UNICODE_CHAR:{ cur_level.flush(); - sParagraph += QChar((unsigned short)(atol(yytext + 2))); + sParagraph += TQChar((unsigned short)(atol(yytext + 2))); break; } case HEX:{ @@ -849,7 +849,7 @@ QString RTF2HTML::Parse(const char *rtf, const char *_encoding) } /* -bool ICQClient::parseRTF(const char *rtf, const char *encoding, QString &res) +bool ICQClient::parseRTF(const char *rtf, const char *encoding, TQString &res) { char _RTF[] = "{\\rtf"; if ((strlen(rtf) > strlen(_RTF)) && !memcmp(rtf, _RTF, strlen(_RTF))){