diff options
700 files changed, 4424 insertions, 4424 deletions
diff --git a/dcoprss/cache.cpp b/dcoprss/cache.cpp index 0636c674..c4a566aa 100644 --- a/dcoprss/cache.cpp +++ b/dcoprss/cache.cpp @@ -35,7 +35,7 @@ bool CacheEntry::isValid() const { // Cache entries get invalid after on hour. One shouldn't hardcode this // but for now it'll do. - return m_timeStamp.secsTo( TQDateTime::tqcurrentDateTime() ) < 3600; + return m_timeStamp.secsTo( TQDateTime::currentDateTime() ) < 3600; } Cache *Cache::m_instance = 0; @@ -51,8 +51,8 @@ TQString Cache::getCacheKey( const TQString &server, const TQString &method, const TQValueList<TQVariant> &args ) { TQString key; - key = server + TQString::tqfromLatin1( "__" ); - key += method + TQString::tqfromLatin1( "__" ); + key = server + TQString::fromLatin1( "__" ); + key += method + TQString::fromLatin1( "__" ); TQValueList<TQVariant>::ConstIterator it = args.begin(); TQValueList<TQVariant>::ConstIterator end = args.end(); for ( ; it != end; ++it ) @@ -111,13 +111,13 @@ void Cache::touch( const TQString &key ) CacheEntry *entry = find( key ); if ( !entry ) return; - entry->m_timeStamp = TQDateTime::tqcurrentDateTime(); + entry->m_timeStamp = TQDateTime::currentDateTime(); } void Cache::insert( const TQString &key, const KXMLRPC::Query::Result &result ) { CacheEntry *entry = new CacheEntry; - entry->m_timeStamp = TQDateTime::tqcurrentDateTime(); + entry->m_timeStamp = TQDateTime::currentDateTime(); entry->m_result = result; TQDict<CacheEntry>::insert( key, entry ); } diff --git a/dcoprss/document.cpp b/dcoprss/document.cpp index 64c68d6e..fb5cd904 100644 --- a/dcoprss/document.cpp +++ b/dcoprss/document.cpp @@ -29,7 +29,7 @@ RSSDocument::RSSDocument(const TQString& url) : m_pix = TQPixmap(); m_isLoading = false; m_maxAge = 60; - m_Timeout = TQDateTime::tqcurrentDateTime(); + m_Timeout = TQDateTime::currentDateTime(); m_state.clear(); } @@ -40,7 +40,7 @@ RSSDocument::~RSSDocument() delete m_Doc; } -void RSSDocument::loadingComplete(Loader *ldr, Document doc, tqStatus stat) +void RSSDocument::loadingComplete(Loader *ldr, Document doc, Status stat) { @@ -129,7 +129,7 @@ TQDateTime RSSDocument::lastBuildDate() if( m_Doc != 0L) return m_Doc->lastBuildDate(); else - return TQDateTime::tqcurrentDateTime(); + return TQDateTime::currentDateTime(); } TQDateTime RSSDocument::pubDate() @@ -137,7 +137,7 @@ TQDateTime RSSDocument::pubDate() if( m_Doc != 0L) return m_Doc->pubDate(); else - return TQDateTime::tqcurrentDateTime(); + return TQDateTime::currentDateTime(); } TQString RSSDocument::copyright() @@ -243,14 +243,14 @@ bool RSSDocument::pixmapValid() void RSSDocument::refresh() { kdDebug() << "Mod time " << m_Timeout.toString() << endl; - kdDebug() << "Current time " << TQDateTime::tqcurrentDateTime().toString() << endl; + kdDebug() << "Current time " << TQDateTime::currentDateTime().toString() << endl; - if(!m_isLoading && (TQDateTime::tqcurrentDateTime() >= m_Timeout)) + if(!m_isLoading && (TQDateTime::currentDateTime() >= m_Timeout)) { kdDebug() << "Document going to refresh" << endl; m_isLoading = true; Loader *loader = Loader::create(this, - TQT_SLOT(loadingComplete(Loader *, Document, tqStatus))); + TQT_SLOT(loadingComplete(Loader *, Document, Status))); loader->loadFrom(KURL( m_Url ), new FileRetriever()); documentUpdating(DCOPRef(this)); } diff --git a/dcoprss/query.cpp b/dcoprss/query.cpp index b3d48eaf..9c324890 100644 --- a/dcoprss/query.cpp +++ b/dcoprss/query.cpp @@ -113,7 +113,7 @@ void QueryService::getCategories( const TQString &category ) kdDebug() << "QueryService::getCategories()" << endl; if ( category == "Top" ) { - cachedCall( "syndic8.GetCategoryRoots", Server::toVariantList( TQString::tqfromLatin1( "DMOZ" ) ), + cachedCall( "syndic8.GetCategoryRoots", Server::toVariantList( TQString::fromLatin1( "DMOZ" ) ), TQT_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) ); } else { TQStringList args; diff --git a/dcoprss/service.h b/dcoprss/service.h index 502d13c1..5ca2872b 100644 --- a/dcoprss/service.h +++ b/dcoprss/service.h @@ -124,7 +124,7 @@ class RSSDocument : public TQObject, public DCOPObject private slots: void pixmapLoaded(const TQPixmap&); - void loadingComplete(Loader *, Document, tqStatus); + void loadingComplete(Loader *, Document, Status); public: RSSDocument(const TQString& url); diff --git a/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui b/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui index 690688c2..59b27886 100644 --- a/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -179,7 +179,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/filesharing/advanced/kcm_sambaconf/filemodedlg.ui b/filesharing/advanced/kcm_sambaconf/filemodedlg.ui index 0f8867c8..96e207df 100644 --- a/filesharing/advanced/kcm_sambaconf/filemodedlg.ui +++ b/filesharing/advanced/kcm_sambaconf/filemodedlg.ui @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>43</height> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui index 51f5e10b..08595eb5 100644 --- a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>285</width> <height>20</height> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui index 2ab91cf5..51a0ff36 100644 --- a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui +++ b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -190,7 +190,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui index 39a21fb3..8b386a4d 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui @@ -521,7 +521,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -614,7 +614,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -633,7 +633,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -752,7 +752,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -900,7 +900,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -1066,7 +1066,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -1102,7 +1102,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -1135,7 +1135,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -1243,7 +1243,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>240</width> <height>20</height> @@ -1413,7 +1413,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -1673,7 +1673,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>180</width> <height>20</height> @@ -1717,7 +1717,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>117</width> <height>20</height> @@ -1789,7 +1789,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -2065,7 +2065,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -2242,7 +2242,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -2295,7 +2295,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>170</height> @@ -2458,7 +2458,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -2592,7 +2592,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>20</height> @@ -2611,7 +2611,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -2730,7 +2730,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -2768,7 +2768,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>76</width> <height>0</height> @@ -2834,7 +2834,7 @@ Only change something if you know what you are doing.</string> <cstring>statusChk</cstring> </property> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="checked"> <bool>true</bool> @@ -2906,7 +2906,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -3034,7 +3034,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -3053,7 +3053,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -3144,7 +3144,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -3493,7 +3493,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -3694,7 +3694,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -3730,7 +3730,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> @@ -3811,7 +3811,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>323</width> <height>20</height> @@ -4060,7 +4060,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -4202,7 +4202,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -4347,7 +4347,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -4393,7 +4393,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>280</height> @@ -4570,7 +4570,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -4640,7 +4640,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -4659,7 +4659,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -4917,7 +4917,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -5036,7 +5036,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -5481,7 +5481,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>0</height> @@ -5500,7 +5500,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>70</height> @@ -5729,7 +5729,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>0</height> @@ -5913,7 +5913,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -5949,7 +5949,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -6035,7 +6035,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>330</width> <height>20</height> @@ -6193,7 +6193,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -6405,7 +6405,7 @@ This is only available if the SSL libraries have been compiled on your system an <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -6468,7 +6468,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>340</width> <height>20</height> @@ -6553,7 +6553,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>300</height> @@ -6728,7 +6728,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>370</width> <height>20</height> @@ -6824,7 +6824,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> @@ -6860,7 +6860,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>280</height> @@ -6946,7 +6946,7 @@ This is only available if the SSL libraries have been compiled on your system an <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -6993,7 +6993,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -7134,7 +7134,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>130</height> @@ -7339,7 +7339,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>330</width> <height>20</height> @@ -7452,7 +7452,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>230</height> @@ -7643,7 +7643,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -7764,7 +7764,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -7838,7 +7838,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>320</height> diff --git a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui index 4a622f1a..200f9eaa 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui @@ -319,7 +319,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>20</width> <height>20</height> @@ -349,7 +349,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>20</width> <height>50</height> @@ -535,7 +535,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>200</width> <height>20</height> @@ -633,7 +633,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>20</width> <height>20</height> @@ -683,7 +683,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>263</width> <height>20</height> @@ -831,7 +831,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>20</width> <height>20</height> @@ -944,7 +944,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>20</width> <height>20</height> @@ -1079,7 +1079,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>20</width> <height>20</height> diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 7914aef2..26b3a194 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -1267,7 +1267,7 @@ void KcmSambaConf::save() { // Base settings _smbconf = _interface->configUrlRq->url(); - KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),false); + KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),false); config.writeEntry("SMBCONF",_smbconf); config.sync(); diff --git a/filesharing/advanced/kcm_sambaconf/konqinterface.ui b/filesharing/advanced/kcm_sambaconf/konqinterface.ui index dfccf5c2..6cba8d8b 100644 --- a/filesharing/advanced/kcm_sambaconf/konqinterface.ui +++ b/filesharing/advanced/kcm_sambaconf/konqinterface.ui @@ -420,7 +420,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -447,7 +447,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 2ba52a57..2ee7f03e 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -394,7 +394,7 @@ SambaShare* SambaFile::getTestParmValues(bool reload) void SambaFile::testParmStdOutReceived(KProcess *, char *buffer, int buflen) { - _parmOutput+=TQString::tqfromLatin1(buffer,buflen); + _parmOutput+=TQString::fromLatin1(buffer,buflen); } void SambaFile::parseParmStdOutput() diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui index 65fff9c5..52971d94 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui +++ b/filesharing/advanced/kcm_sambaconf/share.ui @@ -304,7 +304,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -362,7 +362,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -540,7 +540,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1050,7 +1050,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1072,7 +1072,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1086,7 +1086,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>forceCreateModeEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1100,7 +1100,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>forceSecurityModeEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1114,7 +1114,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>forceDirectoryModeEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1128,7 +1128,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>forceDirectorySecurityModeEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1150,7 +1150,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1172,7 +1172,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1194,7 +1194,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -1272,7 +1272,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1294,7 +1294,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1316,7 +1316,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1330,7 +1330,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>securityMaskEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1344,7 +1344,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>directoryMaskEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1358,7 +1358,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>directorySecurityMaskEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1386,7 +1386,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>createMaskEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1408,7 +1408,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1490,7 +1490,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>forceUnknownAclUserEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1676,7 +1676,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -1759,7 +1759,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>143</width> <height>16</height> @@ -1933,7 +1933,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -2024,7 +2024,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>manglingCharEdit</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -2041,7 +2041,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -2322,7 +2322,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -2392,7 +2392,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>299</width> <height>20</height> @@ -2508,7 +2508,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -2564,7 +2564,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>260</height> @@ -2648,7 +2648,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>284</height> @@ -2745,7 +2745,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -2916,7 +2916,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp index b964d700..8286cdf3 100644 --- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp @@ -175,7 +175,7 @@ bool SmbPasswdFile::changePassword(const SambaUser & user, const TQString & newP void SmbPasswdFile::smbpasswdStdOutReceived(KProcess *, char *buffer, int buflen) { - _smbpasswdOutput+=TQString::tqfromLatin1(buffer,buflen); + _smbpasswdOutput+=TQString::fromLatin1(buffer,buflen); } diff --git a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui index b04f8b7b..e2d4be95 100644 --- a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui index 1526832a..17d02c12 100644 --- a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui @@ -183,7 +183,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -225,7 +225,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>285</width> <height>20</height> diff --git a/filesharing/advanced/kcm_sambaconf/usertab.ui b/filesharing/advanced/kcm_sambaconf/usertab.ui index af5b87bf..57d8b591 100644 --- a/filesharing/advanced/kcm_sambaconf/usertab.ui +++ b/filesharing/advanced/kcm_sambaconf/usertab.ui @@ -159,7 +159,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> diff --git a/filesharing/advanced/nfs/hostprops.ui b/filesharing/advanced/nfs/hostprops.ui index b7fd9f79..1851fad6 100644 --- a/filesharing/advanced/nfs/hostprops.ui +++ b/filesharing/advanced/nfs/hostprops.ui @@ -34,7 +34,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>180</width> <height>0</height> @@ -380,7 +380,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -426,7 +426,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -450,7 +450,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/filesharing/advanced/nfs/nfsdialoggui.ui b/filesharing/advanced/nfs/nfsdialoggui.ui index a9295773..ca77e192 100644 --- a/filesharing/advanced/nfs/nfsdialoggui.ui +++ b/filesharing/advanced/nfs/nfsdialoggui.ui @@ -89,7 +89,7 @@ The first column shows the name or address of the host, the second column shows <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/filesharing/advanced/nfs/nfsentry.h b/filesharing/advanced/nfs/nfsentry.h index 98d1e56a..43071504 100644 --- a/filesharing/advanced/nfs/nfsentry.h +++ b/filesharing/advanced/nfs/nfsentry.h @@ -74,7 +74,7 @@ typedef TQPtrListIterator<NFSLine> NFSLineIterator; class NFSEmptyLine : public NFSLine { public: - virtual TQString toString() const { return TQString::tqfromLatin1("\n"); } + virtual TQString toString() const { return TQString::fromLatin1("\n"); } virtual ~NFSEmptyLine() {}; }; diff --git a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui index 3ba4aca5..5beb1a81 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui +++ b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -181,7 +181,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>156</width> <height>20</height> @@ -277,7 +277,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -312,7 +312,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -335,7 +335,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>1</height> diff --git a/filesharing/simple/controlcenter.ui b/filesharing/simple/controlcenter.ui index 26307437..fad303c4 100644 --- a/filesharing/simple/controlcenter.ui +++ b/filesharing/simple/controlcenter.ui @@ -84,7 +84,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>11</width> <height>0</height> @@ -149,7 +149,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>11</width> <height>0</height> @@ -203,7 +203,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>11</width> <height>0</height> @@ -275,7 +275,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -398,7 +398,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp index 0e41554d..22d0a17e 100644 --- a/filesharing/simple/fileshare.cpp +++ b/filesharing/simple/fileshare.cpp @@ -81,9 +81,9 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS this, TQT_SLOT(allowedUsersBtnClicked())); TQString path = TQString::fromLocal8Bit( getenv( "PATH" ) ); - path += TQString::tqfromLatin1(":/usr/sbin"); - TQString sambaExec = KStandardDirs::findExe( TQString::tqfromLatin1("smbd"), path ); - TQString nfsExec = KStandardDirs::findExe( TQString::tqfromLatin1("rpc.nfsd"), path ); + path += TQString::fromLatin1(":/usr/sbin"); + TQString sambaExec = KStandardDirs::findExe( TQString::fromLatin1("smbd"), path ); + TQString nfsExec = KStandardDirs::findExe( TQString::fromLatin1("rpc.nfsd"), path ); if ( nfsExec.isEmpty() && sambaExec.isEmpty()) { @@ -196,7 +196,7 @@ void KFileShareConfig::allowedUsersBtnClicked() { void KFileShareConfig::load() { - KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true); + KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); m_ccgui->shareGrp->setChecked( config.readEntry("FILESHARING", "yes") == "yes" ); diff --git a/filesharing/simple/groupconfiggui.ui b/filesharing/simple/groupconfiggui.ui index ed7ffd47..33d5c800 100644 --- a/filesharing/simple/groupconfiggui.ui +++ b/filesharing/simple/groupconfiggui.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>180</width> <height>20</height> diff --git a/filesharing/simple/krichtextlabel.cpp b/filesharing/simple/krichtextlabel.cpp index 3d9dfcd0..499577b0 100644 --- a/filesharing/simple/krichtextlabel.cpp +++ b/filesharing/simple/krichtextlabel.cpp @@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text ) KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); - tqsetAlignment( TQt::WordBreak ); + setAlignment( TQt::WordBreak ); setText(text); } KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); - tqsetAlignment( TQt::WordBreak ); + setAlignment( TQt::WordBreak ); } void KRichTextLabel::setDefaultWidth(int defaultWidth) @@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -TQSize KRichTextLabel::tqminimumSizeHint() const +TQSize KRichTextLabel::minimumSizeHint() const { TQString qt_text = qrichtextify( text() ); int pref_width = 0; @@ -97,9 +97,9 @@ TQSize KRichTextLabel::tqminimumSizeHint() const return TQSize(pref_width, rt.height()); } -TQSize KRichTextLabel::tqsizeHint() const +TQSize KRichTextLabel::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void KRichTextLabel::setText( const TQString &text ) { diff --git a/filesharing/simple/krichtextlabel.h b/filesharing/simple/krichtextlabel.h index e9b59d4e..f990725e 100644 --- a/filesharing/simple/krichtextlabel.h +++ b/filesharing/simple/krichtextlabel.h @@ -46,8 +46,8 @@ public: int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize sizeHint() const; TQSizePolicy sizePolicy() const; public slots: diff --git a/kdict/actions.cpp b/kdict/actions.cpp index 5f5480aa..1c9c757c 100644 --- a/kdict/actions.cpp +++ b/kdict/actions.cpp @@ -46,7 +46,7 @@ int DictComboAction::plug( TQWidget *widget, int index ) m_combo = new KComboBox(m_editable,bar); m_combo->setCompletionMode(m_compMode); - bar->insertWidget( id_, m_combo->tqsizeHint().width(), m_combo, index ); + bar->insertWidget( id_, m_combo->sizeHint().width(), m_combo, index ); bar->setItemAutoSized(id_,m_autoSized); if ( m_combo ) { @@ -155,7 +155,7 @@ void DictComboAction::setList(TQStringList items) if (m_editable && m_combo->completionObject()) m_combo->completionObject()->setItems(items); if (!m_autoSized) - m_combo->setFixedWidth(m_combo->tqsizeHint().width()); + m_combo->setFixedWidth(m_combo->sizeHint().width()); } } @@ -213,9 +213,9 @@ int DictLabelAction::plug( TQWidget *widget, int index ) int id = KAction::getToolButtonID(); TQLabel *label = new TQLabel( text(), widget, "kde toolbar widget" ); - label->setMinimumWidth(label->tqsizeHint().width()); + label->setMinimumWidth(label->sizeHint().width()); label->setBackgroundMode( TQt::PaletteButton ); - label->tqsetAlignment(AlignCenter | AlignVCenter); + label->setAlignment(AlignCenter | AlignVCenter); label->adjustSize(); tb->insertWidget( id, label->width(), label, index ); @@ -320,7 +320,7 @@ void DictButtonAction::unplug( TQWidget *widget ) int DictButtonAction::widthHint() { if (m_button) - return m_button->tqsizeHint().width(); + return m_button->sizeHint().width(); else return 0; } diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp index 0179f0b8..7cec38c9 100644 --- a/kdict/applet/kdictapplet.cpp +++ b/kdict/applet/kdictapplet.cpp @@ -102,7 +102,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid TQPixmap pm = KGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, KIcon::SizeSmall, KIcon::DefaultState, 0L, true); iconLabel->setPixmap(pm); baseLay->addWidget(iconLabel,1,0); - iconLabel->tqsetAlignment(TQt::AlignCenter | TQt::AlignVCenter); + iconLabel->setAlignment(TQt::AlignCenter | TQt::AlignVCenter); iconLabel->setFixedWidth(pm.width()+4); TQToolTip::add(iconLabel,i18n("Look up a word or phrase with Kdict")); @@ -160,7 +160,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid externalCombo = new KHistoryCombo(popupBox); externalCombo->setCompletionObject(completionObject); connect(externalCombo, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(startQuery(const TQString&))); - externalCombo->setFixedSize(160, externalCombo->tqsizeHint().height()); + externalCombo->setFixedSize(160, externalCombo->sizeHint().height()); connect(internalCombo, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)), this, TQT_SLOT(updateCompletionMode(KGlobalSettings::Completion))); @@ -205,9 +205,9 @@ DictApplet::~DictApplet() int DictApplet::widthForHeight(int height) const { if (height >= 38) - return textLabel->tqsizeHint().width()+55; + return textLabel->sizeHint().width()+55; else - return textLabel->tqsizeHint().width()+25; + return textLabel->sizeHint().width()+25; } @@ -224,10 +224,10 @@ void DictApplet::resizeEvent(TQResizeEvent*) baseWidget->show(); baseWidget->setFixedSize(width(),height()); - if (height() < internalCombo->tqsizeHint().height()) + if (height() < internalCombo->sizeHint().height()) internalCombo->setFixedHeight(height()); else - internalCombo->setFixedHeight(internalCombo->tqsizeHint().height()); + internalCombo->setFixedHeight(internalCombo->sizeHint().height()); if (height() >= 38) { textLabel->show(); diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp index e4dd030b..f49a4c7f 100644 --- a/kdict/matchview.cpp +++ b/kdict/matchview.cpp @@ -119,7 +119,7 @@ MatchView::MatchView(TQWidget *parent, const char *name) boxLayout->addSpacing(1); w_strat = new TQComboBox(false,this); - w_strat->setFixedHeight(w_strat->tqsizeHint().height()); + w_strat->setFixedHeight(w_strat->sizeHint().height()); connect(w_strat,TQT_SIGNAL(activated(int)),this,TQT_SLOT(strategySelected(int))); boxLayout->addWidget(w_strat,0); boxLayout->addSpacing(1); @@ -133,7 +133,7 @@ MatchView::MatchView(TQWidget *parent, const char *name) w_list->setSelectionMode(TQListView::Extended); w_list->setTreeStepSize(18); w_list->setSorting(-1); // disable sorting - w_list->setMinimumHeight(w_strat->tqsizeHint().height()); + w_list->setMinimumHeight(w_strat->sizeHint().height()); connect(w_list,TQT_SIGNAL(selectionChanged()),TQT_SLOT(enableGetButton())); connect(w_list,TQT_SIGNAL(returnPressed(TQListViewItem *)),TQT_SLOT(returnPressed(TQListViewItem *))); connect(w_list,TQT_SIGNAL(doubleClicked(TQListViewItem *)),TQT_SLOT(getOneItem(TQListViewItem *))); @@ -144,15 +144,15 @@ MatchView::MatchView(TQWidget *parent, const char *name) boxLayout->addSpacing(1); w_get = new TQPushButton(i18n("&Get Selected"),this); - w_get->setFixedHeight(w_get->tqsizeHint().height()-3); - w_get->setMinimumWidth(w_get->tqsizeHint().width()-20); + w_get->setFixedHeight(w_get->sizeHint().height()-3); + w_get->setMinimumWidth(w_get->sizeHint().width()-20); w_get->setEnabled(false); connect(w_get, TQT_SIGNAL(clicked()), this, TQT_SLOT(getSelected())); boxLayout->addWidget(w_get,0); w_getAll = new TQPushButton(i18n("Get &All"),this); - w_getAll->setFixedHeight(w_getAll->tqsizeHint().height()-3); - w_getAll->setMinimumWidth(w_getAll->tqsizeHint().width()-20); + w_getAll->setFixedHeight(w_getAll->sizeHint().height()-3); + w_getAll->setMinimumWidth(w_getAll->sizeHint().width()-20); w_getAll->setEnabled(false); connect(w_getAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(getAll())); boxLayout->addWidget(w_getAll,0); diff --git a/kdict/sets.cpp b/kdict/sets.cpp index fe3f2636..3f043233 100644 --- a/kdict/sets.cpp +++ b/kdict/sets.cpp @@ -44,12 +44,12 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name) topLayout->addLayout(subLayout1,0); w_set = new TQComboBox(true,page); - w_set->setFixedHeight(w_set->tqsizeHint().height()); + w_set->setFixedHeight(w_set->sizeHint().height()); w_set->setInsertionPolicy (TQComboBox::NoInsertion); w_set->insertStringList(sets); connect(w_set, TQT_SIGNAL(activated(int)),this, TQT_SLOT(activateSet(int))); TQLabel *l = new TQLabel(w_set, i18n("&Set:"),page); - l->setMinimumSize(l->tqsizeHint()); + l->setMinimumSize(l->sizeHint()); subLayout1->addWidget(l,0); subLayout1->addWidget(w_set,1); @@ -60,12 +60,12 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name) subLayout1->addWidget(w_save,0); TQPushButton *btn = new TQPushButton(i18n("&New"),page); - btn->setMinimumSize(btn->tqsizeHint()); + btn->setMinimumSize(btn->sizeHint()); connect(btn, TQT_SIGNAL(clicked()),this, TQT_SLOT(newPressed())); subLayout1->addWidget(btn,0); w_delete = new TQPushButton(i18n("&Delete"),page); - w_delete->setMinimumSize(w_delete->tqsizeHint()); + w_delete->setMinimumSize(w_delete->sizeHint()); connect(w_delete, TQT_SIGNAL(clicked()),this, TQT_SLOT(deletePressed())); subLayout1->addWidget(w_delete,0); @@ -83,7 +83,7 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name) connect(w_leftBox, TQT_SIGNAL(selected(int)),this, TQT_SLOT(leftSelected(int))); connect(w_leftBox, TQT_SIGNAL(highlighted(int)),this, TQT_SLOT(leftHighlighted(int))); TQLabel *leftLabel = new TQLabel(w_leftBox, i18n("S&elected databases:"),page); - leftLabel->setMinimumSize(leftLabel->tqsizeHint()); + leftLabel->setMinimumSize(leftLabel->sizeHint()); subLayout2->addWidget(leftLabel,0,0); subLayout2->addMultiCellWidget(w_leftBox,1,6,0,0); @@ -111,7 +111,7 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name) connect(w_rightBox, TQT_SIGNAL(selected(int)),this, TQT_SLOT(rightSelected(int))); connect(w_rightBox, TQT_SIGNAL(highlighted(int)),this, TQT_SLOT(rightHighlighted(int))); TQLabel *rightLabel = new TQLabel(w_rightBox, i18n("A&vailable databases:"),page); - rightLabel->setMinimumSize(rightLabel->tqsizeHint()); + rightLabel->setMinimumSize(rightLabel->sizeHint()); subLayout2->addWidget(rightLabel,0,2); subLayout2->addMultiCellWidget(w_rightBox,1,6,2,2); diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp index b61f7c72..91b34007 100644 --- a/kget/dlgIndividual.cpp +++ b/kget/dlgIndividual.cpp @@ -162,9 +162,9 @@ DlgIndividual::DlgIndividual(Transfer * _item) // otherwise set it to the current time TQDateTime dt; - if (item->getStartTime() < TQDateTime::tqcurrentDateTime() && item->getMode() != Transfer::MD_SCHEDULED) + if (item->getStartTime() < TQDateTime::currentDateTime() && item->getMode() != Transfer::MD_SCHEDULED) { - dt = TQDateTime::tqcurrentDateTime(); + dt = TQDateTime::currentDateTime(); } else { @@ -182,14 +182,14 @@ DlgIndividual::DlgIndividual(Transfer * _item) ml_log = new TQTextEdit(panelAdvanced); ml_log->setTextFormat(LogText); ml_log->setReadOnly(true); - // ml_log->setFixedSize(tqsizeHint()); + // ml_log->setFixedSize(sizeHint()); ml_log->setVScrollBarMode(TQScrollView::Auto); ml_log->setWordWrap(TQTextEdit::NoWrap); - // ml_log->tqsetSizePolicy(policy); + // ml_log->setSizePolicy(policy); panelAdvanced->addTab(ml_log, i18n("Log")); - // panelAdvanced->setFixedSize(tqsizeHint()); + // panelAdvanced->setFixedSize(sizeHint()); @@ -197,7 +197,7 @@ DlgIndividual::DlgIndividual(Transfer * _item) advanced = ksettings.b_advancedIndividual; slotToggleAdvanced(); - resize( tqminimumSizeHint() ); + resize( minimumSizeHint() ); setMaximumHeight( height() ); //bool keepOpenChecked = false; @@ -315,7 +315,7 @@ void DlgIndividual::slotKeepOpenToggled(bool bToggled) bKeepDlgOpen=bToggled; - if (!bKeepDlgOpen && item->gettqStatus()==Transfer::ST_FINISHED) + if (!bKeepDlgOpen && item->getStatus()==Transfer::ST_FINISHED) { hide(); m_pDockIndividual->hide(); diff --git a/kget/dlgadvancedbase.ui b/kget/dlgadvancedbase.ui index 9b317d91..03436214 100644 --- a/kget/dlgadvancedbase.ui +++ b/kget/dlgadvancedbase.ui @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>35</width> <height>20</height> diff --git a/kget/dlgautomationbase.ui b/kget/dlgautomationbase.ui index abf40f34..bad713e1 100644 --- a/kget/dlgautomationbase.ui +++ b/kget/dlgautomationbase.ui @@ -112,7 +112,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> diff --git a/kget/dlgconnectionbase.ui b/kget/dlgconnectionbase.ui index 49eada65..1a0034e5 100644 --- a/kget/dlgconnectionbase.ui +++ b/kget/dlgconnectionbase.ui @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -174,7 +174,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -283,7 +283,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kget/dlgdirectoriesbase.ui b/kget/dlgdirectoriesbase.ui index 6a86b045..9b46fadb 100644 --- a/kget/dlgdirectoriesbase.ui +++ b/kget/dlgdirectoriesbase.ui @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kget/dlglimitsbase.ui b/kget/dlglimitsbase.ui index 09e0cbce..29af48da 100644 --- a/kget/dlglimitsbase.ui +++ b/kget/dlglimitsbase.ui @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kget/dlgsystembase.ui b/kget/dlgsystembase.ui index 5d516195..03fa75fe 100644 --- a/kget/dlgsystembase.ui +++ b/kget/dlgsystembase.ui @@ -107,7 +107,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>10</height> diff --git a/kget/docking.cpp b/kget/docking.cpp index c637303d..b13e04a5 100644 --- a/kget/docking.cpp +++ b/kget/docking.cpp @@ -56,7 +56,7 @@ DockWidget::DockWidget(KMainWidget * _parent):KSystemTray(_parent) setAcceptDrops(true); dtip = new DynamicTip( this ); - dtip->settqStatus( kapp->aboutData()->shortDescription() ); + dtip->setStatus( kapp->aboutData()->shortDescription() ); } @@ -100,7 +100,7 @@ void DockWidget::mousePressEvent(TQMouseEvent * e) void DockWidget::updateToolTip( const TQString& _status ) { - dtip->settqStatus( _status ); + dtip->setStatus( _status ); } @@ -117,7 +117,7 @@ DynamicTip::DynamicTip( TQWidget * parent ) } -void DynamicTip::settqStatus( const TQString & _status ) +void DynamicTip::setStatus( const TQString & _status ) { status = _status; } diff --git a/kget/docking.h b/kget/docking.h index 7d866c88..d7c73aac 100644 --- a/kget/docking.h +++ b/kget/docking.h @@ -43,7 +43,7 @@ class DynamicTip : public TQToolTip public: DynamicTip( TQWidget * parent ); virtual ~DynamicTip() {}//TODO workaround for qt-bug, can be removed after 4.0 - void settqStatus( const TQString & _status ); + void setStatus( const TQString & _status ); protected: void maybeTip( const TQPoint & ); diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp index 5bc91256..16504280 100644 --- a/kget/droptarget.cpp +++ b/kget/droptarget.cpp @@ -45,7 +45,7 @@ #include <X11/Xos.h> #include <X11/extensions/shape.h> #undef Bool -#undef tqStatus +#undef Status #endif #include "settings.h" #include "droptarget.h" diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp index aa65437e..9e665857 100644 --- a/kget/kmainwidget.cpp +++ b/kget/kmainwidget.cpp @@ -142,8 +142,8 @@ KMainWidget::KMainWidget(bool bStartDocked) kmain = this; // Set log time, needed for the name of log file - TQDate date = TQDateTime::tqcurrentDateTime().date(); - TQTime time = TQDateTime::tqcurrentDateTime().time(); + TQDate date = TQDateTime::currentDateTime().date(); + TQTime time = TQDateTime::currentDateTime().time(); TQString tmp; tmp.sprintf("log%d:%d:%d-%d:%d:%d", date.day(), date.month(), date.year(), time.hour(), time.minute(), time.second()); @@ -708,7 +708,7 @@ void KMainWidget::slotQuit() for (; it.current(); ++it) { item = it.current(); - if (item->gettqStatus() == Transfer::ST_RUNNING && !ksettings.b_expertMode) { + if (item->getStatus() == Transfer::ST_RUNNING && !ksettings.b_expertMode) { if (KMessageBox::warningContinueCancel(this, i18n("Some transfers are still running.\nAre you sure you want to quit KGet?"), i18n("Warning"), KStdGuiItem::quit()) != KMessageBox::Continue) { #ifdef _DEBUG sDebugOut << endl; @@ -876,10 +876,10 @@ void KMainWidget::stopAll() log(i18n("Stopping all jobs"), false); TransferIterator it(myTransferList); - Transfer::TransfertqStatus tqStatus; + Transfer::TransferStatus Status; for (; it.current(); ++it) { - tqStatus = it.current()->gettqStatus(); - if (tqStatus == Transfer::ST_TRYING || tqStatus == Transfer::ST_RUNNING) + Status = it.current()->getStatus(); + if (Status == Transfer::ST_TRYING || Status == Transfer::ST_RUNNING) it.current()->slotStop(); } slotUpdateActions(); @@ -1360,7 +1360,7 @@ void KMainWidget::checkQueue() // count running transfers for (; it.current(); ++it) { - status = it.current()->gettqStatus(); + status = it.current()->getStatus(); if (status == Transfer::ST_RUNNING || status == Transfer::ST_TRYING) numRun++; } @@ -1370,7 +1370,7 @@ void KMainWidget::checkQueue() bool isQuequed; for (; it.current() && numRun < ksettings.maxSimultaneousConnections; ++it) { item = it.current(); - isRunning = (item->gettqStatus() == Transfer::ST_RUNNING) || ((item->gettqStatus() == Transfer::ST_TRYING)); + isRunning = (item->getStatus() == Transfer::ST_RUNNING) || ((item->getStatus() == Transfer::ST_TRYING)); isQuequed = (item->getMode() == Transfer::MD_TQUEUED || item->getMode() == Transfer::MD_NEW); @@ -1394,7 +1394,7 @@ void KMainWidget::checkQueue() for (; it.current(); ++it) { item = it.current(); - if (item->getMode() == Transfer::MD_NEW && item->gettqStatus() == Transfer::ST_STOPPED) + if (item->getMode() == Transfer::MD_NEW && item->getStatus() == Transfer::ST_STOPPED) { item->checkCache(); } @@ -1420,7 +1420,7 @@ void KMainWidget::slotAnimTimeout() animCounter = 0; } // update status of all items of transferList - isTransfer = myTransferList->updatetqStatus(animCounter); + isTransfer = myTransferList->updateStatus(animCounter); //if (this->isVisible()) { updateStatusBar(); @@ -1445,7 +1445,7 @@ void KMainWidget::slotTransferTimeout() for (; it.current(); ++it) { item = it.current(); - if (item->getMode() == Transfer::MD_SCHEDULED && item->getStartTime() <= TQDateTime::tqcurrentDateTime()) { + if (item->getMode() == Transfer::MD_SCHEDULED && item->getStartTime() <= TQDateTime::currentDateTime()) { item->setMode(Transfer::MD_TQUEUED); flag = true; } @@ -1455,7 +1455,7 @@ void KMainWidget::slotTransferTimeout() checkQueue(); } - if (ksettings.b_autoDisconnect && ksettings.b_timedDisconnect && ksettings.disconnectTime <= TQTime::currentTime() && ksettings.disconnectDate == TQDate::tqcurrentDate()) { + if (ksettings.b_autoDisconnect && ksettings.b_timedDisconnect && ksettings.disconnectTime <= TQTime::currentTime() && ksettings.disconnectDate == TQDate::currentDate()) { onlineDisconnect(); } @@ -2040,7 +2040,7 @@ void KMainWidget::slotUpdateActions() sDebug << "-->ONLINE= " << ksettings.b_offline << endl; #endif if (item == first_item && !ksettings.b_offline) { - switch (item->gettqStatus()) { + switch (item->getStatus()) { case Transfer::ST_TRYING: case Transfer::ST_RUNNING: m_paResume->setEnabled(false); @@ -2052,7 +2052,7 @@ void KMainWidget::slotUpdateActions() m_paPause->setEnabled(false); m_paRestart->setEnabled(false); #ifdef _DEBUG - sDebug << "STATUS IS stopped" << item->gettqStatus() << endl; + sDebug << "STATUS IS stopped" << item->getStatus() << endl; #endif break; case Transfer::ST_FINISHED: @@ -2064,7 +2064,7 @@ void KMainWidget::slotUpdateActions() } //end switch - } else if (item->gettqStatus() != first_item->gettqStatus()) { + } else if (item->getStatus() != first_item->getStatus()) { // disable all when all selected items don't have the same status m_paResume->setEnabled(false); m_paPause->setEnabled(false); @@ -2076,7 +2076,7 @@ void KMainWidget::slotUpdateActions() m_paDelete->setEnabled(true); m_paCopy->setEnabled(true); m_paIndividual->setEnabled(true); - if (item->gettqStatus() != Transfer::ST_FINISHED) { + if (item->getStatus() != Transfer::ST_FINISHED) { m_paQueue->setEnabled(true); m_paTimer->setEnabled(true); m_paDelay->setEnabled(true); @@ -2469,7 +2469,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) Transfer *transfer = myTransferList->find( url ); if ( transfer ) { - if ( transfer->gettqStatus() != Transfer::ST_FINISHED ) + if ( transfer->getStatus() != Transfer::ST_FINISHED ) { if ( !ksettings.b_expertMode ) { diff --git a/kget/settings.cpp b/kget/settings.cpp index 4329dfc8..4660f7f1 100644 --- a/kget/settings.cpp +++ b/kget/settings.cpp @@ -91,7 +91,7 @@ Settings::load() b_timedDisconnect = config->readBoolEntry("TimedDisconnect", DEF_TimedDisconnect); disconnectTime.setHMS(config->readNumEntry("DisconnectTimeHour"), config->readNumEntry("DisconnectTimeMinute"), 0); - disconnectDate = TQDate::tqcurrentDate(); // doesn't make sense to save it + disconnectDate = TQDate::currentDate(); // doesn't make sense to save it b_autoShutdown = config->readBoolEntry("AutoShutdown", DEF_AutoShutdown); b_autoPaste = config->readBoolEntry("AutoPaste", DEF_AutoPaste); diff --git a/kget/transfer.cpp b/kget/transfer.cpp index 22a5b8ad..8147891e 100644 --- a/kget/transfer.cpp +++ b/kget/transfer.cpp @@ -109,7 +109,7 @@ Transfer::init(const uint _id) id = _id; m_pSlave = new Slave(this, src, dest); canResume = false; - startTime = TQDateTime::tqcurrentDateTime(); + startTime = TQDateTime::currentDateTime(); speed = 0; // retryCount = ksettings.reconnectRetries-1; retryCount = 0; @@ -270,7 +270,7 @@ void Transfer::updateAll() { sDebugIn << endl; - updatetqStatus(status); // first phase of animation + updateStatus(status); // first phase of animation logMessage(i18n("Copy file from: %1").tqarg(src.prettyURL())); logMessage(i18n("To: %1").tqarg(dest.prettyURL())); @@ -303,7 +303,7 @@ void Transfer::updateAll() } -bool Transfer::updatetqStatus(int counter) +bool Transfer::updateStatus(int counter) { //sDebug<< ">>>>Entering"<<endl; @@ -337,18 +337,18 @@ bool Transfer::updatetqStatus(int counter) setPixmap(view->lv_pixmap, *pix); view->setUpdatesEnabled(true); - if(prevtqStatus!=status || prevMode != mode || status==ST_RUNNING || status==ST_TRYING) + if(prevStatus!=status || prevMode != mode || status==ST_RUNNING || status==ST_TRYING) { TQRect rect = view->header()->sectionRect(view->lv_pixmap); int x = rect.x(); - int y = view->tqitemRect(this).y(); + int y = view->itemRect(this).y(); int w = rect.width(); int h = rect.height(); view->TQScrollView::updateContents(x,y,w,h); - prevtqStatus = status; + prevStatus = status; prevMode = mode; } @@ -510,8 +510,8 @@ void Transfer::slotRequestSchedule() // if the time was already set somewhere in the future, keep it // otherwise set it to the current time + 60 seconds - if (startTime < TQDateTime::tqcurrentDateTime()) { - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + if (startTime < TQDateTime::currentDateTime()) { + TQDateTime dt = TQDateTime::currentDateTime(); startTime = dt.addSecs(60); } if (status == ST_RUNNING) { @@ -787,7 +787,7 @@ bool Transfer::read(KSimpleConfig * config, int id) } mode = (TransferMode) config->readNumEntry("Mode", MD_TQUEUED); - status = (TransfertqStatus) config->readNumEntry("Status", ST_RUNNING); + status = (TransferStatus) config->readNumEntry("Status", ST_RUNNING); startTime = config->readDateTimeEntry("ScheduledTime"); canResume = config->readBoolEntry("CanResume", true); totalSize = config->readUnsignedNum64Entry("TotalSize", 0); @@ -851,7 +851,7 @@ void Transfer::slotExecError() status = ST_STOPPED; mode = MD_SCHEDULED; - startTime=TQDateTime::tqcurrentDateTime().addSecs(ksettings.reconnectTime * 60); + startTime=TQDateTime::currentDateTime().addSecs(ksettings.reconnectTime * 60); emit statusChanged(this, OP_SCHEDULED); sDebugOut << endl; @@ -982,7 +982,7 @@ bool Transfer::keepDialogOpen() const void Transfer::maybeShow() { - if ( ksettings.b_showIndividual && gettqStatus() != Transfer::ST_FINISHED ) + if ( ksettings.b_showIndividual && getStatus() != Transfer::ST_FINISHED ) { if(dlgIndividual) dlgIndividual->show(); diff --git a/kget/transfer.h b/kget/transfer.h index 17e4aa08..c21938eb 100644 --- a/kget/transfer.h +++ b/kget/transfer.h @@ -57,7 +57,7 @@ class Transfer:public TQObject, public KListViewItem public: enum TransferMode { MD_TQUEUED, MD_DELAYED, MD_SCHEDULED, MD_NONE, MD_NEW }; - enum TransfertqStatus { ST_TRYING, ST_RUNNING, ST_STOPPED, ST_FINISHED }; + enum TransferStatus { ST_TRYING, ST_RUNNING, ST_STOPPED, ST_FINISHED }; enum TransferOperation { OP_FINISHED, OP_RESUMED, OP_PAUSED, OP_REMOVED, OP_ABORTED, @@ -114,7 +114,7 @@ public: { return speed; } - TransfertqStatus gettqStatus()const + TransferStatus getStatus()const { return status; } @@ -127,7 +127,7 @@ public: { mode = _mode; } - void settqStatus(TransfertqStatus _status) + void setStatus(TransferStatus _status) { status = _status; }; @@ -139,7 +139,7 @@ public: // update methods void updateAll(); - bool updatetqStatus(int counter); + bool updateStatus(int counter); void showIndividual(); void UpdateRetry(); @@ -220,10 +220,10 @@ private: unsigned int remainingTimeSec; TQString remainingTime; - TransfertqStatus status; + TransferStatus status; TransferMode mode; - TransfertqStatus prevtqStatus; + TransferStatus prevStatus; TransferMode prevMode; // how many times have we retried already diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index 71a48dec..99372bdb 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -182,14 +182,14 @@ void TransferList::moveToEnd(Transfer * item) } -bool TransferList::updatetqStatus(int counter) +bool TransferList::updateStatus(int counter) { bool isTransfer = false; TransferIterator it(this); for (; it.current(); ++it) { - isTransfer |= it.current()->updatetqStatus(counter); + isTransfer |= it.current()->updateStatus(counter); } return isTransfer; diff --git a/kget/transferlist.h b/kget/transferlist.h index ae3fd6d8..e32bcb3a 100644 --- a/kget/transferlist.h +++ b/kget/transferlist.h @@ -76,7 +76,7 @@ public: { return phasesNum; } - bool updatetqStatus(int counter); + bool updateStatus(int counter); Transfer * find(const KURL& _src); bool areTransfersQueuedOrScheduled(); diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp index 5fc86dcc..6b90e05a 100644 --- a/knewsticker/common/configaccess.cpp +++ b/knewsticker/common/configaccess.cpp @@ -20,343 +20,343 @@ static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = { // Arts --------------- NewsSourceBase::Data( - TQString::tqfromLatin1("Bureau 42"), - TQString::tqfromLatin1("http://www.bureau42.com/rdf/"), - TQString::tqfromLatin1("http://www.bureau42.com/favicon.ico"), + TQString::fromLatin1("Bureau 42"), + TQString::fromLatin1("http://www.bureau42.com/rdf/"), + TQString::fromLatin1("http://www.bureau42.com/favicon.ico"), NewsSourceBase::Arts, 5, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("eFilmCritic"), - TQString::tqfromLatin1("http://efilmcritic.com/fo.rdf"), - TQString::tqfromLatin1("http://efilmcritic.com/favicon.ico"), + TQString::fromLatin1("eFilmCritic"), + TQString::fromLatin1("http://efilmcritic.com/fo.rdf"), + TQString::fromLatin1("http://efilmcritic.com/favicon.ico"), NewsSourceBase::Arts, 3, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("superhits.ch"), - TQString::tqfromLatin1("http://www.superhits.ch/cgi-bin/superhits.cgi?page=rdf"), - TQString::tqfromLatin1("http://www.superhits.ch/favicon.ico"), - NewsSourceBase::Arts, 10, false, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("superhits.ch"), + TQString::fromLatin1("http://www.superhits.ch/cgi-bin/superhits.cgi?page=rdf"), + TQString::fromLatin1("http://www.superhits.ch/favicon.ico"), + NewsSourceBase::Arts, 10, false, false, TQString::fromLatin1("de")), // Business ----------- NewsSourceBase::Data( - TQString::tqfromLatin1("Internet.com Business"), - TQString::tqfromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), + TQString::fromLatin1("Internet.com Business"), + TQString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), TQString(), NewsSourceBase::Business, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("TradeSims"), - TQString::tqfromLatin1("http://www.tradesims.com/AEX.rdf"), + TQString::fromLatin1("TradeSims"), + TQString::fromLatin1("http://www.tradesims.com/AEX.rdf"), TQString(), NewsSourceBase::Business, 10, false, false), // Computers ---------- NewsSourceBase::Data( - TQString::tqfromLatin1( "linuxartist.org" ), - TQString::tqfromLatin1( "http://www.linuxartist.org/backend.php"), - TQString::tqfromLatin1( "http://www.linuxartist.org/favicon.ico"), + TQString::fromLatin1( "linuxartist.org" ), + TQString::fromLatin1( "http://www.linuxartist.org/backend.php"), + TQString::fromLatin1( "http://www.linuxartist.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false ), NewsSourceBase::Data( - TQString::tqfromLatin1("KDE Deutschland"), - TQString::tqfromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"), - TQString::tqfromLatin1("http://www.kde.de/favicon.ico"), - NewsSourceBase::Computers, 10, true, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("KDE Deutschland"), + TQString::fromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"), + TQString::fromLatin1("http://www.kde.de/favicon.ico"), + NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("KDE France"), - TQString::tqfromLatin1("http://www.kde-france.org/backend-breves.php3"), + TQString::fromLatin1("KDE France"), + TQString::fromLatin1("http://www.kde-france.org/backend-breves.php3"), TQString(), - NewsSourceBase::Computers, 10, true, false, TQString::tqfromLatin1("fr")), + NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("fr")), NewsSourceBase::Data( - TQString::tqfromLatin1("FreeBSD Project News"), - TQString::tqfromLatin1("http://www.freebsd.org/news/news.rdf"), - TQString::tqfromLatin1("http://www.freebsd.org/favicon.ico"), + TQString::fromLatin1("FreeBSD Project News"), + TQString::fromLatin1("http://www.freebsd.org/news/news.rdf"), + TQString::fromLatin1("http://www.freebsd.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("dot.kde.org"), - TQString::tqfromLatin1("http://www.kde.org/dotkdeorg.rdf"), - TQString::tqfromLatin1("http://www.kde.org/favicon.ico"), + TQString::fromLatin1("dot.kde.org"), + TQString::fromLatin1("http://www.kde.org/dotkdeorg.rdf"), + TQString::fromLatin1("http://www.kde.org/favicon.ico"), NewsSourceBase::Computers, 10, true, false), NewsSourceBase::Data( - TQString::tqfromLatin1("GNOME News"), - TQString::tqfromLatin1("http://www.gnomedesktop.org/backend.php"), + TQString::fromLatin1("GNOME News"), + TQString::fromLatin1("http://www.gnomedesktop.org/backend.php"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Slashdot"), - TQString::tqfromLatin1("http://slashdot.org/slashdot.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot"), + TQString::fromLatin1("http://slashdot.org/slashdot.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceBase::Computers, 10, true, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Ask Slashdot"), - TQString::tqfromLatin1("http://slashdot.org/askslashdot.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Ask Slashdot"), + TQString::fromLatin1("http://slashdot.org/askslashdot.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Slashdot: Features"), - TQString::tqfromLatin1("http://slashdot.org/features.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Features"), + TQString::fromLatin1("http://slashdot.org/features.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Slashdot: Apache"), - TQString::tqfromLatin1("http://slashdot.org/apache.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Apache"), + TQString::fromLatin1("http://slashdot.org/apache.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Slashdot: Books"), - TQString::tqfromLatin1("http://slashdot.org/books.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Books"), + TQString::fromLatin1("http://slashdot.org/books.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Jabber News"), - TQString::tqfromLatin1("http://www.jabber.org/news/rss.xml"), + TQString::fromLatin1("Jabber News"), + TQString::fromLatin1("http://www.jabber.org/news/rss.xml"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Freshmeat"), - TQString::tqfromLatin1("http://freshmeat.net/backend/fm.rdf"), - TQString::tqfromLatin1("http://freshmeat.net/favicon.ico"), + TQString::fromLatin1("Freshmeat"), + TQString::fromLatin1("http://freshmeat.net/backend/fm.rdf"), + TQString::fromLatin1("http://freshmeat.net/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Linux Weekly News"), - TQString::tqfromLatin1("http://www.lwn.net/headlines/rss"), - TQString::tqfromLatin1("http://www.lwn.net/favicon.ico"), + TQString::fromLatin1("Linux Weekly News"), + TQString::fromLatin1("http://www.lwn.net/headlines/rss"), + TQString::fromLatin1("http://www.lwn.net/favicon.ico"), NewsSourceBase::Computers, 10, true, false), NewsSourceBase::Data( - TQString::tqfromLatin1("heise online news"), - TQString::tqfromLatin1("http://www.heise.de/newsticker/heise.rdf"), - TQString::tqfromLatin1("http://www.heise.de/favicon.ico"), - NewsSourceBase::Computers, 10, true, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("heise online news"), + TQString::fromLatin1("http://www.heise.de/newsticker/heise.rdf"), + TQString::fromLatin1("http://www.heise.de/favicon.ico"), + NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("RUS-CERT Ticker"), - TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"), - TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), - NewsSourceBase::Computers, 10, true, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("RUS-CERT Ticker"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), + NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("RUS-CERT Elsewhere"), - TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"), - TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("RUS-CERT Elsewhere"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), + NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("Kuro5hin"), - TQString::tqfromLatin1("http://kuro5hin.org/backend.rdf"), - TQString::tqfromLatin1("http://kuro5hin.org/favicon.ico"), + TQString::fromLatin1("Kuro5hin"), + TQString::fromLatin1("http://kuro5hin.org/backend.rdf"), + TQString::fromLatin1("http://kuro5hin.org/favicon.ico"), NewsSourceBase::Computers, 10, true, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Prolinux"), - TQString::tqfromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"), - TQString::tqfromLatin1("http://www.prolinux.de/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("Prolinux"), + TQString::fromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"), + TQString::fromLatin1("http://www.prolinux.de/favicon.ico"), + NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("Linuxde.org"), - TQString::tqfromLatin1("http://www.linuxde.org/backends/news.rdf"), - TQString::tqfromLatin1("http://www.linuxde.org/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("Linuxde.org"), + TQString::fromLatin1("http://www.linuxde.org/backends/news.rdf"), + TQString::fromLatin1("http://www.linuxde.org/favicon.ico"), + NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("LinuxSecurity.com"), - TQString::tqfromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), + TQString::fromLatin1("LinuxSecurity.com"), + TQString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Linux Game Tome"), - TQString::tqfromLatin1("http://happypenguin.org/html/news.rdf"), + TQString::fromLatin1("Linux Game Tome"), + TQString::fromLatin1("http://happypenguin.org/html/news.rdf"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Telefragged"), - TQString::tqfromLatin1("http://www.telefragged.com/cgi-bin/rdf.pl"), + TQString::fromLatin1("Telefragged"), + TQString::fromLatin1("http://www.telefragged.com/cgi-bin/rdf.pl"), TQString(), NewsSourceBase::Computers, 10, false, false), /* NewsSourceBase::Data( - TQString::tqfromLatin1("Gimp News"), - TQString::tqfromLatin1("http://www.xach.com/gimp/news/channel.rdf"), + TQString::fromLatin1("Gimp News"), + TQString::fromLatin1("http://www.xach.com/gimp/news/channel.rdf"), TQString(), NewsSourceBase::Computers, 10, false, false),*/ NewsSourceBase::Data( - TQString::tqfromLatin1("Mozilla"), - TQString::tqfromLatin1("http://www.mozilla.org/news.rdf"), - TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"), + TQString::fromLatin1("Mozilla"), + TQString::fromLatin1("http://www.mozilla.org/news.rdf"), + TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("MozillaZine"), - TQString::tqfromLatin1("http://www.mozillazine.org/contents.rdf"), - TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"), + TQString::fromLatin1("MozillaZine"), + TQString::fromLatin1("http://www.mozillazine.org/contents.rdf"), + TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Daemon News"), - TQString::tqfromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), + TQString::fromLatin1("Daemon News"), + TQString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("use Perl;"), - TQString::tqfromLatin1("http://use.perl.org/useperl.rdf"), + TQString::fromLatin1("use Perl;"), + TQString::fromLatin1("http://use.perl.org/useperl.rdf"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("desktopian.org"), - TQString::tqfromLatin1("http://www.desktopian.org/includes/headlines.xml"), - TQString::tqfromLatin1("http://www.desktopian.org/favicon.ico"), + TQString::fromLatin1("desktopian.org"), + TQString::fromLatin1("http://www.desktopian.org/includes/headlines.xml"), + TQString::fromLatin1("http://www.desktopian.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Root prompt"), - TQString::tqfromLatin1("http://www.rootprompt.org/rss/"), - TQString::tqfromLatin1("http://www.rootprompt.org/favicon.ico"), + TQString::fromLatin1("Root prompt"), + TQString::fromLatin1("http://www.rootprompt.org/rss/"), + TQString::fromLatin1("http://www.rootprompt.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("SecurityFocus"), - TQString::tqfromLatin1("http://www.securityfocus.com/rss/news.xml"), - TQString::tqfromLatin1("http://www.securityfocus.com/favicon.ico"), + TQString::fromLatin1("SecurityFocus"), + TQString::fromLatin1("http://www.securityfocus.com/rss/news.xml"), + TQString::fromLatin1("http://www.securityfocus.com/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("LinuxNewbie"), - TQString::tqfromLatin1("http://www.linuxnewbie.org/news.cdf"), - TQString::tqfromLatin1("http://www.linuxnewbie.org/favicon.ico"), + TQString::fromLatin1("LinuxNewbie"), + TQString::fromLatin1("http://www.linuxnewbie.org/news.cdf"), + TQString::fromLatin1("http://www.linuxnewbie.org/favicon.ico"), NewsSourceBase::Computers, 5, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Arstechnica"), - TQString::tqfromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"), - TQString::tqfromLatin1("http://arstechnica.com/favicon.ico"), + TQString::fromLatin1("Arstechnica"), + TQString::fromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"), + TQString::fromLatin1("http://arstechnica.com/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"), - TQString::tqfromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"), - TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"), + TQString::fromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"), + TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"), + NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("amiga-news.de - english Amiga news"), - TQString::tqfromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"), - TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"), + TQString::fromLatin1("amiga-news.de - english Amiga news"), + TQString::fromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"), + TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("RadioTux)"), - TQString::tqfromLatin1("http://blog.radiotux.de/feed/"), + TQString::fromLatin1("RadioTux)"), + TQString::fromLatin1("http://blog.radiotux.de/feed/"), TQString(), - NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")), + NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("kdenews.unixcode.org"), - TQString::tqfromLatin1("http://kdenews.unixcode.org/?node=news&action=rss"), + TQString::fromLatin1("kdenews.unixcode.org"), + TQString::fromLatin1("http://kdenews.unixcode.org/?node=news&action=rss"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("FreshPorts - the place for ports"), - TQString::tqfromLatin1("http://www.freshports.org/news.php"), - TQString::tqfromLatin1("http://www.freshports.org/favicon.ico"), + TQString::fromLatin1("FreshPorts - the place for ports"), + TQString::fromLatin1("http://www.freshports.org/news.php"), + TQString::fromLatin1("http://www.freshports.org/favicon.ico"), NewsSourceBase::Computers, 20, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("NetPhoenix"), - TQString::tqfromLatin1("http://www.netphoenix.at/rss/netphoenix.php"), - TQString::tqfromLatin1("http://www.netphoenix.at/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("NetPhoenix"), + TQString::fromLatin1("http://www.netphoenix.at/rss/netphoenix.php"), + TQString::fromLatin1("http://www.netphoenix.at/favicon.ico"), + NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("ShortNews - by www.netphoenix.at"), - TQString::tqfromLatin1("http://www.netphoenix.at/rss/shortnews.php"), - TQString::tqfromLatin1("http://www.netphoenix.at/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("ShortNews - by www.netphoenix.at"), + TQString::fromLatin1("http://www.netphoenix.at/rss/shortnews.php"), + TQString::fromLatin1("http://www.netphoenix.at/favicon.ico"), + NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("zez.org - about code "), - TQString::tqfromLatin1("http://zez.org/article/rssheadlines"), + TQString::fromLatin1("zez.org - about code "), + TQString::fromLatin1("http://zez.org/article/rssheadlines"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("BSDatwork.com"), - TQString::tqfromLatin1("http://BSDatwork.com/backend.php"), - TQString::tqfromLatin1("http://BSDatwork.com/favicon.ico"), + TQString::fromLatin1("BSDatwork.com"), + TQString::fromLatin1("http://BSDatwork.com/backend.php"), + TQString::fromLatin1("http://BSDatwork.com/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("FreshSource - the place for source"), - TQString::tqfromLatin1("http://www.freshsource.org/news.php"), - TQString::tqfromLatin1("http://www.freshsource.org/favicon.ico"), + TQString::fromLatin1("FreshSource - the place for source"), + TQString::fromLatin1("http://www.freshsource.org/news.php"), + TQString::fromLatin1("http://www.freshsource.org/favicon.ico"), NewsSourceBase::Computers, 20, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("The FreeBSD Diary"), - TQString::tqfromLatin1("http://www.freebsddiary.org/news.php"), - TQString::tqfromLatin1("http://www.freebsddiary.org/favicon.ico"), + TQString::fromLatin1("The FreeBSD Diary"), + TQString::fromLatin1("http://www.freebsddiary.org/news.php"), + TQString::fromLatin1("http://www.freebsddiary.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("MaximumBSD"), - TQString::tqfromLatin1("http://www.maximumbsd.com/backend/mb.rdf"), - TQString::tqfromLatin1("http://www.maximumbsd.com/favicon.ico"), + TQString::fromLatin1("MaximumBSD"), + TQString::fromLatin1("http://www.maximumbsd.com/backend/mb.rdf"), + TQString::fromLatin1("http://www.maximumbsd.com/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("BR-Linux.org"), - TQString::tqfromLatin1("http://br-linux.org/noticias/index.rdf"), - TQString::tqfromLatin1("http://br-linux.org/noticias/favicon.ico"), + TQString::fromLatin1("BR-Linux.org"), + TQString::fromLatin1("http://br-linux.org/noticias/index.rdf"), + TQString::fromLatin1("http://br-linux.org/noticias/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("OSNews.com"), - TQString::tqfromLatin1("http://www.osnews.com/files/recent.rdf"), - TQString::tqfromLatin1("http://www.osnews.com/favicon.ico"), + TQString::fromLatin1("OSNews.com"), + TQString::fromLatin1("http://www.osnews.com/files/recent.rdf"), + TQString::fromLatin1("http://www.osnews.com/favicon.ico"), NewsSourceBase::Computers, 10, false, false), // Miscellaneous ------ NewsSourceBase::Data( - TQString::tqfromLatin1("tagesschau.de"), - TQString::tqfromLatin1("http://www.tagesschau.de/newsticker.rdf"), - TQString::tqfromLatin1("http://www.tagesschau.de/favicon.ico"), - NewsSourceBase::Misc, 10, true, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("tagesschau.de"), + TQString::fromLatin1("http://www.tagesschau.de/newsticker.rdf"), + TQString::fromLatin1("http://www.tagesschau.de/favicon.ico"), + NewsSourceBase::Misc, 10, true, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("N24.de"), - TQString::tqfromLatin1("http://www.n24.de/rss/?rubrik=home"), - TQString::tqfromLatin1("http://www.n24.de/favicon.ico"), - NewsSourceBase::Misc, 10, true, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("N24.de"), + TQString::fromLatin1("http://www.n24.de/rss/?rubrik=home"), + TQString::fromLatin1("http://www.n24.de/favicon.ico"), + NewsSourceBase::Misc, 10, true, false, TQString::fromLatin1("de")), /* NewsSourceBase::Data( - TQString::tqfromLatin1("CNN"), - TQString::tqfromLatin1("http://www.cnn.com/cnn.rss"), - TQString::tqfromLatin1("http://www.cnn.com/favicon.ico"), + TQString::fromLatin1("CNN"), + TQString::fromLatin1("http://www.cnn.com/cnn.rss"), + TQString::fromLatin1("http://www.cnn.com/favicon.ico"), NewsSourceBase::Misc, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("CNN Europe"), - TQString::tqfromLatin1("http://europe.cnn.com/cnn.rss"), - TQString::tqfromLatin1("http://europe.cnn.com/favicon.ico"), + TQString::fromLatin1("CNN Europe"), + TQString::fromLatin1("http://europe.cnn.com/cnn.rss"), + TQString::fromLatin1("http://europe.cnn.com/favicon.ico"), NewsSourceBase::Misc, 10, false, false), */ NewsSourceBase::Data( - TQString::tqfromLatin1("HotWired"), - TQString::tqfromLatin1("http://www.hotwired.com/webmonkey/meta/headlines.rdf"), - TQString::tqfromLatin1("http://www.hotwired.com/favicon.ico"), + TQString::fromLatin1("HotWired"), + TQString::fromLatin1("http://www.hotwired.com/webmonkey/meta/headlines.rdf"), + TQString::fromLatin1("http://www.hotwired.com/favicon.ico"), NewsSourceBase::Misc, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("The Register"), - TQString::tqfromLatin1("http://www.theregister.co.uk/tonys/slashdot.rdf"), - TQString::tqfromLatin1("http://www.theregister.co.uk/favicon.ico"), + TQString::fromLatin1("The Register"), + TQString::fromLatin1("http://www.theregister.co.uk/tonys/slashdot.rdf"), + TQString::fromLatin1("http://www.theregister.co.uk/favicon.ico"), NewsSourceBase::Misc, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1( "Christian Science Monitor" ), - TQString::tqfromLatin1( "http://www.csmonitor.com/rss/csm.rss"), - TQString::tqfromLatin1( "http://www.csmonitor.com/favicon.ico"), + TQString::fromLatin1( "Christian Science Monitor" ), + TQString::fromLatin1( "http://www.csmonitor.com/rss/csm.rss"), + TQString::fromLatin1( "http://www.csmonitor.com/favicon.ico"), NewsSourceBase::Misc, 10, false, false ), // Magazines ------ NewsSourceBase::Data( - TQString::tqfromLatin1("Revista do Linux"), - TQString::tqfromLatin1("http://www.revistadolinux.com.br/noticias/arquivo/noticias.rdf"), - TQString::tqfromLatin1("http://www.revistadolinux.com.br/favicon.ico"), - NewsSourceBase::Magazines, 10, false, false /*, TQString::tqfromLatin1("br")*/ ), + TQString::fromLatin1("Revista do Linux"), + TQString::fromLatin1("http://www.revistadolinux.com.br/noticias/arquivo/noticias.rdf"), + TQString::fromLatin1("http://www.revistadolinux.com.br/favicon.ico"), + NewsSourceBase::Magazines, 10, false, false /*, TQString::fromLatin1("br")*/ ), NewsSourceBase::Data( - TQString::tqfromLatin1("Spiegel.de"), - TQString::tqfromLatin1("http://www.spiegel.de/schlagzeilen/rss/0,5291,,00.xml"), - TQString::tqfromLatin1("http://www.spiegel.de/favicon.ico"), - NewsSourceBase::Magazines, 10, true, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("Spiegel.de"), + TQString::fromLatin1("http://www.spiegel.de/schlagzeilen/rss/0,5291,,00.xml"), + TQString::fromLatin1("http://www.spiegel.de/favicon.ico"), + NewsSourceBase::Magazines, 10, true, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("FAZ.de"), - TQString::tqfromLatin1("http://www.faz.net/s/Rub/Tpl~Epartner~SRss_.xml"), - TQString::tqfromLatin1("http://www.faz.net/favicon.ico"), - NewsSourceBase::Magazines, 10, true, false, TQString::tqfromLatin1("de")), + TQString::fromLatin1("FAZ.de"), + TQString::fromLatin1("http://www.faz.net/s/Rub/Tpl~Epartner~SRss_.xml"), + TQString::fromLatin1("http://www.faz.net/favicon.ico"), + NewsSourceBase::Magazines, 10, true, false, TQString::fromLatin1("de")), // Recreation NewsSourceBase::Data( - TQString::tqfromLatin1("Segfault"), - TQString::tqfromLatin1("http://segfault.org/stories.xml"), - TQString::tqfromLatin1("http://segfault.org/favicon.ico"), + TQString::fromLatin1("Segfault"), + TQString::fromLatin1("http://segfault.org/stories.xml"), + TQString::fromLatin1("http://segfault.org/favicon.ico"), NewsSourceBase::Recreation, 10, false, false), // Society NewsSourceBase::Data( - TQString::tqfromLatin1("nippon.it"), - TQString::tqfromLatin1("http://www.nippon.it/backend.it.php"), - TQString::tqfromLatin1("http://www.nippon.it/favicon.ico"), - NewsSourceBase::Society, 10, false, false, TQString::tqfromLatin1("it")), + TQString::fromLatin1("nippon.it"), + TQString::fromLatin1("http://www.nippon.it/backend.it.php"), + TQString::fromLatin1("http://www.nippon.it/favicon.ico"), + NewsSourceBase::Society, 10, false, false, TQString::fromLatin1("it")), NewsSourceBase::Data( - TQString::tqfromLatin1( "gflash" ), - TQString::tqfromLatin1( "http://www.gflash.de/backend.php"), - TQString::tqfromLatin1( "http://www.gflash.de/favicon.ico"), - NewsSourceBase::Society, 10, false, false, TQString::tqfromLatin1( "de" ) ), + TQString::fromLatin1( "gflash" ), + TQString::fromLatin1( "http://www.gflash.de/backend.php"), + TQString::fromLatin1( "http://www.gflash.de/favicon.ico"), + NewsSourceBase::Society, 10, false, false, TQString::fromLatin1( "de" ) ), NewsSourceBase::Data( - TQString::tqfromLatin1( "Quintessenz" ), - TQString::tqfromLatin1( "http://quintessenz.at/cgi-bin/rdf"), - TQString::tqfromLatin1( "http://quintessenz.at/favicon.ico"), - NewsSourceBase::Society, 9, false, false, TQString::tqfromLatin1( "de" ) ) + TQString::fromLatin1( "Quintessenz" ), + TQString::fromLatin1( "http://quintessenz.at/cgi-bin/rdf"), + TQString::fromLatin1( "http://quintessenz.at/favicon.ico"), + NewsSourceBase::Society, 9, false, false, TQString::fromLatin1( "de" ) ) }; ArticleFilter::ArticleFilter(const TQString &action, const TQString &newsSource, @@ -587,13 +587,13 @@ NewsSourceBase *ConfigAccess::newsSource(const TQString &newsSource) nsd.icon = m_cfg->readEntry("Icon"); nsd.maxArticles = m_cfg->readNumEntry("Max articles", 10); nsd.enabled = m_cfg->readBoolEntry("Enabled", true); - nsd.language = m_cfg->readEntry("Language", TQString::tqfromLatin1("C")); + nsd.language = m_cfg->readEntry("Language", TQString::fromLatin1("C")); m_cfg->setGroup("KNewsTicker"); } else for (unsigned int i = 0; i < DEFAULT_NEWSSOURCES; i++) if (NewsSourceDefault[i].name == newsSource) { nsd = NewsSourceDefault[i]; if (nsd.enabled) - nsd.enabled = (nsd.language == TQString::tqfromLatin1("C") || + nsd.enabled = (nsd.language == TQString::fromLatin1("C") || KGlobal::locale()->languageList().contains(nsd.language)); break; } @@ -611,8 +611,8 @@ ArticleFilter ConfigAccess::filter(const unsigned int filterNo) const ArticleFilter f; f.setId(filterNo); - if (m_cfg->hasGroup(TQString::tqfromLatin1("Filter #%1").tqarg(filterNo))) { - m_cfg->setGroup(TQString::tqfromLatin1("Filter #%1").tqarg(filterNo)); + if (m_cfg->hasGroup(TQString::fromLatin1("Filter #%1").tqarg(filterNo))) { + m_cfg->setGroup(TQString::fromLatin1("Filter #%1").tqarg(filterNo)); f.setAction(m_cfg->readEntry("Action", i18n("Show"))); f.setNewsSource(m_cfg->readEntry("News source", i18n("all news sources"))); f.setCondition(m_cfg->readEntry("Condition", i18n("contain"))); @@ -640,7 +640,7 @@ void ConfigAccess::setNewsSource(const NewsSourceBase::Data &ns) void ConfigAccess::setFilter(const ArticleFilter &f) { - m_cfg->setGroup(TQString::tqfromLatin1("Filter #%1").tqarg(f.id())); + m_cfg->setGroup(TQString::fromLatin1("Filter #%1").tqarg(f.id())); m_cfg->writeEntry("Action", f.action()); m_cfg->writeEntry("News source", f.newsSource()); m_cfg->writeEntry("Condition", f.condition()); diff --git a/knewsticker/common/configaccess.h b/knewsticker/common/configaccess.h index 50f42cce..9416e4e4 100644 --- a/knewsticker/common/configaccess.h +++ b/knewsticker/common/configaccess.h @@ -32,9 +32,9 @@ class ArticleFilter { public: typedef TQValueList<int> List; - ArticleFilter(const TQString & = I18N_NOOP(TQString::tqfromLatin1("Show")), - const TQString & = I18N_NOOP(TQString::tqfromLatin1("all newssources")), - const TQString & = I18N_NOOP(TQString::tqfromLatin1("contain")), + ArticleFilter(const TQString & = I18N_NOOP(TQString::fromLatin1("Show")), + const TQString & = I18N_NOOP(TQString::fromLatin1("all newssources")), + const TQString & = I18N_NOOP(TQString::fromLatin1("contain")), const TQString & = TQString(), bool = true); diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp index 398e2f40..3ebb4f19 100644 --- a/knewsticker/common/newsengine.cpp +++ b/knewsticker/common/newsengine.cpp @@ -230,7 +230,7 @@ void ProgramNewsSource::slotProgramExited(KProcess *proc) if (!okSoFar) { TQString output = TQString(m_programOutput->buffer()); if (!output.isEmpty()) { - output = TQString::tqfromLatin1("\"") + output + TQString::tqfromLatin1("\""); + output = TQString::fromLatin1("\"") + output + TQString::fromLatin1("\""); errorMsg += i18n("<p>Program output:<br>%1<br>").tqarg(output); } KMessageBox::detailedError(0, i18n("An error occurred while updating the" diff --git a/knewsticker/common/newsengine.h b/knewsticker/common/newsengine.h index 554b95fb..da3059fd 100644 --- a/knewsticker/common/newsengine.h +++ b/knewsticker/common/newsengine.h @@ -75,7 +75,7 @@ class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public KShared const Subject _subject = Computers, unsigned int _maxArticles = 10, bool _enabled = true, bool _isProgram = false, - const TQString &_language = TQString::tqfromLatin1("C")) + const TQString &_language = TQString::fromLatin1("C")) { name = _name; sourceFile = _sourceFile; diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp index b4a8ab67..c80ecb60 100644 --- a/knewsticker/common/newsiconmgr.cpp +++ b/knewsticker/common/newsiconmgr.cpp @@ -39,7 +39,7 @@ NewsIconMgr *NewsIconMgr::self() NewsIconMgr::NewsIconMgr(TQObject *parent, const char *name) : TQObject(parent, name), DCOPObject("NewsIconMgr"), - m_stdIcon(SmallIcon(TQString::tqfromLatin1("news"))) + m_stdIcon(SmallIcon(TQString::fromLatin1("news"))) { connectDCOPSignal("kded", "favicons", "iconChanged(bool, TQString, TQString)", @@ -85,7 +85,7 @@ void NewsIconMgr::getIcon(const KURL &url) kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data); } else { emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", - TQString::tqfromLatin1("favicons/%1.png").tqarg(url.host())))); + TQString::fromLatin1("favicons/%1.png").tqarg(url.host())))); } } else { KIO::Job *job = KIO::get(url, true, false); @@ -127,13 +127,13 @@ void NewsIconMgr::slotGotIcon(bool isHost, TQString hostOrURL, TQString iconName { KURL url = KURL(hostOrURL); if (!isHost) - url.setProtocol(TQString::tqfromLatin1("http")); + url.setProtocol(TQString::fromLatin1("http")); if (iconName.isNull()) emit gotIcon(url, m_stdIcon); else emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", - TQString::tqfromLatin1("favicons/%1.png").tqarg(url.host())))); + TQString::fromLatin1("favicons/%1.png").tqarg(url.host())))); } TQString NewsIconMgr::favicon(const KURL &url) const diff --git a/knewsticker/common/xmlnewsaccess.cpp b/knewsticker/common/xmlnewsaccess.cpp index 3aff700b..96933414 100644 --- a/knewsticker/common/xmlnewsaccess.cpp +++ b/knewsticker/common/xmlnewsaccess.cpp @@ -60,8 +60,8 @@ void XMLNewsSource::loadFrom(const KURL &url) m_downloadData->open(IO_WriteOnly); KIO::Job *job = KIO::get(url, false, false); - job->addMetaData(TQString::tqfromLatin1("UserAgent"), - TQString::tqfromLatin1("KNewsTicker v0.2")); + job->addMetaData(TQString::fromLatin1("UserAgent"), + TQString::fromLatin1("KNewsTicker v0.2")); connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *))); @@ -104,21 +104,21 @@ void XMLNewsSource::processData(const TQByteArray &data, bool okSoFar) tmpData.setRawData(charData, len); if (validContent = domDoc.setContent(tmpData)) { - TQDomNode channelNode = domDoc.documentElement().namedItem(TQString::tqfromLatin1("channel")); + TQDomNode channelNode = domDoc.documentElement().namedItem(TQString::fromLatin1("channel")); - m_name = channelNode.namedItem(TQString::tqfromLatin1("title")).toElement().text().simplifyWhiteSpace(); + m_name = channelNode.namedItem(TQString::fromLatin1("title")).toElement().text().simplifyWhiteSpace(); kdDebug(5005) << "XMLNewsSource::processData(): Successfully updated " << m_name << endl; - m_link = channelNode.namedItem(TQString::tqfromLatin1("link")).toElement().text().simplifyWhiteSpace(); - m_description = channelNode.namedItem(TQString::tqfromLatin1("description")).toElement().text().simplifyWhiteSpace(); + m_link = channelNode.namedItem(TQString::fromLatin1("link")).toElement().text().simplifyWhiteSpace(); + m_description = channelNode.namedItem(TQString::fromLatin1("description")).toElement().text().simplifyWhiteSpace(); - TQDomNodeList items = domDoc.elementsByTagName(TQString::tqfromLatin1("item")); + TQDomNodeList items = domDoc.elementsByTagName(TQString::fromLatin1("item")); m_articles.clear(); TQDomNode itemNode; TQString headline, address; for (unsigned int i = 0; i < items.count(); i++) { itemNode = items.item(i); - headline = KCharsets::resolveEntities(itemNode.namedItem(TQString::tqfromLatin1("title")).toElement().text().simplifyWhiteSpace()); - address = KCharsets::resolveEntities(itemNode.namedItem(TQString::tqfromLatin1("link")).toElement().text().simplifyWhiteSpace()); + headline = KCharsets::resolveEntities(itemNode.namedItem(TQString::fromLatin1("title")).toElement().text().simplifyWhiteSpace()); + address = KCharsets::resolveEntities(itemNode.namedItem(TQString::fromLatin1("link")).toElement().text().simplifyWhiteSpace()); m_articles.append(XMLNewsArticle(headline, KURL( address ))); } } diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index a23696d5..ff525e3e 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -95,12 +95,12 @@ KNewsTicker::~KNewsTicker() int KNewsTicker::heightForWidth(int) const { - return m_scroller->tqsizeHint().height() + m_arrowButton->height(); + return m_scroller->sizeHint().height() + m_arrowButton->height(); } int KNewsTicker::widthForHeight(int) const { - return m_scroller->tqsizeHint().width() + m_arrowButton->width(); + return m_scroller->sizeHint().width() + m_arrowButton->width(); } void KNewsTicker::preferences() @@ -119,7 +119,7 @@ void KNewsTicker::about() void KNewsTicker::help() { - kapp->invokeHelp(TQString(), TQString::tqfromLatin1("knewsticker")); + kapp->invokeHelp(TQString(), TQString::fromLatin1("knewsticker")); } void KNewsTicker::reportBug() @@ -212,7 +212,7 @@ void KNewsTicker::slotNewsSourceUpdated(const NewsSourceBase::Ptr &ns, if (m_newNews) { KNotifyClient::Instance instance(m_instance); - KNotifyClient::event(winId(), TQString::tqfromLatin1("NewNews")); + KNotifyClient::event(winId(), TQString::fromLatin1("NewNews")); } } @@ -242,12 +242,12 @@ void KNewsTicker::slotArrowButtonPressed() if (position() == KPanelApplet::pTop) { pos.setY(pos.y() + size.height() + 2); } else if (position() == KPanelApplet::pBottom) { - const int y = pos.y() - m_contextMenu->tqsizeHint().height() - 2; + const int y = pos.y() - m_contextMenu->sizeHint().height() - 2; pos.setY(TQMAX(0, y)); } else if (position() == KPanelApplet::pLeft ) { pos.setX(pos.x() + size.width() + 2); } else { // position() == KPanelApplet::pRight - const int x = pos.x() - m_contextMenu->tqsizeHint().width() - 2; + const int x = pos.x() - m_contextMenu->sizeHint().width() - 2; pos.setX(TQMAX(0, x)); } @@ -295,13 +295,13 @@ void KNewsTicker::slotNotifyOfFailures() TQStringList::ConstIterator it = m_failedNewsUpdates.begin(); TQStringList::ConstIterator end = m_failedNewsUpdates.end(); for (; it != end; ++it) - notification += TQString::tqfromLatin1("<li>%1</li>").tqarg(*it); - notification += TQString::tqfromLatin1("</ul></qt>"); + notification += TQString::fromLatin1("<li>%1</li>").tqarg(*it); + notification += TQString::fromLatin1("</ul></qt>"); } else notification = i18n("Failed to update several news" " sites. The Internet connection might be cut."); - KNotifyClient::event(winId(), TQString::tqfromLatin1("InvalidRDF"), notification); + KNotifyClient::event(winId(), TQString::fromLatin1("InvalidRDF"), notification); } void KNewsTicker::setInterval(const uint interval) @@ -417,10 +417,10 @@ void KNewsTickerMenu::populateMenu() * Perhaps this hardcoded stuff should be replaced by some kind of * themeing functionality? */ - const TQPixmap lookIcon = SmallIcon(TQString::tqfromLatin1("viewmag")); - const TQPixmap newArticleIcon = SmallIcon(TQString::tqfromLatin1("info")); - const TQPixmap oldArticleIcon = SmallIcon(TQString::tqfromLatin1("mime_empty")); - const TQPixmap noArticlesIcon = SmallIcon(TQString::tqfromLatin1("remove")); + const TQPixmap lookIcon = SmallIcon(TQString::fromLatin1("viewmag")); + const TQPixmap newArticleIcon = SmallIcon(TQString::fromLatin1("info")); + const TQPixmap oldArticleIcon = SmallIcon(TQString::fromLatin1("mime_empty")); + const TQPixmap noArticlesIcon = SmallIcon(TQString::fromLatin1("remove")); unsigned int articleIdx = 0; const NewsSourceBase::List sources = m_parent->m_newsSources; @@ -467,9 +467,9 @@ void KNewsTickerMenu::populateMenu() if (m_fullMenu) { insertSeparator(); - const TQPixmap logoIcon = SmallIcon(TQString::tqfromLatin1("knewsticker")); - const TQPixmap helpIcon = SmallIcon(TQString::tqfromLatin1("help")); - const TQPixmap confIcon = SmallIcon(TQString::tqfromLatin1("configure")); + const TQPixmap logoIcon = SmallIcon(TQString::fromLatin1("knewsticker")); + const TQPixmap helpIcon = SmallIcon(TQString::fromLatin1("help")); + const TQPixmap confIcon = SmallIcon(TQString::fromLatin1("configure")); insertTitle(logoIcon, i18n("KNewsTicker"), 0, 0); @@ -535,7 +535,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString &configFile) { - KGlobal::locale()->insertCatalogue(TQString::tqfromLatin1("knewsticker")); + KGlobal::locale()->insertCatalogue(TQString::fromLatin1("knewsticker")); return new KNewsTicker(configFile, KPanelApplet::Stretch, KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help | KPanelApplet::ReportBug, diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp index eb07bcbd..261ade52 100644 --- a/knewsticker/knewstickerconfig.cpp +++ b/knewsticker/knewstickerconfig.cpp @@ -42,9 +42,9 @@ CategoryItem::CategoryItem(TQListView *parent, const TQString &text) void CategoryItem::setOpen(bool open) { if (open) - setPixmap(0, SmallIcon(TQString::tqfromLatin1("folder_open"))); + setPixmap(0, SmallIcon(TQString::fromLatin1("folder_open"))); else - setPixmap(0, SmallIcon(TQString::tqfromLatin1("folder"))); + setPixmap(0, SmallIcon(TQString::fromLatin1("folder"))); TQListViewItem::setOpen(open); } @@ -356,10 +356,10 @@ void KNewsTickerConfig::slotNewsSourceContextMenu(KListView *, TQListViewItem *i KPopupMenu *menu = new KPopupMenu(); - TQPixmap addIcon = SmallIcon(TQString::tqfromLatin1("news_subscribe")); - TQPixmap modifyIcon = SmallIcon(TQString::tqfromLatin1("edit")); - TQPixmap removeIcon = SmallIcon(TQString::tqfromLatin1("news_unsubscribe")); - TQPixmap logoIcon = SmallIcon(TQString::tqfromLatin1("knewsticker")); + TQPixmap addIcon = SmallIcon(TQString::fromLatin1("news_subscribe")); + TQPixmap modifyIcon = SmallIcon(TQString::fromLatin1("edit")); + TQPixmap removeIcon = SmallIcon(TQString::fromLatin1("news_unsubscribe")); + TQPixmap logoIcon = SmallIcon(TQString::fromLatin1("knewsticker")); menu->insertTitle(logoIcon, i18n("Edit News Source")); menu->insertItem(addIcon, i18n("&Add News Source"), 0); diff --git a/knewsticker/knewstickerconfigwidget.ui b/knewsticker/knewstickerconfigwidget.ui index 2ad24dd9..72f73171 100644 --- a/knewsticker/knewstickerconfigwidget.ui +++ b/knewsticker/knewstickerconfigwidget.ui @@ -218,7 +218,7 @@ The default value (30 minutes) should be appropriate and reasonable in most case <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -325,7 +325,7 @@ Note that you can also right-click on the list to open a menu which lets you add <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -480,7 +480,7 @@ Note that the filters are processed from the top to the bottom so that of two fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -566,7 +566,7 @@ Note that the filters are processed from the top to the bottom so that of two fi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -629,7 +629,7 @@ Note that the filters are processed from the top to the bottom so that of two fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1114,7 +1114,7 @@ Note that the filters are processed from the top to the bottom so that of two fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp index e992b118..2941ed37 100644 --- a/knewsticker/knewstickerstub/knewstickerstub.cpp +++ b/knewsticker/knewstickerstub/knewstickerstub.cpp @@ -49,7 +49,7 @@ int main(int argc, char **argv) DCOPClient *dcopClient = app.dcopClient(); dcopClient->attach(); - KConfig cfg(TQString::tqfromLatin1("knewsticker_panelappletrc"), false, false); + KConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false); ConfigAccess configFrontend(&cfg); if (args->isSet("addrdf")) { diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp index 7d2a588b..a2de376e 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp @@ -58,8 +58,8 @@ KntSrcFilePropsDlg::KntSrcFilePropsDlg(KPropertiesDialog *props) TQT_SLOT(slotClickedArticle(TQListBoxItem *))); Loader *loader = Loader::create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), - TQT_SLOT(slotConstructUI(Loader *, Document, tqStatus))); + connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + TQT_SLOT(slotConstructUI(Loader *, Document, Status))); loader->loadFrom(props->item()->url(), new FileRetriever); connect(NewsIconMgr::self(), TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), @@ -68,13 +68,13 @@ KntSrcFilePropsDlg::KntSrcFilePropsDlg(KPropertiesDialog *props) m_child->show(); } -void KntSrcFilePropsDlg::slotConstructUI(Loader *, Document doc, tqStatus status) +void KntSrcFilePropsDlg::slotConstructUI(Loader *, Document doc, Status status) { if (status != RSS::Success) return; KURL iconURL = doc.link(); - iconURL.setEncodedPathAndQuery(TQString::tqfromLatin1("/favicon.ico")); + iconURL.setEncodedPathAndQuery(TQString::fromLatin1("/favicon.ico")); NewsIconMgr::self()->getIcon(iconURL); m_child->urlName->setText(doc.title()); @@ -107,7 +107,7 @@ void KntSrcFilePropsDlg::slotClickedArticle(TQListBoxItem *item) TQObject *KntSrcFilePropsFactory::createObject(TQObject *parent, const char *, const char *classname, const TQStringList &) { - if (TQString::tqfromLatin1(classname) == "KPropsDlgPlugin") + if (TQString::fromLatin1(classname) == "KPropsDlgPlugin") { if (!parent->inherits("KPropertiesDialog")) return 0L; diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h index 8a06a7b4..eadd1a9b 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h @@ -26,7 +26,7 @@ namespace RSS { using RSS::Loader; using RSS::Document; -using RSS::tqStatus; +using RSS::Status; class KntSrcFilePropsFactory : public KLibFactory { @@ -48,7 +48,7 @@ class KntSrcFilePropsDlg : public KPropsDlgPlugin protected slots: void slotOpenURL(const TQString &); - void slotConstructUI(Loader *loader, Document doc, tqStatus status); + void slotConstructUI(Loader *loader, Document doc, Status status); void slotGotIcon(const KURL &, const TQPixmap &); void slotClickedArticle(TQListBoxItem *); diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui index 1b589f5e..fa2f0751 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui @@ -38,7 +38,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>63</height> diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp index e92529be..6b1be85f 100644 --- a/knewsticker/newsscroller.cpp +++ b/knewsticker/newsscroller.cpp @@ -150,9 +150,9 @@ NewsScroller::NewsScroller(TQWidget *parent, ConfigAccess *cfg, const char *name reset(); } -TQSize NewsScroller::tqsizeHint() const +TQSize NewsScroller::sizeHint() const { - return TQSize(fontMetrics().width(TQString::tqfromLatin1("X")) * 20, fontMetrics().height() * 2); + return TQSize(fontMetrics().width(TQString::fromLatin1("X")) * 20, fontMetrics().height() * 2); } TQSizePolicy NewsScroller::sizePolicy() const @@ -178,14 +178,14 @@ void NewsScroller::dropEvent(TQDropEvent* event) // <HACK> // This is just for http://www.webreference.com/services/news/ newSourceUrl = newSourceUrl.replace(TQRegExp( - TQString::tqfromLatin1("^view-source:http%3A//")), - TQString::tqfromLatin1("http://")); + TQString::fromLatin1("^view-source:http%3A//")), + TQString::fromLatin1("http://")); // </HACK> newSourceUrl = newSourceUrl.stripWhiteSpace(); if (!isHeadline(newSourceUrl) && KMessageBox::questionYesNo(this, i18n("<p>Do you really want to add '%1' to" " the list of news sources?</p>") .tqarg(newSourceUrl), TQString(), i18n("Add"), KStdGuiItem::cancel()) == KMessageBox::Yes) { - KConfig cfg(TQString::tqfromLatin1("knewsticker_panelappletrc"), false, false); + KConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false); ConfigAccess configFrontend(&cfg); TQStringList newsSources = configFrontend.newsSources(); @@ -440,7 +440,7 @@ void NewsScroller::reset(bool bSeparatorOnly) if (m_cfg->scrollingSpeed()) m_scrollTimer->start(speedAsInterval(m_cfg->scrollingSpeed())); - TQString sep = m_headlines.isEmpty() ? i18n(" +++ No News Available +++") : TQString::tqfromLatin1(" +++ "); + TQString sep = m_headlines.isEmpty() ? i18n(" +++ No News Available +++") : TQString::fromLatin1(" +++ "); int w = fontMetrics().width(sep); int h = fontMetrics().height(); diff --git a/knewsticker/newsscroller.h b/knewsticker/newsscroller.h index b05d9d2e..d7800e39 100644 --- a/knewsticker/newsscroller.h +++ b/knewsticker/newsscroller.h @@ -36,7 +36,7 @@ class NewsScroller : public TQFrame public: NewsScroller(TQWidget *, ConfigAccess *, const char * = 0); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual TQSizePolicy sizePolicy() const; // Convenience stuff. Somehow ugly, no? diff --git a/knewsticker/newssourcedlgimpl.cpp b/knewsticker/newssourcedlgimpl.cpp index e78321c7..e5c50090 100644 --- a/knewsticker/newssourcedlgimpl.cpp +++ b/knewsticker/newssourcedlgimpl.cpp @@ -56,7 +56,7 @@ SuggestProgressDlg::SuggestProgressDlg(const KURL &url, TQWidget *parent, const if (url.isLocalFile()) u = TQString(); else - u.setEncodedPathAndQuery(TQString::tqfromLatin1("/favicon.ico")); + u.setEncodedPathAndQuery(TQString::fromLatin1("/favicon.ico")); NewsIconMgr::self()->getIcon(u); } @@ -138,12 +138,12 @@ void NewsSourceDlgImpl::slotOkClicked() KURL iconURL ( leIcon->text() ); if (iconURL.protocol().isEmpty()) - if (iconURL.host().startsWith(TQString::tqfromLatin1("ftp."))) - iconURL.setProtocol(TQString::tqfromLatin1("ftp")); - else if (iconURL.host().startsWith(TQString::tqfromLatin1("www."))) - iconURL.setProtocol(TQString::tqfromLatin1("http")); + if (iconURL.host().startsWith(TQString::fromLatin1("ftp."))) + iconURL.setProtocol(TQString::fromLatin1("ftp")); + else if (iconURL.host().startsWith(TQString::fromLatin1("www."))) + iconURL.setProtocol(TQString::fromLatin1("http")); else - iconURL.setProtocol(TQString::tqfromLatin1("file")); + iconURL.setProtocol(TQString::fromLatin1("file")); NewsSourceBase::Data nsd(leName->text(), url.url(), iconURL.url(), subject, sbMaxArticles->value(), true, cbProgram->isChecked()); @@ -191,7 +191,7 @@ void NewsSourceDlgImpl::setup(const NewsSourceBase::Data &nsd, bool modify) comboCategory->setCurrentItem(nsd.subject); sbMaxArticles->setValue(nsd.maxArticles); KURL iconURL ( nsd.icon ); - if (iconURL.protocol() == TQString::tqfromLatin1("file")) + if (iconURL.protocol() == TQString::fromLatin1("file")) iconURL.setProtocol(TQString()); leIcon->setText(iconURL.url()); NewsIconMgr::self()->getIcon(iconURL); @@ -205,10 +205,10 @@ KURL NewsSourceDlgImpl::polishedURL(const KURL &url) const KURL newURL = url; if (url.protocol().isEmpty()) - if (url.url().startsWith(TQString::tqfromLatin1("ftp"))) - newURL = TQString::tqfromLatin1("ftp://") + url.url(); + if (url.url().startsWith(TQString::fromLatin1("ftp"))) + newURL = TQString::fromLatin1("ftp://") + url.url(); else - newURL = TQString::tqfromLatin1("http://") + url.url(); + newURL = TQString::fromLatin1("http://") + url.url(); return newURL; } @@ -222,7 +222,7 @@ bool NewsSourceDlgImpl::validateURL(const KURL &url) return false; } - if (!url.isValid() || !url.hasPath() || url.encodedPathAndQuery() == TQString::tqfromLatin1("/")) { + if (!url.isValid() || !url.hasPath() || url.encodedPathAndQuery() == TQString::fromLatin1("/")) { KMessageBox::error(this, i18n("KNewsTicker needs a valid RDF or RSS file to" " suggest sensible values. The specified source file is invalid."), i18n("Invalid Source File")); diff --git a/kopete/KABC_INTEG_NOTES b/kopete/KABC_INTEG_NOTES index 6bcc7f95..f249f22c 100644 --- a/kopete/KABC_INTEG_NOTES +++ b/kopete/KABC_INTEG_NOTES @@ -414,7 +414,7 @@ A "reply-by-IM" action in KMail such as things could be done. but how? The application could know if this user is registered to an IM by looking at messaging fields -But how to use such as information available only at runtime, like the tqStatus. +But how to use such as information available only at runtime, like the Status. 1) Saving the status to KABC --the problem is that the status can not be reseted to offline if kopete crashed diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui index 9fc65382..546e35fd 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui @@ -12,7 +12,7 @@ <height>464</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>70</height> @@ -92,7 +92,7 @@ <property name="name"> <cstring>protocolListView</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>300</height> diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui index 67fa86da..9b5a872a 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui @@ -86,7 +86,7 @@ for account:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>21</height> @@ -116,7 +116,7 @@ for account:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>58</height> diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui index a3688a6c..3dc51ca5 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui @@ -88,7 +88,7 @@ for account:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>21</height> @@ -118,7 +118,7 @@ for account:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>58</height> diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp index 9332204e..1db29412 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp @@ -96,7 +96,7 @@ AddContactWizard::AddContactWizard( TQWidget *parent, const char *name ) for(Kopete::Account *i=accounts.first() ; i; i=accounts.next() ) { accountLVI= new TQCheckListItem( protocolListView, i->accountLabel(), TQCheckListItem::CheckBox); - accountLVI->setText(1,i->protocol()->displayName() + TQString::tqfromLatin1(" ") ); + accountLVI->setText(1,i->protocol()->displayName() + TQString::fromLatin1(" ") ); //FIXME - I'm not sure the column 1 is a right place for the colored icon -Olivier accountLVI->setPixmap( 1, i->accountIcon() ); m_accountItems.insert(accountLVI,i); diff --git a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui index 550e285f..bbc2e72b 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui +++ b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>425</width> <height>20</height> @@ -139,7 +139,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>91</height> @@ -215,7 +215,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>65</height> @@ -293,7 +293,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>407</width> <height>16</height> @@ -389,7 +389,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -456,7 +456,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>205</height> diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp b/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp index ecddf632..efc633b4 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp @@ -41,7 +41,7 @@ FastAddContactWizard::FastAddContactWizard( TQWidget *parent, const char *name ) for(Kopete::Account *i=accounts.first() ; i; i=accounts.next() ) { accountLVI= new TQListViewItem( protocolListView, i->accountLabel() ); - accountLVI->setText(1,i->protocol()->displayName() + TQString::tqfromLatin1(" ") ); + accountLVI->setText(1,i->protocol()->displayName() + TQString::fromLatin1(" ") ); accountLVI->setPixmap( 1, SmallIcon( i->protocol()->pluginIcon() ) ); m_accountItems.insert(accountLVI,i); } diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui index d5545eaf..951bdbff 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>211</width> <height>61</height> diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp index c87d7bda..f7675a44 100644 --- a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp +++ b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp @@ -54,9 +54,9 @@ public: { if( TQListViewItem *item = m_listView->itemAt( pos ) ) { - TQRect tqitemRect = m_listView->tqitemRect( item ); - if( tqitemRect.contains( pos ) ) - tip( tqitemRect, static_cast<ContactItem*>( item )->contact()->toolTip() ); + TQRect itemRect = m_listView->itemRect( item ); + if( itemRect.contains( pos ) ) + tip( itemRect, static_cast<ContactItem*>( item )->contact()->toolTip() ); } } @@ -81,7 +81,7 @@ ChatMembersListWidget::ContactItem::ContactItem( ChatMembersListWidget *parent, connect( m_contact, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; - settqStatus( parent->session()->contactOnlineStatus(m_contact) ); + setStatus( parent->session()->contactOnlineStatus(m_contact) ); reposition(); } @@ -95,7 +95,7 @@ void ChatMembersListWidget::ContactItem::slotPropertyChanged( Kopete::Contact*, } } -void ChatMembersListWidget::ContactItem::settqStatus( const Kopete::OnlineStatus &status ) +void ChatMembersListWidget::ContactItem::setStatus( const Kopete::OnlineStatus &status ) { setPixmap( 0, status.iconFor( m_contact ) ); reposition(); @@ -200,7 +200,7 @@ void ChatMembersListWidget::slotContactRemoved( const Kopete::Contact *contact ) void ChatMembersListWidget::slotContactStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &status ) { if ( m_members.contains( contact ) ) - m_members[contact]->settqStatus( status ); + m_members[contact]->setStatus( status ); } void ChatMembersListWidget::slotExecute( TQListViewItem *item ) @@ -249,7 +249,7 @@ TQDragObject *ChatMembersListWidget::dragObject() } } - drag->setPixmap( c->onlinetqStatus().iconFor(c, 12) ); + drag->setPixmap( c->onlineStatus().iconFor(c, 12) ); return drag; } diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.h b/kopete/kopete/chatwindow/chatmemberslistwidget.h index 322dc807..83744110 100644 --- a/kopete/kopete/chatwindow/chatmemberslistwidget.h +++ b/kopete/kopete/chatwindow/chatmemberslistwidget.h @@ -111,7 +111,7 @@ private: friend class ChatMembersListWidget; void reposition(); - void settqStatus( const Kopete::OnlineStatus &status ); + void setStatus( const Kopete::OnlineStatus &status ); Kopete::Contact *m_contact; }; diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index 6336185c..bb6cb1fc 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -263,8 +263,8 @@ ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, co d->saveAction = KStdAction::saveAs( this, TQT_SLOT(save()), actionCollection() ); d->printAction = KStdAction::print( this, TQT_SLOT(print()),actionCollection() ); d->closeAction = KStdAction::close( this, TQT_SLOT(slotCloseView()),actionCollection() ); - d->importEmoticon = new KAction( i18n( "Import Emoticon"), TQString::tqfromLatin1( "importemot" ), 0, this, TQT_SLOT( slotImportEmoticon() ), actionCollection() ); - d->copyURLAction = new KAction( i18n( "Copy Link Address" ), TQString::tqfromLatin1( "editcopy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() ); + d->importEmoticon = new KAction( i18n( "Import Emoticon"), TQString::fromLatin1( "importemot" ), 0, this, TQT_SLOT( slotImportEmoticon() ), actionCollection() ); + d->copyURLAction = new KAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() ); // read formatting override flags readOverrides(); @@ -335,7 +335,7 @@ void ChatMessagePart::slotImportEmoticon() void ChatMessagePart::save() { - KFileDialog dlg( TQString(), TQString::tqfromLatin1( "text/html text/plain" ), view(), "fileSaveDialog", false ); + KFileDialog dlg( TQString(), TQString::fromLatin1( "text/html text/plain" ), view(), "fileSaveDialog", false ); dlg.setCaption( i18n( "Save Conversation" ) ); dlg.setOperationMode( KFileDialog::Saving ); @@ -350,7 +350,7 @@ void ChatMessagePart::save() TQTextStream stream ( file ); stream.setEncoding(TQTextStream::UnicodeUTF8); - if ( dlg.currentFilter() == TQString::tqfromLatin1( "text/plain" ) ) + if ( dlg.currentFilter() == TQString::fromLatin1( "text/plain" ) ) { TQValueList<Kopete::Message>::ConstIterator it, itEnd = d->allMessages.constEnd(); for(it = d->allMessages.constBegin(); it != itEnd; ++it) @@ -392,7 +392,7 @@ void ChatMessagePart::pageDown() void ChatMessagePart::slotOpenURLRequest(const KURL &url, const KParts::URLArgs &/*args*/) { kdDebug(14000) << k_funcinfo << "url=" << url.url() << endl; - if ( url.protocol() == TQString::tqfromLatin1("kopetemessage") ) + if ( url.protocol() == TQString::fromLatin1("kopetemessage") ) { Kopete::Contact *contact = d->manager->account()->contacts()[ url.host() ]; if ( contact ) @@ -634,7 +634,7 @@ const TQString ChatMessagePart::styleHTML() const fontSizeCss = TQString::fromUtf8("%1px;").tqarg(fontSize); } - TQString style = TQString::tqfromLatin1( + TQString style = TQString::fromLatin1( "body{background-color:%1;font-family:%2;font-size:%3;color:%4}" "td{font-family:%5;font-size:%6;color:%7}" "a{color:%8}a.visited{color:%9}" @@ -727,7 +727,7 @@ void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point ) chatWindowPopup->setItemEnabled( 1, false ); chatWindowPopup->insertSeparator(); } - else if ( d->activeElement.tagName().lower() == TQString::tqfromLatin1( "a" ) ) + else if ( d->activeElement.tagName().lower() == TQString::fromLatin1( "a" ) ) { d->copyURLAction->plug( chatWindowPopup ); chatWindowPopup->insertSeparator(); @@ -1024,7 +1024,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const protocolIcon = KGlobal::iconLoader()->iconPath( iconName, KIcon::Small ); - nickLink=TQString::tqfromLatin1("<a href=\"kopetemessage://%1/?protocolId=%2&accountId=%3\" class=\"KopeteDisplayName\">") + nickLink=TQString::fromLatin1("<a href=\"kopetemessage://%1/?protocolId=%2&accountId=%3\" class=\"KopeteDisplayName\">") .tqarg( TQStyleSheet::escape(message.from()->contactId()).replace('"',"""), TQStyleSheet::escape(message.from()->protocol()->pluginId()).replace('"',"""), TQStyleSheet::escape(message.from()->account()->accountId() ).replace('"',""")); @@ -1186,14 +1186,14 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) // Replace %destinationName% resultHTML = resultHTML.replace( TQString::fromUtf8("%destinationName%"), formatName(destinationName) ); // For %timeOpened%, display the date and time (also the seconds). - resultHTML = resultHTML.replace( TQString::fromUtf8("%timeOpened%"), KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true, true ) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%timeOpened%"), KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ); // Look for %timeOpened{X}% TQRegExp timeRegExp("%timeOpened\\{([^}]*)\\}%"); int pos=0; while( (pos=timeRegExp.search(resultHTML, pos) ) != -1 ) { - TQString timeKeyword = formatTime( timeRegExp.cap(1), TQDateTime::tqcurrentDateTime() ); + TQString timeKeyword = formatTime( timeRegExp.cap(1), TQDateTime::currentDateTime() ); resultHTML = resultHTML.replace( pos , timeRegExp.cap(0).length() , timeKeyword ); } // Get contact image paths diff --git a/kopete/kopete/chatwindow/chattexteditpart.cpp b/kopete/kopete/chatwindow/chattexteditpart.cpp index 1cb9ddf3..191e7b01 100644 --- a/kopete/kopete/chatwindow/chattexteditpart.cpp +++ b/kopete/kopete/chatwindow/chattexteditpart.cpp @@ -130,8 +130,8 @@ void ChatTextEditPart::complete() if ( parIdx > 0 ) { - int firstSpace = txt.findRev( TQRegExp( TQString::tqfromLatin1("\\s\\S+") ), parIdx - 1 ) + 1; - int lastSpace = txt.find( TQRegExp( TQString::tqfromLatin1("[\\s\\:]") ), firstSpace ); + int firstSpace = txt.findRev( TQRegExp( TQString::fromLatin1("\\s\\S+") ), parIdx - 1 ) + 1; + int lastSpace = txt.find( TQRegExp( TQString::fromLatin1("[\\s\\:]") ), firstSpace ); if( lastSpace == -1 ) lastSpace = txt.length(); @@ -158,7 +158,7 @@ void ChatTextEditPart::complete() if ( para == 0 && firstSpace == 0 && rightText[0] != TQChar(':') ) { - rightText = match + TQString::tqfromLatin1(": ") + rightText; + rightText = match + TQString::fromLatin1(": ") + rightText; parIdx += 2; } else @@ -245,11 +245,11 @@ bool ChatTextEditPart::canSend() return true; } -void ChatTextEditPart::slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &newtqStatus, const Kopete::OnlineStatus &oldtqStatus ) +void ChatTextEditPart::slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &newStatus, const Kopete::OnlineStatus &oldStatus ) { //FIXME: should use signal contact->isReachableChanged, but it doesn't exist ;( - if ( ( oldtqStatus.status() == Kopete::OnlineStatus::Offline ) - != ( newtqStatus.status() == Kopete::OnlineStatus::Offline ) ) + if ( ( oldStatus.status() == Kopete::OnlineStatus::Offline ) + != ( newStatus.status() == Kopete::OnlineStatus::Offline ) ) { emit canSendChanged( canSend() ); } @@ -262,7 +262,7 @@ void ChatTextEditPart::sendMessage() if ( txt.isEmpty() || txt == "\n" ) return; - if ( m_lastMatch.isNull() && ( txt.find( TQRegExp( TQString::tqfromLatin1("^\\w+:\\s") ) ) > -1 ) ) + if ( m_lastMatch.isNull() && ( txt.find( TQRegExp( TQString::fromLatin1("^\\w+:\\s") ) ) > -1 ) ) { //no last match and it finds something of the form of "word:" at the start of a line TQString search = txt.left( txt.find(':') ); if( !search.isEmpty() ) diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp index 0ec5e8ad..69a34495 100644 --- a/kopete/kopete/chatwindow/chatview.cpp +++ b/kopete/kopete/chatwindow/chatview.cpp @@ -81,7 +81,7 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch m_mainWindow = 0L; membersDock = 0L; - memberstqStatus = Smart; + membersStatus = Smart; m_tabState = Normal; @@ -89,8 +89,8 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch hide(); //Create the view dock widget (KHTML Part), and set it to no docking (lock it in place) - viewDock = createDockWidget(TQString::tqfromLatin1( "viewDock" ), TQPixmap(), - 0L,TQString::tqfromLatin1("viewDock"), TQString::tqfromLatin1(" ")); + viewDock = createDockWidget(TQString::fromLatin1( "viewDock" ), TQPixmap(), + 0L,TQString::fromLatin1("viewDock"), TQString::fromLatin1(" ")); m_messagePart = new ChatMessagePart( mgr, viewDock, "m_messagePart" ); viewDock->setWidget(messagePart()->widget()); @@ -98,8 +98,8 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch viewDock->setEnableDocking(KDockWidget::DockNone); //Create the bottom dock widget, with the edit area, statusbar and send button - editDock = createDockWidget( TQString::tqfromLatin1( "editDock" ), TQPixmap(), - 0L, TQString::tqfromLatin1("editDock"), TQString::tqfromLatin1(" ") ); + editDock = createDockWidget( TQString::fromLatin1( "editDock" ), TQPixmap(), + 0L, TQString::fromLatin1("editDock"), TQString::fromLatin1(" ") ); m_editPart = new ChatTextEditPart( mgr, editDock, "kopeterichtexteditpart" ); // FIXME: is this used these days? it seems totally unnecessary @@ -354,21 +354,21 @@ bool ChatView::closeView( bool force ) response = KMessageBox::warningContinueCancel( this, i18n("<qt>You are about to leave the group chat session <b>%1</b>.<br>" "You will not receive future messages from this conversation.</qt>").tqarg( shortCaption ), i18n( "Closing Group Chat" ), - i18n( "Cl&ose Chat" ), TQString::tqfromLatin1( "AskCloseGroupChat" ) ); + i18n( "Cl&ose Chat" ), TQString::fromLatin1( "AskCloseGroupChat" ) ); } if ( !unreadMessageFrom.isNull() && ( response == KMessageBox::Continue ) ) { response = KMessageBox::warningContinueCancel( this, i18n("<qt>You have received a message from <b>%1</b> in the last " "second. Are you sure you want to close this chat?</qt>").tqarg( unreadMessageFrom ), i18n( "Unread Message" ), - i18n( "Cl&ose Chat" ), TQString::tqfromLatin1("AskCloseChatRecentMessage" ) ); + i18n( "Cl&ose Chat" ), TQString::fromLatin1("AskCloseChatRecentMessage" ) ); } if ( d->sendInProgress && ( response == KMessageBox::Continue ) ) { response = KMessageBox::warningContinueCancel( this, i18n( "You have a message send in progress, which will be " "aborted if this chat is closed. Are you sure you want to close this chat?" ), i18n( "Message in Transit" ), - i18n( "Cl&ose Chat" ), TQString::tqfromLatin1( "AskCloseChatMessageInProgress" ) ); + i18n( "Cl&ose Chat" ), TQString::fromLatin1( "AskCloseChatMessageInProgress" ) ); } } @@ -418,8 +418,8 @@ void ChatView::createMembersList() if ( !membersDock ) { //Create the chat members list - membersDock = createDockWidget( TQString::tqfromLatin1( "membersDock" ), TQPixmap(), 0L, - TQString::tqfromLatin1( "membersDock" ), TQString::tqfromLatin1( " " ) ); + membersDock = createDockWidget( TQString::fromLatin1( "membersDock" ), TQPixmap(), 0L, + TQString::fromLatin1( "membersDock" ), TQString::fromLatin1( " " ) ); m_membersList = new ChatMembersListWidget( m_manager, this, "m_membersList" ); membersDock->setWidget( m_membersList ); @@ -428,21 +428,21 @@ void ChatView::createMembersList() if ( members.first() && members.first()->metaContact() != 0 ) { - memberstqStatus = static_cast<MembersListPolicy> + membersStatus = static_cast<MembersListPolicy> ( members.first()->metaContact()->pluginData - ( m_manager->protocol(), TQString::tqfromLatin1( "MembersListPolicy" ) ).toInt() + ( m_manager->protocol(), TQString::fromLatin1( "MembersListPolicy" ) ).toInt() ); } else { - memberstqStatus = Smart; + membersStatus = Smart; } - if( memberstqStatus == Smart ) + if( membersStatus == Smart ) d->visibleMembers = ( m_manager->members().count() > 1 ); else - d->visibleMembers = ( memberstqStatus == Visible ); + d->visibleMembers = ( membersStatus == Visible ); placeMembersList( membersDockPosition ); } @@ -453,13 +453,13 @@ void ChatView::toggleMembersVisibility() if( membersDock ) { d->visibleMembers = !d->visibleMembers; - memberstqStatus = d->visibleMembers ? Visible : Hidden; + membersStatus = d->visibleMembers ? Visible : Hidden; placeMembersList( membersDockPosition ); Kopete::ContactPtrList members = m_manager->members(); if ( members.first()->metaContact() ) { members.first()->metaContact()->setPluginData( m_manager->protocol(), - TQString::tqfromLatin1( "MembersListPolicy" ), TQString::number(memberstqStatus) ); + TQString::fromLatin1( "MembersListPolicy" ), TQString::number(membersStatus) ); } //refreshView(); } @@ -467,7 +467,7 @@ void ChatView::toggleMembersVisibility() void ChatView::placeMembersList( KDockWidget::DockPosition dp ) { -// kdDebug(14000) << k_funcinfo << "Members list policy " << memberstqStatus << +// kdDebug(14000) << k_funcinfo << "Members list policy " << membersStatus << // ", visible " << d->visibleMembers << endl; if ( d->visibleMembers ) @@ -476,17 +476,17 @@ void ChatView::placeMembersList( KDockWidget::DockPosition dp ) // look up the dock width int dockWidth; - KGlobal::config()->setGroup( TQString::tqfromLatin1( "ChatViewDock" ) ); + KGlobal::config()->setGroup( TQString::fromLatin1( "ChatViewDock" ) ); if( membersDockPosition == KDockWidget::DockLeft ) { dockWidth = KGlobal::config()->readNumEntry( - TQString::tqfromLatin1( "membersDock,viewDock:sepPos" ), 30); + TQString::fromLatin1( "membersDock,viewDock:sepPos" ), 30); } else { dockWidth = KGlobal::config()->readNumEntry( - TQString::tqfromLatin1( "viewDock,membersDock:sepPos" ), 70); + TQString::fromLatin1( "viewDock,membersDock:sepPos" ), 70); } // Make sure it is shown then place it wherever @@ -550,7 +550,7 @@ void ChatView::remoteTyping( const Kopete::Contact *contact, bool isTyping ) setStatusText( i18n( "%1 is typing a message" ).tqarg( typingList.first() ) ); else { - TQString statusTyping = typingList.join( TQString::tqfromLatin1( ", " ) ); + TQString statusTyping = typingList.join( TQString::fromLatin1( ", " ) ); setStatusText( i18n( "%1 is a list of names", "%1 are typing a message" ).tqarg( statusTyping ) ); } updateChatState( Typing ); @@ -565,7 +565,7 @@ void ChatView::setStatusText( const TQString &status ) { d->statusText = status; if ( d->isActive ) - m_mainWindow->settqStatus( status ); + m_mainWindow->setStatus( status ); } const TQString& ChatView::statusText() @@ -633,7 +633,7 @@ void ChatView::slotContactAdded(const Kopete::Contact *contact, bool suppress) if( !suppress && m_manager->members().count() > 1 ) sendInternalMessage( i18n("%1 has joined the chat.").tqarg(contactName) ); - if( memberstqStatus == Smart && membersDock ) + if( membersStatus == Smart && membersDock ) { bool shouldShowMembers = ( m_manager->members().count() > 1); if( shouldShowMembers != d->visibleMembers ) @@ -711,7 +711,7 @@ void ChatView::setCaption( const TQString &text, bool modified ) //Call the original set caption KDockMainWindow::setCaption( newCaption, false ); - emit updateChatTooltip( this, TQString::tqfromLatin1("<qt>%1</qt>").tqarg( d->captionText ) ); + emit updateChatTooltip( this, TQString::fromLatin1("<qt>%1</qt>").tqarg( d->captionText ) ); emit updateChatLabel( this, newCaption ); //Blink icon if modified and not active if( !d->isActive && modified ) @@ -773,18 +773,18 @@ void ChatView::slotToggleRtfToolbar( bool enabled ) emit rtfEnabled( this, enabled ); } -void ChatView::slotContactStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &newtqStatus, const Kopete::OnlineStatus &oldtqStatus ) +void ChatView::slotContactStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &newStatus, const Kopete::OnlineStatus &oldStatus ) { kdDebug(14000) << k_funcinfo << contact << endl; - bool inhibitNotification = ( newtqStatus.status() == Kopete::OnlineStatus::Unknown || - oldtqStatus.status() == Kopete::OnlineStatus::Unknown ); + bool inhibitNotification = ( newStatus.status() == Kopete::OnlineStatus::Unknown || + oldStatus.status() == Kopete::OnlineStatus::Unknown ); if ( contact && KopetePrefs::prefs()->showEvents() && !inhibitNotification ) { if ( contact->account() && contact == contact->account()->myself() ) { // Separate notification for the 'self' contact - if ( newtqStatus.status() != Kopete::OnlineStatus::Connecting ) - sendInternalMessage( i18n( "You are now marked as %1." ).tqarg( newtqStatus.description() ) ); + if ( newStatus.status() != Kopete::OnlineStatus::Connecting ) + sendInternalMessage( i18n( "You are now marked as %1." ).tqarg( newStatus.description() ) ); } else if ( !contact->account() || !contact->account()->suppressStatusNotification() ) { @@ -792,13 +792,13 @@ void ChatView::slotContactStatusChanged( Kopete::Contact *contact, const Kopete: if ( contact->metaContact() && contact->metaContact() != Kopete::ContactList::self()->myself() ) { sendInternalMessage( i18n( "%2 is now %1." ) - .tqarg( newtqStatus.description(), contact->metaContact()->displayName() ) ); + .tqarg( newStatus.description(), contact->metaContact()->displayName() ) ); } else { TQString nick=contact->nickName(); sendInternalMessage( i18n( "%2 is now %1." ) - .tqarg( newtqStatus.description(), nick ) ); + .tqarg( newStatus.description(), nick ) ); } } } @@ -835,9 +835,9 @@ void ChatView::saveOptions() { KConfig *config = KGlobal::config(); - writeDockConfig ( config, TQString::tqfromLatin1( "ChatViewDock" ) ); - config->setGroup( TQString::tqfromLatin1( "ChatViewDock" ) ); - config->writeEntry( TQString::tqfromLatin1( "membersDockPosition" ), membersDockPosition ); + writeDockConfig ( config, TQString::fromLatin1( "ChatViewDock" ) ); + config->setGroup( TQString::fromLatin1( "ChatViewDock" ) ); + config->writeEntry( TQString::fromLatin1( "membersDockPosition" ), membersDockPosition ); saveChatSettings(); config->sync(); } @@ -859,7 +859,7 @@ void ChatView::saveChatSettings() KConfig* config = KGlobal::config(); - TQString contactListGroup = TQString::tqfromLatin1("chatwindow_") + + TQString contactListGroup = TQString::fromLatin1("chatwindow_") + mc->metaContactId(); config->setGroup( contactListGroup ); @@ -875,7 +875,7 @@ void ChatView::loadChatSettings() return; //can't load with more than one other person in the chat //read settings for metacontact - TQString contactListGroup = TQString::tqfromLatin1("chatwindow_") + + TQString contactListGroup = TQString::fromLatin1("chatwindow_") + contacts.first()->metaContact()->metaContactId(); KConfig* config = KGlobal::config(); config->setGroup( contactListGroup ); @@ -891,24 +891,24 @@ void ChatView::readOptions() KConfig *config = KGlobal::config(); /** THIS IS BROKEN !!! */ - //dockManager->readConfig ( config, TQString::tqfromLatin1("ChatViewDock") ); + //dockManager->readConfig ( config, TQString::fromLatin1("ChatViewDock") ); //Work-around to restore dock widget positions - config->setGroup( TQString::tqfromLatin1( "ChatViewDock" ) ); + config->setGroup( TQString::fromLatin1( "ChatViewDock" ) ); membersDockPosition = static_cast<KDockWidget::DockPosition>( - config->readNumEntry( TQString::tqfromLatin1( "membersDockPosition" ), KDockWidget::DockRight ) ); + config->readNumEntry( TQString::fromLatin1( "membersDockPosition" ), KDockWidget::DockRight ) ); - TQString dockKey = TQString::tqfromLatin1( "viewDock" ); + TQString dockKey = TQString::fromLatin1( "viewDock" ); if ( d->visibleMembers ) { if( membersDockPosition == KDockWidget::DockLeft ) - dockKey.prepend( TQString::tqfromLatin1( "membersDock," ) ); + dockKey.prepend( TQString::fromLatin1( "membersDock," ) ); else if( membersDockPosition == KDockWidget::DockRight ) - dockKey.append( TQString::tqfromLatin1( ",membersDock" ) ); + dockKey.append( TQString::fromLatin1( ",membersDock" ) ); } - dockKey.append( TQString::tqfromLatin1( ",editDock:sepPos" ) ); + dockKey.append( TQString::fromLatin1( ",editDock:sepPos" ) ); //kdDebug(14000) << k_funcinfo << "reading splitterpos from key: " << dockKey << endl; int splitterPos = config->readNumEntry( dockKey, 70 ); editDock->manualDock( viewDock, KDockWidget::DockBottom, splitterPos ); @@ -937,7 +937,7 @@ void ChatView::dragEnterEvent ( TQDragEnterEvent * event ) { if( event->provides( "kopete/x-contact" ) ) { - TQStringList lst=TQStringList::split( TQChar( 0xE000 ) , TQString::fromUtf8(event->tqencodedData ( "kopete/x-contact" )) ); + TQStringList lst=TQStringList::split( TQChar( 0xE000 ) , TQString::fromUtf8(event->encodedData ( "kopete/x-contact" )) ); if(m_manager->mayInvite() && m_manager->protocol()->pluginId() == lst[0] && m_manager->account()->accountId() == lst[1]) { TQString contact=lst[2]; @@ -959,7 +959,7 @@ void ChatView::dragEnterEvent ( TQDragEnterEvent * event ) } else if( event->provides( "kopete/x-metacontact" ) ) { - TQString metacontactID=TQString::fromUtf8(event->tqencodedData ( "kopete/x-metacontact" )); + TQString metacontactID=TQString::fromUtf8(event->encodedData ( "kopete/x-metacontact" )); Kopete::MetaContact *m=Kopete::ContactList::self()->metaContact(metacontactID); if( m && m_manager->mayInvite()) @@ -993,7 +993,7 @@ void ChatView::dropEvent ( TQDropEvent * event ) { if( event->provides( "kopete/x-contact" ) ) { - TQStringList lst=TQStringList::split( TQChar( 0xE000 ) , TQString::fromUtf8(event->tqencodedData ( "kopete/x-contact" )) ); + TQStringList lst=TQStringList::split( TQChar( 0xE000 ) , TQString::fromUtf8(event->encodedData ( "kopete/x-contact" )) ); if(m_manager->mayInvite() && m_manager->protocol()->pluginId() == lst[0] && m_manager->account()->accountId() == lst[1]) { TQString contact=lst[2]; @@ -1014,7 +1014,7 @@ void ChatView::dropEvent ( TQDropEvent * event ) } else if( event->provides( "kopete/x-metacontact" ) ) { - TQString metacontactID=TQString::fromUtf8(event->tqencodedData ( "kopete/x-metacontact" )); + TQString metacontactID=TQString::fromUtf8(event->encodedData ( "kopete/x-metacontact" )); Kopete::MetaContact *m=Kopete::ContactList::self()->metaContact(metacontactID); if(m && m_manager->mayInvite()) { diff --git a/kopete/kopete/chatwindow/chatview.h b/kopete/kopete/chatwindow/chatview.h index 29aa5d17..f7ec6f76 100644 --- a/kopete/kopete/chatwindow/chatview.h +++ b/kopete/kopete/chatwindow/chatview.h @@ -382,7 +382,7 @@ private: // position and visibility of the chat member list KDockWidget::DockPosition membersDockPosition; enum MembersListPolicy { Smart = 0, Visible = 1, Hidden = 2 }; - MembersListPolicy memberstqStatus; + MembersListPolicy membersStatus; // miscellany TQPtrDict<TQTimer> m_remoteTypingMap; diff --git a/kopete/kopete/chatwindow/emoticonselector.cpp b/kopete/kopete/chatwindow/emoticonselector.cpp index 3d8f1bbf..e86d08a4 100644 --- a/kopete/kopete/chatwindow/emoticonselector.cpp +++ b/kopete/kopete/chatwindow/emoticonselector.cpp @@ -37,7 +37,7 @@ EmoticonLabel::EmoticonLabel(const TQString &emoticonText, const TQString &pixma { mText = emoticonText; setMovie( TQMovie(pixmapPath) ); - tqsetAlignment(TQt::AlignCenter); + setAlignment(TQt::AlignCenter); TQToolTip::add(this,emoticonText); // Somehow TQLabel doesn't tell a reasonable size when you use setMovie // although it does it correctly for setPixmap. Therefore here is a little workaround @@ -100,7 +100,7 @@ void EmoticonSelector::prepareList(void) else col++; } - resize(tqminimumSizeHint()); + resize(minimumSizeHint()); } void EmoticonSelector::emoticonClicked(const TQString &str) diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp index f2dbd24a..05a21371 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp @@ -185,17 +185,17 @@ KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name ) mainArea = new TQFrame( vBox ); mainArea->setLineWidth( 0 ); - mainArea->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + mainArea->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); mainLayout = new TQVBoxLayout( mainArea ); if ( KopetePrefs::prefs()->chatWShowSend() ) { //Send Button m_button_send = new KPushButton( i18n("Send"), statusBar() ); - m_button_send->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + m_button_send->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); m_button_send->setEnabled( false ); m_button_send->setFont( statusBar()->font() ); - m_button_send->setFixedHeight( statusBar()->tqsizeHint().height() ); + m_button_send->setFixedHeight( statusBar()->sizeHint().height() ); connect( m_button_send, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSendMessage() ) ); statusBar()->addWidget( m_button_send, 0, true ); } @@ -203,9 +203,9 @@ KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name ) m_button_send = 0L; m_status_text = new KSqueezedTextLabel( i18n("Ready."), statusBar(), "m_status_text" ); - m_status_text->tqsetAlignment( AlignLeft | AlignVCenter ); + m_status_text->setAlignment( AlignLeft | AlignVCenter ); m_status_text->setFont( statusBar()->font() ); - m_status_text->setFixedHeight( statusBar()->tqsizeHint().height() ); + m_status_text->setFixedHeight( statusBar()->sizeHint().height() ); statusBar()->addWidget( m_status_text, 1 ); readOptions(); @@ -214,9 +214,9 @@ KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name ) windows.append( this ); windowListChanged(); - KGlobal::config()->setGroup( TQString::tqfromLatin1("ChatWindowSettings") ); - m_alwaysShowTabs = KGlobal::config()->readBoolEntry( TQString::tqfromLatin1("AlwaysShowTabs"), false ); - m_showFormatToolbar = KGlobal::config()->readBoolEntry( TQString::tqfromLatin1("Show Format Toolbar"), true ); + KGlobal::config()->setGroup( TQString::fromLatin1("ChatWindowSettings") ); + m_alwaysShowTabs = KGlobal::config()->readBoolEntry( TQString::fromLatin1("AlwaysShowTabs"), false ); + m_showFormatToolbar = KGlobal::config()->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true ); adjustingFormatToolbar = false; // kdDebug( 14010 ) << k_funcinfo << "Open Windows: " << windows.count() << endl; kapp->ref(); @@ -313,7 +313,7 @@ void KopeteChatWindow::initActions(void) createStandardStatusBarAction(); - chatSend = new KAction( i18n( "&Send Message" ), TQString::tqfromLatin1( "mail_send" ), TQKeySequence(Key_Return) , + chatSend = new KAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), TQKeySequence(Key_Return) , TQT_TQOBJECT(this), TQT_SLOT( slotSendMessage() ), coll, "chat_send" ); chatSend->setEnabled( false ); @@ -334,11 +334,11 @@ void KopeteChatWindow::initActions(void) nickComplete = new KAction( i18n( "Nic&k Completion" ), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT( slotNickComplete() ), coll , "nick_compete"); nickComplete->setShortcut( TQKeySequence( Key_Tab ) ); - tabDetach = new KAction( i18n( "&Detach Chat" ), TQString::tqfromLatin1( "tab_breakoff" ), 0, + tabDetach = new KAction( i18n( "&Detach Chat" ), TQString::fromLatin1( "tab_breakoff" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" ); tabDetach->setEnabled( false ); - actionDetachMenu = new KActionMenu( i18n( "&Move Tab to Window" ), TQString::tqfromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" ); + actionDetachMenu = new KActionMenu( i18n( "&Move Tab to Window" ), TQString::fromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" ); actionDetachMenu->setDelayed( false ); connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareDetachMenu()) ); @@ -354,9 +354,9 @@ void KopeteChatWindow::initActions(void) KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll); KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), coll); - new KAction( i18n( "Set Default &Font..." ), TQString::tqfromLatin1( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFont() ), coll, "format_font" ); - new KAction( i18n( "Set Default Text &Color..." ), TQString::tqfromLatin1( "pencil" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" ); - new KAction( i18n( "Set &Background Color..." ), TQString::tqfromLatin1( "fill" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" ); + new KAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFont() ), coll, "format_font" ); + new KAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" ); + new KAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" ); historyUp = new KAction( i18n( "Previous History" ), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHistoryUp() ), coll, "history_up" ); @@ -397,8 +397,8 @@ void KopeteChatWindow::initActions(void) KopeteStdAction::preferences( coll , "settings_prefs" ); //The Sending movie - normalIcon = TQPixmap( BarIcon( TQString::tqfromLatin1( "kopete" ) ) ); - animIcon = KGlobal::iconLoader()->loadMovie( TQString::tqfromLatin1( "newmessage" ), KIcon::Toolbar); + normalIcon = TQPixmap( BarIcon( TQString::fromLatin1( "kopete" ) ) ); + animIcon = KGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar); // Pause the animation because otherwise it's running even when we're not // showing it. This eats resources, and also triggers a pixmap leak in @@ -418,7 +418,7 @@ void KopeteChatWindow::initActions(void) //toolBar()->alignItemRight( 99 ); setStandardToolBarMenuEnabled( true ); - setXMLFile( TQString::tqfromLatin1( "kopetechatwindow.rc" ) ); + setXMLFile( TQString::fromLatin1( "kopetechatwindow.rc" ) ); createGUI( 0L ); // Special handling for remembering whether the format toolbar is visible or not @@ -581,7 +581,7 @@ void KopeteChatWindow::slotSetBgColor() m_activeView->setBgColor(); } -void KopeteChatWindow::settqStatus(const TQString &text) +void KopeteChatWindow::setStatus(const TQString &text) { m_status_text->setText(text); } @@ -590,11 +590,11 @@ void KopeteChatWindow::createTabBar() { if( !m_tabBar ) { - KGlobal::config()->setGroup( TQString::tqfromLatin1("ChatWindowSettings") ); + KGlobal::config()->setGroup( TQString::fromLatin1("ChatWindowSettings") ); m_tabBar = new KTabWidget( mainArea ); - m_tabBar->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - m_tabBar->setHoverCloseButton(KGlobal::config()->readBoolEntry( TQString::tqfromLatin1("HoverClose"), false )); + m_tabBar->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + m_tabBar->setHoverCloseButton(KGlobal::config()->readBoolEntry( TQString::fromLatin1("HoverClose"), false )); m_tabBar->setTabReorderingEnabled(true); #if KDE_IS_VERSION(3,4,0) m_tabBar->setAutomaticResizeTabs(true); @@ -621,7 +621,7 @@ void KopeteChatWindow::createTabBar() else setActiveView( chatViewList.first() ); - int tabPosition = KGlobal::config()->readNumEntry( TQString::tqfromLatin1("Tab Placement") , 0 ); + int tabPosition = KGlobal::config()->readNumEntry( TQString::fromLatin1("Tab Placement") , 0 ); slotPlaceTabs( tabPosition ); } } @@ -637,7 +637,7 @@ void KopeteChatWindow::addTab( ChatView *view ) Kopete::Contact *c=0L; for ( Kopete::Contact *contact = chatMembers.first(); contact; contact = chatMembers.next() ) { - if(!c || c->onlinetqStatus() < contact->onlinetqStatus()) + if(!c || c->onlineStatus() < contact->onlineStatus()) c=contact; } TQPixmap pluginIcon = c ? view->msgManager()->contactOnlineStatus( c ).iconFor( c) : SmallIcon( view->msgManager()->protocol()->pluginIcon() ); @@ -829,7 +829,7 @@ void KopeteChatWindow::updateBackground( const TQPixmap &pm ) backgroundFile->unlink(); } - backgroundFile = new KTempFile( TQString(), TQString::tqfromLatin1( ".bmp" ) ); + backgroundFile = new KTempFile( TQString(), TQString::fromLatin1( ".bmp" ) ); pm.save( backgroundFile->name(), "BMP" ); TQTimer::singleShot( 100, this, TQT_SLOT( slotEnableUpdateBg() ) ); } @@ -892,7 +892,7 @@ void KopeteChatWindow::setActiveView( TQWidget *widget ) } setCaption( m_activeView->caption() ); - settqStatus( m_activeView->statusText() ); + setStatus( m_activeView->statusText() ); m_activeView->setFocus(); updateSpellCheckAction(); slotUpdateSendEnabled(); @@ -909,7 +909,7 @@ void KopeteChatWindow::slotUpdateCaptionIcons( ChatView *view ) Kopete::Contact *c=0L; for ( Kopete::Contact *contact = chatMembers.first(); contact; contact = chatMembers.next() ) { - if(!c || c->onlinetqStatus() < contact->onlinetqStatus()) + if(!c || c->onlineStatus() < contact->onlineStatus()) c=contact; } @@ -986,15 +986,15 @@ void KopeteChatWindow::slotPrepareContactMenu(void) p, TQT_SLOT(deleteLater() ) ); if( contact->metaContact() ) - contactsMenu->insertItem( contact->onlinetqStatus().iconFor( contact ) , contact->metaContact()->displayName(), p ); + contactsMenu->insertItem( contact->onlineStatus().iconFor( contact ) , contact->metaContact()->displayName(), p ); else - contactsMenu->insertItem( contact->onlinetqStatus().iconFor( contact ) , contact->contactId(), p ); + contactsMenu->insertItem( contact->onlineStatus().iconFor( contact ) , contact->contactId(), p ); //FIXME: This number should be a config option if( ++contactCount == 15 && contact != m_them.getLast() ) { KActionMenu *moreMenu = new KActionMenu( i18n("More..."), - TQString::tqfromLatin1("folder_open"), TQT_TQOBJECT(contactsMenu) ); + TQString::fromLatin1("folder_open"), TQT_TQOBJECT(contactsMenu) ); connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()), moreMenu, TQT_SLOT(deleteLater() ) ); moreMenu->plug( contactsMenu ); @@ -1032,9 +1032,9 @@ void KopeteChatWindow::readOptions() // load and apply config file settings affecting the appearance of the UI // kdDebug(14010) << k_funcinfo << endl; KConfig *config = KGlobal::config(); - applyMainWindowSettings( config, TQString::tqfromLatin1( "KopeteChatWindow" ) ); - config->setGroup( TQString::tqfromLatin1("ChatWindowSettings") ); - m_showFormatToolbar = config->readBoolEntry( TQString::tqfromLatin1("Show Format Toolbar"), true ); + applyMainWindowSettings( config, TQString::fromLatin1( "KopeteChatWindow" ) ); + config->setGroup( TQString::fromLatin1("ChatWindowSettings") ); + m_showFormatToolbar = config->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true ); } void KopeteChatWindow::saveOptions() @@ -1044,12 +1044,12 @@ void KopeteChatWindow::saveOptions() KConfig *config = KGlobal::config(); // saves menubar,toolbar and statusbar setting - saveMainWindowSettings( config, TQString::tqfromLatin1( "KopeteChatWindow" ) ); - config->setGroup( TQString::tqfromLatin1("ChatWindowSettings") ); + saveMainWindowSettings( config, TQString::fromLatin1( "KopeteChatWindow" ) ); + config->setGroup( TQString::fromLatin1("ChatWindowSettings") ); if( m_tabBar ) - config->writeEntry ( TQString::tqfromLatin1("Tab Placement"), m_tabBar->tabPosition() ); + config->writeEntry ( TQString::fromLatin1("Tab Placement"), m_tabBar->tabPosition() ); - config->writeEntry( TQString::tqfromLatin1("Show Format Toolbar"), m_showFormatToolbar ); + config->writeEntry( TQString::fromLatin1("Show Format Toolbar"), m_showFormatToolbar ); config->sync(); } @@ -1214,7 +1214,7 @@ void KopeteChatWindow::slotConfKeys() void KopeteChatWindow::slotConfToolbar() { - saveMainWindowSettings(KGlobal::config(), TQString::tqfromLatin1( "KopeteChatWindow" )); + saveMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteChatWindow" )); KEditToolbar *dlg = new KEditToolbar(factory(), this ); if (dlg->exec()) { @@ -1222,7 +1222,7 @@ void KopeteChatWindow::slotConfToolbar() createGUI( m_activeView->editPart() ); else createGUI( 0L ); - applyMainWindowSettings(KGlobal::config(), TQString::tqfromLatin1( "KopeteChatWindow" )); + applyMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteChatWindow" )); } delete dlg; } @@ -1256,7 +1256,7 @@ void KopeteChatWindow::updateChatState( ChatView* cv, int newState ) void KopeteChatWindow::updateChatTooltip( ChatView* cv ) { if ( m_tabBar ) - m_tabBar->setTabToolTip( cv, TQString::tqfromLatin1("<qt>%1</qt>").tqarg( cv->caption() ) ); + m_tabBar->setTabToolTip( cv, TQString::fromLatin1("<qt>%1</qt>").tqarg( cv->caption() ) ); } void KopeteChatWindow::updateChatLabel() diff --git a/kopete/kopete/chatwindow/kopetechatwindow.h b/kopete/kopete/chatwindow/kopetechatwindow.h index f43fccdb..216f0745 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.h +++ b/kopete/kopete/chatwindow/kopetechatwindow.h @@ -93,7 +93,7 @@ public: ChatView *activeView(); void updateMembersActions(); - void settqStatus( const TQString & ); + void setStatus( const TQString & ); /** * Reimplemented from KMainWindow - asks each ChatView in the window if it is ok to close the window diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp index 73d62080..67e36f3d 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp @@ -164,7 +164,7 @@ int ChatWindowStyleManager::installStyle(const TQString &styleBundlePath) // Each time we found a correspondance to a theme bundle, we add a point to validResult. // A valid style bundle must have: // -a Contents, Contents/Resources, Co/Res/Incoming, Co/Res/Outgoing dirs - // main.css, Footer.html, Header.html, tqStatus.html files in Contents/Ressources. + // main.css, Footer.html, Header.html, Status.html files in Contents/Ressources. // So for a style bundle to be valid, it must have a result greather than 8, because we test for 8 required entry. int validResult = 0; TQStringList entries = rootDir->entries(); diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h index fef09b09..74f145ca 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h +++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h @@ -54,14 +54,14 @@ public: typedef TQMap<TQString, TQString> StyleList; /** - * The StyleInstalltqStatus enum. It gives better return value for installStyle(). + * The StyleInstallStatus enum. It gives better return value for installStyle(). * - StyleInstallOk : The install went fine. * - StyleNotValid : The archive didn't contain a valid Chat Window style. * - StyleNoDirectoryValid : It didn't find a suitable directory to install the theme. * - StyleCannotOpen : The archive couldn't be openned. * - StyleUnknow : Unknow error. */ - enum StyleInstalltqStatus { StyleInstallOk = 0, StyleNotValid, StyleNoDirectoryValid, StyleCannotOpen, StyleUnknow }; + enum StyleInstallStatus { StyleInstallOk = 0, StyleNotValid, StyleNoDirectoryValid, StyleCannotOpen, StyleUnknow }; /** * Destructor. @@ -91,7 +91,7 @@ public slots: * Note that you must pass a path to a archive. * * @param styleBundlePath Path to the container file to install. - * @return A status code from StyleInstalltqStatus enum. + * @return A status code from StyleInstallStatus enum. */ int installStyle(const TQString &styleBundlePath); diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp index f278b255..6965307a 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp +++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp @@ -147,7 +147,7 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP this, TQT_SLOT( messageSentSuccessfully() )); TQWidget *containerWidget = new TQWidget( v ); - containerWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); + containerWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); TQHBoxLayout *h = new TQHBoxLayout( containerWidget, 4, 4 ); h->addStretch(); @@ -176,7 +176,7 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP toggleMode( Send ); KConfig *config = KGlobal::config(); - applyMainWindowSettings( config, TQString::tqfromLatin1( "KopeteEmailWindow" ) ); + applyMainWindowSettings( config, TQString::fromLatin1( "KopeteEmailWindow" ) ); d->sendInProgress = false; @@ -196,7 +196,7 @@ KopeteEmailWindow::~KopeteEmailWindow() // saves menubar, toolbar and statusbar setting KConfig *config = KGlobal::config(); - saveMainWindowSettings( config, TQString::tqfromLatin1( "KopeteEmailWindow" ) ); + saveMainWindowSettings( config, TQString::fromLatin1( "KopeteEmailWindow" ) ); config->sync(); delete d; @@ -206,7 +206,7 @@ void KopeteEmailWindow::initActions(void) { KActionCollection *coll = actionCollection(); - d->chatSend = new KAction( i18n( "&Send Message" ), TQString::tqfromLatin1( "mail_send" ), 0, + d->chatSend = new KAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotReplySend() ), coll, "chat_send" ); //Default to 'Return' for sending messages d->chatSend->setShortcut( TQKeySequence( Key_Return ) ); @@ -217,11 +217,11 @@ void KopeteEmailWindow::initActions(void) KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll); KStdAction::paste( TQT_TQOBJECT(d->editPart->widget()), TQT_SLOT( paste() ), coll ); - new KAction( i18n( "&Set Font..." ), TQString::tqfromLatin1( "charset" ), 0, + new KAction( i18n( "&Set Font..." ), TQString::fromLatin1( "charset" ), 0, d->editPart, TQT_SLOT( setFont() ), coll, "format_font" ); - new KAction( i18n( "Set Text &Color..." ), TQString::tqfromLatin1( "pencil" ), 0, + new KAction( i18n( "Set Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, d->editPart, TQT_SLOT( setFgColor() ), coll, "format_color" ); - new KAction( i18n( "Set &Background Color..." ), TQString::tqfromLatin1( "fill" ), 0, + new KAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, d->editPart, TQT_SLOT( setBgColor() ), coll, "format_bgcolor" ); KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotViewMenuBar() ), coll ); @@ -238,8 +238,8 @@ void KopeteEmailWindow::initActions(void) KopeteStdAction::preferences( coll , "settings_prefs" ); // The animated toolbarbutton - d->normalIcon = TQPixmap( BarIcon( TQString::tqfromLatin1( "kopete" ) ) ); - d->animIcon = KGlobal::iconLoader()->loadMovie( TQString::tqfromLatin1( "newmessage" ), KIcon::Toolbar); + d->normalIcon = TQPixmap( BarIcon( TQString::fromLatin1( "kopete" ) ) ); + d->animIcon = KGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar); d->animIcon.pause(); d->anim = new TQLabel( this, "kde toolbar widget" ); @@ -247,9 +247,9 @@ void KopeteEmailWindow::initActions(void) d->anim->setPixmap( d->normalIcon ); new KWidgetAction( d->anim, i18n("Toolbar Animation"), 0, 0, 0, coll, "toolbar_animation" ); - setXMLFile( TQString::tqfromLatin1( "kopeteemailwindow.rc" ) ); + setXMLFile( TQString::fromLatin1( "kopeteemailwindow.rc" ) ); createGUI( d->editPart ); - //createGUI( TQString::tqfromLatin1( "kopeteemailwindow.rc" ) ); + //createGUI( TQString::fromLatin1( "kopeteemailwindow.rc" ) ); guiFactory()->addClient(m_manager); } @@ -280,12 +280,12 @@ void KopeteEmailWindow::slotSmileyActivated(const TQString &sm ) void KopeteEmailWindow::slotConfToolbar() { - saveMainWindowSettings(KGlobal::config(), TQString::tqfromLatin1( "KopeteEmailWindow" )); - KEditToolbar *dlg = new KEditToolbar(actionCollection(), TQString::tqfromLatin1("kopeteemailwindow.rc") ); + saveMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteEmailWindow" )); + KEditToolbar *dlg = new KEditToolbar(actionCollection(), TQString::fromLatin1("kopeteemailwindow.rc") ); if (dlg->exec()) { createGUI( d->editPart ); - applyMainWindowSettings(KGlobal::config(), TQString::tqfromLatin1( "KopeteEmailWindow" )); + applyMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteEmailWindow" )); } delete dlg; } @@ -420,25 +420,25 @@ bool KopeteEmailWindow::closeView( bool force ) { TQString shortCaption = caption(); if( shortCaption.length() > 40 ) - shortCaption = shortCaption.left( 40 ) + TQString::tqfromLatin1("..."); + shortCaption = shortCaption.left( 40 ) + TQString::fromLatin1("..."); response = KMessageBox::warningContinueCancel(this, i18n("<qt>You are about to leave the group chat session <b>%1</b>.<br>" "You will not receive future messages from this conversation.</qt>").tqarg(shortCaption), i18n("Closing Group Chat"), - i18n("Cl&ose Chat"), TQString::tqfromLatin1("AskCloseGroupChat")); + i18n("Cl&ose Chat"), TQString::fromLatin1("AskCloseGroupChat")); } if( !d->unreadMessageFrom.isNull() && ( response == KMessageBox::Continue ) ) { response = KMessageBox::warningContinueCancel(this, i18n("<qt>You have received a message from <b>%1</b> in the last " "second. Are you sure you want to close this chat?</qt>").tqarg(d->unreadMessageFrom), i18n("Unread Message"), - i18n("Cl&ose Chat"), TQString::tqfromLatin1("AskCloseChatRecentMessage")); + i18n("Cl&ose Chat"), TQString::fromLatin1("AskCloseChatRecentMessage")); } if( d->sendInProgress && ( response == KMessageBox::Continue ) ) { response = KMessageBox::warningContinueCancel(this, i18n("You have a message send in progress, which will be " "aborted if this chat is closed. Are you sure you want to close this chat?"), i18n("Message in Transit"), - i18n("Cl&ose Chat"), TQString::tqfromLatin1("AskCloseChatMessageInProgress") ); + i18n("Cl&ose Chat"), TQString::fromLatin1("AskCloseChatMessageInProgress") ); } } diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp index 08d19240..d1d6bd04 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.cpp +++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp @@ -515,28 +515,28 @@ void KopeteRichTextEditPart::setUnderline( bool b ) void KopeteRichTextEditPart::setAlignLeft( bool yes ) { if ( yes ) - editor->tqsetAlignment( AlignLeft ); + editor->setAlignment( AlignLeft ); writeConfig(); } void KopeteRichTextEditPart::setAlignRight( bool yes ) { if ( yes ) - editor->tqsetAlignment( AlignRight ); + editor->setAlignment( AlignRight ); writeConfig(); } void KopeteRichTextEditPart::setAlignCenter( bool yes ) { if ( yes ) - editor->tqsetAlignment( AlignCenter ); + editor->setAlignment( AlignCenter ); writeConfig(); } void KopeteRichTextEditPart::setAlignJustify( bool yes ) { if ( yes ) - editor->tqsetAlignment( AlignJustify ); + editor->setAlignment( AlignJustify ); writeConfig(); } diff --git a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp index 2f6ea711..31535603 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp @@ -92,7 +92,7 @@ void ChatWindowStyle_Test::testHtml() "<div>%message%</div>\n" "<div id=\"insert\">" ); - TQString exceptedtqStatus = TQString::fromUtf8( + TQString exceptedStatus = TQString::fromUtf8( "<div>%message%</div>\n" "<div>%time%</div>\n" "<div>%time{%H:%M}%</div>"); @@ -103,7 +103,7 @@ void ChatWindowStyle_Test::testHtml() CHECK(testStyle->getNextIncomingHtml(), exceptedNextIncoming); CHECK(testStyle->getOutgoingHtml(), exceptedOutgoing); CHECK(testStyle->getNextOutgoingHtml(), exceptedNextOutgoing); - CHECK(testStyle->getStatusHtml(), exceptedtqStatus); + CHECK(testStyle->getStatusHtml(), exceptedStatus); } void ChatWindowStyle_Test::testAction() diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index 4a2b648f..425cc22a 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -101,7 +101,7 @@ bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*parent return true; } -void connect( const Kopete::OnlineStatus& /*initialtqStatus*/) +void connect( const Kopete::OnlineStatus& /*initialStatus*/) { // do nothing } @@ -205,8 +205,8 @@ void ChatWindowStyleRendering_Test::testHeaderRendering() "<div>Outgoing/buddy_icon.png</div>\n" "<div>%1</div>\n" "<div>%2</div>" - ).tqarg(KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true, true ) ) - .tqarg(TQDateTime::tqcurrentDateTime().toString("hh:mm")); + ).tqarg(KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ) + .tqarg(TQDateTime::currentDateTime().toString("hh:mm")); TQString headerHtml = d->testStyle->getHeaderHtml(); TQString resultHtml; @@ -230,7 +230,7 @@ void ChatWindowStyleRendering_Test::testMessageRendering() "<div>%1</div>\n" "<div>%2</div>\n" "<div id=\"insert\">" - ).tqarg( TQDateTime::tqcurrentDateTime().toString( "hh:mm:ss" ), TQDateTime::tqcurrentDateTime().toString( "hh:mm" ) ); + ).tqarg( TQDateTime::currentDateTime().toString( "hh:mm:ss" ), TQDateTime::currentDateTime().toString( "hh:mm" ) ); TQString expectedOutgoingHtml = TQString( "Outgoing:\n" @@ -242,7 +242,7 @@ void ChatWindowStyleRendering_Test::testMessageRendering() "<div>%1</div>\n" "<div>%2</div>\n" "<div id=\"insert\">" - ).tqarg( TQDateTime::tqcurrentDateTime().toString( "hh:mm:ss" ), TQDateTime::tqcurrentDateTime().toString( "hh:mm" ) ); + ).tqarg( TQDateTime::currentDateTime().toString( "hh:mm:ss" ), TQDateTime::currentDateTime().toString( "hh:mm" ) ); TQString tempHtml; @@ -272,13 +272,13 @@ void ChatWindowStyleRendering_Test::testStatusRendering() "<div><span style=\"\"class=\"KopeteMessageBody\">A contact went offline.</span></div>\n" "<div>%1</div>\n" "<div>%2</div>" - ).tqarg( TQDateTime::tqcurrentDateTime().toString( "hh:mm:ss" ), TQDateTime::tqcurrentDateTime().toString( "hh:mm" ) ); + ).tqarg( TQDateTime::currentDateTime().toString( "hh:mm:ss" ), TQDateTime::currentDateTime().toString( "hh:mm" ) ); TQString statusHtml = d->testStyle->getStatusHtml(); TQString resultHtml; - Kopete::Message msgtqStatus(0,0, TQString::fromUtf8("A contact went offline."), Kopete::Message::Internal); - resultHtml = chatPart->formatStyleKeywords(statusHtml, msgtqStatus); + Kopete::Message msgStatus(0,0, TQString::fromUtf8("A contact went offline."), Kopete::Message::Internal); + resultHtml = chatPart->formatStyleKeywords(statusHtml, msgStatus); CHECK(resultHtml, expectedStatusHtml); } @@ -291,8 +291,8 @@ void ChatWindowStyleRendering_Test::testFullRendering() Kopete::Message msgIn1(d->myself, d->other, TQString("Hello there !"), Kopete::Message::Inbound); Kopete::Message msgIn2(d->myself, d->other, TQString("How are you doing ?"), Kopete::Message::Inbound); Kopete::Message msgOut1(d->other, d->myself, TQString("Fine and you ?"), Kopete::Message::Outbound); - Kopete::Message msgtqStatus1(d->myself,d->other, TQString("You are now marked as away."), Kopete::Message::Internal); - Kopete::Message msgtqStatus2(d->myself,d->other, TQString("You are now marked as online."), Kopete::Message::Internal); + Kopete::Message msgStatus1(d->myself,d->other, TQString("You are now marked as away."), Kopete::Message::Internal); + Kopete::Message msgStatus2(d->myself,d->other, TQString("You are now marked as online."), Kopete::Message::Internal); Kopete::Message msgIn3(d->myself, d->other, TQString("Well, doing some tests."), Kopete::Message::Internal); Kopete::Message msgOut2(d->other, d->myself, TQString("All your bases are belong to us."), Kopete::Message::Outbound); Kopete::Message msgOut3(d->other, d->myself, TQString("You are on the way to destruction"), Kopete::Message::Outbound); @@ -304,8 +304,8 @@ void ChatWindowStyleRendering_Test::testFullRendering() chatPart->appendMessage(msgIn1); chatPart->appendMessage(msgIn2); chatPart->appendMessage(msgOut1); - chatPart->appendMessage(msgtqStatus1); - chatPart->appendMessage(msgtqStatus2); + chatPart->appendMessage(msgStatus1); + chatPart->appendMessage(msgStatus2); chatPart->appendMessage(msgIn3); chatPart->appendMessage(msgOut2); chatPart->appendMessage(msgOut3); diff --git a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui index 112d01f5..16faf54f 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui +++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui @@ -131,7 +131,7 @@ The icon of every contact of this account will be coloured with this color. Usef <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -150,7 +150,7 @@ The icon of every contact of this account will be coloured with this color. Usef <property name="name"> <cstring>mButtonUp</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>10</height> @@ -177,7 +177,7 @@ The priority is used to determine which contact to use when you click on a metac <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -188,7 +188,7 @@ The priority is used to determine which contact to use when you click on a metac <property name="name"> <cstring>mButtonDown</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>10</height> @@ -217,7 +217,7 @@ The priority is used to determine which contact to use when you click on a metac <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>50</height> @@ -234,7 +234,7 @@ The priority is used to determine which contact to use when you click on a metac <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index e415d349..75eccea6 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -242,7 +242,7 @@ AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const htmlWidget->setMarginWidth(4); htmlWidget->setMarginHeight(4); htmlWidget->setFocusPolicy(TQ_NoFocus); - htmlWidget->tqsetSizePolicy( + htmlWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); l->addWidget(htmlWidget); // Add the preview message to the ChatMessagePart @@ -548,9 +548,9 @@ void AppearanceConfig::slotSelectedEmoticonsThemeChanged() TQString newContentText = "<qt>"; for(TQStringList::Iterator it = smileys.begin(); it != smileys.end(); ++it ) - newContentText += TQString::tqfromLatin1("<img src=\"%1\"> ").tqarg(*it); + newContentText += TQString::fromLatin1("<img src=\"%1\"> ").tqarg(*it); - newContentText += TQString::tqfromLatin1("</qt>"); + newContentText += TQString::fromLatin1("</qt>"); d->mPrfsEmoticons->icon_theme_preview->setText(newContentText); emitChanged(); } @@ -728,7 +728,7 @@ FakeAccount(Kopete::Protocol *parent, const TQString &accountID, const char *nam ~FakeAccount() {} bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*parentContact*/ ){return true;} -void connect( const Kopete::OnlineStatus& /*initialtqStatus*/){} +void connect( const Kopete::OnlineStatus& /*initialStatus*/){} void disconnect(){} void setOnlineStatus( const Kopete::OnlineStatus& /*status*/ , const TQString &/*reason*/){} }; diff --git a/kopete/kopete/config/appearance/appearanceconfig_colors.ui b/kopete/kopete/config/appearance/appearanceconfig_colors.ui index 880f2a38..12afec52 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_colors.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_colors.ui @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -382,7 +382,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> diff --git a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui index d15d2d71..da705359 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -315,7 +315,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -352,7 +352,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -371,7 +371,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui index 49c4cd47..20ad8628 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui @@ -80,7 +80,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>64</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp index d14e94f5..ea2fff3d 100644 --- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp +++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp @@ -197,14 +197,14 @@ void EmoticonsEditDialog::slotEditClicked() TQString f = mMainWidget->klvEmoticons->selectedItem()->text(2); KStandardDirs *dir = KGlobal::dirs(); - emo = dir->findResource( "emoticons", themeName + TQString::tqfromLatin1( "/" ) + f ); + emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f ); if( emo.isNull() ) - emo = dir->findResource( "emoticons", themeName + TQString::tqfromLatin1( "/" ) + f + TQString::tqfromLatin1( ".mng" ) ); + emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f + TQString::fromLatin1( ".mng" ) ); if ( emo.isNull() ) - emo = dir->findResource( "emoticons", themeName + TQString::tqfromLatin1( "/" ) + f + TQString::tqfromLatin1( ".png" ) ); + emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f + TQString::fromLatin1( ".png" ) ); if ( emo.isNull() ) - emo = dir->findResource( "emoticons", themeName + TQString::tqfromLatin1( "/" ) + f + TQString::tqfromLatin1( ".gif" ) ); + emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f + TQString::fromLatin1( ".gif" ) ); if ( emo.isNull() ) return; } diff --git a/kopete/kopete/config/appearance/emoticonseditwidget.ui b/kopete/kopete/config/appearance/emoticonseditwidget.ui index 0babcc4e..c40df6e2 100644 --- a/kopete/kopete/config/appearance/emoticonseditwidget.ui +++ b/kopete/kopete/config/appearance/emoticonseditwidget.ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kopete/kopete/config/appearance/tooltipeditwidget.ui b/kopete/kopete/config/appearance/tooltipeditwidget.ui index c08cfc2c..9ef2ac0b 100644 --- a/kopete/kopete/config/appearance/tooltipeditwidget.ui +++ b/kopete/kopete/config/appearance/tooltipeditwidget.ui @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -170,7 +170,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui index 5e4a7b1f..f8a26c86 100644 --- a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui +++ b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui @@ -552,7 +552,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -571,7 +571,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>320</width> <height>240</height> @@ -594,7 +594,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kopete/kopete/config/behavior/behaviorconfig_chat.ui b/kopete/kopete/config/behavior/behaviorconfig_chat.ui index f5601731..f2394f16 100644 --- a/kopete/kopete/config/behavior/behaviorconfig_chat.ui +++ b/kopete/kopete/config/behavior/behaviorconfig_chat.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>240</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>20</height> @@ -261,7 +261,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>212</width> <height>20</height> diff --git a/kopete/kopete/config/behavior/behaviorconfig_events.ui b/kopete/kopete/config/behavior/behaviorconfig_events.ui index 3d1c8926..748d519f 100644 --- a/kopete/kopete/config/behavior/behaviorconfig_events.ui +++ b/kopete/kopete/config/behavior/behaviorconfig_events.ui @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -164,7 +164,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -221,7 +221,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -339,7 +339,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kopete/kopete/config/behavior/behaviorconfig_general.ui b/kopete/kopete/config/behavior/behaviorconfig_general.ui index 13e7cc5d..d22eb069 100644 --- a/kopete/kopete/config/behavior/behaviorconfig_general.ui +++ b/kopete/kopete/config/behavior/behaviorconfig_general.ui @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui index d2a1860a..48680e64 100644 --- a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui +++ b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -242,7 +242,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -264,7 +264,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -285,7 +285,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui index cebc838c..a216ec68 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui +++ b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui @@ -203,7 +203,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -257,7 +257,7 @@ <property name="name"> <cstring>buttonClearPhoto</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>3232</height> @@ -332,7 +332,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>36</height> @@ -343,13 +343,13 @@ <property name="name"> <cstring>labelPhoto</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>64</width> <height>92</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>64</width> <height>32767</height> @@ -381,7 +381,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -402,7 +402,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -470,7 +470,7 @@ current user contact.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> @@ -490,7 +490,7 @@ current user contact.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kopete/kopete/contactlist/customnotificationprops.cpp b/kopete/kopete/contactlist/customnotificationprops.cpp index 8c9deb30..f8e2bb85 100644 --- a/kopete/kopete/contactlist/customnotificationprops.cpp +++ b/kopete/kopete/contactlist/customnotificationprops.cpp @@ -47,12 +47,12 @@ CustomNotificationProps::CustomNotificationProps( TQWidget *parent, Kopete::Noti TQStringList::Iterator end = m_eventList.end(); for ( ; it != end; ++it ) { - if ( !(*it).startsWith( TQString::tqfromLatin1( "kopete_contact_" ) ) ) + if ( !(*it).startsWith( TQString::fromLatin1( "kopete_contact_" ) ) ) continue; contactSpecificEvents.append( *it ); TQMap<TQString, TQString> entries = eventsfile.entryMap( *it ); eventsfile.setGroup( *it ); - TQString comment = eventsfile.readEntry( "Comment", TQString::tqfromLatin1( "Found nothing!" ) ); + TQString comment = eventsfile.readEntry( "Comment", TQString::fromLatin1( "Found nothing!" ) ); m_notifyWidget->cmbEvents->insertItem( comment ); } m_eventList = contactSpecificEvents; diff --git a/kopete/kopete/contactlist/customnotifications.ui b/kopete/kopete/contactlist/customnotifications.ui index b3b578d8..afd59013 100644 --- a/kopete/kopete/contactlist/customnotifications.ui +++ b/kopete/kopete/contactlist/customnotifications.ui @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> diff --git a/kopete/kopete/contactlist/kabcexport_base.ui b/kopete/kopete/contactlist/kabcexport_base.ui index c9b8f883..452e3819 100644 --- a/kopete/kopete/contactlist/kabcexport_base.ui +++ b/kopete/kopete/contactlist/kabcexport_base.ui @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp index b3b6d630..11ec93d0 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp +++ b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp @@ -1,5 +1,5 @@ /* - kopeteaddrbookexport.cpp - Kopete Online tqStatus + kopeteaddrbookexport.cpp - Kopete Online Status Logic for exporting data acquired from messaging systems to the KDE address book diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.h b/kopete/kopete/contactlist/kopeteaddrbookexport.h index 0190e8b7..62f1858d 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexport.h +++ b/kopete/kopete/contactlist/kopeteaddrbookexport.h @@ -1,5 +1,5 @@ /* - kopeteaddrbookexport.h - Kopete Online tqStatus + kopeteaddrbookexport.h - Kopete Online Status Logic for exporting data acquired from messaging systems to the KDE address book diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index d95e4cb1..f92ceddb 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -475,14 +475,14 @@ void KopeteContactListView::initActions( KActionCollection *ac ) actionStartChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( slotStartChat() ), ac, "contactStartChat" ); - actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::tqfromLatin1( "editcut" ), + actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::fromLatin1( "editcut" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotMoveToGroup() ), ac, "contactMove" ); - actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::tqfromLatin1( "editcopy" ), 0, + actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::fromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" ); actionRemove = KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), ac, "contactRemove" ); - actionSendEmail = new KAction( i18n( "Send Email..." ), TQString::tqfromLatin1( "mail_generic" ), + actionSendEmail = new KAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendEmail() ), ac, "contactSendEmail" ); /* this actionRename is buggy, and useless with properties, removed in kopeteui.rc*/ actionRename = new KAction( i18n( "Rename" ), "filesaveas", 0, @@ -491,7 +491,7 @@ void KopeteContactListView::initActions( KActionCollection *ac ) ac, "contactSendFile" ); actionAddContact = new KActionMenu( i18n( "&Add Contact" ), - TQString::tqfromLatin1( "add_user" ), ac , "contactAddContact" ); + TQString::fromLatin1( "add_user" ), ac , "contactAddContact" ); actionAddContact->popupMenu()->insertTitle( i18n("Select Account") ); actionAddTemporaryContact = new KAction( i18n( "Add to Your Contact List" ), "add_user", 0, @@ -659,7 +659,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, int nb = Kopete::ContactList::self()->selectedMetaContacts().count() + Kopete::ContactList::self()->selectedGroups().count(); - KMainWindow *window = dynamic_cast<KMainWindow *>(tqtopLevelWidget()); + KMainWindow *window = dynamic_cast<KMainWindow *>(topLevelWidget()); if ( !window ) { kdError( 14000 ) << k_funcinfo << "Main window not found, unable to display context-menu; " @@ -671,7 +671,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, { int px = mapFromGlobal( point ).x() - ( header()->sectionPos( header()->mapToIndex( 0 ) ) + treeStepSize() * ( item->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ); - int py = mapFromGlobal( point ).y() - tqitemRect( item ).y() - (header()->isVisible() ? header()->height() : 0) ; + int py = mapFromGlobal( point ).y() - itemRect( item ).y() - (header()->isVisible() ? header()->height() : 0) ; //kdDebug( 14000 ) << k_funcinfo << "x: " << px << ", y: " << py << endl; Kopete::Contact *c = metaLVI->contactForPoint( TQPoint( px, py ) ) ; @@ -691,7 +691,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, arg( metaLVI->metaContact()->displayName(), metaLVI->metaContact()->statusString() ); if ( title.length() > 43 ) - title = title.left( 40 ) + TQString::tqfromLatin1( "..." ); + title = title.left( 40 ) + TQString::fromLatin1( "..." ); if ( popup->title( 0 ).isNull() ) popup->insertTitle ( title, 0, 0 ); @@ -716,9 +716,9 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, text=text.replace("&","&&"); // cf BUG 115449 if ( text.length() > 41 ) - text = text.left( 38 ) + TQString::tqfromLatin1( "..." ); + text = text.left( 38 ) + TQString::fromLatin1( "..." ); - popup->insertItem( c->onlinetqStatus().iconFor( c, 16 ), text , contactMenu ); + popup->insertItem( c->onlineStatus().iconFor( c, 16 ), text , contactMenu ); } popup->popup( point ); @@ -733,7 +733,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, { TQString title = groupvi->group()->displayName(); if ( title.length() > 32 ) - title = title.left( 30 ) + TQString::tqfromLatin1( "..." ); + title = title.left( 30 ) + TQString::fromLatin1( "..." ); if( popup->title( 0 ).isNull() ) popup->insertTitle( title, 0, 0 ); @@ -814,7 +814,7 @@ void KopeteContactListView::slotExecuted( TQListViewItem *item, const TQPoint &p { // Try if we are clicking a protocol icon. If so, open a direct // connection for that protocol - TQRect r = tqitemRect( item ); + TQRect r = itemRect( item ); TQPoint relativePos( pos.x() - r.left() - ( treeStepSize() * ( item->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ), pos.y() - r.top() ); @@ -905,7 +905,7 @@ void KopeteContactListView::slotDropped(TQDropEvent *e, TQListViewItem *, TQList } else if( e->provides("kopete/x-contact") ) { - TQString contactInfo = TQString::fromUtf8( e->tqencodedData("kopete/x-contact") ); + TQString contactInfo = TQString::fromUtf8( e->encodedData("kopete/x-contact") ); TQString protocolId = contactInfo.section( TQChar( 0xE000 ), 0, 0 ); TQString accountId = contactInfo.section( TQChar( 0xE000 ), 1, 1 ); TQString contactId = contactInfo.section( TQChar( 0xE000 ), 2 ); @@ -927,7 +927,7 @@ void KopeteContactListView::slotDropped(TQDropEvent *e, TQListViewItem *, TQList for ( KURL::List::Iterator it = urlList.begin(); it != urlList.end(); ++it ) { KURL url = (*it); - if( url.protocol() == TQString::tqfromLatin1("kopetemessage") ) + if( url.protocol() == TQString::fromLatin1("kopetemessage") ) { //Add a contact addDraggedContactByInfo( url.queryItem("protocolId"), @@ -938,7 +938,7 @@ void KopeteContactListView::slotDropped(TQDropEvent *e, TQListViewItem *, TQList TQPoint p = contentsToViewport(e->pos()); int px = p.x() - ( header()->sectionPos( header()->mapToIndex( 0 ) ) + treeStepSize() * ( dest_metaLVI->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ); - int py = p.y() - tqitemRect( dest_metaLVI ).y(); + int py = p.y() - itemRect( dest_metaLVI ).y(); Kopete::Contact *c = dest_metaLVI->contactForPoint( TQPoint( px, py ) ); @@ -1146,7 +1146,7 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const TQPoint p=contentsToViewport(e->pos()); int px = p.x() - ( header()->sectionPos( header()->mapToIndex( 0 ) ) + treeStepSize() * ( dest_metaLVI->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ); - int py = p.y() - tqitemRect( dest_metaLVI ).y(); + int py = p.y() - itemRect( dest_metaLVI ).y(); Kopete::Contact *c = dest_metaLVI->contactForPoint( TQPoint( px, py ) ) ; if( c ? !c->isReachable() : !dest_metaLVI->metaContact()->isReachable() ) @@ -1168,7 +1168,7 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const for ( KURL::List::Iterator it = urlList.begin(); it != urlList.end(); ++it ) { - if( (*it).protocol() != TQString::tqfromLatin1("kopetemessage") && (*it).isLocalFile() ) + if( (*it).protocol() != TQString::fromLatin1("kopetemessage") && (*it).isLocalFile() ) return false; //we can't send links if a locale file is in link } @@ -1216,7 +1216,7 @@ void KopeteContactListView::contentsMousePressEvent( TQMouseEvent *e ) int px = p.x() - ( header()->sectionPos( header()->mapToIndex( 0 ) ) + treeStepSize() * ( i->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ); - int py = p.y() - tqitemRect( i ).y(); + int py = p.y() - itemRect( i ).y(); m_startDragPos = TQPoint( px , py ); } @@ -1272,7 +1272,7 @@ TQDragObject *KopeteContactListView::dragObject() d->setEncodedData( TQString( c->protocol()->pluginId() +TQChar( 0xE000 )+ c->account()->accountId() +TQChar( 0xE000 )+ c->contactId() ).utf8() ); drag->addDragObject( d ); - pm = c->onlinetqStatus().iconFor( c, 12 ); // FIXME: fixed icon scaling + pm = c->onlineStatus().iconFor( c, 12 ); // FIXME: fixed icon scaling } else // dragging a metacontact { diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp index d952e728..6935acaa 100644 --- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp +++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp @@ -1,5 +1,5 @@ /* - kopeteonlinestatus.cpp - Kopete Online tqStatus + kopeteonlinestatus.cpp - Kopete Online Status Copyright (c) 2002-2004 by Olivier Goffart <ogoffart @ kde.org> Copyright (c) 2003 by Martijn Klingens <klingens@kde.org> diff --git a/kopete/kopete/contactlist/kopetegvipropswidget.ui b/kopete/kopete/contactlist/kopetegvipropswidget.ui index f336b240..515ac5ab 100644 --- a/kopete/kopete/contactlist/kopetegvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetegvipropswidget.ui @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index 39b00849..ef700bb7 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -187,19 +187,19 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *pare TQString offlineName = item->metaContact()->icon( Kopete::ContactListElement::Offline ); if(offlineName.isEmpty()) - offlineName = TQString::tqfromLatin1(MC_OFF); // Default + offlineName = TQString::fromLatin1(MC_OFF); // Default TQString onlineName = item->metaContact()->icon( Kopete::ContactListElement::Online ); if(onlineName.isEmpty()) - onlineName = TQString::tqfromLatin1(MC_ON); // Default + onlineName = TQString::fromLatin1(MC_ON); // Default TQString awayName = item->metaContact()->icon( Kopete::ContactListElement::Away ); if(awayName.isEmpty()) - awayName = TQString::tqfromLatin1(MC_AW); // Default + awayName = TQString::fromLatin1(MC_AW); // Default TQString unknownName = item->metaContact()->icon( Kopete::ContactListElement::Unknown ); if(unknownName.isEmpty()) - unknownName = TQString::tqfromLatin1(MC_UNK); // Default + unknownName = TQString::fromLatin1(MC_UNK); // Default mainWidget->icnbOffline->setIcon( offlineName ); mainWidget->icnbOnline->setIcon( onlineName ); diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index a85a8aa8..a990da0f 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -82,18 +82,18 @@ public: { // We begin with the meta contact display name at the top of the tooltip - TQString toolTip = TQString::tqfromLatin1("<qt><table cellpadding=\"0\" cellspacing=\"1\">"); + TQString toolTip = TQString::fromLatin1("<qt><table cellpadding=\"0\" cellspacing=\"1\">"); - toolTip += TQString::tqfromLatin1("<tr><td>"); + toolTip += TQString::fromLatin1("<tr><td>"); if ( ! metaContact->photo().isNull() ) { - TQString photoName = TQString::tqfromLatin1("kopete-metacontact-photo:%1").tqarg( KURL::encode_string( metaContact->metaContactId() )); + TQString photoName = TQString::fromLatin1("kopete-metacontact-photo:%1").tqarg( KURL::encode_string( metaContact->metaContactId() )); //TQMimeSourceFactory::defaultFactory()->setImage( "contactimg", metaContact->photo() ); - toolTip += TQString::tqfromLatin1("<img src=\"%1\">").tqarg( photoName ); + toolTip += TQString::fromLatin1("<img src=\"%1\">").tqarg( photoName ); } - toolTip += TQString::tqfromLatin1("</td><td>"); + toolTip += TQString::fromLatin1("</td><td>"); TQString displayName; Kopete::Emoticons *e = Kopete::Emoticons::self(); @@ -110,21 +110,21 @@ public: } } - toolTip += TQString::tqfromLatin1("<b><font size=\"+1\">%1</font></b><br><br>").tqarg( displayName ); + toolTip += TQString::fromLatin1("<b><font size=\"+1\">%1</font></b><br><br>").tqarg( displayName ); TQPtrList<Contact> contacts = metaContact->contacts(); if ( contacts.count() == 1 ) { - return toolTip + contacts.first()->toolTip() + TQString::tqfromLatin1("</td></tr></table></qt>"); + return toolTip + contacts.first()->toolTip() + TQString::fromLatin1("</td></tr></table></qt>"); } - toolTip += TQString::tqfromLatin1("<table>"); + toolTip += TQString::fromLatin1("<table>"); // We are over a metacontact with > 1 child contacts, and not over a specific contact // Iterate through tqchildren and display a summary tooltip for(Contact *c = contacts.first(); c; c = contacts.next()) { - TQString iconName = TQString::tqfromLatin1("kopete-contact-icon:%1:%2:%3") + TQString iconName = TQString::fromLatin1("kopete-contact-icon:%1:%2:%3") .tqarg( KURL::encode_string( c->protocol()->pluginId() ), KURL::encode_string( c->account()->accountId() ), KURL::encode_string( c->contactId() ) @@ -132,10 +132,10 @@ public: toolTip += i18n("<tr><td>STATUS ICON <b>PROTOCOL NAME</b> (ACCOUNT NAME)</td><td>STATUS DESCRIPTION</td></tr>", "<tr><td><img src=\"%1\"> <nobr><b>%2</b></nobr> <nobr>(%3)</nobr></td><td align=\"right\"><nobr>%4</nobr></td></tr>") - .tqarg( iconName, Kopete::Emoticons::parseEmoticons(c->property(Kopete::Global::Properties::self()->nickName()).value().toString()) , c->contactId(), c->onlinetqStatus().description() ); + .tqarg( iconName, Kopete::Emoticons::parseEmoticons(c->property(Kopete::Global::Properties::self()->nickName()).value().toString()) , c->contactId(), c->onlineStatus().description() ); } - return toolTip + TQString::tqfromLatin1("</table></td></tr></table></qt>"); + return toolTip + TQString::fromLatin1("</table></td></tr></table></qt>"); } private: MetaContact *metaContact; @@ -212,7 +212,7 @@ void KopeteMetaContactLVI::initLVI() d->toolTipSource.reset( new ListView::MetaContactToolTipSource( m_metaContact ) ); - m_oldtqStatus = m_metaContact->status(); + m_oldStatus = m_metaContact->status(); connect( m_metaContact, TQT_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), TQT_SLOT( slotDisplayNameChanged() ) ); @@ -254,7 +254,7 @@ void KopeteMetaContactLVI::initLVI() mIsBlinkIcon = false; //if ( !mBlinkIcon ) - // mBlinkIcon = new TQPixmap( KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "newmsg" ), KIcon::Small ) ); + // mBlinkIcon = new TQPixmap( KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "newmsg" ), KIcon::Small ) ); slotConfigChanged(); // this calls slotIdleStateChanged(), which sets up the constituent components, spacing, fonts and indirectly, the contact icon slotDisplayNameChanged(); @@ -363,18 +363,18 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) // multiple times if the user is in multiple groups - Jason // comparing the status of the previous and new preferred contact is the determining factor in deciding to notify - Kopete::OnlineStatus newtqStatus; + Kopete::OnlineStatus newStatus; if ( m_metaContact->preferredContact() ) - newtqStatus = m_metaContact->preferredContact()->onlinetqStatus(); + newStatus = m_metaContact->preferredContact()->onlineStatus(); else { // the last child contact has gone offline or otherwise unreachable, so take the changed contact's online status - newtqStatus = c->onlinetqStatus(); + newStatus = c->onlineStatus(); } // ensure we are not suppressing notifications, because connecting or disconnected if ( !(c->account()->suppressStatusNotification() - || ( c->account()->myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Connecting ) + || ( c->account()->myself()->onlineStatus().status() == Kopete::OnlineStatus::Connecting ) || !c->account()->isConnected() ) ) { if ( !c->account()->isAway() || KopetePrefs::prefs()->soundIfAway() ) @@ -383,46 +383,46 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) TQString text = i18n( "<qt><i>%1</i> is now %2.</qt>" ) .tqarg( Kopete::Emoticons::parseEmoticons( TQStyleSheet::escape(m_metaContact->displayName()) ) , - TQStyleSheet::escape(c->onlinetqStatus().description())); + TQStyleSheet::escape(c->onlineStatus().description())); // figure out what's happened - enum ChangeType { noChange, noEvent, signedIn, changedtqStatus, signedOut }; + enum ChangeType { noChange, noEvent, signedIn, changedStatus, signedOut }; ChangeType t = noChange; //kdDebug( 14000 ) << k_funcinfo << m_metaContact->displayName() << - //" - Old MC Status: " << m_oldtqStatus.status() << ", New MC Status: " << newtqStatus.status() << endl; + //" - Old MC Status: " << m_oldStatus.status() << ", New MC Status: " << newStatus.status() << endl; // first, exclude changes due to blocking or subscription changes at the protocol level - if ( ( m_oldtqStatus.status() == Kopete::OnlineStatus::Unknown - || newtqStatus.status() == Kopete::OnlineStatus::Unknown ) ) + if ( ( m_oldStatus.status() == Kopete::OnlineStatus::Unknown + || newStatus.status() == Kopete::OnlineStatus::Unknown ) ) t = noEvent; // This means the contact's changed from or to unknown - due to a protocol state change, not a contact state change else // we're dealing with a genuine contact state change { - if ( m_oldtqStatus.status() == Kopete::OnlineStatus::Offline ) + if ( m_oldStatus.status() == Kopete::OnlineStatus::Offline ) { - if ( newtqStatus.status() != Kopete::OnlineStatus::Offline ) + if ( newStatus.status() != Kopete::OnlineStatus::Offline ) { //kdDebug( 14000 ) << "signed in" << endl; t = signedIn; // contact has gone from offline to something else, it's a sign-in } } - else if ( m_oldtqStatus.status() == Kopete::OnlineStatus::Online - || m_oldtqStatus.status() == Kopete::OnlineStatus::Away - || m_oldtqStatus.status() == Kopete::OnlineStatus::Invisible) + else if ( m_oldStatus.status() == Kopete::OnlineStatus::Online + || m_oldStatus.status() == Kopete::OnlineStatus::Away + || m_oldStatus.status() == Kopete::OnlineStatus::Invisible) { - if ( newtqStatus.status() == Kopete::OnlineStatus::Offline ) + if ( newStatus.status() == Kopete::OnlineStatus::Offline ) { //kdDebug( 14000 ) << "signed OUT" << endl; t = signedOut; // contact has gone from an online state to an offline state, it's a sign out } - else if ( m_oldtqStatus > newtqStatus || m_oldtqStatus < newtqStatus ) // operator!= is useless because it's an identity operator, not an equivalence operator + else if ( m_oldStatus > newStatus || m_oldStatus < newStatus ) // operator!= is useless because it's an identity operator, not an equivalence operator { // contact has changed online states, it's a status change, // and the preferredContact changed status, or there is a new preferredContacat // so it's worth notifying //kdDebug( 14000 ) << "changed status" << endl; - t = changedtqStatus; + t = changedStatus; } } - else if ( m_oldtqStatus != newtqStatus ) + else if ( m_oldStatus != newStatus ) { //kdDebug( 14000 ) << "non-event" << endl; // catch-all for any other status change we don't know about @@ -441,7 +441,7 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) connect(KNotification::event(m_metaContact, "kopete_contact_online", text, m_metaContact->photo(), KopeteSystemTray::systemTray(), i18n( "Chat" )) , TQT_SIGNAL(activated(unsigned int )) , this, TQT_SLOT( execute() ) ); break; - case changedtqStatus: + case changedStatus: connect(KNotification::event(m_metaContact, "kopete_contact_status_change", text, m_metaContact->photo(), KopeteSystemTray::systemTray(), i18n( "Chat" )) , TQT_SIGNAL(activated(unsigned int )) , this, TQT_SLOT( execute() )); break; @@ -468,7 +468,7 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) } // make a note of the current status for the next time we get a status change - m_oldtqStatus = newtqStatus; + m_oldStatus = newStatus; if ( m_parentGroup ) m_parentGroup->refreshDisplayName(); @@ -802,9 +802,9 @@ void KopeteMetaContactLVI::updateVisibility() void KopeteMetaContactLVI::slotContactPropertyChanged( Kopete::Contact *contact, const TQString &key, const TQVariant &old, const TQVariant &newVal ) { -// if ( key == TQString::tqfromLatin1("awayMessage") ) +// if ( key == TQString::fromLatin1("awayMessage") ) // kdDebug( 14000 ) << k_funcinfo << "contact=" << contact->contactId() << ", isonline=" << contact->isOnline() << ", alloffline=" << !m_metaContact->isOnline() << ", oldvalue=" << old.toString() << ", newvalue=" << newVal.toString() << endl; - if ( key == TQString::tqfromLatin1("awayMessage") && d->extraText && old != newVal ) + if ( key == TQString::fromLatin1("awayMessage") && d->extraText && old != newVal ) { bool allOffline = !m_metaContact->isOnline(); if ( newVal.toString().isEmpty() || ( !contact->isOnline() && !allOffline ) ) @@ -839,7 +839,7 @@ void KopeteMetaContactLVI::slotContactPropertyChanged( Kopete::Contact *contact, d->extraText->setText( newVal.toString() ); } } // wtf? KopeteMetaContact also connects this signals and emits photoChanged! why no connect photoChanged to slotPhotoChanged? - /*else if ( key == TQString::tqfromLatin1("photo") && (m_metaContact->photoSourceContact() == contact) && (m_metaContact->photoSource() == Kopete::MetaContact::SourceContact)) + /*else if ( key == TQString::fromLatin1("photo") && (m_metaContact->photoSourceContact() == contact) && (m_metaContact->photoSource() == Kopete::MetaContact::SourceContact)) { slotPhotoChanged(); }*/ @@ -855,8 +855,8 @@ void KopeteMetaContactLVI::slotContactAdded( Kopete::Contact *c ) updateContactIcon( c ); - slotContactPropertyChanged( c, TQString::tqfromLatin1("awayMessage"), - TQVariant(), c->property( TQString::tqfromLatin1("awayMessage") ).value() ); + slotContactPropertyChanged( c, TQString::fromLatin1("awayMessage"), + TQVariant(), c->property( TQString::fromLatin1("awayMessage") ).value() ); } void KopeteMetaContactLVI::slotContactRemoved( Kopete::Contact *c ) @@ -870,8 +870,8 @@ void KopeteMetaContactLVI::slotContactRemoved( Kopete::Contact *c ) if ( ListView::Component *comp = contactComponent( c ) ) delete comp; - slotContactPropertyChanged( c, TQString::tqfromLatin1("awayMessage"), - c->property( TQString::tqfromLatin1("awayMessage") ).value(), TQVariant() ); + slotContactPropertyChanged( c, TQString::fromLatin1("awayMessage"), + c->property( TQString::fromLatin1("awayMessage") ).value(), TQVariant() ); } void KopeteMetaContactLVI::updateContactIcons() @@ -884,9 +884,9 @@ void KopeteMetaContactLVI::updateContactIcons() void KopeteMetaContactLVI::updateContactIcon( Kopete::Contact *c ) { - KGlobal::config()->setGroup( TQString::tqfromLatin1("ContactList") ); + KGlobal::config()->setGroup( TQString::fromLatin1("ContactList") ); bool bHideOffline = KGlobal::config()->readBoolEntry( - TQString::tqfromLatin1("HideOfflineContacts"), false ); + TQString::fromLatin1("HideOfflineContacts"), false ); if ( KopetePrefs::prefs()->showOffline() ) bHideOffline = false; diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.h b/kopete/kopete/contactlist/kopetemetacontactlvi.h index 9dcdcc4f..fc755158 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.h +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.h @@ -171,7 +171,7 @@ private: int m_pixelWide; - Kopete::OnlineStatus m_oldtqStatus; + Kopete::OnlineStatus m_oldStatus; TQPixmap m_oldStatusIcon; TQPixmap m_originalBlinkIcon; diff --git a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui index da5b2d99..831365b7 100644 --- a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>107</width> <height>20</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -211,7 +211,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -242,13 +242,13 @@ <property name="name"> <cstring>photoLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>64</width> <height>92</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>64</width> <height>32767</height> @@ -301,7 +301,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -352,7 +352,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -376,7 +376,7 @@ <property name="name"> <cstring>btnClearPhoto</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -519,7 +519,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -538,7 +538,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>170</height> diff --git a/kopete/kopete/eventsrc b/kopete/kopete/eventsrc index 3d05847b..9d3cf2f7 100644 --- a/kopete/kopete/eventsrc +++ b/kopete/kopete/eventsrc @@ -503,7 +503,7 @@ default_presentation=0 [kopete_contact_status_change] -Name=tqStatus Change +Name=Status Change Name[ar]=تغير Øالة Name[be]=Змена Ñтану Name[bg]=Променено ÑÑŠÑтоÑние на приÑтел @@ -512,10 +512,10 @@ Name[bs]=Izmjena statusa Name[ca]=Canvia estatus Name[cs]=ZmÄ›na stavu Name[cy]=Newid Cyflwr -Name[da]=tqStatusændring +Name[da]=Statusændring Name[de]=Statuswechsel Name[el]=Αλλαγή κατάστασης -Name[eo]=tqStatus-ÅanÄo +Name[eo]=Status-ÅanÄo Name[es]=Cambiar estado Name[et]=Staatuse muutus Name[eu]=Egoera aldaketa @@ -537,14 +537,14 @@ Name[km]=ការផ្លាស់ប្ដូរ​ស្ážáž¶áž“ភាព Name[lt]=BÅ«senos pakitimas Name[mk]=Промена на ÑтатуÑот Name[nb]=Endre status -Name[nds]=tqStatusännern +Name[nds]=Statusännern Name[ne]=वसà¥à¤¤à¥à¤¸à¥à¤¥à¤¿à¤¤à¤¿ परिवरà¥à¤¤à¤¨ Name[nl]=Statusverandering Name[nn]=Statusendring Name[pa]=ਹਾਲਤ ਬਦਲੀ Name[pl]=Zmiana statusu Name[pt]=Mudança de Estado -Name[pt_BR]=Mudança de tqStatus +Name[pt_BR]=Mudança de Status Name[ro]=Modificare stare Name[ru]=Изменение ÑтатуÑа Name[se]=Stáhtusrievdadus @@ -552,7 +552,7 @@ Name[sk]=Zmena stavu Name[sl]=Sprememba stanja Name[sr]=Промена ÑтатуÑа Name[sr@Latn]=Promena statusa -Name[sv]=tqStatusändring +Name[sv]=Statusändring Name[ta]=நிலை மாறà¯à®±à®®à¯ Name[tg]=Ивази Ҳолат Name[tr]=Durum DeÄŸiÅŸimi @@ -571,7 +571,7 @@ Comment[bs]=Kontakt je promijenio svoj online status Comment[ca]=L'estat d'un contacte ha canviat Comment[cs]=Osoba zmÄ›nila online stav Comment[da]=En kontakts status pÃ¥ nettet er ændret -Comment[de]=Ein Benutzer wechselt seinen tqStatus. +Comment[de]=Ein Benutzer wechselt seinen Status. Comment[el]=Μια επαφή άλλαξε αυτή τη στιγμή κατάσταση Comment[es]=El estado de conexión de un contacto ha cambiado Comment[et]=Kontakt muutis oma võrgusoleku staatust @@ -591,7 +591,7 @@ Comment[km]=បាន​ផ្លាស់ប្ដូរ​ស្ážáž¶áž“áž—áž Comment[lt]=Kontaktinio asmens bÅ«sena pakito Comment[mk]=СтатуÑот на контактот на линија Ñе измени Comment[nb]=En bruker endret tilkobling til nettet -Comment[nds]=De Tokoppel-tqStatus vun en Kontakt hett sik ännert +Comment[nds]=De Tokoppel-Status vun en Kontakt hett sik ännert Comment[ne]=समà¥à¤ªà¤°à¥à¤•à¤•à¥‹ अनलाइन वसà¥à¤¤à¥à¤¸à¥à¤¥à¤¿à¤¤à¤¿ परिवरà¥à¤¤à¤¨ à¤à¤¯à¥‹ Comment[nl]=Gebruiker wijzigde online status Comment[nn]=Kontakt endrar status diff --git a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp index 961dec84..816f45f3 100644 --- a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp +++ b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp @@ -153,7 +153,7 @@ void parseKey( const TQString &group, const TQString &key, const TQString &value !ircNick.isEmpty( ) && !ircServer.isEmpty() && !ircPort.isEmpty() ) { - accountId = TQString::tqfromLatin1( "%1@%2:%3" ).tqarg( ircNick, ircServer, ircPort ); + accountId = TQString::fromLatin1( "%1@%2:%3" ).tqarg( ircNick, ircServer, ircPort ); } } /* diff --git a/kopete/kopete/kconf_update/kopete-nameTracking.cpp b/kopete/kopete/kconf_update/kopete-nameTracking.cpp index f1a4e37d..c0a556e7 100644 --- a/kopete/kopete/kconf_update/kopete-nameTracking.cpp +++ b/kopete/kopete/kconf_update/kopete-nameTracking.cpp @@ -25,7 +25,7 @@ static TQTextStream qcerr( stderr, IO_WriteOnly ); int main() { KInstance* inst = new KInstance( "Update script" ); - TQString filename = locateLocal( "data", TQString::tqfromLatin1( "kopete/contactlist.xml" ) ); + TQString filename = locateLocal( "data", TQString::fromLatin1( "kopete/contactlist.xml" ) ); // Load contact list & save backup. TQFile contactListFile( filename ); @@ -33,7 +33,7 @@ int main() TQDomDocument contactList; contactList.setContent( &contactListFile ); contactListFile.close(); - TQDir().rename( filename, filename + TQString::tqfromLatin1( ".bak" ) ); + TQDir().rename( filename, filename + TQString::fromLatin1( ".bak" ) ); // parse the XML file TQDomElement list = contactList.documentElement(); @@ -43,7 +43,7 @@ int main() { // update all the MetaContacts - if( mcElement.tagName() == TQString::tqfromLatin1("meta-contact") ) + if( mcElement.tagName() == TQString::fromLatin1("meta-contact") ) { TQDomElement displayName; TQDomElement subcontact; @@ -51,13 +51,13 @@ int main() TQDomElement elem = mcElement.firstChild().toElement(); while( !elem.isNull() ) { - if( elem.tagName() == TQString::tqfromLatin1( "display-name" ) ) + if( elem.tagName() == TQString::fromLatin1( "display-name" ) ) displayName = elem; - if( elem.tagName() == TQString::tqfromLatin1( "plugin-data" ) ) + if( elem.tagName() == TQString::fromLatin1( "plugin-data" ) ) { // check if it's a contact by checking for "protocol" substring in the tag, // and the presence of a contactId child element. - TQString pluginId = elem.attribute( TQString::tqfromLatin1( "plugin-id" ) ); + TQString pluginId = elem.attribute( TQString::fromLatin1( "plugin-id" ) ); bool isProtocol = ( pluginId.contains( "protocol", false ) > 0 ); // case-insensitive search bool hasContactId = false; TQDomNode field = elem.firstChild(); @@ -66,8 +66,8 @@ int main() TQDomElement fieldElem = field.toElement(); if( !fieldElem.isNull() && - fieldElem.tagName() == TQString::tqfromLatin1( "plugin-data-field" ) && - fieldElem.attribute( TQString::tqfromLatin1( "key" ) ) == TQString::tqfromLatin1( "contactId" ) ) + fieldElem.tagName() == TQString::fromLatin1( "plugin-data-field" ) && + fieldElem.attribute( TQString::fromLatin1( "key" ) ) == TQString::fromLatin1( "contactId" ) ) { hasContactId = true; break; @@ -85,8 +85,8 @@ int main() // check if we're even tracking the subcontact's name // if displayName.isNull(), it simply won't find the attribute; no harm done bool tracking = - ( displayName.attribute( TQString::tqfromLatin1( "trackChildNameChanges" ), - TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); + ( displayName.attribute( TQString::fromLatin1( "trackChildNameChanges" ), + TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); if( !displayName.isNull() && !subcontact.isNull() && tracking ) { // collect info @@ -94,26 +94,26 @@ int main() TQString nsPID; TQString nsAID; - nsPID = subcontact.attribute( TQString::tqfromLatin1( "plugin-id" ) ); + nsPID = subcontact.attribute( TQString::fromLatin1( "plugin-id" ) ); TQDomNode field = subcontact.firstChild(); while( !field.isNull() ) { TQDomElement fieldElem = field.toElement(); - if( !fieldElem.isNull() && fieldElem.tagName() == TQString::tqfromLatin1( "plugin-data-field" ) ) + if( !fieldElem.isNull() && fieldElem.tagName() == TQString::fromLatin1( "plugin-data-field" ) ) { - if( fieldElem.attribute( TQString::tqfromLatin1( "key" ) ) == TQString::tqfromLatin1( "contactId" ) ) + if( fieldElem.attribute( TQString::fromLatin1( "key" ) ) == TQString::fromLatin1( "contactId" ) ) nsCID = fieldElem.text(); - if( fieldElem.attribute( TQString::tqfromLatin1( "key" ) ) == TQString::tqfromLatin1( "accountId" ) ) + if( fieldElem.attribute( TQString::fromLatin1( "key" ) ) == TQString::fromLatin1( "accountId" ) ) nsAID = fieldElem.text(); } field = field.nextSibling(); } // create the tracking info - displayName.setAttribute( TQString::tqfromLatin1( "nameSourceContactId" ), nsCID ); - displayName.setAttribute( TQString::tqfromLatin1( "nameSourcePluginId" ), nsPID ); - displayName.setAttribute( TQString::tqfromLatin1( "nameSourceAccountId" ), nsAID ); + displayName.setAttribute( TQString::fromLatin1( "nameSourceContactId" ), nsCID ); + displayName.setAttribute( TQString::fromLatin1( "nameSourcePluginId" ), nsPID ); + displayName.setAttribute( TQString::fromLatin1( "nameSourceAccountId" ), nsAID ); } } diff --git a/kopete/kopete/kimiface.h b/kopete/kopete/kimiface.h index 6c83c299..9c5e4306 100644 --- a/kopete/kopete/kimiface.h +++ b/kopete/kopete/kimiface.h @@ -90,7 +90,7 @@ k_dcop: * @param uid the KABC uid you want the presence for. * @return a numeric representation of presence - currently one of 0 (Unknown), 1 (Offline), 2 (Connecting), 3 (Away), 4 (Online) */ - virtual int presencetqStatus( const TQString & uid ) = 0; + virtual int presenceStatus( const TQString & uid ) = 0; /** * Indicate if a given uid can receive files * @param uid the KABC uid you are interested in. @@ -177,7 +177,7 @@ k_dcop_signals: * Indicates that a contact's presence has changed * @param uid the contact whose presence changed. * @param appId the dcop application id of the program the signal originates from. - * @param presence the new numeric presence @ref presencetqStatus + * @param presence the new numeric presence @ref presenceStatus */ void contactPresenceChanged( TQString uid, TQCString appId, int presence ); }; diff --git a/kopete/kopete/kimifaceimpl.cpp b/kopete/kopete/kimifaceimpl.cpp index b9fffeb2..11cbeeb0 100644 --- a/kopete/kopete/kimifaceimpl.cpp +++ b/kopete/kopete/kimifaceimpl.cpp @@ -127,7 +127,7 @@ TQString KIMIfaceImpl::displayName( const TQString & uid ) return name; } -int KIMIfaceImpl::presencetqStatus( const TQString & uid ) +int KIMIfaceImpl::presenceStatus( const TQString & uid ) { //kdDebug( 14000 ) << k_funcinfo << endl; int p = -1; diff --git a/kopete/kopete/kimifaceimpl.h b/kopete/kopete/kimifaceimpl.h index d99c6335..ec3a45e8 100644 --- a/kopete/kopete/kimifaceimpl.h +++ b/kopete/kopete/kimifaceimpl.h @@ -42,7 +42,7 @@ public: bool isPresent( const TQString &uid ); TQString displayName( const TQString &uid ); TQString presenceString( const TQString &uid ); - int presencetqStatus( const TQString &uid ); + int presenceStatus( const TQString &uid ); bool canReceiveFiles( const TQString &uid ); bool canRespond( const TQString &uid ); TQString locate( const TQString &contactId, const TQString &protocol ); diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp index d23c74f7..a2c88990 100644 --- a/kopete/kopete/kopeteapplication.cpp +++ b/kopete/kopete/kopeteapplication.cpp @@ -221,7 +221,7 @@ void KopeteApplication::slotAllPluginsLoaded() for ( QCStringList::ConstIterator it = connectArgsC.begin(); it != connectArgsC.end(); ++it ) { - TQStringList split = TQStringList::split( ',', TQString::tqfromLatin1( *it ) ); + TQStringList split = TQStringList::split( ',', TQString::fromLatin1( *it ) ); for ( TQStringList::ConstIterator it2 = split.begin(); it2 != split.end(); ++it2 ) { @@ -231,7 +231,7 @@ void KopeteApplication::slotAllPluginsLoaded() for ( TQStringList::ConstIterator i = connectArgs.begin(); i != connectArgs.end(); ++i ) { - TQRegExp rx( TQString::tqfromLatin1( "([^\\|]*)\\|\\|(.*)" ) ); + TQRegExp rx( TQString::fromLatin1( "([^\\|]*)\\|\\|(.*)" ) ); rx.search( *i ); TQString protocolId = rx.cap( 1 ); TQString accountId = rx.cap( 2 ); diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp index a42a4e8e..5e0029f0 100644 --- a/kopete/kopete/kopeteballoon.cpp +++ b/kopete/kopete/kopeteballoon.cpp @@ -78,7 +78,7 @@ KopeteBalloon::KopeteBalloon(const TQString &text, const TQString &pix) //TQLabel *mCaption = new TQLabel(text, this, "mCaption"); KopeteActiveLabel *mCaption = new KopeteActiveLabel(text, this, "mCaption"); mCaption->setPalette(TQToolTip::palette()); - mCaption->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + mCaption->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); if (!pix.isEmpty()) { diff --git a/kopete/kopete/kopeteiface.cpp b/kopete/kopete/kopeteiface.cpp index 2055e002..18a35d82 100644 --- a/kopete/kopete/kopeteiface.cpp +++ b/kopete/kopete/kopeteiface.cpp @@ -74,7 +74,7 @@ TQStringList KopeteIface::onlineContacts() return result; } -TQStringList KopeteIface::contactstqStatus() +TQStringList KopeteIface::contactsStatus() { return Kopete::ContactList::self()->contactStatuses(); } @@ -114,7 +114,7 @@ void KopeteIface::sendFile(const TQString &displayName, const KURL &sourceURL, */ -TQString KopeteIface::onlinetqStatus( const TQString &metaContactId ) +TQString KopeteIface::onlineStatus( const TQString &metaContactId ) { Kopete::MetaContact *m = Kopete::ContactList::self()->metaContact( metaContactId ); if( m ) diff --git a/kopete/kopete/kopeteiface.h b/kopete/kopete/kopeteiface.h index 68124007..f68c3c57 100644 --- a/kopete/kopete/kopeteiface.h +++ b/kopete/kopete/kopeteiface.h @@ -46,8 +46,8 @@ k_dcop: // FIXME: Do we *need* this one? Sounds error prone to me, because // nicknames can contain parentheses too. - // Better add a contacttqStatus( const TQString id ) I'd say - Martijn - TQStringList contactstqStatus(); + // Better add a contactStatus( const TQString id ) I'd say - Martijn + TQStringList contactsStatus(); /** * Open a chat to a contact, and optionally set some initial text @@ -58,7 +58,7 @@ k_dcop: * Describe the status of a contact by their metaContactId, * aka their uid in KABC. */ - TQString onlinetqStatus( const TQString &metaContactId ); + TQString onlineStatus( const TQString &metaContactId ); /** * Message a contact by their metaContactId, aka their uid in KABC. diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index 86fbe897..1b1977a1 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -327,13 +327,13 @@ void KopeteWindow::initActions() slotConfigChanged(); globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) ); - globalAccel->insert( TQString::tqfromLatin1("Read Message"), i18n("Read Message"), i18n("Read the next pending message"), + globalAccel->insert( TQString::fromLatin1("Read Message"), i18n("Read Message"), i18n("Read the next pending message"), CTRL+SHIFT+Key_I, KKey::QtWIN+CTRL+Key_I, Kopete::ChatSessionManager::self(), TQT_SLOT(slotReadMessage()) ); - globalAccel->insert( TQString::tqfromLatin1("Show/Hide Contact List"), i18n("Show/Hide Contact List"), i18n("Show or hide the contact list"), + globalAccel->insert( TQString::fromLatin1("Show/Hide Contact List"), i18n("Show/Hide Contact List"), i18n("Show or hide the contact list"), CTRL+SHIFT+Key_S, KKey::QtWIN+CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotShowHide()) ); - globalAccel->insert( TQString::tqfromLatin1("Set Away/Back"), i18n("Set Away/Back"), i18n("Sets away from keyboard or sets back"), + globalAccel->insert( TQString::fromLatin1("Set Away/Back"), i18n("Set Away/Back"), i18n("Sets away from keyboard or sets back"), CTRL+SHIFT+Key_W, KKey::QtWIN+CTRL+SHIFT+Key_W, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAway()) ); globalAccel->readSettings(); @@ -779,7 +779,7 @@ void KopeteWindow::slotAccountStatusIconChanged( Kopete::Contact *contact ) kdDebug( 14000 ) << k_funcinfo << contact->property( Kopete::Global::Properties::self()->awayMessage() ).value() << endl; // update the global status label if the change doesn't // TQString newAwayMessage = contact->property( Kopete::Global::Properties::self()->awayMessage() ).value().toString(); - Kopete::OnlineStatus status = contact->onlinetqStatus(); + Kopete::OnlineStatus status = contact->onlineStatus(); /* if ( status.status() != Kopete::OnlineStatus::Connecting ) { TQString globalMessage = m_globalStatusMessage->text(); @@ -861,7 +861,7 @@ void KopeteWindow::makeTrayToolTip() { TQToolTip::remove(m_tray); - TQString tt = TQString::tqfromLatin1("<qt>"); + TQString tt = TQString::fromLatin1("<qt>"); TQPtrList<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts(); for(Kopete::Account *a = accounts.first(); a; a = accounts.next()) { @@ -869,9 +869,9 @@ void KopeteWindow::makeTrayToolTip() tt += i18n( "Account tooltip information: <nobr>ICON <b>PROTOCOL:</b> NAME (<i>STATUS</i>)<br/>", "<nobr><img src=\"kopete-account-icon:%3:%4\"> <b>%1:</b> %2 (<i>%5</i>)<br/>" ) .tqarg( a->protocol()->displayName() ).tqarg( a->accountLabel(), KURL::encode_string( a->protocol()->pluginId() ), - KURL::encode_string( a->accountId() ), self->onlinetqStatus().description() ); + KURL::encode_string( a->accountId() ), self->onlineStatus().description() ); } - tt += TQString::tqfromLatin1("</qt>"); + tt += TQString::fromLatin1("</qt>"); TQToolTip::add(m_tray, tt); } } @@ -954,11 +954,11 @@ void KopeteWindow::setStatusMessage( const TQString & message ) for ( TQPtrListIterator<Kopete::Account> it( Kopete::AccountManager::self()->accounts() ); it.current(); ++it ) { Kopete::Contact *self = it.current()->myself(); - bool isInvisible = self && self->onlinetqStatus().status() == Kopete::OnlineStatus::Invisible; + bool isInvisible = self && self->onlineStatus().status() == Kopete::OnlineStatus::Invisible; if ( it.current()->isConnected() && !isInvisible ) { changed = true; - it.current()->setOnlineStatus( self->onlinetqStatus(), message ); + it.current()->setOnlineStatus( self->onlineStatus(), message ); } } Kopete::Away::getInstance()->setGlobalAwayMessage( message ); diff --git a/kopete/kopete/kopetewindow.h b/kopete/kopete/kopetewindow.h index 7d881c79..4148104a 100644 --- a/kopete/kopete/kopetewindow.h +++ b/kopete/kopete/kopetewindow.h @@ -175,7 +175,7 @@ private slots: void slotAllPluginsLoaded(); /** - * Protected slot to setup the Set Global tqStatus Message menu. + * Protected slot to setup the Set Global Status Message menu. */ void slotBuildStatusMessageMenu(); void slotStatusMessageSelected( int i ); diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp index 7982d01e..5fb204ea 100644 --- a/kopete/kopete/systemtray.cpp +++ b/kopete/kopete/systemtray.cpp @@ -164,7 +164,7 @@ void KopeteSystemTray::startBlink( const TQMovie &movie ) void KopeteSystemTray::startBlink() { if ( mMovie.isNull() ) - mMovie = KGlobal::iconLoader()->loadMovie( TQString::tqfromLatin1( "newmessage" ), KIcon::Panel ); + mMovie = KGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Panel ); startBlink( mMovie ); } @@ -343,12 +343,12 @@ void KopeteSystemTray::slotReevaluateAccountStates() if (!c) continue; - if (c->onlinetqStatus().status() == Kopete::OnlineStatus::Online) + if (c->onlineStatus().status() == Kopete::OnlineStatus::Online) { bOnline = true; // at least one contact is online } - else if (c->onlinetqStatus().status() == Kopete::OnlineStatus::Away - || c->onlinetqStatus().status() == Kopete::OnlineStatus::Invisible) + else if (c->onlineStatus().status() == Kopete::OnlineStatus::Away + || c->onlineStatus().status() == Kopete::OnlineStatus::Invisible) { bAway = true; // at least one contact is away or invisible } @@ -397,7 +397,7 @@ TQString KopeteSystemTray::squashMessage( const Kopete::Message& msg ) // Escape it after snipping it to not snip entities msgText =msg.plainBody() ; if( msgText.length() > 30 ) - msgText = msgText.left( 30 ) + TQString::tqfromLatin1( " ..." ); + msgText = msgText.left( 30 ) + TQString::fromLatin1( " ..." ); msgText=Kopete::Message::escape(msgText); } else @@ -411,17 +411,17 @@ TQString KopeteSystemTray::squashMessage( const Kopete::Message& msg ) { TQString urlWithoutProtocol = rx.cap( 4 ); shorterUrl = urlWithoutProtocol.left( 27 ) - + TQString::tqfromLatin1( "... " ); + + TQString::fromLatin1( "... " ); } else { shorterUrl = fullUrl.left( 27 ) - + TQString::tqfromLatin1( "... " ); + + TQString::fromLatin1( "... " ); } // remove message text - msgText = TQString::tqfromLatin1( "... " ) + + msgText = TQString::fromLatin1( "... " ) + rx.cap( 1 ) + - TQString::tqfromLatin1( " ..." ); + TQString::fromLatin1( " ..." ); // find last occurrence of URL (the one inside the <a> tag) int revUrlOffset = msgText.findRev( fullUrl ); msgText.replace( revUrlOffset, diff --git a/kopete/libkopete/avdevice/qvideostream.cpp b/kopete/libkopete/avdevice/qvideostream.cpp index 113aa16d..b1f821c9 100644 --- a/kopete/libkopete/avdevice/qvideostream.cpp +++ b/kopete/libkopete/avdevice/qvideostream.cpp @@ -213,7 +213,7 @@ void QVideoStream::init() d->shmh.shmaddr = (char *)shmat(d->shmh.shmid, 0, 0); d->xim->data = (char*)d->shmh.shmaddr; d->shmh.readOnly = False; - tqStatus s = XShmAttach(_w->x11Display(), &(d->shmh)); + Status s = XShmAttach(_w->x11Display(), &(d->shmh)); if (s) { XSync(_w->x11Display(), False); shmctl(d->shmh.shmid, IPC_RMID, 0); @@ -543,7 +543,7 @@ QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* parent, const char* name) connect(_w, TQT_SIGNAL(resized(int, int)), this, TQT_SLOT(resize(int, int))); - tqtopLevelWidget()->installEventFilter(this); + topLevelWidget()->installEventFilter(this); _glfunTimer = new TQTimer(); } diff --git a/kopete/libkopete/clientiface.h b/kopete/libkopete/clientiface.h index ef1ac3f1..8385cfb8 100644 --- a/kopete/libkopete/clientiface.h +++ b/kopete/libkopete/clientiface.h @@ -14,14 +14,14 @@ k_dcop: /** * Get the status of the connection to the given host. * @param host - * @return a NetworktqStatus::EnumtqStatus representing the state of the connection to the given host + * @return a NetworkStatus::EnumStatus representing the state of the connection to the given host */ virtual int status( const TQString & host = TQString() ) = 0; /** * Request a connection to the named host, registering the application's usage of this connection * @param host The hostname the client wants to connect to. * @param userInitiated Indicates whether the connection is a direct result of a user action or is a background task. Used by the daemon to decide whether to create an on-demand connection. - * @return An NetworktqStatus::EnumRequestResult indicating whether the request was accepted + * @return An NetworkStatus::EnumRequestResult indicating whether the request was accepted */ virtual int request( const TQString & host, bool userInitiated ) = 0; /** diff --git a/kopete/libkopete/connectionmanager.cpp b/kopete/libkopete/connectionmanager.cpp index 62169986..4530fa9e 100644 --- a/kopete/libkopete/connectionmanager.cpp +++ b/kopete/libkopete/connectionmanager.cpp @@ -45,19 +45,19 @@ void ConnectionManager::initialise() { // determine initial state and set the state object accordingly. d->m_state = Inactive; - updatetqStatus(); + updateStatus(); } -void ConnectionManager::updatetqStatus() +void ConnectionManager::updateStatus() { - NetworktqStatus::EnumtqStatus daemontqStatus = (NetworktqStatus::EnumtqStatus)d->m_stub->status( TQString() ); + NetworkStatus::EnumStatus daemonStatus = (NetworkStatus::EnumStatus)d->m_stub->status( TQString() ); kdDebug() << k_funcinfo << endl; - switch ( daemontqStatus ) + switch ( daemonStatus ) { - case NetworktqStatus::Offline: - case NetworktqStatus::OfflineFailed: - case NetworktqStatus::OfflineDisconnected: - case NetworktqStatus::ShuttingDown: + case NetworkStatus::Offline: + case NetworkStatus::OfflineFailed: + case NetworkStatus::OfflineDisconnected: + case NetworkStatus::ShuttingDown: if ( d->m_state == Online ) { kdDebug() << "STATE IS PENDING" << endl; @@ -69,13 +69,13 @@ void ConnectionManager::updatetqStatus() d->m_state = Offline; } break; - case NetworktqStatus::Establishing: - case NetworktqStatus::Online: + case NetworkStatus::Establishing: + case NetworkStatus::Online: kdDebug() << "STATE IS ONLINE" << endl; d->m_state = Online; break; - case NetworktqStatus::NoNetworks: - case NetworktqStatus::Unreachable: + case NetworkStatus::NoNetworks: + case NetworkStatus::Unreachable: kdDebug() << "STATE IS INACTIVE" << endl; d->m_state = Inactive; break; @@ -87,38 +87,38 @@ ConnectionManager::~ConnectionManager() delete d; } -NetworktqStatus::EnumtqStatus ConnectionManager::status( const TQString & host ) +NetworkStatus::EnumStatus ConnectionManager::status( const TQString & host ) { // need also to check that the daemon hasn't died - updatetqStatus(); + updateStatus(); if ( d->m_state == Pending ) - return NetworktqStatus::Offline; + return NetworkStatus::Offline; if ( d->m_state == Online ) - return NetworktqStatus::Online; + return NetworkStatus::Online; if ( d->m_state == Offline ) - return NetworktqStatus::Offline; - return NetworktqStatus::NoNetworks; + return NetworkStatus::Offline; + return NetworkStatus::NoNetworks; } -NetworktqStatus::EnumRequestResult ConnectionManager::requestConnection( TQWidget * mainWidget, const TQString & host, bool userInitiated ) +NetworkStatus::EnumRequestResult ConnectionManager::requestConnection( TQWidget * mainWidget, const TQString & host, bool userInitiated ) { kdDebug() << k_funcinfo << endl; - NetworktqStatus::EnumRequestResult result; + NetworkStatus::EnumRequestResult result; // if offline and the user has previously indicated they didn't want any new connections, suppress it if ( d->m_state == Offline && !userInitiated && d->m_userInitiatedOnly ) - result = NetworktqStatus::UserRefused; + result = NetworkStatus::UserRefused; // if offline, ask the user whether this connection should be allowed if ( d->m_state == Offline ) { if ( askToConnect( mainWidget ) ) - //result = NetworktqStatus::Connected; - result = (NetworktqStatus::EnumRequestResult)d->m_stub->request( host, userInitiated ); + //result = NetworkStatus::Connected; + result = (NetworkStatus::EnumRequestResult)d->m_stub->request( host, userInitiated ); else - result = NetworktqStatus::UserRefused; + result = NetworkStatus::UserRefused; } // otherwise, just ask for the connection else - result = (NetworktqStatus::EnumRequestResult)d->m_stub->request( host, userInitiated ); + result = (NetworkStatus::EnumRequestResult)d->m_stub->request( host, userInitiated ); return result; } @@ -131,12 +131,12 @@ void ConnectionManager::relinquishConnection( const TQString & host ) void ConnectionManager::slotStatusChanged( TQString host, int status ) { kdDebug() << k_funcinfo << endl; - updatetqStatus(); + updateStatus(); // reset user initiated only flag if we are now online if ( d->m_state == Online ) d->m_userInitiatedOnly = false; - emit statusChanged( host, (NetworktqStatus::EnumtqStatus)status ); + emit statusChanged( host, (NetworkStatus::EnumStatus)status ); } bool ConnectionManager::askToConnect( TQWidget * mainWidget ) @@ -147,7 +147,7 @@ bool ConnectionManager::askToConnect( TQWidget * mainWidget ) i18n("This application is currently in offline mode. Do you want to connect in order to carry out this operation?"), i18n("Leave Offline Mode?"), i18n("Connect"), i18n("Stay Offline"), - TQString::tqfromLatin1("OfflineModeAlwaysGoOnline") ) == KMessageBox::Yes ); + TQString::fromLatin1("OfflineModeAlwaysGoOnline") ) == KMessageBox::Yes ); } #include "connectionmanager.moc" diff --git a/kopete/libkopete/connectionmanager.h b/kopete/libkopete/connectionmanager.h index 24d59f33..9890e474 100644 --- a/kopete/libkopete/connectionmanager.h +++ b/kopete/libkopete/connectionmanager.h @@ -32,19 +32,19 @@ class KOPETE_EXPORT ConnectionManager : public TQObject, virtual public DCOPObje static ConnectionManager* self(); enum State { Inactive, Online, Offline, Pending }; virtual ~ConnectionManager(); - NetworktqStatus::EnumtqStatus status( const TQString & host ); + NetworkStatus::EnumStatus status( const TQString & host ); // check if a hostname is available. Ask user if offline. Request host - NetworktqStatus::EnumRequestResult requestConnection( TQWidget* mainWidget, const TQString & host, bool userInitiated ); + NetworkStatus::EnumRequestResult requestConnection( TQWidget* mainWidget, const TQString & host, bool userInitiated ); // method to relinquish a connection void relinquishConnection( const TQString & host ); signals: // signal that the network for a hostname is up/down - void statusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status ); + void statusChanged( const TQString & host, NetworkStatus::EnumStatus status ); protected: // sets up internal state void initialise(); // reread the desktop status from the daemon and update internal state - void updatetqStatus(); + void updateStatus(); // ask if the user would like to reconnect bool askToConnect( TQWidget * mainWidget ); k_dcop: diff --git a/kopete/libkopete/kabcpersistence.cpp b/kopete/libkopete/kabcpersistence.cpp index b0727cce..6e712606 100644 --- a/kopete/libkopete/kabcpersistence.cpp +++ b/kopete/libkopete/kabcpersistence.cpp @@ -128,13 +128,13 @@ void KABCPersistence::write( MetaContact * mc ) for ( ; it != addressMap.end(); ++it ) { // read existing data for this key - TQString currentCustomForProtocol = theAddressee.custom( it.key(), TQString::tqfromLatin1( "All" ) ); + TQString currentCustomForProtocol = theAddressee.custom( it.key(), TQString::fromLatin1( "All" ) ); // merge without duplicating TQString toWrite = unionContents( currentCustomForProtocol, it.data().join( TQChar( 0xE000 ) ) ); // Note if nothing ends up in the KABC data, this is because insertCustom does nothing if any param is empty. kdDebug( 14010 ) << k_funcinfo << "Writing: " << it.key() << ", " << "All" << ", " << toWrite << endl; - theAddressee.insertCustom( it.key(), TQString::tqfromLatin1( "All" ), toWrite ); - TQString check = theAddressee.custom( it.key(), TQString::tqfromLatin1( "All" ) ); + theAddressee.insertCustom( it.key(), TQString::fromLatin1( "All" ), toWrite ); + TQString check = theAddressee.custom( it.key(), TQString::fromLatin1( "All" ) ); } ab->insertAddressee( theAddressee ); //kdDebug( 14010 ) << k_funcinfo << "dumping addressbook before write " << endl; @@ -274,20 +274,20 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) splitField( *it, app, name, value ); kdDebug( 14010 ) << "app=" << app << " name=" << name << " value=" << value << endl; - if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) + if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) ) { - if ( name == TQString::tqfromLatin1( "All" ) ) + if ( name == TQString::fromLatin1( "All" ) ) { kdDebug( 14010 ) << " syncing \"" << app << ":" << name << " with contactlist " << endl; // Get the protocol name from the custom field // by chopping the 'messaging/' prefix from the custom field app name TQString protocolName = app.right( app.length() - 10 ); // munge Jabber hack - if ( protocolName == TQString::tqfromLatin1( "xmpp" ) ) - protocolName = TQString::tqfromLatin1( "jabber" ); + if ( protocolName == TQString::fromLatin1( "xmpp" ) ) + protocolName = TQString::fromLatin1( "jabber" ); // Check Kopete supports it - Protocol * proto = dynamic_cast<Protocol*>( PluginManager::self()->loadPlugin( TQString::tqfromLatin1( "kopete_" ) + protocolName ) ); + Protocol * proto = dynamic_cast<Protocol*>( PluginManager::self()->loadPlugin( TQString::fromLatin1( "kopete_" ) + protocolName ) ); if ( !proto ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, @@ -339,7 +339,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) // if not, prompt to add it kdDebug( 14010 ) << proto->pluginId() << "://" << *it << " was not found in the contact list. Prompting to add..." << endl; if ( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), - i18n( "<qt>An address was added to this contact by another application.<br>Would you like to use it in Kopete?<br><b>Protocol:</b> %1<br><b>Address:</b> %2</qt>" ).tqarg( proto->displayName() ).tqarg( *it ), i18n( "Import Address From Address Book" ), i18n("Use"), i18n("Do Not Use"), TQString::tqfromLatin1( "ImportFromKABC" ) ) ) + i18n( "<qt>An address was added to this contact by another application.<br>Would you like to use it in Kopete?<br><b>Protocol:</b> %1<br><b>Address:</b> %2</qt>" ).tqarg( proto->displayName() ).tqarg( *it ), i18n( "Import Address From Address Book" ), i18n("Use"), i18n("Do Not Use"), TQString::fromLatin1( "ImportFromKABC" ) ) ) { // Check the accounts for this protocol are all connected // Most protocols do not allow you to add contacts while offline diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index 6dbc1bac..7eae7e9a 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -141,46 +141,46 @@ bool KAutoConfig::retrieveSettings(bool trackChanges){ if(trackChanges){ // QT - changedMap.insert(TQString::tqfromLatin1(TQBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::tqfromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::tqfromLatin1(TQPUSHBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::tqfromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::tqfromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(activated (int))); + changedMap.insert(TQString::fromLatin1(TQBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::fromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::fromLatin1(TQPUSHBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::fromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::fromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(activated (int))); //qsqlproperty map doesn't store the text, but the value! - //changedMap.insert(TQString::tqfromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQString::tqfromLatin1(TQDATEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDate &))); - changedMap.insert(TQString::tqfromLatin1(TQDATETIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDateTime &))); - changedMap.insert(TQString::tqfromLatin1(TQDIAL_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged (int))); - changedMap.insert(TQString::tqfromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQString::tqfromLatin1(TQSLIDER_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQString::tqfromLatin1(TQSPINBOX_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQString::tqfromLatin1(TQTIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQTime &))); - changedMap.insert(TQString::tqfromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged())); - changedMap.insert(TQString::tqfromLatin1(TQTEXTBROWSER_OBJECT_NAME_STRING), TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert(TQString::tqfromLatin1(TQMULTILINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged())); - changedMap.insert(TQString::tqfromLatin1(TQLISTBOX_OBJECT_NAME_STRING), TQT_SIGNAL(selectionChanged())); - changedMap.insert(TQString::tqfromLatin1(TQTABWIDGET_OBJECT_NAME_STRING), TQT_SIGNAL(currentChanged(TQWidget *))); + //changedMap.insert(TQString::fromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert(TQString::fromLatin1(TQDATEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDate &))); + changedMap.insert(TQString::fromLatin1(TQDATETIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDateTime &))); + changedMap.insert(TQString::fromLatin1(TQDIAL_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged (int))); + changedMap.insert(TQString::fromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert(TQString::fromLatin1(TQSLIDER_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int))); + changedMap.insert(TQString::fromLatin1(TQSPINBOX_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int))); + changedMap.insert(TQString::fromLatin1(TQTIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQTime &))); + changedMap.insert(TQString::fromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged())); + changedMap.insert(TQString::fromLatin1(TQTEXTBROWSER_OBJECT_NAME_STRING), TQT_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert(TQString::fromLatin1(TQMULTILINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged())); + changedMap.insert(TQString::fromLatin1(TQLISTBOX_OBJECT_NAME_STRING), TQT_SIGNAL(selectionChanged())); + changedMap.insert(TQString::fromLatin1(TQTABWIDGET_OBJECT_NAME_STRING), TQT_SIGNAL(currentChanged(TQWidget *))); // KDE - changedMap.insert( TQString::tqfromLatin1("KComboBox"), TQT_SIGNAL(activated (int))); - changedMap.insert( TQString::tqfromLatin1("KFontCombo"), TQT_SIGNAL(activated (int))); - changedMap.insert( TQString::tqfromLatin1("KFontRequester"), TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( TQString::tqfromLatin1("KFontChooser"), TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( TQString::tqfromLatin1("KHistoryCombo"), TQT_SIGNAL(activated (int))); - - changedMap.insert( TQString::tqfromLatin1("KColorButton"), TQT_SIGNAL(changed(const TQColor &))); - changedMap.insert( TQString::tqfromLatin1("KDatePicker"), TQT_SIGNAL(dateSelected (TQDate))); - changedMap.insert( TQString::tqfromLatin1("KEditListBox"), TQT_SIGNAL(changed())); - changedMap.insert( TQString::tqfromLatin1("KListBox"), TQT_SIGNAL(selectionChanged())); - changedMap.insert( TQString::tqfromLatin1("KLineEdit"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( TQString::tqfromLatin1("KPasswordEdit"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( TQString::tqfromLatin1("KRestrictedLine"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( TQString::tqfromLatin1("KTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert( TQString::tqfromLatin1("KTextEdit"), TQT_SIGNAL(textChanged())); - changedMap.insert( TQString::tqfromLatin1("KURLRequester"), TQT_SIGNAL(textChanged (const TQString& ))); - changedMap.insert( TQString::tqfromLatin1("KIntNumInput"), TQT_SIGNAL(valueChanged (int))); - changedMap.insert( TQString::tqfromLatin1("KIntSpinBox"), TQT_SIGNAL(valueChanged (int))); - changedMap.insert( TQString::tqfromLatin1("KDoubleNumInput"), TQT_SIGNAL(valueChanged (double))); + changedMap.insert( TQString::fromLatin1("KComboBox"), TQT_SIGNAL(activated (int))); + changedMap.insert( TQString::fromLatin1("KFontCombo"), TQT_SIGNAL(activated (int))); + changedMap.insert( TQString::fromLatin1("KFontRequester"), TQT_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( TQString::fromLatin1("KFontChooser"), TQT_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( TQString::fromLatin1("KHistoryCombo"), TQT_SIGNAL(activated (int))); + + changedMap.insert( TQString::fromLatin1("KColorButton"), TQT_SIGNAL(changed(const TQColor &))); + changedMap.insert( TQString::fromLatin1("KDatePicker"), TQT_SIGNAL(dateSelected (TQDate))); + changedMap.insert( TQString::fromLatin1("KEditListBox"), TQT_SIGNAL(changed())); + changedMap.insert( TQString::fromLatin1("KListBox"), TQT_SIGNAL(selectionChanged())); + changedMap.insert( TQString::fromLatin1("KLineEdit"), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert( TQString::fromLatin1("KPasswordEdit"), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert( TQString::fromLatin1("KRestrictedLine"), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert( TQString::fromLatin1("KTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert( TQString::fromLatin1("KTextEdit"), TQT_SIGNAL(textChanged())); + changedMap.insert( TQString::fromLatin1("KURLRequester"), TQT_SIGNAL(textChanged (const TQString& ))); + changedMap.insert( TQString::fromLatin1("KIntNumInput"), TQT_SIGNAL(valueChanged (int))); + changedMap.insert( TQString::fromLatin1("KIntSpinBox"), TQT_SIGNAL(valueChanged (int))); + changedMap.insert( TQString::fromLatin1("KDoubleNumInput"), TQT_SIGNAL(valueChanged (double))); } // Go through all of the tqchildren of the widgets and find all known widgets @@ -215,8 +215,8 @@ bool KAutoConfig::saveSettings() { TQVariant defaultValue = d->defaultValues[groupWidget]; TQVariant currentValue = propertyMap->property(groupWidget); #if KDE_IS_VERSION( 3, 1, 90 ) - if(!config->hasDefault(TQString::tqfromLatin1(groupWidget->name())) && currentValue == defaultValue){ - config->revertToDefault(TQString::tqfromLatin1(groupWidget->name())); + if(!config->hasDefault(TQString::fromLatin1(groupWidget->name())) && currentValue == defaultValue){ + config->revertToDefault(TQString::fromLatin1(groupWidget->name())); widgetChanged = true; } else{ @@ -390,7 +390,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, { parseTheChildren = false; // Disable the widget if it is immutable? - if(config->entryIsImmutable( TQString::tqfromLatin1(childWidget->name()))) + if(config->entryIsImmutable( TQString::fromLatin1(childWidget->name()))) childWidget->setEnabled(false); else { @@ -408,15 +408,15 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, propertyMap->setProperty(childWidget, setting); valueChanged = true; } - if(trackChanges && changedMap.find(TQString::tqfromLatin1(childWidget->className())) != + if(trackChanges && changedMap.find(TQString::fromLatin1(childWidget->className())) != changedMap.end()) { - connect(childWidget, changedMap[TQString::tqfromLatin1(childWidget->className())], + connect(childWidget, changedMap[TQString::fromLatin1(childWidget->className())], this, TQT_SIGNAL(widgetModified())); } #ifndef NDEBUG else if(trackChanges && - changedMap.find(TQString::tqfromLatin1(childWidget->className())) == changedMap.end()) + changedMap.find(TQString::fromLatin1(childWidget->className())) == changedMap.end()) { // Without a signal kautoconfigdialog could incorectly // enable/disable the buttons diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp index f9418ea2..5eef5ee7 100644 --- a/kopete/libkopete/knotification.cpp +++ b/kopete/libkopete/knotification.cpp @@ -109,7 +109,7 @@ void KNotification::notifyByMessagebox() return; TQString action=d->actions[0]; - WId winId=d->widget ? d->widget->tqtopLevelWidget()->winId() : 0; + WId winId=d->widget ? d->widget->topLevelWidget()->winId() : 0; if( action.isEmpty()) { @@ -171,7 +171,7 @@ void KNotification::notifyByPassivePopup(const TQPixmap &pix ) TQString title = config.readEntry( "Comment", appName ); //KPassivePopup::message(title, text, icon, senderWinId); - WId winId=d->widget ? d->widget->tqtopLevelWidget()->winId() : 0; + WId winId=d->widget ? d->widget->topLevelWidget()->winId() : 0; KPassivePopup *pop = new KPassivePopup( checkWinId(appName, winId) ); TQObject::connect(this, TQT_SIGNAL(closed()), pop, TQT_SLOT(deleteLater())); @@ -198,22 +198,22 @@ void KNotification::notifyByPassivePopup(const TQPixmap &pix ) } vb=new TQVBox(hb); TQLabel *msg = new TQLabel( d->text, vb, "msg_label" ); - msg->tqsetAlignment( AlignLeft ); + msg->setAlignment( AlignLeft ); } if ( !d->actions.isEmpty() ) { - TQString linkCode=TQString::tqfromLatin1("<p align=\"right\">"); + TQString linkCode=TQString::fromLatin1("<p align=\"right\">"); int i=0; for ( TQStringList::ConstIterator it = d->actions.begin() ; it != d->actions.end(); ++it ) { i++; - linkCode+=TQString::tqfromLatin1(" <a href=\"%1\">%2</a> ").tqarg( TQString::number(i) , TQStyleSheet::escape(*it) ); + linkCode+=TQString::fromLatin1(" <a href=\"%1\">%2</a> ").tqarg( TQString::number(i) , TQStyleSheet::escape(*it) ); } - linkCode+=TQString::tqfromLatin1("</p>"); + linkCode+=TQString::fromLatin1("</p>"); KActiveLabel *link = new KActiveLabel(linkCode , vb ); - //link->tqsetAlignment( AlignRight ); + //link->setAlignment( AlignRight ); TQObject::disconnect(link, TQT_SIGNAL(linkClicked(const TQString &)), link, TQT_SLOT(openLink(const TQString &))); TQObject::connect(link, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(slotPopupLinkClicked(const TQString &))); TQObject::connect(link, TQT_SIGNAL(linkClicked(const TQString &)), pop, TQT_SLOT(hide())); @@ -373,7 +373,7 @@ KNotification *KNotification::userEvent( const TQString& text, const TQPixmap& p notify->d->text=text; notify->d->actions=actions; notify->d->level=level; - WId winId=widget ? widget->tqtopLevelWidget()->winId() : 0; + WId winId=widget ? widget->topLevelWidget()->winId() : 0; //we will catch some event that will not be fired by the old deamon diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index 9f7b2516..27e12b44 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -79,21 +79,21 @@ public: KConfigGroup *configGroup; uint connectionTry; TQString customIcon; - Kopete::OnlineStatus restoretqStatus; + Kopete::OnlineStatus restoreStatus; TQString restoreMessage; }; Account::Account( Protocol *parent, const TQString &accountId, const char *name ) : TQObject( parent, name ), d( new Private( parent, accountId ) ) { - d->configGroup=new KConfigGroup(KGlobal::config(), TQString::tqfromLatin1( "Account_%1_%2" ).tqarg( d->protocol->pluginId(), d->id )); + d->configGroup=new KConfigGroup(KGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).tqarg( d->protocol->pluginId(), d->id )); d->excludeconnect = d->configGroup->readBoolEntry( "ExcludeConnect", false ); d->color = d->configGroup->readColorEntry( "Color", &d->color ); d->customIcon = d->configGroup->readEntry( "Icon", TQString() ); d->priority = d->configGroup->readNumEntry( "Priority", 0 ); - d->restoretqStatus = Kopete::OnlineStatus::Online; + d->restoreStatus = Kopete::OnlineStatus::Online; d->restoreMessage = ""; TQObject::connect( &d->suppressStatusTimer, TQT_SIGNAL( timeout() ), @@ -118,8 +118,8 @@ Account::~Account() void Account::reconnect() { - kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreStatus " << d->restoretqStatus.status() << " restoreMessage " << d->restoreMessage << endl; - setOnlineStatus( d->restoretqStatus, d->restoreMessage ); + kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreStatus " << d->restoreStatus.status() << " restoreMessage " << d->restoreMessage << endl; + setOnlineStatus( d->restoreStatus, d->restoreMessage ); } void Account::disconnected( DisconnectReason reason ) @@ -361,10 +361,10 @@ bool Account::addContact(const TQString &contactId , MetaContact *parent, AddMod KActionMenu * Account::actionMenu() { //default implementation - KActionMenu *menu = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this ); + KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); - menu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), + menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick ) ); @@ -383,7 +383,7 @@ bool Account::isConnected() const bool Account::isAway() const { - return d->myself && ( d->myself->onlinetqStatus().status() == Kopete::OnlineStatus::Away ); + return d->myself && ( d->myself->onlineStatus().status() == Kopete::OnlineStatus::Away ); } Contact * Account::myself() const @@ -417,12 +417,12 @@ void Account::setMyself( Contact *myself ) } void Account::slotOnlineStatusChanged( Contact * /* contact */, - const OnlineStatus &newtqStatus, const OnlineStatus &oldtqStatus ) + const OnlineStatus &newStatus, const OnlineStatus &oldStatus ) { - bool wasOffline = !oldtqStatus.isDefinitelyOnline(); - bool isOffline = !newtqStatus.isDefinitelyOnline(); + bool wasOffline = !oldStatus.isDefinitelyOnline(); + bool isOffline = !newStatus.isDefinitelyOnline(); - if ( wasOffline || newtqStatus.status() == OnlineStatus::Offline ) + if ( wasOffline || newStatus.status() == OnlineStatus::Offline ) { // Wait for five seconds until we treat status notifications for contacts // as unrelated to our own status change. @@ -437,19 +437,19 @@ void Account::slotOnlineStatusChanged( Contact * /* contact */, if ( !isOffline ) { - d->restoretqStatus = newtqStatus; + d->restoreStatus = newStatus; d->restoreMessage = myself()->property( Kopete::Global::Properties::self()->awayMessage() ).value().toString(); // kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreStatus " << d->restoreStatus.status() << " restoreMessage " << d->restoreMessage << endl; } /* kdDebug(14010) << k_funcinfo << "account " << d->id << " changed status. was " - << Kopete::OnlineStatus::statusTypeToString(oldtqStatus.status()) << ", is " - << Kopete::OnlineStatus::statusTypeToString(newtqStatus.status()) << endl;*/ + << Kopete::OnlineStatus::statusTypeToString(oldStatus.status()) << ", is " + << Kopete::OnlineStatus::statusTypeToString(newStatus.status()) << endl;*/ if ( wasOffline != isOffline ) emit isConnectedChanged(); } -void Account::setAllContactstqStatus( const Kopete::OnlineStatus &status ) +void Account::setAllContactsStatus( const Kopete::OnlineStatus &status ) { d->suppressStatusNotification = true; d->suppressStatusTimer.start( 5000, true ); @@ -462,7 +462,7 @@ void Account::setAllContactstqStatus( const Kopete::OnlineStatus &status ) void Account::slotContactPropertyChanged( Contact * /* contact */, const TQString &key, const TQVariant &old, const TQVariant &newVal ) { - if ( key == TQString::tqfromLatin1("awayMessage") && old != newVal && isConnected() ) + if ( key == TQString::fromLatin1("awayMessage") && old != newVal && isConnected() ) { d->restoreMessage = newVal.toString(); // kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreMessage " << d->restoreMessage << endl; @@ -550,7 +550,7 @@ TQString Account::pluginData( Plugin* /*plugin*/, const TQString &key ) const void Account::setAway(bool away, const TQString& reason) { - setOnlineStatus( OnlineStatusManager::self()->onlinetqStatus(protocol() , away ? OnlineStatusManager::Away : OnlineStatusManager::Online) , reason ); + setOnlineStatus( OnlineStatusManager::self()->onlineStatus(protocol() , away ? OnlineStatusManager::Away : OnlineStatusManager::Online) , reason ); } void Account::setCustomIcon( const TQString & i) diff --git a/kopete/libkopete/kopeteaccount.h b/kopete/libkopete/kopeteaccount.h index b7915b5e..90ae678b 100644 --- a/kopete/libkopete/kopeteaccount.h +++ b/kopete/libkopete/kopeteaccount.h @@ -301,7 +301,7 @@ public: /** * @brief Indicate whether the account is away. * - * This is a convenience method that queries @ref Contact::onlinetqStatus() on @ref myself(). + * This is a convenience method that queries @ref Contact::onlineStatus() on @ref myself(). * This function is safe to call if @ref setMyself() has not been called yet. */ bool isAway() const; @@ -409,7 +409,7 @@ protected slots: * * @param status the status to set all contacts of this account except @ref myself() to. */ - void setAllContactstqStatus( const Kopete::OnlineStatus &status ); + void setAllContactsStatus( const Kopete::OnlineStatus &status ); signals: /** @@ -450,10 +450,10 @@ public slots: /** * @brief Go online for this service. * - * @param initialtqStatus is the status to connect with. If it is an invalid status for this + * @param initialStatus is the status to connect with. If it is an invalid status for this * account, the default online for the account should be used. */ - virtual void connect( const Kopete::OnlineStatus& initialtqStatus = OnlineStatus() ) = 0; + virtual void connect( const Kopete::OnlineStatus& initialStatus = OnlineStatus() ) = 0; /** * @brief Go offline for this service. @@ -516,7 +516,7 @@ private slots: /** * The @ref myself() contact's online status changed. */ - void slotOnlineStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &newtqStatus, const Kopete::OnlineStatus &oldtqStatus ); + void slotOnlineStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &newStatus, const Kopete::OnlineStatus &oldStatus ); /** * The @ref myself() contact's property changed. diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp index 69bf272a..7f014519 100644 --- a/kopete/libkopete/kopeteaccountmanager.cpp +++ b/kopete/libkopete/kopeteaccountmanager.cpp @@ -138,7 +138,7 @@ void AccountManager::setAwayAll( const TQString &awayReason, bool away ) { // FIXME: ICQ's invisible online should be set to invisible away Contact *self = it.current()->myself(); - bool isInvisible = self && self->onlinetqStatus().status() == OnlineStatus::Invisible; + bool isInvisible = self && self->onlineStatus().status() == OnlineStatus::Invisible; if ( anyConnected ) { if ( it.current()->isConnected() && !isInvisible ) @@ -160,7 +160,7 @@ void AccountManager::setOnlineStatus( uint category , const TQString& awayMessag for ( TQPtrListIterator<Account> it( d->accounts ); it.current(); ++it ) { Account *account = it.current(); - Kopete::OnlineStatus status = OnlineStatusManager::self()->onlinetqStatus(account->protocol() , katgor); + Kopete::OnlineStatus status = OnlineStatusManager::self()->onlineStatus(account->protocol() , katgor); if ( anyConnected ) { if ( account->isConnected() || ( (flags & ConnectIfOffline) && !account->excludeConnect() ) ) @@ -332,7 +332,7 @@ void AccountManager::removeAccount( Account *account ) { // FIXME: pluginId() should return the internal name and not the class name, so // we can get rid of this hack - Olivier/Martijn - TQString protocolName = protocol->pluginId().remove( TQString::tqfromLatin1( "Protocol" ) ).lower(); + TQString protocolName = protocol->pluginId().remove( TQString::fromLatin1( "Protocol" ) ).lower(); PluginManager::self()->setPluginEnabled( protocolName, false ); PluginManager::self()->unloadPlugin( protocolName ); @@ -365,14 +365,14 @@ void AccountManager::load() // Don't try to optimize duplicate calls out, the plugin queue is smart enough // (and fast enough) to handle that without adding complexity here KConfig *config = KGlobal::config(); - TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::tqfromLatin1( "^Account_" ) ) ); + TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) ); for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it ) { config->setGroup( *it ); TQString protocol = config->readEntry( "Protocol" ); - if ( protocol.endsWith( TQString::tqfromLatin1( "Protocol" ) ) ) - protocol = TQString::tqfromLatin1( "kopete_" ) + protocol.lower().remove( TQString::tqfromLatin1( "protocol" ) ); + if ( protocol.endsWith( TQString::fromLatin1( "Protocol" ) ) ) + protocol = TQString::fromLatin1( "kopete_" ) + protocol.lower().remove( TQString::fromLatin1( "protocol" ) ); if ( config->readBoolEntry( "Enabled", true ) ) PluginManager::self()->loadPlugin( protocol, PluginManager::LoadAsync ); @@ -388,7 +388,7 @@ void AccountManager::slotPluginLoaded( Plugin *plugin ) // Iterate over all groups that start with "Account_" as those are accounts // and parse them if they are from this protocol KConfig *config = KGlobal::config(); - TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::tqfromLatin1( "^Account_" ) ) ); + TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) ); for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it ) { config->setGroup( *it ); @@ -423,14 +423,14 @@ void AccountManager::slotPluginLoaded( Plugin *plugin ) } void AccountManager::slotAccountOnlineStatusChanged(Contact *c, - const OnlineStatus &oldtqStatus, const OnlineStatus &newtqStatus) + const OnlineStatus &oldStatus, const OnlineStatus &newStatus) { Account *account = c->account(); if (!account) return; //kdDebug(14010) << k_funcinfo << endl; - emit accountOnlineStatusChanged(account, oldtqStatus, newtqStatus); + emit accountOnlineStatusChanged(account, oldStatus, newStatus); } } //END namespace Kopete diff --git a/kopete/libkopete/kopeteaccountmanager.h b/kopete/libkopete/kopeteaccountmanager.h index a8163245..f1ba6443 100644 --- a/kopete/libkopete/kopeteaccountmanager.h +++ b/kopete/libkopete/kopeteaccountmanager.h @@ -196,11 +196,11 @@ signals: * \brief An account has changed its onlinestatus * Technically this monitors Account::myself() onlinestatus changes * \param account Account which changed its onlinestatus - * \param oldtqStatus The online status before the change - * \param newtqStatus The new online status + * \param oldStatus The online status before the change + * \param newStatus The new online status */ void accountOnlineStatusChanged(Kopete::Account *account, - const Kopete::OnlineStatus &oldtqStatus, const Kopete::OnlineStatus &newtqStatus); + const Kopete::OnlineStatus &oldStatus, const Kopete::OnlineStatus &newStatus); private: /** @@ -211,7 +211,7 @@ private: private slots: void slotPluginLoaded( Kopete::Plugin *plugin ); void slotAccountOnlineStatusChanged(Kopete::Contact *c, - const Kopete::OnlineStatus &oldtqStatus, const Kopete::OnlineStatus &newtqStatus); + const Kopete::OnlineStatus &oldStatus, const Kopete::OnlineStatus &newStatus); /** * \internal diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp index 035e12c2..46214376 100644 --- a/kopete/libkopete/kopeteaway.cpp +++ b/kopete/libkopete/kopeteaway.cpp @@ -469,7 +469,7 @@ void Kopete::Away::setActive() { if(i->isConnected() && i->isAway()) { - i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlinetqStatus( i->protocol() , + i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlineStatus( i->protocol() , Kopete::OnlineStatusManager::Online ) ); } @@ -499,21 +499,21 @@ void Kopete::Away::setAutoAway() TQPtrList<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts(); for(Kopete::Account *i=accounts.first() ; i; i=accounts.next() ) { - if(i->myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Online) + if(i->myself()->onlineStatus().status() == Kopete::OnlineStatus::Online) { d->autoAwayAccounts.append(i); if(d->useAutoAwayMessage) { // Display a specific away message - i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlinetqStatus( i->protocol() , + i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlineStatus( i->protocol() , Kopete::OnlineStatusManager::Idle ) , getInstance()->d->autoAwayMessage); } else { // Display the last away message used - i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlinetqStatus( i->protocol() , + i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlineStatus( i->protocol() , Kopete::OnlineStatusManager::Idle ) , getInstance()->d->awayMessage); } diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp index 7030fdbd..29dbf727 100644 --- a/kopete/libkopete/kopeteblacklister.cpp +++ b/kopete/libkopete/kopeteblacklister.cpp @@ -42,7 +42,7 @@ BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, d->owner = accountId; d->protocol = protocolId; config->setGroup("BlackLister"); - d->blacklist = config->readListEntry( d->protocol + TQString::tqfromLatin1("_") + d->owner ); + d->blacklist = config->readListEntry( d->protocol + TQString::fromLatin1("_") + d->owner ); } BlackLister::~BlackLister() @@ -90,7 +90,7 @@ void BlackLister::saveToDisk() KConfig *config = KGlobal::config(); config->setGroup("BlackLister"); - config->writeEntry( d->protocol + TQString::tqfromLatin1("_") + d->owner, d->blacklist ); + config->writeEntry( d->protocol + TQString::fromLatin1("_") + d->owner, d->blacklist ); config->sync(); } diff --git a/kopete/libkopete/kopetechatsession.cpp b/kopete/libkopete/kopetechatsession.cpp index 9c19ebb5..a3593175 100644 --- a/kopete/libkopete/kopetechatsession.cpp +++ b/kopete/libkopete/kopetechatsession.cpp @@ -49,7 +49,7 @@ class KMMPrivate public: Kopete::ContactPtrList mContactList; const Kopete::Contact *mUser; - TQMap<const Kopete::Contact *, Kopete::OnlineStatus> contacttqStatus; + TQMap<const Kopete::Contact *, Kopete::OnlineStatus> contactStatus; Kopete::Protocol *mProtocol; bool isEmpty; bool mCanBeDeleted; @@ -101,27 +101,27 @@ Kopete::ChatSession::~ChatSession() delete d; } -void Kopete::ChatSession::slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus ) +void Kopete::ChatSession::slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus ) { slotUpdateDisplayName(); - emit onlineStatusChanged((Kopete::Contact*)c, status, oldtqStatus); + emit onlineStatusChanged((Kopete::Contact*)c, status, oldStatus); } void Kopete::ChatSession::setContactOnlineStatus( const Kopete::Contact *contact, const Kopete::OnlineStatus &status ) { - Kopete::OnlineStatus oldtqStatus = d->contacttqStatus[ contact ]; - d->contacttqStatus[ contact ] = status; + Kopete::OnlineStatus oldStatus = d->contactStatus[ contact ]; + d->contactStatus[ contact ] = status; disconnect( contact, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), this, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ) ); - emit onlineStatusChanged( (Kopete::Contact*)contact, status, oldtqStatus ); + emit onlineStatusChanged( (Kopete::Contact*)contact, status, oldStatus ); } const Kopete::OnlineStatus Kopete::ChatSession::contactOnlineStatus( const Kopete::Contact *contact ) const { - if ( d->contacttqStatus.contains( contact ) ) - return d->contacttqStatus[ contact ]; + if ( d->contactStatus.contains( contact ) ) + return d->contactStatus[ contact ]; - return contact->onlinetqStatus(); + return contact->onlineStatus(); } const TQString Kopete::ChatSession::displayName() @@ -156,7 +156,7 @@ void Kopete::ChatSession::slotUpdateDisplayName() do { if(! d->displayName.isNull() ) - d->displayName.append( TQString::tqfromLatin1( ", " ) ) ; + d->displayName.append( TQString::fromLatin1( ", " ) ) ; if ( c->metaContact() ) d->displayName.append( c->metaContact()->displayName() ); @@ -171,7 +171,7 @@ void Kopete::ChatSession::slotUpdateDisplayName() //If we have only 1 contact, add the status of him if ( d->mContactList.count() == 1 ) { - d->displayName.append( TQString::tqfromLatin1( " (%1)" ).tqarg( d->mContactList.first()->onlinetqStatus().description() ) ); + d->displayName.append( TQString::fromLatin1( " (%1)" ).tqarg( d->mContactList.first()->onlineStatus().description() ) ); } emit displayNameChanged(); @@ -248,7 +248,7 @@ void Kopete::ChatSession::sendMessage( Kopete::Message &message ) emit messageSent( sentMessage, this ); if ( !account()->isAway() || KopetePrefs::prefs()->soundIfAway() ) { - KNotification::event(TQString::tqfromLatin1( "kopete_outgoing" ), i18n( "Outgoing Message Sent" ) ); + KNotification::event(TQString::fromLatin1( "kopete_outgoing" ), i18n( "Outgoing Message Sent" ) ); } } else @@ -264,7 +264,7 @@ void Kopete::ChatSession::messageSucceeded() void Kopete::ChatSession::emitNudgeNotification() { - KNotification::event( TQString::tqfromLatin1("buzz_nudge"), i18n("A contact sent you a buzz/nudge.") ); + KNotification::event( TQString::fromLatin1("buzz_nudge"), i18n("A contact sent you a buzz/nudge.") ); } void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) @@ -275,7 +275,7 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) { TQString nick=myself()->property(Kopete::Global::Properties::self()->nickName()).value().toString(); if ( KopetePrefs::prefs()->highlightEnabled() && !nick.isEmpty() && - msg.plainBody().contains( TQRegExp( TQString::tqfromLatin1( "\\b(%1)\\b" ).tqarg( nick ), false ) ) ) + msg.plainBody().contains( TQRegExp( TQString::fromLatin1( "\\b(%1)\\b" ).tqarg( nick ), false ) ) ) { msg.setImportance( Kopete::Message::Highlight ); } @@ -294,10 +294,10 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) // emit messageAppended( msg, this ); } -void Kopete::ChatSession::addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialtqStatus, bool suppress ) +void Kopete::ChatSession::addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialStatus, bool suppress ) { - if( !d->contacttqStatus.contains(c) ) - d->contacttqStatus[ c ] = initialtqStatus; + if( !d->contactStatus.contains(c) ) + d->contactStatus[ c ] = initialStatus; addContact( c, suppress ); } @@ -386,7 +386,7 @@ void Kopete::ChatSession::removeContact( const Kopete::Contact *c, const TQStrin slotUpdateDisplayName(); } - d->contacttqStatus.remove( c ); + d->contactStatus.remove( c ); emit contactRemoved( c, reason, format, suppressNotification ); } diff --git a/kopete/libkopete/kopetechatsession.h b/kopete/libkopete/kopetechatsession.h index 802a4e39..cab992c9 100644 --- a/kopete/libkopete/kopetechatsession.h +++ b/kopete/libkopete/kopetechatsession.h @@ -130,7 +130,7 @@ public: * Set a special icon for a contact in this kmm only. * by default, all contact have their own status */ - void setContactOnlineStatus( const Contact *contact, const OnlineStatus &newtqStatus ); + void setContactOnlineStatus( const Contact *contact, const OnlineStatus &newStatus ); /** * @brief get the status of a contact. @@ -296,13 +296,13 @@ public slots: /** * Add a contact to the session with a pre-set initial status * @param c is the contact - * @param initialtqStatus The initial contactOnlineStatus of the contact + * @param initialStatus The initial contactOnlineStatus of the contact * @param suppress mean the there will be no automatic notifications in the chatwindow. * (note that i don't like the param suppress at all. it is used in irc to show a different notification (with an info text) * a TQStringinfo would be more interesting, but it is also used to don't show the notification when entering in a channel) * @see contactOnlineStatus */ - void addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialtqStatus, bool suppress = false ); + void addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialStatus, bool suppress = false ); /** * Remove a contact from the session @@ -371,7 +371,7 @@ public slots: private slots: void slotUpdateDisplayName(); void slotViewDestroyed(); - void slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus ); + void slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus ); void slotContactDestroyed( Kopete::Contact *contact ); protected: diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp index 04153e86..c18b5c34 100644 --- a/kopete/libkopete/kopetecommandhandler.cpp +++ b/kopete/libkopete/kopetecommandhandler.cpp @@ -45,7 +45,7 @@ class KopeteCommandGUIClient : public TQObject, public KXMLGUIClient public: KopeteCommandGUIClient( Kopete::ChatSession *manager ) : TQObject(manager), KXMLGUIClient(manager) { - setXMLFile( TQString::tqfromLatin1("kopetecommandui.rc") ); + setXMLFile( TQString::fromLatin1("kopetecommandui.rc") ); TQDomDocument doc = domDocument(); TQDomNode menu = doc.documentElement().firstChild().firstChild().firstChild(); @@ -57,15 +57,15 @@ class KopeteCommandGUIClient : public TQObject, public KXMLGUIClient { KAction *a = static_cast<KAction*>( it.current() ); actionCollection()->insert( a ); - TQDomElement newNode = doc.createElement( TQString::tqfromLatin1("Action") ); - newNode.setAttribute( TQString::tqfromLatin1("name"), - TQString::tqfromLatin1( a->name() ) ); + TQDomElement newNode = doc.createElement( TQString::fromLatin1("Action") ); + newNode.setAttribute( TQString::fromLatin1("name"), + TQString::fromLatin1( a->name() ) ); bool added = false; for( TQDomElement n = menu.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if( TQString::tqfromLatin1(a->name()) < n.attribute(TQString::tqfromLatin1("name"))) + if( TQString::fromLatin1(a->name()) < n.attribute(TQString::fromLatin1("name"))) { menu.insertBefore( newNode, n ); added = true; @@ -103,33 +103,33 @@ Kopete::CommandHandler::CommandHandler() : TQObject( tqApp ) mCommands.setAutoDelete( true ); p->pluginCommands.insert( this, mCommands ); - registerCommand( this, TQString::tqfromLatin1("help"), TQT_SLOT( slotHelpCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("help"), TQT_SLOT( slotHelpCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /help [<command>] - Used to list available commands, or show help for a specified command." ), 0, 1 ); - registerCommand( this, TQString::tqfromLatin1("close"), TQT_SLOT( slotCloseCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("close"), TQT_SLOT( slotCloseCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /close - Closes the current view." ) ); // FIXME: What's the difference with /close? The help doesn't explain it - Martijn - registerCommand( this, TQString::tqfromLatin1("part"), TQT_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("part"), TQT_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /part - Closes the current view." ) ); - registerCommand( this, TQString::tqfromLatin1("clear"), TQT_SLOT( slotClearCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("clear"), TQT_SLOT( slotClearCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /clear - Clears the active view's chat buffer." ) ); - //registerCommand( this, TQString::tqfromLatin1("me"), TQT_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession * ) ), + //registerCommand( this, TQString::fromLatin1("me"), TQT_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession * ) ), // i18n( "USAGE: /me <text> - Formats message as in '<nickname> went to the store'." ) ); - registerCommand( this, TQString::tqfromLatin1("away"), TQT_SLOT( slotAwayCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("away"), TQT_SLOT( slotAwayCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /away [<reason>] - Marks you as away/back for the current account only." ) ); - registerCommand( this, TQString::tqfromLatin1("awayall"), TQT_SLOT( slotAwayAllCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("awayall"), TQT_SLOT( slotAwayAllCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /awayall [<reason>] - Marks you as away/back for all accounts." ) ); - registerCommand( this, TQString::tqfromLatin1("say"), TQT_SLOT( slotSayCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("say"), TQT_SLOT( slotSayCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /say <text> - Say text in this chat. This is the same as just typing a message, but is very " "useful for scripts." ), 1 ); - registerCommand( this, TQString::tqfromLatin1("exec"), TQT_SLOT( slotExecCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("exec"), TQT_SLOT( slotExecCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /exec [-o] <command> - Executes the specified command and displays the output in the chat buffer. " "If -o is specified, the output is sent to all members of the chat."), 1 ); @@ -192,7 +192,7 @@ bool Kopete::CommandHandler::processMessage( const TQString &msg, Kopete::ChatSe { if( p->inCommand ) return false; - TQRegExp splitRx( TQString::tqfromLatin1("^/([\\S]+)(.*)") ); + TQRegExp splitRx( TQString::fromLatin1("^/([\\S]+)(.*)") ); TQString command; TQString args; if(splitRx.search(msg) != -1) @@ -275,18 +275,18 @@ void Kopete::CommandHandler::slotExecCommand( const TQString &args, Kopete::Chat if( !args.isEmpty() ) { KProcess *proc = 0L; - if ( kapp->authorize( TQString::tqfromLatin1( "shell_access" ) ) ) + if ( kapp->authorize( TQString::fromLatin1( "shell_access" ) ) ) proc = new KProcess(manager); if( proc ) { - *proc << TQString::tqfromLatin1("sh") << TQString::tqfromLatin1("-c"); + *proc << TQString::fromLatin1("sh") << TQString::fromLatin1("-c"); TQStringList argsList = parseArguments( args ); - if( argsList.front() == TQString::tqfromLatin1("-o") ) + if( argsList.front() == TQString::fromLatin1("-o") ) { p->processMap.insert( proc, ManagerPair(manager, Kopete::Message::Outbound) ); - *proc << args.section(TQRegExp(TQString::tqfromLatin1("\\s+")), 1); + *proc << args.section(TQRegExp(TQString::fromLatin1("\\s+")), 1); } else { @@ -371,7 +371,7 @@ void Kopete::CommandHandler::slotExecFinished(KProcess *proc) TQStringList Kopete::CommandHandler::parseArguments( const TQString &args ) { TQStringList arguments; - TQRegExp quotedArgs( TQString::tqfromLatin1("\"(.*)\"") ); + TQRegExp quotedArgs( TQString::fromLatin1("\"(.*)\"") ); quotedArgs.setMinimal( true ); if ( quotedArgs.search( args ) != -1 ) @@ -380,7 +380,7 @@ TQStringList Kopete::CommandHandler::parseArguments( const TQString &args ) arguments.append( quotedArgs.cap(i) ); } - TQStringList otherArgs = TQStringList::split( TQRegExp(TQString::tqfromLatin1("\\s+")), args.section( quotedArgs, 0 ) ); + TQStringList otherArgs = TQStringList::split( TQRegExp(TQString::fromLatin1("\\s+")), args.section( quotedArgs, 0 ) ); for( TQStringList::Iterator it = otherArgs.begin(); it != otherArgs.end(); ++it ) arguments.append( *it ); diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp index 66ecf11f..af56f96d 100644 --- a/kopete/libkopete/kopetecontact.cpp +++ b/kopete/libkopete/kopetecontact.cpp @@ -63,7 +63,7 @@ struct Contact::Private public: bool fileCapable; - OnlineStatus onlinetqStatus; + OnlineStatus onlineStatus; Account *account; MetaContact *metaContact; @@ -124,45 +124,45 @@ Contact::~Contact() -OnlineStatus Contact::onlinetqStatus() const +OnlineStatus Contact::onlineStatus() const { if ( this == account()->myself() || account()->isConnected() ) - return d->onlinetqStatus; + return d->onlineStatus; else - return protocol()->accountOfflinetqStatus(); + return protocol()->accountOfflineStatus(); } void Contact::setOnlineStatus( const OnlineStatus &status ) { - if( status == d->onlinetqStatus ) + if( status == d->onlineStatus ) return; - OnlineStatus oldtqStatus = d->onlinetqStatus; - d->onlinetqStatus = status; + OnlineStatus oldStatus = d->onlineStatus; + d->onlineStatus = status; Kopete::Global::Properties *globalProps = Kopete::Global::Properties::self(); // Contact changed from Offline to another status - if( oldtqStatus.status() == OnlineStatus::Offline && + if( oldStatus.status() == OnlineStatus::Offline && status.status() != OnlineStatus::Offline ) { - setProperty( globalProps->onlineSince(), TQDateTime::tqcurrentDateTime() ); + setProperty( globalProps->onlineSince(), TQDateTime::currentDateTime() ); /*kdDebug(14010) << k_funcinfo << "REMOVING lastSeen property for " << d->displayName << endl;*/ removeProperty( globalProps->lastSeen() ); } - else if( oldtqStatus.status() != OnlineStatus::Offline && - oldtqStatus.status() != OnlineStatus::Unknown && + else if( oldStatus.status() != OnlineStatus::Offline && + oldStatus.status() != OnlineStatus::Unknown && status.status() == OnlineStatus::Offline ) // Contact went back offline { removeProperty( globalProps->onlineSince() ); /*kdDebug(14010) << k_funcinfo << "SETTING lastSeen property for " << d->displayName << endl;*/ - setProperty( globalProps->lastSeen(), TQDateTime::tqcurrentDateTime() ); + setProperty( globalProps->lastSeen(), TQDateTime::currentDateTime() ); } if ( this == account()->myself() || account()->isConnected() ) - emit onlineStatusChanged( this, status, oldtqStatus ); + emit onlineStatusChanged( this, status, oldStatus ); } void Contact::slotAccountIsConnectedChanged() @@ -171,9 +171,9 @@ void Contact::slotAccountIsConnectedChanged() return; if ( account()->isConnected() ) - emit onlineStatusChanged( this, d->onlinetqStatus, protocol()->accountOfflinetqStatus() ); + emit onlineStatusChanged( this, d->onlineStatus, protocol()->accountOfflineStatus() ); else - emit onlineStatusChanged( this, protocol()->accountOfflinetqStatus(), d->onlinetqStatus ); + emit onlineStatusChanged( this, protocol()->accountOfflineStatus(), d->onlineStatus ); } @@ -202,14 +202,14 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager ) TQString titleText; TQString nick = property( Kopete::Global::Properties::self()->nickName() ).value().toString(); if( nick.isEmpty() ) - titleText = TQString::tqfromLatin1( "%1 (%2)" ).tqarg( contactId(), onlinetqStatus().description() ); + titleText = TQString::fromLatin1( "%1 (%2)" ).tqarg( contactId(), onlineStatus().description() ); else - titleText = TQString::tqfromLatin1( "%1 <%2> (%3)" ).tqarg( nick, contactId(), onlinetqStatus().description() ); + titleText = TQString::fromLatin1( "%1 <%2> (%3)" ).tqarg( nick, contactId(), onlineStatus().description() ); menu->insertTitle( titleText ); if( metaContact() && metaContact()->isTemporary() && contactId() != account()->myself()->contactId() ) { - KAction *actionAddContact = new KAction( i18n( "&Add to Your Contact List" ), TQString::tqfromLatin1( "add_user" ), + KAction *actionAddContact = new KAction( i18n( "&Add to Your Contact List" ), TQString::fromLatin1( "add_user" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddContact() ), TQT_TQOBJECT(menu), "actionAddContact" ); actionAddContact->plug( menu ); menu->insertSeparator(); @@ -315,7 +315,7 @@ void Contact::setMetaContact( MetaContact *m ) result = KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget(), i18n( "You are moving the contact `%1' to the meta contact `%2'.\n" "`%3' will be empty afterwards. Do you want to delete this contact?" ) .tqarg(contactId(), m ? m->displayName() : TQString(), old->displayName()) - , i18n( "Move Contact" ), KStdGuiItem::del(), i18n( "&Keep" ) , TQString::tqfromLatin1("delete_old_contact_when_move") ); + , i18n( "Move Contact" ), KStdGuiItem::del(), i18n( "&Keep" ) , TQString::fromLatin1("delete_old_contact_when_move") ); if(result==KMessageBox::Cancel) return; } @@ -368,7 +368,7 @@ void Contact::serializeProperties(TQMap<TQString, TQString> &serializedData) continue; TQVariant val = it.data().value(); - TQString key = TQString::tqfromLatin1("prop_%1_%2").tqarg(TQString::tqfromLatin1(val.typeName()), it.key()); + TQString key = TQString::fromLatin1("prop_%1_%2").tqarg(TQString::fromLatin1(val.typeName()), it.key()); serializedData[key] = val.toString(); @@ -383,7 +383,7 @@ void Contact::deserializeProperties( { TQString key = it.key(); - if ( !key.startsWith( TQString::tqfromLatin1("prop_") ) ) // avoid parsing other serialized data + if ( !key.startsWith( TQString::fromLatin1("prop_") ) ) // avoid parsing other serialized data continue; TQStringList keyList = TQStringList::split( TQChar('_'), key, false ); @@ -419,20 +419,20 @@ bool Contact::isReachable() { // The default implementation returns false when offline and true // otherwise. Subclass if you need more control over the process. - return onlinetqStatus().status() != OnlineStatus::Offline; + return onlineStatus().status() != OnlineStatus::Offline; } void Contact::startChat() { - KopeteView *v=manager( CanCreate )->view(true, TQString::tqfromLatin1("kopete_chatwindow") ); + KopeteView *v=manager( CanCreate )->view(true, TQString::fromLatin1("kopete_chatwindow") ); if(v) v->raise(true); } void Contact::sendMessage() { - KopeteView *v=manager( CanCreate )->view(true, TQString::tqfromLatin1("kopete_emailwindow") ); + KopeteView *v=manager( CanCreate )->view(true, TQString::fromLatin1("kopete_emailwindow") ); if(v) v->raise(true); } @@ -458,8 +458,8 @@ void Contact::slotDelete() { if ( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(), i18n( "Are you sure you want to remove the contact '%1' from your contact list?" ). - arg( d->contactId ), i18n( "Remove Contact" ), KGuiItem(i18n("Remove"), TQString::tqfromLatin1("delete_user") ), - TQString::tqfromLatin1("askRemoveContact"), KMessageBox::Notify | KMessageBox::Dangerous ) + arg( d->contactId ), i18n( "Remove Contact" ), KGuiItem(i18n("Remove"), TQString::fromLatin1("delete_user") ), + TQString::fromLatin1("askRemoveContact"), KMessageBox::Notify | KMessageBox::Dangerous ) == KMessageBox::Continue ) { deleteContact(); @@ -524,7 +524,7 @@ TQPtrList<KAction> *Contact::customContextMenuActions( ChatSession * /* manager bool Contact::isOnline() const { - return onlinetqStatus().isDefinitelyOnline(); + return onlineStatus().isDefinitelyOnline(); } @@ -645,7 +645,7 @@ TQString Contact::toolTip() const // -------------------------------------------------------------------------- // Fixed part of tooltip - TQString iconName = TQString::tqfromLatin1("kopete-contact-icon:%1:%2:%3") + TQString iconName = TQString::fromLatin1("kopete-contact-icon:%1:%2:%3") .tqarg( KURL::encode_string( protocol()->pluginId() ), KURL::encode_string( account()->accountId() ), KURL::encode_string( contactId() ) ); @@ -656,14 +656,14 @@ TQString Contact::toolTip() const { tip = i18n( "<b>DISPLAY NAME</b><br><img src=\"%2\"> CONTACT STATUS", "<b><nobr>%3</nobr></b><br><img src=\"%2\"> %1" ). - arg( Kopete::Message::escape( onlinetqStatus().description() ), iconName, + arg( Kopete::Message::escape( onlineStatus().description() ), iconName, Kopete::Message::escape( d->contactId ) ); } else { tip = i18n( "<b>DISPLAY NAME</b> (CONTACT ID)<br><img src=\"%2\"> CONTACT STATUS", "<nobr><b>%4</b> (%3)</nobr><br><img src=\"%2\"> %1" ). - arg( Kopete::Message::escape( onlinetqStatus().description() ), iconName, + arg( Kopete::Message::escape( onlineStatus().description() ), iconName, Kopete::Message::escape( contactId() ), Kopete::Emoticons::parseEmoticons( Kopete::Message::escape( nick ) ) ); } @@ -673,7 +673,7 @@ TQString Contact::toolTip() const for(TQStringList::Iterator it=shownProps.begin(); it!=shownProps.end(); ++it) { - if((*it) == TQString::tqfromLatin1("FormattedName")) + if((*it) == TQString::fromLatin1("FormattedName")) { TQString name = formattedName(); if(!name.isEmpty()) @@ -682,7 +682,7 @@ TQString Contact::toolTip() const "<br><b>Full Name:</b> <nobr>%1</nobr>").tqarg(TQStyleSheet::escape(name)); } } - else if ((*it) == TQString::tqfromLatin1("FormattedIdleTime")) + else if ((*it) == TQString::fromLatin1("FormattedIdleTime")) { TQString time = formattedIdleTime(); if(!time.isEmpty()) @@ -691,7 +691,7 @@ TQString Contact::toolTip() const "<br><b>Idle:</b> <nobr>%1</nobr>").tqarg(time); } } - else if ((*it) == TQString::tqfromLatin1("homePage")) + else if ((*it) == TQString::fromLatin1("homePage")) { TQString url = property(*it).value().toString(); if(!url.isEmpty()) @@ -701,7 +701,7 @@ TQString Contact::toolTip() const arg( KURL::encode_string( url ), Kopete::Message::escape( TQStyleSheet::escape(url) ) ); } } - else if ((*it) == TQString::tqfromLatin1("awayMessage")) + else if ((*it) == TQString::fromLatin1("awayMessage")) { TQString awaymsg = property(*it).value().toString(); if(!awaymsg.isEmpty()) @@ -755,14 +755,14 @@ TQString Contact::toolTip() const TQString Kopete::Contact::formattedName() const { - if( hasProperty(TQString::tqfromLatin1("FormattedName")) ) - return property(TQString::tqfromLatin1("FormattedName")).value().toString(); + if( hasProperty(TQString::fromLatin1("FormattedName")) ) + return property(TQString::fromLatin1("FormattedName")).value().toString(); TQString ret; Kopete::ContactProperty first, last; - first = property(TQString::tqfromLatin1("firstName")); - last = property(TQString::tqfromLatin1("lastName")); + first = property(TQString::fromLatin1("firstName")); + last = property(TQString::fromLatin1("lastName")); if(!first.isNull()) { if(!last.isNull()) // contact has both first and last name diff --git a/kopete/libkopete/kopetecontact.h b/kopete/libkopete/kopetecontact.h index e24e23f0..05160664 100644 --- a/kopete/libkopete/kopetecontact.h +++ b/kopete/libkopete/kopetecontact.h @@ -204,7 +204,7 @@ public: * @brief Get the online status of the contact * @return the online status of the contact */ - OnlineStatus onlinetqStatus() const; + OnlineStatus onlineStatus() const; /** * \brief Set the contact's online status @@ -510,7 +510,7 @@ signals: * The contact's online status changed */ void onlineStatusChanged( Kopete::Contact *contact, - const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus ); + const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus ); /** * The contact is about to be destroyed. diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp index 1a16b04d..95c625c3 100644 --- a/kopete/libkopete/kopetecontactlist.cpp +++ b/kopete/libkopete/kopetecontactlist.cpp @@ -378,14 +378,14 @@ void ContactList::loadXML() // don't save when we're in the middle of this... d->loaded = false; - TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "contactlist.xml" ) ); + TQString filename = locateLocal( "appdata", TQString::fromLatin1( "contactlist.xml" ) ); if( filename.isEmpty() ) { d->loaded=true; return ; } - TQDomDocument contactList( TQString::tqfromLatin1( "kopete-contact-list" ) ); + TQDomDocument contactList( TQString::fromLatin1( "kopete-contact-list" ) ); TQFile contactListFile( filename ); contactListFile.open( IO_ReadOnly ); @@ -393,10 +393,10 @@ void ContactList::loadXML() TQDomElement list = contactList.documentElement(); - TQString versionString = list.attribute( TQString::tqfromLatin1( "version" ), TQString() ); + TQString versionString = list.attribute( TQString::fromLatin1( "version" ), TQString() ); uint version = 0; - if( TQRegExp( TQString::tqfromLatin1( "[0-9]+\\.[0-9]" ) ).exactMatch( versionString ) ) - version = versionString.replace( TQString::tqfromLatin1( "." ), TQString() ).toUInt(); + if( TQRegExp( TQString::fromLatin1( "[0-9]+\\.[0-9]" ) ).exactMatch( versionString ) ) + version = versionString.replace( TQString::fromLatin1( "." ), TQString() ).toUInt(); if( version < Private::ContactListVersion ) { @@ -410,7 +410,7 @@ void ContactList::loadXML() convertContactList( filename, version, Private::ContactListVersion ); - contactList = TQDomDocument ( TQString::tqfromLatin1( "kopete-contact-list" ) ); + contactList = TQDomDocument ( TQString::fromLatin1( "kopete-contact-list" ) ); contactListFile.open( IO_ReadOnly ); contactList.setContent( &contactListFile ); @@ -423,7 +423,7 @@ void ContactList::loadXML() TQDomElement element = list.firstChild().toElement(); while( !element.isNull() ) { - if( element.tagName() == TQString::tqfromLatin1("meta-contact") ) + if( element.tagName() == TQString::fromLatin1("meta-contact") ) { //TODO: id isn't used //TQString id = element.attribute( "id", TQString() ); @@ -439,7 +439,7 @@ void ContactList::loadXML() metaContact ); } } - else if( element.tagName() == TQString::tqfromLatin1("kopete-group") ) + else if( element.tagName() == TQString::fromLatin1("kopete-group") ) { Kopete::Group *group = new Kopete::Group(); if( !group->fromXML( element ) ) @@ -453,7 +453,7 @@ void ContactList::loadXML() } } // Only load myself metacontact information when Global Identity is enabled. - else if( element.tagName() == TQString::tqfromLatin1("myself-meta-contact") && Kopete::Config::enableGlobalIdentity() ) + else if( element.tagName() == TQString::fromLatin1("myself-meta-contact") && Kopete::Config::enableGlobalIdentity() ) { if( !myself()->fromXML( element ) ) { @@ -479,19 +479,19 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers // changes to allow incremental (multi-pass) conversion so we don't have // to rewrite the whole conversion code for each change. - TQDomDocument contactList( TQString::tqfromLatin1( "messaging-contact-list" ) ); + TQDomDocument contactList( TQString::fromLatin1( "messaging-contact-list" ) ); TQFile contactListFile( fileName ); contactListFile.open( IO_ReadOnly ); contactList.setContent( &contactListFile ); TQDomElement oldList = contactList.documentElement(); - TQDomDocument newList( TQString::tqfromLatin1( "kopete-contact-list" ) ); - newList.appendChild( newList.createProcessingInstruction( TQString::tqfromLatin1( "xml" ), TQString::tqfromLatin1( "version=\"1.0\"" ) ) ); + TQDomDocument newList( TQString::fromLatin1( "kopete-contact-list" ) ); + newList.appendChild( newList.createProcessingInstruction( TQString::fromLatin1( "xml" ), TQString::fromLatin1( "version=\"1.0\"" ) ) ); - TQDomElement newRoot = newList.createElement( TQString::tqfromLatin1( "kopete-contact-list" ) ); + TQDomElement newRoot = newList.createElement( TQString::fromLatin1( "kopete-contact-list" ) ); newList.appendChild( newRoot ); - newRoot.setAttribute( TQString::tqfromLatin1( "version" ), TQString::tqfromLatin1( "1.0" ) ); + newRoot.setAttribute( TQString::fromLatin1( "version" ), TQString::fromLatin1( "1.0" ) ); TQDomNode oldNode = oldList.firstChild(); while( !oldNode.isNull() ) @@ -499,10 +499,10 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers TQDomElement oldElement = oldNode.toElement(); if( !oldElement.isNull() ) { - if( oldElement.tagName() == TQString::tqfromLatin1("meta-contact") ) + if( oldElement.tagName() == TQString::fromLatin1("meta-contact") ) { // Ignore ID, it is not used in the current list anyway - TQDomElement newMetaContact = newList.createElement( TQString::tqfromLatin1( "meta-contact" ) ); + TQDomElement newMetaContact = newList.createElement( TQString::fromLatin1( "meta-contact" ) ); newRoot.appendChild( newMetaContact ); // Plugin data is stored completely different, and requires @@ -518,48 +518,48 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers while( !oldContactNode.isNull() ) { TQDomElement oldContactElement = oldContactNode.toElement(); - if( !oldContactElement.isNull() && oldContactElement.tagName() == TQString::tqfromLatin1("address-book-field") ) + if( !oldContactElement.isNull() && oldContactElement.tagName() == TQString::fromLatin1("address-book-field") ) { // Convert address book fields. // Jabber will be called "xmpp", Aim/Toc and Aim/Oscar both will // be called "aim". MSN, AIM, IRC, Oscar and SMS don't use address // book fields yet; Gadu and ICQ can be converted as-is. // As Yahoo is unfinished we won't try to convert at all. - TQString id = oldContactElement.attribute( TQString::tqfromLatin1( "id" ), TQString() ); + TQString id = oldContactElement.attribute( TQString::fromLatin1( "id" ), TQString() ); TQString data = oldContactElement.text(); TQString app, key, val; - TQString separator = TQString::tqfromLatin1( "," ); - if( id == TQString::tqfromLatin1( "messaging/gadu" ) ) - separator = TQString::tqfromLatin1( "\n" ); - else if( id == TQString::tqfromLatin1( "messaging/icq" ) ) - separator = TQString::tqfromLatin1( ";" ); - else if( id == TQString::tqfromLatin1( "messaging/jabber" ) ) - id = TQString::tqfromLatin1( "messaging/xmpp" ); - - if( id == TQString::tqfromLatin1( "messaging/gadu" ) || id == TQString::tqfromLatin1( "messaging/icq" ) || - id == TQString::tqfromLatin1( "messaging/winpopup" ) || id == TQString::tqfromLatin1( "messaging/xmpp" ) ) + TQString separator = TQString::fromLatin1( "," ); + if( id == TQString::fromLatin1( "messaging/gadu" ) ) + separator = TQString::fromLatin1( "\n" ); + else if( id == TQString::fromLatin1( "messaging/icq" ) ) + separator = TQString::fromLatin1( ";" ); + else if( id == TQString::fromLatin1( "messaging/jabber" ) ) + id = TQString::fromLatin1( "messaging/xmpp" ); + + if( id == TQString::fromLatin1( "messaging/gadu" ) || id == TQString::fromLatin1( "messaging/icq" ) || + id == TQString::fromLatin1( "messaging/winpopup" ) || id == TQString::fromLatin1( "messaging/xmpp" ) ) { app = id; - key = TQString::tqfromLatin1( "All" ); + key = TQString::fromLatin1( "All" ); val = data.replace( separator, TQChar( 0xE000 ) ); } if( !app.isEmpty() ) { - TQDomElement addressBookField = newList.createElement( TQString::tqfromLatin1( "address-book-field" ) ); + TQDomElement addressBookField = newList.createElement( TQString::fromLatin1( "address-book-field" ) ); newMetaContact.appendChild( addressBookField ); - addressBookField.setAttribute( TQString::tqfromLatin1( "app" ), app ); - addressBookField.setAttribute( TQString::tqfromLatin1( "key" ), key ); + addressBookField.setAttribute( TQString::fromLatin1( "app" ), app ); + addressBookField.setAttribute( TQString::fromLatin1( "key" ), key ); addressBookField.appendChild( newList.createTextNode( val ) ); // ICQ didn't store the contactId locally, only in the address // book fields, so we need to be able to access it later - if( id == TQString::tqfromLatin1( "messaging/icq" ) ) + if( id == TQString::fromLatin1( "messaging/icq" ) ) icqData = TQStringList::split( TQChar( 0xE000 ), val ); - else if( id == TQString::tqfromLatin1("messaging/gadu") ) + else if( id == TQString::fromLatin1("messaging/gadu") ) gaduData = TQStringList::split( TQChar( 0xE000 ), val ); } } @@ -573,103 +573,103 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers TQDomElement oldContactElement = oldContactNode.toElement(); if( !oldContactElement.isNull() ) { - if( oldContactElement.tagName() == TQString::tqfromLatin1("display-name") ) + if( oldContactElement.tagName() == TQString::fromLatin1("display-name") ) { - TQDomElement displayName = newList.createElement( TQString::tqfromLatin1( "display-name" ) ); + TQDomElement displayName = newList.createElement( TQString::fromLatin1( "display-name" ) ); displayName.appendChild( newList.createTextNode( oldContactElement.text() ) ); newMetaContact.appendChild( displayName ); } - else if( oldContactElement.tagName() == TQString::tqfromLatin1("groups") ) + else if( oldContactElement.tagName() == TQString::fromLatin1("groups") ) { - TQDomElement groups = newList.createElement( TQString::tqfromLatin1( "groups" ) ); + TQDomElement groups = newList.createElement( TQString::fromLatin1( "groups" ) ); newMetaContact.appendChild( groups ); TQDomNode oldGroup = oldContactElement.firstChild(); while( !oldGroup.isNull() ) { TQDomElement oldGroupElement = oldGroup.toElement(); - if ( oldGroupElement.tagName() == TQString::tqfromLatin1("group") ) + if ( oldGroupElement.tagName() == TQString::fromLatin1("group") ) { - TQDomElement group = newList.createElement( TQString::tqfromLatin1( "group" ) ); + TQDomElement group = newList.createElement( TQString::fromLatin1( "group" ) ); group.appendChild( newList.createTextNode( oldGroupElement.text() ) ); groups.appendChild( group ); } - else if ( oldGroupElement.tagName() == TQString::tqfromLatin1("top-level") ) + else if ( oldGroupElement.tagName() == TQString::fromLatin1("top-level") ) { - TQDomElement group = newList.createElement( TQString::tqfromLatin1( "top-level" ) ); + TQDomElement group = newList.createElement( TQString::fromLatin1( "top-level" ) ); groups.appendChild( group ); } oldGroup = oldGroup.nextSibling(); } } - else if( oldContactElement.tagName() == TQString::tqfromLatin1( "plugin-data" ) ) + else if( oldContactElement.tagName() == TQString::fromLatin1( "plugin-data" ) ) { // Convert the plugin data - TQString id = oldContactElement.attribute( TQString::tqfromLatin1( "plugin-id" ), TQString() ); + TQString id = oldContactElement.attribute( TQString::fromLatin1( "plugin-id" ), TQString() ); TQString data = oldContactElement.text(); bool convertOldAim = false; uint fieldCount = 1; TQString addressBookLabel; - if( id == TQString::tqfromLatin1("MSNProtocol") ) + if( id == TQString::fromLatin1("MSNProtocol") ) { fieldCount = 3; - addressBookLabel = TQString::tqfromLatin1("msn"); + addressBookLabel = TQString::fromLatin1("msn"); } - else if( id == TQString::tqfromLatin1("IRCProtocol") ) + else if( id == TQString::fromLatin1("IRCProtocol") ) { fieldCount = 3; - addressBookLabel = TQString::tqfromLatin1("irc"); + addressBookLabel = TQString::fromLatin1("irc"); } - else if( id == TQString::tqfromLatin1("OscarProtocol") ) + else if( id == TQString::fromLatin1("OscarProtocol") ) { fieldCount = 2; - addressBookLabel = TQString::tqfromLatin1("aim"); + addressBookLabel = TQString::fromLatin1("aim"); } - else if( id == TQString::tqfromLatin1("AIMProtocol") ) + else if( id == TQString::fromLatin1("AIMProtocol") ) { - id = TQString::tqfromLatin1("OscarProtocol"); + id = TQString::fromLatin1("OscarProtocol"); convertOldAim = true; - addressBookLabel = TQString::tqfromLatin1("aim"); + addressBookLabel = TQString::fromLatin1("aim"); } - else if( id == TQString::tqfromLatin1("ICTQProtocol") || id == TQString::tqfromLatin1("WPProtocol") || id == TQString::tqfromLatin1("GaduProtocol") ) + else if( id == TQString::fromLatin1("ICTQProtocol") || id == TQString::fromLatin1("WPProtocol") || id == TQString::fromLatin1("GaduProtocol") ) { fieldCount = 1; } - else if( id == TQString::tqfromLatin1("JabberProtocol") ) + else if( id == TQString::fromLatin1("JabberProtocol") ) { fieldCount = 4; } - else if( id == TQString::tqfromLatin1("SMSProtocol") ) + else if( id == TQString::fromLatin1("SMSProtocol") ) { // SMS used a variable serializing using a dot as delimiter. // The minimal count is three though (id, name, delimiter). fieldCount = 2; - addressBookLabel = TQString::tqfromLatin1("sms"); + addressBookLabel = TQString::fromLatin1("sms"); } if( pluginData[ id ].isNull() ) { - pluginData[ id ] = newList.createElement( TQString::tqfromLatin1( "plugin-data" ) ); - pluginData[ id ].setAttribute( TQString::tqfromLatin1( "plugin-id" ), id ); + pluginData[ id ] = newList.createElement( TQString::fromLatin1( "plugin-data" ) ); + pluginData[ id ].setAttribute( TQString::fromLatin1( "plugin-id" ), id ); newMetaContact.appendChild( pluginData[ id ] ); } // Do the actual conversion - if( id == TQString::tqfromLatin1( "MSNProtocol" ) || id == TQString::tqfromLatin1( "OscarProtocol" ) || - id == TQString::tqfromLatin1( "AIMProtocol" ) || id == TQString::tqfromLatin1( "IRCProtocol" ) || - id == TQString::tqfromLatin1( "ICTQProtocol" ) || id == TQString::tqfromLatin1( "JabberProtocol" ) || - id == TQString::tqfromLatin1( "SMSProtocol" ) || id == TQString::tqfromLatin1( "WPProtocol" ) || - id == TQString::tqfromLatin1( "GaduProtocol" ) ) + if( id == TQString::fromLatin1( "MSNProtocol" ) || id == TQString::fromLatin1( "OscarProtocol" ) || + id == TQString::fromLatin1( "AIMProtocol" ) || id == TQString::fromLatin1( "IRCProtocol" ) || + id == TQString::fromLatin1( "ICTQProtocol" ) || id == TQString::fromLatin1( "JabberProtocol" ) || + id == TQString::fromLatin1( "SMSProtocol" ) || id == TQString::fromLatin1( "WPProtocol" ) || + id == TQString::fromLatin1( "GaduProtocol" ) ) { - TQStringList strList = TQStringList::split( TQString::tqfromLatin1( "||" ), data ); + TQStringList strList = TQStringList::split( TQString::fromLatin1( "||" ), data ); // Unescape '||' for( TQStringList::iterator it = strList.begin(); it != strList.end(); ++it ) { - ( *it ).replace( TQString::tqfromLatin1( "\\|;" ), TQString::tqfromLatin1( "|" ) ). - replace( TQString::tqfromLatin1( "\\\\" ), TQString::tqfromLatin1( "\\" ) ); + ( *it ).replace( TQString::fromLatin1( "\\|;" ), TQString::fromLatin1( "|" ) ). + replace( TQString::fromLatin1( "\\\\" ), TQString::fromLatin1( "\\" ) ); } uint idx = 0; @@ -677,65 +677,65 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers { TQDomElement dataField; - dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "contactId" ) ); - if( id == TQString::tqfromLatin1("ICTQProtocol") ) + dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "contactId" ) ); + if( id == TQString::fromLatin1("ICTQProtocol") ) dataField.appendChild( newList.createTextNode( icqData[ idx ] ) ); - else if( id == TQString::tqfromLatin1("GaduProtocol") ) + else if( id == TQString::fromLatin1("GaduProtocol") ) dataField.appendChild( newList.createTextNode( gaduData[ idx ] ) ); - else if( id == TQString::tqfromLatin1("JabberProtocol") ) + else if( id == TQString::fromLatin1("JabberProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx + 1 ] ) ); else dataField.appendChild( newList.createTextNode( strList[ idx ] ) ); - dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "displayName" ) ); - if( convertOldAim || id == TQString::tqfromLatin1("ICTQProtocol") || id == TQString::tqfromLatin1("WPProtocol") || id == TQString::tqfromLatin1("GaduProtocol") ) + dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "displayName" ) ); + if( convertOldAim || id == TQString::fromLatin1("ICTQProtocol") || id == TQString::fromLatin1("WPProtocol") || id == TQString::fromLatin1("GaduProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx ] ) ); - else if( id == TQString::tqfromLatin1("JabberProtocol") ) + else if( id == TQString::fromLatin1("JabberProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); else dataField.appendChild( newList.createTextNode( strList[ idx + 1 ] ) ); - if( id == TQString::tqfromLatin1("MSNProtocol") ) + if( id == TQString::fromLatin1("MSNProtocol") ) { - dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "groups" ) ); + dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "groups" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); } - else if( id == TQString::tqfromLatin1("IRCProtocol") ) + else if( id == TQString::fromLatin1("IRCProtocol") ) { - dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "serverName" ) ); + dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "serverName" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); } - else if( id == TQString::tqfromLatin1("JabberProtocol") ) + else if( id == TQString::fromLatin1("JabberProtocol") ) { - dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "accountId" ) ); + dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "accountId" ) ); dataField.appendChild( newList.createTextNode( strList[ idx ] ) ); - dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "groups" ) ); + dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "groups" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 3 ] ) ); } - else if( id == TQString::tqfromLatin1( "SMSProtocol" ) && - ( idx + 2 < strList.size() ) && strList[ idx + 2 ] != TQString::tqfromLatin1( "." ) ) + else if( id == TQString::fromLatin1( "SMSProtocol" ) && + ( idx + 2 < strList.size() ) && strList[ idx + 2 ] != TQString::fromLatin1( "." ) ) { - dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "serviceName" ) ); + dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "serviceName" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); - dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "servicePrefs" ) ); + dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "servicePrefs" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 3 ] ) ); // Add extra fields @@ -744,30 +744,30 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers // MSN, AIM, IRC, Oscar and SMS didn't store address book fields up // to now, so create one - if( id != TQString::tqfromLatin1("ICTQProtocol") && id != TQString::tqfromLatin1("JabberProtocol") && id != TQString::tqfromLatin1("WPProtocol") && id != TQString::tqfromLatin1("GaduProtocol") ) + if( id != TQString::fromLatin1("ICTQProtocol") && id != TQString::fromLatin1("JabberProtocol") && id != TQString::fromLatin1("WPProtocol") && id != TQString::fromLatin1("GaduProtocol") ) { - TQDomElement addressBookField = newList.createElement( TQString::tqfromLatin1( "address-book-field" ) ); + TQDomElement addressBookField = newList.createElement( TQString::fromLatin1( "address-book-field" ) ); newMetaContact.appendChild( addressBookField ); - addressBookField.setAttribute( TQString::tqfromLatin1( "app" ), - TQString::tqfromLatin1( "messaging/" ) + addressBookLabel ); - addressBookField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "All" ) ); + addressBookField.setAttribute( TQString::fromLatin1( "app" ), + TQString::fromLatin1( "messaging/" ) + addressBookLabel ); + addressBookField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "All" ) ); addressBookField.appendChild( newList.createTextNode( strList[ idx ] ) ); } idx += fieldCount; } } - else if( id == TQString::tqfromLatin1("ContactNotesPlugin") || id == TQString::tqfromLatin1("CryptographyPlugin") || id == TQString::tqfromLatin1("TranslatorPlugin") ) + else if( id == TQString::fromLatin1("ContactNotesPlugin") || id == TQString::fromLatin1("CryptographyPlugin") || id == TQString::fromLatin1("TranslatorPlugin") ) { - TQDomElement dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); + TQDomElement dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - if( id == TQString::tqfromLatin1("ContactNotesPlugin") ) - dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "notes" ) ); - else if( id == TQString::tqfromLatin1("CryptographyPlugin") ) - dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "gpgKey" ) ); - else if( id == TQString::tqfromLatin1("TranslatorPlugin") ) - dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "languageKey" ) ); + if( id == TQString::fromLatin1("ContactNotesPlugin") ) + dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "notes" ) ); + else if( id == TQString::fromLatin1("CryptographyPlugin") ) + dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "gpgKey" ) ); + else if( id == TQString::fromLatin1("TranslatorPlugin") ) + dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "languageKey" ) ); dataField.appendChild( newList.createTextNode( data ) ); } @@ -776,9 +776,9 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers oldContactNode = oldContactNode.nextSibling(); } } - else if( oldElement.tagName() == TQString::tqfromLatin1("kopete-group") ) + else if( oldElement.tagName() == TQString::fromLatin1("kopete-group") ) { - TQDomElement newGroup = newList.createElement( TQString::tqfromLatin1( "kopete-group" ) ); + TQDomElement newGroup = newList.createElement( TQString::fromLatin1( "kopete-group" ) ); newRoot.appendChild( newGroup ); TQDomNode oldGroupNode = oldNode.firstChild(); @@ -786,38 +786,38 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers { TQDomElement oldGroupElement = oldGroupNode.toElement(); - if( oldGroupElement.tagName() == TQString::tqfromLatin1("display-name") ) + if( oldGroupElement.tagName() == TQString::fromLatin1("display-name") ) { - TQDomElement displayName = newList.createElement( TQString::tqfromLatin1( "display-name" ) ); + TQDomElement displayName = newList.createElement( TQString::fromLatin1( "display-name" ) ); displayName.appendChild( newList.createTextNode( oldGroupElement.text() ) ); newGroup.appendChild( displayName ); } - if( oldGroupElement.tagName() == TQString::tqfromLatin1("type") ) + if( oldGroupElement.tagName() == TQString::fromLatin1("type") ) { - if( oldGroupElement.text() == TQString::tqfromLatin1("Temporary") ) - newGroup.setAttribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "temporary" ) ); - else if( oldGroupElement.text() == TQString::tqfromLatin1( "TopLevel" ) ) - newGroup.setAttribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "top-level" ) ); + if( oldGroupElement.text() == TQString::fromLatin1("Temporary") ) + newGroup.setAttribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "temporary" ) ); + else if( oldGroupElement.text() == TQString::fromLatin1( "TopLevel" ) ) + newGroup.setAttribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "top-level" ) ); else - newGroup.setAttribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "standard" ) ); + newGroup.setAttribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "standard" ) ); } - if( oldGroupElement.tagName() == TQString::tqfromLatin1("view") ) + if( oldGroupElement.tagName() == TQString::fromLatin1("view") ) { - if( oldGroupElement.text() == TQString::tqfromLatin1("collapsed") ) - newGroup.setAttribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( "collapsed" ) ); + if( oldGroupElement.text() == TQString::fromLatin1("collapsed") ) + newGroup.setAttribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( "collapsed" ) ); else - newGroup.setAttribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( "expanded" ) ); + newGroup.setAttribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( "expanded" ) ); } - else if( oldGroupElement.tagName() == TQString::tqfromLatin1("plugin-data") ) + else if( oldGroupElement.tagName() == TQString::fromLatin1("plugin-data") ) { // Per-group plugin data // FIXME: This needs updating too, ideally, convert this in a later // contactlist.xml version - TQDomElement groupPluginData = newList.createElement( TQString::tqfromLatin1( "plugin-data" ) ); + TQDomElement groupPluginData = newList.createElement( TQString::fromLatin1( "plugin-data" ) ); newGroup.appendChild( groupPluginData ); - groupPluginData.setAttribute( TQString::tqfromLatin1( "plugin-id" ), - oldGroupElement.attribute( TQString::tqfromLatin1( "plugin-id" ), TQString() ) ); + groupPluginData.setAttribute( TQString::fromLatin1( "plugin-id" ), + oldGroupElement.attribute( TQString::fromLatin1( "plugin-id" ), TQString() ) ); groupPluginData.appendChild( newList.createTextNode( oldGroupElement.text() ) ); } @@ -836,7 +836,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers // Close the file, and save the new file contactListFile.close(); - TQDir().rename( fileName, fileName + TQString::tqfromLatin1( ".bak" ) ); + TQDir().rename( fileName, fileName + TQString::fromLatin1( ".bak" ) ); // kdDebug( 14010 ) << k_funcinfo << "XML output:\n" << newList.toString( 2 ) << endl; @@ -862,7 +862,7 @@ void Kopete::ContactList::saveXML() return; } - TQString contactListFileName = locateLocal( "appdata", TQString::tqfromLatin1( "contactlist.xml" ) ); + TQString contactListFileName = locateLocal( "appdata", TQString::fromLatin1( "contactlist.xml" ) ); KSaveFile contactListFile( contactListFileName ); if( contactListFile.status() == 0 ) { @@ -894,8 +894,8 @@ void Kopete::ContactList::saveXML() const TQDomDocument ContactList::toXML() { TQDomDocument doc; - doc.appendChild( doc.createElement( TQString::tqfromLatin1("kopete-contact-list") ) ); - doc.documentElement().setAttribute( TQString::tqfromLatin1("version"), TQString::tqfromLatin1("1.0")); + doc.appendChild( doc.createElement( TQString::fromLatin1("kopete-contact-list") ) ); + doc.documentElement().setAttribute( TQString::fromLatin1("version"), TQString::fromLatin1("1.0")); // Save group information. ie: Open/Closed, pehaps later icons? Who knows. for( Kopete::Group *g = d->groups.first(); g; g = d->groups.next() ) @@ -910,7 +910,7 @@ const TQDomDocument ContactList::toXML() if( Kopete::Config::enableGlobalIdentity() ) { TQDomElement myselfElement = myself()->toXML(true); // Save minimal information. - myselfElement.setTagName( TQString::tqfromLatin1("myself-meta-contact") ); + myselfElement.setTagName( TQString::fromLatin1("myself-meta-contact") ); doc.documentElement().appendChild( doc.importNode( myselfElement, true ) ); } @@ -934,7 +934,7 @@ TQStringList ContactList::contactStatuses() const TQPtrListIterator<Kopete::MetaContact> it( d->contacts ); for( ; it.current(); ++it ) { - meta_contacts.append( TQString::tqfromLatin1( "%1 (%2)" ). + meta_contacts.append( TQString::fromLatin1( "%1 (%2)" ). arg( it.current()->displayName(), it.current()->statusString() )); } return meta_contacts; diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp index a9e812cd..89e9ea29 100644 --- a/kopete/libkopete/kopetecontactlistelement.cpp +++ b/kopete/libkopete/kopetecontactlistelement.cpp @@ -90,21 +90,21 @@ const TQValueList<TQDomElement> ContactListElement::toXML() { TQDomDocument pluginData; TQValueList<TQDomElement> pluginNodes; - pluginData.appendChild( pluginData.createElement( TQString::tqfromLatin1( "plugin-data" ) ) ); + pluginData.appendChild( pluginData.createElement( TQString::fromLatin1( "plugin-data" ) ) ); if ( !d->pluginData.isEmpty() ) { TQMap<TQString, TQMap<TQString, TQString> >::ConstIterator pluginIt; for ( pluginIt = d->pluginData.begin(); pluginIt != d->pluginData.end(); ++pluginIt ) { - TQDomElement pluginElement = pluginData.createElement( TQString::tqfromLatin1( "plugin-data" ) ); - pluginElement.setAttribute( TQString::tqfromLatin1( "plugin-id" ), pluginIt.key() ); + TQDomElement pluginElement = pluginData.createElement( TQString::fromLatin1( "plugin-data" ) ); + pluginElement.setAttribute( TQString::fromLatin1( "plugin-id" ), pluginIt.key() ); TQMap<TQString, TQString>::ConstIterator it; for ( it = pluginIt.data().begin(); it != pluginIt.data().end(); ++it ) { - TQDomElement pluginDataField = pluginData.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); - pluginDataField.setAttribute( TQString::tqfromLatin1( "key" ), it.key() ); + TQDomElement pluginDataField = pluginData.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + pluginDataField.setAttribute( TQString::fromLatin1( "key" ), it.key() ); pluginDataField.appendChild( pluginData.createTextNode( it.data() ) ); pluginElement.appendChild( pluginDataField ); } @@ -115,39 +115,39 @@ const TQValueList<TQDomElement> ContactListElement::toXML() } if ( !d->icons.isEmpty() ) { - TQDomElement iconsElement = pluginData.createElement( TQString::tqfromLatin1( "custom-icons" ) ); - iconsElement.setAttribute( TQString::tqfromLatin1( "use" ), d->useCustomIcon ? TQString::tqfromLatin1( "1" ) : TQString::tqfromLatin1( "0" ) ); + TQDomElement iconsElement = pluginData.createElement( TQString::fromLatin1( "custom-icons" ) ); + iconsElement.setAttribute( TQString::fromLatin1( "use" ), d->useCustomIcon ? TQString::fromLatin1( "1" ) : TQString::fromLatin1( "0" ) ); for ( TQMap<IconState, TQString >::ConstIterator it = d->icons.begin(); it != d->icons.end(); ++it ) { - TQDomElement iconElement = pluginData.createElement( TQString::tqfromLatin1( "icon" ) ); + TQDomElement iconElement = pluginData.createElement( TQString::fromLatin1( "icon" ) ); TQString stateStr; switch ( it.key() ) { case Open: - stateStr = TQString::tqfromLatin1( "open" ); + stateStr = TQString::fromLatin1( "open" ); break; case Closed: - stateStr = TQString::tqfromLatin1( "closed" ); + stateStr = TQString::fromLatin1( "closed" ); break; case Online: - stateStr = TQString::tqfromLatin1( "online" ); + stateStr = TQString::fromLatin1( "online" ); break; case Away: - stateStr = TQString::tqfromLatin1( "away" ); + stateStr = TQString::fromLatin1( "away" ); break; case Offline: - stateStr = TQString::tqfromLatin1( "offline" ); + stateStr = TQString::fromLatin1( "offline" ); break; case Unknown: - stateStr = TQString::tqfromLatin1( "unknown" ); + stateStr = TQString::fromLatin1( "unknown" ); break; case None: default: - stateStr = TQString::tqfromLatin1( "none" ); + stateStr = TQString::fromLatin1( "none" ); break; } - iconElement.setAttribute( TQString::tqfromLatin1( "state" ), stateStr ); + iconElement.setAttribute( TQString::fromLatin1( "state" ), stateStr ); iconElement.appendChild( pluginData.createTextNode( it.data() ) ); iconsElement.appendChild( iconElement ); } @@ -159,52 +159,52 @@ const TQValueList<TQDomElement> ContactListElement::toXML() bool ContactListElement::fromXML( const TQDomElement& element ) { - if ( element.tagName() == TQString::tqfromLatin1( "plugin-data" ) ) + if ( element.tagName() == TQString::fromLatin1( "plugin-data" ) ) { TQMap<TQString, TQString> pluginData; - TQString pluginId = element.attribute( TQString::tqfromLatin1( "plugin-id" ), TQString() ); + TQString pluginId = element.attribute( TQString::fromLatin1( "plugin-id" ), TQString() ); //in kopete 0.6 the AIM protocol was called OSCAR - if ( pluginId == TQString::tqfromLatin1( "OscarProtocol" ) ) - pluginId = TQString::tqfromLatin1( "AIMProtocol" ); + if ( pluginId == TQString::fromLatin1( "OscarProtocol" ) ) + pluginId = TQString::fromLatin1( "AIMProtocol" ); TQDomNode field = element.firstChild(); while( !field.isNull() ) { TQDomElement fieldElement = field.toElement(); - if ( fieldElement.tagName() == TQString::tqfromLatin1( "plugin-data-field" ) ) + if ( fieldElement.tagName() == TQString::fromLatin1( "plugin-data-field" ) ) { - pluginData.insert( fieldElement.attribute( TQString::tqfromLatin1( "key" ), - TQString::tqfromLatin1( "undefined-key" ) ), fieldElement.text() ); + pluginData.insert( fieldElement.attribute( TQString::fromLatin1( "key" ), + TQString::fromLatin1( "undefined-key" ) ), fieldElement.text() ); } field = field.nextSibling(); } d->pluginData.insert( pluginId, pluginData ); } - else if ( element.tagName() == TQString::tqfromLatin1( "custom-icons" ) ) + else if ( element.tagName() == TQString::fromLatin1( "custom-icons" ) ) { - d->useCustomIcon= element.attribute( TQString::tqfromLatin1( "use" ), TQString::tqfromLatin1( "1" ) ) == TQString::tqfromLatin1( "1" ); + d->useCustomIcon= element.attribute( TQString::fromLatin1( "use" ), TQString::fromLatin1( "1" ) ) == TQString::fromLatin1( "1" ); TQDomNode ic = element.firstChild(); while( !ic.isNull() ) { TQDomElement iconElement = ic.toElement(); - if ( iconElement.tagName() == TQString::tqfromLatin1( "icon" ) ) + if ( iconElement.tagName() == TQString::fromLatin1( "icon" ) ) { - TQString stateStr = iconElement.attribute( TQString::tqfromLatin1( "state" ), TQString() ); + TQString stateStr = iconElement.attribute( TQString::fromLatin1( "state" ), TQString() ); TQString icon = iconElement.text(); IconState state = None; - if ( stateStr == TQString::tqfromLatin1( "open" ) ) + if ( stateStr == TQString::fromLatin1( "open" ) ) state = Open; - if ( stateStr == TQString::tqfromLatin1( "closed" ) ) + if ( stateStr == TQString::fromLatin1( "closed" ) ) state = Closed; - if ( stateStr == TQString::tqfromLatin1( "online" ) ) + if ( stateStr == TQString::fromLatin1( "online" ) ) state = Online; - if ( stateStr == TQString::tqfromLatin1( "offline" ) ) + if ( stateStr == TQString::fromLatin1( "offline" ) ) state = Offline; - if ( stateStr == TQString::tqfromLatin1( "away" ) ) + if ( stateStr == TQString::fromLatin1( "away" ) ) state = Away; - if ( stateStr == TQString::tqfromLatin1( "unknown" ) ) + if ( stateStr == TQString::fromLatin1( "unknown" ) ) state = Unknown; d->icons[ state ] = icon; diff --git a/kopete/libkopete/kopeteeventpresentation.cpp b/kopete/libkopete/kopeteeventpresentation.cpp index 9314df14..f1017181 100644 --- a/kopete/libkopete/kopeteeventpresentation.cpp +++ b/kopete/libkopete/kopeteeventpresentation.cpp @@ -76,15 +76,15 @@ TQString Kopete::EventPresentation::toString() switch ( m_type ) { case Sound: - type= TQString::tqfromLatin1("sound"); + type= TQString::fromLatin1("sound"); break; case Message: - type= TQString::tqfromLatin1("message"); + type= TQString::fromLatin1("message"); break; case Chat: - type= TQString::tqfromLatin1("chat"); + type= TQString::fromLatin1("chat"); break; } - TQString stringRep = TQString::tqfromLatin1( "Presentation; type=%1; content=%2; enabled=%3; single shot=%4\n" ).tqarg(type).tqarg(m_content).tqarg(m_enabled).tqarg(m_singleShot); + TQString stringRep = TQString::fromLatin1( "Presentation; type=%1; content=%2; enabled=%3; single shot=%4\n" ).tqarg(type).tqarg(m_content).tqarg(m_enabled).tqarg(m_singleShot); return stringRep; } diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp index e7643142..c8c21c25 100644 --- a/kopete/libkopete/kopeteglobal.cpp +++ b/kopete/libkopete/kopeteglobal.cpp @@ -108,85 +108,85 @@ bool Properties::isRegistered(const TQString &key) const ContactPropertyTmpl &Properties::fullName() const { - return createProp(TQString::tqfromLatin1("FormattedName"), + return createProp(TQString::fromLatin1("FormattedName"), i18n("Full Name")); } const ContactPropertyTmpl &Properties::idleTime() const { - return createProp(TQString::tqfromLatin1("idleTime"), + return createProp(TQString::fromLatin1("idleTime"), i18n("Idle Time")); } const ContactPropertyTmpl &Properties::onlineSince() const { - return createProp(TQString::tqfromLatin1("onlineSince"), + return createProp(TQString::fromLatin1("onlineSince"), i18n("Online Since")); } const ContactPropertyTmpl &Properties::lastSeen() const { - return createProp(TQString::tqfromLatin1("lastSeen"), + return createProp(TQString::fromLatin1("lastSeen"), i18n("Last Seen"), TQString(), true); } const ContactPropertyTmpl &Properties::awayMessage() const { - return createProp(TQString::tqfromLatin1("awayMessage"), + return createProp(TQString::fromLatin1("awayMessage"), i18n("Away Message")); } const ContactPropertyTmpl &Properties::firstName() const { - return createProp(TQString::tqfromLatin1("firstName"), + return createProp(TQString::fromLatin1("firstName"), i18n("First Name"), TQString(), true); } const ContactPropertyTmpl &Properties::lastName() const { - return createProp(TQString::tqfromLatin1("lastName"), + return createProp(TQString::fromLatin1("lastName"), i18n("Last Name"), TQString(), true); } const ContactPropertyTmpl &Properties::privatePhone() const { - return createProp(TQString::tqfromLatin1("privatePhoneNumber"), + return createProp(TQString::fromLatin1("privatePhoneNumber"), i18n("Private Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::privateMobilePhone() const { - return createProp(TQString::tqfromLatin1("privateMobilePhoneNumber"), + return createProp(TQString::fromLatin1("privateMobilePhoneNumber"), i18n("Private Mobile Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::workPhone() const { - return createProp(TQString::tqfromLatin1("workPhoneNumber"), + return createProp(TQString::fromLatin1("workPhoneNumber"), i18n("Work Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::workMobilePhone() const { - return createProp(TQString::tqfromLatin1("workMobilePhoneNumber"), + return createProp(TQString::fromLatin1("workMobilePhoneNumber"), i18n("Work Mobile Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::emailAddress() const { - return createProp(TQString::tqfromLatin1("emailAddress"), - i18n("Email Address"), TQString::tqfromLatin1("mail_generic"), true); + return createProp(TQString::fromLatin1("emailAddress"), + i18n("Email Address"), TQString::fromLatin1("mail_generic"), true); } const ContactPropertyTmpl &Properties::nickName() const { - return createProp(TQString::tqfromLatin1("nickName"), + return createProp(TQString::fromLatin1("nickName"), i18n("Nick Name"), TQString(), true); } const ContactPropertyTmpl &Properties::photo() const { - return createProp(TQString::tqfromLatin1("photo"), + return createProp(TQString::fromLatin1("photo"), i18n("Photo"), TQString(), true); } @@ -241,14 +241,14 @@ void installEmoticonTheme(const TQString &archiveName) kapp->processEvents(); TQString currentBundleMimeType = KMimeType::findByPath(archiveName, 0, false)->name(); - if( currentBundleMimeType == TQString::tqfromLatin1("application/x-zip") ) + if( currentBundleMimeType == TQString::fromLatin1("application/x-zip") ) archive = new KZip(archiveName); - else if( currentBundleMimeType == TQString::tqfromLatin1("application/x-tgz") || - currentBundleMimeType == TQString::tqfromLatin1("application/x-tbz") || - currentBundleMimeType == TQString::tqfromLatin1("application/x-gzip") || - currentBundleMimeType == TQString::tqfromLatin1("application/x-bzip2") ) + else if( currentBundleMimeType == TQString::fromLatin1("application/x-tgz") || + currentBundleMimeType == TQString::fromLatin1("application/x-tbz") || + currentBundleMimeType == TQString::fromLatin1("application/x-gzip") || + currentBundleMimeType == TQString::fromLatin1("application/x-bzip2") ) archive = new KTar(archiveName); - else if(archiveName.endsWith(TQString::tqfromLatin1("jisp")) || archiveName.endsWith(TQString::tqfromLatin1("zip")) ) + else if(archiveName.endsWith(TQString::fromLatin1("jisp")) || archiveName.endsWith(TQString::fromLatin1("zip")) ) archive = new KZip(archiveName); else archive = new KTar(archiveName); @@ -273,8 +273,8 @@ void installEmoticonTheme(const TQString &archiveName) if (currentEntry->isDirectory()) { currentDir = dynamic_cast<KArchiveDirectory*>( currentEntry ); - if (currentDir && ( currentDir->entry(TQString::tqfromLatin1("emoticons.xml")) != NULL || - currentDir->entry(TQString::tqfromLatin1("icondef.xml")) != NULL ) ) + if (currentDir && ( currentDir->entry(TQString::fromLatin1("emoticons.xml")) != NULL || + currentDir->entry(TQString::fromLatin1("icondef.xml")) != NULL ) ) foundThemes.append(currentDir->name()); } } @@ -295,7 +295,7 @@ void installEmoticonTheme(const TQString &archiveName) progressDlg->setLabel( i18n("<qt>Installing <strong>%1</strong> emoticon theme</qt>") .tqarg(*it)); - progressDlg->resize(progressDlg->tqsizeHint()); + progressDlg->resize(progressDlg->sizeHint()); kapp->processEvents(); if (progressDlg->wasCancelled()) diff --git a/kopete/libkopete/kopetegroup.cpp b/kopete/libkopete/kopetegroup.cpp index fc1290ba..6206545a 100644 --- a/kopete/libkopete/kopetegroup.cpp +++ b/kopete/libkopete/kopetegroup.cpp @@ -104,27 +104,27 @@ TQPtrList<MetaContact> Group::members() const const TQDomElement Group::toXML() { TQDomDocument group; - group.appendChild( group.createElement( TQString::tqfromLatin1( "kopete-group" ) ) ); - group.documentElement().setAttribute( TQString::tqfromLatin1( "groupId" ), TQString::number( groupId() ) ); + group.appendChild( group.createElement( TQString::fromLatin1( "kopete-group" ) ) ); + group.documentElement().setAttribute( TQString::fromLatin1( "groupId" ), TQString::number( groupId() ) ); TQString type; switch ( d->type ) { case Temporary: - type = TQString::tqfromLatin1( "temporary" ); + type = TQString::fromLatin1( "temporary" ); break; case TopLevel: - type = TQString::tqfromLatin1( "top-level" ); + type = TQString::fromLatin1( "top-level" ); break; default: - type = TQString::tqfromLatin1( "standard" ); // == Normal + type = TQString::fromLatin1( "standard" ); // == Normal break; } - group.documentElement().setAttribute( TQString::tqfromLatin1( "type" ), type ); - group.documentElement().setAttribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( d->expanded ? "expanded" : "collapsed" ) ); + group.documentElement().setAttribute( TQString::fromLatin1( "type" ), type ); + group.documentElement().setAttribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( d->expanded ? "expanded" : "collapsed" ) ); - TQDomElement displayName = group.createElement( TQString::tqfromLatin1( "display-name" ) ); + TQDomElement displayName = group.createElement( TQString::fromLatin1( "display-name" ) ); displayName.appendChild( group.createTextNode( d->displayName ) ); group.documentElement().appendChild( displayName ); @@ -143,7 +143,7 @@ const TQDomElement Group::toXML() bool Group::fromXML( const TQDomElement &data ) { - TQString strGroupId = data.attribute( TQString::tqfromLatin1( "groupId" ) ); + TQString strGroupId = data.attribute( TQString::fromLatin1( "groupId" ) ); if ( !strGroupId.isEmpty() ) { d->groupId = strGroupId.toUInt(); @@ -154,8 +154,8 @@ bool Group::fromXML( const TQDomElement &data ) // Don't overwrite type for Temporary and TopLevel groups if ( d->type != Temporary && d->type != TopLevel ) { - TQString type = data.attribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "standard" ) ); - if ( type == TQString::tqfromLatin1( "temporary" ) ) + TQString type = data.attribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "standard" ) ); + if ( type == TQString::fromLatin1( "temporary" ) ) { if ( d->type != Temporary ) { @@ -163,7 +163,7 @@ bool Group::fromXML( const TQDomElement &data ) return false; } } - else if ( type == TQString::tqfromLatin1( "top-level" ) ) + else if ( type == TQString::fromLatin1( "top-level" ) ) { if ( d->type != TopLevel ) { @@ -177,20 +177,20 @@ bool Group::fromXML( const TQDomElement &data ) } } - TQString view = data.attribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( "expanded" ) ); - d->expanded = ( view != TQString::tqfromLatin1( "collapsed" ) ); + TQString view = data.attribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( "expanded" ) ); + d->expanded = ( view != TQString::fromLatin1( "collapsed" ) ); TQDomNode groupData = data.firstChild(); while ( !groupData.isNull() ) { TQDomElement groupElement = groupData.toElement(); - if ( groupElement.tagName() == TQString::tqfromLatin1( "display-name" ) ) + if ( groupElement.tagName() == TQString::fromLatin1( "display-name" ) ) { // Don't set display name for temporary or top-level items if ( d->type == Normal ) d->displayName = groupElement.text(); } - else if( groupElement.tagName() == TQString::tqfromLatin1( "custom-notifications" ) ) + else if( groupElement.tagName() == TQString::fromLatin1( "custom-notifications" ) ) { Kopete::NotifyDataObject::notifyDataFromXML( groupElement ); } @@ -208,10 +208,10 @@ bool Group::fromXML( const TQDomElement &data ) switch ( d->type ) { case Temporary: - d->displayName = TQString::tqfromLatin1( "Temporary" ); + d->displayName = TQString::fromLatin1( "Temporary" ); break; case TopLevel: - d->displayName = TQString::tqfromLatin1( "Top-Level" ); + d->displayName = TQString::fromLatin1( "Top-Level" ); break; default: d->displayName = i18n( "(Unnamed Group)" ); diff --git a/kopete/libkopete/kopetemessage.cpp b/kopete/libkopete/kopetemessage.cpp index 0dfedd69..2070dd56 100644 --- a/kopete/libkopete/kopetemessage.cpp +++ b/kopete/libkopete/kopetemessage.cpp @@ -83,14 +83,14 @@ Message::Private::Private( const TQDateTime &timeStamp, const Contact *from, } Message::Message() -: d( new Private( TQDateTime::tqcurrentDateTime(), 0L, TQPtrList<Contact>(), TQString(), Internal, +: d( new Private( TQDateTime::currentDateTime(), 0L, TQPtrList<Contact>(), TQString(), Internal, TQString(), TypeNormal ) ) { } Message::Message( const Contact *fromKC, const TQPtrList<Contact> &toKC, const TQString &body, MessageDirection direction, MessageFormat f, const TQString &requestedPlugin, MessageType type ) -: d( new Private( TQDateTime::tqcurrentDateTime(), fromKC, toKC, TQString(), direction, requestedPlugin, type ) ) +: d( new Private( TQDateTime::currentDateTime(), fromKC, toKC, TQString(), direction, requestedPlugin, type ) ) { doSetBody( body, f ); } @@ -100,13 +100,13 @@ Message::Message( const Contact *fromKC, const Contact *toKC, const TQString &bo { TQPtrList<Contact> to; to.append(toKC); - d = new Private( TQDateTime::tqcurrentDateTime(), fromKC, to, TQString(), direction, requestedPlugin, type ); + d = new Private( TQDateTime::currentDateTime(), fromKC, to, TQString(), direction, requestedPlugin, type ); doSetBody( body, f ); } Message::Message( const Contact *fromKC, const TQPtrList<Contact> &toKC, const TQString &body, const TQString &subject, MessageDirection direction, MessageFormat f, const TQString &requestedPlugin, MessageType type ) - : d( new Private( TQDateTime::tqcurrentDateTime(), fromKC, toKC, subject, direction, requestedPlugin, type ) ) + : d( new Private( TQDateTime::currentDateTime(), fromKC, toKC, subject, direction, requestedPlugin, type ) ) { doSetBody( body, f ); } @@ -199,20 +199,20 @@ void Message::doSetBody( const TQString &_body, Message::MessageFormat f ) { //This is coming from the RichTextEditor component. //Strip off the containing HTML document - body.replace( TQRegExp( TQString::tqfromLatin1(".*<body[^>]*>(.*)</body>.*") ), TQString::tqfromLatin1("\\1") ); + body.replace( TQRegExp( TQString::fromLatin1(".*<body[^>]*>(.*)</body>.*") ), TQString::fromLatin1("\\1") ); //Strip <p> tags - body.replace( TQString::tqfromLatin1("<p>"), TQString() ); + body.replace( TQString::fromLatin1("<p>"), TQString() ); //Replace </p> with a <br/> - body.replace( TQString::tqfromLatin1("</p>"), TQString::tqfromLatin1("<br/>") ); + body.replace( TQString::fromLatin1("</p>"), TQString::fromLatin1("<br/>") ); //Remove trailing </br> - if ( body.endsWith( TQString::tqfromLatin1("<br/>") ) ) + if ( body.endsWith( TQString::fromLatin1("<br/>") ) ) body.truncate( body.length() - 5 ); - body.remove( TQString::tqfromLatin1("\n") ); - body.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); + body.remove( TQString::fromLatin1("\n") ); + body.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( " " ) ); } /* else if( f == ParsedHTML ) @@ -266,10 +266,10 @@ TQString Message::unescape( const TQString &xml ) TQString match = data.mid( pos + 1, matchWidth - 2 ).simplifyWhiteSpace(); int elemEndPos = match.find( ' ' ); TQString elem = ( elemEndPos == -1 ? match.lower() : match.left( elemEndPos ).lower() ); - if ( elem == TQString::tqfromLatin1( "img" ) ) + if ( elem == TQString::fromLatin1( "img" ) ) { // Replace smileys with their original text' - const TQString attrTitle = TQString::tqfromLatin1( "title=\"" ); + const TQString attrTitle = TQString::fromLatin1( "title=\"" ); int titlePos = match.find( attrTitle, elemEndPos ); int titleEndPos = match.find( '"', titlePos + attrTitle.length() ); if( titlePos == -1 || titleEndPos == -1 ) @@ -286,8 +286,8 @@ TQString Message::unescape( const TQString &xml ) pos += orig.length(); } } - else if ( elem == TQString::tqfromLatin1( "/p" ) || elem == TQString::tqfromLatin1( "/div" ) || - elem == TQString::tqfromLatin1( "br" ) ) + else if ( elem == TQString::fromLatin1( "/p" ) || elem == TQString::fromLatin1( "/div" ) || + elem == TQString::fromLatin1( "br" ) ) { // Replace paragraph, div and line breaks with a newline data.replace( pos, matchWidth, '\n' ); @@ -302,12 +302,12 @@ TQString Message::unescape( const TQString &xml ) } // Replace stuff starting with '&' - data.replace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); - data.replace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); - data.replace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); - data.replace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); - data.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); - data.replace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); //this one is used in jabber: note, we should escape all &#xx; + data.replace( TQString::fromLatin1( ">" ), TQString::fromLatin1( ">" ) ); + data.replace( TQString::fromLatin1( "<" ), TQString::fromLatin1( "<" ) ); + data.replace( TQString::fromLatin1( """ ), TQString::fromLatin1( "\"" ) ); + data.replace( TQString::fromLatin1( " " ), TQString::fromLatin1( " " ) ); + data.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&" ) ); + data.replace( TQString::fromLatin1( " " ), TQString::fromLatin1( " " ) ); //this one is used in jabber: note, we should escape all &#xx; return data; } @@ -316,13 +316,13 @@ TQString Message::escape( const TQString &text ) { TQString html = TQStyleSheet::escape( text ); //Replace carriage returns inside the text - html.replace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "<br />" ) ); + html.replace( TQString::fromLatin1( "\n" ), TQString::fromLatin1( "<br />" ) ); //Replace a tab with 4 spaces - html.replace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( " " ) ); + html.replace( TQString::fromLatin1( "\t" ), TQString::fromLatin1( " " ) ); //Replace multiple spaces with //do not replace every space so we break the linebreak - html.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); + html.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( " " ) ); return html; } @@ -373,11 +373,11 @@ TQString Message::parsedBody() const static TQString makeRegExp( const char *pattern ) { - const TQString urlChar = TQString::tqfromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); - const TQString boundaryStart = TQString::tqfromLatin1( "(^|[^%1])(" ).tqarg( urlChar ); - const TQString boundaryEnd = TQString::tqfromLatin1( ")([^%1]|$)" ).tqarg( urlChar ); + const TQString urlChar = TQString::fromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); + const TQString boundaryStart = TQString::fromLatin1( "(^|[^%1])(" ).tqarg( urlChar ); + const TQString boundaryEnd = TQString::fromLatin1( ")([^%1]|$)" ).tqarg( urlChar ); - return boundaryStart + TQString::tqfromLatin1(pattern) + boundaryEnd; + return boundaryStart + TQString::fromLatin1(pattern) + boundaryEnd; } TQString Message::parseLinks( const TQString &message, MessageFormat format ) @@ -411,38 +411,38 @@ TQString Message::parseLinks( const TQString &message, MessageFormat format ) TQString body = curr.mid( tagclose + 1 ); *it = tag + parseLinks( body, PlainText ); } - return entries.join(TQString::tqfromLatin1("<")); + return entries.join(TQString::fromLatin1("<")); } TQString result = message; // common subpatterns - may not contain matching parens! - const TQString name = TQString::tqfromLatin1( "[\\w\\+\\-=_\\.]+" ); - const TQString userAndPassword = TQString::tqfromLatin1( "(?:%1(?::%1)?\\@)" ).tqarg( name ); - const TQString urlChar = TQString::tqfromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); - const TQString urlSection = TQString::tqfromLatin1( "[%1]+" ).tqarg( urlChar ); - const TQString domain = TQString::tqfromLatin1( "[\\-\\w_]+(?:\\.[\\-\\w_]+)+" ); + const TQString name = TQString::fromLatin1( "[\\w\\+\\-=_\\.]+" ); + const TQString userAndPassword = TQString::fromLatin1( "(?:%1(?::%1)?\\@)" ).tqarg( name ); + const TQString urlChar = TQString::fromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); + const TQString urlSection = TQString::fromLatin1( "[%1]+" ).tqarg( urlChar ); + const TQString domain = TQString::fromLatin1( "[\\-\\w_]+(?:\\.[\\-\\w_]+)+" ); //Replace http/https/ftp links: // Replace (stuff)://[user:password@](linkstuff) with a link result.replace( TQRegExp( makeRegExp("\\w+://%1?\\w%2").tqarg( userAndPassword, urlSection ) ), - TQString::tqfromLatin1("\\1<a href=\"\\2\" title=\"\\2\">\\2</a>\\3" ) ); + TQString::fromLatin1("\\1<a href=\"\\2\" title=\"\\2\">\\2</a>\\3" ) ); // Replace www.X.Y(linkstuff) with a http: link result.replace( TQRegExp( makeRegExp("%1?www\\.%2%3").tqarg( userAndPassword, domain, urlSection ) ), - TQString::tqfromLatin1("\\1<a href=\"http://\\2\" title=\"http://\\2\">\\2</a>\\3" ) ); + TQString::fromLatin1("\\1<a href=\"http://\\2\" title=\"http://\\2\">\\2</a>\\3" ) ); //Replace Email Links // Replace user@domain with a mailto: link result.replace( TQRegExp( makeRegExp("%1@%2").tqarg( name, domain ) ), - TQString::tqfromLatin1("\\1<a href=\"mailto:\\2\" title=\"mailto:\\2\">\\2</a>\\3") ); + TQString::fromLatin1("\\1<a href=\"mailto:\\2\" title=\"mailto:\\2\">\\2</a>\\3") ); //Workaround for Bug 85061: Highlighted URLs adds a ' ' after the URL itself // the trailing is included in the url. - result.replace( TQRegExp( TQString::tqfromLatin1("(<a href=\"[^\"]+)( )(\")") ) , TQString::tqfromLatin1("\\1\\3") ); + result.replace( TQRegExp( TQString::fromLatin1("(<a href=\"[^\"]+)( )(\")") ) , TQString::fromLatin1("\\1\\3") ); return result; } @@ -486,8 +486,8 @@ TQColor Message::bg() const TQFont Message::font() const { - //TQDomElement bodyNode = d->xmlDoc.elementsByTagName( TQString::tqfromLatin1("body") ).item(0).toElement(); - //return TQFont( bodyNode.attribute( TQString::tqfromLatin1("font") ), bodyNode.attribute( TQString::tqfromLatin1("fontsize") ).toInt() ); + //TQDomElement bodyNode = d->xmlDoc.elementsByTagName( TQString::fromLatin1("body") ).item(0).toElement(); + //return TQFont( bodyNode.attribute( TQString::fromLatin1("font") ), bodyNode.attribute( TQString::fromLatin1("fontsize") ).toInt() ); return d->font; } @@ -543,15 +543,15 @@ TQString Message::getHtmlStyleAttribute() const { TQString fontstr; if(!d->font.family().isNull()) - fontstr+=TQString::tqfromLatin1("font-family: ")+d->font.family()+TQString::tqfromLatin1("; "); + fontstr+=TQString::fromLatin1("font-family: ")+d->font.family()+TQString::fromLatin1("; "); if(d->font.italic()) - fontstr+=TQString::tqfromLatin1("font-style: italic; "); + fontstr+=TQString::fromLatin1("font-style: italic; "); if(d->font.strikeOut()) - fontstr+=TQString::tqfromLatin1("text-decoration: line-through; "); + fontstr+=TQString::fromLatin1("text-decoration: line-through; "); if(d->font.underline()) - fontstr+=TQString::tqfromLatin1("text-decoration: underline; "); + fontstr+=TQString::fromLatin1("text-decoration: underline; "); if(d->font.bold()) - fontstr+=TQString::tqfromLatin1("font-weight: bold;"); + fontstr+=TQString::fromLatin1("font-weight: bold;"); styleAttribute += fontstr; } @@ -629,7 +629,7 @@ TQString Message::decodeString( const TQCString &message, const TQTextCodec *pro kdDebug(14000) << k_funcinfo << "Using latin1 and cleaning string" << endl; //No codec decoded. Just decode latin1, and clean out any junk. - TQString result = TQString::tqfromLatin1( message ); + TQString result = TQString::fromLatin1( message ); const uint length = message.length(); for( uint i = 0; i < length; ++i ) { diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp index 1db7b1e5..d5f8c685 100644 --- a/kopete/libkopete/kopetemetacontact.cpp +++ b/kopete/libkopete/kopetemetacontact.cpp @@ -58,7 +58,7 @@ class MetaContact::Private Private() : photoSource(MetaContact::SourceCustom), displayNameSource(MetaContact::SourceCustom), displayNameSourceContact(0L), photoSourceContact(0L), temporary(false), - onlinetqStatus(Kopete::OnlineStatus::Offline), photoSyncedWithKABC(false) + onlineStatus(Kopete::OnlineStatus::Offline), photoSyncedWithKABC(false) {} ~Private() @@ -85,7 +85,7 @@ class MetaContact::Private TQMap<TQString, TQMap<TQString, TQString> > addressBook; bool temporary; - OnlineStatus::StatusType onlinetqStatus; + OnlineStatus::StatusType onlineStatus; bool photoSyncedWithKABC; // Used to set contact source at load. @@ -171,22 +171,22 @@ void MetaContact::addContact( Contact *c ) void MetaContact::updateOnlineStatus() { - Kopete::OnlineStatus::StatusType newtqStatus = Kopete::OnlineStatus::Unknown; - Kopete::OnlineStatus mostSignificanttqStatus; + Kopete::OnlineStatus::StatusType newStatus = Kopete::OnlineStatus::Unknown; + Kopete::OnlineStatus mostSignificantStatus; for ( TQPtrListIterator<Contact> it( d->contacts ); it.current(); ++it ) { // find most significant status - if ( it.current()->onlinetqStatus() > mostSignificanttqStatus ) - mostSignificanttqStatus = it.current()->onlinetqStatus(); + if ( it.current()->onlineStatus() > mostSignificantStatus ) + mostSignificantStatus = it.current()->onlineStatus(); } - newtqStatus = mostSignificanttqStatus.status(); + newStatus = mostSignificantStatus.status(); - if( newtqStatus != d->onlinetqStatus ) + if( newStatus != d->onlineStatus ) { - d->onlinetqStatus = newtqStatus; - emit onlineStatusChanged( this, d->onlinetqStatus ); + d->onlineStatus = newStatus; + emit onlineStatusChanged( this, d->onlineStatus ); } } @@ -415,14 +415,14 @@ Contact *MetaContact::preferredContact() continue; } - if( c->onlinetqStatus().status() > contact->onlinetqStatus().status() ) + if( c->onlineStatus().status() > contact->onlineStatus().status() ) contact=c; //this contact has a better status - else if ( c->onlinetqStatus().status() == contact->onlinetqStatus().status() ) + else if ( c->onlineStatus().status() == contact->onlineStatus().status() ) { if( c->account()->priority() > contact->account()->priority() ) contact=c; else if( c->account()->priority() == contact->account()->priority() - && c->onlinetqStatus().weight() > contact->onlinetqStatus().weight() ) + && c->onlineStatus().weight() > contact->onlineStatus().weight() ) contact = c; //the weight is not supposed to follow the same scale for each protocol } } @@ -513,7 +513,7 @@ TQString MetaContact::statusString() const OnlineStatus::StatusType MetaContact::status() const { - return d->onlinetqStatus; + return d->onlineStatus; } bool MetaContact::isOnline() const @@ -566,7 +566,7 @@ void MetaContact::sendFile( const KURL &sourceURL, const TQString &altFileName, Contact *contact = d->contacts.first(); for( TQPtrListIterator<Contact> it( d->contacts ) ; it.current(); ++it ) { - if( ( *it )->onlinetqStatus() > contact->onlinetqStatus() && ( *it )->canAcceptFiles() ) + if( ( *it )->onlineStatus() > contact->onlineStatus() && ( *it )->canAcceptFiles() ) contact = *it; } @@ -1360,7 +1360,7 @@ void MetaContact::setMetaContactId( const TQString& newMetaContactId ) // other programs may have written that data and depend on it d->metaContactId = newMetaContactId; KABCPersistence::self()->write( this ); - emit onlineStatusChanged( this, d->onlinetqStatus ); + emit onlineStatusChanged( this, d->onlineStatus ); emit persistentDataChanged(); } diff --git a/kopete/libkopete/kopetemetacontact.h b/kopete/libkopete/kopetemetacontact.h index 168fbaa2..60c8f6a2 100644 --- a/kopete/libkopete/kopetemetacontact.h +++ b/kopete/libkopete/kopetemetacontact.h @@ -559,7 +559,7 @@ private slots: /** * One of the child contact's online status changed */ - void slotContactStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus ); + void slotContactStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus ); /** * One of the child contact's property changed diff --git a/kopete/libkopete/kopetemimesourcefactory.cpp b/kopete/libkopete/kopetemimesourcefactory.cpp index 962bc8ff..f21d875a 100644 --- a/kopete/libkopete/kopetemimesourcefactory.cpp +++ b/kopete/libkopete/kopetemimesourcefactory.cpp @@ -61,7 +61,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const *it = KURL::decode_string( *it ); TQPixmap img; - if ( parts[0] == TQString::tqfromLatin1("kopete-contact-icon") ) + if ( parts[0] == TQString::fromLatin1("kopete-contact-icon") ) { if ( parts.size() >= 4 ) { @@ -71,7 +71,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const Contact *contact = account->contacts()[ parts[3] ]; if ( contact ) { - img = contact->onlinetqStatus().iconFor( contact ); + img = contact->onlineStatus().iconFor( contact ); completed = true; } else @@ -84,14 +84,14 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const kdDebug( 14010 ) << k_funcinfo << "kopete-contact-icon: insufficient information in abs_name: " << parts << endl; } - if ( parts[0] == TQString::tqfromLatin1("kopete-account-icon") ) + if ( parts[0] == TQString::fromLatin1("kopete-account-icon") ) { if ( parts.size() >= 3 ) { Account *account = AccountManager::self()->findAccount( parts[1], parts[2] ); if ( account ) { - img = account->myself()->onlinetqStatus().iconFor( account->myself() ); + img = account->myself()->onlineStatus().iconFor( account->myself() ); completed = true; } else @@ -101,7 +101,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const kdDebug( 14010 ) << k_funcinfo << "kopete-account-icon: insufficient information in abs_name: " << parts << endl; } - if ( parts[0] == TQString::tqfromLatin1("kopete-metacontact-icon") ) + if ( parts[0] == TQString::fromLatin1("kopete-metacontact-icon") ) { if ( parts.size() >= 2 ) { @@ -116,7 +116,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const kdDebug( 14010 ) << k_funcinfo << "kopete-metacontact-icon: insufficient information in abs_name: " << parts << endl; } - if ( parts[0] == TQString::tqfromLatin1("kopete-metacontact-photo") ) + if ( parts[0] == TQString::fromLatin1("kopete-metacontact-photo") ) { if ( parts.size() >= 2 ) { @@ -133,7 +133,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const kdDebug( 14010 ) << k_funcinfo << "kopete-metacontact-photo: insufficient information in abs_name: " << parts << endl; } - if ( parts[0] == TQString::tqfromLatin1("kopete-onlinestatus-icon") ) + if ( parts[0] == TQString::fromLatin1("kopete-onlinestatus-icon") ) { if ( parts.size() >= 2 ) { @@ -152,7 +152,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const Account *account = AccountManager::self()->accounts().getFirst(); if ( account ) { - img = account->myself()->onlinetqStatus().iconFor( parts[1] ); + img = account->myself()->onlineStatus().iconFor( parts[1] ); completed = true; } else diff --git a/kopete/libkopete/kopetemimetypehandler.cpp b/kopete/libkopete/kopetemimetypehandler.cpp index 89282b62..d4b53925 100644 --- a/kopete/libkopete/kopetemimetypehandler.cpp +++ b/kopete/libkopete/kopetemimetypehandler.cpp @@ -200,9 +200,9 @@ void MimeTypeHandler::handleURL( const TQString &mimeType, const KURL &url ) con EmoticonMimeTypeHandler::EmoticonMimeTypeHandler() : MimeTypeHandler( false ) { - registerAsMimeHandler( TQString::tqfromLatin1("application/x-kopete-emoticons") ); - registerAsMimeHandler( TQString::tqfromLatin1("application/x-tgz") ); - registerAsMimeHandler( TQString::tqfromLatin1("application/x-tbz") ); + registerAsMimeHandler( TQString::fromLatin1("application/x-kopete-emoticons") ); + registerAsMimeHandler( TQString::fromLatin1("application/x-tgz") ); + registerAsMimeHandler( TQString::fromLatin1("application/x-tbz") ); } void EmoticonMimeTypeHandler::handleURL( const TQString &, const KURL &url ) const diff --git a/kopete/libkopete/kopetenotifydataobject.cpp b/kopete/libkopete/kopetenotifydataobject.cpp index 16ec1889..68f2a0b9 100644 --- a/kopete/libkopete/kopetenotifydataobject.cpp +++ b/kopete/libkopete/kopetenotifydataobject.cpp @@ -60,14 +60,14 @@ TQDomElement Kopete::NotifyDataObject::notifyDataToXML() if ( !d->events.isEmpty() ) { //<custom-notifications> - notifications = notify.createElement( TQString::tqfromLatin1( "custom-notifications" ) ); + notifications = notify.createElement( TQString::fromLatin1( "custom-notifications" ) ); TQDictIterator<Kopete::NotifyEvent> it( d->events ); for ( ; it.current(); ++it ) { //<event name="..." suppress-common="true|false"> - TQDomElement event = notify.createElement( TQString::tqfromLatin1( "event" ) ); - event.setAttribute( TQString::tqfromLatin1( "name" ), it.currentKey() ); - event.setAttribute( TQString::tqfromLatin1( "suppress-common" ), TQString::tqfromLatin1( it.current()->suppressCommon() ? "true" : "false" ) ); + TQDomElement event = notify.createElement( TQString::fromLatin1( "event" ) ); + event.setAttribute( TQString::fromLatin1( "name" ), it.currentKey() ); + event.setAttribute( TQString::fromLatin1( "suppress-common" ), TQString::fromLatin1( it.current()->suppressCommon() ? "true" : "false" ) ); TQValueList<TQDomElement> presentations = it.current()->toXML(); //<sound-notification enabled="true|false" src="..." single-shot=""> for ( TQValueList<TQDomElement>::Iterator it = presentations.begin(); it != presentations.end(); ++it ) @@ -80,57 +80,57 @@ TQDomElement Kopete::NotifyDataObject::notifyDataToXML() bool Kopete::NotifyDataObject::notifyDataFromXML( const TQDomElement& element ) { - if ( element.tagName() == TQString::tqfromLatin1( "custom-notifications" ) ) + if ( element.tagName() == TQString::fromLatin1( "custom-notifications" ) ) { TQDomNode field = element.firstChild(); while( !field.isNull() ) { //read an event TQDomElement fieldElement = field.toElement(); - if ( fieldElement.tagName() == TQString::tqfromLatin1( "event" ) ) + if ( fieldElement.tagName() == TQString::fromLatin1( "event" ) ) { // get its attributes - TQString name = fieldElement.attribute( TQString::tqfromLatin1( "name" ), TQString() ); - TQString suppress = fieldElement.attribute( TQString::tqfromLatin1( "suppress-common" ), TQString() ); - Kopete::NotifyEvent *evt = new Kopete::NotifyEvent( suppress == TQString::tqfromLatin1( "true" ) ); + TQString name = fieldElement.attribute( TQString::fromLatin1( "name" ), TQString() ); + TQString suppress = fieldElement.attribute( TQString::fromLatin1( "suppress-common" ), TQString() ); + Kopete::NotifyEvent *evt = new Kopete::NotifyEvent( suppress == TQString::fromLatin1( "true" ) ); // get its tqchildren TQDomNode child = fieldElement.firstChild(); while( !child.isNull() ) { TQDomElement childElement = child.toElement(); - if ( childElement.tagName() == TQString::tqfromLatin1( "sound-presentation" ) ) + if ( childElement.tagName() == TQString::fromLatin1( "sound-presentation" ) ) { // kdDebug(14010) << k_funcinfo << "read: sound" << endl; - TQString src = childElement.attribute( TQString::tqfromLatin1( "src" ) ); - TQString enabled = childElement.attribute( TQString::tqfromLatin1( "enabled" ) ); - TQString singleShot = childElement.attribute( TQString::tqfromLatin1( "single-shot" ) ); + TQString src = childElement.attribute( TQString::fromLatin1( "src" ) ); + TQString enabled = childElement.attribute( TQString::fromLatin1( "enabled" ) ); + TQString singleShot = childElement.attribute( TQString::fromLatin1( "single-shot" ) ); Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Sound, src, - ( singleShot == TQString::tqfromLatin1( "true" ) ), - ( enabled == TQString::tqfromLatin1( "true" ) ) ); + ( singleShot == TQString::fromLatin1( "true" ) ), + ( enabled == TQString::fromLatin1( "true" ) ) ); evt->setPresentation( Kopete::EventPresentation::Sound, pres ); // kdDebug(14010) << k_funcinfo << "after sound: " << evt->toString() << endl; } - if ( childElement.tagName() == TQString::tqfromLatin1( "message-presentation" ) ) + if ( childElement.tagName() == TQString::fromLatin1( "message-presentation" ) ) { // kdDebug(14010) << k_funcinfo << "read: msg" << endl; - TQString src = childElement.attribute( TQString::tqfromLatin1( "src" ) ); - TQString enabled = childElement.attribute( TQString::tqfromLatin1( "enabled" ) ); - TQString singleShot = childElement.attribute( TQString::tqfromLatin1( "single-shot" ) ); + TQString src = childElement.attribute( TQString::fromLatin1( "src" ) ); + TQString enabled = childElement.attribute( TQString::fromLatin1( "enabled" ) ); + TQString singleShot = childElement.attribute( TQString::fromLatin1( "single-shot" ) ); Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Message, src, - ( singleShot == TQString::tqfromLatin1( "true" ) ), - ( enabled == TQString::tqfromLatin1( "true" ) ) ); + ( singleShot == TQString::fromLatin1( "true" ) ), + ( enabled == TQString::fromLatin1( "true" ) ) ); evt->setPresentation( Kopete::EventPresentation::Message, pres ); // kdDebug(14010) << k_funcinfo << "after message: " << evt->toString() << endl; } - if ( childElement.tagName() == TQString::tqfromLatin1( "chat-presentation" ) ) + if ( childElement.tagName() == TQString::fromLatin1( "chat-presentation" ) ) { // kdDebug(14010) << k_funcinfo << "read: chat" << endl; - TQString enabled = childElement.attribute( TQString::tqfromLatin1( "enabled" ) ); - TQString singleShot = childElement.attribute( TQString::tqfromLatin1( "single-shot" ) ); + TQString enabled = childElement.attribute( TQString::fromLatin1( "enabled" ) ); + TQString singleShot = childElement.attribute( TQString::fromLatin1( "single-shot" ) ); Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Chat, TQString(), - ( singleShot == TQString::tqfromLatin1( "true" ) ), - ( enabled == TQString::tqfromLatin1( "true" ) ) ); + ( singleShot == TQString::fromLatin1( "true" ) ), + ( enabled == TQString::fromLatin1( "true" ) ) ); evt->setPresentation( Kopete::EventPresentation::Chat, pres ); // kdDebug(14010) << k_funcinfo << "after chat: " << evt->toString() << endl; } diff --git a/kopete/libkopete/kopetenotifyevent.cpp b/kopete/libkopete/kopetenotifyevent.cpp index b233774b..544c3e45 100644 --- a/kopete/libkopete/kopetenotifyevent.cpp +++ b/kopete/libkopete/kopetenotifyevent.cpp @@ -144,25 +144,25 @@ const TQValueList<TQDomElement> Kopete::NotifyEvent::toXML() const TQValueList<TQDomElement> eventNodes; if ( m_sound && !m_sound->content().isEmpty() ) { - TQDomElement soundElmt = eventData.createElement( TQString::tqfromLatin1( "sound-presentation" ) ); - soundElmt.setAttribute( TQString::tqfromLatin1( "enabled" ), TQString::tqfromLatin1( m_sound->enabled() ? "true" : "false" ) ); - soundElmt.setAttribute( TQString::tqfromLatin1( "single-shot" ), TQString::tqfromLatin1( m_sound->singleShot() ? "true" : "false" ) ); - soundElmt.setAttribute( TQString::tqfromLatin1( "src" ), m_sound->content() ); + TQDomElement soundElmt = eventData.createElement( TQString::fromLatin1( "sound-presentation" ) ); + soundElmt.setAttribute( TQString::fromLatin1( "enabled" ), TQString::fromLatin1( m_sound->enabled() ? "true" : "false" ) ); + soundElmt.setAttribute( TQString::fromLatin1( "single-shot" ), TQString::fromLatin1( m_sound->singleShot() ? "true" : "false" ) ); + soundElmt.setAttribute( TQString::fromLatin1( "src" ), m_sound->content() ); eventNodes.append( soundElmt ); } if ( m_message && !m_message->content().isEmpty() ) { - TQDomElement msgElmt = eventData.createElement( TQString::tqfromLatin1( "message-presentation" ) ); - msgElmt.setAttribute( TQString::tqfromLatin1( "enabled" ), TQString::tqfromLatin1( m_message->enabled() ? "true" : "false" ) ); - msgElmt.setAttribute( TQString::tqfromLatin1( "single-shot" ), TQString::tqfromLatin1( m_message->singleShot() ? "true" : "false" ) ); - msgElmt.setAttribute( TQString::tqfromLatin1( "src" ), m_message->content() ); + TQDomElement msgElmt = eventData.createElement( TQString::fromLatin1( "message-presentation" ) ); + msgElmt.setAttribute( TQString::fromLatin1( "enabled" ), TQString::fromLatin1( m_message->enabled() ? "true" : "false" ) ); + msgElmt.setAttribute( TQString::fromLatin1( "single-shot" ), TQString::fromLatin1( m_message->singleShot() ? "true" : "false" ) ); + msgElmt.setAttribute( TQString::fromLatin1( "src" ), m_message->content() ); eventNodes.append( msgElmt ); } if ( m_chat && m_chat->enabled() ) { - TQDomElement chatElmt = eventData.createElement( TQString::tqfromLatin1( "chat-presentation" ) ); - chatElmt.setAttribute( TQString::tqfromLatin1( "enabled" ), TQString::tqfromLatin1( "true" ) ); - chatElmt.setAttribute( TQString::tqfromLatin1( "single-shot" ), TQString::tqfromLatin1( m_chat->singleShot() ? "true" : "false" ) ); + TQDomElement chatElmt = eventData.createElement( TQString::fromLatin1( "chat-presentation" ) ); + chatElmt.setAttribute( TQString::fromLatin1( "enabled" ), TQString::fromLatin1( "true" ) ); + chatElmt.setAttribute( TQString::fromLatin1( "single-shot" ), TQString::fromLatin1( m_chat->singleShot() ? "true" : "false" ) ); eventNodes.append( chatElmt ); } return eventNodes; @@ -170,7 +170,7 @@ const TQValueList<TQDomElement> Kopete::NotifyEvent::toXML() const TQString Kopete::NotifyEvent::toString() { - TQString stringRep = TQString::tqfromLatin1("Event; Suppress common=%1").tqarg( TQString::tqfromLatin1( suppressCommon() ? "true" : "false" ) ); + TQString stringRep = TQString::fromLatin1("Event; Suppress common=%1").tqarg( TQString::fromLatin1( suppressCommon() ? "true" : "false" ) ); if ( m_sound) stringRep += m_sound->toString(); if ( m_message) diff --git a/kopete/libkopete/kopeteonlinestatus.cpp b/kopete/libkopete/kopeteonlinestatus.cpp index b888c246..da9bb5d5 100644 --- a/kopete/libkopete/kopeteonlinestatus.cpp +++ b/kopete/libkopete/kopeteonlinestatus.cpp @@ -1,5 +1,5 @@ /* - kopeteonlinestatus.cpp - Kopete Online tqStatus + kopeteonlinestatus.cpp - Kopete Online Status Copyright (c) 2003 by Martijn Klingens <klingens@kde.org> Copyright (c) 2003 by Duncan Mac-Vicar Prett <duncan@kde.org> @@ -49,7 +49,7 @@ public: TQString protocolIcon() const { - return protocol ? protocol->pluginIcon() : TQString::tqfromLatin1( "unknown" ); + return protocol ? protocol->pluginIcon() : TQString::fromLatin1( "unknown" ); } }; @@ -124,7 +124,7 @@ OnlineStatus::OnlineStatus( StatusType status ) case Unknown: default: d->description = i18n( "Unknown" ); - d->overlayIcons = TQString::tqfromLatin1("status_unknown"); + d->overlayIcons = TQString::fromLatin1("status_unknown"); break; } @@ -137,7 +137,7 @@ OnlineStatus::OnlineStatus() d->internalStatus = 0; d->weight = 0; d->protocol = 0L; - d->overlayIcons = TQString::tqfromLatin1( "status_unknown" ); + d->overlayIcons = TQString::fromLatin1( "status_unknown" ); } OnlineStatus::OnlineStatus( const OnlineStatus &other ) @@ -283,9 +283,9 @@ TQString OnlineStatus::statusTypeToString(OnlineStatus::StatusType statusType) for (int i=0; i< size; i++) if (statusNames[i].status == statusType) - return TQString::tqfromLatin1(statusNames[i].name); + return TQString::fromLatin1(statusNames[i].name); - return TQString::tqfromLatin1(statusNames[0].name); // Unknown + return TQString::fromLatin1(statusNames[0].name); // Unknown } OnlineStatus::StatusType OnlineStatus::statusStringToType(TQString& string) @@ -293,7 +293,7 @@ OnlineStatus::StatusType OnlineStatus::statusStringToType(TQString& string) int size = sizeof(statusNames) / sizeof(statusNames[0]); for (int i=0; i< size; i++) - if (TQString::tqfromLatin1(statusNames[i].name) == string) + if (TQString::fromLatin1(statusNames[i].name) == string) return statusNames[i].status; return OnlineStatus::Unknown; diff --git a/kopete/libkopete/kopeteonlinestatus.h b/kopete/libkopete/kopeteonlinestatus.h index 34f0bc9c..5349677d 100644 --- a/kopete/libkopete/kopeteonlinestatus.h +++ b/kopete/libkopete/kopeteonlinestatus.h @@ -1,5 +1,5 @@ /* - kopeteonlinestatus.h - Kopete Online tqStatus + kopeteonlinestatus.h - Kopete Online Status Copyright (c) 2003 by Martijn Klingens <klingens@kde.org> Copyright (c) 2003 by Duncan Mac-Vicar Prett <duncan@kde.org> @@ -128,7 +128,7 @@ public: * Any internal status value > 0x80000000 is reserved for internal * libkopete use. This enumeration lists the currently known values. */ - enum ReservedInternaltqStatus + enum ReservedInternalStatus { /** * The account this contact belongs to is offline. Used with @@ -202,7 +202,7 @@ public: * This status is usually a lot more fine-grained than the status as used * by libkopete and should be unique per protocol. * @param overlayIcon is a string returning the name of the status icon to be - * used by the KDE icon loader. (tqStatus whiwh doesn't have icon to overlay like + * used by the KDE icon loader. (Status whiwh doesn't have icon to overlay like * Online and Offline should use TQString() as icon string) * @param description is a description in e.g. tooltips. * @param caption is the text of the action in the menu diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp index 9415a428..a814ed36 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.cpp +++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp @@ -49,7 +49,7 @@ class OnlineStatusManager::Private typedef TQMap< OnlineStatus , RegisteredStatusStruct > ProtocolMap ; TQPixmap *nullPixmap; - TQMap<Protocol* , ProtocolMap > registeredtqStatus; + TQMap<Protocol* , ProtocolMap > registeredStatus; TQDict< TQPixmap > iconCache; }; @@ -89,10 +89,10 @@ void OnlineStatusManager::registerOnlineStatus( const OnlineStatus &status, cons s.caption=caption; s.categories=categories; s.options=options; - d->registeredtqStatus[status.protocol()].insert(status, s ); + d->registeredStatus[status.protocol()].insert(status, s ); } -OnlineStatus OnlineStatusManager::onlinetqStatus(Protocol * protocol, Categories category) const +OnlineStatus OnlineStatusManager::onlineStatus(Protocol * protocol, Categories category) const { /* Each category has a number which is a power of two, so it is possible to have several categories per online status * the logaritm in base two if this number, which represent the bit which is equal to 1 in the number is chosen to be in a tree @@ -106,7 +106,7 @@ OnlineStatus OnlineStatusManager::onlinetqStatus(Protocol * protocol, Categories * To get the parent of a key, one just divide per two the number */ - Private::ProtocolMap protocolMap=d->registeredtqStatus[protocol]; + Private::ProtocolMap protocolMap=d->registeredStatus[protocol]; int categ_nb=-1; //the logaritm of category uint category_=category; @@ -137,11 +137,11 @@ TQString OnlineStatusManager::fingerprint( const OnlineStatus &statusFor, const { // create a 'fingerprint' to use as a hash key // fingerprint consists of description/icon name/color/overlay name/size/idle state - return TQString::tqfromLatin1("%1/%2/%3/%4/%5/%6") + return TQString::fromLatin1("%1/%2/%3/%4/%5/%6") .tqarg( statusFor.description() ) .tqarg( icon ) .tqarg( color.name() ) - .tqarg( statusFor.overlayIcons().join( TQString::tqfromLatin1( "," ) ) ) + .tqarg( statusFor.overlayIcons().join( TQString::fromLatin1( "," ) ) ) .tqarg( size ) .tqarg( idle ? 'i' : 'a' ); } @@ -340,7 +340,7 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const TQImage basisImage = basis->convertToImage(); TQImage overlayImage = overlay.convertToImage(); TQPoint offset; - if ( (*it).endsWith( TQString::tqfromLatin1( "_overlay" ) ) ) + if ( (*it).endsWith( TQString::fromLatin1( "_overlay" ) ) ) { // it is possible to have more than one overlay icon // to avoid overlapping we place them in different corners @@ -370,7 +370,7 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const void OnlineStatusManager::createAccountStatusActions( Account *account , KActionMenu *parent) { - Private::ProtocolMap protocolMap=d->registeredtqStatus[account->protocol()]; + Private::ProtocolMap protocolMap=d->registeredStatus[account->protocol()]; Private::ProtocolMap::Iterator it; for ( it = --protocolMap.end(); it != protocolMap.end(); --it ) { diff --git a/kopete/libkopete/kopeteonlinestatusmanager.h b/kopete/libkopete/kopeteonlinestatusmanager.h index e286dafc..8edd8861 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.h +++ b/kopete/libkopete/kopeteonlinestatusmanager.h @@ -54,9 +54,9 @@ public: * * Idle is the status used for auto-away * - * tqStatus number are organised so that make a tree. + * Status number are organised so that make a tree. */ - //please be carrefull when modifying values of status. read comment in onlinetqStatus() + //please be carrefull when modifying values of status. read comment in onlineStatus() enum Categories { Idle=1<<8, ExtendedAway=1<<9 , Invisible=1<<10, @@ -122,7 +122,7 @@ public: * * If no status has been registered in this category, return the one in the category which is the most similair */ - OnlineStatus onlinetqStatus(Protocol *protocol, Categories category) const; + OnlineStatus onlineStatus(Protocol *protocol, Categories category) const; private: friend class OnlineStatus; diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp index ebdcde8b..af23b51c 100644 --- a/kopete/libkopete/kopetepassword.cpp +++ b/kopete/libkopete/kopetepassword.cpp @@ -293,8 +293,8 @@ public: i18n( "<qt>Kopete is unable to save your password securely in your wallet;<br>" "do you want to save the password in the <b>unsafe</b> configuration file instead?</qt>" ), i18n( "Unable to Store Secure Password" ), - KGuiItem( i18n( "Store &Unsafe" ), TQString::tqfromLatin1( "unlock" ) ), - TQString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) != KMessageBox::Continue ) + KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ) ), + TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) != KMessageBox::Continue ) { return false; } diff --git a/kopete/libkopete/kopetepasswordedaccount.cpp b/kopete/libkopete/kopetepasswordedaccount.cpp index 68dd7917..899275c5 100644 --- a/kopete/libkopete/kopetepasswordedaccount.cpp +++ b/kopete/libkopete/kopetepasswordedaccount.cpp @@ -28,17 +28,17 @@ struct Kopete::PasswordedAccount::Private Private( const TQString &group, uint maxLen, bool allowBlankPassword ) : password( group, maxLen, allowBlankPassword, "mPassword" ) {} Kopete::Password password; - Kopete::OnlineStatus initialtqStatus; + Kopete::OnlineStatus initialStatus; }; Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *parent, const TQString &acctId, uint maxLen, const char *name ) - : Kopete::Account( parent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ parent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, false ) ) + : Kopete::Account( parent, acctId, name ), d( new Private( TQString::fromLatin1("Account_")+ parent->pluginId() + TQString::fromLatin1("_") + acctId , maxLen, false ) ) { } Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *parent, const TQString &acctId, uint maxLen, bool allowBlankPassword, const char *name ) - : Kopete::Account( parent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ parent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, allowBlankPassword ) ) + : Kopete::Account( parent, acctId, name ), d( new Private( TQString::fromLatin1("Account_")+ parent->pluginId() + TQString::fromLatin1("_") + acctId , maxLen, allowBlankPassword ) ) { } @@ -58,12 +58,12 @@ void Kopete::PasswordedAccount::connect( ) connect( s ); } -void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialtqStatus ) +void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialStatus ) { // check that the networkstatus is up // warn user somewhere - d->initialtqStatus = initialtqStatus; + d->initialStatus = initialStatus; TQString cached = password().cachedValue(); if( !cached.isNull() || d->password.allowBlankPassword() ) { @@ -85,9 +85,9 @@ TQString Kopete::PasswordedAccount::passwordPrompt() return i18n( "Please enter your password for %1 account <b>%2</b>" ).tqarg( protocol()->displayName(), accountId() ); } -Kopete::OnlineStatus Kopete::PasswordedAccount::initialtqStatus() +Kopete::OnlineStatus Kopete::PasswordedAccount::initialStatus() { - return d->initialtqStatus; + return d->initialStatus; } bool Kopete::PasswordedAccount::removeAccount() diff --git a/kopete/libkopete/kopetepasswordedaccount.h b/kopete/libkopete/kopetepasswordedaccount.h index 4be22016..210adbd4 100644 --- a/kopete/libkopete/kopetepasswordedaccount.h +++ b/kopete/libkopete/kopetepasswordedaccount.h @@ -74,15 +74,15 @@ public: /** * @brief Go online for this service. * - * @param initialtqStatus is the status to connect with. If it is an invalid status for this + * @param initialStatus is the status to connect with. If it is an invalid status for this * account, the default online for the account should be used. */ - void connect( const OnlineStatus& initialtqStatus ); + void connect( const OnlineStatus& initialStatus ); /** * \brief Get the initial status */ - OnlineStatus initialtqStatus(); + OnlineStatus initialStatus(); /** * @brief Remove the account from the server. diff --git a/kopete/libkopete/kopeteplugin.cpp b/kopete/libkopete/kopeteplugin.cpp index 2a4542f6..9b6a7dc1 100644 --- a/kopete/libkopete/kopeteplugin.cpp +++ b/kopete/libkopete/kopeteplugin.cpp @@ -46,7 +46,7 @@ Plugin::~Plugin() TQString Plugin::pluginId() const { - return TQString::tqfromLatin1( className() ); + return TQString::fromLatin1( className() ); } diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index 8595cb94..dae70b34 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -91,8 +91,8 @@ PluginManager* PluginManager::self() PluginManager::PluginManager() : TQObject( tqApp ), d( new Private ) { - d->plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "Kopete/Plugin" ), - TQString::tqfromLatin1( "[X-Kopete-Version] == 1000900" ) ) ); + d->plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "Kopete/Plugin" ), + TQString::fromLatin1( "[X-Kopete-Version] == 1000900" ) ) ); // We want to add a reference to the application's event loop so we // can remain in control when all windows are removed. @@ -239,7 +239,7 @@ void PluginManager::slotShutdownTimeout() remaining.append( it.data()->pluginId() ); kdWarning( 14010 ) << k_funcinfo << "Some plugins didn't shutdown in time!" << endl - << "Remaining plugins: " << remaining.join( TQString::tqfromLatin1( ", " ) ) << endl + << "Remaining plugins: " << remaining.join( TQString::fromLatin1( ", " ) ) << endl << "Forcing Kopete shutdown now." << endl; slotShutdownDone(); @@ -259,17 +259,17 @@ void PluginManager::loadAllPlugins() // FIXME: We need session management here - Martijn KConfig *config = KGlobal::config(); - if ( config->hasGroup( TQString::tqfromLatin1( "Plugins" ) ) ) + if ( config->hasGroup( TQString::fromLatin1( "Plugins" ) ) ) { TQMap<TQString, bool> pluginsMap; - TQMap<TQString, TQString> entries = config->entryMap( TQString::tqfromLatin1( "Plugins" ) ); + TQMap<TQString, TQString> entries = config->entryMap( TQString::fromLatin1( "Plugins" ) ); TQMap<TQString, TQString>::Iterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { TQString key = it.key(); - if ( key.endsWith( TQString::tqfromLatin1( "Enabled" ) ) ) - pluginsMap.insert( key.left( key.length() - 7 ), (it.data() == TQString::tqfromLatin1( "true" )) ); + if ( key.endsWith( TQString::fromLatin1( "Enabled" ) ) ) + pluginsMap.insert( key.left( key.length() - 7 ), (it.data() == TQString::fromLatin1( "true" )) ); } TQValueList<KPluginInfo *> plugins = availablePlugins( TQString() ); @@ -278,7 +278,7 @@ void PluginManager::loadAllPlugins() for ( ; it2 != end; ++it2 ) { // Protocols are loaded automatically so they aren't always in Plugins group. (fixes bug 167113) - if ( (*it2)->category() == TQString::tqfromLatin1( "Protocols" ) ) + if ( (*it2)->category() == TQString::fromLatin1( "Protocols" ) ) continue; TQString pluginName = (*it2)->pluginName(); @@ -343,10 +343,10 @@ Plugin * PluginManager::loadPlugin( const TQString &_pluginId, PluginLoadMode mo // Try to find legacy code // FIXME: Find any cases causing this, remove them, and remove this too - Richard - if ( pluginId.endsWith( TQString::tqfromLatin1( ".desktop" ) ) ) + if ( pluginId.endsWith( TQString::fromLatin1( ".desktop" ) ) ) { kdWarning( 14010 ) << "Trying to use old-style API!" << endl << kdBacktrace() << endl; - pluginId = pluginId.remove( TQRegExp( TQString::tqfromLatin1( ".desktop$" ) ) ); + pluginId = pluginId.remove( TQRegExp( TQString::fromLatin1( ".desktop$" ) ) ); } if ( mode == LoadSync ) @@ -376,8 +376,8 @@ Plugin *PluginManager::loadPluginInternal( const TQString &pluginId ) return d->loadedPlugins[ info ]; int error = 0; - Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::tqfromLatin1( "Kopete/Plugin" ), - TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ), this, 0, TQStringList(), &error ); + Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "Kopete/Plugin" ), + TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ), this, 0, TQStringList(), &error ); if ( plugin ) { @@ -471,8 +471,8 @@ Plugin* PluginManager::plugin( const TQString &_pluginId ) const // FIXME: In the future we'll need to change this nevertheless to unify // the handling - Martijn TQString pluginId = _pluginId; - if ( pluginId.endsWith( TQString::tqfromLatin1( "Protocol" ) ) ) - pluginId = TQString::tqfromLatin1( "kopete_" ) + _pluginId.lower().remove( TQString::tqfromLatin1( "protocol" ) ); + if ( pluginId.endsWith( TQString::fromLatin1( "Protocol" ) ) ) + pluginId = TQString::fromLatin1( "kopete_" ) + _pluginId.lower().remove( TQString::fromLatin1( "protocol" ) ); // End hack KPluginInfo *info = infoForPluginId( pluginId ); @@ -506,13 +506,13 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /* config->setGroup( "Plugins" ); // FIXME: What is this for? This sort of thing is kconf_update's job - Richard - if ( !pluginId.startsWith( TQString::tqfromLatin1( "kopete_" ) ) ) - pluginId.prepend( TQString::tqfromLatin1( "kopete_" ) ); + if ( !pluginId.startsWith( TQString::fromLatin1( "kopete_" ) ) ) + pluginId.prepend( TQString::fromLatin1( "kopete_" ) ); if ( !infoForPluginId( pluginId ) ) return false; - config->writeEntry( pluginId + TQString::tqfromLatin1( "Enabled" ), enabled ); + config->writeEntry( pluginId + TQString::fromLatin1( "Enabled" ), enabled ); config->sync(); return true; diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp index 644ded69..58ca4b60 100644 --- a/kopete/libkopete/kopeteprefs.cpp +++ b/kopete/libkopete/kopeteprefs.cpp @@ -90,7 +90,7 @@ void KopetePrefs::load() mBgOverride = config->readBoolEntry("ChatView Override Background", false); mFgOverride = config->readBoolEntry("ChatView Override Foreground", false); mRtfOverride = config->readBoolEntry("ChatView Override RTF", false); - mInterfacePreference = config->readEntry("View Plugin", TQString::tqfromLatin1("kopete_chatwindow") ); + mInterfacePreference = config->readEntry("View Plugin", TQString::fromLatin1("kopete_chatwindow") ); tmpColor = KGlobalSettings::textColor(); mTextColor = config->readColorEntry("Text Color", &tmpColor ); tmpColor = KGlobalSettings::baseColor(); @@ -112,29 +112,29 @@ void KopetePrefs::load() if(mToolTipContents.empty()) { mToolTipContents - << TQString::tqfromLatin1("FormattedName") - << TQString::tqfromLatin1("userInfo") - << TQString::tqfromLatin1("server") - << TQString::tqfromLatin1("channels") - << TQString::tqfromLatin1("FormattedIdleTime") - << TQString::tqfromLatin1("channelMembers") - << TQString::tqfromLatin1("channelTopic") - << TQString::tqfromLatin1("emailAddress") - << TQString::tqfromLatin1("homePage") - << TQString::tqfromLatin1("onlineSince") - << TQString::tqfromLatin1("lastOnline") - << TQString::tqfromLatin1("awayMessage"); + << TQString::fromLatin1("FormattedName") + << TQString::fromLatin1("userInfo") + << TQString::fromLatin1("server") + << TQString::fromLatin1("channels") + << TQString::fromLatin1("FormattedIdleTime") + << TQString::fromLatin1("channelMembers") + << TQString::fromLatin1("channelTopic") + << TQString::fromLatin1("emailAddress") + << TQString::fromLatin1("homePage") + << TQString::fromLatin1("onlineSince") + << TQString::fromLatin1("lastOnline") + << TQString::fromLatin1("awayMessage"); } config->setGroup("ContactList"); setThemeURL(config->readEntry("ThemeURL")); - int n = tqmetaObject()->findProperty( "contactListDisplayMode" ); - TQString value = config->readEntry("DisplayMode",TQString::tqfromLatin1("Default")); - mContactListDisplayMode = (ContactDisplayMode)tqmetaObject()->property( n )->keyToValue( value.latin1() ); - n = tqmetaObject()->findProperty( "contactListIconMode" ); + int n = metaObject()->findProperty( "contactListDisplayMode" ); + TQString value = config->readEntry("DisplayMode",TQString::fromLatin1("Default")); + mContactListDisplayMode = (ContactDisplayMode)metaObject()->property( n )->keyToValue( value.latin1() ); + n = metaObject()->findProperty( "contactListIconMode" ); value = config->readEntry("IconMode", - TQString::tqfromLatin1("IconDefault")); - mContactListIconMode = (IconDisplayMode) tqmetaObject()->property( n )->keyToValue( value.latin1() ); + TQString::fromLatin1("IconDefault")); + mContactListIconMode = (IconDisplayMode) metaObject()->property( n )->keyToValue( value.latin1() ); mContactListIndentContacts = config->readBoolEntry("IndentContacts", false); mContactListUseCustomFonts = config->readBoolEntry("UseCustomFonts", false); TQFont font = KGlobalSettings::generalFont(); @@ -229,10 +229,10 @@ void KopetePrefs::save() config->setGroup("ContactList"); config->writeEntry("ThemeURL", mThemeURL); - int n = tqmetaObject()->findProperty( "contactListDisplayMode" ); - config->writeEntry("DisplayMode", tqmetaObject()->property( n )->valueToKey( mContactListDisplayMode )); - n = tqmetaObject()->findProperty( "contactListIconMode" ); - config->writeEntry("IconMode", tqmetaObject()->property( n )->valueToKey( mContactListIconMode )); + int n = metaObject()->findProperty( "contactListDisplayMode" ); + config->writeEntry("DisplayMode", metaObject()->property( n )->valueToKey( mContactListDisplayMode )); + n = metaObject()->findProperty( "contactListIconMode" ); + config->writeEntry("IconMode", metaObject()->property( n )->valueToKey( mContactListIconMode )); config->writeEntry("IndentContacts", mContactListIndentContacts); config->writeEntry("UseCustomFonts", mContactListUseCustomFonts); config->writeEntry("GroupFont", mContactListGroupFont); @@ -439,7 +439,7 @@ void KopetePrefs::_setStylePath(const TQString &stylePath) if( !TQFile::exists(stylePath) || stylePath.isEmpty() ) { TQString fallback; - fallback = TQString(TQString::tqfromLatin1("styles/%1/")).tqarg(TQString::tqfromLatin1(KOPETE_DEFAULT_CHATSTYLE)); + fallback = TQString(TQString::fromLatin1("styles/%1/")).tqarg(TQString::fromLatin1(KOPETE_DEFAULT_CHATSTYLE)); mStylePath = locate("appdata", fallback); } } diff --git a/kopete/libkopete/kopeteprefs.h b/kopete/libkopete/kopeteprefs.h index c2d6e291..8c1f393d 100644 --- a/kopete/libkopete/kopeteprefs.h +++ b/kopete/libkopete/kopeteprefs.h @@ -101,7 +101,7 @@ public: int chatWindowPolicy() const { return mChatWindowPolicy; } //Styles - TQString defaultTheme() const { return TQString::tqfromLatin1("Default"); } + TQString defaultTheme() const { return TQString::fromLatin1("Default"); } //for Adium (xhtml+css) TQString stylePath() const { return mStylePath; } TQString styleVariant() const { return mStyleVariant; } diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp index d6910ebd..89b4f919 100644 --- a/kopete/libkopete/kopeteprotocol.cpp +++ b/kopete/libkopete/kopeteprotocol.cpp @@ -47,7 +47,7 @@ public: ContactPropertyTmpl mStickLastSeen; ContactPropertyTmpl mStickFullName; - Kopete::OnlineStatus accountNotConnectedtqStatus; + Kopete::OnlineStatus accountNotConnectedStatus; }; Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) @@ -58,7 +58,7 @@ Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) d->mStickFullName = Global::Properties::self()->fullName(); d->unloading = false; d->capabilities = 0; - d->accountNotConnectedtqStatus = Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, this, Kopete::OnlineStatus::AccountOffline, TQString::tqfromLatin1( "account_offline_overlay" ), i18n( "Account Offline" ) ); + d->accountNotConnectedStatus = Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, this, Kopete::OnlineStatus::AccountOffline, TQString::fromLatin1( "account_offline_overlay" ), i18n( "Account Offline" ) ); } Protocol::~Protocol() @@ -87,9 +87,9 @@ void Protocol::setCapabilities( unsigned int capabilities ) } -Kopete::OnlineStatus Protocol::accountOfflinetqStatus() const +Kopete::OnlineStatus Protocol::accountOfflineStatus() const { - return d->accountNotConnectedtqStatus; + return d->accountNotConnectedStatus; } void Protocol::slotAccountOnlineStatusChanged( Contact *self ) @@ -174,11 +174,11 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) // Preset the contactId and displayName, if the plugin doesn't want to save // them, or use its own format, it can call clear() on the provided list - sd[ TQString::tqfromLatin1( "contactId" ) ] = c->contactId(); + sd[ TQString::fromLatin1( "contactId" ) ] = c->contactId(); //TODO(nick) remove - sd[ TQString::tqfromLatin1( "displayName" ) ] = c->property(Global::Properties::self()->nickName()).value().toString(); + sd[ TQString::fromLatin1( "displayName" ) ] = c->property(Global::Properties::self()->nickName()).value().toString(); if(c->account()) - sd[ TQString::tqfromLatin1( "accountId" ) ] = c->account()->accountId(); + sd[ TQString::fromLatin1( "accountId" ) ] = c->account()->accountId(); // If there's an index field preset it too TQString index = c->protocol()->addressBookIndexField(); @@ -226,13 +226,13 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) // we can devise a better API, but with the constantly changing // requirements every time I learn more about kabc I'd better no touch // the API yet - Martijn - if( it.key().startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) + if( it.key().startsWith( TQString::fromLatin1( "messaging/" ) ) ) { - metaContact->setAddressBookField( this, it.key(), TQString::tqfromLatin1( "All" ), it.data() ); + metaContact->setAddressBookField( this, it.key(), TQString::fromLatin1( "All" ), it.data() ); // kdDebug(14010) << k_funcinfo << "metaContact->setAddressBookField( " << this << ", " << it.key() << ", \"All\", " << it.data() << " );" << endl; } else - metaContact->setAddressBookField( this, TQString::tqfromLatin1( "kopete" ), it.key(), it.data() ); + metaContact->setAddressBookField( this, TQString::fromLatin1( "kopete" ), it.key(), it.data() ); } } @@ -250,7 +250,7 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt serializedDataIterators[ it.key() ] = serializedData[ it.key() ].begin(); } - uint count = serializedData[TQString::tqfromLatin1("contactId")].count(); + uint count = serializedData[TQString::fromLatin1("contactId")].count(); // Prepare the independent entries to pass to the plugin's implementation for( uint i = 0; i < count ; i++ ) @@ -263,11 +263,11 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt ++( serializedDataIt.data() ); } - const TQString& accountId=sd[ TQString::tqfromLatin1( "accountId" ) ]; + const TQString& accountId=sd[ TQString::fromLatin1( "accountId" ) ]; // myself was allowed in the contactlist in old version of kopete. // But if one keep it on the contactlist now, it may conflict witht he myself metacontact. // So ignore it - if(accountId == sd[ TQString::tqfromLatin1( "contactId" ) ] ) + if(accountId == sd[ TQString::fromLatin1( "contactId" ) ] ) { kdDebug( 14010 ) << k_funcinfo << "Myself contact was on the contactlist.xml for account " << accountId << ". Ignore it" << endl; continue; @@ -290,10 +290,10 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt // hack in the serialize code. // Once this code is actually capable of talking to kabc this hack // should be removed ASAP! - Martijn - if( ( *fieldIt ).startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) - ad[ *fieldIt ] = metaContact->addressBookField( this, *fieldIt, TQString::tqfromLatin1( "All" ) ); + if( ( *fieldIt ).startsWith( TQString::fromLatin1( "messaging/" ) ) ) + ad[ *fieldIt ] = metaContact->addressBookField( this, *fieldIt, TQString::fromLatin1( "All" ) ); else - ad[ *fieldIt ] = metaContact->addressBookField( this, TQString::tqfromLatin1( "kopete" ), *fieldIt ); + ad[ *fieldIt ] = metaContact->addressBookField( this, TQString::fromLatin1( "kopete" ), *fieldIt ); } // Check if we have an account id. If not we're deserializing a Kopete 0.6 contact @@ -305,7 +305,7 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt TQDict<Account> accounts = AccountManager::self()->accounts( this ); if ( accounts.count() > 0 ) { - sd[ TQString::tqfromLatin1( "accountId" ) ] = TQDictIterator<Account>( accounts ).currentKey(); + sd[ TQString::fromLatin1( "accountId" ) ] = TQDictIterator<Account>( accounts ).currentKey(); } else { diff --git a/kopete/libkopete/kopeteprotocol.h b/kopete/libkopete/kopeteprotocol.h index 6160650a..e2e3f16a 100644 --- a/kopete/libkopete/kopeteprotocol.h +++ b/kopete/libkopete/kopeteprotocol.h @@ -153,7 +153,7 @@ public: /** * @brief Returns the status used for contacts when accounts of this protocol are offline */ - Kopete::OnlineStatus accountOfflinetqStatus() const; + Kopete::OnlineStatus accountOfflineStatus() const; protected: diff --git a/kopete/libkopete/kopetetransfermanager.cpp b/kopete/libkopete/kopetetransfermanager.cpp index 9357118f..3f7a9358 100644 --- a/kopete/libkopete/kopetetransfermanager.cpp +++ b/kopete/libkopete/kopetetransfermanager.cpp @@ -84,11 +84,11 @@ Kopete::Transfer::~Transfer() KURL Kopete::Transfer::displayURL( const Kopete::Contact *contact, const TQString &file ) { KURL url; - url.setProtocol( TQString::tqfromLatin1("kopete") ); + url.setProtocol( TQString::fromLatin1("kopete") ); TQString host; if( !contact ) - host = TQString::tqfromLatin1("unknown origin"); + host = TQString::fromLatin1("unknown origin"); else if( contact->metaContact() ) host = contact->metaContact()->displayName(); else @@ -234,7 +234,7 @@ void Kopete::TransferManager::sendFile( const KURL &file, const TQString &fname, //If the file location is null, then get it from a file open dialog if( !url.isValid() ) - url = KFileDialog::getOpenURL( TQString(), TQString::tqfromLatin1("*"), 0l, i18n( "Kopete File Transfer" )); + url = KFileDialog::getOpenURL( TQString(), TQString::fromLatin1("*"), 0l, i18n( "Kopete File Transfer" )); else { filename = fname; diff --git a/kopete/libkopete/kopeteutils.cpp b/kopete/libkopete/kopeteutils.cpp index b06082ee..6fe46529 100644 --- a/kopete/libkopete/kopeteutils.cpp +++ b/kopete/libkopete/kopeteutils.cpp @@ -69,7 +69,7 @@ void notifyConnectionLost( const Account *account, const TQString &caption, cons if (!account) return; - notify( account->accountIcon(32), TQString::tqfromLatin1("connection_lost"), caption.isEmpty() ? notifyConnectionLost_DefaultCaption : caption, message.isEmpty() ? notifyConnectionLost_DefaultMessage : message, explanation.isEmpty() ? notifyConnectionLost_DefaultExplanation : explanation, debugInfo); + notify( account->accountIcon(32), TQString::fromLatin1("connection_lost"), caption.isEmpty() ? notifyConnectionLost_DefaultCaption : caption, message.isEmpty() ? notifyConnectionLost_DefaultMessage : message, explanation.isEmpty() ? notifyConnectionLost_DefaultExplanation : explanation, debugInfo); } bool isHostReachable(const TQString &host) @@ -98,7 +98,7 @@ void notifyCannotConnect( const Account *account, const TQString &explanation, c if (!account) return; - notify( account->accountIcon(), TQString::tqfromLatin1("cannot_connect"), notifyCannotConnect_DefaultCaption, notifyCannotConnect_DefaultMessage, notifyCannotConnect_DefaultExplanation, debugInfo); + notify( account->accountIcon(), TQString::fromLatin1("cannot_connect"), notifyCannotConnect_DefaultCaption, notifyCannotConnect_DefaultMessage, notifyCannotConnect_DefaultExplanation, debugInfo); } void notifyConnectionError( const Account *account, const TQString &caption, const TQString &message, const TQString &explanation, const TQString &debugInfo ) @@ -107,7 +107,7 @@ void notifyConnectionError( const Account *account, const TQString &caption, con return; // TODO: Display a specific default connection error message, I don't want to introducte too many new strings - notify( account->accountIcon(32), TQString::tqfromLatin1("connection_error"), caption, message, explanation, debugInfo); + notify( account->accountIcon(32), TQString::fromLatin1("connection_error"), caption, message, explanation, debugInfo); } void notifyServerError( const Account *account, const TQString &caption, const TQString &message, const TQString &explanation, const TQString &debugInfo ) @@ -116,7 +116,7 @@ void notifyServerError( const Account *account, const TQString &caption, const T return; // TODO: Display a specific default server error message, I don't want to introducte too many new strings - notify( account->accountIcon(32), TQString::tqfromLatin1("server_error"), caption, message, explanation, debugInfo); + notify( account->accountIcon(32), TQString::fromLatin1("server_error"), caption, message, explanation, debugInfo); } } // end ns ErrorNotifier diff --git a/kopete/libkopete/kopetewalletmanager.cpp b/kopete/libkopete/kopetewalletmanager.cpp index b7796abc..f17c73b8 100644 --- a/kopete/libkopete/kopetewalletmanager.cpp +++ b/kopete/libkopete/kopetewalletmanager.cpp @@ -87,7 +87,7 @@ void Kopete::WalletManager::openWalletInner() // do we already have a wallet? if ( d->wallet ) { - // if the wallet isn't open yet, we're pending a slotWalletChangedtqStatus + // if the wallet isn't open yet, we're pending a slotWalletChangedStatus // anyway, so we don't set up a single shot. if ( d->wallet->isOpen() ) { @@ -107,19 +107,19 @@ void Kopete::WalletManager::openWalletInner() d->wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), mainWindowID(), KWallet::Wallet::Asynchronous ); - connect( d->wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( slotWalletChangedtqStatus() ) ); + connect( d->wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( slotWalletChangedStatus() ) ); } -void Kopete::WalletManager::slotWalletChangedtqStatus() +void Kopete::WalletManager::slotWalletChangedStatus() { kdDebug(14010) << k_funcinfo << " isOpen: " << d->wallet->isOpen() << endl; if( d->wallet->isOpen() ) { - if ( !d->wallet->hasFolder( TQString::tqfromLatin1( "Kopete" ) ) ) - d->wallet->createFolder( TQString::tqfromLatin1( "Kopete" ) ); + if ( !d->wallet->hasFolder( TQString::fromLatin1( "Kopete" ) ) ) + d->wallet->createFolder( TQString::fromLatin1( "Kopete" ) ); - if ( d->wallet->setFolder( TQString::tqfromLatin1( "Kopete" ) ) ) + if ( d->wallet->setFolder( TQString::fromLatin1( "Kopete" ) ) ) { // success! TQObject::connect( d->wallet, TQT_SIGNAL( walletClosed() ), this, TQT_SLOT( closeWallet() ) ); diff --git a/kopete/libkopete/kopetewalletmanager.h b/kopete/libkopete/kopetewalletmanager.h index 05680b17..83fcefc8 100644 --- a/kopete/libkopete/kopetewalletmanager.h +++ b/kopete/libkopete/kopetewalletmanager.h @@ -80,7 +80,7 @@ private slots: * * Causes walletOpened to be emitted. */ - void slotWalletChangedtqStatus(); + void slotWalletChangedStatus(); /** * Called by a singleShot timer in the event that we are asked for a diff --git a/kopete/libkopete/managedconnectionaccount.cpp b/kopete/libkopete/managedconnectionaccount.cpp index c7ca976e..7d2d02f6 100644 --- a/kopete/libkopete/managedconnectionaccount.cpp +++ b/kopete/libkopete/managedconnectionaccount.cpp @@ -27,45 +27,45 @@ namespace Kopete ManagedConnectionAccount::ManagedConnectionAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength, const char *name ) : PasswordedAccount( parent, acctId, maxPasswordLength, name ), m_waitingForConnection( false ) { - TQObject::connect( ConnectionManager::self(), TQT_SIGNAL(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus ) ), - TQT_SLOT(slotConnectionStatusChanged(const TQString&, NetworktqStatus::EnumtqStatus ) ) ); + TQObject::connect( ConnectionManager::self(), TQT_SIGNAL(statusChanged(const TQString&, NetworkStatus::EnumStatus ) ), + TQT_SLOT(slotConnectionStatusChanged(const TQString&, NetworkStatus::EnumStatus ) ) ); } void ManagedConnectionAccount::connectWithPassword( const TQString &password ) { m_password = password; - NetworktqStatus::EnumtqStatus status = ConnectionManager::self()->status( TQString() ); - if ( status == NetworktqStatus::NoNetworks ) + NetworkStatus::EnumStatus status = ConnectionManager::self()->status( TQString() ); + if ( status == NetworkStatus::NoNetworks ) performConnectWithPassword( password ); else { m_waitingForConnection = true; // need to adapt libkopete so we know the hostname in this class and whether the connection was user initiated // for now, these are the default parameters to always bring up a connection to "the internet". - NetworktqStatus::EnumRequestResult response = ConnectionManager::self()->requestConnection( Kopete::UI::Global::mainWidget(), TQString(), true ); - if ( response == NetworktqStatus::Connected ) + NetworkStatus::EnumRequestResult response = ConnectionManager::self()->requestConnection( Kopete::UI::Global::mainWidget(), TQString(), true ); + if ( response == NetworkStatus::Connected ) { m_waitingForConnection = false; performConnectWithPassword( password ); } - else if ( response == NetworktqStatus::UserRefused || response == NetworktqStatus::Unavailable ) + else if ( response == NetworkStatus::UserRefused || response == NetworkStatus::Unavailable ) disconnect(); } } -void ManagedConnectionAccount::slotConnectionStatusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status ) +void ManagedConnectionAccount::slotConnectionStatusChanged( const TQString & host, NetworkStatus::EnumStatus status ) { Q_UNUSED(host); // as above, we didn't register a hostname, so treat any connection as our own. - if ( m_waitingForConnection && ( status == NetworktqStatus::Online || status == NetworktqStatus::NoNetworks ) ) + if ( m_waitingForConnection && ( status == NetworkStatus::Online || status == NetworkStatus::NoNetworks ) ) { m_waitingForConnection = false; performConnectWithPassword( m_password ); } - else if ( isConnected() && ( status == NetworktqStatus::Offline - || status == NetworktqStatus::ShuttingDown - || status == NetworktqStatus::OfflineDisconnected - || status == NetworktqStatus::OfflineFailed ) ) + else if ( isConnected() && ( status == NetworkStatus::Offline + || status == NetworkStatus::ShuttingDown + || status == NetworkStatus::OfflineDisconnected + || status == NetworkStatus::OfflineFailed ) ) disconnect(); } diff --git a/kopete/libkopete/managedconnectionaccount.h b/kopete/libkopete/managedconnectionaccount.h index a27bd7cd..755fbf71 100644 --- a/kopete/libkopete/managedconnectionaccount.h +++ b/kopete/libkopete/managedconnectionaccount.h @@ -27,7 +27,7 @@ namespace Kopete class Protocol; /** - * A ManagedConnectionAccount queries the NetworktqStatus KDED Module before trying to connect using + * A ManagedConnectionAccount queries the NetworkStatus KDED Module before trying to connect using * connectwithPassword, starting a network connection if needed. If the network is not available, * it delays calling performConnectWithPassword until it receives notification from the daemon * that the network is up. The account receiveds notifications from the daemon of network failures @@ -69,7 +69,7 @@ class KOPETE_EXPORT ManagedConnectionAccount : public PasswordedAccount * @param host For future expansion. * @param status the new status of the network */ - virtual void slotConnectionStatusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status ); + virtual void slotConnectionStatusChanged( const TQString & host, NetworkStatus::EnumStatus status ); private: TQString m_password; bool m_waitingForConnection; diff --git a/kopete/libkopete/networkstatuscommon.cpp b/kopete/libkopete/networkstatuscommon.cpp index ef6d488e..87c18a14 100644 --- a/kopete/libkopete/networkstatuscommon.cpp +++ b/kopete/libkopete/networkstatuscommon.cpp @@ -1,7 +1,7 @@ #include "networkstatuscommon.h" #include <kdebug.h> -TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties p ) +TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p ) { kdDebug() << k_funcinfo << "status is: " << (int)p.status << endl; s << (int)p.status; @@ -12,14 +12,14 @@ TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties return s; } -TQDataStream & operator>> ( TQDataStream & s, NetworktqStatus::Properties &p ) +TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p ) { int status, onDemandPolicy, internet; s >> status; kdDebug() << k_funcinfo << "status is: " << status << endl; - p.status = ( NetworktqStatus::EnumtqStatus )status; + p.status = ( NetworkStatus::EnumStatus )status; s >> onDemandPolicy; - p.onDemandPolicy = ( NetworktqStatus::EnumOnDemandPolicy )onDemandPolicy; + p.onDemandPolicy = ( NetworkStatus::EnumOnDemandPolicy )onDemandPolicy; s >> p.service; s >> internet; if ( internet ) diff --git a/kopete/libkopete/networkstatuscommon.h b/kopete/libkopete/networkstatuscommon.h index 1d36b5c0..a243be43 100644 --- a/kopete/libkopete/networkstatuscommon.h +++ b/kopete/libkopete/networkstatuscommon.h @@ -3,16 +3,16 @@ #include <tqstringlist.h> -namespace NetworktqStatus +namespace NetworkStatus { - enum EnumtqStatus { NoNetworks = 1, Unreachable, OfflineDisconnected, OfflineFailed, ShuttingDown, Offline, Establishing, Online }; + enum EnumStatus { NoNetworks = 1, Unreachable, OfflineDisconnected, OfflineFailed, ShuttingDown, Offline, Establishing, Online }; enum EnumRequestResult { RequestAccepted = 1, Connected, UserRefused, Unavailable }; enum EnumOnDemandPolicy { All, User, None, Permanent }; struct Properties { TQString name; // status of the network - EnumtqStatus status; + EnumStatus status; // policy for on-demand usage as defined by the service EnumOnDemandPolicy onDemandPolicy; // identifier for the service @@ -23,11 +23,11 @@ namespace NetworktqStatus TQStringList netmasks; // for future expansion consider // EnumChargingModel - FlatRate, TimeCharge, VolumeCharged - // EnumLinktqStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT + // EnumLinkStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT }; } -TQDataStream & operator>> ( TQDataStream & s, NetworktqStatus::Properties &p ); -TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties p ); +TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p ); +TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p ); #endif diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp index f9ae7365..08575fdc 100644 --- a/kopete/libkopete/private/kopetecommand.cpp +++ b/kopete/libkopete/private/kopetecommand.cpp @@ -29,7 +29,7 @@ Kopete::Command::Command( TQObject *parent, const TQString &command, const char* const TQString &help, Kopete::CommandHandler::CommandType type, const TQString &formatString, uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix ) : KAction( command[0].upper() + command.right( command.length() - 1).lower(), pix, cut, parent, - ( command.lower() + TQString::tqfromLatin1("_command") ).latin1() ) + ( command.lower() + TQString::fromLatin1("_command") ).latin1() ) { init( command, handlerSlot, help, type, formatString, minArgs, maxArgs ); } @@ -102,8 +102,8 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession // Translate %s to the whole string and %n to current nickname - formatString.replace( TQString::tqfromLatin1("%n"), manager->myself()->nickName() ); - formatString.replace( TQString::tqfromLatin1("%s"), args ); + formatString.replace( TQString::fromLatin1("%n"), manager->myself()->nickName() ); + formatString.replace( TQString::fromLatin1("%s"), args ); // Translate %1..%N to word1..wordN @@ -115,7 +115,7 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession kdDebug(14010) << "New Command after processing alias: " << formatString << endl; - Kopete::CommandHandler::commandHandler()->processMessage( TQString::tqfromLatin1("/") + formatString, manager ); + Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/") + formatString, manager ); } else { diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index 26375517..b289ac07 100644 --- a/kopete/libkopete/private/kopeteemoticons.cpp +++ b/kopete/libkopete/private/kopeteemoticons.cpp @@ -300,14 +300,14 @@ void Emoticons::addIfPossible( const TQString& filenameNoExt, const TQStringList TQString pic; //maybe an extension was given, so try to find the exact file - pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt ); + pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt ); if( pic.isNull() ) - pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt + TQString::tqfromLatin1( ".mng" ) ); + pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt + TQString::fromLatin1( ".mng" ) ); if ( pic.isNull() ) - pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt + TQString::tqfromLatin1( ".png" ) ); + pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt + TQString::fromLatin1( ".png" ) ); if ( pic.isNull() ) - pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt + TQString::tqfromLatin1( ".gif" ) ); + pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt + TQString::fromLatin1( ".gif" ) ); if( !pic.isNull() ) // only add if we found one file { @@ -328,15 +328,15 @@ void Emoticons::addIfPossible( const TQString& filenameNoExt, const TQStringList // Unless we do so, ChatMessagePart::slotScrollView does not work properly and causing // HTMLPart not to be scrolled to the very last message. p.load( e.picPath ); - result = TQString::tqfromLatin1( "<img align=\"center\" src=\"" ) + + result = TQString::fromLatin1( "<img align=\"center\" src=\"" ) + e.picPath + - TQString::tqfromLatin1( "\" title=\"" ) + + TQString::fromLatin1( "\" title=\"" ) + matchEscaped + - TQString::tqfromLatin1( "\" width=\"" ) + + TQString::fromLatin1( "\" width=\"" ) + TQString::number( p.width() ) + - TQString::tqfromLatin1( "\" height=\"" ) + + TQString::fromLatin1( "\" height=\"" ) + TQString::number( p.height() ) + - TQString::tqfromLatin1( "\" />" ); + TQString::fromLatin1( "\" />" ); e.picHTMLCode = result; e.matchTextEscaped = matchEscaped; @@ -365,10 +365,10 @@ void Emoticons::initEmoticons( const TQString &theme ) d->emoticonAndPicList.clear(); d->emoticonMap.clear(); - TQString filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/emoticons.xml" ) ); + TQString filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/emoticons.xml" ) ); if(!filename.isEmpty()) return initEmoticon_emoticonsxml( filename ); - filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/icondef.xml" ) ); + filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/icondef.xml" ) ); if(!filename.isEmpty()) return initEmoticon_JEP0038( filename ); kdWarning(14010) << k_funcinfo << "emotiucon XML theme description not found" <<endl; @@ -376,7 +376,7 @@ void Emoticons::initEmoticons( const TQString &theme ) void Emoticons::initEmoticon_emoticonsxml( const TQString & filename) { - TQDomDocument emoticonMap( TQString::tqfromLatin1( "messaging-emoticon-map" ) ); + TQDomDocument emoticonMap( TQString::fromLatin1( "messaging-emoticon-map" ) ); TQFile mapFile( filename ); mapFile.open( IO_ReadOnly ); @@ -389,10 +389,10 @@ void Emoticons::initEmoticon_emoticonsxml( const TQString & filename) TQDomElement element = node.toElement(); if( !element.isNull() ) { - if( element.tagName() == TQString::tqfromLatin1( "emoticon" ) ) + if( element.tagName() == TQString::fromLatin1( "emoticon" ) ) { TQString emoticon_file = element.attribute( - TQString::tqfromLatin1( "file" ), TQString() ); + TQString::fromLatin1( "file" ), TQString() ); TQStringList items; TQDomNode emoticonNode = node.firstChild(); @@ -401,7 +401,7 @@ void Emoticons::initEmoticon_emoticonsxml( const TQString & filename) TQDomElement emoticonElement = emoticonNode.toElement(); if( !emoticonElement.isNull() ) { - if( emoticonElement.tagName() == TQString::tqfromLatin1( "string" ) ) + if( emoticonElement.tagName() == TQString::fromLatin1( "string" ) ) { items << emoticonElement.text(); } @@ -432,7 +432,7 @@ void Emoticons::initEmoticon_emoticonsxml( const TQString & filename) void Emoticons::initEmoticon_JEP0038( const TQString & filename) { - TQDomDocument emoticonMap( TQString::tqfromLatin1( "icondef" ) ); + TQDomDocument emoticonMap( TQString::fromLatin1( "icondef" ) ); TQFile mapFile( filename ); mapFile.open( IO_ReadOnly ); @@ -445,7 +445,7 @@ void Emoticons::initEmoticon_JEP0038( const TQString & filename) TQDomElement element = node.toElement(); if( !element.isNull() ) { - if( element.tagName() == TQString::tqfromLatin1( "icon" ) ) + if( element.tagName() == TQString::fromLatin1( "icon" ) ) { TQStringList items; TQString emoticon_file; @@ -456,16 +456,16 @@ void Emoticons::initEmoticon_JEP0038( const TQString & filename) TQDomElement emoticonElement = emoticonNode.toElement(); if( !emoticonElement.isNull() ) { - if( emoticonElement.tagName() == TQString::tqfromLatin1( "text" ) ) + if( emoticonElement.tagName() == TQString::fromLatin1( "text" ) ) { //TODO xml:lang items << emoticonElement.text(); } - else if( emoticonElement.tagName() == TQString::tqfromLatin1( "object" ) && emoticon_file.isEmpty() ) + else if( emoticonElement.tagName() == TQString::fromLatin1( "object" ) && emoticon_file.isEmpty() ) { TQString mime= emoticonElement.attribute( - TQString::tqfromLatin1( "mime" ), TQString::tqfromLatin1("image/*") ); - if(mime.startsWith(TQString::tqfromLatin1("image/")) && !mime.endsWith(TQString::tqfromLatin1("/svg+xml"))) + TQString::fromLatin1( "mime" ), TQString::fromLatin1("image/*") ); + if(mime.startsWith(TQString::fromLatin1("image/")) && !mime.endsWith(TQString::fromLatin1("/svg+xml"))) { emoticon_file = emoticonElement.text(); } diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 1d6feced..672d0ac4 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -132,7 +132,7 @@ KopeteView *KopeteViewManager::view( Kopete::ChatSession* session, const TQStrin } if( !viewPlugin ) - viewPlugin = (Kopete::ViewPlugin*)pluginManager->loadPlugin( TQString::tqfromLatin1("kopete_chatwindow") ); + viewPlugin = (Kopete::ViewPlugin*)pluginManager->loadPlugin( TQString::fromLatin1("kopete_chatwindow") ); if( viewPlugin ) { @@ -175,7 +175,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi // append msg event to queue if chat window is active but not the chat view in it... appendMessageEvent = appendMessageEvent && !(w->isActiveWindow() && manager->view() == d->activeView); // ...and chat window is on another desktop - appendMessageEvent = appendMessageEvent && (!d->queueOnlyMessagesOnAnotherDesktop || !KWin::windowInfo( w->tqtopLevelWidget()->winId(), NET::WMDesktop ).isOnCurrentDesktop()); + appendMessageEvent = appendMessageEvent && (!d->queueOnlyMessagesOnAnotherDesktop || !KWin::windowInfo( w->topLevelWidget()->winId(), NET::WMDesktop ).isOnCurrentDesktop()); } else { @@ -219,7 +219,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi TQString msgText = msg.plainBody(); if( msgText.length() > 90 ) - msgText = msgText.left(88) + TQString::tqfromLatin1("..."); + msgText = msgText.left(88) + TQString::fromLatin1("..."); TQString event; TQString body =i18n( "<qt>Incoming message from %1<br>\"%2\"</qt>" ); @@ -227,14 +227,14 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi switch( msg.importance() ) { case Kopete::Message::Low: - event = TQString::tqfromLatin1( "kopete_contact_lowpriority" ); + event = TQString::fromLatin1( "kopete_contact_lowpriority" ); break; case Kopete::Message::Highlight: - event = TQString::tqfromLatin1( "kopete_contact_highlight" ); + event = TQString::fromLatin1( "kopete_contact_highlight" ); body = i18n( "<qt>A highlighted message arrived from %1<br>\"%2\"</qt>" ); break; default: - event = TQString::tqfromLatin1( "kopete_contact_incoming" ); + event = TQString::fromLatin1( "kopete_contact_incoming" ); } KNotification *notify=KNotification::event(msg.from()->metaContact() , event, body.tqarg( TQStyleSheet::escape(msgFrom), TQStyleSheet::escape(msgText) ), 0, /*msg.from()->metaContact(),*/ w , i18n("View") ); diff --git a/kopete/libkopete/tests/kopetecontactlist_test.cpp b/kopete/libkopete/tests/kopetecontactlist_test.cpp index 933a67bb..7b21d407 100644 --- a/kopete/libkopete/tests/kopetecontactlist_test.cpp +++ b/kopete/libkopete/tests/kopetecontactlist_test.cpp @@ -36,7 +36,7 @@ void KopeteContactList_Test::testSomething() // change user data dir to avoid messing with user's .kde dir setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); - TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "contactlist.xml" ) ); + TQString filename = locateLocal( "appdata", TQString::fromLatin1( "contactlist.xml" ) ); if( ! filename.isEmpty() ) { // previous test run, delete the previous contact list diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp index e8ada405..2614f217 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.cpp +++ b/kopete/libkopete/tests/kopeteemoticontest.cpp @@ -62,7 +62,7 @@ void KopeteEmoticonTest::allTests() void KopeteEmoticonTest::testEmoticonParser() { Kopete::Emoticons emo("Default"); - TQString basePath = TQString::tqfromLatin1( SRCDIR ) + TQString::tqfromLatin1("/emoticon-parser-testcases"); + TQString basePath = TQString::fromLatin1( SRCDIR ) + TQString::fromLatin1("/emoticon-parser-testcases"); TQDir testCasesDir(basePath); TQStringList inputFileNames = testCasesDir.entryList("*.input"); @@ -73,8 +73,8 @@ void KopeteEmoticonTest::testEmoticonParser() TQString outputFileName = fileName; outputFileName.replace("input","output"); // open the input file - TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName); - TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName); + TQFile inputFile(basePath + TQString::fromLatin1("/") + fileName); + TQFile expectedFile(basePath + TQString::fromLatin1("/") + outputFileName); // check if the expected output file exists // if it doesn't, skip the testcase if ( ! expectedFile.exists() ) @@ -102,11 +102,11 @@ void KopeteEmoticonTest::testEmoticonParser() // HACK to know the test case we applied, concatenate testcase name to both // input and expected string. WIll remove when I can add some sort of metadata // to a CHECK so debug its origin testcase - result = fileName + TQString::tqfromLatin1(": ") + result; - expectedData = fileName + TQString::tqfromLatin1(": ") + expectedData; + result = fileName + TQString::fromLatin1(": ") + result; + expectedData = fileName + TQString::fromLatin1(": ") + expectedData; // if the test case begins with broken, we expect it to fail, then use XFAIL // otherwise use CHECK - if ( fileName.section("-", 0, 0) == TQString::tqfromLatin1("broken") ) + if ( fileName.section("-", 0, 0) == TQString::fromLatin1("broken") ) { kdDebug() << "checking known-broken testcase: " << fileName << endl; XFAIL(result, expectedData); diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp index 5603b911..bfd9e39e 100644 --- a/kopete/libkopete/tests/kopetemessage_test.cpp +++ b/kopete/libkopete/tests/kopetemessage_test.cpp @@ -57,8 +57,8 @@ KopeteMessage_Test::KopeteMessage_Test() m_account = new Kopete::Test::Mock::Account(m_protocol, "testaccount"); m_metaContactMyself = new Kopete::Test::Mock::MetaContact(); m_metaContactOther = new Kopete::Test::Mock::MetaContact(); - m_contactFrom = new Kopete::Test::Mock::Contact(m_account, TQString::tqfromLatin1("test-myself"), m_metaContactMyself, TQString()); - m_contactTo = new Kopete::Test::Mock::Contact(m_account, TQString::tqfromLatin1("test-dest"), m_metaContactOther, TQString()); + m_contactFrom = new Kopete::Test::Mock::Contact(m_account, TQString::fromLatin1("test-myself"), m_metaContactMyself, TQString()); + m_contactTo = new Kopete::Test::Mock::Contact(m_account, TQString::fromLatin1("test-dest"), m_metaContactOther, TQString()); m_message = new Kopete::Message( m_contactFrom, m_contactTo, TQString(), Kopete::Message::Outbound, Kopete::Message::PlainText); } @@ -251,7 +251,7 @@ void KopeteMessage_Test::setup() void KopeteMessage_Test::testLinkParser() { - TQString basePath = TQString::tqfromLatin1( SRCDIR ) + TQString::tqfromLatin1("/link-parser-testcases"); + TQString basePath = TQString::fromLatin1( SRCDIR ) + TQString::fromLatin1("/link-parser-testcases"); TQDir testCasesDir(basePath); TQStringList inputFileNames = testCasesDir.entryList("*.input"); @@ -261,8 +261,8 @@ void KopeteMessage_Test::testLinkParser() TQString outputFileName = fileName; outputFileName.replace("input","output"); // open the input file - TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName); - TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName); + TQFile inputFile(basePath + TQString::fromLatin1("/") + fileName); + TQFile expectedFile(basePath + TQString::fromLatin1("/") + outputFileName); // check if the expected output file exists // if it doesn't, skip the testcase if ( ! expectedFile.exists() ) @@ -288,7 +288,7 @@ void KopeteMessage_Test::testLinkParser() // set message format for parsing according to textcase filename convention Kopete::Message::MessageFormat format; - if ( fileName.section("-", 1, 1) == TQString::tqfromLatin1("plaintext") ) + if ( fileName.section("-", 1, 1) == TQString::fromLatin1("plaintext") ) format = Kopete::Message::PlainText; else format = Kopete::Message::RichText; @@ -298,11 +298,11 @@ void KopeteMessage_Test::testLinkParser() // HACK to know the test case we applied, concatenate testcase name to both // input and expected string. WIll remove when I can add some sort of metadata // to a CHECK so debug its origin testcase - result = fileName + TQString::tqfromLatin1(": ") + result; - expectedData = fileName + TQString::tqfromLatin1(": ") + expectedData; + result = fileName + TQString::fromLatin1(": ") + result; + expectedData = fileName + TQString::fromLatin1(": ") + expectedData; // if the test case begins with broken, we expect it to fail, then use XFAIL // otherwise use CHECK - if ( fileName.section("-", 0, 0) == TQString::tqfromLatin1("broken") ) + if ( fileName.section("-", 0, 0) == TQString::fromLatin1("broken") ) { //kdDebug() << "checking known-broken testcase: " << fileName << endl; XFAIL(result, expectedData); diff --git a/kopete/libkopete/tests/kopetepropertiestest.cpp b/kopete/libkopete/tests/kopetepropertiestest.cpp index 736bd2f8..76b8ae79 100644 --- a/kopete/libkopete/tests/kopetepropertiestest.cpp +++ b/kopete/libkopete/tests/kopetepropertiestest.cpp @@ -51,8 +51,8 @@ void KopetePropertiesTest::allTests() { PropertyHost myPropertyHost; CHECK( myPropertyHost.property(fooProperty).isNull(), true); - myPropertyHost.setProperty( fooProperty, TQString::tqfromLatin1("Foo!") ); - CHECK( myPropertyHost.property(fooProperty), TQString::tqfromLatin1("Foo!") ); + myPropertyHost.setProperty( fooProperty, TQString::fromLatin1("Foo!") ); + CHECK( myPropertyHost.property(fooProperty), TQString::fromLatin1("Foo!") ); } diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp index b6eaf635..84a7d252 100644 --- a/kopete/libkopete/tests/kopetewallettest_program.cpp +++ b/kopete/libkopete/tests/kopetewallettest_program.cpp @@ -76,9 +76,9 @@ int main( int argc, char *argv[] ) { TQString arg = args->arg( i ); _out << "Processing " << arg << endl; - if( arg == TQString::tqfromLatin1( "open" ) ) openWalletAsync(); - if( arg == TQString::tqfromLatin1( "close" ) ) closeWallet(); - if( arg == TQString::tqfromLatin1( "delay" ) ) delay(); + if( arg == TQString::fromLatin1( "open" ) ) openWalletAsync(); + if( arg == TQString::fromLatin1( "close" ) ) closeWallet(); + if( arg == TQString::fromLatin1( "delay" ) ) delay(); _out << "Done." << endl; } diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp index d6268628..8beb6e81 100644 --- a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp +++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp @@ -41,7 +41,7 @@ bool Account::createContact( const TQString &contactId, Kopete::MetaContact *par return true; } -void Account::connect( const Kopete::OnlineStatus& initialtqStatus) +void Account::connect( const Kopete::OnlineStatus& initialStatus) { // do nothing } diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.h b/kopete/libkopete/tests/mock/kopeteaccount_mock.h index 43686ef2..be4f281e 100644 --- a/kopete/libkopete/tests/mock/kopeteaccount_mock.h +++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.h @@ -40,7 +40,7 @@ public: ~Account(); // pure virtual functions implementation virtual bool createContact( const TQString &contactId, MetaContact *parentContact ); - virtual void connect( const Kopete::OnlineStatus& initialtqStatus = OnlineStatus() ); + virtual void connect( const Kopete::OnlineStatus& initialStatus = OnlineStatus() ); virtual void disconnect(); virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString() ); }; diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp index 3a9b94ff..345e9ab4 100644 --- a/kopete/libkopete/ui/accountselector.cpp +++ b/kopete/libkopete/ui/accountselector.cpp @@ -95,7 +95,7 @@ void AccountSelector::initUI() (new TQVBoxLayout(this))->setAutoAdd(true); d->lv = new KListView(this); d->lv->setFullWidth(true); - d->lv->addColumn(TQString::tqfromLatin1("")); + d->lv->addColumn(TQString::fromLatin1("")); d->lv->header()->hide(); if(d->proto != 0) diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp index f12e7116..5de3a023 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget.cpp +++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp @@ -40,7 +40,7 @@ namespace UI { AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * parent, const char * name ) : AddressBookLinkWidgetBase( parent, name ), mMetaContact( 0 ) { - btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::tqfromLatin1( "locationbar_erase" ) : TQString::tqfromLatin1( "clear_left") ) ); + btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::fromLatin1( "locationbar_erase" ) : TQString::fromLatin1( "clear_left") ) ); connect( btnClear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearAddressee() ) ); connect( btnSelectAddressee, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddressee() ) ); } diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp index ec9604a8..8146225b 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.cpp +++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp @@ -74,7 +74,7 @@ AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const ch //We should add a clear KAction here. But we can't really do that with a designer file :\ this sucks - addresseeListView->setColumnText(2, SmallIconSet(TQString::tqfromLatin1("email")), i18n("Email")); + addresseeListView->setColumnText(2, SmallIconSet(TQString::fromLatin1("email")), i18n("Email")); kListViewSearchLine->setListView(addresseeListView); slotLoadAddressees(); diff --git a/kopete/libkopete/ui/addressbookselectorwidget_base.ui b/kopete/libkopete/ui/addressbookselectorwidget_base.ui index 276620be..4c3993e0 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget_base.ui +++ b/kopete/libkopete/ui/addressbookselectorwidget_base.ui @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>405</width> <height>20</height> diff --git a/kopete/libkopete/ui/addresseeitem.cpp b/kopete/libkopete/ui/addresseeitem.cpp index 55b58068..9fa9f023 100644 --- a/kopete/libkopete/ui/addresseeitem.cpp +++ b/kopete/libkopete/ui/addresseeitem.cpp @@ -49,7 +49,7 @@ TQString AddresseeItem::key( int column, bool ) const { if (column == Email) { TQString value = text(Email); - TQRegExp emailRe(TQString::tqfromLatin1("<\\S*>")); + TQRegExp emailRe(TQString::fromLatin1("<\\S*>")); int match = emailRe.search(value); if (match > -1) value = value.mid(match + 1, emailRe.matchedLength() - 2); diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp index e5fd81b4..018baf7a 100644 --- a/kopete/libkopete/ui/contactaddednotifydialog.cpp +++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp @@ -71,9 +71,9 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const TQString& contactId, d->account=account; d->contactId=contactId; d->widget->m_label->setText(i18n("<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> has added you to his/her contactlist. (Account %3)</qt>") - .tqarg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::tqfromLatin1(":") + .tqarg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::fromLatin1(":") + KURL::encode_string( account->accountId() ) , - contactNick.isEmpty() ? contactId : contactNick + TQString::tqfromLatin1(" < ") + contactId + TQString::tqfromLatin1(" >") , + contactNick.isEmpty() ? contactId : contactNick + TQString::fromLatin1(" < ") + contactId + TQString::fromLatin1(" >") , account->accountLabel() ) ); if( hide & InfoButton) d->widget->m_infoButton->hide() ; diff --git a/kopete/libkopete/ui/contactaddednotifywidget.ui b/kopete/libkopete/ui/contactaddednotifywidget.ui index 100e6eca..80390486 100644 --- a/kopete/libkopete/ui/contactaddednotifywidget.ui +++ b/kopete/libkopete/ui/contactaddednotifywidget.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>20</height> @@ -199,7 +199,7 @@ Leave it empty if you want to see the contact nickname as display name.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -225,7 +225,7 @@ Leave it empty if you want to see the contact nickname as display name.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>40</height> diff --git a/kopete/libkopete/ui/fileconfirmbase.ui b/kopete/libkopete/ui/fileconfirmbase.ui index cd91863d..490d2a7f 100644 --- a/kopete/libkopete/ui/fileconfirmbase.ui +++ b/kopete/libkopete/ui/fileconfirmbase.ui @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kopete/libkopete/ui/kopeteawaydialogbase.ui b/kopete/libkopete/ui/kopeteawaydialogbase.ui index be81b276..45b34aa2 100644 --- a/kopete/libkopete/ui/kopeteawaydialogbase.ui +++ b/kopete/libkopete/ui/kopeteawaydialogbase.ui @@ -44,7 +44,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kopete/libkopete/ui/kopetecontactaction.cpp b/kopete/libkopete/ui/kopetecontactaction.cpp index 6492d1c0..cc6754d2 100644 --- a/kopete/libkopete/ui/kopetecontactaction.cpp +++ b/kopete/libkopete/ui/kopetecontactaction.cpp @@ -23,7 +23,7 @@ KopeteContactAction::KopeteContactAction( Kopete::Contact *contact, const TQObject *receiver, const char *slot, KAction *parent ) -: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlinetqStatus().iconFor( contact ) ), KShortcut(), +: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlineStatus().iconFor( contact ) ), KShortcut(), parent, contact->contactId().latin1() ) { m_contact = contact; diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp index fc9310fa..33b54c4d 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp @@ -40,15 +40,15 @@ KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo m_emited=false; m_view=new FileConfirmBase(this, "FileConfirmView"); - m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::tqfromLatin1( " <" ) + - info.contact()->contactId() + TQString::tqfromLatin1( "> " ) ); + m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::fromLatin1( " <" ) + + info.contact()->contactId() + TQString::fromLatin1( "> " ) ); m_view->m_size->setText( KGlobal::locale()->formatNumber( long( info.size() ), 0 ) ); m_view->m_description->setText( description ); m_view->m_filename->setText( info.file() ); KGlobal::config()->setGroup("File Transfer"); const TQString defaultPath=KGlobal::config()->readEntry("defaultPath" , TQDir::homeDirPath() ); - m_view->m_saveto->setText(defaultPath + TQString::tqfromLatin1( "/" ) + info.file() ); + m_view->m_saveto->setText(defaultPath + TQString::fromLatin1( "/" ) + info.file() ); setMainWidget(m_view); @@ -61,7 +61,7 @@ KopeteFileConfirmDialog::~KopeteFileConfirmDialog() void KopeteFileConfirmDialog::slotBrowsePressed() { - TQString saveFileName = KFileDialog::getSaveFileName( m_view->m_saveto->text(), TQString::tqfromLatin1( "*" ), 0L , i18n( "File Transfer" ) ); + TQString saveFileName = KFileDialog::getSaveFileName( m_view->m_saveto->text(), TQString::fromLatin1( "*" ), 0L , i18n( "File Transfer" ) ); if ( !saveFileName.isNull()) { m_view->m_saveto->setText(saveFileName); diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp index cf1fae01..42c01981 100644 --- a/kopete/libkopete/ui/kopetelistview.cpp +++ b/kopete/libkopete/ui/kopetelistview.cpp @@ -73,14 +73,14 @@ void ToolTip::maybeTip( const TQPoint &pos ) if( Item *item = dynamic_cast<Item*>( m_listView->itemAt( pos ) ) ) { - TQRect tqitemRect = m_listView->tqitemRect( item ); + TQRect itemRect = m_listView->itemRect( item ); uint leftMargin = m_listView->treeStepSize() * ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) + m_listView->itemMargin(); - uint xAdjust = tqitemRect.left() + leftMargin; - uint yAdjust = tqitemRect.top(); + uint xAdjust = itemRect.left() + leftMargin; + uint yAdjust = itemRect.top(); TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust ); std::pair<TQString,TQRect> toolTip = item->toolTip( relativePos ); @@ -88,7 +88,7 @@ void ToolTip::maybeTip( const TQPoint &pos ) return; toolTip.second.moveBy( xAdjust, yAdjust ); -// kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: tqitemRect: " +// kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: itemRect: " // << toolTip.second << ", tooltip: " << toolTip.first << endl; tip( toolTip.second, toolTip.first ); } @@ -193,7 +193,7 @@ void ListView::keyPressEvent( TQKeyEvent *e ) else if ( (e->key() == TQt::Key_Enter || e->key() == TQt::Key_Return) && item && item->isVisible() ) { // must provide a point within the item; emitExecute checks for this - TQPoint p = viewport()->mapToGlobal(tqitemRect(item).center()); + TQPoint p = viewport()->mapToGlobal(itemRect(item).center()); emitExecute( currentItem(), p, 0 ); } else diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp index 6156b6aa..777d35ae 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.cpp +++ b/kopete/libkopete/ui/kopetelistviewitem.cpp @@ -1145,7 +1145,7 @@ ContactComponent::~ContactComponent() void ContactComponent::updatePixmap() { - setPixmap( contact()->onlinetqStatus().iconFor( contact(), d->iconSize ) ); + setPixmap( contact()->onlineStatus().iconFor( contact(), d->iconSize ) ); } Kopete::Contact *ContactComponent::contact() { @@ -1489,7 +1489,7 @@ void Item::setHeight( int ) int Item::width( const TQFontMetrics &, const TQListView *lv, int c ) const { - // TQt computes the tqitemRect from this. we want the whole item to be + // TQt computes the itemRect from this. we want the whole item to be // clickable, so we return the widest we could possibly be. return lv->header()->sectionSize( c ); } @@ -1528,7 +1528,7 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt const BackgroundMode bgmode = lv->viewport()->backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - if ( _cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) + if ( _cg.brush( crole ) != lv->colorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), _cg.brush( crole ) ); else { @@ -1540,8 +1540,8 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt if ( lv->isEnabled() ) how |= TQStyle::Style_Enabled; - lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, - p, lv, TQRect( 0, 0, width, height() ), lv->tqcolorGroup(), + lv->tqstyle().drawComplexControl( TQStyle::CC_ListView, + p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(), how, TQStyle::SC_ListView, TQStyle::SC_None, opt ); } @@ -1565,7 +1565,7 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt textheight++; if ( textheight < height() ) { int w = lv->treeStepSize() / 2; - lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, p, lv, + lv->tqstyle().drawComplexControl( TQStyle::CC_ListView, p, lv, TQRect( 0, textheight, w + 1, height() - textheight + 1 ), _cg, lv->isEnabled() ? TQStyle::Style_Enabled : TQStyle::Style_Default, TQStyle::SC_ListViewExpand, diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.cpp b/kopete/libkopete/ui/kopetelistviewsearchline.cpp index af626858..edb63ffc 100644 --- a/kopete/libkopete/ui/kopetelistviewsearchline.cpp +++ b/kopete/libkopete/ui/kopetelistviewsearchline.cpp @@ -67,7 +67,7 @@ void SearchLine::updateSearch( const TQString &s ) for( TQListViewItemIterator it(listView(), TQListViewItemIterator::Selected | TQListViewItemIterator::Visible); it.current() && !currentItem; ++it ) { - if( listView()->tqitemRect( it.current() ).isValid() ) + if( listView()->itemRect( it.current() ).isValid() ) currentItem = it.current(); } } diff --git a/kopete/libkopete/ui/kopetepassworddialog.ui b/kopete/libkopete/ui/kopetepassworddialog.ui index 6007a139..8a5663b6 100644 --- a/kopete/libkopete/ui/kopetepassworddialog.ui +++ b/kopete/libkopete/ui/kopetepassworddialog.ui @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui index 468efd56..6919064b 100644 --- a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui +++ b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui @@ -49,7 +49,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp index d9a6a632..7f4dc0f4 100644 --- a/kopete/libkopete/ui/kopetestdaction.cpp +++ b/kopete/libkopete/ui/kopetestdaction.cpp @@ -41,7 +41,7 @@ KopetePreferencesAction::KopetePreferencesAction( KActionCollection *parent, con : KAction( KStdGuiItem::configure(), 0, 0, 0, parent, name ) #else : KAction( KGuiItem( i18n( "&Configure Kopete..." ), - TQString::tqfromLatin1( "configure" ) ), 0, 0, 0, parent, name ) + TQString::fromLatin1( "configure" ) ), 0, 0, 0, parent, name ) #endif { connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotShowPreferences() ) ); @@ -70,57 +70,57 @@ KAction * KopeteStdAction::preferences( KActionCollection *parent, const char *n KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "Start &Chat..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Start &Chat..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); } KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "&Send Single Message..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "&Send Single Message..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); } KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "User &Info" ), TQString::tqfromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "User &Info" ), TQString::fromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name ); } KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "Send &File..." ), TQString::tqfromLatin1( "attach" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Send &File..." ), TQString::fromLatin1( "attach" ), 0, recvr, slot, parent, name ); } KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "View &History..." ), TQString::tqfromLatin1( "history" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "View &History..." ), TQString::fromLatin1( "history" ), 0, recvr, slot, parent, name ); } KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "&Create Group..." ), TQString::tqfromLatin1( "folder" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "&Create Group..." ), TQString::fromLatin1( "folder" ), 0, recvr, slot, parent, name ); } KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::tqfromLatin1( "move" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::fromLatin1( "move" ), 0, recvr, slot, parent, name ); } KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "&Delete Contact" ), TQString::tqfromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, parent, name ); + return new KAction( i18n( "&Delete Contact" ), TQString::fromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, parent, name ); } KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) { - return new KAction( i18n( "Change A&lias..." ), TQString::tqfromLatin1( "signature" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Change A&lias..." ), TQString::fromLatin1( "signature" ), 0, recvr, slot, parent, name ); } KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name ) { - return new KAction( i18n( "&Block Contact" ), TQString::tqfromLatin1( "player_pause" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "&Block Contact" ), TQString::fromLatin1( "player_pause" ), 0, recvr, slot, parent, name ); } KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name ) { - return new KAction( i18n( "Un&block Contact" ), TQString::tqfromLatin1( "player_play" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Un&block Contact" ), TQString::fromLatin1( "player_play" ), 0, recvr, slot, parent, name ); } #include "kopetestdaction.moc" diff --git a/kopete/libkopete/ui/kopetewidgets.cpp b/kopete/libkopete/ui/kopetewidgets.cpp index 4b03f729..a1d7d1e1 100644 --- a/kopete/libkopete/ui/kopetewidgets.cpp +++ b/kopete/libkopete/ui/kopetewidgets.cpp @@ -36,7 +36,7 @@ public: TQPixmap pix(m_widgets[key].iconSet); #else TQPixmap pix(locate( "data", - TQString::tqfromLatin1("kopetewidgets/pics/") + m_widgets[key].iconSet)); + TQString::fromLatin1("kopetewidgets/pics/") + m_widgets[key].iconSet)); #endif return TQIconSet(pix); } @@ -71,41 +71,41 @@ KopeteWidgets::KopeteWidgets() { WidgetInfo widget; - widget.group = TQString::tqfromLatin1("Input (Kopete)"); + widget.group = TQString::fromLatin1("Input (Kopete)"); #ifdef EMBED_IMAGES widget.iconSet = TQPixmap(kopete__ui__addressbooklinkwidget_xpm); #else - widget.iconSet = TQString::tqfromLatin1("kopete__ui__addressbooklinkwidget.png"); + widget.iconSet = TQString::fromLatin1("kopete__ui__addressbooklinkwidget.png"); #endif - widget.includeFile = TQString::tqfromLatin1("addressbooklinkwidget.h"); - widget.toolTip = TQString::tqfromLatin1("Address Book Link Widget (Kopete)"); - widget.whatsThis = TQString::tqfromLatin1("KABC::Addressee display/selector"); + widget.includeFile = TQString::fromLatin1("addressbooklinkwidget.h"); + widget.toolTip = TQString::fromLatin1("Address Book Link Widget (Kopete)"); + widget.whatsThis = TQString::fromLatin1("KABC::Addressee display/selector"); widget.isContainer = false; - m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget"), widget); + m_widgets.insert(TQString::fromLatin1("Kopete::UI::AddressBookLinkWidget"), widget); - widget.group = TQString::tqfromLatin1("Views (Kopete)"); + widget.group = TQString::fromLatin1("Views (Kopete)"); #ifdef EMBED_IMAGES widget.iconSet = TQPixmap(kopete__ui__listview__listview_xpm); #else - widget.iconSet = TQString::tqfromLatin1("kopete__ui__listview__listview.png"); + widget.iconSet = TQString::fromLatin1("kopete__ui__listview__listview.png"); #endif - widget.includeFile = TQString::tqfromLatin1("kopetelistview.h"); - widget.toolTip = TQString::tqfromLatin1("List View (Kopete)"); - widget.whatsThis = TQString::tqfromLatin1("A component capable list view widget."); + widget.includeFile = TQString::fromLatin1("kopetelistview.h"); + widget.toolTip = TQString::fromLatin1("List View (Kopete)"); + widget.whatsThis = TQString::fromLatin1("A component capable list view widget."); widget.isContainer = false; - m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::ListView::ListView"), widget); + m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::ListView"), widget); - widget.group = TQString::tqfromLatin1("Input (Kopete)"); + widget.group = TQString::fromLatin1("Input (Kopete)"); #ifdef EMBED_IMAGES widget.iconSet = TQPixmap(kopete__ui__listview__searchline_xpm); #else - widget.iconSet = TQString::tqfromLatin1("kopete__ui__listview__searchline.png"); + widget.iconSet = TQString::fromLatin1("kopete__ui__listview__searchline.png"); #endif - widget.includeFile = TQString::tqfromLatin1("kopetelistviewsearchline.h"); - widget.toolTip = TQString::tqfromLatin1("List View Search Line (Kopete)"); - widget.whatsThis = TQString::tqfromLatin1("Search line able to use Kopete custom list View."); + widget.includeFile = TQString::fromLatin1("kopetelistviewsearchline.h"); + widget.toolTip = TQString::fromLatin1("List View Search Line (Kopete)"); + widget.whatsThis = TQString::fromLatin1("Search line able to use Kopete custom list View."); widget.isContainer = false; - m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine"), widget); + m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::SearchLine"), widget); new KInstance("kopetewidgets"); } @@ -116,13 +116,13 @@ KopeteWidgets::~KopeteWidgets() TQWidget *KopeteWidgets::create(const TQString &key, TQWidget *parent, const char *name) { - if (key == TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget")) + if (key == TQString::fromLatin1("Kopete::UI::AddressBookLinkWidget")) return new Kopete::UI::AddressBookLinkWidget(parent, name); - if (key == TQString::tqfromLatin1("Kopete::UI::ListView::ListView")) + if (key == TQString::fromLatin1("Kopete::UI::ListView::ListView")) return new Kopete::UI::ListView::ListView(parent, name); - if (key == TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine")) + if (key == TQString::fromLatin1("Kopete::UI::ListView::SearchLine")) return new Kopete::UI::ListView::SearchLine(parent, 0, name); return 0; diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp index 40ac3de9..35149e66 100644 --- a/kopete/libkopete/ui/userinfodialog.cpp +++ b/kopete/libkopete/ui/userinfodialog.cpp @@ -93,7 +93,7 @@ void UserInfoDialog::setAwayMessage( const TQString& msg ) d->awayMessage = msg; } -void UserInfoDialog::settqStatus( const TQString& status ) +void UserInfoDialog::setStatus( const TQString& status ) { d->status = status; } @@ -138,7 +138,7 @@ TQHBox* UserInfoDialog::addLabelEdit( const TQString& label, const TQString& tex TQHBox *box = new TQHBox( d->page ); new TQLabel( label, box ); edit = new KLineEdit( box ); - edit->tqsetAlignment( TQt::AlignHCenter ); + edit->setAlignment( TQt::AlignHCenter ); edit->setText( text ); edit->setReadOnly( true ); return box; diff --git a/kopete/libkopete/ui/userinfodialog.h b/kopete/libkopete/ui/userinfodialog.h index 5926ab5a..ce2dcc90 100644 --- a/kopete/libkopete/ui/userinfodialog.h +++ b/kopete/libkopete/ui/userinfodialog.h @@ -50,7 +50,7 @@ namespace Kopete { void setName( const TQString& name ); void setId( const TQString& id ); void setAwayMessage( const TQString& msg ); - void settqStatus( const TQString& status ); + void setStatus( const TQString& status ); void setWarningLevel(const TQString& level ); void setOnlineSince( const TQString& since ); void setInfo( const TQString& info ); diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp index 65e808f4..113ec95e 100644 --- a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp @@ -144,7 +144,7 @@ KBookmarkGroup BookmarksPlugin::getKopeteFolder() { KBookmarkManager *mgr = KBookmarkManager::userBookmarksManager(); - return getFolder( mgr->root(), TQString::tqfromLatin1("kopete") ); + return getFolder( mgr->root(), TQString::fromLatin1("kopete") ); } KBookmarkGroup BookmarksPlugin::getFolder( KBookmarkGroup group, const TQString& folder ) @@ -165,7 +165,7 @@ KBookmarkGroup BookmarksPlugin::getFolder( KBookmarkGroup group, const TQString& TQTextCodec* BookmarksPlugin::getPageEncoding( const TQByteArray& data ) { - TQString temp = TQString::tqfromLatin1(data); + TQString temp = TQString::fromLatin1(data); TQRegExp rx("<meta[^>]*(charset|CHARSET)\\s*=\\s*[^>]*>"); int pos = rx.search( temp ); TQTextCodec *codec; diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp index 3826b869..694ce451 100644 --- a/kopete/plugins/alias/aliaspreferences.cpp +++ b/kopete/plugins/alias/aliaspreferences.cpp @@ -211,7 +211,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin ) protocol, *it, aliasCommand, - TQString::tqfromLatin1("Custom alias for %1").tqarg(aliasCommand), + TQString::fromLatin1("Custom alias for %1").tqarg(aliasCommand), Kopete::CommandHandler::UserAlias ); @@ -241,8 +241,8 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin ) void AliasPreferences::save() { KConfig *config = KGlobal::config(); - config->deleteGroup( TQString::tqfromLatin1("AliasPlugin") ); - config->setGroup( TQString::tqfromLatin1("AliasPlugin") ); + config->deleteGroup( TQString::fromLatin1("AliasPlugin") ); + config->setGroup( TQString::fromLatin1("AliasPlugin") ); TQStringList aliases; AliasItem *item = (AliasItem*)preferencesDialog->aliasList->firstChild(); @@ -271,11 +271,11 @@ void AliasPreferences::save() void AliasPreferences::addAlias( TQString &alias, TQString &command, const ProtocolList &p, uint id ) { - TQRegExp spaces( TQString::tqfromLatin1("\\s+") ); + TQRegExp spaces( TQString::fromLatin1("\\s+") ); - if( alias.startsWith( TQString::tqfromLatin1("/") ) ) + if( alias.startsWith( TQString::fromLatin1("/") ) ) alias = alias.section( '/', 1 ); - if( command.startsWith( TQString::tqfromLatin1("/") ) ) + if( command.startsWith( TQString::fromLatin1("/") ) ) command = command.section( '/', 1 ); if( id == 0 ) @@ -309,7 +309,7 @@ void AliasPreferences::addAlias( TQString &alias, TQString &command, const Proto *it, alias, command, - TQString::tqfromLatin1("Custom alias for %1").tqarg(command), + TQString::fromLatin1("Custom alias for %1").tqarg(command), Kopete::CommandHandler::UserAlias, 0, argc @@ -328,7 +328,7 @@ void AliasPreferences::slotAddAlias() if( addDialog.exec() == TQDialog::Accepted ) { TQString alias = addDialog.alias->text(); - if( alias.startsWith( TQString::tqfromLatin1("/") ) ) + if( alias.startsWith( TQString::fromLatin1("/") ) ) alias = alias.section( '/', 1 ); if( alias.contains( TQRegExp("[_=]") ) ) @@ -418,7 +418,7 @@ void AliasPreferences::slotEditAlias() if( editDialog.exec() == TQDialog::Accepted ) { TQString alias = editDialog.alias->text(); - if( alias.startsWith( TQString::tqfromLatin1("/") ) ) + if( alias.startsWith( TQString::fromLatin1("/") ) ) alias = alias.section( '/', 1 ); if( alias.contains( TQRegExp("[_=]") ) ) { diff --git a/kopete/plugins/autoreplace/autoreplaceprefs.ui b/kopete/plugins/autoreplace/autoreplaceprefs.ui index ca558f4b..e31ef3e4 100644 --- a/kopete/plugins/autoreplace/autoreplaceprefs.ui +++ b/kopete/plugins/autoreplace/autoreplaceprefs.ui @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp index e540277e..d6365c0a 100644 --- a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp +++ b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp @@ -36,7 +36,7 @@ ConnectionStatusPlugin::ConnectionStatusPlugin( TQObject *parent, const char *na m_process = 0L; m_timer = new TQTimer(); - connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotChecktqStatus() ) ); + connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotCheckStatus() ) ); m_timer->start( 60000 ); m_pluginConnected = false; @@ -49,7 +49,7 @@ ConnectionStatusPlugin::~ConnectionStatusPlugin() delete m_process; } -void ConnectionStatusPlugin::slotChecktqStatus() +void ConnectionStatusPlugin::slotCheckStatus() { kdDebug( 14301 ) << k_funcinfo << endl; @@ -87,7 +87,7 @@ void ConnectionStatusPlugin::slotProcessExited( KProcess *process ) if ( process == m_process ) { - setConnectedtqStatus( m_buffer.contains( "default" ) ); + setConnectedStatus( m_buffer.contains( "default" ) ); m_buffer = TQString(); delete m_process; m_process = 0L; @@ -98,11 +98,11 @@ void ConnectionStatusPlugin::slotProcessStdout( KProcess *, char *buffer, int bu { // Look for a default gateway //kdDebug( 14301 ) << k_funcinfo << endl; - m_buffer += TQString::tqfromLatin1( buffer, buflen ); + m_buffer += TQString::fromLatin1( buffer, buflen ); //kdDebug( 14301 ) << qsBuffer << endl; } -void ConnectionStatusPlugin::setConnectedtqStatus( bool connected ) +void ConnectionStatusPlugin::setConnectedStatus( bool connected ) { //kdDebug( 14301 ) << k_funcinfo << endl; diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.h b/kopete/plugins/connectionstatus/connectionstatusplugin.h index e0efdb9a..c030c71c 100644 --- a/kopete/plugins/connectionstatus/connectionstatusplugin.h +++ b/kopete/plugins/connectionstatus/connectionstatusplugin.h @@ -36,7 +36,7 @@ public: ~ConnectionStatusPlugin(); private slots: - void slotChecktqStatus(); + void slotCheckStatus(); void slotProcessStdout( KProcess *process, char *buffer, int len ); /** @@ -45,7 +45,7 @@ private slots: void slotProcessExited( KProcess *process ); private: - void setConnectedtqStatus( bool newtqStatus ); + void setConnectedStatus( bool newStatus ); bool m_pluginConnected; KProcess *m_process; diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp index 11f30f48..898e7f1a 100644 --- a/kopete/plugins/cryptography/cryptographyguiclient.cpp +++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp @@ -48,8 +48,8 @@ CryptographyGUIClient::CryptographyGUIClient(Kopete::ChatSession *parent ) setInstance( KGenericFactory<CryptographyPlugin>::instance() ); - m_action=new KToggleAction( i18n("Encrypt Messages" ), TQString::tqfromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" ); - m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::tqfromLatin1("off") ) ; + m_action=new KToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" ); + m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::fromLatin1("off") ) ; setXMLFile("cryptographychatui.rc"); } diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index 4605391f..4e2e9686 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -45,7 +45,7 @@ //In Jabber, the JEP says it's not. so we don't use richtext in our message, but some client did. //We limit the html to some basis tag to limit security problem (bad links) // - Olivier -const TQRegExp CryptographyPlugin::isHTML( TQString::tqfromLatin1( "^[^<>]*(</?(html|body|br|p|font|center|b|i|u|span|div|pre)(>|[\\s/][^><]*>)[^><]*)+$" ) , false ); +const TQRegExp CryptographyPlugin::isHTML( TQString::fromLatin1( "^[^<>]*(</?(html|body|br|p|font|center|b|i|u|span|div|pre)(>|[\\s/][^><]*>)[^><]*)+$" ) , false ); typedef KGenericFactory<CryptographyPlugin> CryptographyPluginFactory; static const KAboutData aboutdata("kopete_cryptography", I18N_NOOP("Cryptography") , "1.0" ); @@ -154,8 +154,8 @@ bool CryptographyPlugin::passphraseHandling() void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg ) { TQString body = msg.plainBody(); - if( !body.startsWith( TQString::tqfromLatin1("-----BEGIN PGP MESSAGE----") ) - || !body.contains( TQString::tqfromLatin1("-----END PGP MESSAGE----") ) ) + if( !body.startsWith( TQString::fromLatin1("-----BEGIN PGP MESSAGE----") ) + || !body.contains( TQString::fromLatin1("-----END PGP MESSAGE----") ) ) return; if( msg.direction() != Kopete::Message::Inbound ) @@ -179,16 +179,16 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg ) plainBody = TQStyleSheet::escape( plainBody ); //this is the same algoritm as in Kopete::Message::escapedBody(); - plainBody.replace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "<br/>" ) ) - .replace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( " " ) ) - .replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); + plainBody.replace( TQString::fromLatin1( "\n" ), TQString::fromLatin1( "<br/>" ) ) + .replace( TQString::fromLatin1( "\t" ), TQString::fromLatin1( " " ) ) + .replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( " " ) ); } - msg.setBody( TQString::tqfromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>") + msg.setBody( TQString::fromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>") + i18n("Outgoing Encrypted Message: ") - + TQString::tqfromLatin1("</b></font></td></tr><tr><td class=\"highlight\">") + + TQString::fromLatin1("</b></font></td></tr><tr><td class=\"highlight\">") + plainBody - + TQString::tqfromLatin1(" </td></tr></table>") + + TQString::fromLatin1(" </td></tr></table>") , Kopete::Message::RichText ); } @@ -215,11 +215,11 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg ) body = Kopete::Message::escape( body ); } - msg.setBody( TQString::tqfromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>") + msg.setBody( TQString::fromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>") + i18n("Incoming Encrypted Message: ") - + TQString::tqfromLatin1("</b></font></td></tr><tr><td class=\"highlight\">") + + TQString::fromLatin1("</b></font></td></tr><tr><td class=\"highlight\">") + body - + TQString::tqfromLatin1(" </td></tr></table>") + + TQString::fromLatin1(" </td></tr></table>") , Kopete::Message::RichText ); } diff --git a/kopete/plugins/cryptography/cryptographyprefsbase.ui b/kopete/plugins/cryptography/cryptographyprefsbase.ui index 00a7b4c0..2a6ec002 100644 --- a/kopete/plugins/cryptography/cryptographyprefsbase.ui +++ b/kopete/plugins/cryptography/cryptographyprefsbase.ui @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>50</height> diff --git a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui index fb71e0a1..8a5b1379 100644 --- a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui +++ b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui @@ -50,7 +50,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp index e095c0e8..41bdda8f 100644 --- a/kopete/plugins/cryptography/kgpgselkey.cpp +++ b/kopete/plugins/cryptography/kgpgselkey.cpp @@ -163,7 +163,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo keysListpr->setSelected(keysListpr->firstChild(),true); page->show(); - resize(this->tqminimumSize()); + resize(this->minimumSize()); setMainWidget(page); } diff --git a/kopete/plugins/highlight/highlightconfig.cpp b/kopete/plugins/highlight/highlightconfig.cpp index 2cfab23b..d6e04d7f 100644 --- a/kopete/plugins/highlight/highlightconfig.cpp +++ b/kopete/plugins/highlight/highlightconfig.cpp @@ -78,11 +78,11 @@ void HighlightConfig::load() { m_filters.clear(); //clear filters - TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "highlight.xml" ) ); + TQString filename = locateLocal( "appdata", TQString::fromLatin1( "highlight.xml" ) ); if( filename.isEmpty() ) return ; - TQDomDocument filterList( TQString::tqfromLatin1( "highlight-plugin" ) ); + TQDomDocument filterList( TQString::fromLatin1( "highlight-plugin" ) ); TQFile filterListFile( filename ); filterListFile.open( IO_ReadOnly ); @@ -96,7 +96,7 @@ void HighlightConfig::load() TQDomElement element = node.toElement(); if( !element.isNull() ) { -// if( element.tagName() == TQString::tqfromLatin1("filter") +// if( element.tagName() == TQString::fromLatin1("filter") // { Filter *filtre=newFilter(); TQDomNode filterNode = node.firstChild(); @@ -106,40 +106,40 @@ void HighlightConfig::load() TQDomElement filterElement = filterNode.toElement(); if( !filterElement.isNull() ) { - if( filterElement.tagName() == TQString::tqfromLatin1( "display-name" ) ) + if( filterElement.tagName() == TQString::fromLatin1( "display-name" ) ) { filtre->displayName = filterElement.text(); } - else if( filterElement.tagName() == TQString::tqfromLatin1( "search" ) ) + else if( filterElement.tagName() == TQString::fromLatin1( "search" ) ) { filtre->search = filterElement.text(); - filtre->caseSensitive= ( filterElement.attribute( TQString::tqfromLatin1( "caseSensitive" ), TQString::tqfromLatin1( "1" ) ) == TQString::tqfromLatin1( "1" ) ); - filtre->isRegExp= ( filterElement.attribute( TQString::tqfromLatin1( "regExp" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); + filtre->caseSensitive= ( filterElement.attribute( TQString::fromLatin1( "caseSensitive" ), TQString::fromLatin1( "1" ) ) == TQString::fromLatin1( "1" ) ); + filtre->isRegExp= ( filterElement.attribute( TQString::fromLatin1( "regExp" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); } - else if( filterElement.tagName() == TQString::tqfromLatin1( "FG" ) ) + else if( filterElement.tagName() == TQString::fromLatin1( "FG" ) ) { filtre->FG = filterElement.text(); - filtre->setFG= ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); + filtre->setFG= ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); } - else if( filterElement.tagName() == TQString::tqfromLatin1( "BG" ) ) + else if( filterElement.tagName() == TQString::fromLatin1( "BG" ) ) { filtre->BG = filterElement.text(); - filtre->setBG= ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); + filtre->setBG= ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); } - else if( filterElement.tagName() == TQString::tqfromLatin1( "importance" ) ) + else if( filterElement.tagName() == TQString::fromLatin1( "importance" ) ) { filtre->importance = filterElement.text().toUInt(); - filtre->setImportance= ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); + filtre->setImportance= ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); } - else if( filterElement.tagName() == TQString::tqfromLatin1( "sound" ) ) + else if( filterElement.tagName() == TQString::fromLatin1( "sound" ) ) { filtre->soundFN = filterElement.text(); - filtre->playSound = ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); + filtre->playSound = ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); } - else if( filterElement.tagName() == TQString::tqfromLatin1( "raise" ) ) + else if( filterElement.tagName() == TQString::fromLatin1( "raise" ) ) { - filtre->raiseView = ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); + filtre->raiseView = ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); } } filterNode = filterNode.nextSibling(); @@ -154,7 +154,7 @@ void HighlightConfig::load() void HighlightConfig::save() { - TQString fileName = locateLocal( "appdata", TQString::tqfromLatin1( "highlight.xml" ) ); + TQString fileName = locateLocal( "appdata", TQString::fromLatin1( "highlight.xml" ) ); KSaveFile file( fileName ); if( file.status() == 0 ) @@ -162,7 +162,7 @@ void HighlightConfig::save() TQTextStream *stream = file.textStream(); stream->setEncoding( TQTextStream::UnicodeUTF8 ); - TQString xml = TQString::tqfromLatin1( + TQString xml = TQString::fromLatin1( "<?xml version=\"1.0\"?>\n" "<!DOCTYPE kopete-highlight-plugin>\n" "<highlight-plugin>\n" ); @@ -172,32 +172,32 @@ void HighlightConfig::save() for( ; filtreIt.current(); ++filtreIt ) { Filter *filtre = *filtreIt; - xml += TQString::tqfromLatin1( " <filter>\n <display-name>" ) + xml += TQString::fromLatin1( " <filter>\n <display-name>" ) + TQStyleSheet::escape(filtre->displayName) - + TQString::tqfromLatin1( "</display-name>\n" ); + + TQString::fromLatin1( "</display-name>\n" ); - xml += TQString::tqfromLatin1(" <search caseSensitive=\"") + TQString::number( static_cast<int>( filtre->caseSensitive ) ) + - TQString::tqfromLatin1("\" regExp=\"") + TQString::number( static_cast<int>( filtre->isRegExp ) ) + - TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->search ) + TQString::tqfromLatin1( "</search>\n" ); + xml += TQString::fromLatin1(" <search caseSensitive=\"") + TQString::number( static_cast<int>( filtre->caseSensitive ) ) + + TQString::fromLatin1("\" regExp=\"") + TQString::number( static_cast<int>( filtre->isRegExp ) ) + + TQString::fromLatin1( "\">" ) + TQStyleSheet::escape( filtre->search ) + TQString::fromLatin1( "</search>\n" ); - xml += TQString::tqfromLatin1(" <BG set=\"") + TQString::number( static_cast<int>( filtre->setBG ) ) + - TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->BG.name() ) + TQString::tqfromLatin1( "</BG>\n" ); - xml += TQString::tqfromLatin1(" <FG set=\"") + TQString::number( static_cast<int>( filtre->setFG ) ) + - TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->FG.name() ) + TQString::tqfromLatin1( "</FG>\n" ); + xml += TQString::fromLatin1(" <BG set=\"") + TQString::number( static_cast<int>( filtre->setBG ) ) + + TQString::fromLatin1( "\">" ) + TQStyleSheet::escape( filtre->BG.name() ) + TQString::fromLatin1( "</BG>\n" ); + xml += TQString::fromLatin1(" <FG set=\"") + TQString::number( static_cast<int>( filtre->setFG ) ) + + TQString::fromLatin1( "\">" ) + TQStyleSheet::escape( filtre->FG.name() ) + TQString::fromLatin1( "</FG>\n" ); - xml += TQString::tqfromLatin1(" <importance set=\"") + TQString::number( static_cast<int>( filtre->setImportance ) ) + - TQString::tqfromLatin1( "\">" ) + TQString::number( filtre->importance ) + TQString::tqfromLatin1( "</importance>\n" ); + xml += TQString::fromLatin1(" <importance set=\"") + TQString::number( static_cast<int>( filtre->setImportance ) ) + + TQString::fromLatin1( "\">" ) + TQString::number( filtre->importance ) + TQString::fromLatin1( "</importance>\n" ); - xml += TQString::tqfromLatin1(" <sound set=\"") + TQString::number( static_cast<int>( filtre->playSound ) ) + - TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->soundFN ) + TQString::tqfromLatin1( "</sound>\n" ); + xml += TQString::fromLatin1(" <sound set=\"") + TQString::number( static_cast<int>( filtre->playSound ) ) + + TQString::fromLatin1( "\">" ) + TQStyleSheet::escape( filtre->soundFN ) + TQString::fromLatin1( "</sound>\n" ); - xml += TQString::tqfromLatin1(" <raise set=\"") + TQString::number( static_cast<int>( filtre->raiseView ) ) + - TQString::tqfromLatin1( "\"></raise>\n" ); + xml += TQString::fromLatin1(" <raise set=\"") + TQString::number( static_cast<int>( filtre->raiseView ) ) + + TQString::fromLatin1( "\"></raise>\n" ); - xml += TQString::tqfromLatin1( " </filter>\n" ); + xml += TQString::fromLatin1( " </filter>\n" ); } - xml += TQString::tqfromLatin1( "</highlight-plugin>\n" ); + xml += TQString::fromLatin1( "</highlight-plugin>\n" ); *stream << xml; } diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui index eaca281c..7138396c 100644 --- a/kopete/plugins/highlight/highlightprefsbase.ui +++ b/kopete/plugins/highlight/highlightprefsbase.ui @@ -177,7 +177,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -277,7 +277,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>21</height> @@ -328,7 +328,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>21</height> @@ -379,7 +379,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>21</height> diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp index 76b29a5c..64af8c81 100644 --- a/kopete/plugins/history/converter.cpp +++ b/kopete/plugins/history/converter.cpp @@ -44,7 +44,7 @@ void HistoryPlugin::convertOldHistory() progressDlg->setAllowCancel(false); //because i am too lazy to allow to cancel - TQString kopetedir=locateLocal( "data", TQString::tqfromLatin1( "kopete")); + TQString kopetedir=locateLocal( "data", TQString::fromLatin1( "kopete")); TQDir d( kopetedir ); //d should point to ~/.kde/share/apps/kopete/ d.setFilter( TQDir::Dirs ); @@ -155,12 +155,12 @@ void HistoryPlugin::convertOldHistory() buffer += TQString::fromUtf8(cbuf); } - if( buffer.startsWith( TQString::tqfromLatin1( "<message " ) ) ) + if( buffer.startsWith( TQString::fromLatin1( "<message " ) ) ) { msgBlock = buffer; // find the end of the message block - while( !feof( f ) && buffer != TQString::tqfromLatin1( "</message>\n" ) /*strcmp("</message>\n", cbuf )*/ ) + while( !feof( f ) && buffer != TQString::fromLatin1( "</message>\n" ) /*strcmp("</message>\n", cbuf )*/ ) { fgets(cbuf, CBUFLENGTH, f); buffer = TQString::fromUtf8(cbuf); @@ -178,7 +178,7 @@ void HistoryPlugin::convertOldHistory() msgelement = xmllist.documentElement(); node = msgelement.firstChild(); - if( msgelement.attribute( TQString::tqfromLatin1( "direction" ) ) == TQString::tqfromLatin1( "inbound" ) ) + if( msgelement.attribute( TQString::fromLatin1( "direction" ) ) == TQString::fromLatin1( "inbound" ) ) dir = Kopete::Message::Inbound; else dir = Kopete::Message::Outbound; @@ -194,12 +194,12 @@ void HistoryPlugin::convertOldHistory() element = node.toElement(); tagname = element.tagName(); - if( tagname == TQString::tqfromLatin1( "srcnick" ) ) + if( tagname == TQString::fromLatin1( "srcnick" ) ) nick = element.text(); - else if( tagname == TQString::tqfromLatin1( "date" ) ) + else if( tagname == TQString::fromLatin1( "date" ) ) date = element.text(); - else if( tagname == TQString::tqfromLatin1( "body" ) ) + else if( tagname == TQString::fromLatin1( "body" ) ) body = element.text().stripWhiteSpace(); } @@ -213,11 +213,11 @@ void HistoryPlugin::convertOldHistory() if(!docElem.isNull()) { TQDate date(year,month,1); - TQString name = protocolId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + - TQString::tqfromLatin1( "/" ) + - contactId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + TQString name = protocolId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + + TQString::fromLatin1( "/" ) + + contactId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + date.toString(".yyyyMM"); - KSaveFile file( locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ); + KSaveFile file( locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) ) ); if( file.status() == 0 ) { TQTextStream *stream = file.textStream(); @@ -254,7 +254,7 @@ void HistoryPlugin::convertOldHistory() headElem.appendChild(contactElem); TQDomElement importElem = doc.createElement( "imported" ); importElem.setAttribute( "from", fi->fileName() ); - importElem.setAttribute( "date", TQDateTime::tqcurrentDateTime().toString() ); + importElem.setAttribute( "date", TQDateTime::currentDateTime().toString() ); headElem.appendChild(importElem); } TQDomElement msgElem = doc.createElement( "msg" ); @@ -275,11 +275,11 @@ void HistoryPlugin::convertOldHistory() if(!docElem.isNull()) { TQDate date(year,month,1); - TQString name = protocolId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + - TQString::tqfromLatin1( "/" ) + - contactId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + TQString name = protocolId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + + TQString::fromLatin1( "/" ) + + contactId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + date.toString(".yyyyMM"); - KSaveFile file( locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ); + KSaveFile file( locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) ) ); if( file.status() == 0 ) { TQTextStream *stream = file.textStream(); @@ -310,12 +310,12 @@ bool HistoryPlugin::detectOldHistory() return false; - TQDir d( locateLocal( "data", TQString::tqfromLatin1( "kopete/logs")) ); + TQDir d( locateLocal( "data", TQString::fromLatin1( "kopete/logs")) ); d.setFilter( TQDir::Dirs ); if(d.count() >= 3) // '.' and '..' are included return false; //the new history already exists - TQDir d2( locateLocal( "data", TQString::tqfromLatin1( "kopete")) ); + TQDir d2( locateLocal( "data", TQString::fromLatin1( "kopete")) ); d2.setFilter( TQDir::Dirs ); const TQFileInfoList *list = d2.entryInfoList(); TQFileInfoListIterator it( *list ); diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index c4f5418f..45c639a7 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -148,7 +148,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, mHtmlView->setMarginWidth(4); mHtmlView->setMarginHeight(4); mHtmlView->setFocusPolicy(TQ_NoFocus); - mHtmlView->tqsetSizePolicy( + mHtmlView->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); l->addWidget(mHtmlView); @@ -157,7 +157,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, mHtmlPart->begin(); htmlCode = "<html><head>" + fontStyle + "</head><body class=\"hf\"></body></html>"; - mHtmlPart->write( TQString::tqfromLatin1( htmlCode.latin1() ) ); + mHtmlPart->write( TQString::fromLatin1( htmlCode.latin1() ) ); mHtmlPart->end(); @@ -175,7 +175,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, //initActions KActionCollection* ac = new KActionCollection(this); mCopyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac ); - mCopyURLAct = new KAction( i18n( "Copy Link Address" ), TQString::tqfromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac ); + mCopyURLAct = new KAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac ); resize(650, 700); centerOnScreen(this); @@ -255,13 +255,13 @@ void HistoryDialog::init(Kopete::Contact *c) { // Get year and month list TQRegExp rx( "\\.(\\d\\d\\d\\d)(\\d\\d)" ); - const TQString contact_in_filename=c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ); + const TQString contact_in_filename=c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ); TQFileInfo *fi; // BEGIN check if there are Kopete 0.7.x TQDir d1(locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) )); d1.setFilter( TQDir::Files | TQDir::NoSymLinks ); d1.setSorting( TQDir::Name ); @@ -288,9 +288,9 @@ void HistoryDialog::init(Kopete::Contact *c) // END of kopete 0.7.x check TQString logDir = locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + - TQString::tqfromLatin1( "/" ) + - c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) + + TQString::fromLatin1( "/" ) + + c->account()->accountId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) ); TQDir d(logDir); d.setFilter( TQDir::Files | TQDir::NoSymLinks ); @@ -339,16 +339,16 @@ void HistoryDialog::setMessages(TQValueList<Kopete::Message> msgs) htmlBody.removeChild(htmlBody.childNodes().item(htmlBody.childNodes().length() - 1)); // ---- - TQString dir = (TQApplication::reverseLayout() ? TQString::tqfromLatin1("rtl") : - TQString::tqfromLatin1("ltr")); + TQString dir = (TQApplication::reverseLayout() ? TQString::fromLatin1("rtl") : + TQString::fromLatin1("ltr")); TQValueList<Kopete::Message>::iterator it = msgs.begin(); TQString accountLabel; TQString resultHTML = "<b><font color=\"red\">" + (*it).timestamp().date().toString() + "</font></b><br/>"; - DOM::HTMLElement newNode = mHtmlPart->document().createElement(TQString::tqfromLatin1("span")); - newNode.setAttribute(TQString::tqfromLatin1("dir"), dir); + DOM::HTMLElement newNode = mHtmlPart->document().createElement(TQString::fromLatin1("span")); + newNode.setAttribute(TQString::fromLatin1("dir"), dir); newNode.setInnerHTML(resultHTML); mHtmlPart->htmlDocument().body().appendChild(newNode); @@ -384,8 +384,8 @@ void HistoryDialog::setMessages(TQValueList<Kopete::Message> msgs) : "<font color=\"" + KopetePrefs::prefs()->textColor().light(200).name() + "\"><b><</b></font> ") + body + "<br/>"; - newNode = mHtmlPart->document().createElement(TQString::tqfromLatin1("span")); - newNode.setAttribute(TQString::tqfromLatin1("dir"), dir); + newNode = mHtmlPart->document().createElement(TQString::fromLatin1("span")); + newNode.setAttribute(TQString::fromLatin1("dir"), dir); newNode.setInnerHTML(resultHTML); mHtmlPart->htmlDocument().body().appendChild(newNode); diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp index b8608ac9..4b1798ae 100644 --- a/kopete/plugins/history/historyguiclient.cpp +++ b/kopete/plugins/history/historyguiclient.cpp @@ -41,7 +41,7 @@ HistoryGUIClient::HistoryGUIClient(Kopete::ChatSession *parent, const char *name TQPtrList<Kopete::Contact> mb=m_manager->members(); m_logger=new HistoryLogger( mb.first() , this ); - actionLast=new KAction( i18n("History Last" ), TQString::tqfromLatin1( "finish" ), 0, this, TQT_SLOT(slotLast()), actionCollection() , "historyLast" ); + actionLast=new KAction( i18n("History Last" ), TQString::fromLatin1( "finish" ), 0, this, TQT_SLOT(slotLast()), actionCollection() , "historyLast" ); actionPrev = KStdAction::back( this, TQT_SLOT(slotPrevious()), actionCollection() , "historyPrevious" ); actionNext = KStdAction::forward( this, TQT_SLOT(slotNext()), actionCollection() , "historyNext" ); diff --git a/kopete/plugins/history/historylogger.cpp b/kopete/plugins/history/historylogger.cpp index 02bc1b2f..c79c11c0 100644 --- a/kopete/plugins/history/historylogger.cpp +++ b/kopete/plugins/history/historylogger.cpp @@ -45,7 +45,7 @@ HistoryLogger::HistoryLogger( Kopete::MetaContact *m, TQObject *parent, const c m_metaContact=m; m_hideOutgoing=false; m_cachedMonth=-1; - m_realMonth=TQDate::tqcurrentDate().month(); + m_realMonth=TQDate::currentDate().month(); m_oldSens=Default; //the contact may be destroyed, for example, if the contact changes its metacontact @@ -63,7 +63,7 @@ HistoryLogger::HistoryLogger( Kopete::Contact *c, TQObject *parent, const char m_cachedMonth=-1; m_metaContact=c->metaContact(); m_hideOutgoing=false; - m_realMonth=TQDate::tqcurrentDate().month(); + m_realMonth=TQDate::currentDate().month(); m_oldSens=Default; //the contact may be destroyed, for example, if the contact changes its metacontact @@ -107,14 +107,14 @@ void HistoryLogger::setCurrentMonth(int month) TQDomDocument HistoryLogger::getDocument(const Kopete::Contact *c, unsigned int month , bool canLoad , bool* contain) { - if(m_realMonth!=TQDate::tqcurrentDate().month()) + if(m_realMonth!=TQDate::currentDate().month()) { //We changed month, our indice are not correct anymore, clean memory. // or we will see what i called "the 31 midnight bug"(TM) :-) -Olivier m_documents.clear(); m_cachedMonth=-1; m_currentMonth++; //Not usre it's ok, but should work; m_oldMonth++; // idem - m_realMonth=TQDate::tqcurrentDate().month(); + m_realMonth=TQDate::currentDate().month(); } if(!m_metaContact) @@ -137,7 +137,7 @@ TQDomDocument HistoryLogger::getDocument(const Kopete::Contact *c, unsigned int return documents[month]; - TQDomDocument doc = getDocument(c, TQDate::tqcurrentDate().addMonths(0-month), canLoad, contain); + TQDomDocument doc = getDocument(c, TQDate::currentDate().addMonths(0-month), canLoad, contain); documents.insert(month, doc); m_documents[c]=documents; @@ -253,8 +253,8 @@ void HistoryLogger::appendMessage( const Kopete::Message &msg , const Kopete::Co TQDomElement headElem = doc.createElement( "head" ); docElem.appendChild( headElem ); TQDomElement dateElem = doc.createElement( "date" ); - dateElem.setAttribute( "year", TQString::number(TQDate::tqcurrentDate().year()) ); - dateElem.setAttribute( "month", TQString::number(TQDate::tqcurrentDate().month()) ); + dateElem.setAttribute( "year", TQString::number(TQDate::currentDate().year()) ); + dateElem.setAttribute( "month", TQString::number(TQDate::currentDate().month()) ); headElem.appendChild(dateElem); TQDomElement myselfElem = doc.createElement( "contact" ); myselfElem.setAttribute( "type", "myself" ); @@ -280,7 +280,7 @@ void HistoryLogger::appendMessage( const Kopete::Message &msg , const Kopete::Co // On hight-traffic channel, saving can take lots of CPU. (because the file is big) // So i wait a time proportional to the time needed to save.. - const TQString filename=getFileName(c,TQDate::tqcurrentDate()); + const TQString filename=getFileName(c,TQDate::currentDate()); if(!m_toSaveFileName.isEmpty() && m_toSaveFileName != filename) { //that mean the contact or the month has changed, save it now. saveToDisk(); @@ -376,7 +376,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(TQDate date) to.append( dir==Kopete::Message::Inbound ? (*it)->account()->myself() : *it ); Kopete::Message msg(dt, from, to, msgElem2.text(), dir); - msg.setBody( TQString::tqfromLatin1("<span title=\"%1\">%2</span>") + msg.setBody( TQString::fromLatin1("<span title=\"%1\">%2</span>") .tqarg( dt.toString(Qt::LocalDate), msg.escapedBody() ), Kopete::Message::RichText); @@ -403,7 +403,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(TQDate date) TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines, const Kopete::Contact *c, Sens sens, bool reverseOrder, bool colorize) { - //TQDate dd = TQDate::tqcurrentDate().addMonths(0-m_currentMonth); + //TQDate dd = TQDate::currentDate().addMonths(0-m_currentMonth); TQValueList<Kopete::Message> messages; @@ -490,7 +490,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines, if( !msgElem2.isNull() && msgElem2.tagName()=="msg") { rxTime.search(msgElem2.attribute("time")); - TQDate d=TQDate::tqcurrentDate().addMonths(0-m_currentMonth); + TQDate d=TQDate::currentDate().addMonths(0-m_currentMonth); TQDateTime dt( TQDate(d.year() , d.month() , rxTime.cap(1).toUInt()), TQTime( rxTime.cap(2).toUInt() , rxTime.cap(3).toUInt(), rxTime.cap(5).toUInt() ) ); if(!timestamp.isValid() || ((sens==Chronological )? dt < timestamp : dt > timestamp) ) { @@ -587,14 +587,14 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines, { //parse timestamp only if it was not already parsed rxTime.search(msgElem.attribute("time")); - TQDate d=TQDate::tqcurrentDate().addMonths(0-m_currentMonth); + TQDate d=TQDate::currentDate().addMonths(0-m_currentMonth); timestamp=TQDateTime( TQDate(d.year() , d.month() , rxTime.cap(1).toUInt()), TQTime( rxTime.cap(2).toUInt() , rxTime.cap(3).toUInt() , rxTime.cap(5).toUInt() ) ); } Kopete::Message msg(timestamp, from, to, msgElem.text(), dir); if (colorize) { - msg.setBody( TQString::tqfromLatin1("<span style=\"color:%1\" title=\"%2\">%3</span>") + msg.setBody( TQString::fromLatin1("<span style=\"color:%1\" title=\"%2\">%3</span>") .tqarg( fgColor.name(), timestamp.toString(Qt::LocalDate), msg.escapedBody() ), Kopete::Message::RichText ); @@ -602,7 +602,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines, } else { - msg.setBody( TQString::tqfromLatin1("<span title=\"%1\">%2</span>") + msg.setBody( TQString::fromLatin1("<span title=\"%1\">%2</span>") .tqarg( timestamp.toString(Qt::LocalDate), msg.escapedBody() ), Kopete::Message::RichText ); @@ -635,7 +635,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines, TQRegExp rx("(\\d+) (\\d+):(\\d+):(\\d+)"); rx.search(msgElem.attribute("time")); - TQDate d = TQDate::tqcurrentDate().addMonths(0-m_currentMonth); + TQDate d = TQDate::currentDate().addMonths(0-m_currentMonth); timestamp = TQDateTime( TQDate(d.year(), d.month(), rx.cap(1).toUInt()), TQTime( rx.cap(2).toUInt(), rx.cap(3).toUInt() ) ); @@ -663,25 +663,25 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines, TQString HistoryLogger::getFileName(const Kopete::Contact* c, TQDate date) { - TQString name = c->protocol()->pluginId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + - TQString::tqfromLatin1( "/" ) + - c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + - TQString::tqfromLatin1( "/" ) + - c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + TQString name = c->protocol()->pluginId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + + TQString::fromLatin1( "/" ) + + c->account()->accountId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + + TQString::fromLatin1( "/" ) + + c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + date.toString(".yyyyMM"); - TQString filename=locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ; + TQString filename=locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) ) ; //Check if there is a kopete 0.7.x file TQFileInfo fi(filename); if(!fi.exists()) { - name = c->protocol()->pluginId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + - TQString::tqfromLatin1( "/" ) + - c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + name = c->protocol()->pluginId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + + TQString::fromLatin1( "/" ) + + c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + date.toString(".yyyyMM"); - TQString filename2=locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ; + TQString filename2=locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) ) ; TQFileInfo fi2(filename2); if(fi2.exists()) @@ -702,7 +702,7 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c) // BEGIN check if there are Kopete 0.7.x TQDir d1(locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) )); d1.setFilter( TQDir::Files | TQDir::NoSymLinks ); d1.setSorting( TQDir::Name ); @@ -712,10 +712,10 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c) while ( (fi = it1.current()) != 0 ) { - if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ))) + if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ))) { rx.search(fi->fileName()); - int result = 12*(TQDate::tqcurrentDate().year() - rx.cap(1).toUInt()) +TQDate::tqcurrentDate().month() - rx.cap(2).toUInt(); + int result = 12*(TQDate::currentDate().year() - rx.cap(1).toUInt()) +TQDate::currentDate().month() - rx.cap(2).toUInt(); if(result < 0) { @@ -730,9 +730,9 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c) TQDir d(locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + - TQString::tqfromLatin1( "/" ) + - c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) + + TQString::fromLatin1( "/" ) + + c->account()->accountId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) )); d.setFilter( TQDir::Files | TQDir::NoSymLinks ); @@ -742,10 +742,10 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c) TQFileInfoListIterator it( *list ); while ( (fi = it.current()) != 0 ) { - if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ))) + if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ))) { rx.search(fi->fileName()); - int result = 12*(TQDate::tqcurrentDate().year() - rx.cap(1).toUInt()) +TQDate::tqcurrentDate().month() - rx.cap(2).toUInt(); + int result = 12*(TQDate::currentDate().year() - rx.cap(1).toUInt()) +TQDate::currentDate().month() - rx.cap(2).toUInt(); if(result < 0) { kdWarning(14310) << k_funcinfo << "Kopete only found log file made in the future. Check your date!" << endl; diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index f1401c85..af92fc09 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -45,7 +45,7 @@ HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQString : Kopete::Plugin( HistoryPluginFactory::instance(), parent, name ), m_loggerFactory( this ) { KAction *viewMetaContactHistory = new KAction( i18n("View &History" ), - TQString::tqfromLatin1( "history" ), 0, this, TQT_SLOT(slotViewHistory()), + TQString::fromLatin1( "history" ), 0, this, TQT_SLOT(slotViewHistory()), actionCollection(), "viewMetaContactHistory" ); viewMetaContactHistory->setEnabled( Kopete::ContactList::self()->selectedMetaContacts().count() == 1 ); @@ -136,7 +136,7 @@ void HistoryPlugin::slotViewHistory() void HistoryPlugin::slotViewCreated( KopeteView* v ) { - if(v->plugin()->pluginInfo()->pluginName() != TQString::tqfromLatin1("kopete_chatwindow") ) + if(v->plugin()->pluginInfo()->pluginName() != TQString::fromLatin1("kopete_chatwindow") ) return; //Email chat windows are not supported. bool autoChatWindow = HistoryConfig::auto_chatwindow(); diff --git a/kopete/plugins/history/historyprefsui.ui b/kopete/plugins/history/historyprefsui.ui index 36f3dee2..558c68a2 100644 --- a/kopete/plugins/history/historyprefsui.ui +++ b/kopete/plugins/history/historyprefsui.ui @@ -148,7 +148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>90</height> diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui index af9f1bce..35891bf9 100644 --- a/kopete/plugins/history/historyviewer.ui +++ b/kopete/plugins/history/historyviewer.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>200</height> @@ -45,7 +45,7 @@ <property name="name"> <cstring>statusLabel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>20</height> @@ -109,13 +109,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>32767</height> @@ -160,13 +160,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -207,13 +207,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -237,7 +237,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -323,7 +323,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp index 4b0ab594..62aef452 100644 --- a/kopete/plugins/latex/latexplugin.cpp +++ b/kopete/plugins/latex/latexplugin.cpp @@ -145,7 +145,7 @@ void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg ) TQBuffer buffer( ba ); buffer.open( IO_WriteOnly ); renderedImage.save( &buffer, "PNG" ); - TQString imageURL = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg( KCodecs::base64Encode( ba ) ); + TQString imageURL = TQString::fromLatin1("data:image/png;base64,%1").tqarg( KCodecs::base64Encode( ba ) ); replaceMap[match] = imageURL; } #else diff --git a/kopete/plugins/latex/latexprefsbase.ui b/kopete/plugins/latex/latexprefsbase.ui index bad68932..365e159b 100644 --- a/kopete/plugins/latex/latexprefsbase.ui +++ b/kopete/plugins/latex/latexprefsbase.ui @@ -50,7 +50,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>280</width> <height>20</height> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>220</width> <height>20</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kopete/plugins/motionautoaway/motionawayprefs.ui b/kopete/plugins/motionautoaway/motionawayprefs.ui index cf90dc57..f673ccb7 100644 --- a/kopete/plugins/motionautoaway/motionawayprefs.ui +++ b/kopete/plugins/motionautoaway/motionawayprefs.ui @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>95</width> <height>20</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -201,7 +201,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -241,7 +241,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>180</width> <height>20</height> @@ -260,7 +260,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui index 5725a2ae..ac5dc03e 100644 --- a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui +++ b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui @@ -112,7 +112,7 @@ This is not the same as webcam chat you can find in the newer Windows Messenger <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>60</height> diff --git a/kopete/plugins/nowlistening/nljuk.cpp b/kopete/plugins/nowlistening/nljuk.cpp index fe58aba4..78d6914b 100644 --- a/kopete/plugins/nowlistening/nljuk.cpp +++ b/kopete/plugins/nowlistening/nljuk.cpp @@ -58,7 +58,7 @@ void NLJuk::update() { TQDataStream arg( data, IO_WriteOnly ); - arg << TQString::tqfromLatin1("Album"); + arg << TQString::fromLatin1("Album"); if ( m_client->call( "juk", "Player", "trackProperty(TQString)", data, replyType, replyData ) ) { @@ -72,7 +72,7 @@ void NLJuk::update() { TQDataStream arg( data, IO_WriteOnly ); - arg << TQString::tqfromLatin1("Artist"); + arg << TQString::fromLatin1("Artist"); if ( m_client->call( "juk", "Player", "trackProperty(TQString)", data, replyType, replyData ) ) { @@ -86,7 +86,7 @@ void NLJuk::update() { TQDataStream arg( data, IO_WriteOnly ); - arg << TQString::tqfromLatin1("Title"); + arg << TQString::fromLatin1("Title"); if ( m_client->call( "juk", "Player", "trackProperty(TQString)", data, replyType, replyData ) ) { diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp index 4c929a4c..dc67a0ab 100644 --- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp +++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp @@ -336,7 +336,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic() } } - a->setOnlineStatus(a->myself()->onlinetqStatus(), advert); + a->setOnlineStatus(a->myself()->onlineStatus(), advert); } } } diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui index 21d2f0e9..dcc48d8f 100644 --- a/kopete/plugins/nowlistening/nowlisteningprefs.ui +++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui @@ -178,7 +178,7 @@ Expressions in brackets depend on a substitution being made.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -259,7 +259,7 @@ in place of your status message.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -332,7 +332,7 @@ in place of your status message.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -352,7 +352,7 @@ in place of your status message.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kopete/plugins/smpppdcs/Changelog.smpppdcs b/kopete/plugins/smpppdcs/Changelog.smpppdcs index 4884da4f..80854a86 100644 --- a/kopete/plugins/smpppdcs/Changelog.smpppdcs +++ b/kopete/plugins/smpppdcs/Changelog.smpppdcs @@ -19,7 +19,7 @@ Changelog * using KConfigXT for configuration * using dcopidl2cpp stub generated from kinternetiface.h (from kinternet package), no more own implementation -* experimental implementation of the the KDED-NetworktqStatus (not active, yet) +* experimental implementation of the the KDED-NetworkStatus (not active, yet) * significantly speeded up automatic detection of a SMPPPD * BUGFIX: reloading the plugin in a already running Kopete will no more result in an inactive plugin diff --git a/kopete/plugins/smpppdcs/detector.h b/kopete/plugins/smpppdcs/detector.h index 1889a84f..094de9e5 100644 --- a/kopete/plugins/smpppdcs/detector.h +++ b/kopete/plugins/smpppdcs/detector.h @@ -48,7 +48,7 @@ public: */ virtual ~Detector() {} - virtual void checktqStatus() const = 0; + virtual void checkStatus() const = 0; virtual void smpppdServerChange() {} diff --git a/kopete/plugins/smpppdcs/detectornetstat.cpp b/kopete/plugins/smpppdcs/detectornetstat.cpp index ca800e7f..f1ed21b5 100644 --- a/kopete/plugins/smpppdcs/detectornetstat.cpp +++ b/kopete/plugins/smpppdcs/detectornetstat.cpp @@ -27,7 +27,7 @@ DetectorNetstat::~DetectorNetstat() { delete m_process; } -void DetectorNetstat::checktqStatus() const { +void DetectorNetstat::checkStatus() const { kdDebug(14312) << k_funcinfo << endl; if(m_process) { @@ -59,14 +59,14 @@ void DetectorNetstat::checktqStatus() const { void DetectorNetstat::slotProcessStdout(KProcess *, char *buffer, int buflen) { // Look for a default gateway kdDebug(14312) << k_funcinfo << endl; - m_buffer += TQString::tqfromLatin1(buffer, buflen); + m_buffer += TQString::fromLatin1(buffer, buflen); kdDebug(14312) << m_buffer << endl; } void DetectorNetstat::slotProcessExited(KProcess *process) { kdDebug(14312) << k_funcinfo << m_buffer << endl; if(process == m_process) { - m_connector->setConnectedtqStatus(m_buffer.contains("default")); + m_connector->setConnectedStatus(m_buffer.contains("default")); m_buffer = TQString(); delete m_process; m_process = 0L; diff --git a/kopete/plugins/smpppdcs/detectornetstat.h b/kopete/plugins/smpppdcs/detectornetstat.h index 1f6d1161..548b903f 100644 --- a/kopete/plugins/smpppdcs/detectornetstat.h +++ b/kopete/plugins/smpppdcs/detectornetstat.h @@ -38,7 +38,7 @@ public: DetectorNetstat(IConnector* connector); virtual ~DetectorNetstat(); - virtual void checktqStatus() const; + virtual void checkStatus() const; private slots: // Original cs-plugin code diff --git a/kopete/plugins/smpppdcs/detectornetworkstatus.cpp b/kopete/plugins/smpppdcs/detectornetworkstatus.cpp index e8af4158..e2b1ae19 100644 --- a/kopete/plugins/smpppdcs/detectornetworkstatus.cpp +++ b/kopete/plugins/smpppdcs/detectornetworkstatus.cpp @@ -22,44 +22,44 @@ #include "iconnector.h" #include "detectornetworkstatus.h" -DetectorNetworktqStatus::DetectorNetworktqStatus(IConnector* connector) +DetectorNetworkStatus::DetectorNetworkStatus(IConnector* connector) : Detector(connector), m_connManager(NULL) { m_connManager = ConnectionManager::self(); - connect(m_connManager, TQT_SIGNAL(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus)), - this, TQT_SLOT(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus))); + connect(m_connManager, TQT_SIGNAL(statusChanged(const TQString&, NetworkStatus::EnumStatus)), + this, TQT_SLOT(statusChanged(const TQString&, NetworkStatus::EnumStatus))); } -DetectorNetworktqStatus::~DetectorNetworktqStatus() {} +DetectorNetworkStatus::~DetectorNetworkStatus() {} -void DetectorNetworktqStatus::checktqStatus() const { +void DetectorNetworkStatus::checkStatus() const { // needs to do nothing } -void DetectorNetworktqStatus::statusChanged(const TQString& host, NetworktqStatus::EnumtqStatus status) { +void DetectorNetworkStatus::statusChanged(const TQString& host, NetworkStatus::EnumStatus status) { switch(status) { - case NetworktqStatus::Offline: + case NetworkStatus::Offline: kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Offline" << endl; break; - case NetworktqStatus::OfflineFailed: + case NetworkStatus::OfflineFailed: kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::OfflineFailed" << endl; break; - case NetworktqStatus::OfflineDisconnected: + case NetworkStatus::OfflineDisconnected: kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::OfflineDisconnected" << endl; break; - case NetworktqStatus::ShuttingDown: + case NetworkStatus::ShuttingDown: kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::ShuttingDown" << endl; break; - case NetworktqStatus::Establishing: + case NetworkStatus::Establishing: kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Establishing" << endl; break; - case NetworktqStatus::Online: + case NetworkStatus::Online: kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Online" << endl; break; - case NetworktqStatus::NoNetworks: + case NetworkStatus::NoNetworks: kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::NoNetworks" << endl; break; - case NetworktqStatus::Unreachable: + case NetworkStatus::Unreachable: kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Unreachable" << endl; break; } diff --git a/kopete/plugins/smpppdcs/detectornetworkstatus.h b/kopete/plugins/smpppdcs/detectornetworkstatus.h index 1c1896e6..850be008 100644 --- a/kopete/plugins/smpppdcs/detectornetworkstatus.h +++ b/kopete/plugins/smpppdcs/detectornetworkstatus.h @@ -27,22 +27,22 @@ class ConnectionManager; /** @author Heiko Schäfer <heiko@rangun.de> */ -class DetectorNetworktqStatus : protected TQObject, public Detector +class DetectorNetworkStatus : protected TQObject, public Detector { Q_OBJECT TQ_OBJECT - DetectorNetworktqStatus(const DetectorNetworktqStatus&); - DetectorNetworktqStatus& operator=(const DetectorNetworktqStatus&); + DetectorNetworkStatus(const DetectorNetworkStatus&); + DetectorNetworkStatus& operator=(const DetectorNetworkStatus&); public: - DetectorNetworktqStatus(IConnector* connector); - virtual ~DetectorNetworktqStatus(); + DetectorNetworkStatus(IConnector* connector); + virtual ~DetectorNetworkStatus(); - virtual void checktqStatus() const; + virtual void checkStatus() const; protected slots: - void statusChanged(const TQString& host, NetworktqStatus::EnumtqStatus status); + void statusChanged(const TQString& host, NetworkStatus::EnumStatus status); private: ConnectionManager * m_connManager; diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp index 1b932d6d..772090d9 100644 --- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp +++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp @@ -31,9 +31,9 @@ DetectorSMPPPD::DetectorSMPPPD(IConnector * connector) DetectorSMPPPD::~DetectorSMPPPD() {} /*! - \fn DetectorSMPPPD::checktqStatus() + \fn DetectorSMPPPD::checkStatus() */ -void DetectorSMPPPD::checktqStatus() const { +void DetectorSMPPPD::checkStatus() const { kdDebug(14312) << k_funcinfo << "Checking for online status..." << endl; #ifndef NOKINTERNETDCOP @@ -41,10 +41,10 @@ void DetectorSMPPPD::checktqStatus() const { if(kapp->dcopClient() && m_kinternetApp != "") { switch(getConnectionStatusDCOP()) { case CONNECTED: - m_connector->setConnectedtqStatus(true); + m_connector->setConnectedStatus(true); return; case DISCONNECTED: - m_connector->setConnectedtqStatus(false); + m_connector->setConnectedStatus(false); return; default: break; @@ -63,9 +63,9 @@ void DetectorSMPPPD::checktqStatus() const { c.setPassword(SMPPPDCSConfig::self()->password().utf8()); if(c.connect(server, port)) { - m_connector->setConnectedtqStatus(c.isOnline()); + m_connector->setConnectedStatus(c.isOnline()); } else { kdDebug(14312) << k_funcinfo << "not connected to smpppd => I'll try again later" << endl; - m_connector->setConnectedtqStatus(false); + m_connector->setConnectedStatus(false); } } diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.h b/kopete/plugins/smpppdcs/detectorsmpppd.h index cba377e0..197fe65b 100644 --- a/kopete/plugins/smpppdcs/detectorsmpppd.h +++ b/kopete/plugins/smpppdcs/detectorsmpppd.h @@ -39,7 +39,7 @@ public: DetectorSMPPPD(IConnector* connector); virtual ~DetectorSMPPPD(); - virtual void checktqStatus() const; + virtual void checkStatus() const; }; diff --git a/kopete/plugins/smpppdcs/iconnector.h b/kopete/plugins/smpppdcs/iconnector.h index ab63ec71..c4846862 100644 --- a/kopete/plugins/smpppdcs/iconnector.h +++ b/kopete/plugins/smpppdcs/iconnector.h @@ -37,9 +37,9 @@ public: * This method needs to get reimplemented at classes which implement * this interface. * - * @param newtqStatus the status of the internet connection, <code>TRUE</code> if there is a connection, otherwise <code>FALSE</code> + * @param newStatus the status of the internet connection, <code>TRUE</code> if there is a connection, otherwise <code>FALSE</code> */ - virtual void setConnectedtqStatus(bool newtqStatus) = 0; + virtual void setConnectedStatus(bool newStatus) = 0; }; #endif diff --git a/kopete/plugins/smpppdcs/onlineinquiry.cpp b/kopete/plugins/smpppdcs/onlineinquiry.cpp index 99dc7d5c..4cab45d7 100644 --- a/kopete/plugins/smpppdcs/onlineinquiry.cpp +++ b/kopete/plugins/smpppdcs/onlineinquiry.cpp @@ -35,11 +35,11 @@ bool OnlineInquiry::isOnline(bool useSMPPPD) { m_detector = new DetectorNetstat(this); } - m_detector->checktqStatus(); + m_detector->checkStatus(); return m_online; } -void OnlineInquiry::setConnectedtqStatus(bool newtqStatus) { - m_online = newtqStatus; +void OnlineInquiry::setConnectedStatus(bool newStatus) { + m_online = newStatus; } diff --git a/kopete/plugins/smpppdcs/onlineinquiry.h b/kopete/plugins/smpppdcs/onlineinquiry.h index 7a0fcef2..278c1e9f 100644 --- a/kopete/plugins/smpppdcs/onlineinquiry.h +++ b/kopete/plugins/smpppdcs/onlineinquiry.h @@ -35,7 +35,7 @@ public: bool isOnline(bool useSMPPPD); - virtual void setConnectedtqStatus(bool newtqStatus); + virtual void setConnectedStatus(bool newStatus); private: Detector * m_detector; diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp index 0aad71d0..f17f2ca9 100644 --- a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp +++ b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp @@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY(kopete_smpppdcs, SMPPPDCSPluginFactory("kopete_smpppd SMPPPDCSPlugin::SMPPPDCSPlugin(TQObject *parent, const char * name, const TQStringList& /* args */) : DCOPObject("SMPPPDCSIface"), Kopete::Plugin(SMPPPDCSPluginFactory::instance(), parent, name), - m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworktqStatus(NULL), m_timer(NULL), + m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworkStatus(NULL), m_timer(NULL), m_onlineInquiry(NULL) { kdDebug(14312) << k_funcinfo << endl; @@ -51,7 +51,7 @@ m_onlineInquiry(NULL) { m_detectorNetstat = new DetectorNetstat(this); // experimental, not used yet - m_detectorNetworktqStatus = new DetectorNetworktqStatus(this); + m_detectorNetworkStatus = new DetectorNetworkStatus(this); // we wait for the allPluginsLoaded signal, to connect // as early as possible after startup, but not before @@ -72,7 +72,7 @@ SMPPPDCSPlugin::~SMPPPDCSPlugin() { delete m_timer; delete m_detectorSMPPPD; delete m_detectorNetstat; - delete m_detectorNetworktqStatus; + delete m_detectorNetworkStatus; delete m_onlineInquiry; } @@ -80,7 +80,7 @@ void SMPPPDCSPlugin::allPluginsLoaded() { if(Kopete::PluginManager::self()->isAllPluginsLoaded()) { m_timer = new TQTimer(); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotChecktqStatus())); + connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus())); if(SMPPPDCSConfig::self()->useSmpppd()) { m_timer->start(30000); @@ -90,7 +90,7 @@ void SMPPPDCSPlugin::allPluginsLoaded() { m_timer->start(60000); } - slotChecktqStatus(); + slotCheckStatus(); } } @@ -98,19 +98,19 @@ bool SMPPPDCSPlugin::isOnline() const { return m_onlineInquiry->isOnline(SMPPPDCSConfig::self()->useSmpppd()); } -void SMPPPDCSPlugin::slotChecktqStatus() { +void SMPPPDCSPlugin::slotCheckStatus() { // reread config to get changes SMPPPDCSConfig::self()->readConfig(); if(SMPPPDCSConfig::self()->useSmpppd()) { - m_detectorSMPPPD->checktqStatus(); + m_detectorSMPPPD->checkStatus(); } else { - m_detectorNetstat->checktqStatus(); + m_detectorNetstat->checkStatus(); } } -void SMPPPDCSPlugin::setConnectedtqStatus( bool connected ) { +void SMPPPDCSPlugin::setConnectedStatus( bool connected ) { kdDebug(14312) << k_funcinfo << connected << endl; // We have to handle a few cases here. First is the machine is connected, and the plugin thinks diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.h b/kopete/plugins/smpppdcs/smpppdcsplugin.h index 24697ca7..5214ecc5 100644 --- a/kopete/plugins/smpppdcs/smpppdcsplugin.h +++ b/kopete/plugins/smpppdcs/smpppdcsplugin.h @@ -77,7 +77,7 @@ public: * * @see SMPPPDCSPrefs */ - virtual void setConnectedtqStatus( bool newtqStatus ); + virtual void setConnectedStatus( bool newStatus ); virtual TQString detectionMethod() const; @@ -87,7 +87,7 @@ public slots: void smpppdServerChanged(const TQString& server); private slots: - void slotChecktqStatus(); + void slotCheckStatus(); void allPluginsLoaded(); private: @@ -99,7 +99,7 @@ private: Detector * m_detectorSMPPPD; Detector * m_detectorNetstat; - Detector * m_detectorNetworktqStatus; + Detector * m_detectorNetworkStatus; bool m_pluginConnected; TQTimer * m_timer; OnlineInquiry * m_onlineInquiry; diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui index 1bbb6664..f8be184a 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui +++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui @@ -54,7 +54,7 @@ <cstring>csMethod</cstring> </property> <property name="title"> - <string>Method of Connection tqStatus Detection</string> + <string>Method of Connection Status Detection</string> </property> <vbox> <property name="name"> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>341</width> <height>20</height> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -203,7 +203,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>6</height> diff --git a/kopete/plugins/smpppdcs/smpppdlocationui.ui b/kopete/plugins/smpppdcs/smpppdlocationui.ui index 6b22e3f9..7c88f07f 100644 --- a/kopete/plugins/smpppdcs/smpppdlocationui.ui +++ b/kopete/plugins/smpppdcs/smpppdlocationui.ui @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>20</height> diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.cpp b/kopete/plugins/smpppdcs/smpppdsearcher.cpp index cfb103c2..a06e30a9 100644 --- a/kopete/plugins/smpppdcs/smpppdsearcher.cpp +++ b/kopete/plugins/smpppdcs/smpppdsearcher.cpp @@ -64,7 +64,7 @@ void SMPPPDSearcher::searchNetwork() { void SMPPPDSearcher::slotStdoutReceivedIfconfig(KProcess * /* proc */, char * buf, int len) { kdDebug(14312) << k_funcinfo << endl; - TQString myBuf = TQString::tqfromLatin1(buf,len); + TQString myBuf = TQString::fromLatin1(buf,len); TQRegExp rex("^[ ]{10}.*inet addr:([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*Mask:([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})"); // tokenize the string into lines TQStringList toks = TQStringList::split("\n", myBuf); @@ -82,7 +82,7 @@ void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf kdDebug(14312) << k_funcinfo << endl; TQRegExp rexGW(".*\\n0.0.0.0[ ]*([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*"); - TQString myBuf = TQString::tqfromLatin1(buf,len); + TQString myBuf = TQString::fromLatin1(buf,len); if(!(rexGW.exactMatch(myBuf) && scan(rexGW.cap(1), "255.255.255.255"))) { // if netstat -r found no gateway we search the network diff --git a/kopete/plugins/statistics/statisticscontact.cpp b/kopete/plugins/statistics/statisticscontact.cpp index c178b39b..3a03b7bc 100644 --- a/kopete/plugins/statistics/statisticscontact.cpp +++ b/kopete/plugins/statistics/statisticscontact.cpp @@ -28,10 +28,10 @@ #include "statisticscontact.h" #include "statisticsdb.h" -StatisticsContact::StatisticsContact(Kopete::MetaContact *mc, StatisticsDB *db) : m_metaContact(mc),m_db(db), m_oldtqStatus(Kopete::OnlineStatus::Unknown) +StatisticsContact::StatisticsContact(Kopete::MetaContact *mc, StatisticsDB *db) : m_metaContact(mc),m_db(db), m_oldStatus(Kopete::OnlineStatus::Unknown) { m_isChatWindowOpen = false; - m_oldStatusDateTime = TQDateTime::tqcurrentDateTime(); + m_oldStatusDateTime = TQDateTime::currentDateTime(); // Last*Changed are always false at start m_timeBetweenTwoMessagesChanged = false; @@ -107,7 +107,7 @@ void StatisticsContact::initialize(Kopete::Contact *c) // Get last time a message was received - m_lastMessageReceived = TQDateTime::tqcurrentDateTime(); + m_lastMessageReceived = TQDateTime::currentDateTime(); // Check for lastPresent @@ -234,18 +234,18 @@ void StatisticsContact::commonStatsCheck(const TQString name, TQString& statVar1 void StatisticsContact::newMessageReceived(Kopete::Message& m) { kdDebug() << "statistics: new message received" << endl; - TQDateTime tqcurrentDateTime = TQDateTime::tqcurrentDateTime(); + TQDateTime currentDateTime = TQDateTime::currentDateTime(); if (m_timeBetweenTwoMessagesOn != -1 && m_isChatWindowOpen) { - m_timeBetweenTwoMessages = (m_timeBetweenTwoMessages*m_timeBetweenTwoMessagesOn + m_lastMessageReceived.secsTo(tqcurrentDateTime))/(1 + m_timeBetweenTwoMessagesOn); + m_timeBetweenTwoMessages = (m_timeBetweenTwoMessages*m_timeBetweenTwoMessagesOn + m_lastMessageReceived.secsTo(currentDateTime))/(1 + m_timeBetweenTwoMessagesOn); } setIsChatWindowOpen(true); m_timeBetweenTwoMessagesOn += 1; - m_lastMessageReceived = tqcurrentDateTime; + m_lastMessageReceived = currentDateTime; // Message lenght @@ -254,7 +254,7 @@ void StatisticsContact::newMessageReceived(Kopete::Message& m) // Last talked /// @todo do this in message sent too. So we need setLastTalk() - m_lastTalk = tqcurrentDateTime; + m_lastTalk = currentDateTime; m_messageLengthChanged = true; m_lastTalkChanged = true; @@ -269,32 +269,32 @@ void StatisticsContact::onlineStatusChanged(Kopete::OnlineStatus::StatusType sta if (m_statisticsContactId.isEmpty()) return; - TQDateTime tqcurrentDateTime = TQDateTime::tqcurrentDateTime(); + TQDateTime currentDateTime = TQDateTime::currentDateTime(); - /// We don't want to log if oldtqStatus is unknown + /// We don't want to log if oldStatus is unknown /// the change could not be a real one; see StatisticsPlugin::slotMySelfOnlineStatusChanged - if (m_oldtqStatus != Kopete::OnlineStatus::Unknown) + if (m_oldStatus != Kopete::OnlineStatus::Unknown) { - kdDebug() << "statistics - status change for "<< metaContact()->metaContactId() << " : "<< TQString::number(m_oldtqStatus) << endl; + kdDebug() << "statistics - status change for "<< metaContact()->metaContactId() << " : "<< TQString::number(m_oldStatus) << endl; m_db->query(TQString("INSERT INTO contactstatus " "(metacontactid, status, datetimebegin, datetimeend) " - "VALUES('%1', '%2', '%3', '%4'" ");").tqarg(m_statisticsContactId).tqarg(Kopete::OnlineStatus::statusTypeToString(m_oldtqStatus)).tqarg(TQString::number(m_oldStatusDateTime.toTime_t())).tqarg(TQString::number(tqcurrentDateTime.toTime_t()))); + "VALUES('%1', '%2', '%3', '%4'" ");").tqarg(m_statisticsContactId).tqarg(Kopete::OnlineStatus::statusTypeToString(m_oldStatus)).tqarg(TQString::number(m_oldStatusDateTime.toTime_t())).tqarg(TQString::number(currentDateTime.toTime_t()))); } - if (m_oldtqStatus == Kopete::OnlineStatus::Online || m_oldtqStatus == Kopete::OnlineStatus::Away) + if (m_oldStatus == Kopete::OnlineStatus::Online || m_oldStatus == Kopete::OnlineStatus::Away) // If the last status was Online or Away, the last time contact was present is the time he goes offline { - m_lastPresent = tqcurrentDateTime; + m_lastPresent = currentDateTime; m_lastPresentChanged = true; } - m_oldtqStatus = status; - m_oldStatusDateTime = tqcurrentDateTime; + m_oldStatus = status; + m_oldStatusDateTime = currentDateTime; } -bool StatisticsContact::wastqStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status) +bool StatisticsContact::wasStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status) { if (m_statisticsContactId.isEmpty()) return false; @@ -389,7 +389,7 @@ TQValueList<TQTime> StatisticsContact::mainEvents(const Kopete::OnlineStatus::St if (m_statisticsContactId.isEmpty()) return mainEvents; - TQDateTime tqcurrentDateTime = TQDateTime::tqcurrentDateTime(); + TQDateTime currentDateTime = TQDateTime::currentDateTime(); buffer = m_db->query(TQString("SELECT datetimebegin, datetimeend, status FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin").tqarg(m_statisticsContactId)); diff --git a/kopete/plugins/statistics/statisticscontact.h b/kopete/plugins/statistics/statisticscontact.h index 1559e1fd..9d7f6575 100644 --- a/kopete/plugins/statistics/statisticscontact.h +++ b/kopete/plugins/statistics/statisticscontact.h @@ -55,9 +55,9 @@ public: TQString statisticsContactId() { return m_statisticsContactId; } /** \brief Access method - * \return m_oldtqStatus + * \return m_oldStatus */ - Kopete::OnlineStatus::StatusType oldtqStatus() { return m_oldtqStatus; } + Kopete::OnlineStatus::StatusType oldStatus() { return m_oldStatus; } /** \brief Access method * \return m_oldStatusDateTime @@ -106,7 +106,7 @@ public: /** * \returns true if contact was status at dt, false else. */ - bool wastqStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status); + bool wasStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status); /** * \returns the status of the contact at dt. Return false if dt is invalid. @@ -209,9 +209,9 @@ private: /** * The interest of statistics contact is to manage the changes of status - * in order to correctly update the database. That's why here we keep the oldtqStatus + * in order to correctly update the database. That's why here we keep the oldStatus */ - Kopete::OnlineStatus::StatusType m_oldtqStatus; + Kopete::OnlineStatus::StatusType m_oldStatus; /// We keep the old status datetime here TQDateTime m_oldStatusDateTime; diff --git a/kopete/plugins/statistics/statisticsdcopiface.h b/kopete/plugins/statistics/statisticsdcopiface.h index 36336ae2..9a769935 100644 --- a/kopete/plugins/statistics/statisticsdcopiface.h +++ b/kopete/plugins/statistics/statisticsdcopiface.h @@ -60,15 +60,15 @@ k_dcop: /** * \returns return the status of the contact at datetime. */ - virtual TQString dcoptqStatus(TQString id, TQString datetime) = 0; + virtual TQString dcopStatus(TQString id, TQString datetime) = 0; /** * \returns return the status of the contact at timeStamp. */ - virtual TQString dcoptqStatus(TQString id, int timeStamp) = 0; + virtual TQString dcopStatus(TQString id, int timeStamp) = 0; /** * \returns the main status (most used status) of the contact id at date (not time) timeStamp. Will take the day where timeStamp is. */ - virtual TQString dcopMaintqStatus(TQString id, int timeStamp) = 0; + virtual TQString dcopMainStatus(TQString id, int timeStamp) = 0; }; #endif // STATISTICSDCOP_H diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp index 3c0a67c1..b4ca0861 100644 --- a/kopete/plugins/statistics/statisticsdialog.cpp +++ b/kopete/plugins/statistics/statisticsdialog.cpp @@ -63,7 +63,7 @@ StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db, mainWidget->tabWidget->setCurrentPage(0); mainWidget->timePicker->setTime(TQTime::currentTime()); - mainWidget->datePicker->setDate(TQDate::tqcurrentDate()); + mainWidget->datePicker->setDate(TQDate::currentDate()); connect(mainWidget->askButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAskButtonClicked())); setFocus(); @@ -265,7 +265,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T TQDateTime dateTime2; dateTime2.setTime_t(values[i+2].toInt()); - if (dateTime1.date() == TQDate::tqcurrentDate() || dateTime2.date() == TQDate::tqcurrentDate()) + if (dateTime1.date() == TQDate::currentDate() || dateTime2.date() == TQDate::currentDate()) today = true; else today = false; @@ -417,7 +417,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T generalHTMLPart->write("<div title=\"" +i18n("Current status") + "\" class=\"statgroup\">"); generalHTMLPart->write(i18n("Is <b>%1</b> since <b>%2</b>").tqarg( - Kopete::OnlineStatus(m_contact->oldtqStatus()).description(), + Kopete::OnlineStatus(m_contact->oldStatus()).description(), KGlobal::locale()->formatDateTime(m_contact->oldStatusDateTime()))); generalHTMLPart->write(TQString("</div>")); } diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp index 79135598..bef49af8 100644 --- a/kopete/plugins/statistics/statisticsplugin.cpp +++ b/kopete/plugins/statistics/statisticsplugin.cpp @@ -53,7 +53,7 @@ StatisticsPlugin::StatisticsPlugin( TQObject *parent, const char *name, const TQ { KAction *viewMetaContactStatistics = new KAction( i18n("View &Statistics" ), - TQString::tqfromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()), + TQString::fromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()), actionCollection(), "viewMetaContactStatistics" ); viewMetaContactStatistics->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count() == 1); @@ -205,59 +205,59 @@ bool StatisticsPlugin::dcopWasOnline(TQString id, int timeStamp) { TQDateTime dt; dt.setTime_t(timeStamp); - return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Online); + return dcopWasStatus(id, dt, Kopete::OnlineStatus::Online); } bool StatisticsPlugin::dcopWasOnline(TQString id, TQString dateTime) { - return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Online); + return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Online); } bool StatisticsPlugin::dcopWasAway(TQString id, int timeStamp) { TQDateTime dt; dt.setTime_t(timeStamp); - return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Away); + return dcopWasStatus(id, dt, Kopete::OnlineStatus::Away); } bool StatisticsPlugin::dcopWasAway(TQString id, TQString dateTime) { - return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Away); + return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Away); } bool StatisticsPlugin::dcopWasOffline(TQString id, int timeStamp) { TQDateTime dt; dt.setTime_t(timeStamp); - return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Offline); + return dcopWasStatus(id, dt, Kopete::OnlineStatus::Offline); } bool StatisticsPlugin::dcopWasOffline(TQString id, TQString dateTime) { - return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Offline); + return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Offline); } -bool StatisticsPlugin::dcopWastqStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status) +bool StatisticsPlugin::dcopWasStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status) { kdDebug() << k_funcinfo << "statistics - DCOP wasOnline :" << id << endl; if (dateTime.isValid() && statisticsContactMap.contains(id)) { - return statisticsContactMap[id]->wastqStatus(dateTime, status); + return statisticsContactMap[id]->wasStatus(dateTime, status); } return false; } -TQString StatisticsPlugin::dcoptqStatus(TQString id, int timeStamp) +TQString StatisticsPlugin::dcopStatus(TQString id, int timeStamp) { TQDateTime dt; dt.setTime_t(timeStamp); - return dcoptqStatus(id, dt.toString()); + return dcopStatus(id, dt.toString()); } -TQString StatisticsPlugin::dcoptqStatus(TQString id, TQString dateTime) +TQString StatisticsPlugin::dcopStatus(TQString id, TQString dateTime) { TQDateTime dt = TQDateTime::fromString(dateTime); @@ -269,7 +269,7 @@ TQString StatisticsPlugin::dcoptqStatus(TQString id, TQString dateTime) return ""; } -TQString StatisticsPlugin::dcopMaintqStatus(TQString id, int timeStamp) +TQString StatisticsPlugin::dcopMainStatus(TQString id, int timeStamp) { TQDateTime dt; dt.setTime_t(timeStamp); diff --git a/kopete/plugins/statistics/statisticsplugin.h b/kopete/plugins/statistics/statisticsplugin.h index 467bd6b8..d6f75c81 100644 --- a/kopete/plugins/statistics/statisticsplugin.h +++ b/kopete/plugins/statistics/statisticsplugin.h @@ -61,7 +61,7 @@ class KActionCollection; * * <table> * <tr> - * <td>Event</td><td>Changes to database</td><td>oldtqStatus</td> + * <td>Event</td><td>Changes to database</td><td>oldStatus</td> * </tr> * <tr> * <td>John 17:44 Away <i>(connexion)</i></td><td> - <i>(oldstatus was offline)</i></td><td>oldstatus = away </td> @@ -191,12 +191,12 @@ public slots: bool dcopWasOffline(TQString id, int timeStamp); bool dcopWasOffline(TQString id, TQString dt); - bool dcopWastqStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status); + bool dcopWasStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status); - TQString dcoptqStatus(TQString id, TQString dateTime); - TQString dcoptqStatus(TQString id, int timeStamp); + TQString dcopStatus(TQString id, TQString dateTime); + TQString dcopStatus(TQString id, int timeStamp); - TQString dcopMaintqStatus(TQString id, int timeStamp); + TQString dcopMainStatus(TQString id, int timeStamp); private: StatisticsDB *m_db; diff --git a/kopete/plugins/statistics/statisticswidget.ui b/kopete/plugins/statistics/statisticswidget.ui index 87dd1b4d..b0f6ea27 100644 --- a/kopete/plugins/statistics/statisticswidget.ui +++ b/kopete/plugins/statistics/statisticswidget.ui @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>31</height> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -148,7 +148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>41</height> @@ -181,12 +181,12 @@ <widget class="TQComboBox"> <item> <property name="text"> - <string>Contact tqStatus at Date & Time</string> + <string>Contact Status at Date & Time</string> </property> </item> <item> <property name="text"> - <string>Most Used tqStatus at Date</string> + <string>Most Used Status at Date</string> </property> </item> <property name="name"> diff --git a/kopete/plugins/texteffect/texteffectprefs.ui b/kopete/plugins/texteffect/texteffectprefs.ui index 79b1cbde..2dd1ab85 100644 --- a/kopete/plugins/texteffect/texteffectprefs.ui +++ b/kopete/plugins/texteffect/texteffectprefs.ui @@ -96,7 +96,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>81</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>279</height> diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index 751b8294..dd872ee0 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -284,7 +284,7 @@ TQString TranslatorPlugin::googleTranslateMessage( const TQString &msg, const TQ while ( !m_completed[ job ] ) tqApp->processEvents(); - TQString data = TQString::tqfromLatin1( m_data[ job ] ); + TQString data = TQString::fromLatin1( m_data[ job ] ); // After hacks, we need to clean m_data.remove( job ); diff --git a/kopete/plugins/translator/translatorprefsbase.ui b/kopete/plugins/translator/translatorprefsbase.ui index 7a8d2c5a..7a92eccc 100644 --- a/kopete/plugins/translator/translatorprefsbase.ui +++ b/kopete/plugins/translator/translatorprefsbase.ui @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kopete/plugins/webpresence/DESIGN b/kopete/plugins/webpresence/DESIGN index cd7ed095..d62c9c34 100644 --- a/kopete/plugins/webpresence/DESIGN +++ b/kopete/plugins/webpresence/DESIGN @@ -8,5 +8,5 @@ Every so often, it writes a file containing a snapshot of who is online and who Use KIO::NetAccess to upload the files! -Getting Info about Local User's tqStatus +Getting Info about Local User's Status Goal is to allow ppl who don't have us on their contactlist to see what our current status is and what our UIN/id is for each protocol. So we need to know (protocol, uin, status). diff --git a/kopete/plugins/webpresence/webpresence_html.xsl b/kopete/plugins/webpresence/webpresence_html.xsl index 5dac1837..f768ccf5 100644 --- a/kopete/plugins/webpresence/webpresence_html.xsl +++ b/kopete/plugins/webpresence/webpresence_html.xsl @@ -17,7 +17,7 @@ <xsl:template match="webpresence"> <html> <head> - <title>My IM tqStatus</title> + <title>My IM Status</title> </head> <body> <p class="name"><xsl:value-of select="name"/></p> diff --git a/kopete/plugins/webpresence/webpresence_xhtml.xsl b/kopete/plugins/webpresence/webpresence_xhtml.xsl index 4ba456d5..9d749c14 100644 --- a/kopete/plugins/webpresence/webpresence_xhtml.xsl +++ b/kopete/plugins/webpresence/webpresence_xhtml.xsl @@ -16,7 +16,7 @@ <xsl:template match="webpresence"> <html> <head> - <title>My IM tqStatus</title> + <title>My IM Status</title> </head> <body> <p class="name"><xsl:value-of select="name"/></p> diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp index 88de6c07..bb7b9d4c 100644 --- a/kopete/plugins/webpresence/webpresenceplugin.cpp +++ b/kopete/plugins/webpresence/webpresenceplugin.cpp @@ -228,7 +228,7 @@ KTempFile* WebPresencePlugin::generateFile() // insert the current date/time TQDomElement date = doc.createElement( "listdate" ); TQDomText t = doc.createTextNode( - KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); + KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); date.appendChild( t ); root.appendChild( date ); @@ -272,30 +272,30 @@ KTempFile* WebPresencePlugin::generateFile() accName.appendChild( accNameText ); acc.appendChild( accName ); - TQDomElement acctqStatus = doc.createElement( "accountstatus" ); + TQDomElement accStatus = doc.createElement( "accountstatus" ); TQDomText statusText = doc.createTextNode( ( me ) - ? statusAsString( me->onlinetqStatus() ) + ? statusAsString( me->onlineStatus() ) : notKnown ) ; - acctqStatus.appendChild( statusText ); + accStatus.appendChild( statusText ); // Dont add these if we're shutting down, because the result // would be quite weird. if ( !shuttingDown ) { // Add away message as an attribute, if one exists. - if ( me->onlinetqStatus().status() == Kopete::OnlineStatus::Away && + if ( me->onlineStatus().status() == Kopete::OnlineStatus::Away && !me->property("awayMessage").value().toString().isEmpty() ) { - acctqStatus.setAttribute( "awayreason", + accStatus.setAttribute( "awayreason", me->property("awayMessage").value().toString() ); } // Add the online status description as an attribute, if one exits. - if ( !me->onlinetqStatus().description().isEmpty() ) { - acctqStatus.setAttribute( "statusdescription", - me->onlinetqStatus().description() ); + if ( !me->onlineStatus().description().isEmpty() ) { + accStatus.setAttribute( "statusdescription", + me->onlineStatus().description() ); } } - acc.appendChild( acctqStatus ); + acc.appendChild( accStatus ); if ( showAddresses ) { @@ -430,13 +430,13 @@ ProtocolList WebPresencePlugin::allProtocols() return result; } -TQString WebPresencePlugin::statusAsString( const Kopete::OnlineStatus &newtqStatus ) +TQString WebPresencePlugin::statusAsString( const Kopete::OnlineStatus &newStatus ) { if (shuttingDown) return "OFFLINE"; TQString status; - switch ( newtqStatus.status() ) + switch ( newStatus.status() ) { case Kopete::OnlineStatus::Online: status = "ONLINE"; diff --git a/kopete/plugins/webpresence/webpresenceplugin.h b/kopete/plugins/webpresence/webpresenceplugin.h index 8ce3407a..04babfa2 100644 --- a/kopete/plugins/webpresence/webpresenceplugin.h +++ b/kopete/plugins/webpresence/webpresenceplugin.h @@ -109,7 +109,7 @@ protected: /** * Converts numeric status to a string */ - TQString statusAsString( const Kopete::OnlineStatus &newtqStatus ); + TQString statusAsString( const Kopete::OnlineStatus &newStatus ); /** * Schedules writes */ diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui index 41518bb4..5c6632d8 100644 --- a/kopete/plugins/webpresence/webpresenceprefs.ui +++ b/kopete/plugins/webpresence/webpresenceprefs.ui @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>449</width> <height>0</height> @@ -175,7 +175,7 @@ Note that some web browsers do not support XHTML. You should also make sure your <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -276,7 +276,7 @@ images/winpopup_protocol.png</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -313,7 +313,7 @@ images/winpopup_protocol.png</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>93</height> diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 52f13e08..47a124b3 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -132,7 +132,7 @@ static const char* const servers_ip[] = { setMyself( new GaduContact( accountId().toInt(), accountId(), this, Kopete::ContactList::self()->myself() ) ); - p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ); + p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); p->lastDescription = TQString(); for ( unsigned int i = 0; i < NUM_SERVERS ; i++ ) { @@ -234,15 +234,15 @@ GaduAccount::initConnections() void GaduAccount::setAway( bool isAway, const TQString& awayMessage ) { - unsigned int currenttqStatus; + unsigned int currentStatus; if ( isAway ) { - currenttqStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_BUSY : GG_STATUS_BUSY_DESCR; + currentStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_BUSY : GG_STATUS_BUSY_DESCR; } else{ - currenttqStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_AVAIL : GG_STATUS_AVAIL_DESCR; + currentStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_AVAIL : GG_STATUS_AVAIL_DESCR; } - changetqStatus( GaduProtocol::protocol()->converttqStatus( currenttqStatus ), awayMessage ); + changeStatus( GaduProtocol::protocol()->convertStatus( currentStatus ), awayMessage ); } @@ -251,8 +251,8 @@ GaduAccount::actionMenu() { kdDebug(14100) << "actionMenu() " << endl; - p->actionMenu_ = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this ); - p->actionMenu_->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), i18n( "%1 <%2> " ). + p->actionMenu_ = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); + p->actionMenu_->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%1 <%2> " ). arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(), accountId() ) ); if ( p->session_->isConnected() ) { @@ -287,19 +287,19 @@ GaduAccount::actionMenu() p->listFromFileAction->setEnabled( TRUE ); } p->actionMenu_->insert( new KAction( i18n( "Go O&nline" ), - GaduProtocol::protocol()->converttqStatus( GG_STATUS_AVAIL ).iconFor( this ), + GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ), 0, this, TQT_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new KAction( i18n( "Set &Busy" ), - GaduProtocol::protocol()->converttqStatus( GG_STATUS_BUSY ).iconFor( this ), + GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ), 0, this, TQT_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new KAction( i18n( "Set &Invisible" ), - GaduProtocol::protocol()->converttqStatus( GG_STATUS_INVISIBLE ).iconFor( this ), + GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ), 0, this, TQT_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new KAction( i18n( "Go &Offline" ), - GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ), + GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ), 0, this, TQT_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new KAction( i18n( "Set &Description..." ), "info", @@ -332,7 +332,7 @@ GaduAccount::connectWithPassword(const TQString& password) if (isConnected ()) return; // FIXME: add status description to this mechainsm, this is a hack now. libkopete design issue. - changetqStatus( initialtqStatus(), p->lastDescription ); + changeStatus( initialStatus(), p->lastDescription ); } void @@ -353,7 +353,7 @@ void GaduAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason ) { kdDebug(14100) << k_funcinfo << "Called" << endl; - changetqStatus( status, reason); + changeStatus( status, reason); } void @@ -390,7 +390,7 @@ GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* pare } void -GaduAccount::changetqStatus( const Kopete::OnlineStatus& status, const TQString& descr ) +GaduAccount::changeStatus( const Kopete::OnlineStatus& status, const TQString& descr ) { unsigned int ns; @@ -418,14 +418,14 @@ GaduAccount::changetqStatus( const Kopete::OnlineStatus& status, const TQString& if (!descr.isEmpty() && !GaduProtocol::protocol()->statusWithDescription( status.internalStatus() ) ) { // and rerun us again. This won't cause any recursive call, as both conversions are static ns = GaduProtocol::protocol()->statusToWithDescription( status ); - changetqStatus( GaduProtocol::protocol()->converttqStatus( ns ), descr ); + changeStatus( GaduProtocol::protocol()->convertStatus( ns ), descr ); return; } // well, if it's empty but we want to set status with desc, change it too if (descr.isEmpty() && GaduProtocol::protocol()->statusWithDescription( status.internalStatus() ) ) { ns = GaduProtocol::protocol()->statusToWithoutDescription( status ); - changetqStatus( GaduProtocol::protocol()->converttqStatus( ns ), descr ); + changeStatus( GaduProtocol::protocol()->convertStatus( ns ), descr ); return; } @@ -455,7 +455,7 @@ GaduAccount::changetqStatus( const Kopete::OnlineStatus& status, const TQString& else { p->status = status; if ( descr.isEmpty() ) { - if ( p->session_->changetqStatus( status.internalStatus(), p->forFriends ) != 0 ) + if ( p->session_->changeStatus( status.internalStatus(), p->forFriends ) != 0 ) return; } else { @@ -481,7 +481,7 @@ GaduAccount::slotLogin( int status, const TQString& dscr ) { p->lastDescription = dscr; - myself()->setOnlineStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_CONNECTING )); + myself()->setOnlineStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_CONNECTING )); myself()->setProperty( GaduProtocol::protocol()->propAwayMessage, dscr ); if ( !p->session_->isConnected() ) { @@ -507,16 +507,16 @@ GaduAccount::slotLogin( int status, const TQString& dscr ) } } else { - p->session_->changetqStatus( status ); + p->session_->changeStatus( status ); } } void GaduAccount::slotLogoff() { - if ( p->session_->isConnected() || p->status == GaduProtocol::protocol()->converttqStatus( GG_STATUS_CONNECTING )) { - p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ); - changetqStatus( p->status ); + if ( p->session_->isConnected() || p->status == GaduProtocol::protocol()->convertStatus( GG_STATUS_CONNECTING )) { + p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); + changeStatus( p->status ); p->session_->logoff(); dccOff(); } @@ -525,7 +525,7 @@ GaduAccount::slotLogoff() void GaduAccount::slotGoOnline() { - changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_AVAIL ) ); + changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ) ); } void GaduAccount::slotGoOffline() @@ -537,13 +537,13 @@ GaduAccount::slotGoOffline() void GaduAccount::slotGoInvisible() { - changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_INVISIBLE ) ); + changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ) ); } void GaduAccount::slotGoBusy() { - changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_BUSY ) ); + changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ) ); } void @@ -648,7 +648,7 @@ GaduAccount::contactStatusChanged( KGaduNotify* gaduNotify ) return; } - contact->changedtqStatus( gaduNotify ); + contact->changedStatus( gaduNotify ); } void @@ -675,7 +675,7 @@ GaduAccount::connectionFailed( gg_failure_t failure ) case GG_FAILURE_PASSWORD: password().setWrong(); // user pressed CANCEL - p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ); + p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); myself()->setOnlineStatus( p->status ); disconnected( BadPassword ); return; @@ -712,7 +712,7 @@ GaduAccount::connectionFailed( gg_failure_t failure ) else { error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).tqarg( GaduSession::failureDescription( failure ) ), i18n( "Connection Error" ) ); - p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ); + p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); myself()->setOnlineStatus( p->status ); disconnected( InvalidHost ); } @@ -777,7 +777,7 @@ void GaduAccount::connectionSucceed( ) { kdDebug(14100) << "#### Gadu-Gadu connected! " << endl; - p->status = GaduProtocol::protocol()->converttqStatus( p->session_->status() ); + p->status = GaduProtocol::protocol()->convertStatus( p->session_->status() ); myself()->setOnlineStatus( p->status ); myself()->setProperty( GaduProtocol::protocol()->propAwayMessage, p->lastDescription ); startNotify(); @@ -822,11 +822,11 @@ GaduAccount::slotSessionDisconnect( Kopete::Account::DisconnectReason reason ) p->pingTimer_->stop(); } - setAllContactstqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ) ); + setAllContactsStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ) ); - status = myself()->onlinetqStatus().internalStatus(); + status = myself()->onlineStatus().internalStatus(); if ( status != GG_STATUS_NOT_AVAIL || status != GG_STATUS_NOT_AVAIL_DESCR ) { - myself()->setOnlineStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ) ); + myself()->setOnlineStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ) ); } GaduAccount::disconnect( reason ); } @@ -903,7 +903,7 @@ GaduAccount::slotFriendsMode() p->forFriends = !p->forFriends; kdDebug( 14100 ) << "for friends mode: " << p->forFriends << " desc" << p->lastDescription << endl; // now change status, it will changing it with p->forFriends flag - changetqStatus( p->status, p->lastDescription ); + changeStatus( p->status, p->lastDescription ); saveFriendsMode( p->forFriends ); @@ -1077,7 +1077,7 @@ GaduAccount::slotDescription() GaduAway* away = new GaduAway( this ); if( away->exec() == TQDialog::Accepted ) { - changetqStatus( GaduProtocol::protocol()->converttqStatus( away->status() ), + changeStatus( GaduProtocol::protocol()->convertStatus( away->status() ), away->awayText() ); } delete away; diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h index 0363d181..1786e3a9 100644 --- a/kopete/protocols/gadu/gaduaccount.h +++ b/kopete/protocols/gadu/gaduaccount.h @@ -77,7 +77,7 @@ public slots: void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); //} - void changetqStatus( const Kopete::OnlineStatus& status, const TQString& descr = TQString() ); + void changeStatus( const Kopete::OnlineStatus& status, const TQString& descr = TQString() ); void slotLogin( int status = GG_STATUS_AVAIL, const TQString& dscr = TQString() ); void slotLogoff(); void slotGoOnline(); diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp index 8785f08f..2be2a2aa 100644 --- a/kopete/protocols/gadu/gaduaway.cpp +++ b/kopete/protocols/gadu/gaduaway.cpp @@ -47,7 +47,7 @@ GaduAway::GaduAway( GaduAccount* account, TQWidget* parent, const char* name ) ui_ = new GaduAwayUI( this ); setMainWidget( ui_ ); - ks = account->myself()->onlinetqStatus(); + ks = account->myself()->onlineStatus(); s = GaduProtocol::protocol()->statusToWithDescription( ks ); if ( s == GG_STATUS_NOT_AVAIL_DESCR ) { @@ -79,7 +79,7 @@ void GaduAway::slotApply() { if ( account_ ) { - account_->changetqStatus( GaduProtocol::protocol()->converttqStatus( status() ),awayText() ); + account_->changeStatus( GaduProtocol::protocol()->convertStatus( status() ),awayText() ); } } diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp index fb5944f8..c36f1ced 100644 --- a/kopete/protocols/gadu/gaducommands.cpp +++ b/kopete/protocols/gadu/gaducommands.cpp @@ -204,7 +204,7 @@ void RegisterCommand::watcher() } pubDir = (struct gg_pubdir *)session_->data; - emit operationtqStatus( i18n( "Token retrieving status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); + emit operationStatus( i18n( "Token retrieving status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); switch ( session_->state ) { case GG_STATE_CONNECTING: kdDebug( 14100 ) << "Recreating notifiers " << endl; @@ -254,7 +254,7 @@ void RegisterCommand::watcher() return; } pubDir = (gg_pubdir*) session_->data; - emit operationtqStatus( i18n( "Registration status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); + emit operationStatus( i18n( "Registration status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); switch ( session_->state ) { case GG_STATE_CONNECTING: kdDebug( 14100 ) << "Recreating notifiers " << endl; diff --git a/kopete/protocols/gadu/gaducommands.h b/kopete/protocols/gadu/gaducommands.h index a9c78b35..a191242c 100644 --- a/kopete/protocols/gadu/gaducommands.h +++ b/kopete/protocols/gadu/gaducommands.h @@ -53,7 +53,7 @@ signals: void done( const TQString& title, const TQString& what ); void error( const TQString& title, const TQString& error ); void socketReady(); - void operationtqStatus( const TQString ); + void operationStatus( const TQString ); protected: void checkSocket( int, int ); diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index d7965d3b..c9a68f25 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -66,7 +66,7 @@ GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* acco setFileCapable( true ); //offline - setOnlineStatus( GaduProtocol::protocol()->converttqStatus( 0 ) ); + setOnlineStatus( GaduProtocol::protocol()->convertStatus( 0 ) ); setProperty( Kopete::Global::Properties::self()->nickName(), name ); } @@ -107,14 +107,14 @@ GaduContact::sendFile( const KURL &sourceURL, const TQString &/*fileName*/, uint void -GaduContact::changedtqStatus( KGaduNotify* newstatus ) +GaduContact::changedStatus( KGaduNotify* newstatus ) { if ( newstatus->description.isNull() ) { - setOnlineStatus( GaduProtocol::protocol()->converttqStatus( newstatus->status ) ); + setOnlineStatus( GaduProtocol::protocol()->convertStatus( newstatus->status ) ); removeProperty( GaduProtocol::protocol()->propAwayMessage ); } else { - setOnlineStatus( GaduProtocol::protocol()->converttqStatus( newstatus->status ) ); + setOnlineStatus( GaduProtocol::protocol()->convertStatus( newstatus->status ) ); setProperty( GaduProtocol::protocol()->propAwayMessage, newstatus->description ); } @@ -230,7 +230,7 @@ GaduContact::slotUserInfo() dlg->setName( metaContact()->displayName() ); dlg->setId( TQString::number( uin_ ) ); - dlg->settqStatus( onlinetqStatus().description() ); + dlg->setStatus( onlineStatus().description() ); dlg->setAwayMessage( description_ ); dlg->show(); } diff --git a/kopete/protocols/gadu/gaducontact.h b/kopete/protocols/gadu/gaducontact.h index 15eaf288..66851c0c 100644 --- a/kopete/protocols/gadu/gaducontact.h +++ b/kopete/protocols/gadu/gaducontact.h @@ -67,7 +67,7 @@ public: bool ignored(); static TQString findBestContactName( const GaduContactsList::ContactLine* ); - void changedtqStatus( KGaduNotify* ); + void changedStatus( KGaduNotify* ); uin_t uin() const; diff --git a/kopete/protocols/gadu/gaduprotocol.cpp b/kopete/protocols/gadu/gaduprotocol.cpp index 517902f1..3ec773f0 100644 --- a/kopete/protocols/gadu/gaduprotocol.cpp +++ b/kopete/protocols/gadu/gaduprotocol.cpp @@ -199,7 +199,7 @@ GaduProtocol::statusWithDescription( uint status ) } Kopete::OnlineStatus -GaduProtocol::converttqStatus( uint status ) const +GaduProtocol::convertStatus( uint status ) const { switch( status ) { case GG_STATUS_NOT_AVAIL: diff --git a/kopete/protocols/gadu/gaduprotocol.h b/kopete/protocols/gadu/gaduprotocol.h index 5abae065..ff34d970 100644 --- a/kopete/protocols/gadu/gaduprotocol.h +++ b/kopete/protocols/gadu/gaduprotocol.h @@ -71,7 +71,7 @@ public: // } //!Plugin reimplementation - Kopete::OnlineStatus converttqStatus( uint ) const; + Kopete::OnlineStatus convertStatus( uint ) const; bool statusWithDescription( uint status ); uint statusToWithDescription( Kopete::OnlineStatus status ); diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp index 570f2796..fc496aaa 100644 --- a/kopete/protocols/gadu/gadupubdir.cpp +++ b/kopete/protocols/gadu/gadupubdir.cpp @@ -225,12 +225,12 @@ GaduPublicDir::validateData() // Move to GaduProtocol someday TQPixmap -GaduPublicDir::iconFortqStatus( uint status ) +GaduPublicDir::iconForStatus( uint status ) { TQPixmap n; if ( GaduProtocol::protocol() ) { - return GaduProtocol::protocol()->converttqStatus( status ).protocolIcon(); + return GaduProtocol::protocol()->convertStatus( status ).protocolIcon(); } return n; } @@ -256,7 +256,7 @@ GaduPublicDir::slotSearchResult( const SearchResult& result, unsigned int ) (*r).city, TQString::number( (*r).uin ).ascii() ); - sl->setPixmap( 0, iconFortqStatus( (*r).status ) ); + sl->setPixmap( 0, iconForStatus( (*r).status ) ); } // if not found anything, obviously we don't want to search for more diff --git a/kopete/protocols/gadu/gadupubdir.h b/kopete/protocols/gadu/gadupubdir.h index 42fed436..4a2dce64 100644 --- a/kopete/protocols/gadu/gadupubdir.h +++ b/kopete/protocols/gadu/gadupubdir.h @@ -44,7 +44,7 @@ Q_OBJECT public: GaduPublicDir( GaduAccount* , TQWidget *parent = 0, const char* name = "GaduPublicDir" ); GaduPublicDir( GaduAccount* , int searchFor, TQWidget* parent = 0, const char* name = "GaduPublicDir" ); - TQPixmap iconFortqStatus( uint status ); + TQPixmap iconForStatus( uint status ); private slots: void slotSearch(); diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index 1b24575f..22f28703 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -62,9 +62,9 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name ) connect( cRegister, TQT_SIGNAL( tokenRecieved( TQPixmap, TQString ) ), TQT_SLOT( displayToken( TQPixmap, TQString ) ) ); connect( cRegister, TQT_SIGNAL( done( const TQString&, const TQString& ) ), TQT_SLOT( registrationDone( const TQString&, const TQString& ) ) ); connect( cRegister, TQT_SIGNAL( error( const TQString&, const TQString& ) ), TQT_SLOT( registrationError( const TQString&, const TQString& ) ) ); - connect( cRegister, TQT_SIGNAL( operationtqStatus( const TQString ) ), TQT_SLOT( updatetqStatus( const TQString ) ) ); + connect( cRegister, TQT_SIGNAL( operationStatus( const TQString ) ), TQT_SLOT( updateStatus( const TQString ) ) ); - updatetqStatus( i18n( "Retrieving token" ) ); + updateStatus( i18n( "Retrieving token" ) ); cRegister->requestToken(); show(); @@ -86,7 +86,7 @@ GaduRegisterAccount::validateInput() if ( !emailRegexp->exactMatch( ui->valueEmailAddress->text() ) ) { - updatetqStatus( i18n( "Please enter a valid E-Mail Address." ) ); + updateStatus( i18n( "Please enter a valid E-Mail Address." ) ); ui->pixmapEmailAddress->setPixmap ( hintPixmap ); valid = false; } @@ -96,21 +96,21 @@ GaduRegisterAccount::validateInput() if ( valid && ( ( ui->valuePassword->text().isEmpty() ) || ( ui->valuePasswordVerify->text().isEmpty() ) ) ) { - updatetqStatus( i18n( "Please enter the same password twice." ) ); + updateStatus( i18n( "Please enter the same password twice." ) ); valid = false; passwordHighlight = true; } if ( valid && ( ui->valuePassword->text() != ui->valuePasswordVerify->text() ) ) { - updatetqStatus( i18n( "Password entries do not match." ) ); + updateStatus( i18n( "Password entries do not match." ) ); valid = false; passwordHighlight = true; } if ( valid && ( ui->valueVerificationSequence->text().isEmpty() ) ) { - updatetqStatus( i18n( "Please enter the verification sequence." ) ); + updateStatus( i18n( "Please enter the verification sequence." ) ); ui->pixmapVerificationSequence->setPixmap ( hintPixmap ); valid = false; } @@ -131,7 +131,7 @@ GaduRegisterAccount::validateInput() if ( valid ) { // clear status message if we have valid data - updatetqStatus( i18n( "" ) ); + updateStatus( i18n( "" ) ); } enableButton( User1, valid ); @@ -156,7 +156,7 @@ GaduRegisterAccount::registrationDone( const TQString& /*title*/, const TQStri ui->labelVerificationSequence->setDisabled( true ); ui->labelInstructions->setDisabled( true ); emit registeredNumber( cRegister->newUin(), ui->valuePassword->text() ); - updatetqStatus( i18n( "Account created; your new UIN is %1." ).tqarg(TQString::number( cRegister->newUin() ) ) ); + updateStatus( i18n( "Account created; your new UIN is %1." ).tqarg(TQString::number( cRegister->newUin() ) ) ); enableButton( User1, false ); setButtonText( Ok, i18n( "&Close" ) ); } @@ -164,18 +164,18 @@ GaduRegisterAccount::registrationDone( const TQString& /*title*/, const TQStri void GaduRegisterAccount::registrationError( const TQString& title, const TQString& what ) { - updatetqStatus( i18n( "Registration failed: %1" ).tqarg( what ) ); + updateStatus( i18n( "Registration failed: %1" ).tqarg( what ) ); KMessageBox::sorry( this, "Registration was unsucessful, please try again.", title ); disconnect( this, TQT_SLOT( displayToken( TQPixmap, TQString ) ) ); disconnect( this, TQT_SLOT( registrationDone( const TQString&, const TQString& ) ) ); disconnect( this, TQT_SLOT( registrationError( const TQString&, const TQString& ) ) ); - disconnect( this, TQT_SLOT( updatetqStatus( const TQString ) ) ); + disconnect( this, TQT_SLOT( updateStatus( const TQString ) ) ); ui->valueVerificationSequence->setDisabled( true ); ui->valueVerificationSequence->setText( "" ); enableButton( User1, false ); - updatetqStatus( "" ); + updateStatus( "" ); // emit UIN 0, to enable 'register new account' button again in dialog below emit registeredNumber( 0, TQString( "" ) ); @@ -192,9 +192,9 @@ GaduRegisterAccount::displayToken( TQPixmap image, TQString /*tokenId */ ) } void -GaduRegisterAccount::updatetqStatus( const TQString status ) +GaduRegisterAccount::updateStatus( const TQString status ) { - ui->labelStatusMessage->tqsetAlignment( AlignCenter ); + ui->labelStatusMessage->setAlignment( AlignCenter ); ui->labelStatusMessage->setText( status ); } diff --git a/kopete/protocols/gadu/gaduregisteraccount.h b/kopete/protocols/gadu/gaduregisteraccount.h index f6abb06d..ddc295ec 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.h +++ b/kopete/protocols/gadu/gaduregisteraccount.h @@ -49,7 +49,7 @@ protected slots: void registrationDone( const TQString&, const TQString& ); void inputChanged( const TQString & ); void doRegister(); - void updatetqStatus( const TQString status ); + void updateStatus( const TQString status ); private: void validateInput(); diff --git a/kopete/protocols/gadu/gadurichtextformat.cpp b/kopete/protocols/gadu/gadurichtextformat.cpp index 9dcdbc21..18ef22b7 100644 --- a/kopete/protocols/gadu/gadurichtextformat.cpp +++ b/kopete/protocols/gadu/gadurichtextformat.cpp @@ -102,7 +102,7 @@ GaduRichTextFormat::convertToHtml( const TQString& msg, unsigned int formats, vo } style += TQString(" color: rgb( %1, %2, %3 ); ").tqarg( r ).tqarg( g ).tqarg( b ); - tmp += formatOpeningTag( TQString::tqfromLatin1("span"), TQString::tqfromLatin1("style=\"%1\"").tqarg( style ) ); + tmp += formatOpeningTag( TQString::fromLatin1("span"), TQString::fromLatin1("style=\"%1\"").tqarg( style ) ); opened = true; } @@ -150,8 +150,8 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) output->rtf.resize(0); // test first if there is any HTML formating in it - if( htmlString.find( TQString::tqfromLatin1("</span") ) > -1 ) { - TQRegExp findTags( TQString::tqfromLatin1("<span style=\"(.*)\">(.*)</span>") ); + if( htmlString.find( TQString::fromLatin1("</span") ) > -1 ) { + TQRegExp findTags( TQString::fromLatin1("<span style=\"(.*)\">(.*)</span>") ); findTags.setMinimal( true ); int pos = 0; int lastpos = 0; @@ -226,16 +226,16 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) void GaduRichTextFormat::parseAttributes( const TQString attribute, const TQString value ) { - if( attribute == TQString::tqfromLatin1("color") ) { + if( attribute == TQString::fromLatin1("color") ) { color.setNamedColor( value ); } - if( attribute == TQString::tqfromLatin1("font-weight") && value == TQString::tqfromLatin1("600") ) { + if( attribute == TQString::fromLatin1("font-weight") && value == TQString::fromLatin1("600") ) { rtfs.font |= GG_FONT_BOLD; } - if( attribute == TQString::tqfromLatin1("text-decoration") && value == TQString::tqfromLatin1("underline") ) { + if( attribute == TQString::fromLatin1("text-decoration") && value == TQString::fromLatin1("underline") ) { rtfs.font |= GG_FONT_UNDERLINE ; } - if( attribute == TQString::tqfromLatin1("font-style") && value == TQString::tqfromLatin1("italic") ) { + if( attribute == TQString::fromLatin1("font-style") && value == TQString::fromLatin1("italic") ) { rtfs.font |= GG_FONT_ITALIC; } } @@ -282,10 +282,10 @@ GaduRichTextFormat::insertRtf( uint position) TQString GaduRichTextFormat::escapeBody( TQString& input ) { - input.replace( '<', TQString::tqfromLatin1("<") ); - input.replace( '>', TQString::tqfromLatin1(">") ); - input.replace( '\n', TQString::tqfromLatin1( "<br />" ) ); - input.replace( '\t', TQString::tqfromLatin1( " " ) ); - input.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); + input.replace( '<', TQString::fromLatin1("<") ); + input.replace( '>', TQString::fromLatin1(">") ); + input.replace( '\n', TQString::fromLatin1( "<br />" ) ); + input.replace( '\t', TQString::fromLatin1( " " ) ); + input.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( " " ) ); return input; } diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index a9a84691..12fc5794 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -279,7 +279,7 @@ GaduSession::sendMessage( uin_t recipient, const Kopete::Message& msg, int msgCl } int -GaduSession::changetqStatus( int status, bool forFriends ) +GaduSession::changeStatus( int status, bool forFriends ) { kdDebug(14101)<<"## Changing to "<<status<<endl; if ( isConnected() ) { @@ -424,8 +424,8 @@ GaduSession::pubDirSearch( ResLine& query, int ageFrom, int ageTo, bool onlyAli (const char*)textcodec->fromUnicode( query.city ) ); } if ( ageFrom || ageTo ) { - TQString yearFrom = TQString::number( TQDate::tqcurrentDate().year() - ageFrom ); - TQString yearTo = TQString::number( TQDate::tqcurrentDate().year() - ageTo ); + TQString yearFrom = TQString::number( TQDate::currentDate().year() - ageFrom ); + TQString yearTo = TQString::number( TQDate::currentDate().year() - ageTo ); if ( ageFrom && ageTo ) { gg_pubdir50_add( searchRequest, GG_PUBDIR50_BIRTHYEAR, @@ -490,7 +490,7 @@ GaduSession::sendResult( gg_pubdir50_t result ) resultLine.status = stat.toInt(); age = resultLine.age.toInt(); if ( age ) { - resultLine.age = TQString::number( TQDate::tqcurrentDate().year() - age ); + resultLine.age = TQString::number( TQDate::currentDate().year() - age ); } else { resultLine.age.truncate( 0 ); diff --git a/kopete/protocols/gadu/gadusession.h b/kopete/protocols/gadu/gadusession.h index 7f732749..747163e1 100644 --- a/kopete/protocols/gadu/gadusession.h +++ b/kopete/protocols/gadu/gadusession.h @@ -124,7 +124,7 @@ public slots: int addNotify( uin_t ); int removeNotify( uin_t ); int sendMessage( uin_t recipient, const Kopete::Message& msg, int msgClass ); - int changetqStatus( int, bool forFriends = false ); + int changeStatus( int, bool forFriends = false ); int changeStatusDescription( int, const TQString&, bool forFriends = false ); int ping(); diff --git a/kopete/protocols/gadu/ui/gaduawayui.ui b/kopete/protocols/gadu/ui/gaduawayui.ui index de6b1b81..07b531f0 100644 --- a/kopete/protocols/gadu/ui/gaduawayui.ui +++ b/kopete/protocols/gadu/ui/gaduawayui.ui @@ -44,7 +44,7 @@ <cstring>statusGroup_</cstring> </property> <property name="title"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="whatsThis" stdset="0"> <string>Choose status, by default present status is selected. diff --git a/kopete/protocols/gadu/ui/gadueditaccountui.ui b/kopete/protocols/gadu/ui/gadueditaccountui.ui index ff165d35..91556886 100644 --- a/kopete/protocols/gadu/ui/gadueditaccountui.ui +++ b/kopete/protocols/gadu/ui/gadueditaccountui.ui @@ -158,7 +158,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -201,7 +201,7 @@ If you do not currently have an account, please click the button to create one.< <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -231,7 +231,7 @@ If you do not currently have an account, please click the button to create one.< <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>160</height> @@ -570,7 +570,7 @@ If you do not currently have an account, please click the button to create one.< <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -780,7 +780,7 @@ If you do not currently have an account, please click the button to create one.< <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>180</height> diff --git a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui index 9397854c..cc4f6149 100644 --- a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui +++ b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui @@ -39,13 +39,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -112,13 +112,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -157,13 +157,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -216,13 +216,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -283,7 +283,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>23</width> <height>20</height> @@ -302,13 +302,13 @@ <verstretch>13</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>256</width> <height>64</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>256</width> <height>64</height> @@ -350,7 +350,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>22</width> <height>20</height> @@ -388,7 +388,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kopete/protocols/gadu/ui/gadusearch.ui b/kopete/protocols/gadu/ui/gadusearch.ui index d9c39029..3ed367d4 100644 --- a/kopete/protocols/gadu/ui/gadusearch.ui +++ b/kopete/protocols/gadu/ui/gadusearch.ui @@ -220,7 +220,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>297</width> <height>21</height> @@ -367,7 +367,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>224</width> <height>21</height> @@ -386,7 +386,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -411,7 +411,7 @@ <widget class="KListView" row="0" column="0"> <column> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="pixmap"> <pixmap>image0</pixmap> @@ -527,13 +527,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>512</width> <height>256</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>640</width> <height>512</height> diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index cb9c7928..2896ccc8 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -308,13 +308,13 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password ) // contact details listed TQObject::connect( m_client, TQT_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ), TQT_SLOT( receiveContactUserDetails( const GroupWise::ContactDetails & ) ) ); // contact status changed - TQObject::connect( m_client, TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SLOT( receivetqStatus( const TQString &, TQ_UINT16 , const TQString & ) ) ); + TQObject::connect( m_client, TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SLOT( receiveStatus( const TQString &, TQ_UINT16 , const TQString & ) ) ); // incoming message TQObject::connect( m_client, TQT_SIGNAL( messageReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); // auto reply to one of our messages because the recipient is away TQObject::connect( m_client, TQT_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( ourStatusChanged( GroupWise::tqStatus, const TQString &, const TQString & ) ), TQT_SLOT( changeOurtqStatus( GroupWise::tqStatus, const TQString &, const TQString & ) ) ); + TQObject::connect( m_client, TQT_SIGNAL( ourStatusChanged( GroupWise::Status, const TQString &, const TQString & ) ), TQT_SLOT( changeOurStatus( GroupWise::Status, const TQString &, const TQString & ) ) ); // conference events TQObject::connect( m_client, TQT_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ), @@ -390,9 +390,9 @@ void GroupWiseAccount::setOnlineStatus( const Kopete::OnlineStatus& status, cons // Appear Offline is achieved by explicitly setting the status to offline, // rather than disconnecting as when really going offline. if ( status == protocol()->groupwiseAppearOffline ) - m_client->settqStatus( GroupWise::Offline, reason, configGroup()->readEntry( "AutoReply" ) ); + m_client->setStatus( GroupWise::Offline, reason, configGroup()->readEntry( "AutoReply" ) ); else - m_client->settqStatus( ( GroupWise::tqStatus )status.internalStatus(), reason, configGroup()->readEntry( "AutoReply" ) ); + m_client->setStatus( ( GroupWise::Status )status.internalStatus(), reason, configGroup()->readEntry( "AutoReply" ) ); } // going online else @@ -474,11 +474,11 @@ void GroupWiseAccount::slotLoggedIn() // set local status display myself()->setOnlineStatus( protocol()->groupwiseAvailable ); // set status on server - if ( initialtqStatus() != Kopete::OnlineStatus(Kopete::OnlineStatus::Online) && - ( ( GroupWise::tqStatus )initialtqStatus().internalStatus() != GroupWise::Unknown ) ) + if ( initialStatus() != Kopete::OnlineStatus(Kopete::OnlineStatus::Online) && + ( ( GroupWise::Status )initialStatus().internalStatus() != GroupWise::Unknown ) ) { - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Initial status is not online, setting status to " << initialtqStatus().internalStatus() << endl; - m_client->settqStatus( ( GroupWise::tqStatus )initialtqStatus().internalStatus(), m_initialReason, configGroup()->readEntry( "AutoReply" ) ); + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Initial status is not online, setting status to " << initialStatus().internalStatus() << endl; + m_client->setStatus( ( GroupWise::Status )initialStatus().internalStatus(), m_initialReason, configGroup()->readEntry( "AutoReply" ) ); } } @@ -664,7 +664,7 @@ void GroupWiseAccount::slotCSDisconnected() TQValueList<GroupWiseChatSession *>::ConstIterator it; for ( it = m_chatSessions.begin() ; it != m_chatSessions.end(); ++it ) (*it)->setClosed(); - setAllContactstqStatus( protocol()->groupwiseOffline ); + setAllContactsStatus( protocol()->groupwiseOffline ); client()->close(); } @@ -807,8 +807,8 @@ void GroupWiseAccount::handleIncomingMessage( const ConferenceEvent & message ) // if we receive a message from an Offline contact, they are probably blocking us // but we have to set their status to Unknown so that we can reply to them. - kdDebug( GROUPWISE_DEBUG_GLOBAL) << "sender is: " << sender->onlinetqStatus().description() << endl; - if ( sender->onlinetqStatus() == protocol()->groupwiseOffline ) { + kdDebug( GROUPWISE_DEBUG_GLOBAL) << "sender is: " << sender->onlineStatus().description() << endl; + if ( sender->onlineStatus() == protocol()->groupwiseOffline ) { sender->setMessageReceivedOffline( true ); } @@ -1040,14 +1040,14 @@ GroupWiseContact * GroupWiseAccount::createTemporaryContact( const TQString & dn Kopete::ContactList::self()->addMetaContact( metaContact ); // the contact details probably don't contain status - but we can ask for it if ( details.status == GroupWise::Invalid && isConnected() ) - m_client->requesttqStatus( details.dn ); + m_client->requestStatus( details.dn ); } else kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Notified of existing temporary contact DN: " << details.dn << endl; return c; } -void GroupWiseAccount::receivetqStatus( const TQString & contactId, TQ_UINT16 status, const TQString &awayMessage ) +void GroupWiseAccount::receiveStatus( const TQString & contactId, TQ_UINT16 status, const TQString &awayMessage ) { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "got status for: " << contactId << ", status: " << status << ", away message: " << awayMessage << endl; GroupWiseContact * c = contactForDN( contactId ); @@ -1062,7 +1062,7 @@ void GroupWiseAccount::receivetqStatus( const TQString & contactId, TQ_UINT16 st kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " couldn't find " << contactId << endl; } -void GroupWiseAccount::changeOurtqStatus( GroupWise::tqStatus status, const TQString & awayMessage, const TQString & autoReply ) +void GroupWiseAccount::changeOurStatus( GroupWise::Status status, const TQString & awayMessage, const TQString & autoReply ) { if ( status == GroupWise::Offline ) myself()->setOnlineStatus( protocol()->groupwiseAppearOffline ); @@ -1189,7 +1189,7 @@ void GroupWiseAccount::receiveContactCreated() else { client()->requestDetails( TQStringList( cct->dn() ) ); - client()->requesttqStatus( cct->dn() ); + client()->requestStatus( cct->dn() ); } } else @@ -1400,7 +1400,7 @@ void GroupWiseAccount::slotSetAutoReply() void GroupWiseAccount::slotTestRTFize() { /* bool ok; - const TQString query = TQString::tqfromLatin1("Enter a string to rtfize:"); + const TQString query = TQString::fromLatin1("Enter a string to rtfize:"); TQString testText = KLineEditDlg::getText( query, TQString(), &ok, Kopete::UI::Global::mainWidget() ); if ( ok ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Converted text is: '" << protocol()->rtfizeText( testText ) << "'" << endl;*/ diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h index f05f00a1..ff6cca19 100644 --- a/kopete/protocols/groupwise/gwaccount.h +++ b/kopete/protocols/groupwise/gwaccount.h @@ -225,11 +225,11 @@ protected slots: /** * A contact changed status */ - void receivetqStatus( const TQString &, TQ_UINT16, const TQString & ); + void receiveStatus( const TQString &, TQ_UINT16, const TQString & ); /** * Our status changed on the server */ - void changeOurtqStatus( GroupWise::tqStatus, const TQString &, const TQString & ); + void changeOurStatus( GroupWise::Status, const TQString &, const TQString & ); /** * Called when we've been disconnected for logging in as this user somewhere else */ @@ -307,7 +307,7 @@ protected: /** * Sends a status message to the server - called by the status specific slotGoAway etc */ - //void settqStatus( GroupWise::tqStatus status, const TQString & reason = TQString() ); + //void setStatus( GroupWise::Status status, const TQString & reason = TQString() ); int handleTLSWarning (int warning, TQString server, TQString accountId); diff --git a/kopete/protocols/groupwise/gwaddui.ui b/kopete/protocols/groupwise/gwaddui.ui index 6302f869..fc7fff68 100644 --- a/kopete/protocols/groupwise/gwaddui.ui +++ b/kopete/protocols/groupwise/gwaddui.ui @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index 11f2d23b..98fd1f81 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -134,9 +134,9 @@ bool GroupWiseContact::isReachable() // in GWChatSession // (This is a GroupWise rule, not a problem in Kopete) - if ( account()->isConnected() && ( isOnline() || messageReceivedOffline() ) /* && account()->myself()->onlinetqStatus() != protocol()->groupwiseAppearOffline */) + if ( account()->isConnected() && ( isOnline() || messageReceivedOffline() ) /* && account()->myself()->onlineStatus() != protocol()->groupwiseAppearOffline */) return true; - if ( !account()->isConnected()/* || account()->myself()->onlinetqStatus() == protocol()->groupwiseAppearOffline*/ ) + if ( !account()->isConnected()/* || account()->myself()->onlineStatus() == protocol()->groupwiseAppearOffline*/ ) return false; // fallback, something went wrong @@ -222,21 +222,21 @@ void GroupWiseContact::receivePrivacyChanged( const TQString & dn, bool allow ) { Q_UNUSED( allow ); if ( dn == m_dn ) // set the online status back to itself. this will set the blocking state - setOnlineStatus( this->onlinetqStatus() ); + setOnlineStatus( this->onlineStatus() ); } void GroupWiseContact::setOnlineStatus( const Kopete::OnlineStatus& status ) { setMessageReceivedOffline( false ); - if ( status == protocol()->groupwiseAwayIdle && status != onlinetqStatus() ) + if ( status == protocol()->groupwiseAwayIdle && status != onlineStatus() ) setIdleTime( 1 ); - else if ( onlinetqStatus() == protocol()->groupwiseAwayIdle && status != onlinetqStatus() ) + else if ( onlineStatus() == protocol()->groupwiseAwayIdle && status != onlineStatus() ) setIdleTime( 0 ); if ( account()->isContactBlocked( m_dn ) && status.internalStatus() < 15 ) { Kopete::Contact::setOnlineStatus(Kopete::OnlineStatus(status.status() , (status.weight()==0) ? 0 : (status.weight() -1) , - protocol() , status.internalStatus()+15 , TQString::tqfromLatin1("msn_blocked"), + protocol() , status.internalStatus()+15 , TQString::fromLatin1("msn_blocked"), i18n("%1|Blocked").tqarg( status.description() ) ) ); } else diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index 424a1545..5389e4ac 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -206,7 +206,7 @@ void GroupWiseChatSession::slotSendTypingNotification( bool typing ) { // only send a notification if we've got a conference going and we are not Appear Offline if ( !m_guid.isEmpty() && m_memberCount && - ( account()->myself()->onlinetqStatus() != GroupWiseProtocol::protocol()->groupwiseAppearOffline ) ) + ( account()->myself()->onlineStatus() != GroupWiseProtocol::protocol()->groupwiseAppearOffline ) ) account()->client()->sendTyping( guid(), typing ); } @@ -221,7 +221,7 @@ void GroupWiseChatSession::slotMessageSent( Kopete::Message & message, Kopete::C appendMessage( failureNotify ); messageSucceeded(); } - else*/ if ( account()->myself()->onlinetqStatus() == ( static_cast<GroupWiseProtocol *>( protocol() ) )->groupwiseAppearOffline ) + else*/ if ( account()->myself()->onlineStatus() == ( static_cast<GroupWiseProtocol *>( protocol() ) )->groupwiseAppearOffline ) { Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("Your message could not be sent. You cannot send messages while your status is Appear Offline. "), Kopete::Message::Internal, Kopete::Message::PlainText); appendMessage( failureNotify ); @@ -330,7 +330,7 @@ void GroupWiseChatSession::slotInviteContact( Kopete::Contact * contact ) } else { - TQWidget * w = view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L; + TQWidget * w = view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; bool ok; TQRegExp rx( ".*" ); @@ -358,7 +358,7 @@ void GroupWiseChatSession::slotInviteOtherContact() if ( !m_searchDlg ) { // show search dialog - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : Kopete::UI::Global::mainWidget() ); m_searchDlg = new KDialogBase( w, "invitesearchdialog", false, i18n( "Search for Contact to Invite" ), KDialogBase::Ok|KDialogBase::Cancel ); m_search = new GroupWiseContactSearch( account(), TQListView::Single, true, m_searchDlg, "invitesearchwidget" ); @@ -375,7 +375,7 @@ void GroupWiseChatSession::slotSearchedForUsers() TQValueList< ContactDetails > selected = m_search->selectedResults(); if ( selected.count() ) { - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : Kopete::UI::Global::mainWidget() ); ContactDetails cd = selected.first(); bool ok; @@ -399,7 +399,7 @@ void GroupWiseChatSession::addInvitee( const Kopete::Contact * c ) Kopete::MetaContact * inviteeMC = new Kopete::MetaContact(); inviteeMC->setDisplayName( c->metaContact()->displayName() + pending ); GroupWiseContact * invitee = new GroupWiseContact( account(), c->contactId() + " " + pending, inviteeMC, 0, 0, 0 ); - invitee->setOnlineStatus( c->onlinetqStatus() ); + invitee->setOnlineStatus( c->onlineStatus() ); // TODO: we could set all the placeholder's properties etc here too addContact( invitee, true ); m_invitees.append( invitee ); @@ -501,14 +501,14 @@ void GroupWiseChatSession::updateArchiving() void GroupWiseChatSession::slotShowSecurity() { - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : Kopete::UI::Global::mainWidget() ); KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security Status" ) ); } void GroupWiseChatSession::slotShowArchiving() { - TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : Kopete::UI::Global::mainWidget() ); KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving Status" ) ); } diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index 0b4d351a..cfb506da 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -173,7 +173,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) // of multi-byte UTF-8 characters 2 to 6 bytes long (with first byte > 0x7f), these are recoded as 32 bit values, escaped as \u<val>? strings // vanilla RTF "envelope" that doesn't say much but causes other clients to accept the message - TQString rtfTemplate = TQString::tqfromLatin1("{\\rtf1\\ansi\n" + TQString rtfTemplate = TQString::fromLatin1("{\\rtf1\\ansi\n" "{\\fonttbl{\\f0\\fnil Unknown;}}\n" "{\\colortbl ;\\red0\\green0\\blue0;}\n" "\\uc1\\cf1\\f0\\fs18 %1\\par\n}"); diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp index e7395157..f24946c5 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.cpp +++ b/kopete/protocols/groupwise/libgroupwise/client.cpp @@ -63,7 +63,7 @@ public: UserDetailsManager * userDetailsMgr; PrivacyManager * privacyMgr; uint protocolVersion; - TQValueList<GroupWise::CustomtqStatus> customStatuses; + TQValueList<GroupWise::CustomStatus> customStatuses; TQTimer * keepAliveTimer; }; @@ -151,8 +151,8 @@ void Client::start( const TQString &host, const uint port, const TQString &userI connect( login, TQT_SIGNAL( gotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ), privacyManager(), TQT_SLOT( slotGotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ) ); - connect( login, TQT_SIGNAL( gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ), - TQT_SLOT( lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ) ); + connect( login, TQT_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ), + TQT_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) ); connect( login, TQT_SIGNAL( gotKeepalivePeriod( int ) ), TQT_SLOT( lt_gotKeepalivePeriod( int ) ) ); @@ -185,7 +185,7 @@ int Client::port() return d->port; } -TQValueList<GroupWise::CustomtqStatus> Client::customStatuses() +TQValueList<GroupWise::CustomStatus> Client::customStatuses() { return d->customStatuses; } @@ -194,7 +194,7 @@ void Client::initialiseEventTasks() { // The StatusTask handles incoming status changes StatusTask * st = new StatusTask( d->root ); // FIXME - add an additional EventRoot? - connect( st, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); + connect( st, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); // The ConferenceTask handles incoming conference events, messages, joins, leaves, etc ConferenceTask * ct = new ConferenceTask( d->root ); connect( ct, TQT_SIGNAL( message( const ConferenceEvent & ) ), TQT_SLOT( ct_messageReceived( const ConferenceEvent & ) ) ); @@ -216,7 +216,7 @@ void Client::initialiseEventTasks() connect( cont, TQT_SIGNAL( connectedElsewhere() ), TQT_SIGNAL( connectedElsewhere() ) ); } -void Client::settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply ) +void Client::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply ) { debug( TQString("Setting status to %1").tqarg( status ) );; SetStatusTask * sst = new SetStatusTask( d->root ); @@ -226,11 +226,11 @@ void Client::settqStatus( GroupWise::tqStatus status, const TQString & reason, c // TODO: set status change in progress flag } -void Client::requesttqStatus( const TQString & userDN ) +void Client::requestStatus( const TQString & userDN ) { GetStatusTask * gst = new GetStatusTask( d->root ); gst->userDN( userDN ); - connect( gst, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); + connect( gst, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); gst->go( true ); } @@ -348,7 +348,7 @@ void Client::sst_statusChanged() const SetStatusTask * sst = (SetStatusTask *)sender(); if ( sst->success() ) { - emit ourStatusChanged( sst->requestedtqStatus(), sst->awayMessage(), sst->autoReply() ); + emit ourStatusChanged( sst->requestedStatus(), sst->awayMessage(), sst->autoReply() ); } } @@ -402,7 +402,7 @@ void Client::jct_joinConfCompleted() emit conferenceJoined( jct->guid(), jct->participants(), jct->invitees() ); } -void Client::lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & custom ) +void Client::lt_gotCustomStatus( const GroupWise::CustomStatus & custom ) { d->customStatuses.append( custom ); } @@ -431,7 +431,7 @@ TQString Client::password() TQString Client::userAgent() { - return TQString::tqfromLatin1( "%1/%2 (%3)" ).tqarg( d->clientName, d->clientVersion, d->osname ); + return TQString::fromLatin1( "%1/%2 (%3)" ).tqarg( d->clientName, d->clientVersion, d->osname ); } TQCString Client::ipAddress() diff --git a/kopete/protocols/groupwise/libgroupwise/client.h b/kopete/protocols/groupwise/libgroupwise/client.h index 8bdd236d..542d32eb 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.h +++ b/kopete/protocols/groupwise/libgroupwise/client.h @@ -92,7 +92,7 @@ fd * @param password * @param reason custom status name for away statuses * @param autoReply auto reply message for use in this status */ - void settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply ); + void setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply ); /** * Send a message @@ -118,7 +118,7 @@ fd * @param password /** * Request the status of a single user, for example, if they have messaged us and are not on our contact list */ - void requesttqStatus( const TQString & userDN ); + void requestStatus( const TQString & userDN ); /** * Add a contact to the contact list @@ -211,7 +211,7 @@ fd * @param password /** * Obtain the list of custom statuses stored on the server */ - TQValueList<GroupWise::CustomtqStatus> customStatuses(); + TQValueList<GroupWise::CustomStatus> customStatuses(); /** * Get a reference to the RequestFactory for this Client. @@ -281,7 +281,7 @@ fd * @param password /** * Our status changed on the server */ - void ourStatusChanged( GroupWise::tqStatus status, const TQString & statusText, const TQString & autoReply ); + void ourStatusChanged( GroupWise::Status status, const TQString & statusText, const TQString & autoReply ); /** CONFERENCE (MANAGEMENT) EVENTS */ /** @@ -371,7 +371,7 @@ fd * @param password /** * Receive a custom status during login and record it */ - void lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & ); + void lt_gotCustomStatus( const GroupWise::CustomStatus & ); /** * Notify us of the keepalive period contained in the login response */ diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp index b6ff646d..6ea65595 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp @@ -71,7 +71,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) // now create an event object //HACK: lowercased DN - EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::tqcurrentDateTime() ); + EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::currentDateTime() ); // add any additional data depending on the type of event // Note: if there are any errors in the way the data is read below, we will soon be OutOfSync @@ -97,7 +97,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) return 0; } debug( TQString( "got status: %1").tqarg( status ) ); - tentative->settqStatus( status ); + tentative->setStatus( status ); debug( TQString( "tentative status: %1").tqarg( tentative->status() ) ); tentative->setStatusText( statusText ); break; @@ -116,7 +116,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) } tentative->setFlags( flags ); break; - case UndeliverabletqStatus: //102 - GUID + case UndeliverableStatus: //102 - GUID case ConferenceClosed: //105 case ConferenceInviteNotify://118 case ConferenceReject: //119 diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h index 97e48c22..bfcf732f 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h @@ -58,7 +58,7 @@ class EventTransfer; From gwerror.h: enum Event { InvalidRecipient = 101, NOTHANDLED - UndeliverabletqStatus = 102, + UndeliverableStatus = 102, NOTHANDLED * StatusChange = 103, TQ_UINT16 STATUS diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp index be645abb..fb9ab8b3 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp +++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp @@ -60,9 +60,9 @@ bool EventTransfer::hasMessage() return ( m_contentFlags & Message ); } -bool EventTransfer::hastqStatus() +bool EventTransfer::hasStatus() { - return ( m_contentFlags & tqStatus ); + return ( m_contentFlags & Status ); } bool EventTransfer::hasStatusText() @@ -131,10 +131,10 @@ void EventTransfer::setMessage( const TQString & message ) m_message = message; } -void EventTransfer::settqStatus( const TQ_UINT16 intqStatus ) +void EventTransfer::setStatus( const TQ_UINT16 inStatus ) { - m_contentFlags |= tqStatus; - m_status = intqStatus; + m_contentFlags |= Status; + m_status = inStatus; } void EventTransfer::setStatusText( const TQString & statusText ) diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h index 594d0d16..ad325619 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h +++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h @@ -47,7 +47,7 @@ public: Guid = 0x00000008, Flags = 0x00000010, Message = 0x00000020, - tqStatus = 0x00000040, + Status = 0x00000040, StatusText = 0x00000080 }; /** * Constructor @@ -70,7 +70,7 @@ public: bool hasGuid(); bool hasFlags(); bool hasMessage(); - bool hastqStatus(); + bool hasStatus(); bool hasStatusText(); /** @@ -92,7 +92,7 @@ public: void setGuid( const GroupWise::ConferenceGuid & guid ); void setFlags( const TQ_UINT32 flags ); void setMessage( const TQString & message ); - void settqStatus( const TQ_UINT16 status ); + void setStatus( const TQ_UINT16 status ); void setStatusText( const TQString & statusText); private: diff --git a/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h b/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h index 5349fd30..4e73955a 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h +++ b/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h @@ -44,7 +44,7 @@ struct ChatroomSearchResult class Chatroom { public: - enum UsertqStatus { Participating, NotParticipating }; + enum UserStatus { Participating, NotParticipating }; enum Rights { Read = 1, Write = 2, Modify = 4, Moderator = 8, Owner = 16 }; TQString creatorDN; TQString description; @@ -57,7 +57,7 @@ class Chatroom bool archive; uint maxUsers; uint chatRights; - UsertqStatus usertqStatus; + UserStatus userStatus; TQDateTime createdOn; uint participantsCount; // haveParticipants, Acl, Invites indicate if we have obtained these lists from the server, so we can tell 'not fetched list' and 'fetched empty list' apart. diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.h b/kopete/protocols/groupwise/libgroupwise/gwerror.h index f5de53ce..f19d3d39 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwerror.h +++ b/kopete/protocols/groupwise/libgroupwise/gwerror.h @@ -36,7 +36,7 @@ typedef TQ_UINT16 NMERR_T; namespace GroupWise { - enum tqStatus { Unknown = 0, + enum Status { Unknown = 0, Offline = 1, Available = 2, Busy = 3, @@ -58,7 +58,7 @@ namespace GroupWise }; enum Event { InvalidRecipient = 101, - UndeliverabletqStatus = 102, + UndeliverableStatus = 102, StatusChange = 103, ContactAdd = 104, ConferenceClosed = 105, @@ -164,9 +164,9 @@ namespace GroupWise int operation; }; - struct CustomtqStatus + struct CustomStatus { - GroupWise::tqStatus status; + GroupWise::Status status; TQString name; TQString autoReply; }; diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp index 9aa7d80b..7e7dbeed 100644 --- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp +++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp @@ -586,7 +586,7 @@ TQString RSAKey::toPEM(bool publicOnly) const TQCString cs; cs.resize(out.size()+1); memcpy(cs.data(), out.data(), out.size()); - return TQString::tqfromLatin1(cs); + return TQString::fromLatin1(cs); } bool RSAKey::fromPEM(const TQString &str) @@ -798,7 +798,7 @@ TQString Cert::toPEM() const TQCString cs; cs.resize(out.size()+1); memcpy(cs.data(), out.data(), out.size()); - return TQString::tqfromLatin1(cs); + return TQString::fromLatin1(cs); } bool Cert::fromPEM(const TQString &str) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp index 7744552c..a62cf022 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp @@ -62,7 +62,7 @@ bool GetChatSearchResultsTask::take( Transfer * transfer ) // look for the status code Field::FieldList responseFields = response->fields(); Field::SingleField * sf = responseFields.findSingleField( NM_A_UW_STATUS ); - m_querytqStatus = (SearchResultCode)sf->value().toInt(); + m_queryStatus = (SearchResultCode)sf->value().toInt(); Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS ); if ( !resultsArray ) @@ -82,12 +82,12 @@ bool GetChatSearchResultsTask::take( Transfer * transfer ) m_results.append( cd ); } - if ( m_querytqStatus != DataRetrieved ) - setError( m_querytqStatus ); + if ( m_queryStatus != DataRetrieved ) + setError( m_queryStatus ); else { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << " we won!" << endl; - setSuccess( m_querytqStatus ); + setSuccess( m_queryStatus ); } return true; } @@ -97,9 +97,9 @@ TQValueList< GroupWise::ChatroomSearchResult > GetChatSearchResultsTask::results return m_results; } -int GetChatSearchResultsTask::querytqStatus() +int GetChatSearchResultsTask::queryStatus() { - return m_querytqStatus; + return m_queryStatus; } GroupWise::ChatroomSearchResult GetChatSearchResultsTask::extractChatDetails( Field::FieldList & fields ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h index bebe8ff7..5671a122 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h @@ -42,11 +42,11 @@ class GetChatSearchResultsTask : public RequestTask ~GetChatSearchResultsTask(); void poll( int queryHandle); bool take( Transfer * transfer ); - int querytqStatus(); + int queryStatus(); TQValueList< GroupWise::ChatroomSearchResult > results(); private: GroupWise::ChatroomSearchResult extractChatDetails( Field::FieldList & fields ); - SearchResultCode m_querytqStatus; + SearchResultCode m_queryStatus; TQValueList< GroupWise::ChatroomSearchResult > m_results; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp index 86179b62..2b77e33e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp @@ -61,7 +61,7 @@ bool GetStatusTask::take( Transfer * transfer ) // TODO: Check that the change to sending DNs above has fixed this problem. status = sf->value().toInt(); // unfortunately getstatus doesn't give us an away message so we pass TQString() here - emit gottqStatus( m_userDN, status, TQString() ); + emit gotStatus( m_userDN, status, TQString() ); setSuccess(); } else diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h index bd291c62..aec5050f 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h @@ -37,7 +37,7 @@ public: void userDN( const TQString & dn ); bool take( Transfer * transfer ); signals: - void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); + void gotStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); private: TQString m_userDN; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp index f3d55583..e2637807 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp @@ -36,7 +36,7 @@ LoginTask::~LoginTask() void LoginTask::initialise() { - TQString command = TQString::tqfromLatin1("login:%1:%2").tqarg( client()->host() ).tqarg( client()->port() ); + TQString command = TQString::fromLatin1("login:%1:%2").tqarg( client()->host() ).tqarg( client()->port() ); Field::FieldList lst; lst.append( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, client()->userId() ) ); @@ -319,21 +319,21 @@ void LoginTask::extractCustomStatuses( Field::FieldList & fields ) Field::MultiField * mf2 = dynamic_cast<Field::MultiField *>( *custStatIt ); if ( mf2 && ( mf2->tag() == NM_A_FA_STATUS ) ) { - GroupWise::CustomtqStatus custom; + GroupWise::CustomStatus custom; Field::FieldList fl2 = mf2->fields(); for ( Field::FieldListIterator custContentIt = fl2.begin(); custContentIt != fl2.end(); ++custContentIt ) { if ( Field::SingleField * sf3 = dynamic_cast<Field::SingleField *>( *custContentIt ) ) { if ( sf3->tag() == NM_A_SZ_TYPE ) - custom.status = (GroupWise::tqStatus)sf3->value().toInt(); + custom.status = (GroupWise::Status)sf3->value().toInt(); else if ( sf3->tag() == NM_A_SZ_DISPLAY_NAME ) custom.name = sf3->value().toString(); else if ( sf3->tag() == NM_A_SZ_MESSAGE_BODY ) custom.autoReply = sf3->value().toString(); } } - emit gotCustomtqStatus( custom ); + emit gotCustomStatus( custom ); } } } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h index f37add97..fdeaeb9d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h @@ -58,7 +58,7 @@ signals: void gotContact( const ContactItem & ); void gotContactUserDetails( const GroupWise::ContactDetails & ); void gotPrivacySettings( bool locked, bool defaultDeny, const TQStringList & allowList, const TQStringList & denyList ); - void gotCustomtqStatus( const GroupWise::CustomtqStatus & ); + void gotCustomStatus( const GroupWise::CustomStatus & ); void gotKeepalivePeriod( int ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp index 38870112..d65a5a20 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp @@ -59,7 +59,7 @@ bool PollSearchResultsTask::take( Transfer * transfer ) // look for the status code Field::FieldList responseFields = response->fields(); Field::SingleField * sf = responseFields.findSingleField( NM_A_SZ_STATUS ); - m_querytqStatus = sf->value().toInt(); + m_queryStatus = sf->value().toInt(); Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS ); if ( !resultsArray ) @@ -90,10 +90,10 @@ bool PollSearchResultsTask::take( Transfer * transfer ) // followed by NM_A_FA_RESULTS, looks like a getdetails // add an accessor to get at the results list of ContactItems, probably - if ( m_querytqStatus != 2 ) - setError( m_querytqStatus ); + if ( m_queryStatus != 2 ) + setError( m_queryStatus ); else - setSuccess( m_querytqStatus ); + setSuccess( m_queryStatus ); return true; } @@ -102,9 +102,9 @@ TQValueList< GroupWise::ContactDetails > PollSearchResultsTask::results() return m_results; } -int PollSearchResultsTask::querytqStatus() +int PollSearchResultsTask::queryStatus() { - return m_querytqStatus; + return m_queryStatus; } GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::FieldList & fields ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h index ccf0560b..c69b7e0c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h @@ -42,11 +42,11 @@ public: ~PollSearchResultsTask(); void poll( const TQString & queryHandle); bool take( Transfer * transfer ); - int querytqStatus(); + int queryStatus(); TQValueList< GroupWise::ContactDetails > results(); GroupWise::ContactDetails extractUserDetails( Field::FieldList & fields ); private: - int m_querytqStatus; + int m_queryStatus; TQValueList< GroupWise::ContactDetails > m_results; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp index 946450e9..87694eb4 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp @@ -91,9 +91,9 @@ void SearchChatTask::slotPollForResults() void SearchChatTask::slotGotPollResults() { GetChatSearchResultsTask * gcsrt = (GetChatSearchResultsTask *)sender(); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->querytqStatus() << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->queryStatus() << endl; m_polls++; - switch ( gcsrt->querytqStatus() ) + switch ( gcsrt->queryStatus() ) { case GetChatSearchResultsTask::GettingData: if ( m_polls < GW_POLL_MAXIMUM ) // restart timer diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp index 3dde5297..1b64c47d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp @@ -50,7 +50,7 @@ SearchUserTask::~SearchUserTask() void SearchUserTask::search( const TQValueList<UserSearchQueryTerm> & query ) { - m_queryHandle = TQString::number( TQDateTime::tqcurrentDateTime().toTime_t () ); + m_queryHandle = TQString::number( TQDateTime::currentDateTime().toTime_t () ); Field::FieldList lst; if ( query.isEmpty() ) { @@ -102,9 +102,9 @@ void SearchUserTask::slotPollForResults() void SearchUserTask::slotGotPollResults() { PollSearchResultsTask * psrt = (PollSearchResultsTask *)sender(); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->querytqStatus() << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->queryStatus() << endl; m_polls++; - switch ( psrt->querytqStatus() ) + switch ( psrt->queryStatus() ) { case PollSearchResultsTask::Pending: case PollSearchResultsTask::InProgess: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp index 817df4a6..bf463407 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp @@ -30,20 +30,20 @@ SetStatusTask::~SetStatusTask() { } -void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply ) +void SetStatusTask::status( Status newStatus, const TQString &awayMessage, const TQString &autoReply ) { - if ( newtqStatus > GroupWise::Invalid ) + if ( newStatus > GroupWise::Invalid ) { setError( 1, "Invalid Status" ); return; } - m_status = newtqStatus; + m_status = newStatus; m_awayMessage = awayMessage; m_autoReply = autoReply; Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newtqStatus ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newStatus ) ) ); if ( !awayMessage.isNull() ) lst.append( new Field::SingleField( NM_A_SZ_STATUS_TEXT, 0, NMFIELD_TYPE_UTF8, awayMessage ) ); if ( !autoReply.isNull() ) @@ -51,7 +51,7 @@ void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, c createTransfer( "setstatus", lst ); } -tqStatus SetStatusTask::requestedtqStatus() const +Status SetStatusTask::requestedStatus() const { return m_status; } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h index 0c316220..4a7a753d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h @@ -34,12 +34,12 @@ Q_OBJECT public: SetStatusTask(Task* parent); ~SetStatusTask(); - void status( GroupWise::tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply ); - GroupWise::tqStatus requestedtqStatus() const; + void status( GroupWise::Status newStatus, const TQString &awayMessage, const TQString &autoReply ); + GroupWise::Status requestedStatus() const; TQString awayMessage() const; TQString autoReply() const; private: - GroupWise::tqStatus m_status; + GroupWise::Status m_status; TQString m_awayMessage; TQString m_autoReply; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp index 7076324a..79435010 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp @@ -38,7 +38,7 @@ bool StatusTask::take( Transfer * transfer ) { client()->debug( "Got a status change!" ); client()->debug( TQString( "%1 changed status to %2, message: %3" ).tqarg( event->source() ).tqarg( event->status() ).tqarg( event->statusText() ) ); - emit gottqStatus( event->source().lower(), event->status(), event->statusText() ); + emit gotStatus( event->source().lower(), event->status(), event->statusText() ); return true; } else diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h index de5839d7..cc14bace 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h @@ -35,7 +35,7 @@ public: ~StatusTask(); bool take( Transfer * transfer ); signals: - void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); + void gotStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp index 0eb61409..2dace60b 100644 --- a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp @@ -62,15 +62,15 @@ void buildList() // sf - contactlist (empty field array) // sf - message body - Field::SingleField* sf = new Field::SingleField( NM_A_FA_MESSAGE, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "Da steh ich nun, ich armer Tor! Und bin so klug als wie zuvor..." ) ); + Field::SingleField* sf = new Field::SingleField( NM_A_FA_MESSAGE, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "Da steh ich nun, ich armer Tor! Und bin so klug als wie zuvor..." ) ); fl.append( sf ); - sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "maeuschen" ) ); + sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "maeuschen" ) ); fl.append( sf ); // nested list Field::FieldList nl; sf = new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UDWORD, 123 ); nl.append( sf ); - sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "bla bla" ) ); + sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "bla bla" ) ); nl.append( sf ); Field::MultiField* mf = new Field::MultiField( NM_A_FA_PARTICIPANTS, NMFIELD_METHOD_VALID, 0, NMFIELD_TYPE_ARRAY ); mf->setFields( nl ); diff --git a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui index 21f774b5..ce17003c 100644 --- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui +++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui @@ -269,7 +269,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>91</height> diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui index 63ffca38..8f7a3b65 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>340</width> <height>20</height> diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index e7b6ecb2..4a7575e2 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -47,7 +47,7 @@ GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * conta init(); // set up the contents of the props widget m_propsWidget->m_userId->setText( contact->contactId() ); - m_propsWidget->m_status->setText( contact->onlinetqStatus().description() ); + m_propsWidget->m_status->setText( contact->onlineStatus().description() ); m_propsWidget->m_displayName->setText( contact->metaContact()->displayName() ); m_propsWidget->m_firstName->setText( contact->property( Kopete::Global::Properties::self()->firstName() ).value().toString() ); m_propsWidget->m_lastName->setText( contact->property( Kopete::Global::Properties::self()->lastName() ).value().toString() ); diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui index b403abec..b4d70037 100644 --- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui @@ -73,7 +73,7 @@ <cstring>textLabel14</cstring> </property> <property name="text"> - <string>tqStatus:</string> + <string>Status:</string> </property> </widget> <widget class="TQLineEdit" row="2" column="1"> diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui index e6c6a2f6..9847a23c 100644 --- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui +++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui @@ -264,7 +264,7 @@ <widget class="TQListView"> <column> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="clickable"> <bool>true</bool> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>141</height> diff --git a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui index 9ef4caad..9c486269 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui @@ -43,7 +43,7 @@ </widget> <widget class="TQComboBox" row="0" column="1"> <property name="name"> - <cstring>m_cmbtqStatus</cstring> + <cstring>m_cmbStatus</cstring> </property> </widget> <widget class="TQLabel" row="0" column="0"> @@ -51,7 +51,7 @@ <cstring>textLabel3</cstring> </property> <property name="text"> - <string>&tqStatus:</string> + <string>&Status:</string> </property> <property name="buddy" stdset="0"> <cstring>comboBox1</cstring> diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui index 821c6030..7afcd487 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/kopete/protocols/groupwise/ui/gwprivacy.ui b/kopete/protocols/groupwise/ui/gwprivacy.ui index 1f4b6bcb..0fa2cd65 100644 --- a/kopete/protocols/groupwise/ui/gwprivacy.ui +++ b/kopete/protocols/groupwise/ui/gwprivacy.ui @@ -76,7 +76,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>53</height> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>52</height> diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui index 48c061a9..4b23a370 100644 --- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui +++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui @@ -112,7 +112,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index 9dbdfc4a..ec3904eb 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -57,11 +57,11 @@ #include <tqlayout.h> #include <tqtimer.h> -const TQString IRCAccount::CONFIG_CODECMIB = TQString::tqfromLatin1("Codec"); -const TQString IRCAccount::CONFIG_NETWORKNAME = TQString::tqfromLatin1("NetworkName"); -const TQString IRCAccount::CONFIG_NICKNAME = TQString::tqfromLatin1("NickName"); -const TQString IRCAccount::CONFIG_USERNAME = TQString::tqfromLatin1("UserName"); -const TQString IRCAccount::CONFIG_REALNAME = TQString::tqfromLatin1("RealName"); +const TQString IRCAccount::CONFIG_CODECMIB = TQString::fromLatin1("Codec"); +const TQString IRCAccount::CONFIG_NETWORKNAME = TQString::fromLatin1("NetworkName"); +const TQString IRCAccount::CONFIG_NICKNAME = TQString::fromLatin1("NickName"); +const TQString IRCAccount::CONFIG_USERNAME = TQString::fromLatin1("UserName"); +const TQString IRCAccount::CONFIG_REALNAME = TQString::fromLatin1("RealName"); IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const TQString &autoChan, const TQString& netName, const TQString &nickName) : Kopete::PasswordedAccount(protocol, accountId, 0, true), autoConnect( autoChan ), commandSource(0) @@ -100,8 +100,8 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T TQObject::connect(m_engine, TQT_SIGNAL(incomingCtcpReply(const TQString &, const TQString &, const TQString &)), this, TQT_SLOT( slotNewCtcpReply(const TQString&, const TQString &, const TQString &))); - TQObject::connect(m_engine, TQT_SIGNAL(statusChanged(KIRC::Engine::tqStatus)), - this, TQT_SLOT(engineStatusChanged(KIRC::Engine::tqStatus))); + TQObject::connect(m_engine, TQT_SIGNAL(statusChanged(KIRC::Engine::Status)), + this, TQT_SLOT(engineStatusChanged(KIRC::Engine::Status))); TQObject::connect(m_engine, TQT_SIGNAL(incomingServerLoadTooHigh()), this, TQT_SLOT(slotServerBusy())); @@ -204,7 +204,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T m_contactManager = new IRCContactManager(mNickName, this); setMyself( m_contactManager->mySelf() ); - setAccountLabel( TQString::tqfromLatin1("%1@%2").tqarg(mNickName,networkName) ); + setAccountLabel( TQString::fromLatin1("%1@%2").tqarg(mNickName,networkName) ); m_myServer = m_contactManager->myServer(); m_joinChannelAction = new KAction ( i18n("Join Channel..."), TQString(), 0, this, @@ -248,18 +248,18 @@ void IRCAccount::slotNickInUseAlert( const TQString &nick ) void IRCAccount::setAltNick( const TQString &altNick ) { - configGroup()->writeEntry(TQString::tqfromLatin1( "altNick" ), altNick); + configGroup()->writeEntry(TQString::fromLatin1( "altNick" ), altNick); } const TQString IRCAccount::altNick() const { - return configGroup()->readEntry(TQString::tqfromLatin1("altNick")); + return configGroup()->readEntry(TQString::fromLatin1("altNick")); } void IRCAccount::setAutoShowServerWindow( bool show ) { autoShowServerWindow = show; - configGroup()->writeEntry(TQString::tqfromLatin1( "AutoShowServerWindow" ), autoShowServerWindow); + configGroup()->writeEntry(TQString::fromLatin1( "AutoShowServerWindow" ), autoShowServerWindow); } const TQString IRCAccount::networkName() const @@ -338,29 +338,29 @@ TQTextCodec *IRCAccount::codec() const // FIXME: Move this to a dictionnary void IRCAccount::setDefaultPart( const TQString &defaultPart ) { - configGroup()->writeEntry( TQString::tqfromLatin1( "defaultPart" ), defaultPart ); + configGroup()->writeEntry( TQString::fromLatin1( "defaultPart" ), defaultPart ); } // FIXME: Move this to a dictionnary void IRCAccount::setDefaultQuit( const TQString &defaultQuit ) { - configGroup()->writeEntry( TQString::tqfromLatin1( "defaultQuit" ), defaultQuit ); + configGroup()->writeEntry( TQString::fromLatin1( "defaultQuit" ), defaultQuit ); } // FIXME: Move this to a dictionnary const TQString IRCAccount::defaultPart() const { - TQString partMsg = configGroup()->readEntry(TQString::tqfromLatin1("defaultPart")); + TQString partMsg = configGroup()->readEntry(TQString::fromLatin1("defaultPart")); if( partMsg.isEmpty() ) - return TQString::tqfromLatin1("Kopete %1 : http://kopete.kde.org").tqarg( kapp->aboutData()->version() ); + return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").tqarg( kapp->aboutData()->version() ); return partMsg; } const TQString IRCAccount::defaultQuit() const { - TQString quitMsg = configGroup()->readEntry(TQString::tqfromLatin1("defaultQuit")); + TQString quitMsg = configGroup()->readEntry(TQString::fromLatin1("defaultQuit")); if( quitMsg.isEmpty() ) - return TQString::tqfromLatin1("Kopete %1 : http://kopete.kde.org").tqarg(kapp->aboutData()->version()); + return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").tqarg(kapp->aboutData()->version()); return quitMsg; } @@ -370,7 +370,7 @@ void IRCAccount::setCustomCtcpReplies( const TQMap< TQString, TQString > &replie for( TQMap< TQString, TQString >::ConstIterator it = replies.begin(); it != replies.end(); ++it ) { m_engine->addCustomCtcp( it.key(), it.data() ); - val.append( TQString::tqfromLatin1("%1=%2").tqarg( it.key() ).tqarg( it.data() ) ); + val.append( TQString::fromLatin1("%1=%2").tqarg( it.key() ).tqarg( it.data() ) ); } configGroup()->writeEntry( "CustomCtcp", val ); @@ -416,7 +416,7 @@ void IRCAccount::setMessageDestinations( int serverNotices, int serverMessages, KActionMenu *IRCAccount::actionMenu() { - TQString menuTitle = TQString::tqfromLatin1( " %1 <%2> " ).tqarg( accountId() ).tqarg( myself()->onlinetqStatus().description() ); + TQString menuTitle = TQString::fromLatin1( " %1 <%2> " ).tqarg( accountId() ).tqarg( myself()->onlineStatus().description() ); KActionMenu *mActionMenu = Kopete::Account::actionMenu(); @@ -505,13 +505,13 @@ void IRCAccount::connectWithPassword(const TQString &password) } } -void IRCAccount::engineStatusChanged(KIRC::Engine::tqStatus newtqStatus) +void IRCAccount::engineStatusChanged(KIRC::Engine::Status newStatus) { kdDebug(14120) << k_funcinfo << endl; - mySelf()->updatetqStatus(); + mySelf()->updateStatus(); - switch (newtqStatus) + switch (newStatus) { case KIRC::Engine::Idle: // Do nothing. @@ -563,7 +563,7 @@ void IRCAccount::slotPerformOnConnectCommands() return; if (!autoConnect.isEmpty()) - Kopete::CommandHandler::commandHandler()->processMessage( TQString::tqfromLatin1("/join %1").tqarg(autoConnect), manager); + Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/join %1").tqarg(autoConnect), manager); TQStringList commands(connectCommands()); for (TQStringList::Iterator it=commands.begin(); it != commands.end(); ++it) @@ -653,17 +653,17 @@ void IRCAccount::slotShowServerWindow() bool IRCAccount::isConnected() { -// return ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline ); +// return ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline ); return m_engine->isConnected(); } void IRCAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason ) { if ( status.status() == Kopete::OnlineStatus::Online && - myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline ) + myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline ) connect(); else if (status.status() == Kopete::OnlineStatus::Online && - myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away ) + myself()->onlineStatus().status() == Kopete::OnlineStatus::Away ) setAway( false ); else if ( status.status() == Kopete::OnlineStatus::Offline ) disconnect(); @@ -700,7 +700,7 @@ bool IRCAccount::createContact( const TQString &contactId, Kopete::MetaContact * return false; } - else if (contactId.startsWith(TQString::tqfromLatin1("#"))) + else if (contactId.startsWith(TQString::fromLatin1("#"))) { c = static_cast<IRCContact*>(contactManager()->findChannel(contactId, m)); } @@ -852,7 +852,7 @@ void IRCAccount::appendMessage( const TQString &message, MessageType type ) if( destination == KNotify ) { KNotifyClient::event( - Kopete::UI::Global::mainWidget()->winId(), TQString::tqfromLatin1("irc_event"), message + Kopete::UI::Global::mainWidget()->winId(), TQString::fromLatin1("irc_event"), message ); } } diff --git a/kopete/protocols/irc/ircaccount.h b/kopete/protocols/irc/ircaccount.h index 3e5bf304..0d8fc313 100644 --- a/kopete/protocols/irc/ircaccount.h +++ b/kopete/protocols/irc/ircaccount.h @@ -194,7 +194,7 @@ protected: virtual bool createContact( const TQString &contactId, Kopete::MetaContact *parentContact ) ; private slots: - void engineStatusChanged(KIRC::Engine::tqStatus newtqStatus); + void engineStatusChanged(KIRC::Engine::Status newStatus); void destroyed(IRCContact *contact); diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index 45121c34..8ecb59f0 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -66,7 +66,7 @@ IRCChannelContact::IRCChannelContact(IRCContactManager *contactManager, const TQ actionModeI = new KToggleAction(i18n("&Invite Only"), 0, this, TQT_SLOT(slotModeChanged()), this ); actionHomePage = 0L; - updatetqStatus(); + updateStatus(); } IRCChannelContact::~IRCChannelContact() @@ -77,10 +77,10 @@ void IRCChannelContact::slotUpdateInfo() { /** This woudl be nice, but it generates server errors too often - if( !manager(Kopete::Contact::CannotCreate) && onlinetqStatus() == m_protocol->m_ChannelStatusOnline ) - kircEngine()->writeMessage( TQString::tqfromLatin1("LIST %1").tqarg(m_nickName) ); + if( !manager(Kopete::Contact::CannotCreate) && onlineStatus() == m_protocol->m_ChannelStatusOnline ) + kircEngine()->writeMessage( TQString::fromLatin1("LIST %1").tqarg(m_nickName) ); else - setProperty( TQString::tqfromLatin1("channelMembers"), i18n("Members"), manager()->members().count() ); + setProperty( TQString::fromLatin1("channelMembers"), i18n("Members"), manager()->members().count() ); */ KIRC::Engine *engine = kircEngine(); @@ -88,7 +88,7 @@ void IRCChannelContact::slotUpdateInfo() if (manager(Kopete::Contact::CannotCreate)) { setProperty(m_protocol->propChannelMembers, manager()->members().count()); - engine->writeMessage(TQString::tqfromLatin1("WHO %1").tqarg(m_nickName)); + engine->writeMessage(TQString::fromLatin1("WHO %1").tqarg(m_nickName)); } else { @@ -102,7 +102,7 @@ void IRCChannelContact::slotUpdateInfo() void IRCChannelContact::slotChannelListed( const TQString &channel, uint members, const TQString &topic ) { if (!manager(Kopete::Contact::CannotCreate) && - onlinetqStatus() == m_protocol->m_ChannelStatusOnline && + onlineStatus() == m_protocol->m_ChannelStatusOnline && channel.lower() == m_nickName.lower()) { mTopic = topic; @@ -126,9 +126,9 @@ void IRCChannelContact::toggleOperatorActions(bool enabled) actionModeI->setEnabled(enabled); } -void IRCChannelContact::slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus) +void IRCChannelContact::slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus) { - Q_UNUSED(oldtqStatus); + Q_UNUSED(oldStatus); if (c == account()->myself()) { if (status.internalStatus() & IRCProtocol::Operator) { @@ -141,9 +141,9 @@ void IRCChannelContact::slotOnlineStatusChanged(Kopete::Contact *c, const Kopete } } -void IRCChannelContact::updatetqStatus() +void IRCChannelContact::updateStatus() { - KIRC::Engine::tqStatus status = kircEngine()->status(); + KIRC::Engine::Status status = kircEngine()->status(); switch (status) { case KIRC::Engine::Idle: @@ -251,7 +251,7 @@ void IRCChannelContact::slotAddNicknames() else if( firstChar == '+') status = m_protocol->m_UserStatusVoice; else - status = user->onlinetqStatus(); + status = user->onlineStatus(); if( user != account->mySelf() ) manager()->addContact(user , status, true); @@ -292,7 +292,7 @@ void IRCChannelContact::channelHomePage(const TQString &url) void IRCChannelContact::join() { if (!manager(Kopete::Contact::CannotCreate) && - onlinetqStatus().status() == Kopete::OnlineStatus::Online) + onlineStatus().status() == Kopete::OnlineStatus::Online) { kdDebug() << k_funcinfo << "My nickname:" << m_nickName << endl; kdDebug() << k_funcinfo << "My manager:" << manager(Kopete::Contact::CannotCreate) << endl; @@ -636,9 +636,9 @@ void IRCChannelContact::toggleMode( TQChar mode, bool enabled, bool update ) if( modeMap[mode] != enabled ) { if( enabled ) - setMode( TQString::tqfromLatin1("+") + mode ); + setMode( TQString::fromLatin1("+") + mode ); else - setMode( TQString::tqfromLatin1("-") + mode ); + setMode( TQString::fromLatin1("-") + mode ); } } @@ -717,9 +717,9 @@ void IRCChannelContact::slotHomepage() const TQString IRCChannelContact::caption() const { - TQString cap = TQString::tqfromLatin1("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost()); + TQString cap = TQString::fromLatin1("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost()); if(!mTopic.isEmpty()) - cap.append( TQString::tqfromLatin1(" - %1").tqarg(Kopete::Message::unescape(mTopic)) ); + cap.append( TQString::fromLatin1(" - %1").tqarg(Kopete::Message::unescape(mTopic)) ); return cap; } diff --git a/kopete/protocols/irc/ircchannelcontact.h b/kopete/protocols/irc/ircchannelcontact.h index 67fa46c9..7906e0d1 100644 --- a/kopete/protocols/irc/ircchannelcontact.h +++ b/kopete/protocols/irc/ircchannelcontact.h @@ -96,7 +96,7 @@ public: void newAction(const TQString &from, const TQString &action); public slots: - void updatetqStatus(); + void updateStatus(); /** * Sets the topic of this channel @@ -128,7 +128,7 @@ private slots: void slotUpdateInfo(); void slotHomepage(); void slotChannelListed(const TQString &channel, uint members, const TQString &topic); - void slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus); + void slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus); private: KAction *actionJoin; diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp index 7df5894c..c8d59aef 100644 --- a/kopete/protocols/irc/irccontact.cpp +++ b/kopete/protocols/irc/irccontact.cpp @@ -67,8 +67,8 @@ IRCContact::IRCContact(IRCContactManager *contactManager, const TQString &nick, TQObject::connect(engine, TQT_SIGNAL(incomingQuitIRC(const TQString &, const TQString &)), this, TQT_SLOT( slotUserDisconnected(const TQString&, const TQString&))); - TQObject::connect(engine, TQT_SIGNAL(statusChanged(KIRC::Engine::tqStatus)), - this, TQT_SLOT(updatetqStatus())); + TQObject::connect(engine, TQT_SIGNAL(statusChanged(KIRC::Engine::Status)), + this, TQT_SLOT(updateStatus())); engine->setCodec( m_nickName, codec() ); } @@ -94,8 +94,8 @@ KIRC::Engine *IRCContact::kircEngine() const bool IRCContact::isReachable() { - if (onlinetqStatus().status() != Kopete::OnlineStatus::Offline && - onlinetqStatus().status() != Kopete::OnlineStatus::Unknown) + if (onlineStatus().status() != Kopete::OnlineStatus::Offline && + onlineStatus().status() != Kopete::OnlineStatus::Unknown) return true; return false; @@ -111,7 +111,7 @@ const TQString IRCContact::formatedName() const return TQString(); } */ -void IRCContact::updatetqStatus() +void IRCContact::updateStatus() { } @@ -122,12 +122,12 @@ void IRCContact::privateMessage(IRCContact *, IRCContact *, const TQString &) void IRCContact::setCodec(const TQTextCodec *codec) { kircEngine()->setCodec(m_nickName, codec); - metaContact()->setPluginData(m_protocol, TQString::tqfromLatin1("Codec"), TQString::number(codec->mibEnum())); + metaContact()->setPluginData(m_protocol, TQString::fromLatin1("Codec"), TQString::number(codec->mibEnum())); } const TQTextCodec *IRCContact::codec() { - TQString codecId = metaContact()->pluginData(m_protocol, TQString::tqfromLatin1("Codec")); + TQString codecId = metaContact()->pluginData(m_protocol, TQString::fromLatin1("Codec")); TQTextCodec *codec = ircAccount()->codec(); if( !codecId.isEmpty() ) @@ -229,9 +229,9 @@ void IRCContact::slotSendMsg(Kopete::Message &message, Kopete::ChatSession *) // Two-liner in color: // <span style="color:#403897">Hello<br />World</span> - if (htmlString.find(TQString::tqfromLatin1("</span")) > -1) + if (htmlString.find(TQString::fromLatin1("</span")) > -1) { - TQRegExp findTags( TQString::tqfromLatin1("<span style=\"(.*)\">(.*)</span>") ); + TQRegExp findTags( TQString::fromLatin1("<span style=\"(.*)\">(.*)</span>") ); findTags.setMinimal( true ); int pos = 0; @@ -249,19 +249,19 @@ void IRCContact::slotSendMsg(Kopete::Message &message, Kopete::ChatSession *) TQString attribute = (*attrPair).section(':',0,0); TQString value = (*attrPair).section(':',1); - if( attribute == TQString::tqfromLatin1("color") ) + if( attribute == TQString::fromLatin1("color") ) { int ircColor = KSParser::colorForHTML( value ); if( ircColor > -1 ) replacement.prepend( TQString( TQChar(0x03) ).append( TQString::number(ircColor) ) ).append( TQChar( 0x03 ) ); } - else if( attribute == TQString::tqfromLatin1("font-weight") && - value == TQString::tqfromLatin1("600") ) { + else if( attribute == TQString::fromLatin1("font-weight") && + value == TQString::fromLatin1("600") ) { // Bolding replacement.prepend( TQChar(0x02) ).append( TQChar(0x02) ); } - else if( attribute == TQString::tqfromLatin1("text-decoration") && - value == TQString::tqfromLatin1("underline") ) { + else if( attribute == TQString::fromLatin1("text-decoration") && + value == TQString::fromLatin1("underline") ) { replacement.prepend( TQChar(31) ).append( TQChar(31) ); } } diff --git a/kopete/protocols/irc/irccontact.h b/kopete/protocols/irc/irccontact.h index 823f23ae..a415929d 100644 --- a/kopete/protocols/irc/irccontact.h +++ b/kopete/protocols/irc/irccontact.h @@ -121,7 +121,7 @@ signals: public slots: void setCodec( const TQTextCodec *codec ); - virtual void updatetqStatus(); + virtual void updateStatus(); protected slots: virtual void slotSendMsg(Kopete::Message &message, Kopete::ChatSession *); diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index b60f5a58..a4fdb655 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -72,7 +72,7 @@ IRCProtocol *IRCProtocol::s_protocol = 0L; IRCProtocolHandler::IRCProtocolHandler() : Kopete::MimeTypeHandler( false ) { - registerAsProtocolHandler( TQString::tqfromLatin1("irc") ); + registerAsProtocolHandler( TQString::fromLatin1("irc") ); } void IRCProtocolHandler::handleURL( const KURL &url ) const @@ -90,7 +90,7 @@ void IRCProtocolHandler::handleURL( const KURL &url ) const return; KUser user( getuid() ); - TQString accountId = TQString::tqfromLatin1("%1@%2:%3").tqarg( + TQString accountId = TQString::fromLatin1("%1@%2:%3").tqarg( user.loginName(), url.host(), TQString::number(port) @@ -149,141 +149,141 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList m_StatusUnknown(Kopete::OnlineStatus::Unknown, 999, this, 999, "status_unknown", i18n("Status not available")), - propChannelTopic(TQString::tqfromLatin1("channelTopic"), i18n("Topic"), TQString(), false, true ), - propChannelMembers(TQString::tqfromLatin1("channelMembers"), i18n("Members")), - propHomepage(TQString::tqfromLatin1("homePage"), i18n("Home Page")), + propChannelTopic(TQString::fromLatin1("channelTopic"), i18n("Topic"), TQString(), false, true ), + propChannelMembers(TQString::fromLatin1("channelMembers"), i18n("Members")), + propHomepage(TQString::fromLatin1("homePage"), i18n("Home Page")), propLastSeen(Kopete::Global::Properties::self()->lastSeen()), - propUserInfo(TQString::tqfromLatin1("userInfo"), i18n("IRC User")), - propServer(TQString::tqfromLatin1("ircServer"), i18n("IRC Server")), - propChannels( TQString::tqfromLatin1("ircChannels"), i18n("IRC Channels")), - propHops(TQString::tqfromLatin1("ircHops"), i18n("IRC Hops")), - propFullName(TQString::tqfromLatin1("FormattedName"), i18n("Full Name")), - propIsIdentified(TQString::tqfromLatin1("identifiedUser"), i18n("User Is Authenticated")) + propUserInfo(TQString::fromLatin1("userInfo"), i18n("IRC User")), + propServer(TQString::fromLatin1("ircServer"), i18n("IRC Server")), + propChannels( TQString::fromLatin1("ircChannels"), i18n("IRC Channels")), + propHops(TQString::fromLatin1("ircHops"), i18n("IRC Hops")), + propFullName(TQString::fromLatin1("FormattedName"), i18n("Full Name")), + propIsIdentified(TQString::fromLatin1("identifiedUser"), i18n("User Is Authenticated")) { // kdDebug(14120) << k_funcinfo << endl; s_protocol = this; - //m_status = m_unknowntqStatus = m_Unknown; + //m_status = m_unknownStatus = m_Unknown; addAddressBookField("messaging/irc", Kopete::Plugin::MakeIndexField); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("raw"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("raw"), TQT_SLOT( slotRawCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /raw <text> - Sends the text in raw form to the server."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("quote"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("quote"), TQT_SLOT( slotQuoteCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /quote <text> - Sends the text in quoted form to the server."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ctcp"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ctcp"), TQT_SLOT( slotCtcpCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ctcp <nick> <message> - Send the CTCP message to nick<action>."), 2 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ping"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ping"), TQT_SLOT( slotPingCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ping <nickname> - Alias for /CTCP <nickname> PING."), 1, 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("motd"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("motd"), TQT_SLOT( slotMotdCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /motd [<server>] - Shows the message of the day for the current or the given server.") ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("list"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("list"), TQT_SLOT( slotListCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /list - List the public channels on the server.") ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("join"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("join"), TQT_SLOT( slotJoinCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /join <#channel 1> [<password>] - Joins the specified channel."), 1, 2 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("topic"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("topic"), TQT_SLOT( slotTopicCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /topic [<topic>] - Sets and/or displays the topic for the active channel.") ); //FIXME: Update help text - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("whois"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("whois"), TQT_SLOT( slotWhoisCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /whois <nickname> - Display whois info on this user."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("whowas"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("whowas"), TQT_SLOT( slotWhoWasCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /whowas <nickname> - Display whowas info on this user."), 1, 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("who"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("who"), TQT_SLOT( slotWhoCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /who <nickname|channel> - Display who info on this user/channel."), 1, 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("query"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("query"), TQT_SLOT( slotQueryCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /query <nickname> [<message>] - Open a private chat with this user."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("mode"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("mode"), TQT_SLOT( slotModeCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /mode <channel> <modes> - Set modes on the given channel."), 2 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("nick"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("nick"), TQT_SLOT( slotNickCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /nick <nickname> - Change your nickname to the given one."), 1, 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("me"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("me"), TQT_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /me <action> - Do something."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ame"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ame"), TQT_SLOT( slotAllMeCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ame <action> - Do something in every open chat."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("kick"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("kick"), TQT_SLOT( slotKickCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /kick <nickname> [<reason>] - Kick someone from the channel (requires operator status).") , 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ban"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ban"), TQT_SLOT( slotBanCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ban <mask> - Add someone to this channel's ban list. (requires operator status)."), 1, 1 ); - Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::tqfromLatin1("bannick"), - TQString::tqfromLatin1("ban %1!*@*"), + Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("bannick"), + TQString::fromLatin1("ban %1!*@*"), i18n("USAGE: /bannick <nickname> - Add someone to this channel's ban list. Uses the hostmask nickname!*@* (requires operator status)."), Kopete::CommandHandler::SystemAlias, 1, 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("op"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("op"), TQT_SLOT( slotOpCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /op <nickname 1> [<nickname 2> <...>] - Give channel operator status to someone (requires operator status)."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("deop"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("deop"), TQT_SLOT( slotDeopCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /deop <nickname> [<nickname 2> <...>]- Remove channel operator status from someone (requires operator status)."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("voice"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("voice"), TQT_SLOT( slotVoiceCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /voice <nickname> [<nickname 2> <...>]- Give channel voice status to someone (requires operator status)."), 1); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("devoice"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("devoice"), TQT_SLOT( slotDevoiceCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /devoice <nickname> [<nickname 2> <...>]- Remove channel voice status from someone (requires operator status)."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("quit"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("quit"), TQT_SLOT( slotQuitCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /quit [<reason>] - Disconnect from IRC, optionally leaving a message.") ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("part"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("part"), TQT_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /part [<reason>] - Part from a channel, optionally leaving a message.") ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("invite"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("invite"), TQT_SLOT( slotInviteCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /invite <nickname> [<channel>] - Invite a user to join a channel."), 1 ); - Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::tqfromLatin1("j"), - TQString::tqfromLatin1("join %1"), + Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("j"), + TQString::fromLatin1("join %1"), i18n("USAGE: /j <#channel 1> [<password>] - Alias for JOIN."), Kopete::CommandHandler::SystemAlias, 1, 2 ); - Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::tqfromLatin1("msg"), - TQString::tqfromLatin1("query %s"), + Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("msg"), + TQString::fromLatin1("query %s"), i18n("USAGE: /msg <nickname> [<message>] - Alias for TQUERY <nickname> <message>."), Kopete::CommandHandler::SystemAlias, 1 ); TQObject::connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL(aboutToDisplay(Kopete::Message &)), @@ -313,7 +313,7 @@ IRCProtocol::~IRCProtocol() delete m_protocolHandler; } -const Kopete::OnlineStatus IRCProtocol::statusLookup( IRCtqStatus status ) const +const Kopete::OnlineStatus IRCProtocol::statusLookup( IRCStatus status ) const { kdDebug(14120) << k_funcinfo << "Looking up status for " << status << endl; @@ -376,7 +376,7 @@ void IRCProtocol::slotMessageFilter( Kopete::Message &msg ) TQString messageText = msg.escapedBody(); //Add right click for channels, only replace text not in HTML tags - messageText.replace( TQRegExp( TQString::tqfromLatin1("(?![^<]+>)(#[^#\\s]+)(?![^<]+>)") ), TQString::tqfromLatin1("<span class=\"KopeteLink\" type=\"IRCChannel\">\\1</span>") ); + messageText.replace( TQRegExp( TQString::fromLatin1("(?![^<]+>)(#[^#\\s]+)(?![^<]+>)") ), TQString::fromLatin1("<span class=\"KopeteLink\" type=\"IRCChannel\">\\1</span>") ); msg.setBody( messageText, Kopete::Message::RichText ); } @@ -391,7 +391,7 @@ TQPtrList<KAction> *IRCProtocol::customChatWindowPopupActions( const Kopete::Mes { activeNode = n; activeAccount = static_cast<IRCAccount*>( m.from()->account() ); - if( e.getAttribute( TQString::tqfromLatin1("type") ) == TQString::tqfromLatin1("IRCChannel") ) + if( e.getAttribute( TQString::fromLatin1("type") ) == TQString::fromLatin1("IRCChannel") ) return activeAccount->contactManager()->findChannel( e.innerText().string() )->customContextMenuActions(); } @@ -512,7 +512,7 @@ void IRCProtocol::slotTopicCommand( const TQString &args, Kopete::ChatSession *m else { static_cast<IRCAccount*>(manager->account())->engine()-> - writeRawMessage(TQString::tqfromLatin1("TOPIC %1").tqarg(chan->nickName())); + writeRawMessage(TQString::fromLatin1("TOPIC %1").tqarg(chan->nickName())); } } else @@ -568,7 +568,7 @@ void IRCProtocol::slotInviteCommand( const TQString &args, Kopete::ChatSession * if( c && c->manager()->contactOnlineStatus( manager->myself() ) == m_UserStatusOp ) { static_cast<IRCAccount*>( manager->account() )->engine()->writeMessage( - TQString::tqfromLatin1("INVITE %1 %2").tqarg( argsList[0] ). + TQString::fromLatin1("INVITE %1 %2").tqarg( argsList[0] ). arg( c->nickName() ) ); } @@ -614,7 +614,7 @@ void IRCProtocol::slotWhoCommand( const TQString &args, Kopete::ChatSession *man { TQStringList argsList = Kopete::CommandHandler::parseArguments( args ); static_cast<IRCAccount*>( manager->account() )->engine()->writeMessage( - TQString::tqfromLatin1("WHO %1").tqarg( argsList.first() ) ); + TQString::fromLatin1("WHO %1").tqarg( argsList.first() ) ); static_cast<IRCAccount*>( manager->account() )->setCurrentCommandSource( manager ); } @@ -622,7 +622,7 @@ void IRCProtocol::slotWhoWasCommand( const TQString &args, Kopete::ChatSession * { TQStringList argsList = Kopete::CommandHandler::parseArguments( args ); static_cast<IRCAccount*>( manager->account() )->engine()->writeMessage( - TQString::tqfromLatin1("WHOWAS %1").tqarg( argsList.first() ) ); + TQString::fromLatin1("WHOWAS %1").tqarg( argsList.first() ) ); static_cast<IRCAccount*>( manager->account() )->setCurrentCommandSource( manager ); } @@ -641,7 +641,7 @@ void IRCProtocol::slotModeCommand(const TQString &args, Kopete::ChatSession *man { TQStringList argsList = Kopete::CommandHandler::parseArguments( args ); static_cast<IRCAccount*>( manager->account() )->engine()->mode( argsList.front(), - args.section( TQRegExp(TQString::tqfromLatin1("\\s+")), 1 ) ); + args.section( TQRegExp(TQString::fromLatin1("\\s+")), 1 ) ); } void IRCProtocol::slotMeCommand(const TQString &args, Kopete::ChatSession *manager) @@ -668,7 +668,7 @@ void IRCProtocol::slotKickCommand(const TQString &args, Kopete::ChatSession *man { if (manager->contactOnlineStatus( manager->myself() ) == m_UserStatusOp) { - TQRegExp spaces(TQString::tqfromLatin1("\\s+")); + TQRegExp spaces(TQString::fromLatin1("\\s+")); TQString nick = args.section( spaces, 0, 0); TQString reason = args.section( spaces, 1); Kopete::ContactPtrList members = manager->members(); @@ -691,7 +691,7 @@ void IRCProtocol::slotBanCommand( const TQString &args, Kopete::ChatSession *man Kopete::ContactPtrList members = manager->members(); IRCChannelContact *chan = static_cast<IRCChannelContact*>( members.first() ); if( chan && chan->locateUser( argsList.front() ) ) - chan->setMode( TQString::tqfromLatin1("+b %1").tqarg( argsList.front() ) ); + chan->setMode( TQString::fromLatin1("+b %1").tqarg( argsList.front() ) ); } else { @@ -724,22 +724,22 @@ void IRCProtocol::slotPartCommand( const TQString &args, Kopete::ChatSession *ma void IRCProtocol::slotOpCommand( const TQString &args, Kopete::ChatSession *manager ) { - simpleModeChange( args, manager, TQString::tqfromLatin1("+o") ); + simpleModeChange( args, manager, TQString::fromLatin1("+o") ); } void IRCProtocol::slotDeopCommand( const TQString &args, Kopete::ChatSession *manager ) { - simpleModeChange( args, manager, TQString::tqfromLatin1("-o") ); + simpleModeChange( args, manager, TQString::fromLatin1("-o") ); } void IRCProtocol::slotVoiceCommand( const TQString &args, Kopete::ChatSession *manager ) { - simpleModeChange( args, manager, TQString::tqfromLatin1("+v") ); + simpleModeChange( args, manager, TQString::fromLatin1("+v") ); } void IRCProtocol::slotDevoiceCommand( const TQString &args, Kopete::ChatSession *manager ) { - simpleModeChange( args, manager, TQString::tqfromLatin1("-v") ); + simpleModeChange( args, manager, TQString::fromLatin1("-v") ); } void IRCProtocol::simpleModeChange( const TQString &args, Kopete::ChatSession *manager, const TQString &mode ) @@ -754,7 +754,7 @@ void IRCProtocol::simpleModeChange( const TQString &args, Kopete::ChatSession *m for( TQStringList::iterator it = argsList.begin(); it != argsList.end(); ++it ) { if( chan->locateUser( *it ) ) - chan->setMode( TQString::tqfromLatin1("%1 %2").tqarg( mode ).tqarg( *it ) ); + chan->setMode( TQString::fromLatin1("%1 %2").tqarg( mode ).tqarg( *it ) ); } } } @@ -770,7 +770,7 @@ void IRCProtocol::editNetworks( const TQString &networkName ) if( !netConf ) { netConf = new NetworkConfig( Kopete::UI::Global::mainWidget(), "network_config", true ); - netConf->host->setValidator( new TQRegExpValidator( TQString::tqfromLatin1("^[\\w-\\.]*$"), TQT_TQOBJECT(netConf) ) ); + netConf->host->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[\\w-\\.]*$"), TQT_TQOBJECT(netConf) ) ); netConf->upButton->setIconSet( SmallIconSet( "up" ) ); netConf->downButton->setIconSet( SmallIconSet( "down" ) ); @@ -827,7 +827,7 @@ void IRCProtocol::slotUpdateNetworkConfig() netConf->hostList->clear(); for( TQValueList<IRCHost*>::iterator it = net->hosts.begin(); it != net->hosts.end(); ++it ) - netConf->hostList->insertItem( (*it)->host + TQString::tqfromLatin1(":") + TQString::number((*it)->port) ); + netConf->hostList->insertItem( (*it)->host + TQString::fromLatin1(":") + TQString::number((*it)->port) ); // prevent nested event loop crash disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); @@ -871,7 +871,7 @@ void IRCProtocol::storeCurrentHost() void IRCProtocol::slotHostPortChanged( int value ) { - TQString entryText = m_uiCurrentHostSelection + TQString::tqfromLatin1(":") + TQString::number( value ); + TQString entryText = m_uiCurrentHostSelection + TQString::fromLatin1(":") + TQString::number( value ); // changeItem causes a take() and insert, and we don't want a selectionChanged() signal that sets all this off again. disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); netConf->hostList->changeItem( entryText, netConf->hostList->currentItem() ); @@ -919,7 +919,7 @@ void IRCProtocol::slotDeleteNetwork() Kopete::UI::Global::mainWidget(), i18n("<qt>Are you sure you want to delete the network <b>%1</b>?<br>" "Any accounts which use this network will have to be modified.</qt>") .tqarg(network), i18n("Deleting Network"), - KGuiItem(i18n("&Delete Network"),"editdelete"), TQString::tqfromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue ) + KGuiItem(i18n("&Delete Network"),"editdelete"), TQString::fromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue ) { disconnect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); @@ -945,13 +945,13 @@ void IRCProtocol::slotDeleteHost() if ( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(), i18n("<qt>Are you sure you want to delete the host <b>%1</b>?</qt>") .tqarg(hostName), i18n("Deleting Host"), - KGuiItem(i18n("&Delete Host"),"editdelete"), TQString::tqfromLatin1("AskIRCDeleteHost")) == KMessageBox::Continue ) + KGuiItem(i18n("&Delete Host"),"editdelete"), TQString::fromLatin1("AskIRCDeleteHost")) == KMessageBox::Continue ) { IRCHost *host = m_hosts[ hostName ]; if ( host ) { disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); - TQString entryText = host->host + TQString::tqfromLatin1(":") + TQString::number(host->port); + TQString entryText = host->host + TQString::fromLatin1(":") + TQString::number(host->port); TQListBoxItem * justAdded = netConf->hostList->findItem( entryText ); netConf->hostList->removeItem( netConf->hostList->index( justAdded ) ); connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); @@ -971,12 +971,12 @@ void IRCProtocol::slotNewNetwork() // create a new network struct IRCNetwork *net = new IRCNetwork; // give it the name of 'New Network' (incrementing number if needed) - TQString netName = TQString::tqfromLatin1( "New Network" ); + TQString netName = TQString::fromLatin1( "New Network" ); if ( m_networks.find( netName ) ) { int newIdx = 1; do { - netName = TQString::tqfromLatin1( "New Network #%1" ).tqarg( newIdx++ ); + netName = TQString::fromLatin1( "New Network #%1" ).tqarg( newIdx++ ); } while ( m_networks.find( netName ) && newIdx < 100 ); if ( newIdx == 100 ) // pathological case @@ -1019,7 +1019,7 @@ void IRCProtocol::slotNewHost() IRCNetwork *net = m_networks[ netConf->networkList->currentText() ]; net->hosts.append( host ); // add it to the gui - TQString entryText = host->host + TQString::tqfromLatin1(":") + TQString::number(host->port); + TQString entryText = host->host + TQString::fromLatin1(":") + TQString::number(host->port); netConf->hostList->insertItem( entryText ); // select it in the gui TQListBoxItem * justAdded = netConf->hostList->findItem( entryText ); @@ -1203,7 +1203,7 @@ void IRCProtocol::slotMoveServerUp() if( currentPos > 0 ) { netConf->hostList->removeItem( currentPos ); - TQString entryText = selectedHost->host + TQString::tqfromLatin1(":") + TQString::number( selectedHost->port ); + TQString entryText = selectedHost->host + TQString::fromLatin1(":") + TQString::number( selectedHost->port ); netConf->hostList->insertItem( entryText, --currentPos ); netConf->hostList->setSelected( currentPos, true ); } @@ -1228,7 +1228,7 @@ void IRCProtocol::slotMoveServerDown() if( currentPos < ( netConf->hostList->count() - 1 ) ) { netConf->hostList->removeItem( currentPos ); - TQString entryText = selectedHost->host + TQString::tqfromLatin1(":") + TQString::number( selectedHost->port ); + TQString entryText = selectedHost->host + TQString::fromLatin1(":") + TQString::number( selectedHost->port ); netConf->hostList->insertItem( entryText, ++currentPos ); netConf->hostList->setSelected( currentPos, true ); } diff --git a/kopete/protocols/irc/ircprotocol.h b/kopete/protocols/irc/ircprotocol.h index 725f078a..662b7f8a 100644 --- a/kopete/protocols/irc/ircprotocol.h +++ b/kopete/protocols/irc/ircprotocol.h @@ -56,7 +56,7 @@ class IRCProtocolHandler : public Kopete::MimeTypeHandler void handleURL( const KURL &url ) const; }; -static const TQString CHAT_VIEW( TQString::tqfromLatin1("kopete_chatwindow") ); +static const TQString CHAT_VIEW( TQString::fromLatin1("kopete_chatwindow") ); /** * @author Nick Betcher <nbetcher@kde.org> @@ -67,7 +67,7 @@ class IRCProtocol : public Kopete::Protocol TQ_OBJECT public: - enum IRCtqStatus + enum IRCStatus { Offline = 1, //! An offline user. Connecting = 2, //! User that is connecting. @@ -105,7 +105,7 @@ public: /** * Maps the given IRC status to Kopete::OnlineStatus. */ - const Kopete::OnlineStatus statusLookup( IRCtqStatus status ) const; + const Kopete::OnlineStatus statusLookup( IRCStatus status ) const; const Kopete::OnlineStatus m_ServerStatusOnline; const Kopete::OnlineStatus m_ServerStatusOffline; diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp index 9188963f..d0c70cfb 100644 --- a/kopete/protocols/irc/ircservercontact.cpp +++ b/kopete/protocols/irc/ircservercontact.cpp @@ -63,12 +63,12 @@ IRCServerContact::IRCServerContact(IRCContactManager *contactManager, const TQSt TQObject::connect(Kopete::ChatSessionManager::self(), TQT_SIGNAL(viewCreated(KopeteView*)), this, TQT_SLOT(slotViewCreated(KopeteView*)) ); - updatetqStatus(); + updateStatus(); } -void IRCServerContact::updatetqStatus() +void IRCServerContact::updateStatus() { - KIRC::Engine::tqStatus status = kircEngine()->status(); + KIRC::Engine::Status status = kircEngine()->status(); switch( status ) { case KIRC::Engine::Idle: @@ -184,7 +184,7 @@ void IRCServerContact::slotIncomingMotd(const TQString &message) void IRCServerContact::slotCannotSendToChannel(const TQString &channel, const TQString &message) { - ircAccount()->appendMessage(TQString::tqfromLatin1("%1: %2").tqarg(channel).tqarg(message), IRCAccount::ErrorReply); + ircAccount()->appendMessage(TQString::fromLatin1("%1: %2").tqarg(channel).tqarg(message), IRCAccount::ErrorReply); } void IRCServerContact::appendMessage(Kopete::Message &msg) diff --git a/kopete/protocols/irc/ircservercontact.h b/kopete/protocols/irc/ircservercontact.h index b715a65b..f5167a9f 100644 --- a/kopete/protocols/irc/ircservercontact.h +++ b/kopete/protocols/irc/ircservercontact.h @@ -61,7 +61,7 @@ class IRCServerContact virtual void slotSendMsg(Kopete::Message &message, Kopete::ChatSession *); private slots: - virtual void updatetqStatus(); + virtual void updateStatus(); void slotViewCreated( KopeteView* ); void slotDumpMessages(); diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index bec7c4b7..b03d465f 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -53,39 +53,39 @@ IRCUserContact::IRCUserContact(IRCContactManager *contactManager, const TQString mInfo.away = false; mInfo.online = metaContact()->isTemporary(); - updatetqStatus(); + updateStatus(); } -void IRCUserContact::updatetqStatus() +void IRCUserContact::updateStatus() { //kdDebug(14120) << k_funcinfo << endl; - Kopete::OnlineStatus newtqStatus; + Kopete::OnlineStatus newStatus; switch (kircEngine()->status()) { case KIRC::Engine::Idle: - newtqStatus = m_protocol->m_UserStatusOffline; + newStatus = m_protocol->m_UserStatusOffline; break; case KIRC::Engine::Connecting: case KIRC::Engine::Authentifying: if (this == ircAccount()->mySelf()) - newtqStatus = m_protocol->m_UserStatusConnecting; + newStatus = m_protocol->m_UserStatusConnecting; else - newtqStatus = m_protocol->m_UserStatusOffline; + newStatus = m_protocol->m_UserStatusOffline; break; case KIRC::Engine::Connected: case KIRC::Engine::Closing: if (mInfo.away) - newtqStatus = m_protocol->m_UserStatusAway; + newStatus = m_protocol->m_UserStatusAway; else if (mInfo.online) - newtqStatus = m_protocol->m_UserStatusOnline; + newStatus = m_protocol->m_UserStatusOnline; break; default: - newtqStatus = m_protocol->m_StatusUnknown; + newStatus = m_protocol->m_StatusUnknown; } // Try hard not to emit several onlineStatusChanged() signals. @@ -105,31 +105,31 @@ void IRCUserContact::updatetqStatus() for( TQValueList<IRCChannelContact*>::iterator it = channels.begin(); it != channels.end(); ++it ) { IRCChannelContact *channel = *it; - Kopete::OnlineStatus currenttqStatus = channel->manager()->contactOnlineStatus(this); + Kopete::OnlineStatus currentStatus = channel->manager()->contactOnlineStatus(this); - //kdDebug(14120) << k_funcinfo << "iterating channel " << channel->nickName() << " internal status: " << currenttqStatus.internalStatus() << endl; + //kdDebug(14120) << k_funcinfo << "iterating channel " << channel->nickName() << " internal status: " << currentStatus.internalStatus() << endl; - if( currenttqStatus.internalStatus() >= IRCProtocol::Online ) + if( currentStatus.internalStatus() >= IRCProtocol::Online ) { onlineStatusChanged = true; - if( !(currenttqStatus.internalStatus() & IRCProtocol::Away) && newtqStatus == m_protocol->m_UserStatusAway ) + if( !(currentStatus.internalStatus() & IRCProtocol::Away) && newStatus == m_protocol->m_UserStatusAway ) { - setOnlineStatus( newtqStatus ); + setOnlineStatus( newStatus ); //kdDebug(14120) << k_funcinfo << "was NOT away, but is now, channel " << channel->nickName() << endl; adjustInternalOnlineStatusBits(channel, IRCProtocol::Away, AddBits); } - else if( (currenttqStatus.internalStatus() & IRCProtocol::Away) && newtqStatus == m_protocol->m_UserStatusOnline ) + else if( (currentStatus.internalStatus() & IRCProtocol::Away) && newStatus == m_protocol->m_UserStatusOnline ) { - setOnlineStatus( newtqStatus ); + setOnlineStatus( newStatus ); //kdDebug(14120) << k_funcinfo << "was away, but not anymore, channel " << channel->nickName() << endl; adjustInternalOnlineStatusBits(channel, IRCProtocol::Away, RemoveBits); } - else if( newtqStatus.internalStatus() < IRCProtocol::Away ) + else if( newStatus.internalStatus() < IRCProtocol::Away ) { //kdDebug(14120) << k_funcinfo << "offline or connecting?" << endl; - channel->manager()->setContactOnlineStatus( this, newtqStatus ); + channel->manager()->setContactOnlineStatus( this, newStatus ); } } } @@ -137,7 +137,7 @@ void IRCUserContact::updatetqStatus() if (!onlineStatusChanged) { //kdDebug(14120) << k_funcinfo << "setting status at last" << endl; - setOnlineStatus( newtqStatus ); + setOnlineStatus( newStatus ); } } @@ -162,10 +162,10 @@ void IRCUserContact::slotUserOffline() mInfo.online = false; mInfo.away = false; - updatetqStatus(); + updateStatus(); if( !metaContact()->isTemporary() ) - kircEngine()->writeMessage( TQString::tqfromLatin1("WHOWAS %1").tqarg(m_nickName) ); + kircEngine()->writeMessage( TQString::fromLatin1("WHOWAS %1").tqarg(m_nickName) ); removeProperty( m_protocol->propUserInfo ); removeProperty( m_protocol->propServer ); @@ -177,7 +177,7 @@ void IRCUserContact::setAway(bool isAway) //kdDebug(14120) << k_funcinfo << isAway << endl; mInfo.away = isAway; - updatetqStatus(); + updateStatus(); } void IRCUserContact::incomingUserIsAway(const TQString &reason) @@ -194,7 +194,7 @@ void IRCUserContact::incomingUserIsAway(const TQString &reason) void IRCUserContact::userOnline() { mInfo.online = true; - updatetqStatus(); + updateStatus(); if (this != ircAccount()->mySelf() && !metaContact()->isTemporary() && ircAccount()->isConnected()) { mOnlineTimer->start( 45000, true ); @@ -221,22 +221,22 @@ const TQString IRCUserContact::caption() const void IRCUserContact::slotOp() { - contactMode( TQString::tqfromLatin1("+o") ); + contactMode( TQString::fromLatin1("+o") ); } void IRCUserContact::slotDeop() { - contactMode( TQString::tqfromLatin1("-o") ); + contactMode( TQString::fromLatin1("-o") ); } void IRCUserContact::slotVoice() { - contactMode( TQString::tqfromLatin1("+v") ); + contactMode( TQString::fromLatin1("+v") ); } void IRCUserContact::slotDevoice() { - contactMode( TQString::tqfromLatin1("-v") ); + contactMode( TQString::fromLatin1("-v") ); } void IRCUserContact::slotBanHost() @@ -260,7 +260,7 @@ void IRCUserContact::slotBanHostOnce() Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast<IRCContact*>(members.first())->nickName(); - kircEngine()->mode(channelName, TQString::tqfromLatin1("+b *!*@%1").tqarg(mInfo.hostName)); + kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@%1").tqarg(mInfo.hostName)); } void IRCUserContact::slotBanUserHost() @@ -284,7 +284,7 @@ void IRCUserContact::slotBanUserHostOnce() Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast<IRCContact*>(members.first())->nickName(); - kircEngine()->mode(channelName, TQString::tqfromLatin1("+b *!*%1@%2").tqarg(mInfo.userName, mInfo.hostName)); + kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@%2").tqarg(mInfo.userName, mInfo.hostName)); } void IRCUserContact::slotBanDomain() @@ -310,7 +310,7 @@ void IRCUserContact::slotBanDomainOnce() TQString domain = mInfo.hostName.section('.', 1); - kircEngine()->mode(channelName, TQString::tqfromLatin1("+b *!*@*.%1").tqarg(domain)); + kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@*.%1").tqarg(domain)); } void IRCUserContact::slotBanUserDomain() @@ -336,7 +336,7 @@ void IRCUserContact::slotBanUserDomainOnce() TQString domain = mInfo.hostName.section('.', 1); - kircEngine()->mode(channelName, TQString::tqfromLatin1("+b *!*%1@*.%2").tqarg(mInfo.userName, domain)); + kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@*.%2").tqarg(mInfo.userName, domain)); } void IRCUserContact::slotKick() @@ -350,7 +350,7 @@ void IRCUserContact::contactMode(const TQString &mode) { Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast<IRCContact*>(members.first())->nickName(); - kircEngine()->mode(channelName, TQString::tqfromLatin1("%1 %2").tqarg(mode).tqarg(m_nickName)); + kircEngine()->mode(channelName, TQString::fromLatin1("%1 %2").tqarg(mode).tqarg(m_nickName)); } void IRCUserContact::slotCtcpPing() @@ -370,9 +370,9 @@ void IRCUserContact::newWhoIsUser(const TQString &username, const TQString &host mInfo.hostName = hostname; mInfo.realName = realname; - if( onlinetqStatus().status() == Kopete::OnlineStatus::Offline ) + if( onlineStatus().status() == Kopete::OnlineStatus::Offline ) { - setProperty( m_protocol->propUserInfo, TQString::tqfromLatin1("%1@%2") + setProperty( m_protocol->propUserInfo, TQString::fromLatin1("%1@%2") .tqarg(mInfo.userName).tqarg(mInfo.hostName) ); setProperty( m_protocol->propServer, mInfo.serverName ); setProperty( m_protocol->propFullName, mInfo.realName ); @@ -382,8 +382,8 @@ void IRCUserContact::newWhoIsUser(const TQString &username, const TQString &host void IRCUserContact::newWhoIsServer(const TQString &servername, const TQString &serverinfo) { mInfo.serverName = servername; - if( metaContact()->isTemporary() || onlinetqStatus().status() == Kopete::OnlineStatus::Online - || onlinetqStatus().status() == Kopete::OnlineStatus::Away ) + if( metaContact()->isTemporary() || onlineStatus().status() == Kopete::OnlineStatus::Online + || onlineStatus().status() == Kopete::OnlineStatus::Away ) mInfo.serverInfo = serverinfo; else { @@ -489,7 +489,7 @@ TQString IRCUserContact::formattedName() const void IRCUserContact::updateInfo() { - setProperty( m_protocol->propUserInfo, TQString::tqfromLatin1("%1@%2") + setProperty( m_protocol->propUserInfo, TQString::fromLatin1("%1@%2") .tqarg(mInfo.userName).tqarg(mInfo.hostName) ); setProperty( m_protocol->propServer, mInfo.serverName ); setProperty( m_protocol->propChannels, mInfo.channels.join(" ") ); @@ -667,32 +667,32 @@ void IRCUserContact::slotIncomingModeChange( const TQString &channel, const TQSt void IRCUserContact::adjustInternalOnlineStatusBits(IRCChannelContact *channel, unsigned statusAdjustment, bitAdjustment adj) { - Kopete::OnlineStatus currenttqStatus = channel->manager()->contactOnlineStatus(this); - Kopete::OnlineStatus newtqStatus; + Kopete::OnlineStatus currentStatus = channel->manager()->contactOnlineStatus(this); + Kopete::OnlineStatus newStatus; if (adj == RemoveBits) { // If the bit is not set in the current internal status, stop here. - if ((currenttqStatus.internalStatus() & ~statusAdjustment) == currenttqStatus.internalStatus()) + if ((currentStatus.internalStatus() & ~statusAdjustment) == currentStatus.internalStatus()) return; - newtqStatus = m_protocol->statusLookup( - (IRCProtocol::IRCtqStatus)(currenttqStatus.internalStatus() & ~statusAdjustment) + newStatus = m_protocol->statusLookup( + (IRCProtocol::IRCStatus)(currentStatus.internalStatus() & ~statusAdjustment) ); } else if (adj == AddBits) { // If the bit is already set in the current internal status, stop here. - if ((currenttqStatus.internalStatus() | statusAdjustment) == currenttqStatus.internalStatus()) + if ((currentStatus.internalStatus() | statusAdjustment) == currentStatus.internalStatus()) return; - newtqStatus = m_protocol->statusLookup( - (IRCProtocol::IRCtqStatus)(currenttqStatus.internalStatus() | statusAdjustment) + newStatus = m_protocol->statusLookup( + (IRCProtocol::IRCStatus)(currentStatus.internalStatus() | statusAdjustment) ); } - channel->manager()->setContactOnlineStatus(this, newtqStatus); + channel->manager()->setContactOnlineStatus(this, newStatus); } void IRCUserContact::privateMessage(IRCContact *from, IRCContact *to, const TQString &message) diff --git a/kopete/protocols/irc/ircusercontact.h b/kopete/protocols/irc/ircusercontact.h index 269cd40c..dbf4b51c 100644 --- a/kopete/protocols/irc/ircusercontact.h +++ b/kopete/protocols/irc/ircusercontact.h @@ -94,7 +94,7 @@ public: public slots: /** \brief Updates online status for channels based on current internal status. */ - virtual void updatetqStatus(); + virtual void updateStatus(); virtual void sendFile(const KURL &sourceURL, const TQString&, unsigned int); diff --git a/kopete/protocols/irc/ksparser.cpp b/kopete/protocols/irc/ksparser.cpp index 79ff605e..25421d4d 100644 --- a/kopete/protocols/irc/ksparser.cpp +++ b/kopete/protocols/irc/ksparser.cpp @@ -117,17 +117,17 @@ TQCString KSParser::_parse(const TQCString &message) } else { - toAppend = popTag(TQString::tqfromLatin1("span")); + toAppend = popTag(TQString::fromLatin1("span")); } break; case 0x07: //System bell: ^G - KNotifyClient::beep( TQString::tqfromLatin1("IRC beep event received in a message") ); + KNotifyClient::beep( TQString::fromLatin1("IRC beep event received in a message") ); break; case '\t': // 0x09 - toAppend = TQString::tqfromLatin1(" "); + toAppend = TQString::fromLatin1(" "); break; case '\n': // 0x0D - toAppend= TQString::tqfromLatin1("<br/>"); + toAppend= TQString::fromLatin1("<br/>"); break; case 0x0D: // Italics: ^N toAppend = toggleTag("i"); @@ -145,14 +145,14 @@ TQCString KSParser::_parse(const TQCString &message) toAppend = toggleTag("u"); break; case '<': - toAppend = TQString::tqfromLatin1("<"); + toAppend = TQString::fromLatin1("<"); break; case '>': - toAppend = TQString::tqfromLatin1(">"); + toAppend = TQString::fromLatin1(">"); break; default: if (cur < TQChar(' ')) // search for control characters - toAppend = TQString::tqfromLatin1("<%1>").tqarg(cur, 2, 16).upper(); + toAppend = TQString::fromLatin1("<%1>").tqarg(cur, 2, 16).upper(); else toAppend = TQStyleSheet::escape(cur); } @@ -193,14 +193,14 @@ TQString KSParser::pushColorTag(const TQColor &fgColor, const TQColor &bgColor) TQString tagStyle; if (fgColor.isValid()) - tagStyle += TQString::tqfromLatin1("color:%1;").tqarg(fgColor.name()); + tagStyle += TQString::fromLatin1("color:%1;").tqarg(fgColor.name()); if (bgColor.isValid()) - tagStyle += TQString::tqfromLatin1("background-color:%1;").tqarg(bgColor.name()); + tagStyle += TQString::fromLatin1("background-color:%1;").tqarg(bgColor.name()); if(!tagStyle.isEmpty()) - tagStyle = TQString::tqfromLatin1("style=\"%1\"").tqarg(tagStyle); + tagStyle = TQString::fromLatin1("style=\"%1\"").tqarg(tagStyle); - return pushTag(TQString::tqfromLatin1("span"), tagStyle);; + return pushTag(TQString::fromLatin1("span"), tagStyle);; } TQString KSParser::popTag(const TQString &tag) diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index ac1fd698..0e1b3bc1 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -51,10 +51,10 @@ using namespace KIRC; /* Please note that the regular expression "[\\r\\n]*$" is used in a TQString::replace statement many times. * This gets rid of trailing \r\n, \r, \n, and \n\r characters. */ -const TQRegExp Engine::m_RemoveLinefeeds( TQString::tqfromLatin1("[\\r\\n]*$") ); +const TQRegExp Engine::m_RemoveLinefeeds( TQString::fromLatin1("[\\r\\n]*$") ); Engine::Engine(TQObject *parent, const char *name) - : TQObject(parent, TQString::tqfromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()), + : TQObject(parent, TQString::fromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()), m_status(Idle), m_FailedNickOnLogin(false), m_useSSL(false), @@ -74,9 +74,9 @@ Engine::Engine(TQObject *parent, const char *name) bindNumericReplies(); bindCtcp(); - m_VersionString = TQString::tqfromLatin1("Anonymous client using the KIRC engine."); - m_UserString = TQString::tqfromLatin1("Response not supplied by user."); - m_SourceString = TQString::tqfromLatin1("Unknown client, known source."); + m_VersionString = TQString::fromLatin1("Anonymous client using the KIRC engine."); + m_UserString = TQString::fromLatin1("Response not supplied by user."); + m_SourceString = TQString::fromLatin1("Unknown client, known source."); defaultCodec = TQTextCodec::codecForMib(106); // UTF8 mib is 106 kdDebug(14120) << "Setting default engine codec, " << defaultCodec->name() << endl; @@ -133,14 +133,14 @@ void Engine::setUseSSL( bool useSSL ) } } -void Engine::settqStatus(Engine::tqStatus status) +void Engine::setStatus(Engine::Status status) { kdDebug(14120) << k_funcinfo << status << endl; if (m_status == status) return; -// Engine::tqStatus oldtqStatus = m_status; +// Engine::Status oldStatus = m_status; m_status = status; emit statusChanged(status); @@ -169,16 +169,16 @@ void Engine::settqStatus(Engine::tqStatus status) case Closing: m_sock->close(); m_sock->reset(); - settqStatus(Idle); + setStatus(Idle); break; case AuthentifyingFailed: - settqStatus(Closing); + setStatus(Closing); break; case Timeout: - settqStatus(Closing); + setStatus(Closing); break; case Disconnected: - settqStatus(Closing); + setStatus(Closing); break; } } @@ -200,23 +200,23 @@ void Engine::connectToServer(const TQString &host, TQ_UINT16 port, const TQStrin if( m_sock->startAsyncConnect() == 0 ) { kdDebug(14120) << k_funcinfo << "Success!. Status: " << m_sock->socketStatus() << endl; - settqStatus(Connecting); + setStatus(Connecting); } else { kdDebug(14120) << k_funcinfo << "Failed. Status: " << m_sock->socketStatus() << endl; - settqStatus(Disconnected); + setStatus(Disconnected); } } void Engine::slotConnected() { - settqStatus(Authentifying); + setStatus(Authentifying); } void Engine::slotConnectionClosed() { - settqStatus(Disconnected); + setStatus(Disconnected); } void Engine::error(int errCode) @@ -225,7 +225,7 @@ void Engine::error(int errCode) if (m_sock->socketStatus () != KExtendedSocket::connecting) { // Connection in progress.. This is a signal fired wrong - settqStatus(Disconnected); + setStatus(Disconnected); } } @@ -250,7 +250,7 @@ void Engine::setSourceString(const TQString &newString) void Engine::setUserName(const TQString &newName) { if(newName.isEmpty()) - m_Username = TQString::tqfromLatin1(getpwuid(getuid())->pw_name); + m_Username = TQString::fromLatin1(getpwuid(getuid())->pw_name); else m_Username = newName; m_Username.remove(m_RemoveLinefeeds); @@ -259,7 +259,7 @@ void Engine::setUserName(const TQString &newName) void Engine::setRealName(const TQString &newName) { if(newName.isEmpty()) - m_realName = TQString::tqfromLatin1(getpwuid(getuid())->pw_gecos); + m_realName = TQString::fromLatin1(getpwuid(getuid())->pw_gecos); else m_realName = newName; m_realName.remove(m_RemoveLinefeeds); @@ -443,7 +443,7 @@ bool Engine::invokeCtcpCommandOfMessage(const TQDict<MessageRedirector> &map, Me kdDebug(14120) << "Method error for line:" << ctcpMsg.raw() << endl; writeCtcpErrorMessage(msg.prefix(), msg.ctcpRaw(), - TQString::tqfromLatin1("%1 internal error(s)").tqarg(errors.size())); + TQString::fromLatin1("%1 internal error(s)").tqarg(errors.size())); } else { diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h index d6b8c32b..728c2a9e 100644 --- a/kopete/protocols/irc/libkirc/kircengine.h +++ b/kopete/protocols/irc/libkirc/kircengine.h @@ -72,7 +72,7 @@ class Engine // TQ_PROPERTY(TQString nick READ nick) // TQ_PROPERTY(TQStringList portList) - Q_ENUMS(tqStatus) + Q_ENUMS(Status) public: enum Error @@ -84,7 +84,7 @@ public: MethodFailed }; - enum tqStatus + enum Status { Idle, Connecting, @@ -165,7 +165,7 @@ public: KExtendedSocket *socket() { return m_sock; }; - inline KIRC::Engine::tqStatus status() const + inline KIRC::Engine::Status status() const { return m_status; } inline bool isDisconnected() const @@ -275,7 +275,7 @@ public slots: void showInfoDialog(); signals: - void statusChanged(KIRC::Engine::tqStatus newtqStatus); + void statusChanged(KIRC::Engine::Status newStatus); void internalError(KIRC::Engine::Error, KIRC::Message &); void receivedMessage(KIRC::Message &); @@ -479,7 +479,7 @@ private: void bindNumericReplies(); void bindCtcp(); - void settqStatus(KIRC::Engine::tqStatus status); + void setStatus(KIRC::Engine::Status status); bool invokeCtcpCommandOfMessage(const TQDict<KIRC::MessageRedirector> &map, KIRC::Message &message); /* @@ -493,7 +493,7 @@ private: //Static regexes static const TQRegExp m_RemoveLinefeeds; - KIRC::Engine::tqStatus m_status; + KIRC::Engine::Status m_status; TQString m_Host; TQ_UINT16 m_Port; diff --git a/kopete/protocols/irc/libkirc/kircengine_commands.cpp b/kopete/protocols/irc/libkirc/kircengine_commands.cpp index e0e63909..acea30e7 100644 --- a/kopete/protocols/irc/libkirc/kircengine_commands.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_commands.cpp @@ -48,7 +48,7 @@ void Engine::away(bool isAway, const TQString &awayMessage) if( !awayMessage.isEmpty() ) writeMessage("AWAY", TQString(), awayMessage); else - writeMessage("AWAY", TQString(), TQString::tqfromLatin1("I'm away.")); + writeMessage("AWAY", TQString(), TQString::fromLatin1("I'm away.")); else writeMessage("AWAY", TQString()); } @@ -56,20 +56,20 @@ void Engine::away(bool isAway, const TQString &awayMessage) // FIXME: Really handle this message void Engine::error(Message &) { - settqStatus(Closing); + setStatus(Closing); } void Engine::ison(const TQStringList &nickList) { if (!nickList.isEmpty()) { - TQString statement = TQString::tqfromLatin1("ISON"); + TQString statement = TQString::fromLatin1("ISON"); for (TQStringList::ConstIterator it = nickList.begin(); it != nickList.end(); ++it) { if ((statement.length()+(*it).length())>509) // 512(max buf)-2("\r\n")-1(<space separator>) { writeMessage(statement); - statement = TQString::tqfromLatin1("ISON ") + (*it); + statement = TQString::fromLatin1("ISON ") + (*it); } else statement.append(TQChar(' ') + (*it)); @@ -201,7 +201,7 @@ void Engine::quit(const TQString &reason, bool /*now*/) if (isConnected()) writeMessage("QUIT", TQString(), reason); - settqStatus(Closing); + setStatus(Closing); } void Engine::quit(Message &msg) diff --git a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp index 05477710..0159f790 100644 --- a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp @@ -109,10 +109,10 @@ bool Engine::CtcpReply_action(Message &msg) // FIXME: the API can now answer to help commands. void Engine::CtcpQuery_clientinfo(Message &msg) { - TQString clientinfo = customCtcpMap[ TQString::tqfromLatin1("clientinfo") ]; + TQString clientinfo = customCtcpMap[ TQString::fromLatin1("clientinfo") ]; if (clientinfo.isNull()) - clientinfo = TQString::tqfromLatin1("The following commands are supported, but " + clientinfo = TQString::fromLatin1("The following commands are supported, but " "without sub-command help: VERSION, CLIENTINFO, USERINFO, TIME, SOURCE, PING," "ACTION."); @@ -132,8 +132,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName, case Transfer::Chat: { writeCtcpQueryMessage(nickname, TQString(), - TQString::tqfromLatin1("DCC"), - TQStringList(TQString::tqfromLatin1("CHAT")) << TQString::tqfromLatin1("chat") << + TQString::fromLatin1("DCC"), + TQStringList(TQString::fromLatin1("CHAT")) << TQString::fromLatin1("chat") << m_sock->localAddress()->nodeName() << TQString::number(port) ); break; @@ -154,8 +154,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName, kdDebug(14120) << "Starting DCC file outgoing transfer." << endl; writeCtcpQueryMessage(nickname, TQString(), - TQString::tqfromLatin1("DCC"), - TQStringList(TQString::tqfromLatin1("SEND")) << noWhiteSpace << ipNumber << + TQString::fromLatin1("DCC"), + TQStringList(TQString::fromLatin1("SEND")) << noWhiteSpace << ipNumber << TQString::number(server->port()) << TQString::number(file.size()) ); break; @@ -173,7 +173,7 @@ void Engine::CtcpQuery_dcc(Message &msg) Message &ctcpMsg = msg.ctcpMessage(); TQString dccCommand = ctcpMsg.arg(0).upper(); - if (dccCommand == TQString::tqfromLatin1("CHAT")) + if (dccCommand == TQString::fromLatin1("CHAT")) { // if(ctcpMsg.argsSize()!=4) return false; @@ -196,7 +196,7 @@ void Engine::CtcpQuery_dcc(Message &msg) Transfer::Chat ); } } - else if (dccCommand == TQString::tqfromLatin1("SEND")) + else if (dccCommand == TQString::fromLatin1("SEND")) { // if(ctcpMsg.argsSize()!=5) return false; @@ -253,7 +253,7 @@ void Engine::CtcpRequest_ping(const TQString &target) TQString timeReply; if( Entity::isChannel(target) ) - timeReply = TQString::tqfromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec); + timeReply = TQString::fromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec); else timeReply = TQString::number( time.tv_sec ); @@ -275,7 +275,7 @@ void Engine::CtcpReply_ping(Message &msg) if (gettimeofday(&time, 0) == 0) { // FIXME: the time code is wrong for usec - TQString timeReply = TQString::tqfromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec); + TQString timeReply = TQString::fromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec); double newTime = timeReply.toDouble(); double oldTime = msg.suffix().section(' ',0, 0).toDouble(); double difference = newTime - oldTime; @@ -295,10 +295,10 @@ void Engine::CtcpReply_ping(Message &msg) TQString millSec = diffString.section('.', 1, 1); millSec.remove(millSec.find('.'), 1); millSec.truncate(3); - diffString = TQString::tqfromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec); + diffString = TQString::fromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec); } - emit incomingCtcpReply(TQString::tqfromLatin1("PING"), msg.nickFromPrefix(), diffString); + emit incomingCtcpReply(TQString::fromLatin1("PING"), msg.nickFromPrefix(), diffString); } // else // ((MessageRedirector *)sender())->error("failed to get current time"); @@ -313,13 +313,13 @@ void Engine::CtcpQuery_source(Message &msg) void Engine::CtcpQuery_time(Message &msg) { writeCtcpReplyMessage(msg.nickFromPrefix(), TQString(), - msg.ctcpMessage().command(), TQDateTime::tqcurrentDateTime().toString(), + msg.ctcpMessage().command(), TQDateTime::currentDateTime().toString(), TQString(), false); } void Engine::CtcpQuery_userinfo(Message &msg) { - TQString userinfo = customCtcpMap[ TQString::tqfromLatin1("userinfo") ]; + TQString userinfo = customCtcpMap[ TQString::fromLatin1("userinfo") ]; if (userinfo.isNull()) userinfo = m_UserString; @@ -335,7 +335,7 @@ void Engine::CtcpRequest_version(const TQString &target) void Engine::CtcpQuery_version(Message &msg) { - TQString response = customCtcpMap[ TQString::tqfromLatin1("version") ]; + TQString response = customCtcpMap[ TQString::fromLatin1("version") ]; kdDebug(14120) << "Version check: " << response << endl; if (response.isNull()) diff --git a/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp b/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp index 3d7b896b..67d3a842 100644 --- a/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp @@ -117,7 +117,7 @@ void Engine::numericReply_001(Message &msg) */ emitSuffix(msg); - settqStatus(Connected); + setStatus(Connected); } /* 002: ":Your host is <servername>, running version <ver>" diff --git a/kopete/protocols/irc/libkirc/kircentity.cpp b/kopete/protocols/irc/libkirc/kircentity.cpp index 2086ab9d..74781e48 100644 --- a/kopete/protocols/irc/libkirc/kircentity.cpp +++ b/kopete/protocols/irc/libkirc/kircentity.cpp @@ -29,16 +29,16 @@ using namespace KNetwork; * where user and host are optionnal. * NOTE: If changes are done to the regexp string, update also the sm_userStrictRegExp regexp string. */ -const TQRegExp Entity::sm_userRegExp(TQString::tqfromLatin1("^([^\\s,:!@]+)(?:(?:!([^\\s,:!@]+))?(?:@([^\\s,!@]+)))?$")); +const TQRegExp Entity::sm_userRegExp(TQString::fromLatin1("^([^\\s,:!@]+)(?:(?:!([^\\s,:!@]+))?(?:@([^\\s,!@]+)))?$")); /** * Regexp to match strictly the complete user definition: * nick!user@host * NOTE: If changes are done to the regexp string, update also the sm_userRegExp regexp string. */ -const TQRegExp Entity::sm_userStrictRegExp(TQString::tqfromLatin1("^([^\\s,:!@]+)!([^\\s,:!@]+)@([^\\s,:!@]+)$")); +const TQRegExp Entity::sm_userStrictRegExp(TQString::fromLatin1("^([^\\s,:!@]+)!([^\\s,:!@]+)@([^\\s,:!@]+)$")); -const TQRegExp Entity::sm_channelRegExp( TQString::tqfromLatin1("^[#!+&][^\\s,]+$") ); +const TQRegExp Entity::sm_channelRegExp( TQString::fromLatin1("^[#!+&][^\\s,]+$") ); Entity::Entity(const TQString &, const Type type) : TQObject(0, "KIRC::Entity"), diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp index 6f45b0c1..c9d71cd2 100644 --- a/kopete/protocols/irc/libkirc/kircmessage.cpp +++ b/kopete/protocols/irc/libkirc/kircmessage.cpp @@ -99,14 +99,14 @@ void Message::writeRawMessage(Engine *engine, const TQTextCodec *codec, const TQ return; } - TQString txt = str + TQString::tqfromLatin1("\r\n"); + TQString txt = str + TQString::fromLatin1("\r\n"); TQCString s(codec->fromUnicode(txt)); kdDebug(14120) << "Message is " << s.length() << " chars" << endl; // FIXME: Should check the amount of data really writen. int wrote = engine->socket()->writeBlock(s.data(), s.length()); - kdDebug(14121) << TQString::tqfromLatin1("(%1 bytes) >> %2").tqarg(wrote).tqarg(str) << endl; + kdDebug(14121) << TQString::fromLatin1("(%1 bytes) >> %2").tqarg(wrote).tqarg(str) << endl; } void Message::writeMessage(Engine *engine, const TQTextCodec *codec, const TQString &message) @@ -123,7 +123,7 @@ void Message::writeMessage(Engine *engine, const TQTextCodec *codec, msg += TQChar(' ') + args.join(TQChar(' ')).stripWhiteSpace(); // some extra check should be done here if (!suffix.isNull()) - msg = msg.stripWhiteSpace() + TQString::tqfromLatin1(" :") + suffix; + msg = msg.stripWhiteSpace() + TQString::fromLatin1(" :") + suffix; writeMessage(engine, codec, msg); } @@ -145,7 +145,7 @@ void Message::writeCtcpMessage(Engine *engine, const TQTextCodec *codec, ctcpMsg += TQChar(' ') + ctcpArgs.join(TQChar(' ')).stripWhiteSpace(); // some extra check should be done here if (!ctcpSuffix.isNull()) - ctcpMsg += TQString::tqfromLatin1(" :") + ctcpSuffix; + ctcpMsg += TQString::fromLatin1(" :") + ctcpSuffix; writeMessage(engine, codec, command, to, suffix + TQChar(0x01) + ctcpQuote(ctcpMsg) + TQChar(0x01)); } @@ -202,9 +202,9 @@ TQString Message::quote(const TQString &str) TQString tmp = str; TQChar q('\020'); tmp.replace(q, q+TQString(q)); - tmp.replace(TQChar('\r'), q+TQString::tqfromLatin1("r")); - tmp.replace(TQChar('\n'), q+TQString::tqfromLatin1("n")); - tmp.replace(TQChar('\0'), q+TQString::tqfromLatin1("0")); + tmp.replace(TQChar('\r'), q+TQString::fromLatin1("r")); + tmp.replace(TQChar('\n'), q+TQString::fromLatin1("n")); + tmp.replace(TQChar('\0'), q+TQString::fromLatin1("0")); return tmp; } @@ -230,8 +230,8 @@ TQString Message::unquote(const TQString &str) TQString Message::ctcpQuote(const TQString &str) { TQString tmp = str; - tmp.replace( TQChar('\\'), TQString::tqfromLatin1("\\\\")); - tmp.replace( (char)1, TQString::tqfromLatin1("\\1")); + tmp.replace( TQChar('\\'), TQString::fromLatin1("\\\\")); + tmp.replace( (char)1, TQString::fromLatin1("\\1")); return tmp; } @@ -317,7 +317,7 @@ TQString Message::toString() const for (TQStringList::ConstIterator it = m_args.begin(); it != m_args.end(); ++it) msg += TQChar(' ') + *it; if (!m_suffix.isNull()) - msg += TQString::tqfromLatin1(" :") + m_suffix; + msg += TQString::fromLatin1(" :") + m_suffix; return msg; } diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp index ae9854f1..7ff74ecc 100644 --- a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp +++ b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp @@ -82,7 +82,7 @@ bool MessageRedirector::checkValidity(const Message &msg) ( msg.argsSize() > 0 && ( msg.tqarg(0) == m_Nickname || msg.tqarg(0) == m_PendingNick || - msg.tqarg(0) == TQString::tqfromLatin1("*") + msg.tqarg(0) == TQString::fromLatin1("*") ) ) ) diff --git a/kopete/protocols/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp index 3c6d1907..68e28f0c 100644 --- a/kopete/protocols/irc/libkirc/kirctransfer.cpp +++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp @@ -94,11 +94,11 @@ Transfer::~Transfer() // m_file is automatically closed on destroy. } -Transfer::tqStatus Transfer::status() const +Transfer::Status Transfer::status() const { if(m_socket) { -// return (Transfer::tqStatus)m_socket->socketStatus(); +// return (Transfer::Status)m_socket->socketStatus(); return Connected; } return Error_NoSocket; diff --git a/kopete/protocols/irc/libkirc/kirctransfer.h b/kopete/protocols/irc/libkirc/kirctransfer.h index 950c0e96..53e71735 100644 --- a/kopete/protocols/irc/libkirc/kirctransfer.h +++ b/kopete/protocols/irc/libkirc/kirctransfer.h @@ -47,7 +47,7 @@ public: FileIncoming }; - enum tqStatus { + enum Status { Error_NoSocket = -2, Error = -1, Idle = 0, @@ -101,7 +101,7 @@ public: { return m_nick; } Type type() const { return m_type; } - tqStatus status() const; + Status status() const; /* Start the transfer. * If not connected connect to client. diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index 6426224a..622ad995 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -106,7 +106,7 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum const BackgroundMode bgmode = lv->viewport()->backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - if ( _cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) + if ( _cg.brush( crole ) != lv->colorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), _cg.brush( crole ) ); else { @@ -118,8 +118,8 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum if ( lv->isEnabled() ) how |= TQStyle::Style_Enabled; - lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, - p, lv, TQRect( 0, 0, width, height() ), lv->tqcolorGroup(), + lv->tqstyle().drawComplexControl( TQStyle::CC_ListView, + p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(), how, TQStyle::SC_ListView, TQStyle::SC_None, opt ); } @@ -143,7 +143,7 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum textheight++; if ( textheight < height() ) { int w = lv->treeStepSize() / 2; - lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, p, lv, + lv->tqstyle().drawComplexControl( TQStyle::CC_ListView, p, lv, TQRect( 0, textheight, w + 1, height() - textheight + 1 ), _cg, lv->isEnabled() ? TQStyle::Style_Enabled : TQStyle::Style_Default, TQStyle::SC_ListViewExpand, @@ -226,8 +226,8 @@ ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine ) connect( m_engine, TQT_SIGNAL( incomingEndOfList() ), this, TQT_SLOT( slotListEnd() ) ); - connect( m_engine, TQT_SIGNAL( statusChanged(KIRC::Engine::tqStatus) ), - this, TQT_SLOT( slotStatusChanged(KIRC::Engine::tqStatus) ) ); + connect( m_engine, TQT_SIGNAL( statusChanged(KIRC::Engine::Status) ), + this, TQT_SLOT( slotStatusChanged(KIRC::Engine::Status) ) ); show(); } @@ -242,9 +242,9 @@ void ChannelList::slotItemSelected( TQListViewItem *i ) emit channelSelected( i->text(0) ); } -void ChannelList::slotStatusChanged(KIRC::Engine::tqStatus newtqStatus) +void ChannelList::slotStatusChanged(KIRC::Engine::Status newStatus) { - switch(newtqStatus) { + switch(newStatus) { case KIRC::Engine::Connected: this->reset(); break; diff --git a/kopete/protocols/irc/ui/channellist.h b/kopete/protocols/irc/ui/channellist.h index a5963b6b..81c56e1c 100644 --- a/kopete/protocols/irc/ui/channellist.h +++ b/kopete/protocols/irc/ui/channellist.h @@ -58,7 +58,7 @@ class ChannelList void slotChannelListed( const TQString & channel, uint users, const TQString & topic ); void slotListEnd(); void slotSearchCache(); - void slotStatusChanged( KIRC::Engine::tqStatus ); + void slotStatusChanged( KIRC::Engine::Status ); private: void checkSearchResult( const TQString & channel, uint users, const TQString & topic ); diff --git a/kopete/protocols/irc/ui/ircadd.ui b/kopete/protocols/irc/ui/ircadd.ui index c899eca8..bed61568 100644 --- a/kopete/protocols/irc/ui/ircadd.ui +++ b/kopete/protocols/irc/ui/ircadd.ui @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui index e2e33f69..34ef83b7 100644 --- a/kopete/protocols/irc/ui/irceditaccount.ui +++ b/kopete/protocols/irc/ui/irceditaccount.ui @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>150</height> @@ -82,7 +82,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -293,7 +293,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>161</width> <height>20</height> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>392</width> <height>20</height> @@ -427,7 +427,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>141</width> <height>20</height> @@ -505,7 +505,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>150</height> @@ -744,7 +744,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>130</height> @@ -871,7 +871,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>130</height> diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 8a7cdcfb..9012a924 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -91,9 +91,9 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident new TQListViewItem( ctcpList, it.key(), it.data() ); } - mUserName->setValidator( new TQRegExpValidator( TQString::tqfromLatin1("^[^\\s]*$"), TQT_TQOBJECT(mUserName) ) ); - mNickName->setValidator( new TQRegExpValidator( TQString::tqfromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mNickName) ) ); - mAltNickname->setValidator( new TQRegExpValidator( TQString::tqfromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mAltNickname) ) ); + mUserName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^\\s]*$"), TQT_TQOBJECT(mUserName) ) ); + mNickName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mNickName) ) ); + mAltNickname->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mAltNickname) ) ); charset->insertStringList( KCodecAction::supportedEncodings() ); @@ -214,7 +214,7 @@ TQString IRCEditAccountWidget::generateAccountId( const TQString &network ) uint accountNumber = 1; while( config->hasGroup( TQString("Account_%1_%2").tqarg( m_protocol->pluginId() ).tqarg( nextId ) ) ) { - nextId = TQString::tqfromLatin1("%1_%2").tqarg( network ).tqarg( ++accountNumber ); + nextId = TQString::fromLatin1("%1_%2").tqarg( network ).tqarg( ++accountNumber ); } kdDebug( 14120 ) << k_funcinfo << " ID IS: " << nextId << endl; return nextId; diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networkconfig.ui index 0f15dee5..09121e54 100644 --- a/kopete/protocols/irc/ui/networkconfig.ui +++ b/kopete/protocols/irc/ui/networkconfig.ui @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>210</width> <height>20</height> @@ -240,7 +240,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>151</height> @@ -313,7 +313,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>260</width> <height>20</height> diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index a86fc490..4865f8b1 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -111,7 +111,7 @@ JabberAccount::JabberAccount (JabberProtocol * parent, const TQString & accountI TQObject::connect(Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ) ); - m_initialPresence = XMPP::tqStatus ( "", "", 5, true ); + m_initialPresence = XMPP::Status ( "", "", 5, true ); } @@ -323,8 +323,8 @@ void JabberAccount::connectWithPassword ( const TQString &password ) this, TQT_SLOT ( slotGroupChatJoined ( const XMPP::Jid & ) ) ); TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatLeft ( const XMPP::Jid & ) ), this, TQT_SLOT ( slotGroupChatLeft ( const XMPP::Jid & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::tqStatus & ) ), - this, TQT_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::tqStatus & ) ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ), + this, TQT_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ) ); TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatError ( const XMPP::Jid &, int, const TQString & ) ), this, TQT_SLOT ( slotGroupChatError ( const XMPP::Jid &, int, const TQString & ) ) ); TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ), @@ -414,7 +414,7 @@ void JabberAccount::connectWithPassword ( const TQString &password ) kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Connecting to Jabber server " << server() << ":" << port() << endl; - setPresence( XMPP::tqStatus ("connecting", "", 0, true) ); + setPresence( XMPP::Status ("connecting", "", 0, true) ); switch ( m_jabberClient->connect ( XMPP::Jid ( accountId () + TQString("/") + resource () ), password ) ) { @@ -609,13 +609,13 @@ void JabberAccount::slotIncomingFileTransfer () void JabberAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason) { - XMPP::tqStatus xmpptqStatus = m_protocol->kosTotqStatus( status, reason); + XMPP::Status xmppStatus = m_protocol->kosToStatus( status, reason); if( status.status() == Kopete::OnlineStatus::Offline ) { - xmpptqStatus.setIsAvailable( false ); + xmppStatus.setIsAvailable( false ); kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "CROSS YOUR FINGERS! THIS IS GONNA BE WILD" << endl; - disconnect (Manual, xmpptqStatus); + disconnect (Manual, xmppStatus); return; } @@ -628,12 +628,12 @@ void JabberAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const if ( !isConnected () ) { // we are not connected yet, so connect now - m_initialPresence = xmpptqStatus; + m_initialPresence = xmppStatus; connect ( status ); } else { - setPresence ( xmpptqStatus ); + setPresence ( xmppStatus ); } } @@ -650,8 +650,8 @@ void JabberAccount::disconnect ( Kopete::Account::DisconnectReason reason ) // make sure that the connection animation gets stopped if we're still // in the process of connecting - setPresence ( XMPP::tqStatus ("", "", 0, false) ); - m_initialPresence = XMPP::tqStatus ("", "", 5, true); + setPresence ( XMPP::Status ("", "", 0, false) ); + m_initialPresence = XMPP::Status ("", "", 5, true); /* FIXME: * We should delete the JabberClient instance here, @@ -666,7 +666,7 @@ void JabberAccount::disconnect ( Kopete::Account::DisconnectReason reason ) disconnected ( reason ); } -void JabberAccount::disconnect( Kopete::Account::DisconnectReason reason, XMPP::tqStatus &status ) +void JabberAccount::disconnect( Kopete::Account::DisconnectReason reason, XMPP::Status &status ) { kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "disconnect( reason, status ) called" << endl; @@ -1015,27 +1015,27 @@ void JabberAccount::slotCSError ( int error ) } /* Set presence (usually called by dialog widget). */ -void JabberAccount::setPresence ( const XMPP::tqStatus &status ) +void JabberAccount::setPresence ( const XMPP::Status &status ) { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Status: " << status.show () << ", Reason: " << status.status () << endl; // fetch input status - XMPP::tqStatus newtqStatus = status; + XMPP::Status newStatus = status; // TODO: Check if Caps is enabled // Send entity capabilities if( client() ) { - newtqStatus.setCapsNode( client()->capsNode() ); - newtqStatus.setCapsVersion( client()->capsVersion() ); - newtqStatus.setCapsExt( client()->capsExt() ); + newStatus.setCapsNode( client()->capsNode() ); + newStatus.setCapsVersion( client()->capsVersion() ); + newStatus.setCapsExt( client()->capsExt() ); } // make sure the status gets the correct priority - newtqStatus.setPriority ( configGroup()->readNumEntry ( "Priority", 5 ) ); + newStatus.setPriority ( configGroup()->readNumEntry ( "Priority", 5 ) ); XMPP::Jid jid ( myself()->contactId () ); - XMPP::Resource newResource ( resource (), newtqStatus ); + XMPP::Resource newResource ( resource (), newStatus ); // update our resource in the resource pool resourcePool()->addResource ( jid, newResource ); @@ -1057,7 +1057,7 @@ void JabberAccount::setPresence ( const XMPP::tqStatus &status ) XMPP::JT_Presence * task = new XMPP::JT_Presence ( client()->rootTask ()); - task->pres ( newtqStatus ); + task->pres ( newStatus ); task->go ( true ); } else @@ -1299,11 +1299,11 @@ void JabberAccount::slotContactUpdated (const XMPP::RosterItem & item) */ if ( !item.ask().isEmpty () ) { - contact->setProperty ( protocol()->propAuthorizationtqStatus, i18n ( "Waiting for authorization" ) ); + contact->setProperty ( protocol()->propAuthorizationStatus, i18n ( "Waiting for authorization" ) ); } else { - contact->removeProperty ( protocol()->propAuthorizationtqStatus ); + contact->removeProperty ( protocol()->propAuthorizationStatus ); } } else if(c) //we don't need to add it, and it is in the contactlist @@ -1469,7 +1469,7 @@ void JabberAccount::slotGroupChatLeft (const XMPP::Jid & jid) } -void JabberAccount::slotGroupChatPresence (const XMPP::Jid & jid, const XMPP::tqStatus & status) +void JabberAccount::slotGroupChatPresence (const XMPP::Jid & jid, const XMPP::Status & status) { kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Received groupchat presence for room " << jid.full () << endl; diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h index 17286a90..9ce7c9c4 100644 --- a/kopete/protocols/jabber/jabberaccount.h +++ b/kopete/protocols/jabber/jabberaccount.h @@ -147,7 +147,7 @@ public slots: void disconnect ( Kopete::Account::DisconnectReason reason ); /* Disconnect with a reason, and status */ - void disconnect( Kopete::Account::DisconnectReason reason, XMPP::tqStatus &status ); + void disconnect( Kopete::Account::DisconnectReason reason, XMPP::Status &status ); /* Reimplemented from Kopete::Account */ void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); @@ -199,13 +199,13 @@ private: void cleanup (); /* Initial presence to set after connecting. */ - XMPP::tqStatus m_initialPresence; + XMPP::Status m_initialPresence; /** * Sets our own presence. Updates our resource in the * resource pool and sends a presence packet to the server. */ - void setPresence ( const XMPP::tqStatus &status ); + void setPresence ( const XMPP::Status &status ); /** * Returns if a connection attempt is currently in progress. @@ -257,7 +257,7 @@ private slots: void slotJoinNewChat (); void slotGroupChatJoined ( const XMPP::Jid &jid ); void slotGroupChatLeft ( const XMPP::Jid &jid ); - void slotGroupChatPresence ( const XMPP::Jid &jid, const XMPP::tqStatus &status ); + void slotGroupChatPresence ( const XMPP::Jid &jid, const XMPP::Status &status ); void slotGroupChatError ( const XMPP::Jid &jid, int error, const TQString &reason ); /* Incoming subscription request. */ diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index 2ee8423e..5dac2e18 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -129,19 +129,19 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) switch ( item.subscription().type () ) { case XMPP::Subscription::None: - setProperty ( protocol()->propSubscriptiontqStatus, + setProperty ( protocol()->propSubscriptionStatus, i18n ( "You cannot see each others' status." ) ); break; case XMPP::Subscription::To: - setProperty ( protocol()->propSubscriptiontqStatus, + setProperty ( protocol()->propSubscriptionStatus, i18n ( "You can see this contact's status but they cannot see your status." ) ); break; case XMPP::Subscription::From: - setProperty ( protocol()->propSubscriptiontqStatus, + setProperty ( protocol()->propSubscriptionStatus, i18n ( "This contact can see your status but you cannot see their status." ) ); break; case XMPP::Subscription::Both: - setProperty ( protocol()->propSubscriptiontqStatus, + setProperty ( protocol()->propSubscriptionStatus, i18n ( "You can see each others' status." ) ); break; } @@ -217,7 +217,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) setDontSync ( false ); //can't do it now because it's called from contructor at a point some virtual function are not available - TQTimer::singleShot(0, this, TQT_SLOT(reevaluatetqStatus())); + TQTimer::singleShot(0, this, TQT_SLOT(reevaluateStatus())); } @@ -295,7 +295,7 @@ void JabberBaseContact::updateResourceList () setProperty ( protocol()->propAvailableResources, resourceListStr ); } -void JabberBaseContact::reevaluatetqStatus () +void JabberBaseContact::reevaluateStatus () { kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Determining new status for " << contactId () << endl; @@ -390,7 +390,7 @@ void JabberBaseContact::serialize (TQMap < TQString, TQString > &serializedData, // Contact id and display name are already set for us, only add the rest serializedData["JID"] = mRosterItem.jid().full(); - serializedData["groups"] = mRosterItem.groups ().join (TQString::tqfromLatin1 (",")); + serializedData["groups"] = mRosterItem.groups ().join (TQString::fromLatin1 (",")); } void JabberBaseContact::slotUserInfo( ) @@ -414,7 +414,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard ) // update vCard cache timestamp if this is not a temporary contact if ( metaContact() && !metaContact()->isTemporary () ) { - setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::tqcurrentDateTime().toString ( Qt::ISODate ) ); + setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( Qt::ISODate ) ); } diff --git a/kopete/protocols/jabber/jabberbasecontact.h b/kopete/protocols/jabber/jabberbasecontact.h index c3453344..2dcc26b7 100644 --- a/kopete/protocols/jabber/jabberbasecontact.h +++ b/kopete/protocols/jabber/jabberbasecontact.h @@ -158,7 +158,7 @@ public slots: * whenever a resource is added, removed, or * changed in the resource pool. */ - void reevaluatetqStatus (); + void reevaluateStatus (); protected: /** diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index bb637870..42089333 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -240,7 +240,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::setFeatures(const TQStr void JabberCapabilitiesManager::CapabilitiesInformation::updateLastSeen() { - m_lastSeen = TQDate::tqcurrentDate(); + m_lastSeen = TQDate::currentDate(); } TQDomElement JabberCapabilitiesManager::CapabilitiesInformation::toXml(TQDomDocument *doc) const @@ -351,7 +351,7 @@ void JabberCapabilitiesManager::removeAccount(JabberAccount *account) } } -void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::tqStatus &status ) +void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::Status &status ) { if( !account->client() || !account->client()->rootTask() ) return; diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.h b/kopete/protocols/jabber/jabbercapabilitiesmanager.h index f314d760..8e2a95a6 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.h +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.h @@ -81,12 +81,12 @@ public slots: /** * Update if necessary the capabities for the JID passed in args. * Caps are received in Presence messages so that's why we are - * passing a XMPP::tqStatus object. + * passing a XMPP::Status object. * * @param jid JID that capabilities was updated. - * @param status The XMPP::tqStatus that contain the caps. + * @param status The XMPP::Status that contain the caps. */ - void updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::tqStatus &status); + void updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::Status &status); private slots: /** diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index d10f4201..532cfd22 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -118,7 +118,7 @@ void JabberChatSession::slotUpdateDisplayName () jid.setResource ( mResource ); TQString statusText = i18n("a contact's online status in parenthesis.", " (%1)") - .tqarg( chatMembers.first()->onlinetqStatus().description() ); + .tqarg( chatMembers.first()->onlineStatus().description() ); if ( jid.resource().isEmpty () ) setDisplayName ( chatMembers.first()->metaContact()->displayName () + statusText ); else diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp index cf37ffd8..fddd588f 100644 --- a/kopete/protocols/jabber/jabberclient.cpp +++ b/kopete/protocols/jabber/jabberclient.cpp @@ -724,8 +724,8 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt this, TQT_SLOT ( slotGroupChatJoined (const Jid &) ) ); TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatLeft (const Jid &) ), this, TQT_SLOT ( slotGroupChatLeft (const Jid &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatPresence (const Jid &, const tqStatus &) ), - this, TQT_SLOT ( slotGroupChatPresence (const Jid &, const tqStatus &) ) ); + TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatPresence (const Jid &, const Status &) ), + this, TQT_SLOT ( slotGroupChatPresence (const Jid &, const Status &) ) ); TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatError (const Jid &, int, const TQString &) ), this, TQT_SLOT ( slotGroupChatError (const Jid &, int, const TQString &) ) ); //TQObject::connect ( d->jabberClient, TQT_SIGNAL (debugText (const TQString &) ), @@ -769,7 +769,7 @@ void JabberClient::disconnect () } -void JabberClient::disconnect( XMPP::tqStatus &reason ) +void JabberClient::disconnect( XMPP::Status &reason ) { if ( d->jabberClient ) { @@ -823,12 +823,12 @@ void JabberClient::leaveGroupChat ( const TQString &host, const TQString &room ) } -void JabberClient::setGroupChattqStatus( const TQString & host, const TQString & room, const XMPP::tqStatus & status ) +void JabberClient::setGroupChatStatus( const TQString & host, const TQString & room, const XMPP::Status & status ) { - client()->groupChatSettqStatus( host, room, status); + client()->groupChatSetStatus( host, room, status); } -void JabberClient::changeGroupChatNick( const TQString & host, const TQString & room, const TQString & nick, const XMPP::tqStatus & status ) +void JabberClient::changeGroupChatNick( const TQString & host, const TQString & room, const TQString & nick, const XMPP::Status & status ) { client()->groupChatChangeNick( host, room, nick, status ); } @@ -1112,7 +1112,7 @@ void JabberClient::slotGroupChatLeft ( const Jid &jid ) } -void JabberClient::slotGroupChatPresence ( const Jid &jid, const tqStatus &status) +void JabberClient::slotGroupChatPresence ( const Jid &jid, const Status &status) { emit groupChatPresence ( jid, status ); diff --git a/kopete/protocols/jabber/jabberclient.h b/kopete/protocols/jabber/jabberclient.h index 05324824..7ba389f9 100644 --- a/kopete/protocols/jabber/jabberclient.h +++ b/kopete/protocols/jabber/jabberclient.h @@ -96,7 +96,7 @@ public: * Disconnect from Jabber server with reason * @param reason The reason for disconnecting */ - void disconnect (XMPP::tqStatus &reason); + void disconnect (XMPP::Status &reason); /** * Returns if this instance is connected to a server. @@ -379,11 +379,11 @@ public: /** * change the status of a group chat */ - void setGroupChattqStatus(const TQString &host, const TQString &room, const XMPP::tqStatus &); + void setGroupChatStatus(const TQString &host, const TQString &room, const XMPP::Status &); /** * change the nick in a group chat */ - void changeGroupChatNick(const TQString &host, const TQString &room, const TQString &nick, const XMPP::tqStatus &status =XMPP::tqStatus()); + void changeGroupChatNick(const TQString &host, const TQString &room, const TQString &nick, const XMPP::Status &status =XMPP::Status()); /** * Send a message. @@ -492,7 +492,7 @@ signals: /** * A presence to a group chat has been signalled. */ - void groupChatPresence ( const XMPP::Jid &jid, const XMPP::tqStatus &status ); + void groupChatPresence ( const XMPP::Jid &jid, const XMPP::Status &status ); /** * An error was encountered joining or processing a group chat. @@ -590,7 +590,7 @@ private slots: /* Slots for handling group chats. */ void slotGroupChatJoined (const Jid & jid); void slotGroupChatLeft (const Jid & jid); - void slotGroupChatPresence (const Jid & jid, const tqStatus & status); + void slotGroupChatPresence (const Jid & jid, const Status & status); void slotGroupChatError (const Jid & jid, int error, const TQString & reason); /* Incoming subscription request. */ diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index c6147ae1..f7b1741f 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -107,7 +107,7 @@ JabberContact::JabberContact (const XMPP::RosterItem &rosterItem, Kopete::Accoun * Trigger update once if we're already connected for contacts * that are being added while we are online. */ - if ( account()->myself()->onlinetqStatus().isDefinitelyOnline() ) + if ( account()->myself()->onlineStatus().isDefinitelyOnline() ) { slotGetTimedVCard (); } @@ -170,7 +170,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions () // if the contact is online, display the resources we have for it, // otherwise disable the menu - if (onlinetqStatus ().status () == Kopete::OnlineStatus::Offline) + if (onlineStatus ().status () == Kopete::OnlineStatus::Offline) { actionSelectResource->setEnabled ( false ); } @@ -415,7 +415,7 @@ void JabberContact::slotCheckVCard () Kopete::ContactProperty cacheDateString = property ( protocol()->propVCardCacheTimeStamp ); // don't do anything while we are offline - if ( !account()->myself()->onlinetqStatus().isDefinitelyOnline () ) + if ( !account()->myself()->onlineStatus().isDefinitelyOnline () ) { return; } @@ -440,13 +440,13 @@ void JabberContact::slotCheckVCard () // avoid warning if key does not exist in configuration file if ( cacheDateString.isNull () ) - cacheDate = TQDateTime::tqcurrentDateTime().addDays ( -2 ); + cacheDate = TQDateTime::currentDateTime().addDays ( -2 ); else cacheDate = TQDateTime::fromString ( cacheDateString.value().toString (), Qt::ISODate ); kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Cached vCard data for " << contactId () << " from " << cacheDate.toString () << endl; - if ( !mVCardUpdateInProgress && ( cacheDate.addDays ( 1 ) < TQDateTime::tqcurrentDateTime () ) ) + if ( !mVCardUpdateInProgress && ( cacheDate.addDays ( 1 ) < TQDateTime::currentDateTime () ) ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Scheduling update." << endl; @@ -463,7 +463,7 @@ void JabberContact::slotGetTimedVCard () mVCardUpdateInProgress = false; // check if we are still connected - eventually we lost our connection in the meantime - if ( !account()->myself()->onlinetqStatus().isDefinitelyOnline () ) + if ( !account()->myself()->onlineStatus().isDefinitelyOnline () ) { // we are not connected, discard this update return; @@ -506,7 +506,7 @@ void JabberContact::slotGotVCard () // update timestamp of last vCard retrieval if ( metaContact() && !metaContact()->isTemporary () ) { - setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::tqcurrentDateTime().toString ( Qt::ISODate ) ); + setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( Qt::ISODate ) ); } mVCardUpdateInProgress = false; @@ -527,7 +527,7 @@ void JabberContact::slotGotVCard () } -void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &newtqStatus, const Kopete::OnlineStatus &oldtqStatus ) +void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &newStatus, const Kopete::OnlineStatus &oldStatus ) { /* @@ -541,13 +541,13 @@ void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::Onl * to query its activity after we are already connected. */ - if ( onlinetqStatus().isDefinitelyOnline () ) + if ( onlineStatus().isDefinitelyOnline () ) { // Kopete already deals with lastSeen if the contact is online return; } - if ( ( oldtqStatus.status () == Kopete::OnlineStatus::Connecting ) && newtqStatus.isDefinitelyOnline () ) + if ( ( oldStatus.status () == Kopete::OnlineStatus::Connecting ) && newStatus.isDefinitelyOnline () ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Scheduling request for last activity for " << mRosterItem.jid().bare () << endl; @@ -567,13 +567,13 @@ void JabberContact::slotGetTimedLastActivity () * maintained by Kopete) */ - if ( onlinetqStatus().isDefinitelyOnline () ) + if ( onlineStatus().isDefinitelyOnline () ) { // Kopete already deals with setting lastSeen if the contact is online return; } - if ( account()->myself()->onlinetqStatus().isDefinitelyOnline () ) + if ( account()->myself()->onlineStatus().isDefinitelyOnline () ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Requesting last activity from timer for " << mRosterItem.jid().bare () << endl; @@ -591,7 +591,7 @@ void JabberContact::slotGotLastActivity () if ( task->success () ) { - setProperty ( protocol()->propLastSeen, TQDateTime(TQDateTime::tqcurrentDateTime().addSecs ( -task->seconds () ))); + setProperty ( protocol()->propLastSeen, TQDateTime(TQDateTime::currentDateTime().addSecs ( -task->seconds () ))); if( !task->message().isEmpty() ) { setProperty( protocol()->propAwayMessage, task->message() ); @@ -1110,7 +1110,7 @@ void JabberContact::slotSelectResource () } -void JabberContact::sendPresence ( const XMPP::tqStatus status ) +void JabberContact::sendPresence ( const XMPP::Status status ) { if ( !account()->isConnected () ) @@ -1119,15 +1119,15 @@ void JabberContact::sendPresence ( const XMPP::tqStatus status ) return; } - XMPP::tqStatus newtqStatus = status; + XMPP::Status newStatus = status; // honour our priority - if(newtqStatus.isAvailable()) - newtqStatus.setPriority ( account()->configGroup()->readNumEntry ( "Priority", 5 ) ); + if(newStatus.isAvailable()) + newStatus.setPriority ( account()->configGroup()->readNumEntry ( "Priority", 5 ) ); XMPP::JT_Presence * task = new XMPP::JT_Presence ( account()->client()->rootTask () ); - task->pres ( bestAddress (), newtqStatus); + task->pres ( bestAddress (), newStatus); task->go ( true ); } @@ -1136,7 +1136,7 @@ void JabberContact::sendPresence ( const XMPP::tqStatus status ) void JabberContact::slotStatusOnline () { - XMPP::tqStatus status; + XMPP::Status status; status.setShow(""); sendPresence ( status ); @@ -1146,7 +1146,7 @@ void JabberContact::slotStatusOnline () void JabberContact::slotStatusChatty () { - XMPP::tqStatus status; + XMPP::Status status; status.setShow ("chat"); sendPresence ( status ); @@ -1156,7 +1156,7 @@ void JabberContact::slotStatusChatty () void JabberContact::slotStatusAway () { - XMPP::tqStatus status; + XMPP::Status status; status.setShow ("away"); sendPresence ( status ); @@ -1166,7 +1166,7 @@ void JabberContact::slotStatusAway () void JabberContact::slotStatusXA () { - XMPP::tqStatus status; + XMPP::Status status; status.setShow ("xa"); sendPresence ( status ); @@ -1176,7 +1176,7 @@ void JabberContact::slotStatusXA () void JabberContact::slotStatusDND () { - XMPP::tqStatus status; + XMPP::Status status; status.setShow ("dnd"); sendPresence ( status ); @@ -1187,7 +1187,7 @@ void JabberContact::slotStatusDND () void JabberContact::slotStatusInvisible () { - XMPP::tqStatus status; + XMPP::Status status; status.setIsAvailable( false ); sendPresence ( status ); @@ -1299,7 +1299,7 @@ void JabberContact::slotDiscoFinished( ) XMPP::RosterItem ri = rosterItem(); Kopete::MetaContact *mc=metaContact(); JabberAccount *parentAccount=account(); - Kopete::OnlineStatus status=onlinetqStatus(); + Kopete::OnlineStatus status=onlineStatus(); kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << ri.jid().full() << " is not a contact but a gateway - " << this << endl; diff --git a/kopete/protocols/jabber/jabbercontact.h b/kopete/protocols/jabber/jabbercontact.h index ce40be30..15b5096e 100644 --- a/kopete/protocols/jabber/jabbercontact.h +++ b/kopete/protocols/jabber/jabbercontact.h @@ -228,7 +228,7 @@ private: /** * Sends a presence packet to this contact */ - void sendPresence ( const XMPP::tqStatus status ); + void sendPresence ( const XMPP::Status status ); /** * This variable keeps a list of message managers. diff --git a/kopete/protocols/jabber/jabberformtranslator.cpp b/kopete/protocols/jabber/jabberformtranslator.cpp index de789f44..3809bcfa 100644 --- a/kopete/protocols/jabber/jabberformtranslator.cpp +++ b/kopete/protocols/jabber/jabberformtranslator.cpp @@ -35,8 +35,8 @@ JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * TQVBoxLayout *innerLayout = new TQVBoxLayout (this, 0, 4); TQLabel *label = new TQLabel (form.instructions (), this, "InstructionLabel"); - label->tqsetAlignment (int (TQLabel::WordBreak | TQLabel::AlignVCenter)); - label->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Fixed, true); + label->setAlignment (int (TQLabel::WordBreak | TQLabel::AlignVCenter)); + label->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Fixed, true); label->show (); innerLayout->addWidget (label, 0); diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp index 7ddf4041..717d36be 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.cpp +++ b/kopete/protocols/jabber/jabbergroupcontact.cpp @@ -345,8 +345,8 @@ void JabberGroupContact::slotStatusChanged( ) } //TODO: away message - XMPP::tqStatus newtqStatus = account()->protocol()->kosTotqStatus( account()->myself()->onlinetqStatus() ); - account()->client()->setGroupChattqStatus( rosterItem().jid().host() , rosterItem().jid().user() , newtqStatus ); + XMPP::Status newStatus = account()->protocol()->kosToStatus( account()->myself()->onlineStatus() ); + account()->client()->setGroupChatStatus( rosterItem().jid().host() , rosterItem().jid().user() , newStatus ); } void JabberGroupContact::slotChangeNick( ) @@ -361,7 +361,7 @@ void JabberGroupContact::slotChangeNick( ) mNick=futureNewNickName; - XMPP::tqStatus status = account()->protocol()->kosTotqStatus( account()->myself()->onlinetqStatus() ); + XMPP::Status status = account()->protocol()->kosToStatus( account()->myself()->onlineStatus() ); account()->client()->changeGroupChatNick( rosterItem().jid().host() , rosterItem().jid().user() , mNick , status); } diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp index 0b73f38b..a7cf3a78 100644 --- a/kopete/protocols/jabber/jabberprotocol.cpp +++ b/kopete/protocols/jabber/jabberprotocol.cpp @@ -90,8 +90,8 @@ JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStr propWorkPhone(Kopete::Global::Properties::self()->workPhone()), propWorkMobilePhone(Kopete::Global::Properties::self()->workMobilePhone()), propNickName(Kopete::Global::Properties::self()->nickName()), - propSubscriptiontqStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString(), true, false), - propAuthorizationtqStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), TQString(), true, false), + propSubscriptionStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString(), true, false), + propAuthorizationStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), TQString(), true, false), propAvailableResources("jabberAvailableResources", i18n ("Available Resources"), "jabber_chatty", false, true), propVCardCacheTimeStamp("jabberVCardCacheTimeStamp", i18n ("vCard Cache Timestamp"), TQString(), true, false, true), propPhoto(Kopete::Global::Properties::self()->photo()), @@ -304,42 +304,42 @@ Kopete::Contact *JabberProtocol::deserializeContact (Kopete::MetaContact * metaC return account->contacts()[contactId]; } -XMPP::tqStatus JabberProtocol::kosTotqStatus( const Kopete::OnlineStatus & status , const TQString & message ) +XMPP::Status JabberProtocol::kosToStatus( const Kopete::OnlineStatus & status , const TQString & message ) { - XMPP::tqStatus xmpptqStatus ( "", message ); + XMPP::Status xmppStatus ( "", message ); if( status.status() == Kopete::OnlineStatus::Offline ) { - xmpptqStatus.setIsAvailable( false ); + xmppStatus.setIsAvailable( false ); } switch ( status.internalStatus () ) { case JabberProtocol::JabberFreeForChat: - xmpptqStatus.setShow ( "chat" ); + xmppStatus.setShow ( "chat" ); break; case JabberProtocol::JabberOnline: - xmpptqStatus.setShow ( "" ); + xmppStatus.setShow ( "" ); break; case JabberProtocol::JabberAway: - xmpptqStatus.setShow ( "away" ); + xmppStatus.setShow ( "away" ); break; case JabberProtocol::JabberXA: - xmpptqStatus.setShow ( "xa" ); + xmppStatus.setShow ( "xa" ); break; case JabberProtocol::JabberDND: - xmpptqStatus.setShow ( "dnd" ); + xmppStatus.setShow ( "dnd" ); break; case JabberProtocol::JabberInvisible: - xmpptqStatus.setIsInvisible ( true ); + xmppStatus.setIsInvisible ( true ); break; } - return xmpptqStatus; + return xmppStatus; } #include "jabberprotocol.moc" diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h index 0e79c357..6e647f74 100644 --- a/kopete/protocols/jabber/jabberprotocol.h +++ b/kopete/protocols/jabber/jabberprotocol.h @@ -39,11 +39,11 @@ namespace XMPP { class Resource; - class tqStatus; + class Status; } class JabberContact; -class dlgJabbertqStatus; +class dlgJabberStatus; class dlgJabberSendRaw; class JabberCapabilitiesManager; @@ -95,8 +95,8 @@ public: const Kopete::ContactPropertyTmpl propWorkPhone; const Kopete::ContactPropertyTmpl propWorkMobilePhone; const Kopete::ContactPropertyTmpl propNickName; - const Kopete::ContactPropertyTmpl propSubscriptiontqStatus; - const Kopete::ContactPropertyTmpl propAuthorizationtqStatus; + const Kopete::ContactPropertyTmpl propSubscriptionStatus; + const Kopete::ContactPropertyTmpl propAuthorizationStatus; const Kopete::ContactPropertyTmpl propAvailableResources; const Kopete::ContactPropertyTmpl propVCardCacheTimeStamp; const Kopete::ContactPropertyTmpl propPhoto; @@ -141,9 +141,9 @@ public: Kopete::OnlineStatus resourceToKOS ( const XMPP::Resource &resource ); /** - * Convert an online status to a XMPP::tqStatus + * Convert an online status to a XMPP::Status */ - XMPP::tqStatus kosTotqStatus( const Kopete::OnlineStatus & status, const TQString& message=TQString() ); + XMPP::Status kosToStatus( const Kopete::OnlineStatus & status, const TQString& message=TQString() ); /** * Return the Entity Capabilities(JEP-0115) manager instance. diff --git a/kopete/protocols/jabber/jabberresourcepool.cpp b/kopete/protocols/jabber/jabberresourcepool.cpp index cddffd64..19492790 100644 --- a/kopete/protocols/jabber/jabberresourcepool.cpp +++ b/kopete/protocols/jabber/jabberresourcepool.cpp @@ -95,7 +95,7 @@ void JabberResourcePool::notifyRelevantContacts ( const XMPP::Jid &jid ) for(JabberBaseContact *mContact = list.first (); mContact; mContact = list.next ()) { - mContact->reevaluatetqStatus (); + mContact->reevaluateStatus (); } } diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index 218c9aae..abec26bc 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -123,10 +123,10 @@ JabberTransport::~JabberTransport () KActionMenu *JabberTransport::actionMenu () { - KActionMenu *menu = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this ); + KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); - menu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), + menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick ) ); @@ -203,44 +203,44 @@ void JabberTransport::setOnlineStatus( const Kopete::OnlineStatus& status , con return; } - XMPP::tqStatus xmpptqStatus ( "", reason ); + XMPP::Status xmppStatus ( "", reason ); switch ( status.internalStatus () ) { case JabberProtocol::JabberFreeForChat: - xmpptqStatus.setShow ( "chat" ); + xmppStatus.setShow ( "chat" ); break; case JabberProtocol::JabberOnline: - xmpptqStatus.setShow ( "" ); + xmppStatus.setShow ( "" ); break; case JabberProtocol::JabberAway: - xmpptqStatus.setShow ( "away" ); + xmppStatus.setShow ( "away" ); break; case JabberProtocol::JabberXA: - xmpptqStatus.setShow ( "xa" ); + xmppStatus.setShow ( "xa" ); break; case JabberProtocol::JabberDND: - xmpptqStatus.setShow ( "dnd" ); + xmppStatus.setShow ( "dnd" ); break; case JabberProtocol::JabberInvisible: - xmpptqStatus.setIsInvisible ( true ); + xmppStatus.setIsInvisible ( true ); break; } if ( !isConnected () ) { // we are not connected yet, so connect now - m_initialPresence = xmpptqStatus; + m_initialPresence = xmppStatus; connect (); } else { - setPresence ( xmpptqStatus ); + setPresence ( xmppStatus ); } #endif } @@ -328,7 +328,7 @@ void JabberTransport::eatContacts( ) { XMPP::RosterItem item=contact->rosterItem(); Kopete::MetaContact *mc=contact->metaContact(); - Kopete::OnlineStatus status = contact->onlinetqStatus(); + Kopete::OnlineStatus status = contact->onlineStatus(); kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << item.jid().full() << " will be soon eat - " << contact << endl; delete contact; Kopete::Contact *c2=account()->contactPool()->addContact( item , mc , false ); //not sure this is false; diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h index f0a2ab81..2cfcd4c1 100644 --- a/kopete/protocols/jabber/jabbertransport.h +++ b/kopete/protocols/jabber/jabbertransport.h @@ -80,8 +80,8 @@ public: virtual bool removeAccount(); - enum TransporttqStatus { Normal , Creating, Removing , AccountRemoved }; - TransporttqStatus transporttqStatus() { return m_status; }; + enum TransportStatus { Normal , Creating, Removing , AccountRemoved }; + TransportStatus transportStatus() { return m_status; }; /** * return the legacyId conrresponding to the jid @@ -132,7 +132,7 @@ protected: private: JabberAccount *m_account; - TransporttqStatus m_status; + TransportStatus m_status; }; diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp index a389730b..446d1d41 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp @@ -69,7 +69,7 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall setContactInformation( peerContact ); } - labelSessiontqStatus->setText( i18n("Incoming Session...") ); + labelSessionStatus->setText( i18n("Incoming Session...") ); buttonAccept->setEnabled(true); buttonDecline->setEnabled(true); } @@ -95,7 +95,7 @@ void JingleVoiceSessionDialog::setContactInformation(JabberContact *contact) void JingleVoiceSessionDialog::start() { - labelSessiontqStatus->setText( i18n("Waiting for other peer...") ); + labelSessionStatus->setText( i18n("Waiting for other peer...") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(true); @@ -106,7 +106,7 @@ void JingleVoiceSessionDialog::start() void JingleVoiceSessionDialog::slotAcceptClicked() { - labelSessiontqStatus->setText( i18n("Session accepted.") ); + labelSessionStatus->setText( i18n("Session accepted.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(true); @@ -118,7 +118,7 @@ void JingleVoiceSessionDialog::slotAcceptClicked() void JingleVoiceSessionDialog::slotDeclineClicked() { - labelSessiontqStatus->setText( i18n("Session declined.") ); + labelSessionStatus->setText( i18n("Session declined.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(false); @@ -131,7 +131,7 @@ void JingleVoiceSessionDialog::slotDeclineClicked() void JingleVoiceSessionDialog::slotTerminateClicked() { - labelSessiontqStatus->setText( i18n("Session terminated.") ); + labelSessionStatus->setText( i18n("Session terminated.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(false); @@ -147,7 +147,7 @@ void JingleVoiceSessionDialog::sessionStarted(const Jid &jid) { if( m_peerJid.compare(jid) ) { - labelSessiontqStatus->setText( i18n("Session in progress.") ); + labelSessionStatus->setText( i18n("Session in progress.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(true); @@ -159,7 +159,7 @@ void JingleVoiceSessionDialog::sessionAccepted(const Jid &jid) { if( m_peerJid.compare(jid) ) { - labelSessiontqStatus->setText( i18n("Session accepted.") ); + labelSessionStatus->setText( i18n("Session accepted.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(true); @@ -171,7 +171,7 @@ void JingleVoiceSessionDialog::sessionDeclined(const Jid &jid) { if( m_peerJid.compare(jid) ) { - labelSessiontqStatus->setText( i18n("Session declined.") ); + labelSessionStatus->setText( i18n("Session declined.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(false); @@ -183,7 +183,7 @@ void JingleVoiceSessionDialog::sessionTerminated(const Jid &jid) { if( m_peerJid.compare(jid) ) { - labelSessiontqStatus->setText( i18n("Session terminated.") ); + labelSessionStatus->setText( i18n("Session terminated.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(false); diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui index 72e3827c..3ae2edc1 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -70,7 +70,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -116,7 +116,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>128</width> <height>128</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -209,7 +209,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -248,7 +248,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -298,7 +298,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -325,7 +325,7 @@ </widget> <widget class="TQLabel"> <property name="name"> - <cstring>labelSessiontqStatus</cstring> + <cstring>labelSessionStatus</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -351,7 +351,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc index 40c1fbfe..6d818932 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc @@ -188,13 +188,13 @@ private: CallClient* call_client_; }; -const char* DescribetqStatus(buzz::tqStatus::Show show, const std::string& desc) { +const char* DescribeStatus(buzz::Status::Show show, const std::string& desc) { switch (show) { - case buzz::tqStatus::SHOW_XA: return desc.c_str(); - case buzz::tqStatus::SHOW_ONLINE: return "online"; - case buzz::tqStatus::SHOW_AWAY: return "away"; - case buzz::tqStatus::SHOW_DND: return "do not disturb"; - case buzz::tqStatus::SHOW_CHAT: return "ready to chat"; + case buzz::Status::SHOW_XA: return desc.c_str(); + case buzz::Status::SHOW_ONLINE: return "online"; + case buzz::Status::SHOW_AWAY: return "away"; + case buzz::Status::SHOW_DND: return "do not disturb"; + case buzz::Status::SHOW_CHAT: return "ready to chat"; delault: return "offline"; } } @@ -320,11 +320,11 @@ void CallClient::InitPresence() { this, &CallClient::OnStatusUpdate); presence_push_->Start(); - buzz::tqStatus my_status; + buzz::Status my_status; my_status.set_jid(xmpp_client_->jid()); my_status.set_available(true); my_status.set_invisible(false); - my_status.set_show(buzz::tqStatus::SHOW_ONLINE); + my_status.set_show(buzz::Status::SHOW_ONLINE); my_status.set_priority(0); my_status.set_know_capabilities(true); my_status.set_phone_capability(true); @@ -337,7 +337,7 @@ void CallClient::InitPresence() { presence_out_->Start(); } -void CallClient::OnStatusUpdate(const buzz::tqStatus& status) { +void CallClient::OnStatusUpdate(const buzz::Status& status) { RosterItem item; item.jid = status.jid(); item.show = status.show(); @@ -362,7 +362,7 @@ void CallClient::PrintRoster() { while (iter != roster_->end()) { Console()->Printf("%s - %s", iter->second.jid.BareJid().Str().c_str(), - DescribetqStatus(iter->second.show, iter->second.status)); + DescribeStatus(iter->second.show, iter->second.status)); iter++; } } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h index 24ce1545..d35a6114 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h @@ -29,7 +29,7 @@ namespace buzz { class PresencePushTask; -class tqStatus; +class Status; } namespace cricket { @@ -43,7 +43,7 @@ class Call; struct RosterItem { buzz::Jid jid; - buzz::tqStatus::Show show; + buzz::Status::Show show; std::string status; }; @@ -82,7 +82,7 @@ private: void OnSendStanza(cricket::SessionClient *client, const buzz::XmlElement* stanza); void InitPresence(); - void OnStatusUpdate(const buzz::tqStatus& status); + void OnStatusUpdate(const buzz::Status& status); }; #endif // CRICKET_EXAMPLES_CALL_CALLCLIENT_H__ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc index 7fd68120..a15a6c83 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc @@ -42,27 +42,27 @@ bool ToString(const T &t, return !oss.fail(); } -XmppReturntqStatus -PresenceOutTask::Send(const tqStatus & s) { +XmppReturnStatus +PresenceOutTask::Send(const Status & s) { if (GetState() != STATE_INIT) return XMPP_RETURN_BADSTATE; - stanza_.reset(TranslatetqStatus(s)); + stanza_.reset(TranslateStatus(s)); return XMPP_RETURN_OK; } -XmppReturntqStatus -PresenceOutTask::SendDirected(const Jid & j, const tqStatus & s) { +XmppReturnStatus +PresenceOutTask::SendDirected(const Jid & j, const Status & s) { if (GetState() != STATE_INIT) return XMPP_RETURN_BADSTATE; - XmlElement * presence = TranslatetqStatus(s); + XmlElement * presence = TranslateStatus(s); presence->AddAttr(TQN_TO, j.Str()); stanza_.reset(presence); return XMPP_RETURN_OK; } -XmppReturntqStatus PresenceOutTask::SendProbe(const Jid & jid) { +XmppReturnStatus PresenceOutTask::SendProbe(const Jid & jid) { if (GetState() != STATE_INIT) return XMPP_RETURN_BADSTATE; @@ -82,7 +82,7 @@ PresenceOutTask::ProcessStart() { } XmlElement * -PresenceOutTask::TranslatetqStatus(const tqStatus & s) { +PresenceOutTask::TranslateStatus(const Status & s) { XmlElement * result = new XmlElement(TQN_PRESENCE); if (!s.available()) { result->AddAttr(TQN_TYPE, STR_UNAVAILABLE); @@ -92,19 +92,19 @@ PresenceOutTask::TranslatetqStatus(const tqStatus & s) { result->AddAttr(TQN_TYPE, STR_INVISIBLE); } - if (s.show() != tqStatus::SHOW_ONLINE && s.show() != tqStatus::SHOW_OFFLINE) { + if (s.show() != Status::SHOW_ONLINE && s.show() != Status::SHOW_OFFLINE) { result->AddElement(new XmlElement(TQN_SHOW)); switch (s.show()) { default: result->AddText(STR_SHOW_AWAY, 1); break; - case tqStatus::SHOW_XA: + case Status::SHOW_XA: result->AddText(STR_SHOW_XA, 1); break; - case tqStatus::SHOW_DND: + case Status::SHOW_DND: result->AddText(STR_SHOW_DND, 1); break; - case tqStatus::SHOW_CHAT: + case Status::SHOW_CHAT: result->AddText(STR_SHOW_CHAT, 1); break; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h index 47660514..2b65a553 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h @@ -31,13 +31,13 @@ public: PresenceOutTask(Task * parent) : XmppTask(parent) {} virtual ~PresenceOutTask() {} - XmppReturntqStatus Send(const tqStatus & s); - XmppReturntqStatus SendDirected(const Jid & j, const tqStatus & s); - XmppReturntqStatus SendProbe(const Jid& jid); + XmppReturnStatus Send(const Status & s); + XmppReturnStatus SendDirected(const Jid & j, const Status & s); + XmppReturnStatus SendProbe(const Jid& jid); virtual int ProcessStart(); private: - XmlElement * TranslatetqStatus(const tqStatus & s); + XmlElement * TranslateStatus(const Status & s); scoped_ptr<XmlElement> stanza_; }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc index cee7058a..31d1ae77 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc @@ -77,7 +77,7 @@ PresencePushTask::ProcessStart() { const XmlElement * stanza = NextStanza(); if (stanza == NULL) return STATE_BLOCKED; - tqStatus s; + Status s; s.set_jid(Jid(stanza->Attr(TQN_FROM))); @@ -114,23 +114,23 @@ PresencePushTask::ProcessStart() { const XmlElement * show = stanza->FirstNamed(TQN_SHOW); if (show == NULL || show->FirstChild() == NULL) { - s.set_show(tqStatus::SHOW_ONLINE); + s.set_show(Status::SHOW_ONLINE); } else { if (show->BodyText() == "away") { - s.set_show(tqStatus::SHOW_AWAY); + s.set_show(Status::SHOW_AWAY); } else if (show->BodyText() == "xa") { - s.set_show(tqStatus::SHOW_XA); + s.set_show(Status::SHOW_XA); } else if (show->BodyText() == "dnd") { - s.set_show(tqStatus::SHOW_DND); + s.set_show(Status::SHOW_DND); } else if (show->BodyText() == "chat") { - s.set_show(tqStatus::SHOW_CHAT); + s.set_show(Status::SHOW_CHAT); } else { - s.set_show(tqStatus::SHOW_ONLINE); + s.set_show(Status::SHOW_ONLINE); } } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h index 06c68015..77459647 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h @@ -32,7 +32,7 @@ class PresencePushTask : public XmppTask { public: PresencePushTask(Task * parent) : XmppTask(parent, XmppEngine::HL_TYPE) {} virtual int ProcessStart(); - sigslot::signal1<const tqStatus &>SignalStatusUpdate; + sigslot::signal1<const Status &>SignalStatusUpdate; protected: virtual bool HandleStanza(const XmlElement * stanza); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h index 264ed725..cab9312f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h @@ -26,9 +26,9 @@ namespace buzz { -class tqStatus { +class Status { public: - tqStatus() : + Status() : pri_(0), show_(SHOW_NONE), available_(false), @@ -39,7 +39,7 @@ public: is_google_client_(false), feedback_probation_(false) {}; - ~tqStatus() {} + ~Status() {} // These are arranged in "priority order", i.e., if we see // two statuses at the same priority but with different Shows, @@ -86,7 +86,7 @@ public: void set_feedback_probation(bool f) { feedback_probation_ = f; } void set_sent_time(const std::string& time) { sent_time_ = time; } - void UpdateWith(const tqStatus & new_value) { + void UpdateWith(const Status & new_value) { if (!new_value.know_capabilities()) { bool k = know_capabilities(); bool i = is_google_client(); @@ -105,15 +105,15 @@ public: } } - bool HasQuiettqStatus() const { + bool HasQuietStatus() const { if (status_.empty()) return false; - return !(QuiettqStatus().empty()); + return !(QuietStatus().empty()); } // Knowledge of other clients' silly automatic status strings - // Don't show these. - std::string QuiettqStatus() const { + std::string QuietStatus() const { if (jid_.resource().find("Psi") != std::string::npos) { if (status_ == "Online" || status_.find("Auto Status") != std::string::npos) @@ -123,18 +123,18 @@ public: if (status_ == "Sorry, I ran out for a bit!") return STR_EMPTY; } - return TrimtqStatus(status_); + return TrimStatus(status_); } - std::string ExplicittqStatus() const { - std::string result = QuiettqStatus(); + std::string ExplicitStatus() const { + std::string result = QuietStatus(); if (result.empty()) { - result = ShowtqStatus(); + result = ShowStatus(); } return result; } - std::string ShowtqStatus() const { + std::string ShowStatus() const { std::string result; if (!available()) { result = "Offline"; @@ -159,7 +159,7 @@ public: return result; } - static std::string TrimtqStatus(const std::string & st) { + static std::string TrimStatus(const std::string & st) { std::string s(st); int j = 0; bool collapsing = true; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc index 40e694e2..7d966fb3 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc @@ -68,6 +68,6 @@ void XmppPump::OnMessage(cricket::Message *pmsg) { RunTasks(); } -buzz::XmppReturntqStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) { +buzz::XmppReturnStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) { return client_->SendStanza(stanza); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h index 0314b2fd..fd6f88bb 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h @@ -62,7 +62,7 @@ public: void OnMessage(cricket::Message *pmsg); - buzz::XmppReturntqStatus SendStanza(const buzz::XmlElement *stanza); + buzz::XmppReturnStatus SendStanza(const buzz::XmlElement *stanza); private: buzz::XmppClient *client_; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc index fa6a14a6..959b6f88 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc @@ -86,7 +86,7 @@ public: void OnSocketClosed(); }; -XmppReturntqStatus +XmppReturnStatus XmppClient::Connect(const XmppClientSettings & settings, AsyncSocket * socket, PreXmppAuth * pre_auth) { if (socket == NULL) return XMPP_RETURN_BADARGUMENT; @@ -237,7 +237,7 @@ XmppClient::ProcessResponse() { return STATE_BLOCKED; } -XmppReturntqStatus +XmppReturnStatus XmppClient::Disconnect() { if (d_->socket_.get() == NULL) return XMPP_RETURN_BADSTATE; @@ -263,17 +263,17 @@ XmppClient::NextId() { return d_->engine_->NextId(); } -XmppReturntqStatus +XmppReturnStatus XmppClient::SendStanza(const XmlElement * stanza) { return d_->engine_->SendStanza(stanza); } -XmppReturntqStatus +XmppReturnStatus XmppClient::SendStanzaError(const XmlElement * old_stanza, XmppStanzaError xse, const std::string & message) { return d_->engine_->SendStanzaError(old_stanza, xse, message); } -XmppReturntqStatus +XmppReturnStatus XmppClient::SendRaw(const std::string & text) { return d_->engine_->SendRaw(text); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h index fd65c39c..f8b4798c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h @@ -74,14 +74,14 @@ public: XmppClient(Task * parent); ~XmppClient(); - XmppReturntqStatus Connect(const XmppClientSettings & settings, + XmppReturnStatus Connect(const XmppClientSettings & settings, AsyncSocket * socket, PreXmppAuth * preauth); virtual Task * GetParent(int code); virtual int ProcessStart(); virtual int ProcessResponse(); - XmppReturntqStatus Disconnect(); + XmppReturnStatus Disconnect(); const Jid & jid(); sigslot::signal1<XmppEngine::State> SignalStateChange; @@ -97,9 +97,9 @@ public: std::string GetAuthCookie(); std::string NextId(); - XmppReturntqStatus SendStanza(const XmlElement *stanza); - XmppReturntqStatus SendRaw(const std::string & text); - XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal, + XmppReturnStatus SendStanza(const XmlElement *stanza); + XmppReturnStatus SendRaw(const std::string & text); + XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal, XmppStanzaError code, const std::string & text); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h index 58576328..1497c3ec 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h @@ -66,9 +66,9 @@ enum XmppStanzaError { XSE_UNEXPECTED_REQUEST, }; -// XmppReturntqStatus +// XmppReturnStatus // This is used by API functions to synchronously return status. -enum XmppReturntqStatus { +enum XmppReturnStatus { XMPP_RETURN_OK, XMPP_RETURN_BADARGUMENT, XMPP_RETURN_BADSTATE, @@ -171,34 +171,34 @@ public: // SOCKET INPUT AND OUTPUT ------------------------------------------------ //! Registers the handler for socket output - virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0; + virtual XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0; //! Provides socket input to the engine - virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len) = 0; + virtual XmppReturnStatus HandleInput(const char * bytes, size_t len) = 0; //! Advises the engine that the socket has closed - virtual XmppReturntqStatus ConnectionClosed() = 0; + virtual XmppReturnStatus ConnectionClosed() = 0; // SESSION SETUP --------------------------------------------------------- //! Indicates the (bare) JID for the user to use. - virtual XmppReturntqStatus SetUser(const Jid & jid)= 0; + virtual XmppReturnStatus SetUser(const Jid & jid)= 0; //! Get the login (bare) JID. virtual const Jid & GetUser() = 0; //! Provides different methods for credentials for login. //! Takes ownership of this object; deletes when login is done - virtual XmppReturntqStatus SetSaslHandler(SaslHandler * h) = 0; + virtual XmppReturnStatus SetSaslHandler(SaslHandler * h) = 0; //! Sets whether TLS will be used within the connection (default true). - virtual XmppReturntqStatus SetUseTls(bool useTls) = 0; + virtual XmppReturnStatus SetUseTls(bool useTls) = 0; //! Sets an alternate domain from which we allows TLS certificates. //! This is for use in the case where a we want to allow a proxy to //! serve up its own certificate rather than one owned by the underlying //! domain. - virtual XmppReturntqStatus SetTlsServerDomain(const std::string & proxy_domain) = 0; + virtual XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain) = 0; //! Gets whether TLS will be used within the connection. virtual bool GetUseTls() = 0; @@ -206,7 +206,7 @@ public: //! Sets the request resource name, if any (optional). //! Note that the resource name may be overridden by the server; after //! binding, the actual resource name is available as part of FullJid(). - virtual XmppReturntqStatus SetRequestedResource(const std::string& resource) = 0; + virtual XmppReturnStatus SetRequestedResource(const std::string& resource) = 0; //! Gets the request resource name. virtual const std::string & GetRequestedResource() = 0; @@ -214,12 +214,12 @@ public: // SESSION MANAGEMENT --------------------------------------------------- //! Set callback for state changes. - virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler) = 0; + virtual XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler) = 0; //! Initiates the XMPP connection. //! After supplying connection settings, call this once to initiate, //! (optionally) encrypt, authenticate, and bind the connection. - virtual XmppReturntqStatus Connect() = 0; + virtual XmppReturnStatus Connect() = 0; //! The current engine state. virtual State GetState() = 0; @@ -240,7 +240,7 @@ public: //! Sends CloseConnection to output, and disconnects and registered //! session handlers. After Disconnect completes, it is guaranteed //! that no further callbacks will be made. - virtual XmppReturntqStatus Disconnect() = 0; + virtual XmppReturnStatus Disconnect() = 0; // APPLICATION USE ------------------------------------------------------- @@ -257,33 +257,33 @@ public: //! Adds a listener for session events. //! Stanza delivery is chained to session handlers; the first to //! return 'true' is the last to get each stanza. - virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0; + virtual XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0; //! Removes a listener for session events. - virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0; + virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0; //! Sends a stanza to the server. - virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza) = 0; + virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza) = 0; //! Sends raw text to the server - virtual XmppReturntqStatus SendRaw(const std::string & text) = 0; + virtual XmppReturnStatus SendRaw(const std::string & text) = 0; //! Sends an iq to the server, and registers a callback for the result. //! Returns the cookie passed to the result handler. - virtual XmppReturntqStatus SendIq(const XmlElement* pelStanza, + virtual XmppReturnStatus SendIq(const XmlElement* pelStanza, XmppIqHandler* iq_handler, XmppIqCookie* cookie) = 0; //! Unregisters an iq callback handler given its cookie. //! No callback will come to this handler after it's unregistered. - virtual XmppReturntqStatus RemoveIqHandler(XmppIqCookie cookie, + virtual XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie, XmppIqHandler** iq_handler) = 0; //! Forms and sends an error in response to the given stanza. //! Swaps to and from, sets type to "error", and adds error information //! based on the passed code. Text is optional and may be STR_EMPTY. - virtual XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal, + virtual XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal, XmppStanzaError code, const std::string & text) = 0; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc index c9569524..3d363a78 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc @@ -85,7 +85,7 @@ XmppEngineImpl::~XmppEngineImpl() { DeleteIqCookies(); } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -95,7 +95,7 @@ XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) { return XMPP_RETURN_OK; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -105,7 +105,7 @@ XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) { return XMPP_RETURN_OK; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::HandleInput(const char * bytes, size_t len) { if (state_ < STATE_OPENING || state_ > STATE_OPEN) return XMPP_RETURN_BADSTATE; @@ -117,7 +117,7 @@ XmppEngineImpl::HandleInput(const char * bytes, size_t len) { return XMPP_RETURN_OK; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::ConnectionClosed() { if (state_ != STATE_CLOSED) { EnterExit ee(this); @@ -128,7 +128,7 @@ XmppEngineImpl::ConnectionClosed() { return XMPP_RETURN_OK; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::SetUseTls(bool useTls) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -138,7 +138,7 @@ XmppEngineImpl::SetUseTls(bool useTls) { return XMPP_RETURN_OK; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::SetTlsServerDomain(const std::string & tls_server_domain) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -153,7 +153,7 @@ XmppEngineImpl::GetUseTls() { return tls_needed_; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::SetUser(const Jid & jid) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -168,7 +168,7 @@ XmppEngineImpl::GetUser() { return user_jid_; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -177,7 +177,7 @@ XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) { return XMPP_RETURN_OK; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::SetRequestedResource(const std::string & resource) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -192,7 +192,7 @@ XmppEngineImpl::GetRequestedResource() { return requested_resource_; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler, XmppEngine::HandlerLevel level) { if (state_ == STATE_CLOSED) @@ -203,7 +203,7 @@ XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler, return XMPP_RETURN_OK; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) { bool found = false; @@ -227,7 +227,7 @@ XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) { return XMPP_RETURN_OK; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::Connect() { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -245,7 +245,7 @@ XmppEngineImpl::Connect() { return XMPP_RETURN_OK; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::SendStanza(const XmlElement * element) { if (state_ == STATE_CLOSED) return XMPP_RETURN_BADSTATE; @@ -263,7 +263,7 @@ XmppEngineImpl::SendStanza(const XmlElement * element) { return XMPP_RETURN_OK; } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::SendRaw(const std::string & text) { if (state_ == STATE_CLOSED || login_task_.get()) return XMPP_RETURN_BADSTATE; @@ -282,7 +282,7 @@ XmppEngineImpl::NextId() { return ss.str(); } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::Disconnect() { if (state_ != STATE_CLOSED) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h index 6011d9e8..c36f168c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h @@ -57,33 +57,33 @@ public: // SOCKET INPUT AND OUTPUT ------------------------------------------------ //! Registers the handler for socket output - virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh); + virtual XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh); //! Provides socket input to the engine - virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len); + virtual XmppReturnStatus HandleInput(const char * bytes, size_t len); //! Advises the engine that the socket has closed - virtual XmppReturntqStatus ConnectionClosed(); + virtual XmppReturnStatus ConnectionClosed(); // SESSION SETUP --------------------------------------------------------- //! Indicates the (bare) JID for the user to use. - virtual XmppReturntqStatus SetUser(const Jid & jid); + virtual XmppReturnStatus SetUser(const Jid & jid); //! Get the login (bare) JID. virtual const Jid & GetUser(); //! Indicates the autentication to use. Takes ownership of the object. - virtual XmppReturntqStatus SetSaslHandler(SaslHandler * sasl_handler); + virtual XmppReturnStatus SetSaslHandler(SaslHandler * sasl_handler); //! Sets whether TLS will be used within the connection (default true). - virtual XmppReturntqStatus SetUseTls(bool useTls); + virtual XmppReturnStatus SetUseTls(bool useTls); //! Sets an alternate domain from which we allows TLS certificates. //! This is for use in the case where a we want to allow a proxy to //! serve up its own certificate rather than one owned by the underlying //! domain. - virtual XmppReturntqStatus SetTlsServerDomain(const std::string & proxy_domain); + virtual XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain); //! Gets whether TLS will be used within the connection. virtual bool GetUseTls(); @@ -91,7 +91,7 @@ public: //! Sets the request resource name, if any (optional). //! Note that the resource name may be overridden by the server; after //! binding, the actual resource name is available as part of FullJid(). - virtual XmppReturntqStatus SetRequestedResource(const std::string& resource); + virtual XmppReturnStatus SetRequestedResource(const std::string& resource); //! Gets the request resource name. virtual const std::string & GetRequestedResource(); @@ -99,12 +99,12 @@ public: // SESSION MANAGEMENT --------------------------------------------------- //! Set callback for state changes. - virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler); + virtual XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler); //! Initiates the XMPP connection. //! After supplying connection settings, call this once to initiate, //! (optionally) encrypt, authenticate, and bind the connection. - virtual XmppReturntqStatus Connect(); + virtual XmppReturnStatus Connect(); //! The current engine state. virtual State GetState() { return state_; } @@ -125,40 +125,40 @@ public: //! Sends CloseConnection to output, and disconnects and registered //! session handlers. After Disconnect completes, it is guaranteed //! that no further callbacks will be made. - virtual XmppReturntqStatus Disconnect(); + virtual XmppReturnStatus Disconnect(); // APPLICATION USE ------------------------------------------------------- //! Adds a listener for session events. //! Stanza delivery is chained to session handlers; the first to //! return 'true' is the last to get each stanza. - virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler, + virtual XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler, XmppEngine::HandlerLevel level); //! Removes a listener for session events. - virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler); + virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler); //! Sends a stanza to the server. - virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza); + virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza); //! Sends raw text to the server - virtual XmppReturntqStatus SendRaw(const std::string & text); + virtual XmppReturnStatus SendRaw(const std::string & text); //! Sends an iq to the server, and registers a callback for the result. //! Returns the cookie passed to the result handler. - virtual XmppReturntqStatus SendIq(const XmlElement* pelStanza, + virtual XmppReturnStatus SendIq(const XmlElement* pelStanza, XmppIqHandler* iq_handler, XmppIqCookie* cookie); //! Unregisters an iq callback handler given its cookie. //! No callback will come to this handler after it's unregistered. - virtual XmppReturntqStatus RemoveIqHandler(XmppIqCookie cookie, + virtual XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie, XmppIqHandler** iq_handler); //! Forms and sends an error in response to the given stanza. //! Swaps to and from, sets type to "error", and adds error information //! based on the passed code. Text is optional and may be STR_EMPTY. - virtual XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal, + virtual XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal, XmppStanzaError code, const std::string & text); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc index 38f268b9..7987856e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc @@ -54,7 +54,7 @@ private: }; -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler, XmppIqCookie* cookie) { if (state_ == STATE_CLOSED) @@ -85,7 +85,7 @@ XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler, } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::RemoveIqHandler(XmppIqCookie cookie, XmppIqHandler ** iq_handler) { @@ -199,7 +199,7 @@ AddErrorCode(XmlElement * error_element, XmppStanzaError code) { } -XmppReturntqStatus +XmppReturnStatus XmppEngineImpl::SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc index e7ac0e04..c9d86ba6 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc @@ -55,14 +55,14 @@ XmppTask::StopImpl() { } } -XmppReturntqStatus +XmppReturnStatus XmppTask::SendStanza(const XmlElement * stanza) { if (client_ == NULL) return XMPP_RETURN_BADSTATE; return client_->SendStanza(stanza); } -XmppReturntqStatus +XmppReturnStatus XmppTask::SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h index a1ed3dd3..0bd7c4b8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h @@ -78,9 +78,9 @@ public: protected: friend class XmppClient; - XmppReturntqStatus SendStanza(const XmlElement * stanza); - XmppReturntqStatus SetResult(const std::string & code); - XmppReturntqStatus SendStanzaError(const XmlElement * element_original, + XmppReturnStatus SendStanza(const XmlElement * stanza); + XmppReturnStatus SetResult(const std::string & code); + XmppReturnStatus SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text); diff --git a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch index 4632af45..2a6a4806 100644 --- a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch +++ b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch @@ -7,8 +7,8 @@ Index: iris/include/im.h bool groupChatJoin(const QString &host, const QString &room, const QString &nick); + bool groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString &password); - void groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &); - void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const tqStatus &); + void groupChatSetStatus(const QString &host, const QString &room, const Status &); + void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const Status &); void groupChatLeave(const QString &host, const QString &room); Index: iris/xmpp-im/client.cpp =================================================================== @@ -41,13 +41,13 @@ Index: iris/xmpp-im/client.cpp + d->groupChatList += i; + + JT_MucPresence *j = new JT_MucPresence(rootTask()); -+ j->pres(jid, tqStatus(), password); ++ j->pres(jid, Status(), password); + j->go(true); + + return true; +} + - void Client::groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &_s) + void Client::groupChatSetStatus(const QString &host, const QString &room, const Status &_s) { Jid jid(room + "@" + host); Index: iris/xmpp-im/xmpp_tasks.h @@ -66,8 +66,8 @@ Index: iris/xmpp-im/xmpp_tasks.h + JT_MucPresence(Task *parent); + ~JT_MucPresence(); + -+ void pres(const tqStatus &); -+ void pres(const Jid &, const tqStatus &, const QString &password); ++ void pres(const Status &); ++ void pres(const Jid &, const Status &, const QString &password); + + void onGo(); + @@ -102,7 +102,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp +{ +} + -+void JT_MucPresence::pres(const tqStatus &s) ++void JT_MucPresence::pres(const Status &s) +{ + type = 0; + @@ -146,7 +146,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp + } +} + -+void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const QString &password) ++void JT_MucPresence::pres(const Jid &to, const Status &s, const QString &password) +{ + pres(s); + tag.setAttribute("to", to.full()); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp index cd5b2f64..f20c054f 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp @@ -358,7 +358,7 @@ void HttpPoll::resetKey() fprintf(stderr, "HttpPoll: reset key!\n"); #endif TQByteArray a = randomArray(64); - TQString str = TQString::tqfromLatin1(a.data(), a.size()); + TQString str = TQString::fromLatin1(a.data(), a.size()); d->key_n = POLL_KEYS; for(int n = 0; n < POLL_KEYS; ++n) diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp index 16f02e07..e4e1b182 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp @@ -122,7 +122,7 @@ static int sp_read_udp(TQByteArray *from, SPS_UDP *s) return 0; TQCString cs(host_len+1); memcpy(cs.data(), from->data() + 5, host_len); - host = TQString::tqfromLatin1(cs); + host = TQString::fromLatin1(cs); } else if(atype == 0x04) { full_len += 16; @@ -467,7 +467,7 @@ static int sp_get_request(TQByteArray *from, SPS_CONNREQ *s) return 0; TQCString cs(host_len+1); memcpy(cs.data(), from->data() + 5, host_len); - host = TQString::tqfromLatin1(cs); + host = TQString::fromLatin1(cs); } else if(atype == 0x04) { full_len += 16; diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp index c9726d75..fcdd3d49 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp @@ -146,7 +146,7 @@ TQString Base64::arrayToString(const TQByteArray &a) TQCString c; c.resize(b.size()+1); memcpy(c.data(), b.data(), b.size()); - return TQString::tqfromLatin1(c); + return TQString::fromLatin1(c); } //! diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h index 8387d48a..835eed62 100644 --- a/kopete/protocols/jabber/libiris/iris/include/im.h +++ b/kopete/protocols/jabber/libiris/iris/include/im.h @@ -136,11 +136,11 @@ namespace XMPP SubType value; }; - class tqStatus + class Status { public: - tqStatus(const TQString &show="", const TQString &status="", int priority=0, bool available=true); - ~tqStatus(); + Status(const TQString &show="", const TQString &status="", int priority=0, bool available=true); + ~Status(); int priority() const; const TQString & show() const; @@ -162,7 +162,7 @@ namespace XMPP void setPriority(int); void setShow(const TQString &); - void settqStatus(const TQString &); + void setStatus(const TQString &); void setTimeStamp(const TQDateTime &); void setKeyID(const TQString &); void setIsAvailable(bool); @@ -197,19 +197,19 @@ namespace XMPP class Resource { public: - Resource(const TQString &name="", const tqStatus &s=tqStatus()); + Resource(const TQString &name="", const Status &s=Status()); ~Resource(); const TQString & name() const; int priority() const; - const tqStatus & status() const; + const Status & status() const; void setName(const TQString &); - void settqStatus(const tqStatus &); + void setStatus(const Status &); private: TQString v_name; - tqStatus v_status; + Status v_status; class ResourcePrivate *d; }; @@ -570,7 +570,7 @@ namespace XMPP void rosterRequest(); void sendMessage(const Message &); void sendSubscription(const Jid &, const TQString &); - void setPresence(const tqStatus &); + void setPresence(const Status &); void debug(const TQString &); TQString genUniqueId(); @@ -610,8 +610,8 @@ namespace XMPP bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick); bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick, const TQString &password); - void groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &); - void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &); + void groupChatSetStatus(const TQString &host, const TQString &room, const Status &); + void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &); void groupChatLeave(const TQString &host, const TQString &room); signals: @@ -632,7 +632,7 @@ namespace XMPP void xmlOutgoing(const TQString &); void groupChatJoined(const Jid &); void groupChatLeft(const Jid &); - void groupChatPresence(const Jid &, const tqStatus &); + void groupChatPresence(const Jid &, const Status &); void groupChatError(const Jid &, int, const TQString &); void incomingJidLink(); @@ -652,7 +652,7 @@ namespace XMPP // basic daemons void ppSubscription(const Jid &, const TQString &); - void ppPresence(const Jid &, const tqStatus &); + void ppPresence(const Jid &, const Status &); void pmMessage(const Message &); void prRoster(const Roster &); @@ -666,8 +666,8 @@ namespace XMPP void distribute(const TQDomElement &); void importRoster(const Roster &); void importRosterItem(const RosterItem &); - void updateSelfPresence(const Jid &, const tqStatus &); - void updatePresence(LiveRosterItem *, const Jid &, const tqStatus &); + void updateSelfPresence(const Jid &, const Status &); + void updatePresence(LiveRosterItem *, const Jid &, const Status &); class ClientPrivate; ClientPrivate *d; @@ -689,15 +689,15 @@ namespace XMPP ResourceList::ConstIterator priority() const; bool isAvailable() const; - const tqStatus & lastUnavailabletqStatus() const; + const Status & lastUnavailableStatus() const; bool flagForDelete() const; - void setLastUnavailabletqStatus(const tqStatus &); + void setLastUnavailableStatus(const Status &); void setFlagForDelete(bool); private: ResourceList v_resourceList; - tqStatus v_lastUnavailabletqStatus; + Status v_lastUnavailableStatus; bool v_flagForDelete; class LiveRosterItemPrivate; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index 973b6c73..69737a24 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -208,13 +208,13 @@ void Client::start(const TQString &host, const TQString &user, const TQString &p d->pass = pass; d->resource = _resource; - tqStatus stat; + Status stat; stat.setIsAvailable(false); d->resourceList += Resource(resource(), stat); JT_PushPresence *pp = new JT_PushPresence(rootTask()); connect(pp, TQT_SIGNAL(subscription(const Jid &, const TQString &)), TQT_SLOT(ppSubscription(const Jid &, const TQString &))); - connect(pp, TQT_SIGNAL(presence(const Jid &, const tqStatus &)), TQT_SLOT(ppPresence(const Jid &, const tqStatus &))); + connect(pp, TQT_SIGNAL(presence(const Jid &, const Status &)), TQT_SLOT(ppPresence(const Jid &, const Status &))); JT_PushMessage *pm = new JT_PushMessage(rootTask()); connect(pm, TQT_SIGNAL(message(const Message &)), TQT_SLOT(pmMessage(const Message &))); @@ -267,7 +267,7 @@ bool Client::isActive() const return d->active; } -void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &_s) +void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &_s) { Jid jid(room + "@" + host + "/" + nick); for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { @@ -275,7 +275,7 @@ void Client::groupChatChangeNick(const TQString &host, const TQString &room, con if(i.j.compare(jid, false)) { i.j = jid; - tqStatus s = _s; + Status s = _s; s.setIsAvailable(true); JT_Presence *j = new JT_Presence(rootTask()); @@ -310,7 +310,7 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS d->groupChatList += i; JT_Presence *j = new JT_Presence(rootTask()); - j->pres(jid, tqStatus()); + j->pres(jid, Status()); j->go(true); return true; @@ -339,13 +339,13 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS d->groupChatList += i; JT_MucPresence *j = new JT_MucPresence(rootTask()); - j->pres(jid, tqStatus(), password); + j->pres(jid, Status(), password); j->go(true); return true; } -void Client::groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &_s) +void Client::groupChatSetStatus(const TQString &host, const TQString &room, const Status &_s) { Jid jid(room + "@" + host); bool found = false; @@ -360,7 +360,7 @@ void Client::groupChatSettqStatus(const TQString &host, const TQString &room, co if(!found) return; - tqStatus s = _s; + Status s = _s; s.setIsAvailable(true); JT_Presence *j = new JT_Presence(rootTask()); @@ -381,7 +381,7 @@ void Client::groupChatLeave(const TQString &host, const TQString &room) debug(TQString("Client: Leaving: [%1]\n").tqarg(i.j.full())); JT_Presence *j = new JT_Presence(rootTask()); - tqStatus s; + Status s; s.setIsAvailable(false); j->pres(i.j, s); j->go(true); @@ -410,7 +410,7 @@ void Client::close(bool) i.status = GroupChat::Closing; JT_Presence *j = new JT_Presence(rootTask()); - tqStatus s; + Status s; s.setIsAvailable(false); j->pres(i.j, s); j->go(true); @@ -713,7 +713,7 @@ void Client::ppSubscription(const Jid &j, const TQString &s) subscription(j, s); } -void Client::ppPresence(const Jid &j, const tqStatus &s) +void Client::ppPresence(const Jid &j, const Status &s) { if(s.isAvailable()) debug(TQString("Client: %1 is available.\n").tqarg(j.full())); @@ -789,7 +789,7 @@ void Client::ppPresence(const Jid &j, const tqStatus &s) } } -void Client::updateSelfPresence(const Jid &j, const tqStatus &s) +void Client::updateSelfPresence(const Jid &j, const Status &s) { ResourceList::Iterator rit = d->resourceList.find(j.resource()); bool found = (rit == d->resourceList.end()) ? false: true; @@ -798,7 +798,7 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s) if(!s.isAvailable()) { if(found) { debug(TQString("Client: Removing self resource: name=[%1]\n").tqarg(j.resource())); - (*rit).settqStatus(s); + (*rit).setStatus(s); resourceUnavailable(j, *rit); d->resourceList.remove(rit); } @@ -812,7 +812,7 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s) debug(TQString("Client: Adding self resource: name=[%1]\n").tqarg(j.resource())); } else { - (*rit).settqStatus(s); + (*rit).setStatus(s); r = *rit; debug(TQString("Client: Updating self resource: name=[%1]\n").tqarg(j.resource())); } @@ -821,7 +821,7 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s) } } -void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s) +void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) { ResourceList::Iterator rit = i->resourceList().find(j.resource()); bool found = (rit == i->resourceList().end()) ? false: true; @@ -829,11 +829,11 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s) // unavailable? remove the resource if(!s.isAvailable()) { if(found) { - (*rit).settqStatus(s); + (*rit).setStatus(s); debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); resourceUnavailable(j, *rit); i->resourceList().remove(rit); - i->setLastUnavailabletqStatus(s); + i->setLastUnavailableStatus(s); } } // available? add/update the resource @@ -845,7 +845,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s) debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); } else { - (*rit).settqStatus(s); + (*rit).setStatus(s); r = *rit; debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); } @@ -994,7 +994,7 @@ void Client::sendSubscription(const Jid &jid, const TQString &type) j->go(true); } -void Client::setPresence(const tqStatus &s) +void Client::setPresence(const Status &s) { JT_Presence *j = new JT_Presence(rootTask()); j->pres(s); @@ -1004,7 +1004,7 @@ void Client::setPresence(const tqStatus &s) ppPresence(jid(), s); //ResourceList::Iterator rit = d->resourceList.find(resource()); //Resource &r = *rit; - //r.settqStatus(s); + //r.setStatus(s); } TQString Client::OSName() const @@ -1462,9 +1462,9 @@ bool LiveRosterItem::isAvailable() const return false; } -const tqStatus & LiveRosterItem::lastUnavailabletqStatus() const +const Status & LiveRosterItem::lastUnavailableStatus() const { - return v_lastUnavailabletqStatus; + return v_lastUnavailableStatus; } bool LiveRosterItem::flagForDelete() const @@ -1472,9 +1472,9 @@ bool LiveRosterItem::flagForDelete() const return v_flagForDelete; } -void LiveRosterItem::setLastUnavailabletqStatus(const tqStatus &s) +void LiveRosterItem::setLastUnavailableStatus(const Status &s) { - v_lastUnavailabletqStatus = s; + v_lastUnavailableStatus = s; } void LiveRosterItem::setFlagForDelete(bool b) diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index 9e742d10..5700c343 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -697,7 +697,7 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset) d->spooled = true; } else { - d->timeStamp = TQDateTime::tqcurrentDateTime(); + d->timeStamp = TQDateTime::currentDateTime(); d->spooled = false; } @@ -801,100 +801,100 @@ bool Subscription::fromString(const TQString &s) //--------------------------------------------------------------------------- -// tqStatus +// Status //--------------------------------------------------------------------------- -tqStatus::tqStatus(const TQString &show, const TQString &status, int priority, bool available) +Status::Status(const TQString &show, const TQString &status, int priority, bool available) { v_isAvailable = available; v_show = show; v_status = status; v_priority = priority; - v_timeStamp = TQDateTime::tqcurrentDateTime(); + v_timeStamp = TQDateTime::currentDateTime(); v_isInvisible = false; ecode = -1; } -tqStatus::~tqStatus() +Status::~Status() { } -bool tqStatus::hasError() const +bool Status::hasError() const { return (ecode != -1); } -void tqStatus::setError(int code, const TQString &str) +void Status::setError(int code, const TQString &str) { ecode = code; estr = str; } -void tqStatus::setIsAvailable(bool available) +void Status::setIsAvailable(bool available) { v_isAvailable = available; } -void tqStatus::setIsInvisible(bool invisible) +void Status::setIsInvisible(bool invisible) { v_isInvisible = invisible; } -void tqStatus::setPriority(int x) +void Status::setPriority(int x) { v_priority = x; } -void tqStatus::setShow(const TQString & _show) +void Status::setShow(const TQString & _show) { v_show = _show; } -void tqStatus::settqStatus(const TQString & _status) +void Status::setStatus(const TQString & _status) { v_status = _status; } -void tqStatus::setTimeStamp(const TQDateTime & _timestamp) +void Status::setTimeStamp(const TQDateTime & _timestamp) { v_timeStamp = _timestamp; } -void tqStatus::setKeyID(const TQString &key) +void Status::setKeyID(const TQString &key) { v_key = key; } -void tqStatus::setXSigned(const TQString &s) +void Status::setXSigned(const TQString &s) { v_xsigned = s; } -void tqStatus::setSongTitle(const TQString & _songtitle) +void Status::setSongTitle(const TQString & _songtitle) { v_songTitle = _songtitle; } -void tqStatus::setCapsNode(const TQString & _capsNode) +void Status::setCapsNode(const TQString & _capsNode) { v_capsNode = _capsNode; } -void tqStatus::setCapsVersion(const TQString & _capsVersion) +void Status::setCapsVersion(const TQString & _capsVersion) { v_capsVersion = _capsVersion; } -void tqStatus::setCapsExt(const TQString & _capsExt) +void Status::setCapsExt(const TQString & _capsExt) { v_capsExt = _capsExt; } -bool tqStatus::isAvailable() const +bool Status::isAvailable() const { return v_isAvailable; } -bool tqStatus::isAway() const +bool Status::isAway() const { if(v_show == "away" || v_show == "xa" || v_show == "dnd") return true; @@ -902,66 +902,66 @@ bool tqStatus::isAway() const return false; } -bool tqStatus::isInvisible() const +bool Status::isInvisible() const { return v_isInvisible; } -int tqStatus::priority() const +int Status::priority() const { return v_priority; } -const TQString & tqStatus::show() const +const TQString & Status::show() const { return v_show; } -const TQString & tqStatus::status() const +const TQString & Status::status() const { return v_status; } -TQDateTime tqStatus::timeStamp() const +TQDateTime Status::timeStamp() const { return v_timeStamp; } -const TQString & tqStatus::keyID() const +const TQString & Status::keyID() const { return v_key; } -const TQString & tqStatus::xsigned() const +const TQString & Status::xsigned() const { return v_xsigned; } -const TQString & tqStatus::songTitle() const +const TQString & Status::songTitle() const { return v_songTitle; } -const TQString & tqStatus::capsNode() const +const TQString & Status::capsNode() const { return v_capsNode; } -const TQString & tqStatus::capsVersion() const +const TQString & Status::capsVersion() const { return v_capsVersion; } -const TQString & tqStatus::capsExt() const +const TQString & Status::capsExt() const { return v_capsExt; } -int tqStatus::errorCode() const +int Status::errorCode() const { return ecode; } -const TQString & tqStatus::errorString() const +const TQString & Status::errorString() const { return estr; } @@ -970,7 +970,7 @@ const TQString & tqStatus::errorString() const //--------------------------------------------------------------------------- // Resource //--------------------------------------------------------------------------- -Resource::Resource(const TQString &name, const tqStatus &stat) +Resource::Resource(const TQString &name, const Status &stat) { v_name = name; v_status = stat; @@ -990,7 +990,7 @@ int Resource::priority() const return v_status.priority(); } -const tqStatus & Resource::status() const +const Status & Resource::status() const { return v_status; } @@ -1000,7 +1000,7 @@ void Resource::setName(const TQString & _name) v_name = _name; } -void Resource::settqStatus(const tqStatus & _status) +void Resource::setStatus(const Status & _status) { v_status = _status; } diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp index 89d66796..c6e05909 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -485,7 +485,7 @@ JT_Presence::~JT_Presence() { } -void JT_Presence::pres(const tqStatus &s) +void JT_Presence::pres(const Status &s) { type = 0; @@ -529,7 +529,7 @@ void JT_Presence::pres(const tqStatus &s) } } -void JT_Presence::pres(const Jid &to, const tqStatus &s) +void JT_Presence::pres(const Jid &to, const Status &s) { pres(s); tag.setAttribute("to", to.full()); @@ -569,7 +569,7 @@ bool JT_PushPresence::take(const TQDomElement &e) return false; Jid j(e.attribute("from")); - tqStatus p; + Status p; if(e.hasAttribute("type")) { TQString type = e.attribute("type"); @@ -593,7 +593,7 @@ bool JT_PushPresence::take(const TQDomElement &e) tag = findSubTag(e, "status", &found); if(found) - p.settqStatus(tagContent(tag)); + p.setStatus(tagContent(tag)); tag = findSubTag(e, "show", &found); if(found) p.setShow(tagContent(tag)); @@ -1338,7 +1338,7 @@ bool JT_ServInfo::take(const TQDomElement &e) // TQDomElement query = doc()->createElement("query"); // query.setAttribute("xmlns", "jabber:iq:time"); // iq.appendChild(query); - // TQDateTime local = TQDateTime::tqcurrentDateTime(); + // TQDateTime local = TQDateTime::currentDateTime(); // TQDateTime utc = local.addSecs(-getTZOffset() * 3600); // TQString str = getTZString(); // query.appendChild(textTag("utc", TS2stamp(utc))); @@ -1969,7 +1969,7 @@ JT_MucPresence::~JT_MucPresence() { } -void JT_MucPresence::pres(const tqStatus &s) +void JT_MucPresence::pres(const Status &s) { type = 0; @@ -2013,7 +2013,7 @@ void JT_MucPresence::pres(const tqStatus &s) } } -void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const TQString &password) +void JT_MucPresence::pres(const Jid &to, const Status &s, const TQString &password) { pres(s); tag.setAttribute("to", to.full()); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h index 9a8041e9..0a1fdac5 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h @@ -30,7 +30,7 @@ namespace XMPP { class Roster; - class tqStatus; + class Status; class JT_Register : public Task { @@ -135,8 +135,8 @@ namespace XMPP JT_Presence(Task *parent); ~JT_Presence(); - void pres(const tqStatus &); - void pres(const Jid &, const tqStatus &); + void pres(const Status &); + void pres(const Jid &, const Status &); void sub(const Jid &, const TQString &subType); void onGo(); @@ -160,7 +160,7 @@ namespace XMPP bool take(const TQDomElement &); signals: - void presence(const Jid &, const tqStatus &); + void presence(const Jid &, const Status &); void subscription(const Jid &, const TQString &); private: @@ -468,8 +468,8 @@ namespace XMPP JT_MucPresence(Task *parent); ~JT_MucPresence(); - void pres(const tqStatus &); - void pres(const Jid &, const tqStatus &, const TQString &password); + void pres(const Status &); + void pres(const Jid &, const Status &, const TQString &password); void onGo(); diff --git a/kopete/protocols/jabber/libiris/jingle_iris.patch b/kopete/protocols/jabber/libiris/jingle_iris.patch index 489afab4..41acad0e 100644 --- a/kopete/protocols/jabber/libiris/jingle_iris.patch +++ b/kopete/protocols/jabber/libiris/jingle_iris.patch @@ -185,44 +185,44 @@ diff -ur psi/iris/xmpp-im/types.cpp psi-jingle/iris/xmpp-im/types.cpp v_songTitle = _songtitle; } -+void tqStatus::setCapsNode(const QString & _capsNode) ++void Status::setCapsNode(const QString & _capsNode) +{ + v_capsNode = _capsNode; +} + -+void tqStatus::setCapsVersion(const QString & _capsVersion) ++void Status::setCapsVersion(const QString & _capsVersion) +{ + v_capsVersion = _capsVersion; +} + -+void tqStatus::setCapsExt(const QString & _capsExt) ++void Status::setCapsExt(const QString & _capsExt) +{ + v_capsExt = _capsExt; +} + - bool tqStatus::isAvailable() const + bool Status::isAvailable() const { return v_isAvailable; @@ -836,6 +851,21 @@ return v_songTitle; } -+const QString & tqStatus::capsNode() const ++const QString & Status::capsNode() const +{ + return v_capsNode; +} + -+const QString & tqStatus::capsVersion() const ++const QString & Status::capsVersion() const +{ + return v_capsVersion; +} + -+const QString & tqStatus::capsExt() const ++const QString & Status::capsExt() const +{ + return v_capsExt; +} + - int tqStatus::errorCode() const + int Status::errorCode() const { return ecode; @@ -1427,6 +1457,15 @@ diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.cpp b/kopete/protocols/jabber/libiris/qca/src/qca.cpp index 1996b103..bad05fcd 100644 --- a/kopete/protocols/jabber/libiris/qca/src/qca.cpp +++ b/kopete/protocols/jabber/libiris/qca/src/qca.cpp @@ -586,7 +586,7 @@ TQString RSAKey::toPEM(bool publicOnly) const TQCString cs; cs.resize(out.size()+1); memcpy(cs.data(), out.data(), out.size()); - return TQString::tqfromLatin1(cs); + return TQString::fromLatin1(cs); } bool RSAKey::fromPEM(const TQString &str) @@ -794,7 +794,7 @@ TQString Cert::toPEM() const TQCString cs; cs.resize(out.size()+1); memcpy(cs.data(), out.data(), out.size()); - return TQString::tqfromLatin1(cs); + return TQString::fromLatin1(cs); } bool Cert::fromPEM(const TQString &str) diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui index c0b3d1cc..43b063e4 100644 --- a/kopete/protocols/jabber/ui/dlgaddcontact.ui +++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>190</height> diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui index cb0f1cc2..a1d61833 100644 --- a/kopete/protocols/jabber/ui/dlgbrowse.ui +++ b/kopete/protocols/jabber/ui/dlgbrowse.ui @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> diff --git a/kopete/protocols/jabber/ui/dlgchangepassword.ui b/kopete/protocols/jabber/ui/dlgchangepassword.ui index 29ae6d33..c1469a8d 100644 --- a/kopete/protocols/jabber/ui/dlgchangepassword.ui +++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui @@ -57,7 +57,7 @@ </widget> <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>lbltqStatus</cstring> + <cstring>lblStatus</cstring> </property> <property name="sizePolicy"> <sizepolicy> diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui index aa124cc2..5c588e57 100644 --- a/kopete/protocols/jabber/ui/dlgchatjoin.ui +++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui index 5feefbb7..25458a91 100644 --- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui +++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>21</height> diff --git a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui index a1b732db..ad52240e 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui +++ b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui @@ -12,7 +12,7 @@ <height>343</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>300</height> @@ -87,7 +87,7 @@ </widget> <widget class="TQLabel" row="1" column="0"> <property name="name"> - <cstring>lbltqStatus</cstring> + <cstring>lblStatus</cstring> </property> <property name="text"> <string></string> diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index e3599536..71f44d17 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -153,7 +153,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -243,7 +243,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -469,7 +469,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>100</width> <height>32767</height> @@ -495,7 +495,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -542,13 +542,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>100</width> <height>32767</height> @@ -575,7 +575,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>200</height> @@ -707,7 +707,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>241</height> @@ -748,7 +748,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -814,7 +814,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -907,7 +907,7 @@ If two resources have the same priority, the messages will be sent to the one co <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>110</height> diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index 8d1324ca..7b39edeb 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp @@ -61,7 +61,7 @@ void dlgJabberRegister::slotGotForm () translator = new JabberFormTranslator (task->form (), grpForm); static_cast<TQBoxLayout*>(grpForm->tqlayout())->insertWidget(1, translator); translator->show(); - resize(tqsizeHint()); + resize(sizeHint()); // enable the send button btnRegister->setEnabled (true); diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui index 32749c18..4f1f7502 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui +++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui @@ -12,7 +12,7 @@ <height>376</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>350</height> @@ -40,13 +40,13 @@ <property name="name"> <cstring>pixPasswordVerify</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -135,13 +135,13 @@ <property name="name"> <cstring>pixJID</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -185,13 +185,13 @@ <property name="name"> <cstring>pixServer</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -213,13 +213,13 @@ <property name="name"> <cstring>pixPassword</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -257,7 +257,7 @@ <property name="name"> <cstring>lblJIDInformation</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>100</height> @@ -280,7 +280,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 2e81801d..7682aee7 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -296,7 +296,7 @@ void dlgJabberVCard::setEnabled(bool state) void dlgJabberVCard::slotSaveVCard() { setEnabled(false); - m_mainWidget->lbltqStatus->setText( i18n("Saving vCard to server...") ); + m_mainWidget->lblStatus->setText( i18n("Saving vCard to server...") ); XMPP::VCard vCard; XMPP::VCard::AddressList addressList; @@ -418,12 +418,12 @@ void dlgJabberVCard::slotVCardSaved() if( vCard->success() ) { - m_mainWidget->lbltqStatus->setText( i18n("vCard save sucessful.") ); + m_mainWidget->lblStatus->setText( i18n("vCard save sucessful.") ); m_contact->setPropertiesFromVCard( vCard->vcard() ); } else { - m_mainWidget->lbltqStatus->setText( i18n("Error: Unable to save vCard.") ); + m_mainWidget->lblStatus->setText( i18n("Error: Unable to save vCard.") ); } setEnabled(true); @@ -431,7 +431,7 @@ void dlgJabberVCard::slotVCardSaved() void dlgJabberVCard::slotGetVCard() { - m_mainWidget->lbltqStatus->setText( i18n("Fetching contact vCard...") ); + m_mainWidget->lblStatus->setText( i18n("Fetching contact vCard...") ); setReadOnly(true); setEnabled(false); @@ -454,11 +454,11 @@ void dlgJabberVCard::slotGotVCard() assignContactProperties(); - m_mainWidget->lbltqStatus->setText( i18n("vCard fetching Done.") ); + m_mainWidget->lblStatus->setText( i18n("vCard fetching Done.") ); } else { - m_mainWidget->lbltqStatus->setText( i18n("Error: vCard could not be fetched correctly. Check connectivity with the Jabber server.") ); + m_mainWidget->lblStatus->setText( i18n("Error: vCard could not be fetched correctly. Check connectivity with the Jabber server.") ); //it is maybe possible to anyway edit our own vCard (if it is new if(m_account->myself() == m_contact) setEnabled( true ); @@ -547,7 +547,7 @@ void dlgJabberVCard::slotClearPhoto() void dlgJabberVCard::slotOpenURL(const TQString &url) { - if ( !url.isEmpty () || (url == TQString::tqfromLatin1("mailto:") ) ) + if ( !url.isEmpty () || (url == TQString::fromLatin1("mailto:") ) ) new KRun(KURL( url ) ); } diff --git a/kopete/protocols/jabber/ui/dlgregister.ui b/kopete/protocols/jabber/ui/dlgregister.ui index 8a883b65..8ea5d423 100644 --- a/kopete/protocols/jabber/ui/dlgregister.ui +++ b/kopete/protocols/jabber/ui/dlgregister.ui @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui index 9d56f7bc..8eb13e45 100644 --- a/kopete/protocols/jabber/ui/dlgsendraw.ui +++ b/kopete/protocols/jabber/ui/dlgsendraw.ui @@ -42,7 +42,7 @@ <string>Type in the packet that should be sent to the server:</string> </property> <property name="buddy" stdset="0"> - <cstring>lblRealtqStatus</cstring> + <cstring>lblRealStatus</cstring> </property> </widget> <widget class="TQTextEdit"> @@ -63,7 +63,7 @@ </item> <item> <property name="text"> - <string>Availability tqStatus</string> + <string>Availability Status</string> </property> </item> <item> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>25</height> diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui index fda7bf4a..d0d0a6bb 100644 --- a/kopete/protocols/jabber/ui/dlgservices.ui +++ b/kopete/protocols/jabber/ui/dlgservices.ui @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>21</height> diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui index 8a4aa790..ce06ba0a 100644 --- a/kopete/protocols/jabber/ui/dlgvcard.ui +++ b/kopete/protocols/jabber/ui/dlgvcard.ui @@ -90,7 +90,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -294,7 +294,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -311,7 +311,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -357,13 +357,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>96</width> <height>96</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>96</width> <height>96</height> @@ -386,7 +386,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -403,7 +403,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -472,7 +472,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -586,7 +586,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -641,7 +641,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -720,7 +720,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -849,7 +849,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -931,7 +931,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1015,7 +1015,7 @@ </widget> <widget class="TQLabel" row="1" column="0"> <property name="name"> - <cstring>lbltqStatus</cstring> + <cstring>lblStatus</cstring> </property> <property name="text"> <string></string> diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index 95272833..63339158 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -41,7 +41,7 @@ JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const ch mMainWidget = new DlgJabberChooseServer ( this ); setMainWidget ( mMainWidget ); - mMainWidget->lbltqStatus->setText ( i18n ( "Retrieving server list...") ); + mMainWidget->lblStatus->setText ( i18n ( "Retrieving server list...") ); mMainWidget->listServers->setLeftMargin ( 0 ); @@ -108,7 +108,7 @@ void JabberChooseServer::slotTransferResult ( KIO::Job *job ) if ( job->error () || mTransferJob->isErrorPage () ) { - mMainWidget->lbltqStatus->setText ( i18n ( "Could not retrieve server list." ) ); + mMainWidget->lblStatus->setText ( i18n ( "Could not retrieve server list." ) ); return; } else @@ -116,14 +116,14 @@ void JabberChooseServer::slotTransferResult ( KIO::Job *job ) kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Received server list ok!" << endl; // clear status message - mMainWidget->lbltqStatus->setText ( "" ); + mMainWidget->lblStatus->setText ( "" ); // parse XML list TQDomDocument doc; if ( !doc.setContent ( xmlServerList ) ) { - mMainWidget->lbltqStatus->setText ( i18n ( "Could not parse the server list.") ); + mMainWidget->lblStatus->setText ( i18n ( "Could not parse the server list.") ); return; } diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 758322cf..b8a9c080 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -88,7 +88,7 @@ void JabberEditAccountWidget::reopen () mPass->load (&account()->password ()); cbAutoConnect->setChecked (account()->excludeConnect()); - mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::tqfromLatin1("Kopete"))); + mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::fromLatin1("Kopete"))); mPriority->setValue (account()->configGroup()->readNumEntry ("Priority", 5)); mServer->setText (account()->configGroup()->readEntry ("Server", TQString())); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index 2641ed41..631ec3f4 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -146,8 +146,8 @@ void JabberRegisterAccount::validateData () } if ( valid && - ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || - TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) ) + ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || + TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) ) { mMainWidget->lblStatusMessage->setText ( i18n ( "Please enter the same password twice." ) ); valid = false; @@ -155,8 +155,8 @@ void JabberRegisterAccount::validateData () } if ( valid && - ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ) != - TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) + ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ) != + TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) { mMainWidget->lblStatusMessage->setText ( i18n ( "Password entries do not match." ) ); valid = false; diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index d0fe10bc..03f8e008 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -71,7 +71,7 @@ bool MeanwhileAccount::createContact( MeanwhileProtocol *p = static_cast<MeanwhileProtocol *>(protocol()); if ((newContact != 0L) && (m_session != 0L) - && (myself()->onlinetqStatus() != + && (myself()->onlineStatus() != p->statusOffline)) m_session->addContact(newContact); @@ -109,7 +109,7 @@ void MeanwhileAccount::connectWithPassword(const TQString &password) if (!m_session->isConnected() && !m_session->isConnecting()) m_session->connect(password); - m_session->setStatus(initialtqStatus()); + m_session->setStatus(initialStatus()); } void MeanwhileAccount::disconnect() @@ -123,7 +123,7 @@ void MeanwhileAccount::disconnect(Kopete::Account::DisconnectReason reason) return; MeanwhileProtocol *p = static_cast<MeanwhileProtocol *>(protocol()); - setAllContactstqStatus(p->statusOffline); + setAllContactsStatus(p->statusOffline); disconnected(reason); emit isConnectedChanged(); @@ -139,7 +139,7 @@ KActionMenu * MeanwhileAccount::actionMenu() #if 0 menu->insert(new KAction(i18n("&Change Status Message"), TQString(), 0, - this, TQT_SLOT(meanwhileChangetqStatus()), this, + this, TQT_SLOT(meanwhileChangeStatus()), this, "meanwhileChangeStatus")); //infoPlugin->addCustomMenus(theMenu); #endif @@ -219,7 +219,7 @@ void MeanwhileAccount::setOnlineStatus(const Kopete::OnlineStatus &status, const TQString &reason) { HERE; - Kopete::OnlineStatus oldstatus = myself()->onlinetqStatus(); + Kopete::OnlineStatus oldstatus = myself()->onlineStatus(); mwDebug() << "From: " << oldstatus.description() << "(" << oldstatus.internalStatus() << "):" << oldstatus.isDefinitelyOnline() @@ -256,7 +256,7 @@ void MeanwhileAccount::syncContactsToServer() void MeanwhileAccount::slotSessionStateChange(Kopete::OnlineStatus status) { HERE; - Kopete::OnlineStatus oldstatus = myself()->onlinetqStatus(); + Kopete::OnlineStatus oldstatus = myself()->onlineStatus(); myself()->setOnlineStatus(status); if (status.isDefinitelyOnline() != oldstatus.isDefinitelyOnline()) { diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.cpp b/kopete/protocols/meanwhile/meanwhileprotocol.cpp index 3347f6da..5f443f36 100644 --- a/kopete/protocols/meanwhile/meanwhileprotocol.cpp +++ b/kopete/protocols/meanwhile/meanwhileprotocol.cpp @@ -59,7 +59,7 @@ MeanwhileProtocol::MeanwhileProtocol(TQObject* parent, const char *name, statusAccountOffline(Kopete::OnlineStatus::Offline, 0, this, 0, TQString(), i18n("Account Offline")), - statusMessage(TQString::tqfromLatin1("statusMessage"), + statusMessage(TQString::fromLatin1("statusMessage"), i18n("Status Message"), TQString(), false, true), awayMessage(Kopete::Global::Properties::self()->awayMessage()) @@ -113,14 +113,14 @@ Kopete::Contact *MeanwhileProtocol::deserializeContact( return theAccount->contacts()[contactId]; } -const Kopete::OnlineStatus MeanwhileProtocol::accountOfflinetqStatus() +const Kopete::OnlineStatus MeanwhileProtocol::accountOfflineStatus() { return statusAccountOffline; } -const Kopete::OnlineStatus MeanwhileProtocol::lookuptqStatus( +const Kopete::OnlineStatus MeanwhileProtocol::lookupStatus( enum Kopete::OnlineStatusManager::Categories cats) { - return Kopete::OnlineStatusManager::self()->onlinetqStatus(this, cats); + return Kopete::OnlineStatusManager::self()->onlineStatus(this, cats); } #include "meanwhileprotocol.moc" diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.h b/kopete/protocols/meanwhile/meanwhileprotocol.h index dab52878..9b550c9e 100644 --- a/kopete/protocols/meanwhile/meanwhileprotocol.h +++ b/kopete/protocols/meanwhile/meanwhileprotocol.h @@ -58,9 +58,9 @@ public: const TQMap<TQString,TQString> &serializedData, const TQMap<TQString, TQString> &addressBookData); - const Kopete::OnlineStatus accountOfflinetqStatus(); + const Kopete::OnlineStatus accountOfflineStatus(); - const Kopete::OnlineStatus lookuptqStatus( + const Kopete::OnlineStatus lookupStatus( enum Kopete::OnlineStatusManager::Categories cats); const Kopete::OnlineStatus statusOffline; diff --git a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui index 6920d7e3..b4aff75d 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui index 5f85cac2..e9fed90a 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui @@ -357,7 +357,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui index 701d564d..a0c37920 100644 --- a/kopete/protocols/msn/config/msnprefs.ui +++ b/kopete/protocols/msn/config/msnprefs.ui @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>70</height> diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index fbf43221..760f7cba 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -231,7 +231,7 @@ void MSNAccount::createNotificationServer( const TQString &host, uint port ) TQObject::connect( m_notifySocket, TQT_SIGNAL( errorMessage(int, const TQString& ) ), TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) ); - m_notifySocket->settqStatus( m_connectstatus ); + m_notifySocket->setStatus( m_connectstatus ); m_notifySocket->connect(host, port); } @@ -314,7 +314,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS disconnect(); else if ( m_notifySocket ) { - m_notifySocket->settqStatus( status ); + m_notifySocket->setStatus( status ); } else { @@ -409,7 +409,7 @@ void MSNAccount::slotNotifySocketClosed() m_notifySocket->deleteLater(); m_notifySocket = 0l; myself()->setOnlineStatus( MSNProtocol::protocol()->FLN ); - setAllContactstqStatus( MSNProtocol::protocol()->FLN ); + setAllContactsStatus( MSNProtocol::protocol()->FLN ); disconnected(reason); @@ -951,7 +951,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, if( !c->hasProperty(MSNProtocol::protocol()->propGuid.key()) ) c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid ); - if ( c->onlinetqStatus() == MSNProtocol::protocol()->UNK ) + if ( c->onlineStatus() == MSNProtocol::protocol()->UNK ) c->setOnlineStatus( MSNProtocol::protocol()->FLN ); if ( c->metaContact() && c->metaContact()->isTemporary() ) @@ -1488,7 +1488,7 @@ void MSNAccount::resetPictureObject(bool silent, bool force) if(old!=m_pictureObj && isConnected() && m_notifySocket && !silent) { //update the msn pict - m_notifySocket->settqStatus( myself()->onlinetqStatus() ); + m_notifySocket->setStatus( myself()->onlineStatus() ); } } diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 2b7fe8bb..3fcecc47 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -527,7 +527,7 @@ void MSNChatSession::slotRequestPicture() if( !c->object().isEmpty() ) m_chatService->requestDisplayPicture(); } - else if(myself()->onlinetqStatus().isDefinitelyOnline() && myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Invisible ) + else if(myself()->onlineStatus().isDefinitelyOnline() && myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible ) startChatSession(); } else @@ -548,7 +548,7 @@ void MSNChatSession::slotDisplayPictureChanged() int sz=22; // get the size of the toolbar were the aciton is plugged. // if you know a better way to get the toolbar, let me know - KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L; + KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; if(w) { //We connected that in the constructor. we don't need to keep this slot active. diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 304029bf..0b38f2c3 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -89,7 +89,7 @@ MSNContact::~MSNContact() bool MSNContact::isReachable() { - if ( account()->isConnected() && isOnline() && account()->myself()->onlinetqStatus() != MSNProtocol::protocol()->HDN ) + if ( account()->isConnected() && isOnline() && account()->myself()->onlineStatus() != MSNProtocol::protocol()->HDN ) return true; MSNChatSession *kmm=dynamic_cast<MSNChatSession*>(manager(Kopete::Contact::CannotCreate)); @@ -98,13 +98,13 @@ bool MSNContact::isReachable() // When we are invisible we can't start a chat with others, make isReachable return false // (This is an MSN limitation, not a problem in Kopete) - if ( !account()->isConnected() || account()->myself()->onlinetqStatus() == MSNProtocol::protocol()->HDN ) + if ( !account()->isConnected() || account()->myself()->onlineStatus() == MSNProtocol::protocol()->HDN ) return false; //if the contact is offline, it is impossible to send it a message. but it is impossible //to be sure the contact is realy offline. For example, if the contact is not on the contactlist for //some reason. - if( onlinetqStatus() == MSNProtocol::protocol()->FLN && ( isAllowed() || isBlocked() ) && !serverGroups().isEmpty() ) + if( onlineStatus() == MSNProtocol::protocol()->FLN && ( isAllowed() || isBlocked() ) && !serverGroups().isEmpty() ) return false; return true; @@ -264,8 +264,8 @@ void MSNContact::setBlocked( bool blocked ) { m_blocked = blocked; //update the status - setOnlineStatus(m_currenttqStatus); - //m_currenttqStatus is used here. previously it was onlinetqStatus() but this may cause problem when + setOnlineStatus(m_currentStatus); + //m_currentStatus is used here. previously it was onlineStatus() but this may cause problem when // the account is offline because of the Kopete::Contact::OnlineStatus() account offline hack. } } @@ -577,7 +577,7 @@ void MSNContact::rename( const TQString &newName ) void MSNContact::slotShowProfile() { - KRun::runURL( KURL( TQString::tqfromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId()) , "text/html" ); + KRun::runURL( KURL( TQString::fromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId()) , "text/html" ); } @@ -655,7 +655,7 @@ void MSNContact::setOnlineStatus(const Kopete::OnlineStatus& status) } else Kopete::Contact::setOnlineStatus(status); - m_currenttqStatus=status; + m_currentStatus=status; } void MSNContact::slotSendMail() @@ -703,7 +703,7 @@ void MSNContact::setObject(const TQString &obj) KConfig *config = KGlobal::config(); config->setGroup( "MSN" ); if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty() - && account()->myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Invisible ) + && account()->myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible ) manager(Kopete::Contact::CanCreate); //create the manager which will download the photo automatically. } diff --git a/kopete/protocols/msn/msncontact.h b/kopete/protocols/msn/msncontact.h index 97039fed..42667682 100644 --- a/kopete/protocols/msn/msncontact.h +++ b/kopete/protocols/msn/msncontact.h @@ -185,10 +185,10 @@ private: TQString m_obj; //the MSNObject /** - * keep the current status here. (it's normally already in Kopete::Contact::d->onlinetqStatus) + * keep the current status here. (it's normally already in Kopete::Contact::d->onlineStatus) * This is a workaround to prevent problems with the account offline status. */ - Kopete::OnlineStatus m_currenttqStatus; + Kopete::OnlineStatus m_currentStatus; //MSNProtocol::deserializeContact need to acess some contact insternals friend class MSNProtocol; diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp index 72b5f1f8..157209e9 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.cpp +++ b/kopete/protocols/msn/msnfiletransfersocket.cpp @@ -217,7 +217,7 @@ void MSNFileTransferSocket::slotAcceptConnection() void MSNFileTransferSocket::slotTimer() { - if(onlinetqStatus() != Disconnected) + if(onlineStatus() != Disconnected) return; kdDebug(14140) << "MSNFileTransferSocket::slotTimer: timeout "<< endl; if( m_kopeteTransfer) diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index 88ad1528..5a15aa6f 100644 --- a/kopete/protocols/msn/msnnotifysocket.cpp +++ b/kopete/protocols/msn/msnnotifysocket.cpp @@ -90,14 +90,14 @@ void MSNNotifySocket::disconnect() m_isLogged = false; if( m_disconnectReason==Kopete::Account::Unknown ) m_disconnectReason=Kopete::Account::Manual; - if( onlinetqStatus() == Connected ) + if( onlineStatus() == Connected ) sendCommand( "OUT", TQString(), false ); if( m_keepaliveTimer ) m_keepaliveTimer->stop(); // the socket is not connected yet, so I should force the signals - if ( onlinetqStatus() == Disconnected || onlinetqStatus() == Connecting ) + if ( onlineStatus() == Disconnected || onlineStatus() == Connecting ) emit socketClosed(); else MSNSocket::disconnect(); @@ -563,7 +563,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString kdDebug(14140) << k_funcinfo << "Contact list up-to-date." << endl; // set the status - settqStatus( m_newstatus ); + setStatus( m_newstatus ); } else if( cmd == "BPR" ) { @@ -641,7 +641,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString "<input type=\"hidden\" name=\"sl\" value=\"" + sl +"\">\n" "<input type=\"hidden\" name=\"rru\" value=\"" + rru + "\">\n" "<input type=\"hidden\" name=\"auth\" value=\"" + m_MSPAuth + "\">\n" - "<input type=\"hidden\" name=\"creds\" value=\"" + TQString::tqfromLatin1( md5.hexDigest() ) + "\">\n" + "<input type=\"hidden\" name=\"creds\" value=\"" + TQString::fromLatin1( md5.hexDigest() ) + "\">\n" "<input type=\"hidden\" name=\"svc\" value=\"mail\">\n" "<input type=\"hidden\" name=\"js\" value=\"yes\">\n" "</form></body>\n</html>\n"; @@ -909,7 +909,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) m_msnAlertURLs.append(subscString); // Don't do any MSN alerts notification for new blog updates - if( subscString != TQString::tqfromLatin1("s.htm") && actionString != TQString::tqfromLatin1("a.htm") ) + if( subscString != TQString::fromLatin1("s.htm") && actionString != TQString::fromLatin1("a.htm") ) { KNotification* notification = KNotification::event("msn_alert", textString, 0L, 0L, actions); TQObject::connect(notification, TQT_SIGNAL(activated(unsigned int)), this, TQT_SLOT(slotMSNAlertLink(unsigned int))); @@ -1105,11 +1105,11 @@ void MSNNotifySocket::removeContact( const TQString &handle, int list, const TQS m_tmpHandles[id]=handle; } -void MSNNotifySocket::settqStatus( const Kopete::OnlineStatus &status ) +void MSNNotifySocket::setStatus( const Kopete::OnlineStatus &status ) { // kdDebug( 14140 ) << k_funcinfo << statusToString( status ) << endl; - if( onlinetqStatus() == Disconnected ) + if( onlineStatus() == Disconnected ) m_newstatus = status; else sendCommand( "CHG", statusToString( status ) + " " + m_account->myselfClientId() + " " + escape(m_account->pictureObject()) ); diff --git a/kopete/protocols/msn/msnnotifysocket.h b/kopete/protocols/msn/msnnotifysocket.h index 805e427c..ccec2e89 100644 --- a/kopete/protocols/msn/msnnotifysocket.h +++ b/kopete/protocols/msn/msnnotifysocket.h @@ -50,7 +50,7 @@ public: virtual void disconnect(); - void settqStatus( const Kopete::OnlineStatus &status ); + void setStatus( const Kopete::OnlineStatus &status ); void addContact( const TQString &handle, int list, const TQString& publicName, const TQString& contactGuid, const TQString& groupGuid ); void removeContact( const TQString &handle, int list, const TQString &contactGuid, const TQString &groupGuid ); @@ -86,7 +86,7 @@ public slots: signals: void newContactList(); void contactList(const TQString& handle, const TQString& publicName, const TQString &contactGuid, uint lists, const TQString& groups); - void contacttqStatus(const TQString&, const TQString&, const TQString& ); + void contactStatus(const TQString&, const TQString&, const TQString& ); void contactAdded(const TQString& handle, const TQString& list, const TQString& publicName, const TQString& contactGuid, const TQString& groupGuid); //void contactRemoved(const TQString&, const TQString&, uint); void contactRemoved(const TQString& handle, const TQString& list, const TQString& contactGuid, const TQString& groupGuid); @@ -99,7 +99,7 @@ signals: void invitedToChat(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ); void startChat( const TQString&, const TQString& ); - void statusChanged( const Kopete::OnlineStatus &newtqStatus ); + void statusChanged( const Kopete::OnlineStatus &newStatus ); void hotmailSeted(bool) ; @@ -165,7 +165,7 @@ private: Kopete::OnlineStatus m_newstatus; /** - * Convert an entry of the tqStatus enum back to a string + * Convert an entry of the Status enum back to a string */ TQString statusToString( const Kopete::OnlineStatus &status ) const; diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp index 407550f3..f1f2a1e3 100644 --- a/kopete/protocols/msn/msnprotocol.cpp +++ b/kopete/protocols/msn/msnprotocol.cpp @@ -74,7 +74,7 @@ MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList setCapabilities( Kopete::Protocol::BaseFgColor | Kopete::Protocol::BaseFont | Kopete::Protocol::BaseFormatting ); - // m_status = m_unknowntqStatus = UNK; + // m_status = m_unknownStatus = UNK; } Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaContact, const TQMap<TQString, TQString> &serializedData, diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index f238a507..e65fcd87 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -56,7 +56,7 @@ class MimeMessage MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent) { - m_onlinetqStatus = Disconnected; + m_onlineStatus = Disconnected; m_socket = 0L; m_useHttp = false; m_timer = 0L; @@ -64,7 +64,7 @@ MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent) MSNSocket::~MSNSocket() { - //if ( m_onlinetqStatus != Disconnected ) + //if ( m_onlineStatus != Disconnected ) // disconnect(); delete m_timer; m_timer = 0L; @@ -75,13 +75,13 @@ MSNSocket::~MSNSocket() void MSNSocket::connect( const TQString &server, uint port ) { - if ( m_onlinetqStatus == Connected || m_onlinetqStatus == Connecting ) + if ( m_onlineStatus == Connected || m_onlineStatus == Connecting ) { kdWarning( 14140 ) << k_funcinfo << "Already connected or connecting! Not connecting again." << endl; return; } - if( m_onlinetqStatus == Disconnecting ) + if( m_onlineStatus == Disconnecting ) { // Cleanup first. // FIXME: More generic!!! @@ -166,10 +166,10 @@ void MSNSocket::doneDisconnect() void MSNSocket::setOnlineStatus( MSNSocket::OnlineStatus status ) { - if ( m_onlinetqStatus == status ) + if ( m_onlineStatus == status ) return; - m_onlinetqStatus = status; + m_onlineStatus = status; emit onlineStatusChanged( status ); } @@ -823,7 +823,7 @@ void MSNSocket::slotSocketClosed() { kdDebug( 14140 ) << k_funcinfo << "Socket closed. " << endl; - if ( !m_socket || m_onlinetqStatus == Disconnected ) + if ( !m_socket || m_onlineStatus == Disconnected ) { kdDebug( 14140 ) << k_funcinfo << "Socket already deleted or already disconnected" << endl; return; @@ -897,7 +897,7 @@ bool MSNSocket::setUseHttpMethod( bool useHttp ) m_gateway = "gateway.messenger.hotmail.com"; } - if ( m_onlinetqStatus != Disconnected ) + if ( m_onlineStatus != Disconnected ) disconnect(); m_useHttp = useHttp; diff --git a/kopete/protocols/msn/msnsocket.h b/kopete/protocols/msn/msnsocket.h index e4238a59..aa5a5922 100644 --- a/kopete/protocols/msn/msnsocket.h +++ b/kopete/protocols/msn/msnsocket.h @@ -76,11 +76,11 @@ public: * handshake likely has to follow first. */ enum OnlineStatus { Connecting, Connected, Disconnecting, Disconnected }; - enum LookuptqStatus { Processing, Success, Failed }; + enum LookupStatus { Processing, Success, Failed }; enum Transport { TcpTransport, HttpTransport }; enum ErrorType { ErrorConnectionLost, ErrorConnectionError, ErrorCannotConnect, ErrorServerError, ErrorInformation}; - OnlineStatus onlinetqStatus() { return m_onlinetqStatus; } + OnlineStatus onlineStatus() { return m_onlineStatus; } /* * return the local ip. @@ -279,7 +279,7 @@ private: void parseLine( const TQString &str ); KNetwork::KBufferedSocket *m_socket; - OnlineStatus m_onlinetqStatus; + OnlineStatus m_onlineStatus; TQString m_server; uint m_port; diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index 319df782..b5519ed8 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -577,7 +577,7 @@ void MSNSwitchBoardSocket::sendTypingMsg( bool isTyping ) if( !isTyping ) return; - if ( onlinetqStatus() != Connected || m_chatMembers.empty()) + if ( onlineStatus() != Connected || m_chatMembers.empty()) { //we are not yet in a chat. //if we send that command now, we may get disconnected. @@ -653,7 +653,7 @@ int MSNSwitchBoardSocket::sendCustomEmoticon(const TQString &name, const TQStrin // this sends a short message to the server int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) { - if ( onlinetqStatus() != Connected || m_chatMembers.empty()) + if ( onlineStatus() != Connected || m_chatMembers.empty()) { // m_messagesQueue.append(msg); return -1; @@ -1021,19 +1021,19 @@ Kopete::Message &MSNSwitchBoardSocket::parseCustomEmoticons(Kopete::Message &kms * emoticons like that. So, in that case, we show like the MSN client */ #if 0 TQString em = TQRegExp::escape( es ); - message.replace( TQRegExp(TQString::tqfromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)), - TQString::tqfromLatin1("\\1<img align=\"center\" width=\"") + + message.replace( TQRegExp(TQString::fromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)), + TQString::fromLatin1("\\1<img align=\"center\" width=\"") + #endif //match any occurence which is not in a html tag. - message.replace( TQRegExp(TQString::tqfromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))), - TQString::tqfromLatin1("<img align=\"center\" width=\"") + + message.replace( TQRegExp(TQString::fromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))), + TQString::fromLatin1("<img align=\"center\" width=\"") + TQString::number(iconImage.width()) + - TQString::tqfromLatin1("\" height=\"") + + TQString::fromLatin1("\" height=\"") + TQString::number(iconImage.height()) + - TQString::tqfromLatin1("\" src=\"") + imgPath + - TQString::tqfromLatin1("\" title=\"") + es + - TQString::tqfromLatin1("\" alt=\"") + es + - TQString::tqfromLatin1( "\"/>" ) ); + TQString::fromLatin1("\" src=\"") + imgPath + + TQString::fromLatin1("\" title=\"") + es + + TQString::fromLatin1("\" alt=\"") + es + + TQString::fromLatin1( "\"/>" ) ); kmsg.setBody(message, Kopete::Message::RichText); } } @@ -1112,7 +1112,7 @@ void MSNSwitchBoardSocket::slotKeepAliveTimer( ) the bad side effect: some switchboard connection may be maintained for really long time! */ - if ( onlinetqStatus() != Connected || m_chatMembers.empty()) + if ( onlineStatus() != Connected || m_chatMembers.empty()) { //we are not yet in a chat. //if we send that command now, we may get disconnected. diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui index 283ea56f..cee5897d 100644 --- a/kopete/protocols/msn/ui/msnadd.ui +++ b/kopete/protocols/msn/ui/msnadd.ui @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>160</height> diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui index 674248a1..b511de42 100644 --- a/kopete/protocols/msn/ui/msneditaccountui.ui +++ b/kopete/protocols/msn/ui/msneditaccountui.ui @@ -54,7 +54,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>146</height> @@ -92,7 +92,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -449,7 +449,7 @@ Only works for emoticons in the PNG format.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -468,7 +468,7 @@ Only works for emoticons in the PNG format.</string> <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -498,7 +498,7 @@ Only works for emoticons in the PNG format.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>40</height> @@ -706,7 +706,7 @@ Only works for emoticons in the PNG format.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -725,7 +725,7 @@ Only works for emoticons in the PNG format.</string> <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>1</height> @@ -760,13 +760,13 @@ Only works for emoticons in the PNG format.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>96</width> <height>96</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>96</width> <height>96</height> @@ -789,7 +789,7 @@ Only works for emoticons in the PNG format.</string> <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>1</height> @@ -810,7 +810,7 @@ Only works for emoticons in the PNG format.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -921,7 +921,7 @@ Only works for emoticons in the PNG format.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -966,7 +966,7 @@ Only works for emoticons in the PNG format.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -994,7 +994,7 @@ Only works for emoticons in the PNG format.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -1021,7 +1021,7 @@ Only works for emoticons in the PNG format.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -1032,7 +1032,7 @@ Only works for emoticons in the PNG format.</string> <property name="name"> <cstring>m_RLButton</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>200</width> <height>32767</height> @@ -1058,7 +1058,7 @@ Only works for emoticons in the PNG format.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>20</height> @@ -1287,7 +1287,7 @@ Only check this option if the normal connection doesn't work.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>70</height> diff --git a/kopete/protocols/msn/ui/msninfo.ui b/kopete/protocols/msn/ui/msninfo.ui index 42a0f0b6..fde773a2 100644 --- a/kopete/protocols/msn/ui/msninfo.ui +++ b/kopete/protocols/msn/ui/msninfo.ui @@ -208,7 +208,7 @@ If not, the user has not added you to their list, or has removed you.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index e2024a94..a91d3460 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -268,7 +268,7 @@ void Webcam::processMessage(const Message& message) { unsigned char X=dataMessage[q+f]; char C=((char)(( X<128 && X>31 ) ? X : '.')); - echoS+=TQString::tqfromLatin1(&C,1); + echoS+=TQString::fromLatin1(&C,1); } f+=16; } @@ -462,7 +462,7 @@ void Webcam::makeSIPMessage(const TQString &message, TQ_UINT8 XX, TQ_UINT8 YY , { unsigned char X=dataMessage[q+f]; char C=((char)(( X<128 && X>31 ) ? X : '.')); - echoS+=TQString::tqfromLatin1(&C,1); + echoS+=TQString::fromLatin1(&C,1); } f+=16; } diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h index 75e742d3..459f7fca 100644 --- a/kopete/protocols/msn/webcam.h +++ b/kopete/protocols/msn/webcam.h @@ -57,7 +57,7 @@ class Webcam : public TransferContext KNetwork::KServerSocket *m_listener; KNetwork::KBufferedSocket *m_webcamSocket; - enum WebcamtqStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ; + enum WebcamStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ; Who m_who; @@ -68,7 +68,7 @@ class Webcam : public TransferContext MSNWebcamDialog *m_widget; TQValueList<KNetwork::KBufferedSocket* > m_allSockets; - TQMap<KNetwork::KBufferedSocket*, WebcamtqStatus> m_webcamStates; + TQMap<KNetwork::KBufferedSocket*, WebcamStatus> m_webcamStates; int m_timerId; int m_timerFps; diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp index 31e5dbfc..d5ed4865 100644 --- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp +++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp @@ -48,7 +48,7 @@ MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, co { kdDebug(14180) << k_funcinfo << "Adding webcam image container" << endl; //m_imageContainer.setText( i18n( "No webcam image received" ) ); - //m_imageContainer.tqsetAlignment( TQt::AlignCenter ); + //m_imageContainer.setAlignment( TQt::AlignCenter ); m_imageContainer.setMinimumSize(320,240); } show(); @@ -73,7 +73,7 @@ void MSNWebcamDialog::webcamClosed( int reason ) kdDebug(14180) << k_funcinfo << "webcam closed with reason?? " << reason <<endl; //m_imageContainer.clear(); //m_imageContainer.setText( i18n( "Webcam closed with reason %1" ).tqarg( TQString::number( reason ) ) ); - //m_imageContainer.tqsetAlignment( TQt::AlignCenter ); + //m_imageContainer.setAlignment( TQt::AlignCenter ); //show(); } diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index 33a4b365..93209b04 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -127,53 +127,53 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio //font-size:xxpt -> <font ptsize=xx> s=message.escapedBody(); - s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")), - TQString::tqfromLatin1("<style>\\1;\"\\2</style>")); + s.replace ( TQRegExp( TQString::fromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")), + TQString::fromLatin1("<style>\\1;\"\\2</style>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("<i><style>\\1\\2\"\\3</style></i>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("<b><style>\\1\\2\"\\3</style></b>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("<u><style>\\1\\2\"\\3</style></u>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("\\2")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("\\2")); //okay now change the <font ptsize="xx"> to <font size="xx"> //0-9 are size 1 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")), - TQString::tqfromLatin1("<font size=\"1\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"\\d\">")), + TQString::fromLatin1("<font size=\"1\">")); //10-11 are size 2 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")), - TQString::tqfromLatin1("<font size=\"2\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[01]\">")), + TQString::fromLatin1("<font size=\"2\">")); //12-13 are size 3 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")), - TQString::tqfromLatin1("<font size=\"3\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[23]\">")), + TQString::fromLatin1("<font size=\"3\">")); //14-16 are size 4 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")), - TQString::tqfromLatin1("<font size=\"4\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[456]\">")), + TQString::fromLatin1("<font size=\"4\">")); //17-22 are size 5 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")), - TQString::tqfromLatin1("<font size=\"5\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")), + TQString::fromLatin1("<font size=\"5\">")); //23-29 are size 6 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"2[3456789]\">")),TQString::fromLatin1("<font size=\"6\">")); //30- (and any I missed) are size 7 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"[^\"]*\">")),TQString::fromLatin1("<font size=\"7\">")); - s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") ); + s.replace ( TQRegExp ( TQString::fromLatin1("<br[ /]*>")), TQString::fromLatin1("<br>") ); kdDebug(14190) << k_funcinfo << "sending " << s << endl; @@ -300,12 +300,12 @@ KActionMenu* AIMAccount::actionMenu() // mActionMenu is managed by Kopete::Account. It is deleted when // it is no longer shown, so we can (safely) just make a new one here. KActionMenu *mActionMenu = new KActionMenu(accountId(), - myself()->onlinetqStatus().iconFor( this ), this, "AIMAccount::mActionMenu"); + myself()->onlineStatus().iconFor( this ), this, "AIMAccount::mActionMenu"); AIMProtocol *p = AIMProtocol::protocol(); TQString accountNick = myself()->property( Kopete::Global::Properties::self()->nickName() ).value().toString(); - mActionMenu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), + mActionMenu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%2 <%1>" ).tqarg( accountId(), accountNick )); mActionMenu->insert( new KAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, @@ -344,14 +344,14 @@ void AIMAccount::setAway(bool away, const TQString &awayReason) // kdDebug(14152) << k_funcinfo << accountId() << "reason is " << awayReason << endl; if ( away ) { - engine()->settqStatus( Client::Away, awayReason ); + engine()->setStatus( Client::Away, awayReason ); AIMMyselfContact* me = static_cast<AIMMyselfContact *> ( myself() ); me->setLastAwayMessage(awayReason); me->setProperty( Kopete::Global::Properties::self()->awayMessage(), awayReason ); } else { - engine()->settqStatus( Client::Online ); + engine()->setStatus( Client::Online ); AIMMyselfContact* me = static_cast<AIMMyselfContact *> ( myself() ); me->setLastAwayMessage(TQString()); me->removeProperty( Kopete::Global::Properties::self()->awayMessage() ); @@ -374,7 +374,7 @@ void AIMAccount::setUserProfile(const TQString &profile) AIMMyselfContact* aimmc = dynamic_cast<AIMMyselfContact*>( myself() ); if ( aimmc ) aimmc->setOwnProfile( profile ); - configGroup()->writeEntry( TQString::tqfromLatin1( "Profile" ), profile ); + configGroup()->writeEntry( TQString::fromLatin1( "Profile" ), profile ); } void AIMAccount::slotEditInfo() @@ -532,13 +532,13 @@ void AIMAccount::slotJoinChat() void AIMAccount::slotGoOnline() { - if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away ) + if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Away ) { kdDebug(14152) << k_funcinfo << accountId() << " was away. welcome back." << endl; - engine()->settqStatus( Client::Online ); + engine()->setStatus( Client::Online ); myself()->removeProperty( Kopete::Global::Properties::self()->awayMessage() ); } - else if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline ) + else if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline ) { kdDebug(14152) << k_funcinfo << accountId() << " was offline. time to connect" << endl; OscarAccount::connect(); @@ -606,7 +606,7 @@ void AIMAccount::messageReceived( const Oscar::Message& message ) // Might be duplicate code from the parent class to get some needed information // Perhaps a refactoring is needed. kdDebug(14152) << k_funcinfo << "Checking to see if I'm online.." << endl; - if( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away ) + if( myself()->onlineStatus().status() == Kopete::OnlineStatus::Away ) { TQString sender = Oscar::normalize( message.sender() ); AIMContact* aimSender = static_cast<AIMContact *> ( contacts()[sender] ); //should exist now @@ -759,7 +759,7 @@ void AIMAccount::connectWithPassword( const TQString & ) // Get the screen name for this account TQString screenName = accountId(); - TQString server = configGroup()->readEntry( "Server", TQString::tqfromLatin1( "login.oscar.aol.com" ) ); + TQString server = configGroup()->readEntry( "Server", TQString::fromLatin1( "login.oscar.aol.com" ) ); uint port = configGroup()->readNumEntry( "Port", 5190 ); Connection* c = setupConnection( server, port ); @@ -771,7 +771,7 @@ void AIMAccount::connectWithPassword( const TQString & ) << "AIM network because no password was specified in the " << "preferences." << endl; } - else if ( myself()->onlinetqStatus() == static_cast<AIMProtocol*>( protocol() )->statusOffline ) + else if ( myself()->onlineStatus() == static_cast<AIMProtocol*>( protocol() )->statusOffline ) { kdDebug(14152) << k_funcinfo << "Logging in as " << accountId() << endl ; updateVersionUpdaterStamp(); diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index ffa81067..ed380b15 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -56,7 +56,7 @@ AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete:: m_haveAwayMessage = false; m_mobile = false; // Set the last autoresponse time to the current time yesterday - m_lastAutoresponseTime = TQDateTime::tqcurrentDateTime().addDays(-1); + m_lastAutoresponseTime = TQDateTime::currentDateTime().addDays(-1); TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ), this, TQT_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) ); @@ -128,15 +128,15 @@ void AIMContact::setAwayMessage(const TQString &message) "Called for '" << contactId() << "', away msg='" << message << "'" << endl; TQString filteredMessage = message; filteredMessage.replace( - TQRegExp(TQString::tqfromLatin1("<[hH][tT][mM][lL].*>(.*)</[hH][tT][mM][lL]>")), - TQString::tqfromLatin1("\\1")); + TQRegExp(TQString::fromLatin1("<[hH][tT][mM][lL].*>(.*)</[hH][tT][mM][lL]>")), + TQString::fromLatin1("\\1")); filteredMessage.replace( - TQRegExp(TQString::tqfromLatin1("<[bB][oO][dD][yY].*>(.*)</[bB][oO][dD][yY]>")), - TQString::tqfromLatin1("\\1") ); - TQRegExp fontRemover( TQString::tqfromLatin1("<[fF][oO][nN][tT].*>(.*)</[fF][oO][nN][tT]>") ); + TQRegExp(TQString::fromLatin1("<[bB][oO][dD][yY].*>(.*)</[bB][oO][dD][yY]>")), + TQString::fromLatin1("\\1") ); + TQRegExp fontRemover( TQString::fromLatin1("<[fF][oO][nN][tT].*>(.*)</[fF][oO][nN][tT]>") ); fontRemover.setMinimal(true); while ( filteredMessage.find( fontRemover ) != -1 ) - filteredMessage.replace( fontRemover, TQString::tqfromLatin1("\\1") ); + filteredMessage.replace( fontRemover, TQString::fromLatin1("\\1") ); setProperty(mProtocol->awayMessage, filteredMessage); } @@ -148,7 +148,7 @@ int AIMContact::warningLevel() const void AIMContact::updateSSIItem() { if ( m_ssiItem.type() != 0xFFFF && m_ssiItem.waitingAuth() == false && - onlinetqStatus() == Kopete::OnlineStatus::Unknown ) + onlineStatus() == Kopete::OnlineStatus::Unknown ) { //make sure they're offline setOnlineStatus( static_cast<AIMProtocol*>( protocol() )->statusOffline ); @@ -392,59 +392,59 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *) //font-size:xxpt -> <font ptsize=xx> s=message.escapedBody(); - s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")), - TQString::tqfromLatin1("<style>\\1;\"\\2</style>")); + s.replace ( TQRegExp( TQString::fromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")), + TQString::fromLatin1("<style>\\1;\"\\2</style>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("<i><style>\\1\\2\"\\3</style></i>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("<b><style>\\1\\2\"\\3</style></b>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("<u><style>\\1\\2\"\\3</style></u>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")), - TQString::tqfromLatin1("\\2")); + s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)\"([^<]*)</style>")), + TQString::fromLatin1("\\2")); //okay now change the <font ptsize="xx"> to <font size="xx"> //0-9 are size 1 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")), - TQString::tqfromLatin1("<font size=\"1\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"\\d\">")), + TQString::fromLatin1("<font size=\"1\">")); //10-11 are size 2 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")), - TQString::tqfromLatin1("<font size=\"2\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[01]\">")), + TQString::fromLatin1("<font size=\"2\">")); //12-13 are size 3 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")), - TQString::tqfromLatin1("<font size=\"3\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[23]\">")), + TQString::fromLatin1("<font size=\"3\">")); //14-16 are size 4 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")), - TQString::tqfromLatin1("<font size=\"4\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[456]\">")), + TQString::fromLatin1("<font size=\"4\">")); //17-22 are size 5 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")), - TQString::tqfromLatin1("<font size=\"5\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")), + TQString::fromLatin1("<font size=\"5\">")); //23-29 are size 6 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"2[3456789]\">")),TQString::fromLatin1("<font size=\"6\">")); //30- (and any I missed) are size 7 - s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">")); + s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"[^\"]*\">")),TQString::fromLatin1("<font size=\"7\">")); // strip left over line break - s.remove(TQRegExp(TQString::tqfromLatin1("<br\b[^>]*>$"))); + s.remove(TQRegExp(TQString::fromLatin1("<br\b[^>]*>$"))); - s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") ); + s.replace ( TQRegExp ( TQString::fromLatin1("<br[ /]*>")), TQString::fromLatin1("<br>") ); // strip left over line break - s.remove( TQRegExp( TQString::tqfromLatin1( "<br>$" ) ) ); + s.remove( TQRegExp( TQString::fromLatin1( "<br>$" ) ) ); kdDebug(14190) << k_funcinfo << "sending " << s << endl; @@ -475,9 +475,9 @@ void AIMContact::updateFeatures() void AIMContact::sendAutoResponse(Kopete::Message& msg) { // The target time is 2 minutes later than the last message - int delta = m_lastAutoresponseTime.secsTo( TQDateTime::tqcurrentDateTime() ); + int delta = m_lastAutoresponseTime.secsTo( TQDateTime::currentDateTime() ); kdDebug(14152) << k_funcinfo << "Last autoresponse time: " << m_lastAutoresponseTime << endl; - kdDebug(14152) << k_funcinfo << "Current time: " << TQDateTime::tqcurrentDateTime() << endl; + kdDebug(14152) << k_funcinfo << "Current time: " << TQDateTime::currentDateTime() << endl; kdDebug(14152) << k_funcinfo << "Difference: " << delta << endl; // Check to see if we're past that time if(delta > 120) @@ -509,7 +509,7 @@ void AIMContact::sendAutoResponse(Kopete::Message& msg) manager(Kopete::Contact::CanCreate)->appendMessage(msg); manager(Kopete::Contact::CanCreate)->messageSucceeded(); // Update the last autoresponse time - m_lastAutoresponseTime = TQDateTime::tqcurrentDateTime(); + m_lastAutoresponseTime = TQDateTime::currentDateTime(); } else { diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp index fe4dbf22..2e412491 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.cpp +++ b/kopete/protocols/oscar/aim/aimprotocol.cpp @@ -46,7 +46,7 @@ AIMProtocol* AIMProtocol::protocolStatic_ = 0L; AIMProtocolHandler::AIMProtocolHandler() : Kopete::MimeTypeHandler(false) { - registerAsProtocolHandler(TQString::tqfromLatin1("aim")); + registerAsProtocolHandler(TQString::fromLatin1("aim")); } void AIMProtocolHandler::handleURL(const KURL &url) const @@ -286,8 +286,8 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac if ( serializedData.contains( "ssi_type" ) ) { ssiName = serializedData["ssi_name"]; - TQString authtqStatus = serializedData["ssi_waitingAuth"]; - if ( authtqStatus == "true" ) + TQString authStatus = serializedData["ssi_waitingAuth"]; + if ( authStatus == "true" ) ssiWaitingAuth = true; ssiGid = serializedData["ssi_gid"].toUInt(); ssiBid = serializedData["ssi_bid"].toUInt(); diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index deaa2ff2..4d9352ee 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -165,7 +165,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -198,7 +198,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -342,7 +342,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>200</height> @@ -455,7 +455,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>225</height> diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui index 9457068e..7de495f2 100644 --- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui +++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui @@ -12,7 +12,7 @@ <height>408</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>360</width> <height>400</height> @@ -213,7 +213,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>64</width> <height>16</height> diff --git a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui index fdfe2a53..5b2d084b 100644 --- a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui +++ b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -54,7 +54,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index 245e365c..9d996724 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -50,9 +50,9 @@ ICQMyselfContact::ICQMyselfContact( ICQAccount *acct ) : OscarMyselfContact( acc void ICQMyselfContact::userInfoUpdated() { - DWORD extendedtqStatus = details().extendedtqStatus(); - kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << TQString::number( extendedtqStatus, 16 ) << endl; - ICQ::Presence presence = ICQ::Presence::fromOscartqStatus( extendedtqStatus & 0xffff ); + DWORD extendedStatus = details().extendedStatus(); + kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << TQString::number( extendedStatus, 16 ) << endl; + ICQ::Presence presence = ICQ::Presence::fromOscarStatus( extendedStatus & 0xffff ); setOnlineStatus( presence.toOnlineStatus() ); setProperty( Kopete::Global::Properties::self()->awayMessage(), static_cast<ICQAccount*>( account() )->engine()->statusMessage() ); } @@ -100,7 +100,7 @@ ICQAccount::ICQAccount(Kopete::Protocol *parent, TQString accountID, const char { kdDebug(14153) << k_funcinfo << "sending status to reflect HideIP and WebAware settings" << endl; - //settqStatus(mtqStatus, TQString()); + //setStatus(mStatus, TQString()); }*/ } @@ -116,7 +116,7 @@ ICQProtocol* ICQAccount::protocol() ICQ::Presence ICQAccount::presence() { - return ICQ::Presence::fromOnlineStatus( myself()->onlinetqStatus() ); + return ICQ::Presence::fromOnlineStatus( myself()->onlineStatus() ); } @@ -150,21 +150,21 @@ void ICQAccount::connectWithPassword( const TQString &password ) kdDebug(14153) << k_funcinfo << "accountId='" << accountId() << "'" << endl; - Kopete::OnlineStatus status = initialtqStatus(); + Kopete::OnlineStatus status = initialStatus(); if ( status == Kopete::OnlineStatus() && status.status() == Kopete::OnlineStatus::Unknown ) //use default online in case of invalid online status for connecting status = Kopete::OnlineStatus( Kopete::OnlineStatus::Online ); ICQ::Presence pres = ICQ::Presence::fromOnlineStatus( status ); bool accountIsOffline = ( presence().type() == ICQ::Presence::Offline || - myself()->onlinetqStatus() == protocol()->statusManager()->connectingtqStatus() ); + myself()->onlineStatus() == protocol()->statusManager()->connectingStatus() ); if ( accountIsOffline ) { - myself()->setOnlineStatus( protocol()->statusManager()->connectingtqStatus() ); + myself()->setOnlineStatus( protocol()->statusManager()->connectingStatus() ); TQString icqNumber = accountId(); kdDebug(14153) << k_funcinfo << "Logging in as " << icqNumber << endl ; - TQString server = configGroup()->readEntry( "Server", TQString::tqfromLatin1( "login.oscar.aol.com" ) ); + TQString server = configGroup()->readEntry( "Server", TQString::fromLatin1( "login.oscar.aol.com" ) ); uint port = configGroup()->readNumEntry( "Port", 5190 ); Connection* c = setupConnection( server, port ); @@ -172,15 +172,15 @@ void ICQAccount::connectWithPassword( const TQString &password ) Oscar::Settings* oscarSettings = engine()->clientSettings(); oscarSettings->setWebAware( configGroup()->readBoolEntry( "WebAware", false ) ); oscarSettings->setHideIP( configGroup()->readBoolEntry( "HideIP", true ) ); - //FIXME: also needed for the other call to settqStatus (in setPresenceTarget) - DWORD status = pres.toOscartqStatus(); + //FIXME: also needed for the other call to setStatus (in setPresenceTarget) + DWORD status = pres.toOscarStatus(); if ( !mHideIP ) status |= ICQ::StatusCode::SHOWIP; if ( mWebAware ) status |= ICQ::StatusCode::WEBAWARE; - engine()->settqStatus( status, mInitialStatusMessage ); + engine()->setStatus( status, mInitialStatusMessage ); updateVersionUpdaterStamp(); engine()->start( server, port, accountId(), password ); engine()->connectToServer( c, server, true /* doAuth */ ); @@ -331,7 +331,7 @@ void ICQAccount::setPresenceTarget( const ICQ::Presence &newPres, const TQString { bool targetIsOffline = (newPres.type() == ICQ::Presence::Offline); bool accountIsOffline = ( presence().type() == ICQ::Presence::Offline || - myself()->onlinetqStatus() == protocol()->statusManager()->connectingtqStatus() ); + myself()->onlineStatus() == protocol()->statusManager()->connectingStatus() ); if ( targetIsOffline ) { @@ -346,7 +346,7 @@ void ICQAccount::setPresenceTarget( const ICQ::Presence &newPres, const TQString } else { - engine()->settqStatus( newPres.toOscartqStatus(), message ); + engine()->setStatus( newPres.toOscarStatus(), message ); } } diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h index a5335dbc..f3a62c73 100644 --- a/kopete/protocols/oscar/icq/icqaccount.h +++ b/kopete/protocols/oscar/icq/icqaccount.h @@ -84,7 +84,7 @@ private: void setPresenceType( ICQ::Presence::Type, const TQString &awayMessage = TQString() ); void setPresenceTarget( const ICQ::Presence &presence, const TQString &message = TQString() ); - //const unsigned long fulltqStatus( const unsigned long plaintqStatus ); + //const unsigned long fullStatus( const unsigned long plainStatus ); private slots: void slotToggleInvisible(); diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index 30563ae0..d5f1245c 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -103,7 +103,7 @@ void ICQContact::updateSSIItem() setOnlineStatus( mProtocol->statusManager()->waitingForAuth() ); if ( m_ssiItem.type() != 0xFFFF && m_ssiItem.waitingAuth() == false && - onlinetqStatus() == Kopete::OnlineStatus::Unknown ) + onlineStatus() == Kopete::OnlineStatus::Unknown ) { //make sure they're offline setOnlineStatus( ICQ::Presence( ICQ::Presence::Offline, ICQ::Presence::Visible ).toOnlineStatus() ); @@ -121,8 +121,8 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de if ( !isOnline() ) removeProperty( mProtocol->awayMessage ); - kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << details.extendedtqStatus() << endl; - ICQ::Presence presence = ICQ::Presence::fromOscartqStatus( details.extendedtqStatus() & 0xffff ); + kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << details.extendedStatus() << endl; + ICQ::Presence presence = ICQ::Presence::fromOscarStatus( details.extendedStatus() & 0xffff ); setOnlineStatus( presence.toOnlineStatus() ); // ICQ does not support status messages for state Online @@ -133,7 +133,7 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de } else { - if ( ICQ::Presence::fromOnlineStatus( account()->myself()->onlinetqStatus() ).visibility() == ICQ::Presence::Visible ) + if ( ICQ::Presence::fromOnlineStatus( account()->myself()->onlineStatus() ).visibility() == ICQ::Presence::Visible ) { switch ( presence.type() ) { @@ -561,27 +561,27 @@ void ICQContact::slotContactChanged(const UserInfo &u) else removeProperty(mProtocol->clientFeatures); - unsigned int newtqStatus = 0; + unsigned int newStatus = 0; mInvisible = (mInfo.icqextstatus & ICQ_STATUS_IS_INVIS); if (mInfo.icqextstatus & ICQ_STATUS_IS_FFC) - newtqStatus = OSCAR_FFC; + newStatus = OSCAR_FFC; else if (mInfo.icqextstatus & ICQ_STATUS_IS_DND) - newtqStatus = OSCAR_DND; + newStatus = OSCAR_DND; else if (mInfo.icqextstatus & ICQ_STATUS_IS_OCC) - newtqStatus = OSCAR_OCC; + newStatus = OSCAR_OCC; else if (mInfo.icqextstatus & ICQ_STATUS_IS_NA) - newtqStatus = OSCAR_NA; + newStatus = OSCAR_NA; else if (mInfo.icqextstatus & ICQ_STATUS_IS_AWAY) - newtqStatus = OSCAR_AWAY; + newStatus = OSCAR_AWAY; else - newtqStatus = OSCAR_ONLINE; + newStatus = OSCAR_ONLINE; if (this != account()->myself()) { - if(newtqStatus != onlinetqStatus().internalStatus()) + if(newStatus != onlineStatus().internalStatus()) { - if(newtqStatus != OSCAR_ONLINE) // if user changed to some state other than online + if(newStatus != OSCAR_ONLINE) // if user changed to some state other than online { mAccount->engine()->requestAwayMessage(this); } @@ -592,7 +592,7 @@ void ICQContact::slotContactChanged(const UserInfo &u) } } - settqStatus(newtqStatus); + setStatus(newStatus); } void ICQContact::slotOffgoingBuddy(TQString sender) @@ -655,7 +655,7 @@ TQPtrList<KAction> *ICQContact::customContextMenuActions() /* TQString awTxt; TQString awIcn; - unsigned int status = onlinetqStatus().internalStatus(); + unsigned int status = onlineStatus().internalStatus(); if (status >= 15) status -= 15; // get rid of invis addon switch(status) diff --git a/kopete/protocols/oscar/icq/icqpresence.cpp b/kopete/protocols/oscar/icq/icqpresence.cpp index 520153a6..b0a051d7 100644 --- a/kopete/protocols/oscar/icq/icqpresence.cpp +++ b/kopete/protocols/oscar/icq/icqpresence.cpp @@ -49,7 +49,7 @@ struct PresenceTypeData static const PresenceTypeData *all(); static const PresenceTypeData &forType( Presence::Type type ); - static const PresenceTypeData &fortqStatus( unsigned long status ); + static const PresenceTypeData &forStatus( unsigned long status ); static const PresenceTypeData &forOnlineStatusType( const Kopete::OnlineStatus::StatusType statusType ); }; @@ -89,7 +89,7 @@ const PresenceTypeData &PresenceTypeData::forType( Presence::Type type ) return array[0]; } -const PresenceTypeData &PresenceTypeData::fortqStatus( unsigned long status ) +const PresenceTypeData &PresenceTypeData::forStatus( unsigned long status ) { const PresenceTypeData *array = all(); for ( uint n = 0; n < Presence::TypeCount; ++n ) @@ -216,12 +216,12 @@ Kopete::OnlineStatus OnlineStatusManager::onlineStatusOf( const Presence &presen return d->invisibleStatusList[ presence.type() ]; } -Kopete::OnlineStatus OnlineStatusManager::connectingtqStatus() +Kopete::OnlineStatus OnlineStatusManager::connectingStatus() { return d->connecting; } -Kopete::OnlineStatus OnlineStatusManager::unknowntqStatus() +Kopete::OnlineStatus OnlineStatusManager::unknownStatus() { return d->unknown; } @@ -258,31 +258,31 @@ Kopete::OnlineStatus Presence::toOnlineStatus() const } -unsigned long Presence::toOscartqStatus() const +unsigned long Presence::toOscarStatus() const { - unsigned long basictqStatus = basicOscartqStatus(); + unsigned long basicStatus = basicOscarStatus(); if ( _visibility == Invisible ) - basictqStatus |= StatusCode::INVISIBLE; - return basictqStatus; + basicStatus |= StatusCode::INVISIBLE; + return basicStatus; } -Presence Presence::fromOscartqStatus( unsigned long code ) +Presence Presence::fromOscarStatus( unsigned long code ) { - Type type = typeFromOscartqStatus( code & ~StatusCode::INVISIBLE ); + Type type = typeFromOscarStatus( code & ~StatusCode::INVISIBLE ); bool invisible = (code & StatusCode::INVISIBLE) == StatusCode::INVISIBLE; return Presence( type, invisible ? Invisible : Visible ); } -unsigned long Presence::basicOscartqStatus() const +unsigned long Presence::basicOscarStatus() const { const PresenceTypeData &data = PresenceTypeData::forType( _type ); return data.setFlag; } -Presence::Type Presence::typeFromOscartqStatus( unsigned long status ) +Presence::Type Presence::typeFromOscarStatus( unsigned long status ) { - const PresenceTypeData &data = PresenceTypeData::fortqStatus( status ); + const PresenceTypeData &data = PresenceTypeData::forStatus( status ); return data.type; } diff --git a/kopete/protocols/oscar/icq/icqpresence.h b/kopete/protocols/oscar/icq/icqpresence.h index 360cadeb..d7ef9ed2 100644 --- a/kopete/protocols/oscar/icq/icqpresence.h +++ b/kopete/protocols/oscar/icq/icqpresence.h @@ -78,8 +78,8 @@ public: ~OnlineStatusManager(); ICQ::Presence presenceOf( uint internalStatus ); Kopete::OnlineStatus onlineStatusOf( const ICQ::Presence &presence ); - Kopete::OnlineStatus connectingtqStatus(); - Kopete::OnlineStatus unknowntqStatus(); + Kopete::OnlineStatus connectingStatus(); + Kopete::OnlineStatus unknownStatus(); Kopete::OnlineStatus waitingForAuth(); private: @@ -117,23 +117,23 @@ public: Kopete::OnlineStatus toOnlineStatus() const; /** - * Get the status code to pass to liboscar to set us to this tqStatus. + * Get the status code to pass to liboscar to set us to this Status. * @note This is not the opposite of fromOnlineStatus(). The set and get codes don't match. */ - unsigned long toOscartqStatus() const; + unsigned long toOscarStatus() const; /** * Get the status a contact is at based on liboscar's view of its status. * @note This is not the opposite of toOnlineStatus(). */ - static Presence fromOscartqStatus( unsigned long code ); + static Presence fromOscarStatus( unsigned long code ); bool operator==( const Presence &other ) const { return other._type == _type && other._visibility == _visibility; } bool operator!=( const Presence &other ) const { return !(*this == other); } private: - unsigned long basicOscartqStatus() const; - static Type typeFromOscartqStatus( unsigned long status ); + unsigned long basicOscarStatus() const; + static Type typeFromOscarStatus( unsigned long status ); private: Type _type; Visibility _visibility; diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index dad58726..9e85c1ad 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -66,7 +66,7 @@ K_EXPORT_COMPONENT_FACTORY( kopete_icq, ICQProtocolFactory( "kopete_icq" ) ) ICQProtocolHandler::ICQProtocolHandler() : Kopete::MimeTypeHandler(false) { - registerAsMimeHandler(TQString::tqfromLatin1("application/x-icq")); + registerAsMimeHandler(TQString::fromLatin1("application/x-icq")); } void ICQProtocolHandler::handleURL(const TQString &mimeType, const KURL & url) const @@ -219,7 +219,7 @@ void ICQProtocol::initGenders() void ICQProtocol::initCountries() { mCountries.insert(0, ""); // unspecified - KLocale *kl = KGlobal::locale(); //KLocale(TQString::tqfromLatin1("kopete")); + KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); mCountries.insert(93, kl->twoAlphaToCountryName("af")); mCountries.insert(355, kl->twoAlphaToCountryName("al")); @@ -468,7 +468,7 @@ void ICQProtocol::initCountries() void ICQProtocol::initLang() { - KLocale *kl = KGlobal::locale(); //KLocale(TQString::tqfromLatin1("kopete")); + KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); mLanguages.insert(0 , ""); mLanguages.insert(1 , kl->twoAlphaToLanguageName("ar") /*i18n("Arabic")*/); @@ -775,8 +775,8 @@ Kopete::Contact *ICQProtocol::deserializeContact( Kopete::MetaContact *metaConta if ( serializedData.contains( "ssi_waitingAuth" ) ) { - TQString authtqStatus = serializedData["ssi_waitingAuth"]; - if ( authtqStatus == "true" ) + TQString authStatus = serializedData["ssi_waitingAuth"]; + if ( authStatus == "true" ) ssiWaitingAuth = true; } diff --git a/kopete/protocols/oscar/icq/icqreadaway.cpp b/kopete/protocols/oscar/icq/icqreadaway.cpp index 94eaa063..abbc8eb2 100644 --- a/kopete/protocols/oscar/icq/icqreadaway.cpp +++ b/kopete/protocols/oscar/icq/icqreadaway.cpp @@ -37,7 +37,7 @@ ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *parent, const char* name) mAccount = static_cast<ICQAccount*>(c->account()); mContact = c; - setCaption(i18n("'%2' Message for %1").tqarg(c->displayName()).tqarg(c->onlinetqStatus().description())); + setCaption(i18n("'%2' Message for %1").tqarg(c->displayName()).tqarg(c->onlineStatus().description())); TQVBox *mMainWidget = makeVBoxMainWidget(); @@ -74,12 +74,12 @@ void ICQReadAway::slotFetchAwayMessage() mAccount->engine()->requestAwayMessage(mContact); - setCaption(i18n("Fetching '%2' Message for %1...").tqarg(mContact->displayName()).tqarg(mContact->onlinetqStatus().description())); + setCaption(i18n("Fetching '%2' Message for %1...").tqarg(mContact->displayName()).tqarg(mContact->onlineStatus().description())); } // END slotFetchAwayMessage() void ICQReadAway::slotAwayMessageChanged() { - setCaption(i18n("'%2' Message for %1").tqarg(mContact->displayName()).tqarg(mContact->onlinetqStatus().description())); + setCaption(i18n("'%2' Message for %1").tqarg(mContact->displayName()).tqarg(mContact->onlineStatus().description())); awayMessageBrowser->setText(mContact->awayMessage()); awayMessageBrowser->setDisabled(false); diff --git a/kopete/protocols/oscar/icq/ui/icqadd.ui b/kopete/protocols/oscar/icq/ui/icqadd.ui index 5ac8d973..6ae1f092 100644 --- a/kopete/protocols/oscar/icq/ui/icqadd.ui +++ b/kopete/protocols/oscar/icq/ui/icqadd.ui @@ -71,7 +71,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>47</width> <height>26</height> @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui index 61fc84cb..370bef8b 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui +++ b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -131,7 +131,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>220</width> <height>21</height> diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui index 1bc5d379..541308e2 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui @@ -149,7 +149,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -183,7 +183,7 @@ If you do not currently have an ICQ account, please click the button to create o <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -372,7 +372,7 @@ If you do not currently have an ICQ account, please click the button to create o <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui index c48e8ff9..1af12007 100644 --- a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui +++ b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui @@ -331,7 +331,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>125</width> <height>0</height> @@ -579,7 +579,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> diff --git a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui index 009780f0..1dd7134b 100644 --- a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui +++ b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>220</height> diff --git a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui index d5d77c09..088fc302 100644 --- a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui +++ b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui index 140f17fa..161444f6 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui +++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>190</height> @@ -162,7 +162,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>105</height> @@ -328,7 +328,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>166</width> <height>20</height> diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp index 1eb1c934..44fd5afd 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp @@ -47,28 +47,28 @@ ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name ) TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General ICQ Information" ), - KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "identity" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo ); m_genInfoWidget = new ICQGeneralInfoWidget( genInfo, "Basic Information" ); genLayout->addWidget( m_genInfoWidget ); TQFrame* workInfo = addPage( i18n( "Work Info" ), i18n( "Work Information" ), - KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "attach" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo ); m_workInfoWidget = new ICQWorkInfoWidget( workInfo, "Work Information" ); workLayout->addWidget( m_workInfoWidget ); TQFrame* otherInfo = addPage( i18n( "Other Info" ), i18n( "Other ICQ Information" ), - KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo ); m_otherInfoWidget = new ICQOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); TQFrame* interestInfo = addPage( i18n( "Interest Info" ), i18n( "Interest" ), - KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* interestLayout = new TQVBoxLayout( interestInfo ); m_interestInfoWidget = new ICQInterestInfoWidget( interestInfo, "Other Information" ); interestLayout->addWidget( m_interestInfoWidget ); diff --git a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui index 4707dbe8..8f243f20 100644 --- a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui +++ b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui @@ -236,7 +236,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp index ff3159f4..3e649b97 100644 --- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp +++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp @@ -341,7 +341,7 @@ void ChatServiceTask::parseChatMessage() Oscar::Message omessage; omessage.setReceiver( client()->userId() ); omessage.setSender( sender ); - omessage.setTimestamp( TQDateTime::tqcurrentDateTime() ); + omessage.setTimestamp( TQDateTime::currentDateTime() ); omessage.setText( Oscar::Message::UTF8, msgText ); omessage.setType( 0x03 ); omessage.setExchange( m_exchange ); diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp index 00431434..28f841c2 100644 --- a/kopete/protocols/oscar/liboscar/client.cpp +++ b/kopete/protocols/oscar/liboscar/client.cpp @@ -98,7 +98,7 @@ public: TQValueList<WORD> redirectionServices; WORD currentRedirect; TQByteArray cookie; - DWORD connectAstqStatus; // icq only + DWORD connectAsStatus; // icq only TQString connectWithMessage; // icq only Oscar::Settings* settings; @@ -128,7 +128,7 @@ public: struct AwayMsgRequest { TQString contact; - ICQtqStatus contacttqStatus; + ICQStatus contactStatus; }; TQValueList<AwayMsgRequest> awayMsgRequestQueue; TQTimer* awayMsgRequestTimer; @@ -149,7 +149,7 @@ Client::Client( TQObject* parent ) d->isIcq = false; //default to AIM d->redirectRequested = false; d->currentRedirect = 0; - d->connectAstqStatus = 0x0; // default to online + d->connectAsStatus = 0x0; // default to online d->ssiManager = new SSIManager( this ); d->settings = new Oscar::Settings(); d->errorTask = 0L; @@ -222,7 +222,7 @@ void Client::close() //don't clear the stored status between stage one and two if ( d->stage == ClientPrivate::StageTwo ) { - d->connectAstqStatus = 0x0; + d->connectAsStatus = 0x0; d->connectWithMessage = TQString(); } @@ -233,7 +233,7 @@ void Client::close() d->ssiManager->clear(); } -void Client::settqStatus( AIMtqStatus status, const TQString &_message ) +void Client::setStatus( AIMStatus status, const TQString &_message ) { // AIM: you're away exactly when your away message isn't empty. // can't use TQString() as a message either; ProfileTask @@ -257,7 +257,7 @@ void Client::settqStatus( AIMtqStatus status, const TQString &_message ) pt->go( true ); } -void Client::settqStatus( DWORD status, const TQString &message ) +void Client::setStatus( DWORD status, const TQString &message ) { // remember the message to reply with, when requested kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Setting status message to "<< message << endl; @@ -292,7 +292,7 @@ void Client::settqStatus( DWORD status, const TQString &message ) } else { - d->connectAstqStatus = status; + d->connectAsStatus = status; d->connectWithMessage = message; } } @@ -399,7 +399,7 @@ void Client::serviceSetupFinished() d->active = true; if ( isIcq() ) - settqStatus( d->connectAstqStatus, d->connectWithMessage ); + setStatus( d->connectAsStatus, d->connectWithMessage ); d->ownStatusTask->go(); @@ -862,14 +862,14 @@ void Client::requestAIMAwayMessage( const TQString& contact ) d->userInfoTask->requestInfoFor( contact, UserInfoTask::AwayMessage ); } -void Client::requestICQAwayMessage( const TQString& contact, ICQtqStatus contacttqStatus ) +void Client::requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "requesting away message for " << contact << endl; Oscar::Message msg; msg.setType( 2 ); msg.setReceiver( contact ); msg.addProperty( Oscar::Message::StatusMessageRequest ); - switch ( contacttqStatus ) + switch ( contactStatus ) { case ICQAway: msg.setMessageType( 0xE8 ); // away @@ -894,7 +894,7 @@ void Client::requestICQAwayMessage( const TQString& contact, ICQtqStatus contact sendMessage( msg ); } -void Client::addICQAwayMessageRequest( const TQString& contact, ICQtqStatus contacttqStatus ) +void Client::addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "adding away message request for " << contact << " to queue" << endl; @@ -902,7 +902,7 @@ void Client::addICQAwayMessageRequest( const TQString& contact, ICQtqStatus cont //remove old request if still exists removeICQAwayMessageRequest( contact ); - ClientPrivate::AwayMsgRequest amr = { contact, contacttqStatus }; + ClientPrivate::AwayMsgRequest amr = { contact, contactStatus }; d->awayMsgRequestQueue.prepend( amr ); if ( !d->awayMsgRequestTimer->isActive() ) @@ -959,7 +959,7 @@ void Client::nextICQAwayMessageRequest() amr = d->awayMsgRequestQueue.back(); d->awayMsgRequestQueue.pop_back(); - requestICQAwayMessage( amr.contact, amr.contacttqStatus ); + requestICQAwayMessage( amr.contact, amr.contactStatus ); } void Client::requestStatusInfo( const TQString& contact ) @@ -1139,7 +1139,7 @@ void Client::haveServerForRedirect( const TQString& host, const TQByteArray& coo else { realHost = host; - realPort = TQString::tqfromLatin1("5190"); + realPort = TQString::fromLatin1("5190"); } Connection* c = createConnection( realHost, realPort ); diff --git a/kopete/protocols/oscar/liboscar/client.h b/kopete/protocols/oscar/liboscar/client.h index 976f43be..b09be40e 100644 --- a/kopete/protocols/oscar/liboscar/client.h +++ b/kopete/protocols/oscar/liboscar/client.h @@ -68,8 +68,8 @@ public: FatalProtocolError = 3 }; - enum AIMtqStatus { Online = 0, Away }; - enum ICQtqStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat }; + enum AIMStatus { Online = 0, Away }; + enum ICQStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat }; /************* EXTERNAL API @@ -103,9 +103,9 @@ public: /** Logout and disconnect */ void close(); /** Set our status for AIM */ - void settqStatus( AIMtqStatus status, const TQString &message = TQString() ); + void setStatus( AIMStatus status, const TQString &message = TQString() ); /** Set our status for ICQ */ - void settqStatus( DWORD status, const TQString &message = TQString() ); + void setStatus( DWORD status, const TQString &message = TQString() ); /** Retrieve our user info */ UserDetails ourInfo() const; @@ -256,7 +256,7 @@ public: * Add the icq away message request to queue * \param contact the contact to get info for */ - void addICQAwayMessageRequest( const TQString& contact, ICQtqStatus contacttqStatus ); + void addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus ); /** * Remove the icq away message request from queue @@ -505,7 +505,7 @@ private: * \param contact the contact to get info for */ //TODO only made a default for testing w/o frontend - void requestICQAwayMessage( const TQString& contact, ICQtqStatus contacttqStatus = ICQAway ); + void requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus = ICQAway ); private: class ClientPrivate; diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp index 1bbe6622..b5b78f2b 100644 --- a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp +++ b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp @@ -176,7 +176,7 @@ void MessageReceiverTask::handleType1Message() msg.setSender( m_fromUser ); msg.setReceiver( client()->userId() ); - msg.setTimestamp( TQDateTime::tqcurrentDateTime() ); + msg.setTimestamp( TQDateTime::currentDateTime() ); msg.setType( 0x01 ); emit receivedMessage( msg ); @@ -332,7 +332,7 @@ void MessageReceiverTask::handleType4Message() } msg.setType( 0x04 ); - msg.setTimestamp( TQDateTime::tqcurrentDateTime() ); + msg.setTimestamp( TQDateTime::currentDateTime() ); msg.setSender( msgSender ); msg.setReceiver( client()->userId() ); msg.setEncoding( Oscar::Message::UserDefined ); @@ -437,7 +437,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg ) msg->setSender( m_fromUser ); msg->setReceiver( client()->userId() ); - msg->setTimestamp( TQDateTime::tqcurrentDateTime() ); + msg->setTimestamp( TQDateTime::currentDateTime() ); msg->setType( 0x02 ); msg->setIcbmCookie( m_icbmCookie ); msg->setProtocolVersion( protocolVersion ); diff --git a/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp b/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp index 958a5d49..97751352 100644 --- a/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp +++ b/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp @@ -224,7 +224,7 @@ TQByteArray Oscar::SSI::iconHash( ) const TQString Oscar::SSI::toString() const { - TQString ssiString = TQString::tqfromLatin1( "name: " ); + TQString ssiString = TQString::fromLatin1( "name: " ); ssiString += m_name; ssiString += " gid: "; ssiString += TQString::number( m_gid ); diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp index 3bd07cb5..1a0e57c8 100644 --- a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp @@ -25,7 +25,7 @@ #include "oscarutils.h" #include "transfer.h" -SendDCInfoTask::SendDCInfoTask(Task* parent, DWORD status): Task(parent), mtqStatus(status) +SendDCInfoTask::SendDCInfoTask(Task* parent, DWORD status): Task(parent), mStatus(status) { } @@ -70,7 +70,7 @@ void SendDCInfoTask::onGo() statusFlag |= 0x10000000; // Direct connection upon authorization, hides IP } - buffer->addDWord( statusFlag | mtqStatus ); + buffer->addDWord( statusFlag | mStatus ); /* Fill in the DC Info * We don't support Direct Connection yet. So fill in some diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.h b/kopete/protocols/oscar/liboscar/senddcinfotask.h index a98b9612..d130cc40 100644 --- a/kopete/protocols/oscar/liboscar/senddcinfotask.h +++ b/kopete/protocols/oscar/liboscar/senddcinfotask.h @@ -33,7 +33,7 @@ public: virtual void onGo(); private: - DWORD mtqStatus; + DWORD mStatus; }; #endif diff --git a/kopete/protocols/oscar/liboscar/ssimanager.cpp b/kopete/protocols/oscar/liboscar/ssimanager.cpp index ce39965f..1351c237 100644 --- a/kopete/protocols/oscar/liboscar/ssimanager.cpp +++ b/kopete/protocols/oscar/liboscar/ssimanager.cpp @@ -141,7 +141,7 @@ void SSIManager::setParameters( WORD maxContacts, WORD maxGroups, WORD maxVisibl { //I'm not using k_funcinfo for these debug statements because of //the function's long signature - TQString funcName = TQString::tqfromLatin1( "[void SSIManager::setParameters] " ); + TQString funcName = TQString::fromLatin1( "[void SSIManager::setParameters] " ); kdDebug(OSCAR_RAW_DEBUG) << funcName << "Max number of contacts allowed in SSI: " << maxContacts << endl; kdDebug(OSCAR_RAW_DEBUG) << funcName << "Max number of groups allowed in SSI: " diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp index 6f62ebe6..a7c16cea 100644 --- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp +++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp @@ -27,7 +27,7 @@ ClientStreamTest::~ClientStreamTest() void ClientStreamTest::slotDoTest() { - TQString server = TQString::tqfromLatin1("login.oscar.aol.com"); + TQString server = TQString::fromLatin1("login.oscar.aol.com"); // connect to server qDebug( "connecting to server "); myTestObject->connectToServer( server, true ); // fine up to here... diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.cpp b/kopete/protocols/oscar/liboscar/tests/logintest.cpp index 540aa35c..1d3728aa 100644 --- a/kopete/protocols/oscar/liboscar/tests/logintest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/logintest.cpp @@ -29,7 +29,7 @@ LoginTest::~LoginTest() void LoginTest::slotDoTest() { - TQString server = TQString::tqfromLatin1("login.oscar.aol.com"); + TQString server = TQString::fromLatin1("login.oscar.aol.com"); // connect to server qDebug( "connecting to server "); diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp index 9849bbbb..6ca733cc 100644 --- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp @@ -29,7 +29,7 @@ LoginTest::~LoginTest() void LoginTest::slotDoTest() { - TQString server = TQString::tqfromLatin1("login.oscar.aol.com"); + TQString server = TQString::fromLatin1("login.oscar.aol.com"); // connect to server qDebug( "connecting to server "); @@ -57,7 +57,7 @@ int main(int argc, char ** argv) void LoginTest::runAddGroupTest() { qDebug( "running ssi group add test" ); - TQString group = TQString::tqfromLatin1( "dummygroup" ); + TQString group = TQString::fromLatin1( "dummygroup" ); myClient->addGroup( group ); TQTimer::singleShot( 5000, this, TQT_SLOT( runDelGroupTest() ) ); } @@ -65,7 +65,7 @@ void LoginTest::runAddGroupTest() void LoginTest::runDelGroupTest() { qDebug( "running ssi group del test" ); - TQString group = TQString::tqfromLatin1( "dummygroup" ); + TQString group = TQString::fromLatin1( "dummygroup" ); myClient->removeGroup( group ); } diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp index 663ec2fb..fb346d26 100644 --- a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp @@ -29,7 +29,7 @@ LoginTest::~LoginTest() void LoginTest::slotDoTest() { - TQString server = TQString::tqfromLatin1("login.oscar.aol.com"); + TQString server = TQString::fromLatin1("login.oscar.aol.com"); // connect to server qDebug( "connecting to server "); @@ -58,7 +58,7 @@ int main(int argc, char ** argv) void LoginTest::runUserInfoTest() { qDebug( "running user info test" ); - TQString contact = TQString::tqfromLatin1( "userid" ); + TQString contact = TQString::fromLatin1( "userid" ); myClient->requestFullInfo( contact ); } diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp index 77a6c72b..bc6ac70a 100644 --- a/kopete/protocols/oscar/liboscar/userdetails.cpp +++ b/kopete/protocols/oscar/liboscar/userdetails.cpp @@ -34,7 +34,7 @@ UserDetails::UserDetails() m_warningLevel = 0; m_userClass = 0; m_idleTime = 0; - m_extendedtqStatus = 0; + m_extendedStatus = 0; m_capabilities = 0; m_dcPort = 0; m_dcType = 0; @@ -107,9 +107,9 @@ int UserDetails::userClass() const return m_userClass; } -DWORD UserDetails::extendedtqStatus() const +DWORD UserDetails::extendedStatus() const { - return m_extendedtqStatus; + return m_extendedStatus; } BYTE UserDetails::iconCheckSumType() const @@ -183,10 +183,10 @@ void UserDetails::fill( Buffer * buffer ) #endif break; case 0x0006: //extended user status - m_extendedtqStatus = b.getDWord(); + m_extendedStatus = b.getDWord(); m_extendedStatusSpecified = true; #ifdef OSCAR_USERINFO_DEBUG - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedtqStatus, 16 ) << endl; + kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedStatus, 16 ) << endl; #endif break; case 0x000A: //external IP address @@ -366,9 +366,9 @@ void UserDetails::detectClient() case 0xFFFFFFFFL: //gaim behaves like official AIM so we can't detect them, only look for miranda { if (m_dcLastExtStatusUpdateTime & 0x80000000) - m_clientName=TQString::tqfromLatin1("Miranda alpha"); + m_clientName=TQString::fromLatin1("Miranda alpha"); else - m_clientName=TQString::tqfromLatin1("Miranda"); + m_clientName=TQString::fromLatin1("Miranda"); DWORD version = (m_dcLastExtInfoUpdateTime & 0xFFFFFF); BYTE major1 = ((version >> 24) & 0xFF); @@ -391,25 +391,25 @@ void UserDetails::detectClient() } break; case 0xFFFFFF8FL: - m_clientName = TQString::tqfromLatin1("StrICQ"); + m_clientName = TQString::fromLatin1("StrICQ"); break; case 0xFFFFFF42L: - m_clientName = TQString::tqfromLatin1("mICQ"); + m_clientName = TQString::fromLatin1("mICQ"); break; case 0xFFFFFFBEL: - m_clientName = TQString::tqfromLatin1("alicq"); + m_clientName = TQString::fromLatin1("alicq"); break; case 0xFFFFFF7FL: - m_clientName = TQString::tqfromLatin1("&RQ"); + m_clientName = TQString::fromLatin1("&RQ"); break; case 0xFFFFFFABL: - m_clientName = TQString::tqfromLatin1("YSM"); + m_clientName = TQString::fromLatin1("YSM"); break; case 0x3AA773EEL: if ((m_dcLastExtStatusUpdateTime == 0x3AA66380L) && (m_dcLastExtInfoUpdateTime == 0x3A877A42L)) { - m_clientName=TQString::tqfromLatin1("libicq2000"); + m_clientName=TQString::fromLatin1("libicq2000"); } break; default: @@ -427,48 +427,48 @@ void UserDetails::detectClient() switch (m_dcProtoVersion) { case 10: - m_clientName=TQString::tqfromLatin1("ICQ 2003b"); + m_clientName=TQString::fromLatin1("ICQ 2003b"); break; case 9: - m_clientName=TQString::tqfromLatin1("ICQ Lite"); + m_clientName=TQString::fromLatin1("ICQ Lite"); break; case 8: - m_clientName=TQString::tqfromLatin1("Miranda"); + m_clientName=TQString::fromLatin1("Miranda"); break; default: - m_clientName=TQString::tqfromLatin1("ICQ2go"); + m_clientName=TQString::fromLatin1("ICQ2go"); } } else if (hasCap(CAP_BUDDYICON)) // only gaim seems to advertize this on ICQ { - m_clientName = TQString::tqfromLatin1("Gaim"); + m_clientName = TQString::fromLatin1("Gaim"); } else if (hasCap(CAP_XTRAZ)) { - m_clientName = TQString::tqfromLatin1("ICQ 4.0 Lite"); + m_clientName = TQString::fromLatin1("ICQ 4.0 Lite"); } else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) && hasCap(CAP_IS_2001)) { - m_clientName = TQString::tqfromLatin1( "ICQ 2001"); + m_clientName = TQString::fromLatin1( "ICQ 2001"); } else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) && hasCap(CAP_STR_2002)) { - m_clientName = TQString::tqfromLatin1("ICQ 2002"); + m_clientName = TQString::fromLatin1("ICQ 2002"); } else if (hasCap(CAP_RTFMSGS) && hasCap(CAP_UTF8) && hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ)) { - m_clientName = TQString::tqfromLatin1("ICQ 2003a"); + m_clientName = TQString::fromLatin1("ICQ 2003a"); } else if (hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ)) { - m_clientName =TQString::tqfromLatin1("ICQ 2001b"); + m_clientName =TQString::fromLatin1("ICQ 2001b"); } else if ((m_dcProtoVersion == 7) && hasCap(CAP_RTFMSGS)) { - m_clientName = TQString::tqfromLatin1("GnomeICU"); + m_clientName = TQString::fromLatin1("GnomeICU"); } } @@ -514,7 +514,7 @@ void UserDetails::merge( const UserDetails& ud ) } if ( ud.m_extendedStatusSpecified ) { - m_extendedtqStatus = ud.m_extendedtqStatus; + m_extendedStatus = ud.m_extendedStatus; m_extendedStatusSpecified = true; } if ( ud.m_capabilitiesSpecified ) diff --git a/kopete/protocols/oscar/liboscar/userdetails.h b/kopete/protocols/oscar/liboscar/userdetails.h index 367d8999..8835f6f9 100644 --- a/kopete/protocols/oscar/liboscar/userdetails.h +++ b/kopete/protocols/oscar/liboscar/userdetails.h @@ -44,7 +44,7 @@ public: TQDateTime onlineSinceTime() const; //! Online since accessor TQDateTime memberSinceTime() const; //! Member since accessor int userClass() const; //! User class accessor - DWORD extendedtqStatus() const; //!User status accessor + DWORD extendedStatus() const; //!User status accessor BYTE iconCheckSumType() const; //!Buddy icon hash type TQByteArray buddyIconHash() const; //! Buddy icon md5 hash accessor TQString clientName() const; //! Client name and version @@ -85,7 +85,7 @@ private: TQDateTime m_onlineSince; /// how long the contact's been online - TLV 0x03 DWORD m_numSecondsOnline; /// how long the contact's been online in seconds WORD m_idleTime; /// the idle time of the contact - TLV 0x0F - DWORD m_extendedtqStatus; /// the extended status of the contact - TLV 0x06 + DWORD m_extendedStatus; /// the extended status of the contact - TLV 0x06 DWORD m_capabilities; //TLV 0x05 TQString m_clientVersion; /// the version of client they're using TQString m_clientName; /// the name of the client they're using diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index 89d72641..da6d534b 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -276,7 +276,7 @@ void OscarAccount::processSSIList() } kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "the following contacts are not on the server side list" << nonServerContactList << endl; - bool showMissingContactsDialog = configGroup()->readBoolEntry(TQString::tqfromLatin1("ShowMissingContactsDialog"), true); + bool showMissingContactsDialog = configGroup()->readBoolEntry(TQString::fromLatin1("ShowMissingContactsDialog"), true); if ( !nonServerContactList.isEmpty() && showMissingContactsDialog ) { d->olnscDialog = new OscarListNonServerContacts( Kopete::UI::Global::mainWidget() ); @@ -334,7 +334,7 @@ void OscarAccount::nonServerAddContactDialogClosed() } bool showOnce = d->olnscDialog->onlyShowOnce(); - configGroup()->writeEntry( TQString::tqfromLatin1("ShowMissingContactsDialog") , !showOnce); + configGroup()->writeEntry( TQString::fromLatin1("ShowMissingContactsDialog") , !showOnce); configGroup()->sync(); d->olnscDialog->delayedDestruct(); @@ -429,15 +429,15 @@ void OscarAccount::messageReceived( const Oscar::Message& message ) void OscarAccount::setServerAddress(const TQString &server) { - configGroup()->writeEntry( TQString::tqfromLatin1( "Server" ), server ); + configGroup()->writeEntry( TQString::fromLatin1( "Server" ), server ); } void OscarAccount::setServerPort(int port) { if ( port > 0 ) - configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), port ); + configGroup()->writeEntry( TQString::fromLatin1( "Port" ), port ); else //set to default 5190 - configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), 5190 ); + configGroup()->writeEntry( TQString::fromLatin1( "Port" ), 5190 ); } TQTextCodec* OscarAccount::defaultCodec() const @@ -729,7 +729,7 @@ void OscarAccount::slotSocketError( int errCode, const TQString& errString ) Q_UNUSED( errCode ); KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ), errString, - myself()->onlinetqStatus().protocolIcon(), + myself()->onlineStatus().protocolIcon(), Kopete::UI::Global::mainWidget() ); logOff( Kopete::Account::ConnectionReset ); } @@ -745,7 +745,7 @@ void OscarAccount::slotTaskError( const Oscar::SNAC& s, int code, bool fatal ) { message = getFLAPErrorMessage( code ); KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ), - message, myself()->onlinetqStatus().protocolIcon(), + message, myself()->onlineStatus().protocolIcon(), Kopete::UI::Global::mainWidget() ); switch ( code ) { @@ -772,7 +772,7 @@ void OscarAccount::slotTaskError( const Oscar::SNAC& s, int code, bool fatal ) else message = i18n("There was an error in the protocol handling; automatic reconnection occurring."); - KPassivePopup::message( i18n("OSCAR Protocol error"), message, myself()->onlinetqStatus().protocolIcon(), + KPassivePopup::message( i18n("OSCAR Protocol error"), message, myself()->onlineStatus().protocolIcon(), Kopete::UI::Global::mainWidget() ); if ( fatal ) logOff( Kopete::Account::ConnectionReset ); diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp index 3ee9ffed..71e8868d 100644 --- a/kopete/protocols/oscar/oscarcontact.cpp +++ b/kopete/protocols/oscar/oscarcontact.cpp @@ -66,7 +66,7 @@ void OscarContact::serialize(TQMap<TQString, TQString> &serializedData, serializedData["ssi_gid"] = TQString::number( m_ssiItem.gid() ); serializedData["ssi_bid"] = TQString::number( m_ssiItem.bid() ); serializedData["ssi_alias"] = m_ssiItem.alias(); - serializedData["ssi_waitingAuth"] = m_ssiItem.waitingAuth() ? TQString::tqfromLatin1( "true" ) : TQString::tqfromLatin1( "false" ); + serializedData["ssi_waitingAuth"] = m_ssiItem.waitingAuth() ? TQString::fromLatin1( "true" ) : TQString::fromLatin1( "false" ); } bool OscarContact::isOnServer() const diff --git a/kopete/protocols/oscar/oscarencodingselectionbase.ui b/kopete/protocols/oscar/oscarencodingselectionbase.ui index 97ef3f74..7a6d82ff 100644 --- a/kopete/protocols/oscar/oscarencodingselectionbase.ui +++ b/kopete/protocols/oscar/oscarencodingselectionbase.ui @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kopete/protocols/oscar/oscarvisibilitybase.ui b/kopete/protocols/oscar/oscarvisibilitybase.ui index 4a3bb1a1..b7db0d40 100644 --- a/kopete/protocols/oscar/oscarvisibilitybase.ui +++ b/kopete/protocols/oscar/oscarvisibilitybase.ui @@ -47,7 +47,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>40</height> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>40</height> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>40</height> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>40</height> diff --git a/kopete/protocols/sms/services/gsmlibprefs.ui b/kopete/protocols/sms/services/gsmlibprefs.ui index b0bcd890..c7be276f 100644 --- a/kopete/protocols/sms/services/gsmlibprefs.ui +++ b/kopete/protocols/sms/services/gsmlibprefs.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>321</width> <height>16</height> diff --git a/kopete/protocols/sms/services/smsclientprefs.ui b/kopete/protocols/sms/services/smsclientprefs.ui index 1b10799a..1442878e 100644 --- a/kopete/protocols/sms/services/smsclientprefs.ui +++ b/kopete/protocols/sms/services/smsclientprefs.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>321</width> <height>16</height> diff --git a/kopete/protocols/sms/services/smssendprefs.ui b/kopete/protocols/sms/services/smssendprefs.ui index cdd2220d..823b13e2 100644 --- a/kopete/protocols/sms/services/smssendprefs.ui +++ b/kopete/protocols/sms/services/smssendprefs.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>311</width> <height>16</height> @@ -139,7 +139,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>351</width> <height>16</height> diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index fc12437c..1788517d 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -104,7 +104,7 @@ void SMSAccount::connect(const Kopete::OnlineStatus&) void SMSAccount::slotConnected() { myself()->setOnlineStatus( SMSProtocol::protocol()->SMSOnline ); - setAllContactstqStatus( SMSProtocol::protocol()->SMSOnline ); + setAllContactsStatus( SMSProtocol::protocol()->SMSOnline ); } void SMSAccount::disconnect() @@ -116,7 +116,7 @@ void SMSAccount::disconnect() void SMSAccount::slotDisconnected() { myself()->setOnlineStatus( SMSProtocol::protocol()->SMSOffline ); - setAllContactstqStatus( SMSProtocol::protocol()->SMSOffline ); + setAllContactsStatus( SMSProtocol::protocol()->SMSOffline ); } void SMSAccount::slotSendMessage(Kopete::Message &msg) @@ -186,11 +186,11 @@ KActionMenu* SMSAccount::actionMenu() void SMSAccount::setOnlineStatus( const Kopete::OnlineStatus & status , const TQString &reason) { - if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online ) + if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online ) connect(); - else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline ) + else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline ) disconnect(); - else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away ) + else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away ) setAway( true, reason ); } diff --git a/kopete/protocols/sms/ui/smsactprefs.ui b/kopete/protocols/sms/ui/smsactprefs.ui index d04814ef..f2d5e61b 100644 --- a/kopete/protocols/sms/ui/smsactprefs.ui +++ b/kopete/protocols/sms/ui/smsactprefs.ui @@ -203,7 +203,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>181</height> @@ -379,7 +379,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kopete/protocols/sms/ui/smsadd.ui b/kopete/protocols/sms/ui/smsadd.ui index 29e75542..e5efd52b 100644 --- a/kopete/protocols/sms/ui/smsadd.ui +++ b/kopete/protocols/sms/ui/smsadd.ui @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>170</height> diff --git a/kopete/protocols/sms/ui/smsuserprefs.ui b/kopete/protocols/sms/ui/smsuserprefs.ui index 777b16b7..5a182c52 100644 --- a/kopete/protocols/sms/ui/smsuserprefs.ui +++ b/kopete/protocols/sms/ui/smsuserprefs.ui @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp index 17c1ea73..cc906447 100644 --- a/kopete/protocols/testbed/testbedaccount.cpp +++ b/kopete/protocols/testbed/testbedaccount.cpp @@ -75,10 +75,10 @@ void TestbedAccount::setAway( bool away, const TQString & /* reason */ ) void TestbedAccount::setOnlineStatus(const Kopete::OnlineStatus& status, const TQString &reason ) { if ( status.status() == Kopete::OnlineStatus::Online && - myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline ) + myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline ) slotGoOnline(); else if (status.status() == Kopete::OnlineStatus::Online && - myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away ) + myself()->onlineStatus().status() == Kopete::OnlineStatus::Away ) setAway( false, reason ); else if ( status.status() == Kopete::OnlineStatus::Offline ) slotGoOffline(); @@ -86,7 +86,7 @@ void TestbedAccount::setOnlineStatus(const Kopete::OnlineStatus& status, const T slotGoAway( /* reason */ ); } -void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialtqStatus */ ) +void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialStatus */ ) { kdDebug ( 14210 ) << k_funcinfo << endl; myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline ); @@ -114,7 +114,7 @@ void TestbedAccount::slotGoOnline () connect (); else myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline ); - updateContacttqStatus(); + updateContactStatus(); } void TestbedAccount::slotGoAway () @@ -125,7 +125,7 @@ void TestbedAccount::slotGoAway () connect(); myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedAway ); - updateContacttqStatus(); + updateContactStatus(); } @@ -135,7 +135,7 @@ void TestbedAccount::slotGoOffline () if (isConnected ()) disconnect (); - updateContacttqStatus(); + updateContactStatus(); } void TestbedAccount::slotShowVideo () @@ -144,7 +144,7 @@ void TestbedAccount::slotShowVideo () if (isConnected ()) TestbedWebcamDialog *testbedWebcamDialog = new TestbedWebcamDialog(0, 0, "Testbed video window"); - updateContacttqStatus(); + updateContactStatus(); } void TestbedAccount::receivedMessage( const TQString &message ) @@ -165,11 +165,11 @@ void TestbedAccount::receivedMessage( const TQString &message ) kdWarning(14210) << k_funcinfo << "unable to look up contact for delivery" << endl; } -void TestbedAccount::updateContacttqStatus() +void TestbedAccount::updateContactStatus() { TQDictIterator<Kopete::Contact> itr( contacts() ); for ( ; itr.current(); ++itr ) - itr.current()->setOnlineStatus( myself()->onlinetqStatus() ); + itr.current()->setOnlineStatus( myself()->onlineStatus() ); } diff --git a/kopete/protocols/testbed/testbedaccount.h b/kopete/protocols/testbed/testbedaccount.h index c9f1517e..8bb310ca 100644 --- a/kopete/protocols/testbed/testbedaccount.h +++ b/kopete/protocols/testbed/testbedaccount.h @@ -60,7 +60,7 @@ public: /** * 'Connect' to the testbed server. Only sets myself() online. */ - virtual void connect( const Kopete::OnlineStatus& initialtqStatus = Kopete::OnlineStatus() ); + virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() ); /** * Disconnect from the server. Only sets myself() offline. */ @@ -80,7 +80,7 @@ protected: /** * This simulates contacts going on and offline in sync with the account's status changes */ - void updateContacttqStatus(); + void updateContactStatus(); TestbedFakeServer* m_server; protected slots: diff --git a/kopete/protocols/testbed/testbedaccountpreferences.ui b/kopete/protocols/testbed/testbedaccountpreferences.ui index 4edf08ca..26e7fd4d 100644 --- a/kopete/protocols/testbed/testbedaccountpreferences.ui +++ b/kopete/protocols/testbed/testbedaccountpreferences.ui @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>131</height> diff --git a/kopete/protocols/testbed/testbedaddcontactpage.cpp b/kopete/protocols/testbed/testbedaddcontactpage.cpp index 9250b9a0..bb016453 100644 --- a/kopete/protocols/testbed/testbedaddcontactpage.cpp +++ b/kopete/protocols/testbed/testbedaddcontactpage.cpp @@ -48,7 +48,7 @@ bool TestbedAddContactPage::apply( Kopete::Account* a, Kopete::MetaContact* m ) if ( m_testbedAddUI->m_rbEcho->isOn() ) { type = m_testbedAddUI->m_uniqueName->text(); - name = TQString::tqfromLatin1( "Echo Contact" ); + name = TQString::fromLatin1( "Echo Contact" ); ok = true; } if ( ok ) diff --git a/kopete/protocols/testbed/testbedaddui.ui b/kopete/protocols/testbed/testbedaddui.ui index aa0410dd..e0b9202e 100644 --- a/kopete/protocols/testbed/testbedaddui.ui +++ b/kopete/protocols/testbed/testbedaddui.ui @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>252</height> diff --git a/kopete/protocols/testbed/testbedfakeserver.cpp b/kopete/protocols/testbed/testbedfakeserver.cpp index 7740b858..9a4116ca 100644 --- a/kopete/protocols/testbed/testbedfakeserver.cpp +++ b/kopete/protocols/testbed/testbedfakeserver.cpp @@ -36,8 +36,8 @@ void TestbedFakeServer::sendMessage( TQString contactId, TQString message ) kdDebug( 14210 ) << k_funcinfo << "Message for: " << contactId << ", is: " << message << endl; kdDebug( 14210 ) << "recipient is echo, coming back at you." << endl; // put the message in a map and start a timer to tell it to deliver itself. - //emit messageReceived( TQString::tqfromLatin1( "echo: " ) + message ); - TQString messageId = contactId + TQString::tqfromLatin1(": "); + //emit messageReceived( TQString::fromLatin1( "echo: " ) + message ); + TQString messageId = contactId + TQString::fromLatin1(": "); TestbedIncomingMessage* msg = new TestbedIncomingMessage( this, messageId + message ); m_incomingMessages.append( msg ); TQTimer::singleShot( 1000, msg, TQT_SLOT( deliver() ) ); diff --git a/kopete/protocols/testbed/testbedprotocol.cpp b/kopete/protocols/testbed/testbedprotocol.cpp index 301b8a08..867a2647 100644 --- a/kopete/protocols/testbed/testbedprotocol.cpp +++ b/kopete/protocols/testbed/testbedprotocol.cpp @@ -55,9 +55,9 @@ Kopete::Contact *TestbedProtocol::deserializeContact( TQString type = serializedData[ "contactType" ]; TestbedContact::TestbedContactType tbcType; - if ( type == TQString::tqfromLatin1( "echo" ) ) + if ( type == TQString::fromLatin1( "echo" ) ) tbcType = TestbedContact::Echo; - if ( type == TQString::tqfromLatin1( "null" ) ) + if ( type == TQString::fromLatin1( "null" ) ) tbcType = TestbedContact::Null; else tbcType = TestbedContact::Null; diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp index d5453978..9b98db7e 100644 --- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp +++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp @@ -43,7 +43,7 @@ TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * mImageContainer = new Kopete::WebcamWidget( page ); mImageContainer->setMinimumSize(320,240); mImageContainer->setText( i18n( "No webcam image received" ) ); - mImageContainer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + mImageContainer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); topLayout->add( mImageContainer ); show(); diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index a3ee592e..fa213552 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -108,7 +108,7 @@ bool WinPopupLib::checkMessageDir() "Install Into Samba (Configure... -> Account -> Edit) information\n" "on how to do this.\n" "Should the directory be created? (May need root password)").tqarg(WP_POPUP_DIR), - TQString::tqfromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create")); + TQString::fromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create")); if (tmpYesNo == KMessageBox::Yes) { TQStringList kdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR)); if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) return true; @@ -127,7 +127,7 @@ bool WinPopupLib::checkMessageDir() "You will not receive messages if you say no.\n" "You can also correct it manually (chmod 0777 %1) and restart kopete.\n" "Fix? (May need root password)").tqarg(WP_POPUP_DIR), - TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix")); + TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix")); if (tmpYesNo == KMessageBox::Yes) { TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR)); if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) return true; @@ -148,7 +148,7 @@ void WinPopupLib::slotUpdateGroupData() passedInitialHost = false; todo.clear(); currentGroupsMap.clear(); - currentHost = TQString::tqfromLatin1("LOCALHOST"); + currentHost = TQString::fromLatin1("LOCALHOST"); startReadProcess(currentHost); } @@ -184,7 +184,7 @@ void WinPopupLib::slotReadProcessReady(KProcIO *r) if (group.search(tmpLine) != -1) currentGroups[group.cap(1)] = group.cap(2); if (error.search(tmpLine) != -1) { kdDebug(14170) << "Connection to " << currentHost << " failed!" << endl; - if (currentHost == TQString::tqfromLatin1("LOCALHOST")) currentHost = TQString::tqfromLatin1("failed"); // to be sure + if (currentHost == TQString::fromLatin1("LOCALHOST")) currentHost = TQString::fromLatin1("failed"); // to be sure } } } @@ -229,11 +229,11 @@ void WinPopupLib::slotReadProcessExited(KProcess *r) todo += groupMaster; } } else { - if (currentHost == TQString::tqfromLatin1("failed")) + if (currentHost == TQString::fromLatin1("failed")) KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("Connection to localhost failed!\n" "Is your samba server running?"), - TQString::tqfromLatin1("Winpopup")); + TQString::fromLatin1("Winpopup")); } } @@ -303,7 +303,7 @@ void WinPopupLib::readMessages(const KFileItemList &items) i18n("A message file could not be removed; " "maybe the permissions are wrong.\n" "Fix? (May need root password)"), - TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix")); + TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix")); if (tmpYesNo == KMessageBox::Yes) { TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path())); if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) { diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h index 686252ea..b4d7dc82 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h @@ -29,7 +29,7 @@ #include <kprocio.h> #include <kfileitem.h> -const TQString WP_POPUP_DIR = TQString::tqfromLatin1("/var/lib/winpopup"); +const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup"); class KDirLister; diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui index 8049dab1..fe0fab28 100644 --- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui +++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui index 32c8ead5..91522218 100644 --- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui +++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui @@ -179,7 +179,7 @@ However, the recommended way is to ask your administrator to create this directo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>16</height> @@ -209,7 +209,7 @@ However, the recommended way is to ask your administrator to create this directo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>135</height> diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index eb881c70..004750ca 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -66,7 +66,7 @@ const TQStringList WPAccount::getHosts(const TQString &Group) bool WPAccount::checkHost(const TQString &Name) { // kdDebug() << "WPAccount::checkHost: " << Name << endl; - if (Name.upper() == TQString::tqfromLatin1("LOCALHOST")) { + if (Name.upper() == TQString::fromLatin1("LOCALHOST")) { // Assume localhost is always there, but it will not appear in the samba output. // Should never happen as localhost is now forbidden as contact, just for safety. GF return true; @@ -159,8 +159,8 @@ KActionMenu* WPAccount::actionMenu() /// How to remove an action from Kopete::Account::actionMenu()? GF - KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlinetqStatus().iconFor(this), this); - theActionMenu->popupMenu()->insertTitle(myself()->onlinetqStatus().iconFor(this), i18n("WinPopup (%1)").tqarg(accountId())); + KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this); + theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").tqarg(accountId())); if (mProtocol) { @@ -189,17 +189,17 @@ void WPAccount::slotSendMessage(const TQString &Body, const TQString &Destinatio { kdDebug(14170) << "WPAccount::slotSendMessage(" << Body << ", " << Destination << ")" << endl; - if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline); + if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline); mProtocol->sendMessage(Body, Destination); } void WPAccount::setOnlineStatus(const Kopete::OnlineStatus &status, const TQString &reason) { - if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online) + if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online) connect( status ); - else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline) + else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline) disconnect(); - else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away) + else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away) setAway( true, reason ); } diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp index 25e4b6d8..e5912c14 100644 --- a/kopete/protocols/winpopup/wpaddcontact.cpp +++ b/kopete/protocols/winpopup/wpaddcontact.cpp @@ -93,7 +93,7 @@ bool WPAddContact::validateData() // If our own host is not allowed as contact localhost should be forbidden as well, // additionally somehow localhost as contact crashes when receiving a message from it?? GF - if (tmpHostName.upper() == TQString::tqfromLatin1("LOCALHOST")) { + if (tmpHostName.upper() == TQString::fromLatin1("LOCALHOST")) { KMessageBox::sorry(this, i18n("<qt>LOCALHOST is not allowed as contact.</qt>"), i18n("WinPopup")); return false; } diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp index 1aff6e32..103a2a85 100644 --- a/kopete/protocols/winpopup/wpcontact.cpp +++ b/kopete/protocols/winpopup/wpcontact.cpp @@ -51,8 +51,8 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons // Initialise and start the periodical checking for contact's status setOnlineStatus(static_cast<WPProtocol *>(protocol())->WPOffline); - connect(&checktqStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotChecktqStatus())); - checktqStatus.start(1000, false); + connect(&checkStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus())); + checkStatus.start(1000, false); } TQPtrList<KAction> * WPContact::customContextMenuActions() @@ -89,14 +89,14 @@ Kopete::ChatSession* WPContact::manager( Kopete::Contact::CanCreateFlags /*canCr bool WPContact::isOnline() const { kdDebug(14170) << "[WPContact::isOnline()]" << endl; - return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown; + return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown; } */ bool WPContact::isReachable() { // kdDebug(14170) << "[WPContact::isReachable()]" << endl; - return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown; + return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown; } void WPContact::slotChatSessionDestroyed() @@ -131,7 +131,7 @@ void deleteContact() } */ -void WPContact::slotChecktqStatus() +void WPContact::slotCheckStatus() { bool oldWasConnected = myWasConnected; bool newIsOnline = false; @@ -141,11 +141,11 @@ void WPContact::slotChecktqStatus() if (acct) newIsOnline = acct->checkHost(contactId()); if(newIsOnline != isOnline() || myWasConnected != oldWasConnected) { - Kopete::OnlineStatus tmptqStatus = WPProtocol::protocol()->WPOffline; + Kopete::OnlineStatus tmpStatus = WPProtocol::protocol()->WPOffline; if (myWasConnected && newIsOnline) { - tmptqStatus = WPProtocol::protocol()->WPOnline; + tmpStatus = WPProtocol::protocol()->WPOnline; } - setOnlineStatus(tmptqStatus); + setOnlineStatus(tmpStatus); } } diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h index 6843d6c2..8acd7235 100644 --- a/kopete/protocols/winpopup/wpcontact.h +++ b/kopete/protocols/winpopup/wpcontact.h @@ -62,7 +62,7 @@ public: public slots: virtual void slotUserInfo(); - void slotChecktqStatus(); // the call back for the checktqStatus timer + void slotCheckStatus(); // the call back for the checkStatus timer void slotNewMessage(const TQString &Body, const TQDateTime &Arrival); private slots: @@ -73,7 +73,7 @@ private slots: private: bool myWasConnected; // true if protocol connected at last check - TQTimer checktqStatus; // checks the status of this contact every second or so + TQTimer checkStatus; // checks the status of this contact every second or so // KActionCollection *myActionCollection; // holds all the protocol specific actions (not many!) Kopete::ChatSession *m_manager; diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index a6805a7e..bf2b5c3e 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -58,7 +58,7 @@ WPProtocol::WPProtocol( TQObject *parent, const char *name, const TQStringList & sProtocol = this; - // Load tqStatus Actions + // Load Status Actions // initActions(); // TODO: Maybe use this in the future? diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp index a92cfc8f..1943aa6b 100644 --- a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp @@ -1,6 +1,6 @@ /* Kopete Yahoo Protocol - Change our tqStatus + Change our Status Copyright (c) 2005-2006 André Duffeck <duffeck@kde.org> @@ -41,7 +41,7 @@ void ChangeStatusTask::onGo() } else { - YMSGTransfer *t = new YMSGTransfer( Yahoo::ServicetqStatus ); + YMSGTransfer *t = new YMSGTransfer( Yahoo::ServiceStatus ); t->setId( client()->sessionID() ); if( !m_message.isEmpty() ) @@ -55,7 +55,7 @@ void ChangeStatusTask::onGo() send( t ); - if( client()->status() == Yahoo::StatusInvisible ) // Invisible --> tqStatus + if( client()->status() == Yahoo::StatusInvisible ) // Invisible --> Status sendVisibility( Visible ); } setSuccess(); @@ -74,7 +74,7 @@ void ChangeStatusTask::setMessage( const TQString &msg ) m_message = msg; } -void ChangeStatusTask::settqStatus( Yahoo::tqStatus status ) +void ChangeStatusTask::setStatus( Yahoo::Status status ) { m_status = status; } diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.h b/kopete/protocols/yahoo/libkyahoo/changestatustask.h index ffeb5301..200a6f34 100644 --- a/kopete/protocols/yahoo/libkyahoo/changestatustask.h +++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.h @@ -1,6 +1,6 @@ /* Kopete Yahoo Protocol - Change our tqStatus + Change our Status Copyright (c) 2005 André Duffeck <duffeck@kde.org> @@ -36,12 +36,12 @@ public: virtual void onGo(); void setMessage( const TQString &msg ); - void settqStatus( Yahoo::tqStatus status ); + void setStatus( Yahoo::Status status ); void setType( Yahoo::StatusType type ); private: enum Visibility { Visible = 1, Invisible = 2 }; TQString m_message; - Yahoo::tqStatus m_status; + Yahoo::Status m_status; Yahoo::StatusType m_type; void sendVisibility( Visibility visible ); diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp index 366b256e..30867e02 100644 --- a/kopete/protocols/yahoo/libkyahoo/client.cpp +++ b/kopete/protocols/yahoo/libkyahoo/client.cpp @@ -95,10 +95,10 @@ public: TQString yCookie; TQString tCookie; TQString cCookie; - Yahoo::tqStatus status; - Yahoo::tqStatus statusOnConnect; + Yahoo::Status status; + Yahoo::Status statusOnConnect; TQString statusMessageOnConnect; - Yahoo::PicturetqStatus pictureFlag; + Yahoo::PictureStatus pictureFlag; int pictureChecksum; bool buddyListReady; TQStringList pictureRequestQueue; @@ -112,7 +112,7 @@ Client::Client(TQObject *par) :TQObject(par, "yahooclient") d->root = new Task(this, true); d->statusOnConnect = Yahoo::StatusAvailable; - settqStatus( Yahoo::StatusDisconnected ); + setStatus( Yahoo::StatusDisconnected ); d->tasksInitialized = false; d->stream = 0L; d->iconLoader = 0L; @@ -132,8 +132,8 @@ Client::Client(TQObject *par) :TQObject(par, "yahooclient") TQObject::connect( d->loginTask, TQT_SIGNAL( haveCookies() ), TQT_SLOT( slotGotCookies() ) ); TQObject::connect( d->listTask, TQT_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ), TQT_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ) ); - TQObject::connect( d->listTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ), - TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ) ); + TQObject::connect( d->listTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ), + TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) ); } Client::~Client() @@ -151,7 +151,7 @@ void Client::connect( const TQString &host, const uint port, const TQString &use d->port = port; d->user = userId; d->pass = pass; - settqStatus( Yahoo::StatusConnecting ); + setStatus( Yahoo::StatusConnecting ); m_connector = new KNetworkConnector; m_connector->setOptHostPort( host, port ); @@ -272,9 +272,9 @@ void Client::slotLoginResponse( int response, const TQString &msg ) if( !(d->statusOnConnect == Yahoo::StatusAvailable || d->statusOnConnect == Yahoo::StatusInvisible) || !d->statusMessageOnConnect.isEmpty() ) - changetqStatus( d->statusOnConnect, d->statusMessageOnConnect, Yahoo::StatusTypeAway ); + changeStatus( d->statusOnConnect, d->statusMessageOnConnect, Yahoo::StatusTypeAway ); d->statusMessageOnConnect = TQString(); - settqStatus( d->statusOnConnect ); + setStatus( d->statusOnConnect ); /* only send a ping every hour. we get disconnected otherwise */ m_pingTimer->start( 60 * 60 * 1000 ); initTasks(); @@ -344,7 +344,7 @@ void Client::sendBuzz( const TQString &to ) { SendMessageTask *smt = new SendMessageTask( d->root ); smt->setTarget( to ); - smt->setText( TQString::tqfromLatin1( "<ding>" ) ); + smt->setText( TQString::fromLatin1( "<ding>" ) ); smt->setPicureFlag( pictureFlag() ); smt->go( true ); } @@ -404,13 +404,13 @@ void Client::cancelFileTransfer( unsigned int transferId ) emit fileTransferCanceled( transferId ); } -void Client::changetqStatus( Yahoo::tqStatus status, const TQString &message, Yahoo::StatusType type ) +void Client::changeStatus( Yahoo::Status status, const TQString &message, Yahoo::StatusType type ) { kdDebug(YAHOO_RAW_DEBUG) << "status: " << status << " message: " << message << " type: " << type << endl; ChangeStatusTask *cst = new ChangeStatusTask( d->root ); - cst->settqStatus( status ); + cst->setStatus( status ); cst->setMessage( message ); cst->setType( type ); cst->go( true ); @@ -418,7 +418,7 @@ void Client::changetqStatus( Yahoo::tqStatus status, const TQString &message, Ya if( status == Yahoo::StatusInvisible ) stealthContact( TQString(), Yahoo::StealthOnline, Yahoo::StealthClear ); - settqStatus( status ); + setStatus( status ); } void Client::sendAuthReply( const TQString &userId, bool accept, const TQString &msg ) @@ -444,7 +444,7 @@ void Client::sendPing() // ***** Contactlist handling ***** -void Client::stealthContact(TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthtqStatus state) +void Client::stealthContact(TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthStatus state) { StealthTask *st = new StealthTask( d->root ); st->setTarget( userId ); @@ -575,7 +575,7 @@ void Client::sendPictureInformation( const TQString &userId, const TQString &url spt->go( true ); } -void Client::setPicturetqStatus( Yahoo::PicturetqStatus status ) +void Client::setPictureStatus( Yahoo::PictureStatus status ) { if( d->pictureFlag == status ) return; @@ -583,8 +583,8 @@ void Client::setPicturetqStatus( Yahoo::PicturetqStatus status ) kdDebug(YAHOO_RAW_DEBUG) << "Setting PictureStatus to: " << status << endl; d->pictureFlag = status; SendPictureTask *spt = new SendPictureTask( d->root ); - spt->setType( SendPictureTask::SendtqStatus ); - spt->settqStatus( status ); + spt->setType( SendPictureTask::SendStatus ); + spt->setStatus( status ); spt->go( true ); } @@ -710,7 +710,7 @@ void Client::leaveChat() // ***** other ***** void Client::notifyError( const TQString &info, const TQString & errorString, LogLevel level ) { - kdDebug(YAHOO_RAW_DEBUG) << TQString::tqfromLatin1("\nThe following error occurred: %1\n Reason: %2\n LogLevel: %3") + kdDebug(YAHOO_RAW_DEBUG) << TQString::fromLatin1("\nThe following error occurred: %1\n Reason: %2\n LogLevel: %3") .tqarg(info).tqarg(errorString).tqarg(level) << endl; d->errorString = errorString; d->errorInformation = info; @@ -727,18 +727,18 @@ void Client::setUserId( const TQString & userId ) d->user = userId; } -Yahoo::tqStatus Client::status() +Yahoo::Status Client::status() { return d->status; } -void Client::settqStatus( Yahoo::tqStatus status ) +void Client::setStatus( Yahoo::Status status ) { d->status = status; } -void Client::setStatusOnConnect( Yahoo::tqStatus status ) +void Client::setStatusOnConnect( Yahoo::Status status ) { d->statusOnConnect = status; } @@ -841,8 +841,8 @@ void Client::initTasks() d->statusTask = new StatusNotifierTask( d->root ); TQObject::connect( d->statusTask, TQT_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ), TQT_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ) ); - TQObject::connect( d->statusTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ), - TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ) ); + TQObject::connect( d->statusTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ), + TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) ); TQObject::connect( d->statusTask, TQT_SIGNAL( loginResponse( int, const TQString& ) ), TQT_SLOT( slotLoginResponse( int, const TQString& ) ) ); TQObject::connect( d->statusTask, TQT_SIGNAL( authorizationRejected( const TQString&, const TQString& ) ), diff --git a/kopete/protocols/yahoo/libkyahoo/client.h b/kopete/protocols/yahoo/libkyahoo/client.h index 586eead5..4e1602eb 100644 --- a/kopete/protocols/yahoo/libkyahoo/client.h +++ b/kopete/protocols/yahoo/libkyahoo/client.h @@ -100,7 +100,7 @@ Q_OBJECT * If status is any other status the Client connects into Online state and changes into the specified state after the login. * @param status the status to connect with */ - void setStatusOnConnect( Yahoo::tqStatus status ); + void setStatusOnConnect( Yahoo::Status status ); /** * Specifies the status message we connect with. @@ -147,7 +147,7 @@ Q_OBJECT * @param message the status message that will be set * @param type Yahoo::StatusTypeAvailable means that the user is available, Yahoo::StatusTypeAway means that the user is away from the keyboard */ - void changetqStatus(Yahoo::tqStatus status, const TQString &message, Yahoo::StatusType type); + void changeStatus(Yahoo::Status status, const TQString &message, Yahoo::StatusType type); /** * Set the verification word that is needed for a account verification after @@ -162,7 +162,7 @@ Q_OBJECT * @param group the group where the buddy will be placed * @param message the message that will be sent to the buddy along the authorization request */ - void addBuddy( const TQString &userId, const TQString &group, const TQString &message = TQString::tqfromLatin1("Please add me") ); + void addBuddy( const TQString &userId, const TQString &group, const TQString &message = TQString::fromLatin1("Please add me") ); /** * Remove a buddy from the contact list @@ -185,7 +185,7 @@ Q_OBJECT * @param mode defines the Stealth mode that is changed. That can be "Appear Offline", "Appear Online" or "Apper permanently offline" * @param state the status of the specified Stealth mode. Active, Not Active or Clear */ - void stealthContact( TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthtqStatus state ); + void stealthContact( TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthStatus state ); /** * Request the buddy's picture @@ -226,7 +226,7 @@ Q_OBJECT * Notify the buddies about our new status * @param flag the type of our picture (0=none, 1=avatar, 2=picture) */ - void setPicturetqStatus( Yahoo::PicturetqStatus flag ); + void setPictureStatus( Yahoo::PictureStatus flag ); /** * Send a response to the webcam invite ( Accept / Decline ) @@ -432,13 +432,13 @@ Q_OBJECT int pictureChecksum(); /** Get our status */ - Yahoo::tqStatus status(); + Yahoo::Status status(); /** * Set our status * @param status the new status */ - void settqStatus( Yahoo::tqStatus status ); + void setStatus( Yahoo::Status status ); /** Access the root Task for this client, so tasks may be added to it. */ Task* rootTask(); @@ -503,7 +503,7 @@ Q_OBJECT /** * Notifies about the stealth status of buddies */ - void stealthStatusChanged( const TQString &, Yahoo::StealthtqStatus ); + void stealthStatusChanged( const TQString &, Yahoo::StealthStatus ); /** * Notifies about mails */ diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.h b/kopete/protocols/yahoo/libkyahoo/listtask.h index cd7718e3..8f8e69ba 100644 --- a/kopete/protocols/yahoo/libkyahoo/listtask.h +++ b/kopete/protocols/yahoo/libkyahoo/listtask.h @@ -41,7 +41,7 @@ protected: void parseStealthList( YMSGTransfer *transfer ); signals: void gotBuddy(const TQString&, const TQString&, const TQString&); - void stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ); + void stealthStatusChanged( const TQString&, Yahoo::StealthStatus ); }; #endif diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index d653ecf1..301b5083 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -404,7 +404,7 @@ void LoginTask::handleAuthResp(YMSGTransfer *t) mState = InitialState; } -void LoginTask::setStateOnConnect( Yahoo::tqStatus status ) +void LoginTask::setStateOnConnect( Yahoo::Status status ) { m_stateOnConnect = status; } diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.h b/kopete/protocols/yahoo/libkyahoo/logintask.h index 30c01ffe..4ed1ac95 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.h +++ b/kopete/protocols/yahoo/libkyahoo/logintask.h @@ -47,7 +47,7 @@ public: virtual void onGo(); void reset(); - void setStateOnConnect( Yahoo::tqStatus status ); + void setStateOnConnect( Yahoo::Status status ); void setVerificationWord( const TQString &word ); const TQString &yCookie(); @@ -80,7 +80,7 @@ signals: void buddyListReady(); private: State mState; - Yahoo::tqStatus m_stateOnConnect; + Yahoo::Status m_stateOnConnect; TQString m_yCookie; TQString m_tCookie; TQString m_cCookie; diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp index 133b17cf..1a813a66 100644 --- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp @@ -68,7 +68,7 @@ void MailNotifierTask::parseMail( YMSGTransfer *t ) TQString subject = t->firstParam( 18 ); if( !mail.isEmpty() && !from.isEmpty() && !subject.isEmpty() ) - emit mailNotify( TQString::tqfromLatin1( "%1 <%2>").tqarg( from, mail ), subject, count.toInt() ); + emit mailNotify( TQString::fromLatin1( "%1 <%2>").tqarg( from, mail ), subject, count.toInt() ); else emit mailNotify( TQString(), TQString(), count.toInt()); } diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index 3888bef8..4da8517f 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -99,7 +99,7 @@ void ModifyYABTask::connectSucceeded() kdDebug(YAHOO_RAW_DEBUG) ; KBufferedSocket* socket = const_cast<KBufferedSocket*>( static_cast<const KBufferedSocket*>( sender() ) ); - TQString header = TQString::tqfromLatin1("POST /yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1& HTTP/1.1\r\n" + TQString header = TQString::fromLatin1("POST /yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1& HTTP/1.1\r\n" "Cookie: Y=%1; T=%2; C=%3 ;B=fckeert1kk1nl&b=2\r\n" "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n" "Host: address.yahoo.com\r\n" diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp index a7245fe6..07c3d225 100644 --- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp @@ -47,8 +47,8 @@ bool PictureNotifierTask::take( Transfer* transfer ) switch( t->service() ) { - case Yahoo::ServicePicturetqStatus: - parsePicturetqStatus( t ); + case Yahoo::ServicePictureStatus: + parsePictureStatus( t ); parsePicture( t ); break; case Yahoo::ServicePictureChecksum: @@ -80,13 +80,13 @@ bool PictureNotifierTask::forMe( const Transfer* transfer ) const t->service() == Yahoo::ServicePicture || t->service() == Yahoo::ServicePictureUpdate || t->service() == Yahoo::ServicePictureUpload || - t->service() == Yahoo::ServicePicturetqStatus ) + t->service() == Yahoo::ServicePictureStatus ) return true; else return false; } -void PictureNotifierTask::parsePicturetqStatus( YMSGTransfer *t ) +void PictureNotifierTask::parsePictureStatus( YMSGTransfer *t ) { kdDebug(YAHOO_RAW_DEBUG) ; diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h index 7e09be19..832efc35 100644 --- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h @@ -39,7 +39,7 @@ public: protected: virtual bool forMe( const Transfer *transfer ) const; void parsePictureChecksum( YMSGTransfer *transfer ); - void parsePicturetqStatus( YMSGTransfer *transfer ); + void parsePictureStatus( YMSGTransfer *transfer ); void parsePicture( YMSGTransfer *transfer ); void parsePictureUploadResponse( YMSGTransfer *transfer ); signals: diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp index 3943cd22..5910fbfe 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp @@ -187,19 +187,19 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer ) send( t ); // The server expects a HTTP HEAD command prior to the GET - m_mimetypeJob = KIO::mimetype(TQString::tqfromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") + m_mimetypeJob = KIO::mimetype(TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") .tqarg( TQString(transfer->firstParam( 250 )) ).tqarg( TQString(transfer->firstParam( 251 )) ).tqarg(m_userId).tqarg(client()->userId()), false); m_mimetypeJob->addMetaData("cookies", "manual"); - m_mimetypeJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;") + m_mimetypeJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;") .tqarg(client()->tCookie()).tqarg(client()->yCookie()).tqarg(client()->cCookie()) ); - m_transferJob = KIO::get( TQString::tqfromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") + m_transferJob = KIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") .tqarg( TQString(transfer->firstParam( 250 )) ).tqarg( TQString(transfer->firstParam( 251 )) ).tqarg(m_userId).tqarg(client()->userId()), false, false ); TQObject::connect( m_transferJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) ); TQObject::connect( m_transferJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) ); m_transferJob->addMetaData("cookies", "manual"); - m_transferJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;") + m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;") .tqarg(client()->tCookie()).tqarg(client()->yCookie()) ); } } diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp index 3f4f83b2..638a1811 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp @@ -35,7 +35,7 @@ void SendNotifyTask::onGo() { YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceNotify); t->setId( client()->sessionID() ); - t->settqStatus( Yahoo::StatusNotify ); + t->setStatus( Yahoo::StatusNotify ); switch( m_type ) { diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index a9e76332..48d2af8c 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -55,8 +55,8 @@ void SendPictureTask::onGo() case SendInformation: sendInformation(); break; - case SendtqStatus: - sendtqStatus(); + case SendStatus: + sendStatus(); break; } } @@ -111,7 +111,7 @@ void SendPictureTask::connectSucceeded() paket = t.serialize(); kdDebug(YAHOO_RAW_DEBUG) << "Sizes: File (" << m_path << "): " << file.size() << " - paket: " << paket.size() << endl; - TQString header = TQString::tqfromLatin1("POST /notifyft HTTP/1.1\r\n" + TQString header = TQString::fromLatin1("POST /notifyft HTTP/1.1\r\n" "Cookie: Y=%1; T=%2; C=%3 ;\r\n" "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n" "Host: filetransfer.msg.yahoo.com\r\n" @@ -208,11 +208,11 @@ void SendPictureTask::sendInformation() setSuccess(); } -void SendPictureTask::sendtqStatus() +void SendPictureTask::sendStatus() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - YMSGTransfer *t = new YMSGTransfer(Yahoo::ServicePicturetqStatus); + YMSGTransfer *t = new YMSGTransfer(Yahoo::ServicePictureStatus); t->setId( client()->sessionID() ); t->setParam(3, client()->userId().local8Bit()); t->setParam(213, m_status ); @@ -252,7 +252,7 @@ void SendPictureTask::setChecksum( int checksum ) m_checksum = checksum; } -void SendPictureTask::settqStatus( int status ) +void SendPictureTask::setStatus( int status ) { m_status = status; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h index 861d0dd5..4bac4f31 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h @@ -37,7 +37,7 @@ class SendPictureTask : public Task Q_OBJECT TQ_OBJECT public: - enum Type { UploadPicture, SendChecksum, SendInformation, SendtqStatus }; + enum Type { UploadPicture, SendChecksum, SendInformation, SendStatus }; SendPictureTask(Task *parent); virtual ~SendPictureTask(); @@ -50,13 +50,13 @@ public: void setFilesize( int ); void setPath( const TQString & ); void setChecksum( int ); - void settqStatus( int ); + void setStatus( int ); void setUrl( const TQString & ); private: void initiateUpload(); void sendChecksum(); void sendInformation(); - void sendtqStatus(); + void sendStatus(); private slots: void connectSucceeded(); void connectFailed( int ); diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp index 95e06b3c..ac900a83 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp @@ -42,11 +42,11 @@ bool StatusNotifierTask::take( Transfer* transfer ) YMSGTransfer *t = static_cast<YMSGTransfer*>(transfer); if( t->service() == Yahoo::ServiceStealthOffline ) - parseStealthtqStatus( t ); + parseStealthStatus( t ); else if( t->service() == Yahoo::ServiceAuthorization ) parseAuthorization( t ); else - parsetqStatus( t ); + parseStatus( t ); return true; } @@ -67,17 +67,17 @@ bool StatusNotifierTask::forMe( const Transfer* transfer ) const t->service() == Yahoo::ServiceGameLogoff || t->service() == Yahoo::ServiceIdAct || t->service() == Yahoo::ServiceIddeAct || - t->service() == Yahoo::ServicetqStatus || + t->service() == Yahoo::ServiceStatus || t->service() == Yahoo::ServiceStealthOffline || t->service() == Yahoo::ServiceAuthorization || - t->service() == Yahoo::ServiceBuddytqStatus + t->service() == Yahoo::ServiceBuddyStatus ) return true; else return false; } -void StatusNotifierTask::parsetqStatus( YMSGTransfer* t ) +void StatusNotifierTask::parseStatus( YMSGTransfer* t ) { kdDebug(YAHOO_RAW_DEBUG) ; @@ -163,7 +163,7 @@ void StatusNotifierTask::parseAuthorization( YMSGTransfer* t ) } } -void StatusNotifierTask::parseStealthtqStatus( YMSGTransfer* t ) +void StatusNotifierTask::parseStealthStatus( YMSGTransfer* t ) { kdDebug(YAHOO_RAW_DEBUG) ; diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h index 8ed029f5..4941d479 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h @@ -38,12 +38,12 @@ public: protected: virtual bool forMe( const Transfer *transfer ) const; - void parsetqStatus( YMSGTransfer *transfer ); - void parseStealthtqStatus( YMSGTransfer *transfer ); + void parseStatus( YMSGTransfer *transfer ); + void parseStealthStatus( YMSGTransfer *transfer ); void parseAuthorization( YMSGTransfer *transfer ); signals: void statusChanged( const TQString &nick, int state, const TQString &message, int away, int idle, int pictureChecksum ); - void stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ); + void stealthStatusChanged( const TQString&, Yahoo::StealthStatus ); void loginResponse( int, const TQString& ); void authorizationAccepted( const TQString & ); void authorizationRejected( const TQString &, const TQString & ); diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp index 9dcc2431..6eba854a 100644 --- a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp @@ -70,7 +70,7 @@ void StealthTask::setTarget( const TQString &to ) m_target = to; } -void StealthTask::setState( Yahoo::StealthtqStatus state) +void StealthTask::setState( Yahoo::StealthStatus state) { m_state = state; } diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.h b/kopete/protocols/yahoo/libkyahoo/stealthtask.h index aef13038..370f06bc 100644 --- a/kopete/protocols/yahoo/libkyahoo/stealthtask.h +++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.h @@ -35,12 +35,12 @@ public: virtual void onGo(); void setTarget( const TQString &to ); - void setState( Yahoo::StealthtqStatus state ); + void setState( Yahoo::StealthStatus state ); void setMode( Yahoo::StealthMode mode ); private: TQString m_target; Yahoo::StealthMode m_mode; - Yahoo::StealthtqStatus m_state; + Yahoo::StealthStatus m_state; }; #endif diff --git a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp index 6d8d9e0d..efcd63cf 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp +++ b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp @@ -30,7 +30,7 @@ ClientStreamTest::~ClientStreamTest() void ClientStreamTest::slotDoTest() { - TQString server = TQString::tqfromLatin1("scs.msg.yahoo.com"); + TQString server = TQString::fromLatin1("scs.msg.yahoo.com"); // connect to server kdDebug(14180) << k_funcinfo << " connecting to server" << endl; myTestObject->connectToServer( server, true ); // fine up to here... diff --git a/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp index ecf96906..5e9b04a5 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp +++ b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp @@ -46,7 +46,7 @@ LoginTest::~LoginTest() void LoginTest::slotDoTest() { - TQString server = TQString::tqfromLatin1("scs.msg.yahoo.com"); + TQString server = TQString::fromLatin1("scs.msg.yahoo.com"); // connect to server kdDebug(14180) << k_funcinfo << " connecting to server" << endl; diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index 8c85705c..addcb15a 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -94,7 +94,7 @@ void WebcamTask::parseWebcamInformation( YMSGTransfer *t ) info.sender = keyPending; info.server = t->firstParam( 102 ); info.key = t->firstParam( 61 ); - info.status = InitialtqStatus; + info.status = InitialStatus; info.dataLength = 0; info.buffer = 0L; info.headerRead = false; diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.h b/kopete/protocols/yahoo/libkyahoo/webcamtask.h index 1aff0537..66dd92c8 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.h +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.h @@ -30,7 +30,7 @@ namespace KNetwork { } using namespace KNetwork; -enum ConnectiontqStatus{ InitialtqStatus, ConnectedStage1, ConnectedStage2, Receiving, Sending, SendingEmpty }; +enum ConnectionStatus{ InitialStatus, ConnectedStage1, ConnectedStage2, Receiving, Sending, SendingEmpty }; enum PacketType { Image, ConnectionClosed, UserRequest, NewWatcher, WatcherLeft }; enum Direction { Incoming, Outgoing }; @@ -39,7 +39,7 @@ struct YahooWebcamInformation TQString sender; TQString server; TQString key; - ConnectiontqStatus status; + ConnectionStatus status; PacketType type; Direction direction; uchar reason; diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp index 278dcd31..391d494e 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp @@ -94,12 +94,12 @@ void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision ) { kdDebug(YAHOO_RAW_DEBUG) << "LastMerge: " << lastMerge << " LastRemoteRevision: " << lastRemoteRevision << endl; m_data = TQString(); - TQString url = TQString::tqfromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3") + TQString url = TQString::fromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3") .tqarg( lastMerge ).tqarg( lastRemoteRevision ).tqarg( YMSG_PROGRAM_VERSION_STRING ); m_transferJob = KIO::get( url , false, false ); m_transferJob->addMetaData("cookies", "manual"); - m_transferJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: Y=%1; T=%2; C=%3;") + m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;") .tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()) ); connect( m_transferJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) ); connect( m_transferJob, TQT_SIGNAL( result( KIO::Job *) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) ); diff --git a/kopete/protocols/yahoo/libkyahoo/yahootypes.h b/kopete/protocols/yahoo/libkyahoo/yahootypes.h index a5017609..376036b3 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahootypes.h +++ b/kopete/protocols/yahoo/libkyahoo/yahootypes.h @@ -93,8 +93,8 @@ namespace Yahoo ServicePictureUpdate = 0xc1, ServicePictureUpload = 0xc2, ServiceVisibility = 0xc5, /* YMSG13, key 13: 2 = invisible, 1 = visible */ - ServicetqStatus = 0xc6, /* YMSG13 */ - ServicePicturetqStatus = 0xc7, /* YMSG13, key 213: 0 = none, 1 = avatar, 2 = picture */ + ServiceStatus = 0xc6, /* YMSG13 */ + ServicePictureStatus = 0xc7, /* YMSG13, key 213: 0 = none, 1 = avatar, 2 = picture */ ServiceContactDetails = 0xd3, /* YMSG13 */ ServiceChatSession = 0xd4, ServiceAuthorization = 0xd6, /* YMSG13 */ @@ -102,11 +102,11 @@ namespace Yahoo ServiceFileTransfer7Info = 0xdd, /* YMSG13 */ ServiceFileTransfer7Accept = 0xde, /* YMSG13 */ ServiceBuddyChangeGroup = 0xe7, /* YMSG13 */ - ServiceBuddytqStatus = 0xf0, + ServiceBuddyStatus = 0xf0, ServiceBuddyList = 0xf1 }; - enum tqStatus + enum Status { StatusConnecting = -2, StatusDisconnected = -1, @@ -134,7 +134,7 @@ namespace Yahoo StatusTypeAway }; - enum LogintqStatus { + enum LoginStatus { LoginOk = 0, LoginUname = 3, LoginPasswd = 13, @@ -150,7 +150,7 @@ namespace Yahoo StealthPermOffline }; - enum StealthtqStatus { + enum StealthStatus { StealthActive = 1, StealthNotActive = 2, StealthClear = 3 @@ -161,7 +161,7 @@ namespace Yahoo ResponseDecline }; - enum PicturetqStatus { + enum PictureStatus { NoPicture = 0, Avatar = 1, Picture = 2 diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp index 6cc99f24..b1e6e4e3 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp +++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp @@ -64,7 +64,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) int pos = 0; int len = 0; - Yahoo::tqStatus status = Yahoo::StatusAvailable; + Yahoo::Status status = Yahoo::StatusAvailable; Yahoo::Service service = Yahoo::ServiceAuth; int statusnum = 0; int sessionid = 0; @@ -149,9 +149,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceIddeAct " << servicenum << endl; service = Yahoo::ServiceIddeAct; break; - case (Yahoo::ServicetqStatus) : + case (Yahoo::ServiceStatus) : kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceStatus " << servicenum << endl; - service = Yahoo::ServicetqStatus; + service = Yahoo::ServiceStatus; break; case (Yahoo::ServiceMessage) : kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceMessage " << servicenum << endl; @@ -177,9 +177,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePictureChecksum " << servicenum << endl; service = Yahoo::ServicePictureChecksum; break; - case (Yahoo::ServicePicturetqStatus) : + case (Yahoo::ServicePictureStatus) : kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePictureStatus " << servicenum << endl; - service = Yahoo::ServicePicturetqStatus; + service = Yahoo::ServicePictureStatus; break; case (Yahoo::ServicePicture) : kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePicture " << servicenum << endl; @@ -297,9 +297,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceComment " << servicenum << endl; service = Yahoo::ServiceComment; break; - case (Yahoo::ServiceBuddytqStatus) : + case (Yahoo::ServiceBuddyStatus) : kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddyStatus " << servicenum << endl; - service = Yahoo::ServiceBuddytqStatus; + service = Yahoo::ServiceBuddyStatus; break; case (Yahoo::ServiceBuddyList) : kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddyList " << servicenum << endl; @@ -329,7 +329,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) ServiceGroupRename = 0x89, // > 1, 65(new), 66(0), 67(old) ServicePictureUpdate = 0xc1, ServiceVisibility = 0xc5, // YMSG13, key 13: 2 = invisible, 1 = visible - ServicetqStatus = 0xc6, // YMSG13 + ServiceStatus = 0xc6, // YMSG13 */ default: @@ -378,7 +378,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) YMSGTransfer *t = new YMSGTransfer(); t->setService(service); t->setId(sessionid); - t->settqStatus(status); + t->setStatus(status); t->setPacketLength(len); TQString d = TQString::fromAscii( packet.data() + pos, packet.size() - pos ); diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp index 3ed2192a..b1f77863 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp +++ b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp @@ -39,7 +39,7 @@ public: int version; int packetLength; Yahoo::Service service; - Yahoo::tqStatus status; + Yahoo::Status status; unsigned int id; ParamList data; bool valid; @@ -62,7 +62,7 @@ YMSGTransfer::YMSGTransfer(Yahoo::Service service) d->status = Yahoo::StatusAvailable; } -YMSGTransfer::YMSGTransfer(Yahoo::Service service, Yahoo::tqStatus status) +YMSGTransfer::YMSGTransfer(Yahoo::Service service, Yahoo::Status status) { d = new YMSGTransferPrivate; d->valid = true; @@ -96,12 +96,12 @@ void YMSGTransfer::setService(Yahoo::Service service) d->service = service; } -Yahoo::tqStatus YMSGTransfer::status() const +Yahoo::Status YMSGTransfer::status() const { return d->status; } -void YMSGTransfer::settqStatus(Yahoo::tqStatus status) +void YMSGTransfer::setStatus(Yahoo::Status status) { d->status = status; } diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h index 953d3993..09ba7a27 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h +++ b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h @@ -40,7 +40,7 @@ class YMSGTransfer : public Transfer { public: YMSGTransfer(Yahoo::Service service); - YMSGTransfer(Yahoo::Service service, Yahoo::tqStatus status); + YMSGTransfer(Yahoo::Service service, Yahoo::Status status); YMSGTransfer(); ~YMSGTransfer(); @@ -51,8 +51,8 @@ public: bool isValid() const; Yahoo::Service service() const; void setService(Yahoo::Service service); - Yahoo::tqStatus status() const; - void settqStatus(Yahoo::tqStatus status); + Yahoo::Status status() const; + void setStatus(Yahoo::Status status); unsigned int id() const; void setId(unsigned int id); int packetLength() const; diff --git a/kopete/protocols/yahoo/ui/yahooadd.ui b/kopete/protocols/yahoo/ui/yahooadd.ui index f497da37..252bc424 100644 --- a/kopete/protocols/yahoo/ui/yahooadd.ui +++ b/kopete/protocols/yahoo/ui/yahooadd.ui @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui index 144a0f33..60dcf519 100644 --- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui @@ -29,7 +29,7 @@ <property name="name"> <cstring>tabWidget11</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>460</width> <height>0</height> @@ -147,7 +147,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>81</height> @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> @@ -371,13 +371,13 @@ <property name="name"> <cstring>m_Picture</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>96</width> <height>96</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>96</width> <height>96</height> diff --git a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui index 16af6016..8089a9d3 100644 --- a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui @@ -218,7 +218,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>30</height> @@ -516,7 +516,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>78</height> diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui index c1d88464..056a93f4 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui +++ b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui @@ -63,7 +63,7 @@ <property name="name"> <cstring>listFriends</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>180</height> @@ -97,7 +97,7 @@ <property name="name"> <cstring>listInvited</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>150</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -265,7 +265,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>350</width> <height>31</height> diff --git a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui index 197de528..2193118e 100644 --- a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>130</height> diff --git a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui index d0254985..92246ba1 100644 --- a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui +++ b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui @@ -12,7 +12,7 @@ <height>114</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>195</width> <height>75</height> diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index a19ebfff..bdf56e79 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -47,21 +47,21 @@ YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, co showButton( User2, false ); TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General Yahoo Information" ), - KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "identity" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo ); m_genInfoWidget = new YahooGeneralInfoWidget( genInfo, "Basic Information" ); genLayout->addWidget( m_genInfoWidget ); TQFrame* workInfo = addPage( i18n( "Work Info" ), i18n( "Work Information" ), - KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "attach" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo ); m_workInfoWidget = new YahooWorkInfoWidget( workInfo, "Work Information" ); workLayout->addWidget( m_workInfoWidget ); TQFrame* otherInfo = addPage( i18n( "Other Info" ), i18n( "Other Yahoo Information" ), - KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo ); m_otherInfoWidget = new YahooOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); diff --git a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui index 5a18d662..351bcec4 100644 --- a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui @@ -12,7 +12,7 @@ <height>200</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>450</width> <height>200</height> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>72</width> <height>20</height> @@ -116,7 +116,7 @@ <property name="name"> <cstring>mPicture</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>240</width> <height>75</height> @@ -139,7 +139,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>72</width> <height>20</height> diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp index 640164f1..0bff9120 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp @@ -44,11 +44,11 @@ YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * pare m_imageContainer = new Kopete::WebcamWidget( page ); m_imageContainer->setText( i18n( "No webcam image received" ) ); m_imageContainer->setMinimumSize(320,240); - m_imageContainer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_imageContainer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); topLayout->add( m_imageContainer ); m_Viewer = new TQLabel( page ); - m_Viewer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_Viewer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_Viewer->hide(); topLayout->add( m_Viewer ); @@ -67,7 +67,7 @@ void YahooWebcamDialog::newImage( const TQPixmap &image ) void YahooWebcamDialog::webcamPaused() { - m_imageContainer->setText( TQString::tqfromLatin1("*** Webcam paused ***") ); + m_imageContainer->setText( TQString::fromLatin1("*** Webcam paused ***") ); } void YahooWebcamDialog::webcamClosed( int reason ) diff --git a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui index c501d6b5..a70bc620 100644 --- a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui @@ -143,7 +143,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -210,7 +210,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>150</height> diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index eabf6fdd..c6c861c9 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -109,7 +109,7 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con // initConnectionSignals( MakeConnections ); - TQString displayName = configGroup()->readEntry(TQString::tqfromLatin1("displayName"), TQString()); + TQString displayName = configGroup()->readEntry(TQString::fromLatin1("displayName"), TQString()); if(!displayName.isEmpty()) _myself->setNickName(displayName); @@ -130,15 +130,15 @@ YahooAccount::~YahooAccount() void YahooAccount::setServer( const TQString &server ) { - configGroup()->writeEntry( TQString::tqfromLatin1( "Server" ), server ); + configGroup()->writeEntry( TQString::fromLatin1( "Server" ), server ); } void YahooAccount::setPort( int port ) { - configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), port ); + configGroup()->writeEntry( TQString::fromLatin1( "Port" ), port ); } -void YahooAccount::slotGotqStatus( int status, const TQString &awayMessage) +void YahooAccount::slotGoStatus( int status, const TQString &awayMessage) { kdDebug(YAHOO_GEN_DEBUG) << "GoStatus: " << status << " msg: " << awayMessage << endl; if( !isConnected() ) @@ -148,7 +148,7 @@ void YahooAccount::slotGotqStatus( int status, const TQString &awayMessage) } else { - m_session->changetqStatus( Yahoo::tqStatus( status ), awayMessage, + m_session->changeStatus( Yahoo::Status( status ), awayMessage, (status == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway ); //sets the awayMessage property for the owner of the account. shows up in the statusbar icon's tooltip. the property is unset when awayMessage is null @@ -265,8 +265,8 @@ void YahooAccount::initConnectionSignals( enum SignalConnectionType sct ) TQObject::connect(m_session, TQT_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)), this, TQT_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int))); - TQObject::connect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthtqStatus)), - this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthtqStatus)) ); + TQObject::connect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)), + this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); TQObject::connect(m_session, TQT_SIGNAL(gotIm(const TQString&, const TQString&, long, int)), this, TQT_SLOT(slotGotIm(const TQString &, const TQString&, long, int))); @@ -407,8 +407,8 @@ void YahooAccount::initConnectionSignals( enum SignalConnectionType sct ) TQObject::disconnect(m_session, TQT_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)), this, TQT_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int))); - TQObject::disconnect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthtqStatus)), - this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthtqStatus)) ); + TQObject::disconnect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)), + this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); TQObject::disconnect(m_session, TQT_SIGNAL(gotIm(const TQString&, const TQString&, long, int)), this, TQT_SLOT(slotGotIm(const TQString &, const TQString&, long, int))); @@ -526,7 +526,7 @@ void YahooAccount::connectWithPassword( const TQString &passwd ) } if ( isConnected() || - myself()->onlinetqStatus() == m_protocol->Connecting ) + myself()->onlineStatus() == m_protocol->Connecting ) { kdDebug(YAHOO_GEN_DEBUG) << "Yahoo plugin: Ignoring connect request (already connected)." << endl; return; @@ -549,7 +549,7 @@ void YahooAccount::connectWithPassword( const TQString &passwd ) kdDebug(YAHOO_GEN_DEBUG) << "Attempting to connect to Yahoo on <" << server << ":" << port << ">. user <" << accountId() << ">" << endl; static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Connecting ); - m_session->setStatusOnConnect( Yahoo::tqStatus( initialtqStatus().internalStatus() ) ); + m_session->setStatusOnConnect( Yahoo::Status( initialStatus().internalStatus() ) ); m_session->connect( server, port, accountId().lower(), passwd ); } @@ -607,9 +607,9 @@ void YahooAccount::setAway(bool status, const TQString &awayMessage) kdDebug(YAHOO_GEN_DEBUG) ; if( awayMessage.isEmpty() ) - slotGotqStatus( status ? 2 : 0 ); + slotGoStatus( status ? 2 : 0 ); else - slotGotqStatus( status ? 99 : 0, awayMessage ); + slotGoStatus( status ? 99 : 0, awayMessage ); } void YahooAccount::slotConnected() @@ -623,7 +623,7 @@ void YahooAccount::slotGoOnline() if( !isConnected() ) connect( m_protocol->Online ); else - slotGotqStatus(0); + slotGoStatus(0); } void YahooAccount::slotGoOffline() @@ -722,9 +722,9 @@ void YahooAccount::slotLoginResponse( int succ , const TQString &url ) setupActions( succ == Yahoo::LoginOk ); if ( succ == Yahoo::LoginOk || (succ == Yahoo::LoginDupl && m_lastDisconnectCode == 2) ) { - if ( initialtqStatus().internalStatus() ) + if ( initialStatus().internalStatus() ) { - static_cast<YahooContact *>( myself() )->setOnlineStatus( initialtqStatus() ); + static_cast<YahooContact *>( myself() )->setOnlineStatus( initialStatus() ); } else { @@ -802,7 +802,7 @@ void YahooAccount::slotDisconnected() TQString message; message = i18n( "%1 has been disconnected.\nError message:\n%2 - %3" ) .tqarg( accountId() ).tqarg( m_session->error() ).tqarg( m_session->errorString() ); - KNotification::event( "connection_lost", message, myself()->onlinetqStatus().protocolIcon() ); + KNotification::event( "connection_lost", message, myself()->onlineStatus().protocolIcon() ); } void YahooAccount::slotLoginFailed() @@ -815,7 +815,7 @@ void YahooAccount::slotLoginFailed() TQString message; message = i18n( "There was an error while connecting %1 to the Yahoo server.\nError message:\n%2 - %3" ) .tqarg( accountId()).tqarg( m_session->error() ).tqarg( m_session->errorString() ); - KNotification::event( "cannot_connect", message, myself()->onlinetqStatus().protocolIcon() ); + KNotification::event( "cannot_connect", message, myself()->onlineStatus().protocolIcon() ); } void YahooAccount::slotError( int level ) @@ -889,7 +889,7 @@ void YahooAccount::slotAuthorizationAccepted( const TQString &who ) kdDebug(YAHOO_GEN_DEBUG) ; TQString message; message = i18n( "User %1 has granted your authorization request." ).tqarg( who ); - KNotification::event( TQString::tqfromLatin1("kopete_authorization"), message ); + KNotification::event( TQString::fromLatin1("kopete_authorization"), message ); if( contact( who ) ) contact( who )->setOnlineStatus( m_protocol->Online ); @@ -901,7 +901,7 @@ void YahooAccount::slotAuthorizationRejected( const TQString &who, const TQStrin TQString message; message = i18n( "User %1 has rejected your authorization request.\n%2" ) .tqarg( who ).tqarg( msg ); - KNotification::event( TQString::tqfromLatin1("kopete_authorization"), message ); + KNotification::event( TQString::fromLatin1("kopete_authorization"), message ); } void YahooAccount::slotgotAuthorizationRequest( const TQString &user, const TQString &msg, const TQString &name ) @@ -995,24 +995,24 @@ void YahooAccount::slotStatusChanged( const TQString &who, int stat, const TQStr if ( kc ) { - Kopete::OnlineStatus newtqStatus = m_protocol->statusFromYahoo( stat ); - Kopete::OnlineStatus oldtqStatus = kc->onlinetqStatus(); + Kopete::OnlineStatus newStatus = m_protocol->statusFromYahoo( stat ); + Kopete::OnlineStatus oldStatus = kc->onlineStatus(); - if( newtqStatus == m_protocol->Custom ) { + if( newStatus == m_protocol->Custom ) { if( away == 0 ) - newtqStatus =m_protocol->Online; + newStatus =m_protocol->Online; kc->setProperty( m_protocol->awayMessage, msg); } else kc->removeProperty( m_protocol->awayMessage ); // from original file - if( newtqStatus != m_protocol->Offline && oldtqStatus == m_protocol->Offline && contact(who) != myself() ) + if( newStatus != m_protocol->Offline && oldStatus == m_protocol->Offline && contact(who) != myself() ) { //m_session->requestBuddyIcon( who ); // Try to get Buddy Icon if ( !myself()->property( Kopete::Global::Properties::self()->photo() ).isNull() && - myself()->onlinetqStatus() != m_protocol->Invisible && + myself()->onlineStatus() != m_protocol->Invisible && !kc->stealthed() ) { kc->sendBuddyIconUpdate( m_session->pictureFlag() ); @@ -1020,19 +1020,19 @@ void YahooAccount::slotStatusChanged( const TQString &who, int stat, const TQStr } } - //if( newtqStatus == static_cast<YahooProtocol*>( m_protocol )->Idle ) { - if( newtqStatus == m_protocol->Idle ) + //if( newStatus == static_cast<YahooProtocol*>( m_protocol )->Idle ) { + if( newStatus == m_protocol->Idle ) kc->setIdleTime( idle ? idle : 1 ); else kc->setIdleTime( 0 ); - kc->setOnlineStatus( newtqStatus ); + kc->setOnlineStatus( newStatus ); slotGotBuddyIconChecksum( who, pictureChecksum ); } } -void YahooAccount::slotStealthStatusChanged( const TQString &who, Yahoo::StealthtqStatus state ) +void YahooAccount::slotStealthStatusChanged( const TQString &who, Yahoo::StealthStatus state ) { //kdDebug(YAHOO_GEN_DEBUG) << "Stealth Status of " << who << "changed to " << state; @@ -1053,7 +1053,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) kdDebug(YAHOO_GEN_DEBUG) << "Message after stripping color codes '" << newMsgText << "'" << endl; - newMsgText.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); + newMsgText.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&" ) ); // Replace Font tags regExp.setMinimal( true ); @@ -1063,7 +1063,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) pos = regExp.search( newMsgText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsgText.replace( regExp, TQString::tqfromLatin1("<font\\1style=\"font-size:\\2pt\">" ) ); + newMsgText.replace( regExp, TQString::fromLatin1("<font\\1style=\"font-size:\\2pt\">" ) ); } } @@ -1095,7 +1095,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) pos = regExp.search( newMsgText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsgText.replace( regExp, TQString::tqfromLatin1("<" ) ); + newMsgText.replace( regExp, TQString::fromLatin1("<" ) ); } } regExp.setPattern( "([^\"bui])>" ); @@ -1104,22 +1104,22 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) pos = regExp.search( newMsgText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsgText.replace( regExp, TQString::tqfromLatin1("\\1>" ) ); + newMsgText.replace( regExp, TQString::fromLatin1("\\1>" ) ); } } // add closing tags when needed regExp.setMinimal( false ); regExp.setPattern( "(<b>.*)(?!</b>)" ); - newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</b>" ) ); + newMsgText.replace( regExp, TQString::fromLatin1("\\1</b>" ) ); regExp.setPattern( "(<i>.*)(?!</i>)" ); - newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</i>" ) ); + newMsgText.replace( regExp, TQString::fromLatin1("\\1</i>" ) ); regExp.setPattern( "(<u>.*)(?!</u>)" ); - newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</u>" ) ); + newMsgText.replace( regExp, TQString::fromLatin1("\\1</u>" ) ); regExp.setPattern( "(<font.*)(?!</font>)" ); - newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</font>" ) ); + newMsgText.replace( regExp, TQString::fromLatin1("\\1</font>" ) ); - newMsgText.replace( TQString::tqfromLatin1( "\r" ), TQString::tqfromLatin1( "<br/>" ) ); + newMsgText.replace( TQString::fromLatin1( "\r" ), TQString::fromLatin1( "<br/>" ) ); return newMsgText; } @@ -1143,7 +1143,7 @@ void YahooAccount::slotGotIm( const TQString &who, const TQString &msg, long tm, // FIXME to check if (tm == 0) - //msgDT = TQDateTime( TQDate::tqcurrentDate(), TQTime::currentTime(), TQt::LocalTime ); + //msgDT = TQDateTime( TQDate::currentDate(), TQTime::currentTime(), TQt::LocalTime ); msgDT.setTime_t(time(0L)); else //msgDT = TQDateTime::fromTime_t(tm); @@ -1181,7 +1181,7 @@ void YahooAccount::slotGotBuzz( const TQString &who, long tm ) // FIXME: to check if (tm == 0) - //msgDT = TQDateTime( TQDate::tqcurrentDate(), TQTime::currentTime(), TQt::LocalTime ); + //msgDT = TQDateTime( TQDate::currentDate(), TQTime::currentTime(), TQt::LocalTime ); msgDT.setTime_t(time(0L)); else //msgDT = TQDateTime::fromTime_t(tm); @@ -1642,7 +1642,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec if ( cnt > 0 && from.isEmpty() ) { - TQObject::connect(KNotification::event( TQString::tqfromLatin1("yahoo_mail"), i18n( "You have one unread message in your Yahoo inbox.", + TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have one unread message in your Yahoo inbox.", "You have %n unread messages in your Yahoo inbox.", cnt ), TQPixmap() , 0 ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); @@ -1651,7 +1651,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec else if ( cnt > 0 ) { kdDebug(YAHOO_GEN_DEBUG) << "attempting to trigger event" << endl; - TQObject::connect(KNotification::event( TQString::tqfromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2").tqarg( from ).tqarg( subject ), + TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2").tqarg( from ).tqarg( subject ), TQPixmap() , 0 ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); m_currentMailCount = cnt; @@ -1777,7 +1777,7 @@ void YahooAccount::setBuddyIcon( const KURL &url ) myself()->removeProperty( YahooProtocol::protocol()->iconExpire ); if ( m_session ) - m_session->setPicturetqStatus( Yahoo::NoPicture ); + m_session->setPictureStatus( Yahoo::NoPicture ); } else { @@ -1827,7 +1827,7 @@ void YahooAccount::setBuddyIcon( const KURL &url ) configGroup()->writeEntry( "iconLocalUrl", newlocation ); if ( checksum != static_cast<uint>(myself()->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt()) || - TQDateTime::tqcurrentDateTime().toTime_t() > expire ) + TQDateTime::currentDateTime().toTime_t() > expire ) { myself()->setProperty( YahooProtocol::protocol()->iconCheckSum, checksum ); configGroup()->writeEntry( "iconCheckSum", checksum ); @@ -1848,7 +1848,7 @@ void YahooAccount::slotBuddyIconChanged( const TQString &url, int expires ) myself()->setProperty( YahooProtocol::protocol()->iconExpire , expires ); configGroup()->writeEntry( "iconRemoteUrl", url ); configGroup()->writeEntry( "iconExpire", expires ); - m_session->setPicturetqStatus( Yahoo::Picture ); + m_session->setPictureStatus( Yahoo::Picture ); m_session->sendPictureChecksum( TQString(), checksum ); } } @@ -1928,52 +1928,52 @@ void YahooAccount::slotWebcamPaused( const TQString &who ) void YahooAccount::setOnlineStatus( const Kopete::OnlineStatus &status, const TQString &reason) { kdDebug(YAHOO_GEN_DEBUG) ; - if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && + if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && status.status() != Kopete::OnlineStatus::Offline ) { if( !reason.isEmpty() ) m_session->setStatusMessageOnConnect( reason ); connect( status ); } - else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && + else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline ) { disconnect(); } - else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && + else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.internalStatus() == 2 && !reason.isEmpty()) { - slotGotqStatus( 99, reason ); + slotGoStatus( 99, reason ); } - else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && + else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.internalStatus() == 99 && reason.isEmpty()) { - slotGotqStatus( 2, reason ); + slotGoStatus( 2, reason ); } - else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline ) + else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline ) { - slotGotqStatus( status.internalStatus(), reason ); + slotGoStatus( status.internalStatus(), reason ); } } /* FIXME: not ported yet void YahooAccount::setStatusMessage(const Kopete::StatusMessage &statusMessage) { - int currenttqStatus = myself()->onlinetqStatus().internalStatus(); - m_session->changetqStatus( Yahoo::tqStatus( currenttqStatus ), statusMessage.message(), - (currenttqStatus == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway ); + int currentStatus = myself()->onlineStatus().internalStatus(); + m_session->changeStatus( Yahoo::Status( currentStatus ), statusMessage.message(), + (currentStatus == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway ); myself()->setStatusMessage( statusMessage ); } */ void YahooAccount::slotOpenInbox() { - KRun::runURL( KURL( TQString::tqfromLatin1("http://mail.yahoo.com/") ) , "text/html" ); + KRun::runURL( KURL( TQString::fromLatin1("http://mail.yahoo.com/") ) , "text/html" ); } void YahooAccount::slotOpenYAB() { - KRun::runURL( KURL( TQString::tqfromLatin1("http://address.yahoo.com/") ) , "text/html" ); + KRun::runURL( KURL( TQString::fromLatin1("http://address.yahoo.com/") ) , "text/html" ); } void YahooAccount::slotEditOwnYABEntry() diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h index 7cfc6f84..de647bbe 100644 --- a/kopete/protocols/yahoo/yahooaccount.h +++ b/kopete/protocols/yahoo/yahooaccount.h @@ -176,7 +176,7 @@ protected slots: void slotJoinChatRoom(); void slotChatCategorySelected( const Yahoo::ChatCategory &category ); - void slotGotqStatus(int status, const TQString &awayMessage = TQString()); + void slotGoStatus(int status, const TQString &awayMessage = TQString()); void slotLoginResponse(int succ, const TQString &url); void slotDisconnected(); void slotLoginFailed(); @@ -192,7 +192,7 @@ protected slots: void slotGotIgnore(const TQStringList &); void slotGotIdentities(const TQStringList &); void slotStatusChanged(const TQString &who, int stat, const TQString &msg, int away, int idle, int pictureChecksum); - void slotStealthStatusChanged(const TQString &who, Yahoo::StealthtqStatus state); + void slotStealthStatusChanged(const TQString &who, Yahoo::StealthStatus state); void slotGotIm(const TQString &who, const TQString &msg, long tm, int stat); void slotGotBuzz(const TQString &who, long tm); void slotGotConfInvite(const TQString &who, const TQString &room, const TQString &msg, const TQStringList &members); diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp index ef0bf09e..5402919c 100644 --- a/kopete/protocols/yahoo/yahoochatsession.cpp +++ b/kopete/protocols/yahoo/yahoochatsession.cpp @@ -127,7 +127,7 @@ void YahooChatSession::slotDisplayPictureChanged() int sz=22; // get the size of the toolbar were the aciton is plugged. // if you know a better way to get the toolbar, let me know - KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L; + KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; if(w) { //We connected that in the constructor. we don't need to keep this slot active. diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index 06559f8f..f74fd1b6 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -128,7 +128,7 @@ void YahooContact::setOnlineStatus(const Kopete::OnlineStatus &status) void YahooContact::setStealthed( bool stealthed ) { m_stealthed = stealthed; - setOnlineStatus( onlinetqStatus() ); + setOnlineStatus( onlineStatus() ); } bool YahooContact::stealthed() @@ -187,7 +187,7 @@ void YahooContact::sync(unsigned int flags) bool YahooContact::isOnline() const { //kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown; + return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown; } bool YahooContact::isReachable() @@ -232,7 +232,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1font-weight:600\\2>\033[1m\\3\033[x1m</span>" ) ); + newMsg.replace( regExp, TQString::fromLatin1("<span\\1font-weight:600\\2>\033[1m\\3\033[x1m</span>" ) ); } } @@ -243,7 +243,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1text-decoration:underline\\2>\033[4m\\3\033[x4m</span>" ) ); + newMsg.replace( regExp, TQString::fromLatin1("<span\\1text-decoration:underline\\2>\033[4m\\3\033[x4m</span>" ) ); } } @@ -254,7 +254,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1font-style:italic\\2>\033[2m\\3\033[x2m</span>" ) ); + newMsg.replace( regExp, TQString::fromLatin1("<span\\1font-style:italic\\2>\033[2m\\3\033[x2m</span>" ) ); } } @@ -265,7 +265,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3>\033[#\\2m\\4\033[#000000m</span>" ) ); + newMsg.replace( regExp, TQString::fromLatin1("<span\\1\\3>\033[#\\2m\\4\033[#000000m</span>" ) ); } } @@ -276,7 +276,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3><font face=\"\\2\">\\4</span>" ) ); + newMsg.replace( regExp, TQString::fromLatin1("<span\\1\\3><font face=\"\\2\">\\4</span>" ) ); } } @@ -287,7 +287,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3><font size=\"\\2\">\\4</span>" ) ); + newMsg.replace( regExp, TQString::fromLatin1("<span\\1\\3><font size=\"\\2\">\\4</span>" ) ); } } @@ -298,18 +298,18 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::tqfromLatin1("\\2") ); + newMsg.replace( regExp, TQString::fromLatin1("\\2") ); } } // convert escaped chars - newMsg.replace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); - newMsg.replace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); - newMsg.replace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); - newMsg.replace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); - newMsg.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); - newMsg.replace( TQString::tqfromLatin1( "<br />" ), TQString::tqfromLatin1( "\r" ) ); - newMsg.replace( TQString::tqfromLatin1( "<br/>" ), TQString::tqfromLatin1( "\r" ) ); + newMsg.replace( TQString::fromLatin1( ">" ), TQString::fromLatin1( ">" ) ); + newMsg.replace( TQString::fromLatin1( "<" ), TQString::fromLatin1( "<" ) ); + newMsg.replace( TQString::fromLatin1( """ ), TQString::fromLatin1( "\"" ) ); + newMsg.replace( TQString::fromLatin1( " " ), TQString::fromLatin1( " " ) ); + newMsg.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&" ) ); + newMsg.replace( TQString::fromLatin1( "<br />" ), TQString::fromLatin1( "\r" ) ); + newMsg.replace( TQString::fromLatin1( "<br/>" ), TQString::fromLatin1( "\r" ) ); return newMsg; } @@ -447,7 +447,7 @@ void YahooContact::slotUserProfile() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - TQString profileSiteString = TQString::tqfromLatin1("http://profiles.yahoo.com/") + userId(); + TQString profileSiteString = TQString::fromLatin1("http://profiles.yahoo.com/") + userId(); KRun::runURL( KURL( profileSiteString ) , "text/html" ); } @@ -467,7 +467,7 @@ void YahooContact::stealthContact() stealthSettingDialog->setMainWidget( stealthWidget ); // Prepare dialog - if( m_account->myself()->onlinetqStatus() == YahooProtocol::protocol()->Invisible ) + if( m_account->myself()->onlineStatus() == YahooProtocol::protocol()->Invisible ) { stealthWidget->radioOffline->setEnabled( true ); stealthWidget->radioOffline->setChecked( true ); @@ -490,7 +490,7 @@ void YahooContact::stealthContact() m_account->yahooSession()->stealthContact( m_userId, Yahoo::StealthPermOffline, Yahoo::StealthActive ); // Apply temporary setting - if( m_account->myself()->onlinetqStatus() == YahooProtocol::protocol()->Invisible ) + if( m_account->myself()->onlineStatus() == YahooProtocol::protocol()->Invisible ) { if( stealthWidget->radioOnline->isChecked() ) { diff --git a/kopete/protocols/yahoo/yahoocontact.h b/kopete/protocols/yahoo/yahoocontact.h index e9f8b517..acd69e0d 100644 --- a/kopete/protocols/yahoo/yahoocontact.h +++ b/kopete/protocols/yahoo/yahoocontact.h @@ -54,7 +54,7 @@ public: virtual void serialize( TQMap<TQString, TQString> &serializedData, TQMap<TQString, TQString> &addressBookData ); void setOnlineStatus(const Kopete::OnlineStatus &status); - void setYahootqStatus( const Kopete::OnlineStatus& ); + void setYahooStatus( const Kopete::OnlineStatus& ); void setStealthed( bool ); bool stealthed(); diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp index dc6115df..8b07f036 100644 --- a/kpf/src/ActiveMonitor.cpp +++ b/kpf/src/ActiveMonitor.cpp @@ -146,7 +146,7 @@ namespace KPF void ActiveMonitor::slotCull() { - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQListViewItemIterator it(view_); diff --git a/kpf/src/ActiveMonitorItem.cpp b/kpf/src/ActiveMonitorItem.cpp index 04fe857d..217e437c 100644 --- a/kpf/src/ActiveMonitorItem.cpp +++ b/kpf/src/ActiveMonitorItem.cpp @@ -93,7 +93,7 @@ namespace KPF { switch (c) { - case tqStatus: + case Status: return 16; break; @@ -115,19 +115,19 @@ namespace KPF switch (server_->state()) { case Server::WaitingForRequest: - setPixmap(tqStatus, SmallIcon("connect_creating")); + setPixmap(Status, SmallIcon("connect_creating")); break; case Server::WaitingForHeaders: - setPixmap(tqStatus, SmallIcon("connect_creating")); + setPixmap(Status, SmallIcon("connect_creating")); break; case Server::Responding: - setPixmap(tqStatus, SmallIcon("connect_established")); + setPixmap(Status, SmallIcon("connect_established")); break; case Server::Finished: - setPixmap(tqStatus, SmallIcon("connect_no")); + setPixmap(Status, SmallIcon("connect_no")); break; } } diff --git a/kpf/src/ActiveMonitorItem.h b/kpf/src/ActiveMonitorItem.h index 8cc347e2..a5d78971 100644 --- a/kpf/src/ActiveMonitorItem.h +++ b/kpf/src/ActiveMonitorItem.h @@ -48,7 +48,7 @@ namespace KPF enum Column { - tqStatus, + Status, Progress, Size, Sent, diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp index 546aa630..84a4bdef 100644 --- a/kpf/src/BandwidthGraph.cpp +++ b/kpf/src/BandwidthGraph.cpp @@ -112,7 +112,7 @@ namespace KPF p.drawPixmap( ( width()-bgPix_.width() )/2, ( height()-bgPix_.height() )/2, bgPix_ ); - p.setPen(tqcolorGroup().dark()); + p.setPen(colorGroup().dark()); for (uint i = 0; i < history_.size(); i++) { @@ -280,13 +280,13 @@ namespace KPF } TQSize - BandwidthGraph::tqsizeHint() const + BandwidthGraph::sizeHint() const { return TQSize(32, 32); } TQSize - BandwidthGraph::tqminimumSizeHint() const + BandwidthGraph::minimumSizeHint() const { return TQSize(12, 12); } diff --git a/kpf/src/BandwidthGraph.h b/kpf/src/BandwidthGraph.h index 8684c71f..257381cf 100644 --- a/kpf/src/BandwidthGraph.h +++ b/kpf/src/BandwidthGraph.h @@ -76,12 +76,12 @@ namespace KPF /** * Overridden to provide reasonable default size and tqshape. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Overridden to provide reasonable minimum size and tqshape. */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** * @return the WebServer object given on construction. diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp index 028697d3..56dfb51f 100644 --- a/kpf/src/PropertiesDialogPlugin.cpp +++ b/kpf/src/PropertiesDialogPlugin.cpp @@ -136,7 +136,7 @@ namespace KPF TQLabel * l_bandwidthLimit; // TQLabel * l_connectionLimit; TQLabel * l_serverName; - TQLabel * l_kpftqStatus; + TQLabel * l_kpfStatus; TQSpinBox * sb_listenPort; TQSpinBox * sb_bandwidthLimit; @@ -298,10 +298,10 @@ namespace KPF l->addWidget(about); - d->l_kpftqStatus = + d->l_kpfStatus = new TQLabel(i18n("Applet status: <strong>not running</strong>"), w); - l->addWidget(d->l_kpftqStatus); + l->addWidget(d->l_kpfStatus); TQHBoxLayout * l2 = new TQHBoxLayout(l); @@ -507,7 +507,7 @@ namespace KPF void PropertiesDialogPlugin::slotStartKPF() { - d->l_kpftqStatus + d->l_kpfStatus ->setText(i18n("Applet status: <strong>starting...</strong>")); kapp->dcopClient() @@ -519,7 +519,7 @@ namespace KPF void PropertiesDialogPlugin::slotStartKPFFailed() { - d->l_kpftqStatus + d->l_kpfStatus ->setText(i18n("Applet status: <strong>failed to start</strong>")); d->pb_startKPF->setEnabled(true); @@ -532,7 +532,7 @@ namespace KPF { d->kpfRunning = true; - d->l_kpftqStatus + d->l_kpfStatus ->setText(i18n("Applet status: <strong>running</strong>")); d->pb_startKPF->setEnabled(false); @@ -554,7 +554,7 @@ namespace KPF d->pb_startKPF->setEnabled(true); - d->l_kpftqStatus + d->l_kpfStatus ->setText(i18n("Applet status: <strong>not running</strong>")); d->stack->raiseWidget(d->initWidget); diff --git a/kpf/src/Server.cpp b/kpf/src/Server.cpp index 87d3c733..868a88d3 100644 --- a/kpf/src/Server.cpp +++ b/kpf/src/Server.cpp @@ -53,7 +53,7 @@ namespace KPF d->followSymlinks = followSymlinks; - d->birth = TQDateTime::tqcurrentDateTime(); + d->birth = TQDateTime::currentDateTime(); d->socket.setSocket(socket); @@ -754,7 +754,7 @@ namespace KPF d->socket.close(); - d->death = TQDateTime::tqcurrentDateTime(); + d->death = TQDateTime::currentDateTime(); emit(finished(this)); } diff --git a/kpf/src/Utils.cpp b/kpf/src/Utils.cpp index 8dc5c373..631059a7 100644 --- a/kpf/src/Utils.cpp +++ b/kpf/src/Utils.cpp @@ -105,7 +105,7 @@ namespace KPF TQString dateString() { - return dateString(TQDateTime::tqcurrentDateTime()); + return dateString(TQDateTime::currentDateTime()); } diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp index 2d7ab5d7..a01854a0 100644 --- a/kppp/accounting.cpp +++ b/kppp/accounting.cpp @@ -72,7 +72,7 @@ AccountingBase::AccountingBase(TQObject *parent) : _total(0), _session(0) { - TQDate dt = TQDate::tqcurrentDate(); + TQDate dt = TQDate::currentDate(); LogFileName = TQString("%1-%2.log") .tqarg(TQDate::shortMonthName(dt.month())) .tqarg(dt.year(), 4); @@ -233,7 +233,7 @@ void Accounting::timerEvent(TQTimerEvent *t) { double newLen; double connect_time = difftime(time(0), start_time); - rules.getActiveRule(TQDateTime::tqcurrentDateTime(), connect_time, newCosts, newLen); + rules.getActiveRule(TQDateTime::currentDateTime(), connect_time, newCosts, newLen); if(newLen < 1) { // changed to < 1 slotStop(); return; // no default rule found @@ -279,7 +279,7 @@ void Accounting::slotStart() { _lastcosts = 0.0; _lastlen = 0.0; _session = rules.perConnectionCosts(); - rules.setStartTime(TQDateTime::tqcurrentDateTime()); + rules.setStartTime(TQDateTime::currentDateTime()); acct_timer_id = startTimer(1); if(UPDATE_TIME > 0) update_timer_id = startTimer(UPDATE_TIME); diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp index fe1424e2..2b8ae563 100644 --- a/kppp/accounts.cpp +++ b/kppp/accounts.cpp @@ -75,7 +75,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editaccount())); TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account")); - min = edit_b->tqsizeHint().width(); + min = edit_b->sizeHint().width(); min = TQMAX(70,min); edit_b->setMinimumWidth(min); @@ -116,7 +116,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) costedit = new TQLineEdit(parent); costedit->setFocusPolicy(TQ_NoFocus); - costedit->setFixedHeight(costedit->tqsizeHint().height()); + costedit->setFixedHeight(costedit->sizeHint().height()); costedit->setEnabled(FALSE); l121->addWidget(costedit); l121->addStretch(1); @@ -135,7 +135,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) voledit = new TQLineEdit(parent,"voledit"); voledit->setFocusPolicy(TQ_NoFocus); - voledit->setFixedHeight(voledit->tqsizeHint().height()); + voledit->setFixedHeight(voledit->sizeHint().height()); voledit->setEnabled(FALSE); l121->addWidget(voledit); tmp = i18n("<p>This shows the number of bytes transferred\n" @@ -450,7 +450,7 @@ QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) { l1->activate(); - // this activates the f-tqlayout and sets tqminimumSize() + // this activates the f-tqlayout and sets minimumSize() f->show(); tl->addWidget(f); @@ -470,7 +470,7 @@ QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) { tl->addWidget(bbox); // TODO: activate if KGroupBox is fixed - // setFixedSize(tqsizeHint()); + // setFixedSize(sizeHint()); } diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp index 2a1ec1f8..2aadce50 100644 --- a/kppp/acctselect.cpp +++ b/kppp/acctselect.cpp @@ -85,7 +85,7 @@ AccountingSelector::AccountingSelector(TQWidget *parent, bool _isnewaccount, con selected = new TQLabel(parent); selected->setFrameStyle(TQFrame::Sunken | TQFrame::WinPanel); selected->setLineWidth(1); - selected->setFixedHeight(selected->tqsizeHint().height() + 16); + selected->setFixedHeight(selected->sizeHint().height() + 16); l11->addWidget(lsel, 0); l11->addSpacing(10); l11->addWidget(selected, 1); diff --git a/kppp/connect.cpp b/kppp/connect.cpp index ea755a3e..6878d072 100644 --- a/kppp/connect.cpp +++ b/kppp/connect.cpp @@ -109,10 +109,10 @@ ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st) l0->addSpacing(10); messg = new TQLabel(this, "messg"); messg->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - messg->tqsetAlignment(AlignCenter); + messg->setAlignment(AlignCenter); messg->setText(i18n("Unable to create modem lock file.")); - messg->setMinimumHeight(messg->tqsizeHint().height() + 5); - int messw = (messg->tqsizeHint().width() * 12) / 10; + messg->setMinimumHeight(messg->sizeHint().height() + 5); + int messw = (messg->sizeHint().width() * 12) / 10; messw = TQMAX(messw,280); messg->setMinimumWidth(messw); messg->setText(i18n("Looking for modem...")); @@ -131,8 +131,8 @@ ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st) cancel->setFocus(); connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancelbutton())); - int maxw = TQMAX(cancel->tqsizeHint().width(), - debug->tqsizeHint().width()); + int maxw = TQMAX(cancel->sizeHint().width(), + debug->sizeHint().width()); maxw = TQMAX(maxw,65); debug->setFixedWidth(maxw); cancel->setFixedWidth(maxw); @@ -140,7 +140,7 @@ ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st) l1->addWidget(cancel); l1->addSpacing(10); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); pausetimer = new TQTimer(this); connect(pausetimer, TQT_SIGNAL(timeout()), TQT_SLOT(pause())); diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp index 14154e69..a657fd2c 100644 --- a/kppp/conwindow.cpp +++ b/kppp/conwindow.cpp @@ -142,11 +142,11 @@ void ConWindow::accounting(bool on) { l1->setColStretch(0, 0); l1->setColStretch(1, 1); - info2->tqsetAlignment(AlignRight|AlignVCenter); - timelabel2->tqsetAlignment(AlignRight|AlignVCenter); - session_bill->tqsetAlignment(AlignRight|AlignVCenter); - total_bill->tqsetAlignment(AlignRight|AlignVCenter); - volinfo->tqsetAlignment(AlignRight|AlignVCenter); + info2->setAlignment(AlignRight|AlignVCenter); + timelabel2->setAlignment(AlignRight|AlignVCenter); + session_bill->setAlignment(AlignRight|AlignVCenter); + total_bill->setAlignment(AlignRight|AlignVCenter); + volinfo->setAlignment(AlignRight|AlignVCenter); // make sure that there's enough space for the bills TQString s1 = session_bill->text(); TQString s2 = total_bill->text(); @@ -155,9 +155,9 @@ void ConWindow::accounting(bool on) { session_bill->setText("888888.88 XXX"); total_bill->setText("888888.88 XXX"); volinfo->setText("8888.8 MB"); - session_bill->setFixedSize(session_bill->tqsizeHint()); - total_bill->setFixedSize(total_bill->tqsizeHint()); - volinfo->setFixedSize(volinfo->tqsizeHint()); + session_bill->setFixedSize(session_bill->sizeHint()); + total_bill->setFixedSize(total_bill->sizeHint()); + volinfo->setFixedSize(volinfo->sizeHint()); session_bill->setText(s1); total_bill->setText(s2); volinfo->setText(s3); @@ -214,7 +214,7 @@ void ConWindow::accounting(bool on) { tl1->addSpacing(5); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); /* do not overwrite position read from config // If this gets re-enabled, fix it for Xinerama before committing to CVS. diff --git a/kppp/debug.cpp b/kppp/debug.cpp index 9b220c20..3dee5797 100644 --- a/kppp/debug.cpp +++ b/kppp/debug.cpp @@ -57,7 +57,7 @@ DebugWidget::DebugWidget(TQWidget *parent, const char *name) statuslabel = new TQLabel("", this, "statuslabel"); statuslabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - statuslabel->tqsetAlignment( AlignLeft|AlignVCenter ); + statuslabel->setAlignment( AlignLeft|AlignVCenter ); statuslabel->setGeometry(2, 307, 400, 20); //statusPageLabel->setFont( KGlobalSettings::generalFont() ); diff --git a/kppp/edit.cpp b/kppp/edit.cpp index ef2eaa10..368fd4fb 100644 --- a/kppp/edit.cpp +++ b/kppp/edit.cpp @@ -66,7 +66,7 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name ) number_label = new TQLabel(i18n("P&hone number:"), parent); - number_label->tqsetAlignment(AlignTop|AlignLeft); + number_label->setAlignment(AlignTop|AlignLeft); tl->addWidget(number_label, 1, 0); TQHBoxLayout *lpn = new TQHBoxLayout(5); @@ -324,7 +324,7 @@ i18n("Here you can select commands to run at certain stages of the\n" "(unless, of course, you are root).\n\n" "Be sure to supply the whole path to the program otherwise\n" "kppp might be unable to find it."), parent); - l->setMinimumHeight(l->tqsizeHint().height()); + l->setMinimumHeight(l->sizeHint().height()); tl->addWidget(l); tl->addStretch(1); @@ -334,7 +334,7 @@ i18n("Here you can select commands to run at certain stages of the\n" l1->setColStretch(1, 1); before_connect_l = new TQLabel(i18n("&Before connect:"), parent); - before_connect_l->tqsetAlignment(AlignVCenter); + before_connect_l->setAlignment(AlignVCenter); l1->addWidget(before_connect_l, 0, 0); before_connect = new TQLineEdit(parent); before_connect_l->setBuddy(before_connect); @@ -350,7 +350,7 @@ i18n("Here you can select commands to run at certain stages of the\n" TQWhatsThis::add(before_connect,tmp); command_label = new TQLabel(i18n("&Upon connect:"), parent); - command_label->tqsetAlignment(AlignVCenter); + command_label->setAlignment(AlignVCenter); l1->addWidget(command_label, 1, 0); command = new TQLineEdit(parent); command_label->setBuddy(command); @@ -367,7 +367,7 @@ i18n("Here you can select commands to run at certain stages of the\n" predisconnect_label = new TQLabel(i18n("Before &disconnect:"), parent); - predisconnect_label->tqsetAlignment(AlignVCenter); + predisconnect_label->setAlignment(AlignVCenter); l1->addWidget(predisconnect_label, 2, 0); predisconnect = new TQLineEdit(parent); predisconnect_label->setBuddy(predisconnect); @@ -382,7 +382,7 @@ i18n("Here you can select commands to run at certain stages of the\n" discommand_label = new TQLabel(i18n("U&pon disconnect:"), parent); - discommand_label->tqsetAlignment(AlignVCenter); + discommand_label->setAlignment(AlignVCenter); l1->addWidget(discommand_label, 3, 0); discommand = new TQLineEdit(parent); @@ -655,7 +655,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name ) tl->addLayout(l1, 4, 1); add = new TQPushButton(i18n("&Add"), parent); connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(adddns())); - int width = add->tqsizeHint().width(); + int width = add->sizeHint().width(); width = TQMAX(width,60); add->setMinimumWidth(width); l1->addWidget(add); @@ -667,7 +667,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name ) remove = new TQPushButton(i18n("&Remove"), parent); connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removedns())); - width = remove->tqsizeHint().width(); + width = remove->sizeHint().width(); width = TQMAX(width,60); remove->setMinimumWidth(width); l1->addWidget(remove); @@ -676,7 +676,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name ) "server entry from the list below")); servers_label = new TQLabel(i18n("DNS address &list:"), parent); - servers_label->tqsetAlignment(AlignTop|AlignLeft); + servers_label->setAlignment(AlignTop|AlignLeft); tl->addWidget(servers_label, 5, 0); dnsservers = new TQListBox(parent); @@ -908,7 +908,7 @@ ScriptWidget::ScriptWidget( TQWidget *parent, bool isnewaccount, const char *nam sl->setMinimumSize(TQSize(150, 140)); slb = new TQScrollBar(parent); - slb->setFixedWidth(slb->tqsizeHint().width()); + slb->setFixedWidth(slb->sizeHint().width()); connect(slb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrolling(int))); l12->addWidget(stl, 1); diff --git a/kppp/iplined.cpp b/kppp/iplined.cpp index 989c790c..197b13a6 100644 --- a/kppp/iplined.cpp +++ b/kppp/iplined.cpp @@ -32,11 +32,11 @@ IPLineEdit::IPLineEdit( TQWidget *parent, const char *name ) setMaxLength(3 * 4 + 1 * 3); } -TQSize IPLineEdit::tqsizeHint() const { +TQSize IPLineEdit::sizeHint() const { TQFontMetrics fm = fontMetrics(); TQSize s; - s.setHeight(TQLineEdit::tqsizeHint().height()); + s.setHeight(TQLineEdit::sizeHint().height()); s.setWidth(fm.boundingRect("888.888.888.888XX").width()); return s; } diff --git a/kppp/iplined.h b/kppp/iplined.h index 64a6dcbb..b978b6f5 100644 --- a/kppp/iplined.h +++ b/kppp/iplined.h @@ -34,7 +34,7 @@ public: IPLineEdit( TQWidget *parent=0, const char *name=0 ); ~IPLineEdit() {} - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; }; #endif diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index 8b73d393..a20d5f15 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -189,13 +189,13 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) int minw = 0; quit_b = new KPushButton(KStdGuiItem::quit(), this); connect( quit_b, TQT_SIGNAL(clicked()), TQT_SLOT(quitbutton())); - if(quit_b->tqsizeHint().width() > minw) - minw = quit_b->tqsizeHint().width(); + if(quit_b->sizeHint().width() > minw) + minw = quit_b->sizeHint().width(); setup_b = new KPushButton(KGuiItem(i18n("Co&nfigure..."), "configure"), this); connect( setup_b, TQT_SIGNAL(clicked()), TQT_SLOT(expandbutton())); - if(setup_b->tqsizeHint().width() > minw) - minw = setup_b->tqsizeHint().width(); + if(setup_b->sizeHint().width() > minw) + minw = setup_b->sizeHint().width(); if(gpppdata.access() != KConfig::ReadWrite) setup_b->setEnabled(false); @@ -206,19 +206,19 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) KHelpMenu *helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), true); help_b->setPopup((TQPopupMenu*)helpMenu->menu()); - if(help_b->tqsizeHint().width() > minw) - minw = help_b->tqsizeHint().width(); + if(help_b->sizeHint().width() > minw) + minw = help_b->sizeHint().width(); connect_b = new TQPushButton(i18n("&Connect"), this); connect_b->setDefault(true); connect_b->setFocus(); connect(connect_b, TQT_SIGNAL(clicked()), TQT_SLOT(beginConnect())); - if(connect_b->tqsizeHint().width() > minw) - minw = connect_b->tqsizeHint().width(); + if(connect_b->sizeHint().width() > minw) + minw = connect_b->sizeHint().width(); quit_b->setFixedWidth(minw); setup_b->setFixedWidth(minw); - help_b->setFixedWidth(help_b->tqsizeHint().width()); + help_b->setFixedWidth(help_b->sizeHint().width()); connect_b->setFixedWidth(minw); l2->addWidget(quit_b); @@ -227,7 +227,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) l2->addSpacing(20); l2->addWidget(connect_b); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); (void)new Modem; @@ -258,7 +258,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) KWin::setIcons(con->winId(), kapp->icon(), kapp->miniIcon() ); connect(this, TQT_SIGNAL(begin_connect()),con, TQT_SLOT(preinit())); - TQRect desk = KGlobalSettings::desktopGeometry(tqtopLevelWidget()); + TQRect desk = KGlobalSettings::desktopGeometry(topLevelWidget()); con->setGeometry(desk.center().x()-175, desk.center().y()-55, 350,110); // connect the ConnectWidgets various signals @@ -516,7 +516,7 @@ void KPPPWidget::resetmodems() { label7->setShown(m_bModemCShown); modem_c->setShown(m_bModemCShown); tqlayout()->tqinvalidate(); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); //set the default modem if(!gpppdata.defaultModem().isEmpty()) { @@ -598,8 +598,8 @@ void KPPPWidget::sigPPPDDied() { Modem::modem->unlockdevice(); con->pppdDied(); - Requester::rq->pppdExittqStatus(); - gpppdata.setWaitCallback(gpppdata.callbackType() && Requester::rq->lasttqStatus == E_CBCP_WAIT); + Requester::rq->pppdExitStatus(); + gpppdata.setWaitCallback(gpppdata.callbackType() && Requester::rq->lastStatus == E_CBCP_WAIT); if(!gpppdata.automatic_redial() && !gpppdata.waitCallback()) { quit_b->setFocus(); @@ -617,9 +617,9 @@ void KPPPWidget::sigPPPDDied() { "to come up."); else { msg = i18n("<p>The pppd daemon died unexpectedly!</p>"); - Requester::rq->pppdExittqStatus(); - if (Requester::rq->lasttqStatus != 99) { // more recent pppds only - msg += i18n("<p>Exit status: %1").tqarg(Requester::rq->lasttqStatus); + Requester::rq->pppdExitStatus(); + if (Requester::rq->lastStatus != 99) { // more recent pppds only + msg += i18n("<p>Exit status: %1").tqarg(Requester::rq->lastStatus); msg += i18n("</p><p>See 'man pppd' for an explanation of the error " "codes or take a look at the kppp FAQ on " " <a href=\"%1\">%2</a></p>") @@ -1020,7 +1020,7 @@ void KPPPWidget::showNews() { TQLabel *icon = new TQLabel(&dlg); icon->setPixmap(BarIcon("exclamation")); - icon->setFixedSize(icon->tqsizeHint()); + icon->setFixedSize(icon->sizeHint()); l1->addWidget(icon); l1->addLayout(l2); @@ -1037,7 +1037,7 @@ void KPPPWidget::showNews() { &dlg); TQCheckBox *cb = new TQCheckBox(i18n("Don't show this hint again"), &dlg); - cb->setFixedSize(cb->tqsizeHint()); + cb->setFixedSize(cb->sizeHint()); KButtonBox *bbox = new KButtonBox(&dlg); bbox->addStretch(1); diff --git a/kppp/loginterm.cpp b/kppp/loginterm.cpp index 4be1dea0..fd544486 100644 --- a/kppp/loginterm.cpp +++ b/kppp/loginterm.cpp @@ -123,10 +123,10 @@ LoginTerm::LoginTerm (TQWidget *parent, const char *name) connect(continue_b, TQT_SIGNAL(clicked()), TQT_SLOT(continuebutton())); int mwidth; - if (cancel_b->tqsizeHint().width() > continue_b->tqsizeHint().width()) - mwidth = cancel_b->tqsizeHint().width(); + if (cancel_b->sizeHint().width() > continue_b->sizeHint().width()) + mwidth = cancel_b->sizeHint().width(); else - mwidth = continue_b->tqsizeHint().width(); + mwidth = continue_b->sizeHint().width(); cancel_b->setFixedWidth(mwidth + 20); continue_b->setFixedWidth(mwidth + 20); diff --git a/kppp/logview/export.cpp b/kppp/logview/export.cpp index b646acdc..a3d55686 100644 --- a/kppp/logview/export.cpp +++ b/kppp/logview/export.cpp @@ -73,7 +73,7 @@ ExportWizard::ExportWizard(TQWidget *parent, const TQString &_date) formatLayout->addSpacing(10); typeInfo = new TQLabel(formatPage); - typeInfo->tqsetAlignment(TQt::AlignTop | TQt::WordBreak); + typeInfo->setAlignment(TQt::AlignTop | TQt::WordBreak); typeInfo->setText(i18n("<qt><b>Please choose the output format on the left side.</b></qt>")); typeInfo->setMinimumSize(350, 200); formatLayout->addWidget(typeInfo); @@ -222,9 +222,9 @@ HTMLExport::HTMLExport(const TQString &filename, const TQString &date) TQString title = i18n("Connection log for %1").tqarg(date); buffer = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n"; buffer.append("<html>\n<head>\n <title>"+title+"</title>\n"); - buffer.append(TQString::tqfromLatin1(" <meta http-equiv=\"Content-Type\" content=\"text/html; charset=") + buffer.append(TQString::fromLatin1(" <meta http-equiv=\"Content-Type\" content=\"text/html; charset=") + TQTextCodec::codecForLocale()->mimeName() + - TQString::tqfromLatin1("\">")); + TQString::fromLatin1("\">")); buffer.append("\n</head>\n<body>\n<h1>"+title+"</h1>\n\n"); buffer.append("<table width=\"100%\" border=\"1\">\n"); diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp index 6f87ae21..f034c462 100644 --- a/kppp/logview/main.cpp +++ b/kppp/logview/main.cpp @@ -86,8 +86,8 @@ TopWidget::TopWidget() : KMainWindow(0, "") { kapp, TQT_SLOT(quit())); } - setMinimumSize(mw->tqsizeHint().width() + 15, - mw->tqsizeHint().height() + 120); + setMinimumSize(mw->sizeHint().width() + 15, + mw->sizeHint().height() + 120); setCentralWidget(w); } diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 831976cc..030cd3ba 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -46,8 +46,8 @@ static void formatBytes(double bytes, TQString &result) { static void formatBytesMonth(double bytes, TQString &result) { int day, days; - day = TQDate::tqcurrentDate().day(); - days = TQDate::tqcurrentDate().daysInMonth(); + day = TQDate::currentDate().day(); + days = TQDate::currentDate().daysInMonth(); bytes = (bytes / day) * days; @@ -76,8 +76,8 @@ static void formatDuration(int seconds, TQString &result) { static void formatDurationMonth(int seconds, TQString &result) { int day, days; - day = TQDate::tqcurrentDate().day(); - days = TQDate::tqcurrentDate().daysInMonth(); + day = TQDate::currentDate().day(); + days = TQDate::currentDate().daysInMonth(); seconds = (seconds / day) * days; @@ -97,8 +97,8 @@ static void formatDurationMonth(int seconds, TQString &result) { static void costsMonth(double costs, double &result) { int day, days; - day = TQDate::tqcurrentDate().day(); - days = TQDate::tqcurrentDate().daysInMonth(); + day = TQDate::currentDate().day(); + days = TQDate::currentDate().daysInMonth(); result = (costs / day) * days; @@ -212,7 +212,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) : lv2->setSorting(-1); lv2->setItemMargin(2); lv2->setMaximumHeight(100); - lv2->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + lv2->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); lv2->setSelectionMode(TQListView::NoSelection); title = new TQLabel("X", this); @@ -220,7 +220,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) : f.setPointSize(f.pointSize() + 2); f.setBold(TRUE); title->setFont(f); - title->setFixedHeight(title->tqsizeHint().height()*2); + title->setFixedHeight(title->sizeHint().height()*2); cboConnections = new TQComboBox(false, this); // add a combo box to select connections cboConnections->setMaximumWidth(200); // a resonable size @@ -265,8 +265,8 @@ void MonthlyWidget::layoutWidget() { f2.setPointSize(f2.pointSize() + 1); f2.setBold(TRUE); l->setFont(f2); - l->setFixedHeight(l->tqsizeHint().height()); - l->tqsetAlignment( AlignLeft ); + l->setFixedHeight(l->sizeHint().height()); + l->setAlignment( AlignLeft ); tl->addWidget(l, 5, 0); tl->addWidget(bbox, 1, 2); tl->addMultiCellWidget(lv, 1, 4, 0, 1); @@ -396,7 +396,7 @@ void MonthlyWidget::plotMonth() { const KCalendarSystem * calendar = KGlobal::locale()->calendar(); - if(calendar->month(periodeFirst()) == calendar->month(TQDate::tqcurrentDate())) { + if(calendar->month(periodeFirst()) == calendar->month(TQDate::currentDate())) { TQString m_bin, m_bout; @@ -456,7 +456,7 @@ void MonthlyWidget::prevMonth() { void MonthlyWidget::currentMonth() { const KCalendarSystem * calendar = KGlobal::locale()->calendar(); - TQDate dt = TQDate::tqcurrentDate(); + TQDate dt = TQDate::currentDate(); calendar->setYMD(m_periodeFirst, calendar->year(dt), calendar->month(dt), 1); plotMonth(); @@ -464,7 +464,7 @@ void MonthlyWidget::currentMonth() { void MonthlyWidget::exportWizard() { const KCalendarSystem * calendar = KGlobal::locale()->calendar(); - TQString date = TQString::tqfromLatin1("%1-%2") // e.g.: June-2001 + TQString date = TQString::fromLatin1("%1-%2") // e.g.: June-2001 .tqarg(calendar->monthName(periodeFirst())) .tqarg(calendar->year(periodeFirst())); @@ -576,7 +576,7 @@ void MonthlyWidget::exportWizard() { } } - if(calendar->month(periodeFirst()) == calendar->month(TQDate::tqcurrentDate())) { + if(calendar->month(periodeFirst()) == calendar->month(TQDate::currentDate())) { TQString m_bin, m_bout; if(bin < 0) @@ -595,7 +595,7 @@ void MonthlyWidget::exportWizard() { costsMonth(costs, costs); TQString m_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2)); - TQString datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true); + TQString datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true); exportIFace->addEmptyLine(); exportIFace->addDataline(i18n("Monthly estimates (%1)").tqarg(datetime), diff --git a/kppp/macros.h b/kppp/macros.h index b631516a..6f541b76 100644 --- a/kppp/macros.h +++ b/kppp/macros.h @@ -5,11 +5,11 @@ #include <tqlayout.h> -#define MIN_WIDTH(w) w->setMinimumWidth(w->tqsizeHint().width()); -#define MIN_HEIGHT(w) w->setMinimumHeight(w->tqsizeHint().height()); -#define MIN_SIZE(w) w->setMinimumSize(w->tqsizeHint()); -#define FIXED_SIZE(w) w->setFixedSize(w->tqsizeHint()); -#define FIXED_WIDTH(w) w->setFixedWidth(w->tqsizeHint().width()); -#define FIXED_HEIGHT(w) w->setFixedHeight(w->tqsizeHint().height()); +#define MIN_WIDTH(w) w->setMinimumWidth(w->sizeHint().width()); +#define MIN_HEIGHT(w) w->setMinimumHeight(w->sizeHint().height()); +#define MIN_SIZE(w) w->setMinimumSize(w->sizeHint()); +#define FIXED_SIZE(w) w->setFixedSize(w->sizeHint()); +#define FIXED_WIDTH(w) w->setFixedWidth(w->sizeHint().width()); +#define FIXED_HEIGHT(w) w->setFixedHeight(w->sizeHint().height()); #endif diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp index dae8bd0f..fe1eb144 100644 --- a/kppp/modemcmds.cpp +++ b/kppp/modemcmds.cpp @@ -40,10 +40,10 @@ #include <tqlabel.h> -#define ADJUSTEDIT(e) e->setText("XXXXXXXXqy"); e->setMinimumSize(e->tqsizeHint()); e->setFixedHeight(e->tqsizeHint().height()); e->setText(""); e->setMaxLength(MODEMSTR_SIZE); +#define ADJUSTEDIT(e) e->setText("XXXXXXXXqy"); e->setMinimumSize(e->sizeHint()); e->setFixedHeight(e->sizeHint().height()); e->setText(""); e->setMaxLength(MODEMSTR_SIZE); // a little trick to make the label look like a disabled lineedit -#define FORMATSLIDERLABEL(l) l->setFixedWidth(l->tqsizeHint().width()); l->setFixedHeight(TQLineEdit(dummyWidget).tqsizeHint().height()); l->tqsetAlignment(AlignCenter); l->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); l->setLineWidth(2); +#define FORMATSLIDERLABEL(l) l->setFixedWidth(l->sizeHint().width()); l->setFixedHeight(TQLineEdit(dummyWidget).sizeHint().height()); l->setAlignment(AlignCenter); l->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); l->setLineWidth(2); ModemCommands::ModemCommands(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Edit Modem Commands"), Ok|Cancel) @@ -72,7 +72,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) preinitslider = new TQSlider(0, 300, 1, 0, Qt::Horizontal, dummyWidget); - preinitslider->setFixedHeight(preinitslider->tqsizeHint().height()); + preinitslider->setFixedHeight(preinitslider->sizeHint().height()); connect(preinitslider, TQT_SIGNAL(valueChanged(int)), lpreinitslider, TQT_SLOT(setNum(int))); l2->addWidget(lpreinitslider, 0); @@ -96,7 +96,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) FORMATSLIDERLABEL(linitslider); initslider = new TQSlider(1, 300, 1, 0, Qt::Horizontal, dummyWidget); - initslider->setFixedHeight(initslider->tqsizeHint().height()); + initslider->setFixedHeight(initslider->sizeHint().height()); connect(initslider, TQT_SIGNAL(valueChanged(int)), linitslider, TQT_SLOT(setNum(int))); l3->addWidget(linitslider, 0); @@ -112,7 +112,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) FORMATSLIDERLABEL(ldurationslider); durationslider = new TQSlider(1, 255, 1, 0, Qt::Horizontal, dummyWidget); - durationslider->setFixedHeight(durationslider->tqsizeHint().height()); + durationslider->setFixedHeight(durationslider->sizeHint().height()); connect(durationslider, TQT_SIGNAL(valueChanged(int)), ldurationslider, TQT_SLOT(setNum(int))); l4->addWidget(ldurationslider, 0); @@ -228,7 +228,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) slider = new TQSlider(0, 255, 1, 0, Qt::Horizontal, dummyWidget); - slider->setFixedHeight(slider->tqsizeHint().height()); + slider->setFixedHeight(slider->sizeHint().height()); connect(slider, TQT_SIGNAL(valueChanged(int)), lslider, TQT_SLOT(setNum(int))); l5->addWidget(lslider, 0); @@ -242,14 +242,14 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) TQHBoxLayout *l6 = new TQHBoxLayout; l1->addLayout(l6, row++, 2); volume_off = new TQLineEdit(dummyWidget); - volume_off->setFixedHeight(volume_off->tqsizeHint().height()); - volume_off->setMinimumWidth((int)(volume_off->tqsizeHint().width() / 2)); + volume_off->setFixedHeight(volume_off->sizeHint().height()); + volume_off->setMinimumWidth((int)(volume_off->sizeHint().width() / 2)); volume_medium = new TQLineEdit(dummyWidget); - volume_medium->setFixedHeight(volume_medium->tqsizeHint().height()); - volume_medium->setMinimumWidth((int)(volume_medium->tqsizeHint().width() / 2)); + volume_medium->setFixedHeight(volume_medium->sizeHint().height()); + volume_medium->setMinimumWidth((int)(volume_medium->sizeHint().width() / 2)); volume_high = new TQLineEdit(dummyWidget); - volume_high->setFixedHeight(volume_high->tqsizeHint().height()); - volume_high->setMinimumWidth((int)(volume_high->tqsizeHint().width() / 2)); + volume_high->setFixedHeight(volume_high->sizeHint().height()); + volume_high->setMinimumWidth((int)(volume_high->sizeHint().width() / 2)); l6->addWidget(volume_off); l6->addWidget(volume_medium); l6->addWidget(volume_high); diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp index 35eff389..6f910a69 100644 --- a/kppp/modemdb.cpp +++ b/kppp/modemdb.cpp @@ -51,7 +51,7 @@ ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) { "right list. If you don't know which modem you have, " "you can try out one of the \"Generic\" modems."), this); - l1->tqsetAlignment(AlignLeft | WordBreak); + l1->setAlignment(AlignLeft | WordBreak); l1->setFixedWidth(400); l1->setMinimumHeight(50); tl->addWidget(l1, 0); @@ -75,7 +75,7 @@ ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) { cancel = bbox->addButton(KStdGuiItem::cancel()); bbox->tqlayout(); tl->addWidget(bbox); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); // set up modem database db = new ModemDatabase(); diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp index 8c9f00cd..7a5da172 100644 --- a/kppp/modeminfo.cpp +++ b/kppp/modeminfo.cpp @@ -48,7 +48,7 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name) statusBar = new TQLabel(this,"sBar"); statusBar->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - statusBar->tqsetAlignment(AlignCenter); + statusBar->setAlignment(AlignCenter); // This is a rather complicated case. Since we do not know which // message is the widest in the national language, we'd to @@ -56,12 +56,12 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name) // the longest english message, translate it and give it additional // 20 percent space. Hope this is enough. statusBar->setText(i18n("Unable to create modem lock file.")); - statusBar->setFixedWidth((statusBar->tqsizeHint().width() * 12) / 10); - statusBar->setFixedHeight(statusBar->tqsizeHint().height() + 4); + statusBar->setFixedWidth((statusBar->sizeHint().width() * 12) / 10); + statusBar->setFixedHeight(statusBar->sizeHint().height() + 4); // set original text statusBar->setText(i18n("Looking for modem...")); - progressBar->setFixedHeight(statusBar->tqminimumSize().height()); + progressBar->setFixedHeight(statusBar->minimumSize().height()); tl->addWidget(progressBar); tl->addWidget(statusBar); @@ -74,7 +74,7 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name) l1->addStretch(1); l1->addWidget(cancel); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); step = 0; @@ -280,7 +280,7 @@ ModemInfo::ModemInfo(TQWidget *parent, const char* name) connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); l2->addWidget(ok); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); } diff --git a/kppp/modems.cpp b/kppp/modems.cpp index 9cbe6d9a..5a13be66 100644 --- a/kppp/modems.cpp +++ b/kppp/modems.cpp @@ -74,7 +74,7 @@ ModemsWidget::ModemsWidget( TQWidget *parent, const char *name ) connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editmodem())); TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account")); - min = edit_b->tqsizeHint().width(); + min = edit_b->sizeHint().width(); min = TQMAX(70,min); edit_b->setMinimumWidth(min); diff --git a/kppp/newwidget.cpp b/kppp/newwidget.cpp index 49676ddd..28cc9fc6 100644 --- a/kppp/newwidget.cpp +++ b/kppp/newwidget.cpp @@ -9,7 +9,7 @@ TQLineEdit *newLineEdit(int visiblewidth, TQWidget *parent) { TQLineEdit *l = new TQLineEdit(parent); if(visiblewidth == 0) - l->setMinimumWidth(l->tqsizeHint().width()); + l->setMinimumWidth(l->sizeHint().width()); else l->setFixedWidth(l->fontMetrics().width('H') * visiblewidth); diff --git a/kppp/opener.cpp b/kppp/opener.cpp index 0d46edd9..5d90cc0e 100644 --- a/kppp/opener.cpp +++ b/kppp/opener.cpp @@ -128,7 +128,7 @@ extern "C" { static void sighandler_child(int); static pid_t pppdPid = -1; -static int pppdExittqStatus = -1; +static int pppdExitStatus = -1; static int checkForInterface(); // processing will stop at first file that could be opened successfully @@ -316,10 +316,10 @@ void Opener::mainLoop() { sendResponse(&response); break; - case PPPDExittqStatus: + case PPPDExitStatus: Debug("Opener: received PPPDExitStatus"); MY_ASSERT(len == sizeof(struct PPPDExitStatusRequest)); - response.status = pppdExittqStatus; + response.status = pppdExitStatus; sendResponse(&response); break; @@ -519,7 +519,7 @@ bool Opener::execpppd(const char *arguments) { if(ttyfd<0) return false; - pppdExittqStatus = -1; + pppdExitStatus = -1; switch(pppdPid = fork()) { @@ -711,10 +711,10 @@ void sighandler_child(int) { Debug("It was pppd that died"); pppdPid = -1; if((WIFEXITED(status))) { - pppdExittqStatus = (WEXITSTATUS(status)); - Debug2("pppd exited with return value %d\n", pppdExittqStatus); + pppdExitStatus = (WEXITSTATUS(status)); + Debug2("pppd exited with return value %d\n", pppdExitStatus); } else { - pppdExittqStatus = 99; + pppdExitStatus = 99; Debug("pppd exited abnormally."); } Debug2("Sending %i a SIGUSR1\n", getppid()); diff --git a/kppp/opener.h b/kppp/opener.h index 99568f5d..812ec9ba 100644 --- a/kppp/opener.h +++ b/kppp/opener.h @@ -34,7 +34,7 @@ public: SetSecret, RemoveSecret, SetHostname, ExecPPPDaemon, KillPPPDaemon, - PPPDExittqStatus, + PPPDExitStatus, Stop }; enum Auth { PAP = 1, CHAP }; enum { MaxPathLen = 30, MaxStrLen = 40, MaxArgs = 100 }; diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp index 3b4abc3a..5a5472d9 100644 --- a/kppp/pppdargs.cpp +++ b/kppp/pppdargs.cpp @@ -98,7 +98,7 @@ PPPdArguments::PPPdArguments(TQWidget *parent, const char *name) bbox->tqlayout(); l->addWidget(bbox); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); //load info from gpppdata init(); diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp index a5075b3e..0c62b152 100644 --- a/kppp/ppplog.cpp +++ b/kppp/ppplog.cpp @@ -202,8 +202,8 @@ void PPPL_ShowLog() { bool foundConnect = false; bool foundLCP = gpppdata.getPPPDebug(); - TQString lcp = TQString::tqfromLatin1("[LCP"); - TQString conn = TQString::tqfromLatin1("Connect:"); + TQString lcp = TQString::fromLatin1("[LCP"); + TQString conn = TQString::fromLatin1("Connect:"); TQStringList::ConstIterator it = sl.begin(); for( ; it != sl.end(); it++) { if((*it).find(lcp) >= 0) { @@ -258,7 +258,7 @@ void PPPL_ShowLog() { tl->addWidget(label); tl->addWidget(diagnosis, 1); tl->addWidget(bbox); - dlg->setFixedSize(dlg->tqsizeHint()); + dlg->setFixedSize(dlg->sizeHint()); for(uint i = 0; i < sl.count(); i++) edit->append(*sl.at(i)); diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp index 39c1490d..818c2c38 100644 --- a/kppp/pppstatdlg.cpp +++ b/kppp/pppstatdlg.cpp @@ -80,7 +80,7 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *, pixmap_l = new TQLabel(this); pixmap_l->setMinimumSize(big_modem_both_pixmap.size()); l111->addWidget(pixmap_l, 1); - pixmap_l->tqsetAlignment(AlignVCenter|AlignLeft); + pixmap_l->setAlignment(AlignVCenter|AlignLeft); TQGridLayout *l1112 = new TQGridLayout(3, 2); l111->addLayout(l1112); @@ -137,10 +137,10 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *, for(i = 0; i < 5; i++) { labela2[i]->setText("888888888"); // TODO: resize automatically labelb2[i]->setText("888888888"); - labela2[i]->tqsetAlignment(TQt::AlignRight); - labelb2[i]->tqsetAlignment(TQt::AlignRight); - labela2[i]->setFixedSize(labela2[i]->tqsizeHint()); - labelb2[i]->setFixedSize(labelb2[i]->tqsizeHint()); + labela2[i]->setAlignment(TQt::AlignRight); + labelb2[i]->setAlignment(TQt::AlignRight); + labela2[i]->setFixedSize(labela2[i]->sizeHint()); + labelb2[i]->setFixedSize(labelb2[i]->sizeHint()); labela2[i]->setText(""); labelb2[i]->setText(""); @@ -175,8 +175,8 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *, cancelbutton = new KPushButton(KStdGuiItem::close(),this, "cancelbutton"); cancelbutton->setFocus(); connect(cancelbutton, TQT_SIGNAL(clicked()), this,TQT_SLOT(cancel())); - cancelbutton->setFixedHeight(cancelbutton->tqsizeHint().height()); - cancelbutton->setMinimumWidth(TQMAX(cancelbutton->tqsizeHint().width(), 70)); + cancelbutton->setFixedHeight(cancelbutton->sizeHint().height()); + cancelbutton->setMinimumWidth(TQMAX(cancelbutton->sizeHint().width(), 70)); l12->addWidget(cancelbutton); if(gpppdata.graphingEnabled()) { @@ -184,7 +184,7 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *, connect(graphTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateGraph())); } - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); connect(stats, TQT_SIGNAL(statsChanged(int)), TQT_SLOT(paintIcon(int))); diff --git a/kppp/pppstats.cpp b/kppp/pppstats.cpp index fb4d6428..29a87e77 100644 --- a/kppp/pppstats.cpp +++ b/kppp/pppstats.cpp @@ -127,25 +127,25 @@ void PPPStats::clear() compressed = 0; packetsunc = 0; packetsoutunc = 0; - iotqStatus = BytesNone; + ioStatus = BytesNone; } void PPPStats::timerClick() { - enum IOtqStatus newtqStatus; + enum IOStatus newStatus; doStats(); if((ibytes != ibytes_last) && (obytes != obytes_last)) - newtqStatus = BytesBoth; + newStatus = BytesBoth; else if(ibytes != ibytes_last) - newtqStatus = BytesIn; + newStatus = BytesIn; else if(obytes != obytes_last) - newtqStatus = BytesOut; + newStatus = BytesOut; else - newtqStatus = BytesNone; + newStatus = BytesNone; - if(newtqStatus != iotqStatus) - emit statsChanged(iotqStatus = newtqStatus); + if(newStatus != ioStatus) + emit statsChanged(ioStatus = newStatus); ibytes_last = ibytes; obytes_last = obytes; diff --git a/kppp/pppstats.h b/kppp/pppstats.h index 91e4e9e0..4fdf17bd 100644 --- a/kppp/pppstats.h +++ b/kppp/pppstats.h @@ -65,7 +65,7 @@ public: TQString local_ip_address; TQString remote_ip_address; - enum IOtqStatus { BytesNone = 0, BytesIn, BytesOut, BytesBoth }; + enum IOStatus { BytesNone = 0, BytesIn, BytesOut, BytesBoth }; private: bool get_ppp_stats(struct ppp_stats *curp); @@ -78,7 +78,7 @@ private: #endif int unit; char unitName[5]; - enum IOtqStatus iotqStatus; + enum IOStatus ioStatus; TQTimer *timer; }; diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp index 97d13612..870db69b 100644 --- a/kppp/providerdb.cpp +++ b/kppp/providerdb.cpp @@ -88,7 +88,7 @@ ProviderDB::ProviderDB(TQWidget *parent) : connect((const TQObject *)backButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(pageSelected())); - // resize(tqminimumSize()); + // resize(minimumSize()); adjustSize(); } diff --git a/kppp/requester.cpp b/kppp/requester.cpp index dcb28fcb..b5450929 100644 --- a/kppp/requester.cpp +++ b/kppp/requester.cpp @@ -70,7 +70,7 @@ Requester *Requester::rq = 0L; Requester::Requester(int s) : socket(s) { assert(rq==0L); rq = this; - lasttqStatus = -1; + lastStatus = -1; } Requester::~Requester() { @@ -167,7 +167,7 @@ bool Requester::recvResponse() { kdDebug(5002) << "response.status: " << response.status << endl; } - lasttqStatus = response.status; + lastStatus = response.status; return (response.status == 0); } @@ -306,10 +306,10 @@ bool Requester::killPPPDaemon() { return recvResponse(); } -int Requester::pppdExittqStatus() +int Requester::pppdExitStatus() { struct PPPDExitStatusRequest req; - req.header.type = Opener::PPPDExittqStatus; + req.header.type = Opener::PPPDExitStatus; sendRequest((struct RequestHeader *) &req, sizeof(req)); return recvResponse(); } diff --git a/kppp/requester.h b/kppp/requester.h index 46626df5..ea415df0 100644 --- a/kppp/requester.h +++ b/kppp/requester.h @@ -17,12 +17,12 @@ public: bool setHostname(const TQString & name); bool execPPPDaemon(const TQString & arguments); bool killPPPDaemon(); - int pppdExittqStatus(); + int pppdExitStatus(); bool stop(); public: static Requester *rq; - int lasttqStatus; + int lastStatus; private: bool sendRequest(struct RequestHeader *request, int len); diff --git a/kppp/ruleset.cpp b/kppp/ruleset.cpp index ef9d9517..723d5f2b 100644 --- a/kppp/ruleset.cpp +++ b/kppp/ruleset.cpp @@ -362,7 +362,7 @@ bool RuleSet::parseLine(const TQString &s) { // parse the days token = s.mid(s.find("on(") + 3, s.find(")betw")-s.find("on(") - 3); - if(!parseEntries(token, TQDate::tqcurrentDate().year(), + if(!parseEntries(token, TQDate::currentDate().year(), t1, t2, costs, len, after)) return FALSE; diff --git a/krdc/events.h b/krdc/events.h index d9856449..5100a23c 100644 --- a/krdc/events.h +++ b/krdc/events.h @@ -33,10 +33,10 @@ * REMOTE_VIEW_DISCONNECTING * @li You can move from REMOTE_VIEW_DISCONNECTED to REMOTE_VIEW_CONNECTING * - * @ref KRemoteView::settqStatus() will follow this rules for you. + * @ref KRemoteView::setStatus() will follow this rules for you. * (If you add/remove a state here, you must adapt it) */ -enum RemoteViewtqStatus { +enum RemoteViewStatus { REMOTE_VIEW_CONNECTING = 0, REMOTE_VIEW_AUTHENTICATING = 1, REMOTE_VIEW_PREPARING = 2, @@ -78,13 +78,13 @@ const int StatusChangeEventType = 41002; class StatusChangeEvent : public TQCustomEvent { private: - RemoteViewtqStatus m_status; + RemoteViewStatus m_status; public: - StatusChangeEvent(RemoteViewtqStatus s) : + StatusChangeEvent(RemoteViewStatus s) : TQCustomEvent(StatusChangeEventType), m_status(s) {}; - RemoteViewtqStatus status() const { return m_status; }; + RemoteViewStatus status() const { return m_status; }; }; const int PasswordRequiredEventType = 41003; diff --git a/krdc/hostprofiles.ui b/krdc/hostprofiles.ui index 34d7d939..b312d4e7 100644 --- a/krdc/hostprofiles.ui +++ b/krdc/hostprofiles.ui @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>117</width> <height>21</height> diff --git a/krdc/keycapturewidget.ui b/krdc/keycapturewidget.ui index e90411b1..f08c9e7a 100644 --- a/krdc/keycapturewidget.ui +++ b/krdc/keycapturewidget.ui @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>112</width> <height>21</height> @@ -51,7 +51,7 @@ <property name="name"> <cstring>keyLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>21</height> diff --git a/krdc/kfullscreenpanel.cpp b/krdc/kfullscreenpanel.cpp index 81cd49e7..0c85cfdd 100644 --- a/krdc/kfullscreenpanel.cpp +++ b/krdc/kfullscreenpanel.cpp @@ -88,7 +88,7 @@ void KFullscreenPanel::setChild(TQWidget *child) { } void KFullscreenPanel::doLayout() { - TQSize s = tqsizeHint(); + TQSize s = sizeHint(); setFixedSize(s); setGeometry((m_fsResolution.width() - s.width())/2, 0, s.width(), s.height()); diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index e77079db..1670b581 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -165,7 +165,7 @@ bool KRDC::start() m_scrollView = new TQScrollView2(this, "remote scrollview"); m_scrollView->setFrameStyle(TQFrame::NoFrame); - m_scrollView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + m_scrollView->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); switch(m_protocol) @@ -198,8 +198,8 @@ bool KRDC::start() // note that the disconnectedError() will be disconnected when kremoteview // is completely initialized connect(m_view, TQT_SIGNAL(disconnectedError()), TQT_SIGNAL(disconnectedError())); - connect(m_view, TQT_SIGNAL(statusChanged(RemoteViewtqStatus)), - TQT_SLOT(changeProgress(RemoteViewtqStatus))); + connect(m_view, TQT_SIGNAL(statusChanged(RemoteViewStatus)), + TQT_SLOT(changeProgress(RemoteViewStatus))); connect(m_view, TQT_SIGNAL(showingPasswordDialog(bool)), TQT_SLOT(showingPasswordDialog(bool))); connect(m_keyCaptureDialog, TQT_SIGNAL(keyPressed(XEvent*)), @@ -210,7 +210,7 @@ bool KRDC::start() return ret_status; } -void KRDC::changeProgress(RemoteViewtqStatus s) { +void KRDC::changeProgress(RemoteViewStatus s) { if (!m_progressDialog) { m_progressDialog = new KProgressDialog(0, 0, TQString(), "1234567890", false); @@ -373,10 +373,10 @@ void KRDC::enableFullscreen(bool on) m_view->switchFullscreen(on); } -TQSize KRDC::tqsizeHint() +TQSize KRDC::sizeHint() { if ((m_isFullscreen != WINDOW_MODE_FULLSCREEN) && m_toolbar) { - int dockHint = m_dockArea->tqsizeHint().height(); + int dockHint = m_dockArea->sizeHint().height(); dockHint = dockHint < 1 ? 1 : dockHint; // fix wrong size hint return TQSize(m_view->framebufferSize().width(), dockHint + m_view->framebufferSize().height()); @@ -495,7 +495,7 @@ void KRDC::switchToFullscreen(bool scaling) TQLabel *hostLabel = new TQLabel(t); hostLabel->setName("kde toolbar widget"); - hostLabel->tqsetAlignment(TQt::AlignCenter); + hostLabel->setAlignment(TQt::AlignCenter); hostLabel->setText(" "+m_host+" "); t->insertWidget(FS_HOSTLABEL_ID, 150, hostLabel); t->setItemAutoSized(FS_HOSTLABEL_ID, true); @@ -575,7 +575,7 @@ void KRDC::switchToNormal(bool scaling) if (!m_toolbar) { m_dockArea = new TQDockArea(Qt::Horizontal, TQDockArea::Normal, this); - m_dockArea->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + m_dockArea->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); KToolBar *t = new KToolBar(m_dockArea); m_toolbar = t; @@ -633,7 +633,7 @@ void KRDC::switchToNormal(bool scaling) m_view->resize(m_view->framebufferSize()); } - setMaximumSize(tqsizeHint()); + setMaximumSize(sizeHint()); repositionView(false); @@ -644,7 +644,7 @@ void KRDC::switchToNormal(bool scaling) m_initialWindowSize = TQSize(); } else if (!scalingChanged) - resize(tqsizeHint()); + resize(sizeHint()); show(); if (scalingChanged) m_view->update(); @@ -681,14 +681,14 @@ void KRDC::iconify() } void KRDC::toolbarChanged() { - setMaximumSize(tqsizeHint()); + setMaximumSize(sizeHint()); // resize window when toolbar is docked and it was maximized TQSize fs = m_view->framebufferSize(); TQSize cs = size(); TQSize cs1(cs.width(), cs.height()-1); // adjusted for TQDockArea.height()==1 if ((fs == cs) || (fs == cs1)) - resize(tqsizeHint()); + resize(sizeHint()); } diff --git a/krdc/krdc.h b/krdc/krdc.h index d78dc959..a264e11e 100644 --- a/krdc/krdc.h +++ b/krdc/krdc.h @@ -127,7 +127,7 @@ protected: virtual void mouseMoveEvent(TQMouseEvent *e); virtual bool event(TQEvent *e); virtual bool eventFilter(TQObject *watched, TQEvent *e); - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); public: KRDC(WindowMode wm = WINDOW_MODE_AUTO, @@ -145,7 +145,7 @@ public: static void setLastHost(const TQString &host); private slots: - void changeProgress(RemoteViewtqStatus s); + void changeProgress(RemoteViewStatus s); void showingPasswordDialog(bool b); void showProgressTimeout(); diff --git a/krdc/kremoteview.cpp b/krdc/kremoteview.cpp index a3dbce40..76ae6267 100644 --- a/krdc/kremoteview.cpp +++ b/krdc/kremoteview.cpp @@ -24,11 +24,11 @@ KRemoteView::KRemoteView(TQWidget *parent, m_status(REMOTE_VIEW_DISCONNECTED) { } -enum RemoteViewtqStatus KRemoteView::status() { +enum RemoteViewStatus KRemoteView::status() { return m_status; } -void KRemoteView::settqStatus(RemoteViewtqStatus s) { +void KRemoteView::setStatus(RemoteViewStatus s) { if (m_status == s) return; @@ -49,8 +49,8 @@ void KRemoteView::settqStatus(RemoteViewtqStatus s) { // smooth state transition int origState = (int)m_status; for (int i = origState; i < (int)s; i++) { - m_status = (RemoteViewtqStatus) i; - emit statusChanged((RemoteViewtqStatus) i); + m_status = (RemoteViewStatus) i; + emit statusChanged((RemoteViewStatus) i); } } } diff --git a/krdc/kremoteview.h b/krdc/kremoteview.h index 0b0ae11c..af4fb0ef 100644 --- a/krdc/kremoteview.h +++ b/krdc/kremoteview.h @@ -152,7 +152,7 @@ public: * Checks whether the view is currently quitting. * @return true if it is quitting * @see startQuitting() - * @see settqStatus() + * @see setStatus() */ virtual bool isQuitting() = 0; @@ -173,7 +173,7 @@ public: * dialogs to the user) and start connecting. Should not block * without running the event loop (so displaying a dialog is ok). * When the view starts connecting the application must call - * @ref settqStatus() with the status REMOTE_VIEW_CONNECTING. + * @ref setStatus() with the status REMOTE_VIEW_CONNECTING. * @return true if successful (so far), false * otherwise * @see connected() @@ -186,9 +186,9 @@ public: /** * Returns the current status of the connection. * @return the status of the connection - * @see settqStatus() + * @see setStatus() */ - enum RemoteViewtqStatus status(); + enum RemoteViewStatus status(); public slots: /** @@ -253,7 +253,7 @@ signals: * Emitted when the status of the view changed. * @param s the new status */ - void statusChanged(RemoteViewtqStatus s); + void statusChanged(RemoteViewStatus s); /** * Emitted when the password dialog is shown or hidden. @@ -275,21 +275,21 @@ protected: /** * The status of the remote view. */ - enum RemoteViewtqStatus m_status; + enum RemoteViewStatus m_status; /** * Set the status of the connection. * Emits a statusChanged() signal. * Note that the states need to be set in a certain order, - * see @ref RemoteViewtqStatus. settqStatus() will try to do this + * see @ref RemoteViewStatus. setStatus() will try to do this * transition automatically, so if you are in REMOTE_VIEW_CONNECTING - * and call settqStatus(REMOTE_VIEW_PREPARING), settqStatus() will + * and call setStatus(REMOTE_VIEW_PREPARING), setStatus() will * emit a REMOTE_VIEW_AUTHENTICATING and then REMOTE_VIEW_PREPARING. * If you transition backwards, it will emit a * REMOTE_VIEW_DISCONNECTED before doing the transition. * @param s the new status */ - virtual void settqStatus(RemoteViewtqStatus s); + virtual void setStatus(RemoteViewStatus s); }; #endif diff --git a/krdc/maindialogbase.ui b/krdc/maindialogbase.ui index 083e0c37..dec931a4 100644 --- a/krdc/maindialogbase.ui +++ b/krdc/maindialogbase.ui @@ -48,7 +48,7 @@ <property name="name"> <cstring>m_serverInput</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> @@ -149,7 +149,7 @@ Remote Desktop Connection only supports systems that use VNC.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>34</width> <height>16</height> @@ -188,7 +188,7 @@ Remote Desktop Connection only supports systems that use VNC.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>34</width> <height>16</height> @@ -226,7 +226,7 @@ Remote Desktop Connection only supports systems that use VNC.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp index eed72b99..df4d687b 100644 --- a/krdc/maindialogwidget.cpp +++ b/krdc/maindialogwidget.cpp @@ -175,8 +175,8 @@ void MainDialogWidget::enableBrowsingArea( bool enable ) m_browsingPanel->setMaximumSize(0, 0); m_browsingPanel->setEnabled(false); m_browseButton->setText(m_browseButton->text().replace("<<", ">>")); - int h = tqminimumSize().height()-hOffset; - setMinimumSize(tqminimumSize().width(), (h > 0) ? h : 0); + int h = minimumSize().height()-hOffset; + setMinimumSize(minimumSize().width(), (h > 0) ? h : 0); resize(width(), height()-hOffset); TQTimer::singleShot( 0, parentWidget(), TQT_SLOT( adjustSize() ) ); diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp index 4e5bc632..672b7b00 100644 --- a/krdc/rdp/krdpview.cpp +++ b/krdc/rdp/krdpview.cpp @@ -120,13 +120,13 @@ KRdpView::~KRdpView() // returns the size of the framebuffer TQSize KRdpView::framebufferSize() { - return m_container->tqsizeHint(); + return m_container->sizeHint(); } // returns the suggested size -TQSize KRdpView::tqsizeHint() +TQSize KRdpView::sizeHint() { - return tqmaximumSize(); + return maximumSize(); } // start closing the connection @@ -303,7 +303,7 @@ bool KRdpView::start() return false; } - settqStatus(REMOTE_VIEW_CONNECTING); + setStatus(REMOTE_VIEW_CONNECTING); return true; } @@ -340,9 +340,9 @@ void KRdpView::setViewOnly(bool s) void KRdpView::connectionOpened(WId /*window*/) { - TQSize size = m_container->tqsizeHint(); + TQSize size = m_container->sizeHint(); - settqStatus(REMOTE_VIEW_CONNECTED); + setStatus(REMOTE_VIEW_CONNECTED); setFixedSize(size); m_container->setFixedSize(size); emit changeSize(size.width(), size.height()); @@ -353,7 +353,7 @@ void KRdpView::connectionOpened(WId /*window*/) void KRdpView::connectionClosed() { emit disconnected(); - settqStatus(REMOTE_VIEW_DISCONNECTED); + setStatus(REMOTE_VIEW_DISCONNECTED); m_quitFlag = true; } @@ -361,7 +361,7 @@ void KRdpView::processDied(KProcess */*proc*/) { if(m_status == REMOTE_VIEW_CONNECTING) { - settqStatus(REMOTE_VIEW_DISCONNECTED); + setStatus(REMOTE_VIEW_DISCONNECTED); if(m_clientVersion.isEmpty()) { KMessageBox::error(0, i18n("Connection attempt to host failed."), diff --git a/krdc/rdp/krdpview.h b/krdc/rdp/krdpview.h index c34d3c27..7f6180b5 100644 --- a/krdc/rdp/krdpview.h +++ b/krdc/rdp/krdpview.h @@ -69,7 +69,7 @@ class KRdpView : public KRemoteView // functions regarding the window virtual TQSize framebufferSize(); // returns the size of the remote view - TQSize tqsizeHint(); // returns the suggested size + TQSize sizeHint(); // returns the suggested size virtual bool viewOnly(); virtual bool startFullscreen(); diff --git a/krdc/rdp/rdpprefs.ui b/krdc/rdp/rdpprefs.ui index 0d37422a..46f791a0 100644 --- a/krdc/rdp/rdpprefs.ui +++ b/krdc/rdp/rdpprefs.ui @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>21</height> @@ -84,7 +84,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>280</width> <height>0</height> @@ -325,7 +325,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>280</width> <height>0</height> diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index 02cd3a78..eabadc7d 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -219,7 +219,7 @@ bool KVncView::checkLocalKRfb() { if (m_port != portNum) return true; - settqStatus(REMOTE_VIEW_DISCONNECTED); + setStatus(REMOTE_VIEW_DISCONNECTED); KMessageBox::error(0, i18n("It is not possible to connect to a local desktop sharing service."), i18n("Connection Failure")); @@ -295,7 +295,7 @@ bool KVncView::start() { useKWallet = hp->useKWallet(); } - settqStatus(REMOTE_VIEW_CONNECTING); + setStatus(REMOTE_VIEW_CONNECTING); m_cthread.start(); setBackgroundMode(TQt::NoBackground); @@ -390,7 +390,7 @@ void KVncView::customEvent(TQCustomEvent *e) } else if (e->type() == StatusChangeEventType) { StatusChangeEvent *sce = (StatusChangeEvent*) e; - settqStatus(sce->status()); + setStatus(sce->status()); if (m_status == REMOTE_VIEW_CONNECTED) { emit connected(); setFocus(); @@ -458,7 +458,7 @@ void KVncView::customEvent(TQCustomEvent *e) } else if (e->type() == FatalErrorEventType) { FatalErrorEvent *fee = (FatalErrorEvent*) e; - settqStatus(REMOTE_VIEW_DISCONNECTED); + setStatus(REMOTE_VIEW_DISCONNECTED); switch (fee->errorCode()) { case ERROR_CONNECTION: KMessageBox::error(0, @@ -683,8 +683,8 @@ void KVncView::focusOutEvent(TQFocusEvent *) { unpressModifiers(); } -TQSize KVncView::tqsizeHint() { - return tqmaximumSize(); +TQSize KVncView::sizeHint() { + return maximumSize(); } void KVncView::setRemoteMouseTracking(bool s) { diff --git a/krdc/vnc/kvncview.h b/krdc/vnc/kvncview.h index 7fdf402c..7a8c9a2c 100644 --- a/krdc/vnc/kvncview.h +++ b/krdc/vnc/kvncview.h @@ -84,7 +84,7 @@ public: DotCursorState dotCursorState = DOT_CURSOR_AUTO, const TQString &encodings = TQString()); ~KVncView(); - TQSize tqsizeHint(); + TQSize sizeHint(); void drawRegion(int x, int y, int w, int h); void lockFramebuffer(); void unlockFramebuffer(); diff --git a/krdc/vnc/rfbproto.c b/krdc/vnc/rfbproto.c index 13676bb6..22909533 100644 --- a/krdc/vnc/rfbproto.c +++ b/krdc/vnc/rfbproto.c @@ -159,7 +159,7 @@ ConnectToRFBServer(const char *hostname, int port) * InitialiseRFBConnection. */ -enum InittqStatus +enum InitStatus InitialiseRFBConnection() { rfbProtocolVersionMsg pv; @@ -734,12 +734,12 @@ static void *MakeSoftCursor(int bpp, int cursorWidth, int cursorHeight, /********************************************************************* - * HandletqCursorShape(). Support for XCursor and RichCursor tqshape + * HandleCursorShape(). Support for XCursor and RichCursor tqshape * updates. We emulate cursor operating on the frame buffer (that is * why we call it "software cursor"). ********************************************************************/ -static Bool HandletqCursorShape(int xhot, int yhot, int width, int height, CARD32 enc) +static Bool HandleCursorShape(int xhot, int yhot, int width, int height, CARD32 enc) { int bytesPerPixel; size_t bytesPerRow, bytesMaskData; @@ -956,7 +956,7 @@ HandleRFBServerMessage() if (rect.encoding == rfbEncodingXCursor || rect.encoding == rfbEncodingRichCursor) { - if (!HandletqCursorShape(rect.r.x, rect.r.y, rect.r.w, rect.r.h, + if (!HandleCursorShape(rect.r.x, rect.r.y, rect.r.w, rect.r.h, rect.encoding)) { return False; } diff --git a/krdc/vnc/threads.cpp b/krdc/vnc/threads.cpp index f4e0eefe..ebd02c8e 100644 --- a/krdc/vnc/threads.cpp +++ b/krdc/vnc/threads.cpp @@ -47,7 +47,7 @@ ControllerThread::ControllerThread(KVncView *v, WriterThread &wt, volatile bool { } -void ControllerThread::changetqStatus(RemoteViewtqStatus s) { +void ControllerThread::changeStatus(RemoteViewStatus s) { m_status = s; TQApplication::postEvent(m_view, new StatusChangeEvent(s)); } @@ -86,13 +86,13 @@ void ControllerThread::run() { return; } if (m_quitFlag) { - changetqStatus(REMOTE_VIEW_DISCONNECTED); + changeStatus(REMOTE_VIEW_DISCONNECTED); return; } - changetqStatus(REMOTE_VIEW_AUTHENTICATING); + changeStatus(REMOTE_VIEW_AUTHENTICATING); - enum InittqStatus s = InitialiseRFBConnection(); + enum InitStatus s = InitialiseRFBConnection(); if (s != INIT_OK) { if (s == INIT_CONNECTION_FAILED) sendFatalError(ERROR_IO); @@ -103,7 +103,7 @@ void ControllerThread::run() { else if (s == INIT_AUTHENTICATION_FAILED) sendFatalError(ERROR_AUTHENTICATION); else if (s == INIT_ABORTED) - changetqStatus(REMOTE_VIEW_DISCONNECTED); + changeStatus(REMOTE_VIEW_DISCONNECTED); else sendFatalError(ERROR_INTERNAL); return; @@ -120,18 +120,18 @@ void ControllerThread::run() { m_waiter.wait(1000); if (m_quitFlag) { - changetqStatus(REMOTE_VIEW_DISCONNECTED); + changeStatus(REMOTE_VIEW_DISCONNECTED); return; } - changetqStatus(REMOTE_VIEW_PREPARING); + changeStatus(REMOTE_VIEW_PREPARING); if (!SetFormatAndEncodings()) { sendFatalError(ERROR_INTERNAL); return; } - changetqStatus(REMOTE_VIEW_CONNECTED); + changeStatus(REMOTE_VIEW_CONNECTED); m_wthread.start(); @@ -143,11 +143,11 @@ void ControllerThread::run() { } m_quitFlag = true; - changetqStatus(REMOTE_VIEW_DISCONNECTED); + changeStatus(REMOTE_VIEW_DISCONNECTED); m_wthread.kick(); } -enum RemoteViewtqStatus ControllerThread::status() { +enum RemoteViewStatus ControllerThread::status() { return m_status; } diff --git a/krdc/vnc/threads.h b/krdc/vnc/threads.h index 4bb77ef3..08ca4c20 100644 --- a/krdc/vnc/threads.h +++ b/krdc/vnc/threads.h @@ -102,18 +102,18 @@ protected: class ControllerThread : public TQThread { private: KVncView *m_view; - enum RemoteViewtqStatus m_status; + enum RemoteViewStatus m_status; WriterThread &m_wthread; volatile bool &m_quitFlag; volatile bool m_desktopInitialized; TQWaitCondition m_waiter; - void changetqStatus(RemoteViewtqStatus s); + void changeStatus(RemoteViewStatus s); void sendFatalError(ErrorCode s); public: ControllerThread(KVncView *v, WriterThread &wt, volatile bool &quitFlag); - enum RemoteViewtqStatus status(); + enum RemoteViewStatus status(); void desktopInit(); void kick(); diff --git a/krdc/vnc/vncprefs.ui b/krdc/vnc/vncprefs.ui index f569bb3f..ad38431c 100644 --- a/krdc/vnc/vncprefs.ui +++ b/krdc/vnc/vncprefs.ui @@ -104,7 +104,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>280</width> <height>0</height> @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>84</width> <height>16</height> diff --git a/krdc/vnc/vnctypes.h b/krdc/vnc/vnctypes.h index 4dba9a5c..fae12549 100644 --- a/krdc/vnc/vnctypes.h +++ b/krdc/vnc/vnctypes.h @@ -54,7 +54,7 @@ typedef struct { } AppData; -enum InittqStatus { +enum InitStatus { INIT_OK = 0, INIT_NAME_RESOLUTION_FAILURE = 1, INIT_PROTOCOL_FAILURE = 2, diff --git a/krdc/vnc/vncviewer.h b/krdc/vnc/vncviewer.h index 4b1f6cb9..285357b9 100644 --- a/krdc/vnc/vncviewer.h +++ b/krdc/vnc/vncviewer.h @@ -155,7 +155,7 @@ typedef struct { extern PointerImage pointerImages[]; extern int ConnectToRFBServer(const char *hostname, int port); -extern enum InittqStatus InitialiseRFBConnection(void); +extern enum InitStatus InitialiseRFBConnection(void); extern Bool SetFormatAndEncodings(void); extern Bool SendIncrementalFramebufferUpdateRequest(void); extern Bool SendFramebufferUpdateRequest(int x, int y, int w, int h, diff --git a/krfb/kcm_krfb/configurationwidget.ui b/krfb/kcm_krfb/configurationwidget.ui index 7eaf2d96..f4e79d39 100644 --- a/krfb/kcm_krfb/configurationwidget.ui +++ b/krfb/kcm_krfb/configurationwidget.ui @@ -247,7 +247,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>50</height> @@ -316,7 +316,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -442,7 +442,7 @@ Most VNC clients use a display number instead of the actual port. This display n <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp index f20076de..e0d37f61 100644 --- a/krfb/kinetd/kinetd.cpp +++ b/krfb/kinetd/kinetd.cpp @@ -181,7 +181,7 @@ void PortListener::loadConfig(KService::Ptr s) { m_dnssdRegister = false; - m_slpLifetimeEnd = TQDateTime::tqcurrentDateTime().addSecs(m_serviceLifetime); + m_slpLifetimeEnd = TQDateTime::currentDateTime().addSecs(m_serviceLifetime); m_defaultPortBase = m_portBase; m_defaultAutoPortRange = m_autoPortRange; @@ -195,7 +195,7 @@ void PortListener::loadConfig(KService::Ptr s) { TQDateTime nullTime; m_expirationTime = m_config->readDateTimeEntry("enabled_expiration_"+m_serviceName, &nullTime); - if ((!m_expirationTime.isNull()) && (m_expirationTime < TQDateTime::tqcurrentDateTime())) + if ((!m_expirationTime.isNull()) && (m_expirationTime < TQDateTime::currentDateTime())) m_enabled = false; m_registerService = m_config->readBoolEntry("enabled_srvreg_"+m_serviceName, m_registerService); @@ -356,7 +356,7 @@ void PortListener::setServiceRegistrationEnabledInternal(bool e) { } m_serviceRegistered = true; // make lifetime 30s shorter, because the timeout is not precise - m_slpLifetimeEnd = TQDateTime::tqcurrentDateTime().addSecs(m_serviceLifetime-30); + m_slpLifetimeEnd = TQDateTime::currentDateTime().addSecs(m_serviceLifetime-30); } else { TQStringList::Iterator it = m_registeredServiceURLs.begin(); while (it != m_registeredServiceURLs.end()) @@ -383,7 +383,7 @@ void PortListener::dnssdRegister(bool e) { } void PortListener::refreshRegistration() { - if (m_serviceRegistered && (m_slpLifetimeEnd.addSecs(-90) < TQDateTime::tqcurrentDateTime())) { + if (m_serviceRegistered && (m_slpLifetimeEnd.addSecs(-90) < TQDateTime::currentDateTime())) { setServiceRegistrationEnabledInternal(false); setServiceRegistrationEnabledInternal(true); } @@ -458,7 +458,7 @@ void KInetD::expirationTimer() { void KInetD::setExpirationTimer() { TQDateTime nextEx = getNextExpirationTime(); // disables expired portlistener! if (!nextEx.isNull()) - m_expirationTimer.start(TQDateTime::tqcurrentDateTime().secsTo(nextEx)*1000 + 30000, + m_expirationTimer.start(TQDateTime::currentDateTime().secsTo(nextEx)*1000 + 30000, false); else m_expirationTimer.stop(); @@ -475,7 +475,7 @@ void KInetD::setReregistrationTimer() { while (pl) { TQDateTime d2 = pl->serviceLifetimeEnd(); if (!d2.isNull()) { - if (d2 < TQDateTime::tqcurrentDateTime()) { + if (d2 < TQDateTime::currentDateTime()) { m_reregistrationTimer.start(0, true); return; } @@ -486,7 +486,7 @@ void KInetD::setReregistrationTimer() { } if (!d.isNull()) { - int s = TQDateTime::tqcurrentDateTime().secsTo(d); + int s = TQDateTime::currentDateTime().secsTo(d); if (s < 30) s = 30; // max frequency 30s m_reregistrationTimer.start(s*1000, true); @@ -544,7 +544,7 @@ TQDateTime KInetD::getNextExpirationTime() while (pl) { TQDateTime d2 = pl->expiration(); if (!d2.isNull()) { - if (d2 < TQDateTime::tqcurrentDateTime()) + if (d2 < TQDateTime::currentDateTime()) pl->setEnabled(false); else if (d.isNull() || (d2 < d)) d = d2; diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc index 2076c4ed..efab5974 100644 --- a/krfb/krfb/configuration.cc +++ b/krfb/krfb/configuration.cc @@ -148,7 +148,7 @@ void Configuration::doKinetdConf() { lastExpiration = t; it++; } - if (lastExpiration.isNull() || (lastExpiration < TQDateTime::tqcurrentDateTime())) { + if (lastExpiration.isNull() || (lastExpiration < TQDateTime::currentDateTime())) { setKInetdEnabled(false); portNum = -1; } diff --git a/krfb/krfb/connectionwidget.ui b/krfb/krfb/connectionwidget.ui index a4a27b02..e5378cbe 100644 --- a/krfb/krfb/connectionwidget.ui +++ b/krfb/krfb/connectionwidget.ui @@ -92,13 +92,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>108</width> <height>318</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>108</width> <height>318</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>84</height> @@ -195,7 +195,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cc index d06feefe..ce7e19d8 100644 --- a/krfb/krfb/invitation.cc +++ b/krfb/krfb/invitation.cc @@ -59,8 +59,8 @@ static TQString readableRandomString(int length) { Invitation::Invitation() : m_viewItem(0) { m_password = readableRandomString(4)+"-"+readableRandomString(3); - m_creationTime = TQDateTime::tqcurrentDateTime(); - m_expirationTime = TQDateTime::tqcurrentDateTime().addSecs(INVITATION_DURATION); + m_creationTime = TQDateTime::currentDateTime(); + m_expirationTime = TQDateTime::currentDateTime().addSecs(INVITATION_DURATION); } Invitation::Invitation(const Invitation &x) : @@ -111,7 +111,7 @@ TQDateTime Invitation::creationTime() const { } bool Invitation::isValid() const { - return m_expirationTime > TQDateTime::tqcurrentDateTime(); + return m_expirationTime > TQDateTime::currentDateTime(); } void Invitation::setViewItem(KListViewItem *i) { diff --git a/krfb/krfb/invitewidget.ui b/krfb/krfb/invitewidget.ui index 46f39fec..e60ee6c8 100644 --- a/krfb/krfb/invitewidget.ui +++ b/krfb/krfb/invitewidget.ui @@ -59,13 +59,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>108</width> <height>318</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>108</width> <height>318</height> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -125,7 +125,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>24</height> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>89</height> diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui index 807ce195..d6cfa41b 100644 --- a/krfb/krfb/manageinvitations.ui +++ b/krfb/krfb/manageinvitations.ui @@ -38,7 +38,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/krfb/krfb/personalinvitewidget.ui b/krfb/krfb/personalinvitewidget.ui index da8ce9d9..9a4e3cd9 100644 --- a/krfb/krfb/personalinvitewidget.ui +++ b/krfb/krfb/personalinvitewidget.ui @@ -55,7 +55,7 @@ Give the information below to the person that you want to invite (<a href="wh <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>34</height> @@ -74,13 +74,13 @@ Give the information below to the person that you want to invite (<a href="wh <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>108</width> <height>318</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>108</width> <height>318</height> @@ -106,7 +106,7 @@ Give the information below to the person that you want to invite (<a href="wh <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc index 93dc5539..81c00da7 100644 --- a/krfb/krfb/rfbcontroller.cc +++ b/krfb/krfb/rfbcontroller.cc @@ -761,7 +761,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl) dialog.setRemoteHost(remoteIp); dialog.setAllowRemoteControl( true ); - dialog.setFixedSize(dialog.tqsizeHint()); + dialog.setFixedSize(dialog.sizeHint()); dialog.show(); return RFB_CLIENT_ON_HOLD; } diff --git a/krfb/libvncserver/cursor.c b/krfb/libvncserver/cursor.c index f13eaaf9..ebbaedee 100644 --- a/krfb/libvncserver/cursor.c +++ b/krfb/libvncserver/cursor.c @@ -29,7 +29,7 @@ */ Bool -rfbSendtqCursorShape(cl) +rfbSendCursorShape(cl) rfbClientPtr cl; { rfbCursorPtr pCursor; diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h index 56dce45e..9e097f59 100644 --- a/krfb/libvncserver/rfb.h +++ b/krfb/libvncserver/rfb.h @@ -535,7 +535,7 @@ typedef struct _rfbClientRec { Bool enableLastRectEncoding; /* client supports LastRect encoding */ Bool enableSoftCursorUpdates; /* client supports softcursor updates */ Bool disableBackground; /* client wants to disable background */ - Bool enabletqCursorShapeUpdates; /* client supports cursor tqshape updates */ + Bool enableCursorShapeUpdates; /* client supports cursor tqshape updates */ Bool useRichCursorEncoding; /* rfbEncodingRichCursor is preferred */ Bool cursorWasChanged; /* cursor tqshape update should be sent */ Bool cursorWasMoved; /* cursor move tqshape update should be sent */ @@ -569,8 +569,8 @@ typedef struct _rfbClientRec { */ #define FB_UPDATE_PENDING(cl) \ - ((!(cl)->enabletqCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) || \ - ((cl)->enabletqCursorShapeUpdates && (cl)->cursorWasChanged) || \ + ((!(cl)->enableCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) || \ + ((cl)->enableCursorShapeUpdates && (cl)->cursorWasChanged) || \ !sraRgnEmpty((cl)->copyRegion) || !sraRgnEmpty((cl)->modifiedRegion)) /* @@ -733,7 +733,7 @@ typedef struct rfbCursor { unsigned char *richSource; /* source bytes for a rich cursor */ } rfbCursor, *rfbCursorPtr; -extern Bool rfbSendtqCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/); +extern Bool rfbSendCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/); extern Bool rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged); extern unsigned char rfbReverseByte[0x100]; extern void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap); diff --git a/krfb/libvncserver/rfbserver.c b/krfb/libvncserver/rfbserver.c index 22c9202d..493f22c9 100644 --- a/krfb/libvncserver/rfbserver.c +++ b/krfb/libvncserver/rfbserver.c @@ -270,7 +270,7 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP) for (i = 0; i < 4; i++) cl->zsActive[i] = FALSE; - cl->enabletqCursorShapeUpdates = FALSE; + cl->enableCursorShapeUpdates = FALSE; cl->useRichCursorEncoding = FALSE; cl->enableLastRectEncoding = FALSE; cl->disableBackground = FALSE; @@ -663,7 +663,7 @@ rfbProcessClientNormalMessage(cl) cl->preferredEncoding = -1; cl->useCopyRect = FALSE; - cl->enabletqCursorShapeUpdates = FALSE; + cl->enableCursorShapeUpdates = FALSE; cl->enableLastRectEncoding = FALSE; cl->disableBackground = FALSE; @@ -729,7 +729,7 @@ rfbProcessClientNormalMessage(cl) if(!cl->screen->dontConvertRichCursorToXCursor) { rfbLog("Enabling X-style cursor updates for client %s\n", cl->host); - cl->enabletqCursorShapeUpdates = TRUE; + cl->enableCursorShapeUpdates = TRUE; cl->cursorWasChanged = TRUE; } break; @@ -738,7 +738,7 @@ rfbProcessClientNormalMessage(cl) "%s\n", cl->host); if (cl->enableSoftCursorUpdates) break; - cl->enabletqCursorShapeUpdates = TRUE; + cl->enableCursorShapeUpdates = TRUE; cl->useRichCursorEncoding = TRUE; cl->cursorWasChanged = TRUE; break; @@ -748,7 +748,7 @@ rfbProcessClientNormalMessage(cl) cl->enableSoftCursorUpdates = TRUE; cl->cursorWasChanged = TRUE; cl->cursorWasMoved = TRUE; - cl->enabletqCursorShapeUpdates = FALSE; + cl->enableCursorShapeUpdates = FALSE; cl->useRichCursorEncoding = FALSE; break; case rfbEncodingLastRect: @@ -959,7 +959,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion) rfbFramebufferUpdateMsg *fu = (rfbFramebufferUpdateMsg *)cl->updateBuf; sraRegionPtr updateRegion,updateCopyRegion,tmpRegion; int dx, dy; - Bool sendtqCursorShape = FALSE; + Bool sendCursorShape = FALSE; int sendSoftCursorRects = 0; if(cl->screen->displayHook) @@ -970,13 +970,13 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion) * removed from the framebuffer. Otherwise, make sure it's put up. */ - if (cl->enabletqCursorShapeUpdates) { + if (cl->enableCursorShapeUpdates) { if (cl->screen->cursorIsDrawn) { rfbUndrawCursor(cl->screen); } if (!cl->screen->cursorIsDrawn && cl->cursorWasChanged && cl->readyForSetColourMapEntries) - sendtqCursorShape = TRUE; + sendCursorShape = TRUE; } else if (cl->enableSoftCursorUpdates) { if (cl->screen->cursorIsDrawn) { @@ -1012,7 +1012,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion) updateRegion = sraRgnCreateRgn(givenUpdateRegion); sraRgnOr(updateRegion,cl->copyRegion); if(!sraRgnAnd(updateRegion,cl->requestedRegion) && - !(sendtqCursorShape || sendSoftCursorRects)) { + !(sendCursorShape || sendSoftCursorRects)) { sraRgnDestroy(updateRegion); UNLOCK(cl->updateMutex); return TRUE; @@ -1113,15 +1113,15 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion) if (nUpdateRegionRects != 0xFFFF) { fu->nRects = Swap16IfLE((CARD16)(sraRgnCountRects(updateCopyRegion) + nUpdateRegionRects - + !!sendtqCursorShape + sendSoftCursorRects)); + + !!sendCursorShape + sendSoftCursorRects)); } else { fu->nRects = 0xFFFF; } cl->ublen = sz_rfbFramebufferUpdateMsg; - if (sendtqCursorShape) { + if (sendCursorShape) { cl->cursorWasChanged = FALSE; - if (!rfbSendtqCursorShape(cl)) { + if (!rfbSendCursorShape(cl)) { sraRgnDestroy(updateRegion); return FALSE; } diff --git a/ksirc/FilterRuleEditor.dlg b/ksirc/FilterRuleEditor.dlg index bbfa72e2..5461d839 100644 --- a/ksirc/FilterRuleEditor.dlg +++ b/ksirc/FilterRuleEditor.dlg @@ -24,7 +24,7 @@ Label { Margin {-1} Rect {140 10 80 30} Name {Label_1} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -36,7 +36,7 @@ LineEdit { Rect {220 10 280 30} Name {LineEdit_1} Variable {LineTitle} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -46,7 +46,7 @@ Label { Margin {-1} Rect {140 50 70 30} Name {Label_4} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -58,7 +58,7 @@ LineEdit { Rect {220 50 280 30} Name {LineEdit_2} Variable {LineSearch} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -68,7 +68,7 @@ Label { Margin {-1} Rect {140 90 80 30} Name {Label_7} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -78,7 +78,7 @@ Label { Margin {-1} Rect {140 130 70 30} Name {Label_9} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -90,7 +90,7 @@ LineEdit { Rect {220 90 280 30} Name {LineEdit_3} Variable {LineFrom} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -102,7 +102,7 @@ LineEdit { Rect {220 130 280 30} Name {LineEdit_4} Variable {LineTo} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {0 0} MaximumSize {32767 32767} } @@ -117,7 +117,7 @@ PushButton { Name {PushButton_1} Variable {ApplyButton} Signal {[Protected] clicked --> OkPressed ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -131,7 +131,7 @@ PushButton { Rect {390 210 110 30} Name {PushButton_2} Signal {[Protected] clicked --> closePressed ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -145,7 +145,7 @@ PushButton { Rect {270 170 110 30} Name {PushButton_7} Signal {[Protected] clicked --> newRule ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -160,7 +160,7 @@ PushButton { Name {PushButton_8} Variable {deleteButton} Signal {[Protected] clicked --> deleteRule ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -174,7 +174,7 @@ PushButton { Rect {10 210 55 30} Name {PushButton_9} Signal {[Protected] clicked --> raiseRule ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -188,7 +188,7 @@ PushButton { Rect {75 210 55 30} Name {PushButton_10} Signal {[Protected] clicked --> lowerRule ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -208,7 +208,7 @@ ListBox { Variable {RuleList} Signal {[Protected] highlighted --> newHighlight (int)} Signal {[Protected] selected --> newHighlight (int)} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp index 3b96df99..ca538bab 100644 --- a/ksirc/KSOpenkSirc/open_ksirc.cpp +++ b/ksirc/KSOpenkSirc/open_ksirc.cpp @@ -233,7 +233,7 @@ TQString open_ksirc::encryptPassword( const TQString &password ) memcpy(result.data(), kapp->randomString(utf8Length).latin1(), utf8Length); for (unsigned int i = 0; i < utf8Length; ++i) result[i + utf8Length] = utf8[i] ^ result[i]; - return TQString::tqfromLatin1(KCodecs::base64Encode(result)); + return TQString::fromLatin1(KCodecs::base64Encode(result)); } TQString open_ksirc::decryptPassword( const TQString &scrambled ) diff --git a/ksirc/KSOpenkSirc/open_ksircData.ui b/ksirc/KSOpenkSirc/open_ksircData.ui index 0bc3374d..b3dcc2da 100644 --- a/ksirc/KSOpenkSirc/open_ksircData.ui +++ b/ksirc/KSOpenkSirc/open_ksircData.ui @@ -280,7 +280,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/ksirc/KSPrefs/page_colorsbase.ui b/ksirc/KSPrefs/page_colorsbase.ui index 9c14536f..a44d9b2e 100644 --- a/ksirc/KSPrefs/page_colorsbase.ui +++ b/ksirc/KSPrefs/page_colorsbase.ui @@ -113,7 +113,7 @@ <property name="name"> <cstring>genericTextCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -155,7 +155,7 @@ <property name="name"> <cstring>linkCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -169,7 +169,7 @@ <property name="name"> <cstring>backCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -183,7 +183,7 @@ <property name="name"> <cstring>errorCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -208,7 +208,7 @@ <property name="name"> <cstring>infoCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -222,7 +222,7 @@ <property name="name"> <cstring>chanMsgCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -236,7 +236,7 @@ <property name="name"> <cstring>selBackCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -250,7 +250,7 @@ <property name="name"> <cstring>selForeCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -336,7 +336,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>40</height> @@ -384,7 +384,7 @@ <property name="name"> <cstring>ownNickCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -428,7 +428,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>202</width> <height>20</height> @@ -490,13 +490,13 @@ <property name="name"> <cstring>nickFGCBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -524,7 +524,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -544,7 +544,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>83</width> <height>21</height> @@ -587,7 +587,7 @@ <property name="name"> <cstring>ownContainNickCBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -607,7 +607,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>169</width> <height>21</height> @@ -644,7 +644,7 @@ <property name="name"> <cstring>msg1CBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -672,7 +672,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>104</width> <height>21</height> @@ -709,7 +709,7 @@ <property name="name"> <cstring>msg2CBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -737,7 +737,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>104</width> <height>21</height> @@ -797,7 +797,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -816,7 +816,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>16</height> diff --git a/ksirc/KSPrefs/page_font.cpp b/ksirc/KSPrefs/page_font.cpp index d320a3f5..627c6ce4 100644 --- a/ksirc/KSPrefs/page_font.cpp +++ b/ksirc/KSPrefs/page_font.cpp @@ -21,7 +21,7 @@ void PageFont::update( void ){ void PageFont::saveConfig( void ) { ksopts->defaultFont = fontchooser->font(); - TQApplication::tqsetFont(fontchooser->font(), true, "KSirc::TextView" ); + TQApplication::setFont(fontchooser->font(), true, "KSirc::TextView" ); } void PageFont::readConfig( const KSOColors * opts ) diff --git a/ksirc/KSPrefs/page_generalbase.ui b/ksirc/KSPrefs/page_generalbase.ui index e5811a1a..2c31912f 100644 --- a/ksirc/KSPrefs/page_generalbase.ui +++ b/ksirc/KSPrefs/page_generalbase.ui @@ -12,7 +12,7 @@ <height>489</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>425</width> <height>0</height> @@ -69,7 +69,7 @@ <property name="name"> <cstring>historyItemsLabel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>32767</height> @@ -230,7 +230,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>21</height> @@ -393,7 +393,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>71</height> diff --git a/ksirc/KSPrefs/page_irccolorsbase.ui b/ksirc/KSPrefs/page_irccolorsbase.ui index b83b9b05..ae87e929 100644 --- a/ksirc/KSPrefs/page_irccolorsbase.ui +++ b/ksirc/KSPrefs/page_irccolorsbase.ui @@ -71,7 +71,7 @@ <property name="name"> <cstring>CBtn_1</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -137,7 +137,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -187,7 +187,7 @@ <property name="name"> <cstring>CBtn_2</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -237,7 +237,7 @@ <property name="name"> <cstring>CBtn_4</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -279,7 +279,7 @@ <property name="name"> <cstring>CBtn_3</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -321,7 +321,7 @@ <property name="name"> <cstring>CBtn_5</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -363,7 +363,7 @@ <property name="name"> <cstring>CBtn_6</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -405,7 +405,7 @@ <property name="name"> <cstring>CBtn_7</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -516,7 +516,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>41</height> @@ -629,7 +629,7 @@ <property name="name"> <cstring>CBtn_8</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -643,7 +643,7 @@ <property name="name"> <cstring>CBtn_9</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -657,7 +657,7 @@ <property name="name"> <cstring>CBtn_10</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -671,7 +671,7 @@ <property name="name"> <cstring>CBtn_11</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -685,7 +685,7 @@ <property name="name"> <cstring>CBtn_12</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -699,7 +699,7 @@ <property name="name"> <cstring>CBtn_13</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -713,7 +713,7 @@ <property name="name"> <cstring>CBtn_14</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -727,7 +727,7 @@ <property name="name"> <cstring>CBtn_15</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -1043,7 +1043,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>121</height> diff --git a/ksirc/KSPrefs/page_looknfeelbase.ui b/ksirc/KSPrefs/page_looknfeelbase.ui index 49688ab9..a691708f 100644 --- a/ksirc/KSPrefs/page_looknfeelbase.ui +++ b/ksirc/KSPrefs/page_looknfeelbase.ui @@ -12,7 +12,7 @@ <height>452</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>425</width> <height>450</height> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -132,13 +132,13 @@ <property name="name"> <cstring>Frame3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>120</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>120</height> @@ -198,13 +198,13 @@ <property name="name"> <cstring>wallpaperPathLE</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>30</height> @@ -217,13 +217,13 @@ <property name="name"> <cstring>Frame3_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>120</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>120</height> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>1</height> diff --git a/ksirc/KSPrefs/page_rmbmenubase.ui b/ksirc/KSPrefs/page_rmbmenubase.ui index 09fbef0d..b4234c4b 100644 --- a/ksirc/KSPrefs/page_rmbmenubase.ui +++ b/ksirc/KSPrefs/page_rmbmenubase.ui @@ -26,7 +26,7 @@ <property name="name"> <cstring>explLabel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -161,7 +161,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -178,7 +178,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>10</width> <height>21</height> diff --git a/ksirc/KSPrefs/page_shortcutsbase.ui b/ksirc/KSPrefs/page_shortcutsbase.ui index 1c40bdca..ca76ff9b 100644 --- a/ksirc/KSPrefs/page_shortcutsbase.ui +++ b/ksirc/KSPrefs/page_shortcutsbase.ui @@ -12,7 +12,7 @@ <height>452</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>425</width> <height>450</height> diff --git a/ksirc/KSPrefs/page_startupbase.ui b/ksirc/KSPrefs/page_startupbase.ui index 42dfefeb..629e3d30 100644 --- a/ksirc/KSPrefs/page_startupbase.ui +++ b/ksirc/KSPrefs/page_startupbase.ui @@ -42,7 +42,7 @@ <property name="name"> <cstring>nickGB</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> diff --git a/ksirc/KSProgress/ksprogress.cpp b/ksirc/KSProgress/ksprogress.cpp index 361c171c..ccf3b194 100644 --- a/ksirc/KSProgress/ksprogress.cpp +++ b/ksirc/KSProgress/ksprogress.cpp @@ -39,7 +39,7 @@ void KSProgress::setTopText(TQString text) void KSProgress::setBotText(TQString text) { - transfertqStatus->setText(text); + transferStatus->setText(text); } void KSProgress::setValue(int value) diff --git a/ksirc/KSProgress/ksprogress.dlg b/ksirc/KSProgress/ksprogress.dlg index 4d1b065d..5484c4d6 100644 --- a/ksirc/KSProgress/ksprogress.dlg +++ b/ksirc/KSProgress/ksprogress.dlg @@ -124,7 +124,7 @@ </Frame> </Label> <Label nested="true" > - <Text >XfertqStatus</Text> + <Text >XferStatus</Text> <Alignment >AlignLeft|AlignVCenter|ExpandTabs</Alignment> <Indent type="integer">-1</Indent> <TextFormat type="qstring">AutoText</TextFormat> @@ -138,7 +138,7 @@ <Y type="integer">35</Y> </Rect> <Name >Label_2</Name> - <Variable >transfertqStatus</Variable> + <Variable >transferStatus</Variable> <SignalConnection list="true" nested="true" > </SignalConnection> <MinimumSize type="qsize" complex="true" nested="true" > diff --git a/ksirc/KSProgress/ksprogressdata.cpp b/ksirc/KSProgress/ksprogressdata.cpp index 6b528f5c..ab098df9 100644 --- a/ksirc/KSProgress/ksprogressdata.cpp +++ b/ksirc/KSProgress/ksprogressdata.cpp @@ -46,16 +46,16 @@ ksprogressData::ksprogressData fileName->setMinimumSize( 10, 10 ); fileName->setMaximumSize( 32767, 32767 ); fileName->setText( i18n("File Name") ); - fileName->tqsetAlignment( 289 ); + fileName->setAlignment( 289 ); fileName->setMargin( -1 ); - transfertqStatus = new TQLabel( this, "Label_2" ); - transfertqStatus->setGeometry( 10, 35, 230, 20 ); - transfertqStatus->setMinimumSize( 10, 10 ); - transfertqStatus->setMaximumSize( 32767, 32767 ); - transfertqStatus->setText( i18n("Transfer Status") ); - transfertqStatus->tqsetAlignment( 289 ); - transfertqStatus->setMargin( -1 ); + transferStatus = new TQLabel( this, "Label_2" ); + transferStatus->setGeometry( 10, 35, 230, 20 ); + transferStatus->setMinimumSize( 10, 10 ); + transferStatus->setMaximumSize( 32767, 32767 ); + transferStatus->setText( i18n("Transfer Status") ); + transferStatus->setAlignment( 289 ); + transferStatus->setMargin( -1 ); resize( 250,130 ); setMinimumSize( 250, 140 ); diff --git a/ksirc/KSProgress/ksprogressdata.h b/ksirc/KSProgress/ksprogressdata.h index 0bffb520..a52e099b 100644 --- a/ksirc/KSProgress/ksprogressdata.h +++ b/ksirc/KSProgress/ksprogressdata.h @@ -42,7 +42,7 @@ protected slots: protected: KProgress* progress; TQLabel* fileName; - TQLabel* transfertqStatus; + TQLabel* transferStatus; }; diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp index 581bd2dc..36ad249a 100644 --- a/ksirc/KSTicker/ksttest.cpp +++ b/ksirc/KSTicker/ksttest.cpp @@ -35,8 +35,8 @@ StdInTicker::~StdInTicker() kConfig->writeEntry("font", KSTicker::font()); kConfig->writeEntry("tick", tick); kConfig->writeEntry("step", step); - kConfig->writeEntry("text", tqcolorGroup().text() ); - kConfig->writeEntry("background", tqcolorGroup().background() ); + kConfig->writeEntry("text", colorGroup().text() ); + kConfig->writeEntry("background", colorGroup().background() ); kConfig->sync(); } diff --git a/ksirc/KSTicker/speeddialog.dlg b/ksirc/KSTicker/speeddialog.dlg index aff83de2..08526647 100644 --- a/ksirc/KSTicker/speeddialog.dlg +++ b/ksirc/KSTicker/speeddialog.dlg @@ -31,7 +31,7 @@ Slider { Name {Slider_1} Variable {sliderTick} Signal {[Protected] valueChanged --> updateTick (int)} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -49,7 +49,7 @@ Slider { Name {Slider_2} Variable {sliderStep} Signal {[Protected] valueChanged --> updateStep (int)} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -62,7 +62,7 @@ LCDNumber { Rect {200 5 60 30} Name {LCDNumber_1} Variable {lcdTick} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -75,7 +75,7 @@ LCDNumber { Rect {200 40 60 30} Name {LCDNumber_2} Variable {lcdStep} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -85,7 +85,7 @@ Label { Margin {-1} Rect {10 5 80 30} Name {Label_1} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -95,7 +95,7 @@ Label { Margin {-1} Rect {10 40 80 30} Name {Label_2} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -109,7 +109,7 @@ PushButton { Rect {140 80 120 30} Name {PushButton_2} Signal {[Protected] pressed --> terminate ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } diff --git a/ksirc/KSTicker/speeddialogData.cpp b/ksirc/KSTicker/speeddialogData.cpp index 04102569..f0a6a931 100644 --- a/ksirc/KSTicker/speeddialogData.cpp +++ b/ksirc/KSTicker/speeddialogData.cpp @@ -66,7 +66,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) TQLabel* dlgedit_Label_1; dlgedit_Label_1 = new TQLabel( this, "Label_1" ); dlgedit_Label_1->setText( i18n("Tick interval:") ); - dlgedit_Label_1->tqsetAlignment( 289 ); + dlgedit_Label_1->setAlignment( 289 ); dlgedit_Label_1->setMargin( -1 ); grid->addWidget( dlgedit_Label_1, 0, 0 ); @@ -74,7 +74,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) TQLabel* dlgedit_Label_2; dlgedit_Label_2 = new TQLabel( this, "Label_2" ); dlgedit_Label_2->setText( i18n("Step size:") ); - dlgedit_Label_2->tqsetAlignment( 289 ); + dlgedit_Label_2->setAlignment( 289 ); dlgedit_Label_2->setMargin( -1 ); grid->addWidget( dlgedit_Label_2, 1, 0 ); diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp index 4928155c..5477cf5a 100644 --- a/ksirc/ahistlineedit.cpp +++ b/ksirc/ahistlineedit.cpp @@ -116,9 +116,9 @@ void aHistLineEdit::slotMaybeResize() // int h = metrics.height() * lines(); int h = metrics.lineSpacing() * lines()+8; // only grow if we are less than 1/4 the size of the toplevel - if(h > (tqtopLevelWidget()->height() >> 2)) { - if(this != tqtopLevelWidget()) { - h = tqtopLevelWidget()->height() >> 2; + if(h > (topLevelWidget()->height() >> 2)) { + if(this != topLevelWidget()) { + h = topLevelWidget()->height() >> 2; setVScrollBarMode( Auto ); } } @@ -131,7 +131,7 @@ void aHistLineEdit::slotMaybeResize() s.setHeight(h); resize(s); setFixedHeight( h ); - TQLayout *l = tqtopLevelWidget()->tqlayout(); + TQLayout *l = topLevelWidget()->tqlayout(); if(l){ l->tqinvalidate(); l->activate(); diff --git a/ksirc/alistbox.h b/ksirc/alistbox.h index 244a2fcb..cc636f4d 100644 --- a/ksirc/alistbox.h +++ b/ksirc/alistbox.h @@ -80,10 +80,10 @@ public: virtual void fontChange( const TQFont &f ); - static TQString nickPrefixOp() { return TQString::tqfromLatin1( "o" ); } - static TQString nickPrefixVoice() { return TQString::tqfromLatin1( "v" ); } - static TQString nickPrefixAway() { return TQString::tqfromLatin1( "a" ); } - static TQString nickPrefixIrcOp() { return TQString::tqfromLatin1( "O" ); } + static TQString nickPrefixOp() { return TQString::fromLatin1( "o" ); } + static TQString nickPrefixVoice() { return TQString::fromLatin1( "v" ); } + static TQString nickPrefixAway() { return TQString::fromLatin1( "a" ); } + static TQString nickPrefixIrcOp() { return TQString::fromLatin1( "O" ); } signals: void contextMenuRequested(int index); diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp index d5f59939..b79ba1e2 100644 --- a/ksirc/chanButtons.cpp +++ b/ksirc/chanButtons.cpp @@ -17,7 +17,7 @@ static void makeSquare(TQWidget *w) { - TQSize sh = w->tqsizeHint(); + TQSize sh = w->sizeHint(); int s = sh.height(); w->setFixedSize(s,s); } @@ -230,7 +230,7 @@ chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent, Layout->setMargin(0); okButton = new KPushButton(KStdGuiItem::ok(), this); - okButton->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, + okButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, okButton->sizePolicy().hasHeightForWidth())); Layout->addWidget(okButton); switch (modeType) { @@ -245,7 +245,7 @@ chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent, Layout->addWidget(okButton); cancelButton = new KPushButton(KStdGuiItem::cancel(), this); - cancelButton->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, + cancelButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, cancelButton->sizePolicy().hasHeightForWidth())); Layout->addWidget(cancelButton); connect(cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp index b2bdc93c..a297dc95 100644 --- a/ksirc/chanparser.cpp +++ b/ksirc/chanparser.cpp @@ -38,7 +38,7 @@ ChannelParser::ChannelParser(KSircTopLevel *_top) if(parserTable.isEmpty() == TRUE){ parserTable.setAutoDelete(TRUE); parserTable.insert("`l`", new parseFunc(&ChannelParser::parseSSFEClear)); - parserTable.insert("`s`", new parseFunc(&ChannelParser::parseSSFEtqStatus)); + parserTable.insert("`s`", new parseFunc(&ChannelParser::parseSSFEStatus)); parserTable.insert("`i`", new parseFunc(&ChannelParser::parseSSFEInit)); parserTable.insert("`t`", new parseFunc(&ChannelParser::parseSSFEMsg)); parserTable.insert("`o`", new parseFunc(&ChannelParser::parseSSFEOut)); @@ -123,7 +123,7 @@ parseResult * ChannelParser::parseSSFEClear(TQString string) return new parseSucc(TQString()); // Null string, don't display anything } -parseResult * ChannelParser::parseSSFEtqStatus(TQString string) +parseResult * ChannelParser::parseSSFEStatus(TQString string) { string.remove(0, 12); // strip off the first 12 characters "<junk> [sirc] " if(string.length() == 0) @@ -159,7 +159,7 @@ parseResult * ChannelParser::parseSSFEtqStatus(TQString string) if ( nickItem ) { if(nickItem->away() != away){ nickItem->setAway( away ); - top->nicks->viewport()->tqrepaint( top->nicks->tqitemRect( nickItem ), false ); + top->nicks->viewport()->tqrepaint( top->nicks->itemRect( nickItem ), false ); } nickItem->forceColour(&ksopts->ownNickColor); } diff --git a/ksirc/chanparser.h b/ksirc/chanparser.h index 3eaf39b6..7a6a0e77 100644 --- a/ksirc/chanparser.h +++ b/ksirc/chanparser.h @@ -198,10 +198,10 @@ private: parseResult * parseSSFEClear(TQString string); /** - * SSFE tqStatus is used to update caption, and op status + * SSFE Status is used to update caption, and op status * */ - parseResult * parseSSFEtqStatus(TQString string); + parseResult * parseSSFEStatus(TQString string); /** * SSFE Init is called by ssfe when it's time to init and setup diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp index be5fca73..5c88ccac 100644 --- a/ksirc/colorpicker.cpp +++ b/ksirc/colorpicker.cpp @@ -46,8 +46,8 @@ ColorPicker::ColorPicker( TQWidget *parent, const char *name ) m_sample = new TQLineEdit( i18n( "Sample Text" ), sampleBox ); m_sample->setFocusPolicy( TQ_NoFocus ); - m_sample->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, - m_sample->tqsizePolicy().verData() ) ); + m_sample->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + m_sample->sizePolicy().verData() ) ); sampleLayout->addWidget( m_sample ); sampleLayout->addStretch(); @@ -111,7 +111,7 @@ void ColorPicker::setBackgroundColor( int col ) void ColorPicker::updateSample() { - TQColorGroup cg( tqcolorGroup() ); + TQColorGroup cg( colorGroup() ); TQColor col = ksopts->textColor; if ( m_foregroundColor != -1 ) @@ -270,7 +270,7 @@ void ColorBar::mouseReleaseEvent( TQMouseEvent *ev ) void ColorBar::updateCellSize() { - setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) ); + setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) ); TQFontMetrics metrics( font() ); diff --git a/ksirc/dccManager.cpp b/ksirc/dccManager.cpp index cbf63109..47763faa 100644 --- a/ksirc/dccManager.cpp +++ b/ksirc/dccManager.cpp @@ -22,7 +22,7 @@ #define COL_CPS 4 #define COL_PER 5 -dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dcctqStatus status, unsigned int size ) +dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size ) : TQObject(), KListViewItem(parent), m_who(who), m_file(file), m_type(type) { m_percent = 0; @@ -34,7 +34,7 @@ dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, con setText(COL_FILE, file); setText(COL_WHO, who); - setText(COL_STAT, enumTotqStatus(status)); + setText(COL_STAT, enumToStatus(status)); if(m_type == dccChat) setText(COL_SIZE, ""); else @@ -43,7 +43,7 @@ dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, con } -dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dcctqStatus status, unsigned int size ) +dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size ) : TQObject(), KListViewItem(parent), m_who(who), m_file(file), m_type(type) { m_percent = 0; @@ -54,7 +54,7 @@ dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, setText(COL_FILE, file); setText(COL_WHO, who); - setText(COL_STAT, enumTotqStatus(status)); + setText(COL_STAT, enumToStatus(status)); if(type != dccChat) setText(COL_SIZE, TQString("%1").tqarg(size)); setText(COL_PER, ""); @@ -65,7 +65,7 @@ dccItem::~dccItem() { } -TQString dccItem::enumTotqStatus(enum dcctqStatus status) +TQString dccItem::enumToStatus(enum dccStatus status) { TQString str; switch(status){ @@ -121,10 +121,10 @@ void dccItem::changeWho(const TQString &who) { m_who = who; } -void dccItem::changetqStatus(enum dcctqStatus status) +void dccItem::changeStatus(enum dccStatus status) { m_manager->doChanged(); - setText(COL_STAT, enumTotqStatus(status)); + setText(COL_STAT, enumToStatus(status)); m_status = status; emit statusChanged(this); } @@ -228,7 +228,7 @@ dccManager::~dccManager() { } -dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dcctqStatus status, unsigned int size) +dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dccStatus status, unsigned int size) { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_sendit, this, dccItem::dccSend, file, who, status, size); @@ -237,7 +237,7 @@ dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dcct return it; } -dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dcctqStatus status, unsigned int size) +dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dccStatus status, unsigned int size) { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_getit, this, dccItem::dccGet, file, who, status, size); @@ -247,7 +247,7 @@ dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dcctq } -dccItem *dccManager::newChatItem(TQString who, enum dccItem::dcctqStatus status) +dccItem *dccManager::newChatItem(TQString who, enum dccItem::dccStatus status) { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_chatit, this, dccItem::dccChat, "", who, status, 0); diff --git a/ksirc/dccManager.h b/ksirc/dccManager.h index ec5b9bbe..524c886f 100644 --- a/ksirc/dccManager.h +++ b/ksirc/dccManager.h @@ -28,7 +28,7 @@ class dccItem : public TQObject, Q_OBJECT TQ_OBJECT public: - enum dcctqStatus { + enum dccStatus { dccRecving, dccOpen, dccWaitOnResume, @@ -47,11 +47,11 @@ public: dccSend }; - dccItem( KListView *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dcctqStatus, unsigned int size ); - dccItem( KListViewItem *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dcctqStatus, unsigned int size ); + dccItem( KListView *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dccStatus, unsigned int size ); + dccItem( KListViewItem *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dccStatus, unsigned int size ); virtual ~dccItem(); - void changetqStatus(enum dcctqStatus); + void changeStatus(enum dccStatus); void setReceivedBytes(int bytes); void setWhoPostfix(const TQString &post); @@ -60,7 +60,7 @@ public: const TQString who() { return m_who; } const TQString file() { return m_file; } - enum dcctqStatus status() { return m_status; } + enum dccStatus status() { return m_status; } enum dccType type() { return m_type; } double getPercent() { return m_percent; } @@ -71,7 +71,7 @@ signals: void itemRenamed(dccItem *, TQString oldNick, TQString oldFile); protected: - TQString enumTotqStatus(enum dcctqStatus); + TQString enumToStatus(enum dccStatus); virtual void okRename ( int col ); virtual void cancelRename ( int col ); @@ -84,7 +84,7 @@ private: TQString m_post; int m_percent; unsigned int m_size; - enum dcctqStatus m_status; + enum dccStatus m_status; const enum dccType m_type; time_t m_stime; time_t m_lasttime; @@ -102,9 +102,9 @@ public: dccManager( TQWidget *parent = 0, const char *name = 0 ); ~dccManager(); - dccItem *newSendItem(TQString file, TQString who, enum dccItem::dcctqStatus, unsigned int size); - dccItem *newGetItem(TQString file, TQString who, enum dccItem::dcctqStatus, unsigned int size); - dccItem *newChatItem(TQString who, enum dccItem::dcctqStatus); + dccItem *newSendItem(TQString file, TQString who, enum dccItem::dccStatus, unsigned int size); + dccItem *newGetItem(TQString file, TQString who, enum dccItem::dccStatus, unsigned int size); + dccItem *newChatItem(TQString who, enum dccItem::dccStatus); void doChanged() { emit changed(false, TQString("dcc activity")); }; diff --git a/ksirc/dccManagerbase.ui b/ksirc/dccManagerbase.ui index b3b070b4..c475f05c 100644 --- a/ksirc/dccManagerbase.ui +++ b/ksirc/dccManagerbase.ui @@ -50,7 +50,7 @@ </column> <column> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="clickable"> <bool>true</bool> diff --git a/ksirc/dccMgrTest.cpp b/ksirc/dccMgrTest.cpp index b37a8795..ac2b76cb 100644 --- a/ksirc/dccMgrTest.cpp +++ b/ksirc/dccMgrTest.cpp @@ -19,7 +19,7 @@ public: } void timerEvent( TQTimerEvent * ) { - m_it->changetqStatus(dccItem::dccSending); + m_it->changeStatus(dccItem::dccSending); bytes += 1000; m_it->setReceivedBytes(bytes); diff --git a/ksirc/dccNewbase.ui b/ksirc/dccNewbase.ui index 661ed5f5..fce40055 100644 --- a/ksirc/dccNewbase.ui +++ b/ksirc/dccNewbase.ui @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -87,7 +87,7 @@ <property name="name"> <cstring>nickList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>100</height> @@ -108,7 +108,7 @@ <property name="name"> <cstring>gbFile</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp index f2805426..81c69c24 100644 --- a/ksirc/displayMgrMDI.cpp +++ b/ksirc/displayMgrMDI.cpp @@ -178,7 +178,7 @@ void DisplayMgrMDI::reparentReq() { kdDebug(5008) << "got reparent" << endl; - TQWidget *o = kapp->tqfocusWidget(); + TQWidget *o = kapp->focusWidget(); TQWidget *s; if(o == NULL){ diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp index e47d98da..2c5808e8 100644 --- a/ksirc/dockservercontroller.cpp +++ b/ksirc/dockservercontroller.cpp @@ -98,7 +98,7 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren m_blinkTimer = new TQTimer( this ); connect( m_blinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( blinkDockedIcon() ) ); - m_blinktqStatus = false; + m_blinkStatus = false; m_blinkActive = false; servercontroller::self() @@ -316,7 +316,7 @@ void dockServerController::startBlink(const TQString& reason, const TQString& te if(m_blinkActive == false){ // change icon (to "someone's talking to you" icon) setPixmap( m_pic_info ); - m_blinktqStatus = true; + m_blinkStatus = true; m_blinkActive = true; m_blinkTimer->start( 500 ); // half a second } @@ -395,8 +395,8 @@ void dockServerController::raiseLastActiveWindow() void dockServerController::blinkDockedIcon() { - m_blinktqStatus = !m_blinktqStatus; - setPixmap( m_blinktqStatus ? m_pic_info : m_pic_dock ); + m_blinkStatus = !m_blinkStatus; + setPixmap( m_blinkStatus ? m_pic_info : m_pic_dock ); } void dockServerController::helpNotice() diff --git a/ksirc/dockservercontroller.h b/ksirc/dockservercontroller.h index 51020fdd..94f13674 100644 --- a/ksirc/dockservercontroller.h +++ b/ksirc/dockservercontroller.h @@ -36,7 +36,7 @@ public: void setOffline() { m_status = isOffline; m_offline = TQTime::currentTime(); } const TQTime offline() { return m_offline; } - void settqStatus(enum status stat) { m_status = stat; } + void setStatus(enum status stat) { m_status = stat; } enum status status() { return m_status; } private: @@ -100,7 +100,7 @@ private: bool m_mainPopVisible; bool m_blinkActive; - bool m_blinktqStatus; // true: blue icon, false: normal icon + bool m_blinkStatus; // true: blue icon, false: normal icon TQTimer* m_blinkTimer; TQStringList m_blink_reason; diff --git a/ksirc/ioDCC.cpp b/ksirc/ioDCC.cpp index 7f601ace..52c5dc9a 100644 --- a/ksirc/ioDCC.cpp +++ b/ksirc/ioDCC.cpp @@ -204,7 +204,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString error = rx.cap(3); - enum dccItem::dcctqStatus status = dccItem::dccDone; + enum dccItem::dccStatus status = dccItem::dccDone; if(error == "CLOSE"){ status = dccItem::dccCancel; @@ -218,7 +218,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) kdDebug(5008) << "SendPercent: " << DCCSendItems[key]->getPercent() << endl; if((status == dccItem::dccDone) && (DCCSendItems[key]->getPercent() < 100)) status = dccItem::dccError; - DCCSendItems[key]->changetqStatus(status); + DCCSendItems[key]->changeStatus(status); } } } @@ -229,7 +229,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString error = rx.cap(3); - enum dccItem::dcctqStatus status = dccItem::dccDone; + enum dccItem::dccStatus status = dccItem::dccDone; if(error != "OK"){ status = dccItem::dccError; @@ -240,7 +240,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) kdDebug(5008) << "GetPercent: " << DCCGetItems[key]->getPercent() << endl; if((status == dccItem::dccDone) && (DCCGetItems[key]->getPercent() < 100)) status = dccItem::dccError; - DCCGetItems[key]->changetqStatus(status); + DCCGetItems[key]->changeStatus(status); } } else { @@ -258,7 +258,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) kdDebug(5008) << "Got DCC GET resumed message..." << it->file() << endl; if(it->status() == dccItem::dccWaitOnResume) dccConnectClicked(it); - it->changetqStatus(dccItem::dccResumed); + it->changeStatus(dccItem::dccResumed); } } } @@ -269,7 +269,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString filename = rx.cap(2); TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCSendItems[key]){ - DCCSendItems[key]->changetqStatus(dccItem::dccResumed); + DCCSendItems[key]->changeStatus(dccItem::dccResumed); } } } @@ -280,7 +280,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString filename = rx.cap(2); TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCGetItems[key]){ - DCCGetItems[key]->changetqStatus(dccItem::dccRecving); + DCCGetItems[key]->changeStatus(dccItem::dccRecving); } } } @@ -293,7 +293,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCSendItems[key]){ DCCSendItems[key]->setWhoPostfix("(" + ip + ")"); - DCCSendItems[key]->changetqStatus(dccItem::dccSending); + DCCSendItems[key]->changeStatus(dccItem::dccSending); } } } @@ -302,7 +302,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(rx.search(str)){ TQString who = rx.cap(1); if(DCCChatItems[who]){ - DCCChatItems[who]->changetqStatus(dccItem::dccOpen); + DCCChatItems[who]->changeStatus(dccItem::dccOpen); proc->new_toplevel(KSircChannel(proc->serverName(), TQString("=") + who.lower())); } } @@ -314,7 +314,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString ip = rx.cap(2); if(DCCChatItems[who]){ DCCChatItems[who]->setWhoPostfix("(" + ip + ")"); - DCCChatItems[who]->changetqStatus(dccItem::dccOpen); + DCCChatItems[who]->changeStatus(dccItem::dccOpen); proc->new_toplevel(KSircChannel(proc->serverName(), TQString("=") + who.lower())); } } @@ -327,7 +327,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString error = rx.cap(3); TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCGetItems[key]){ - DCCGetItems[key]->changetqStatus(dccItem::dccError); + DCCGetItems[key]->changeStatus(dccItem::dccError); } KPassivePopup::message(i18n("DCC Get with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr()); } @@ -338,7 +338,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString who = rx.cap(1); TQString error = rx.cap(2); if(DCCChatItems[who]){ - DCCChatItems[who]->changetqStatus(dccItem::dccError); + DCCChatItems[who]->changeStatus(dccItem::dccError); } KPassivePopup::message(i18n("DCC Chat with %1 failed because of %2").tqarg(who).tqarg(error), mgr->mgr()); } @@ -362,7 +362,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString filename = rx.cap(2); TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); if(DCCGetItems[key]){ - DCCGetItems[key]->changetqStatus(dccItem::dccCancel); + DCCGetItems[key]->changeStatus(dccItem::dccCancel); } } } @@ -373,7 +373,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // TQString filename = rx.cap(2); // TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); // if(DCCSendItems[key]){ -// DCCSendItems[key]->changetqStatus(dccItem::dccCancel); +// DCCSendItems[key]->changeStatus(dccItem::dccCancel); // } // } // } @@ -382,7 +382,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(rx.search(str)){ TQString who = rx.cap(1); if(DCCChatItems[who]){ - DCCChatItems[who]->changetqStatus(dccItem::dccDone); + DCCChatItems[who]->changeStatus(dccItem::dccDone); } } } @@ -470,11 +470,11 @@ void KSircIODCC::control_message(int, TQString) void KSircIODCC::cancelTransfer(TQString filename) { //if(DlgList[filename]){ - //emit outputLine(DCCtqStatus[filename]->cancelMessage.ascii()); + //emit outputLine(DCCStatus[filename]->cancelMessage.ascii()); //delete DlgList[filename]; //DlgList.remove(filename); - //delete DCCtqStatus[filename]; - //DCCtqStatus.remove(filename); + //delete DCCStatus[filename]; + //DCCStatus.remove(filename); //} } @@ -561,7 +561,7 @@ void KSircIODCC::dccResumeClicked(dccItem *it) kdDebug(5008) << "Got resume click on " << it->who() << " " << it->type() << endl; switch(it->type()){ case dccItem::dccGet: - it->changetqStatus(dccItem::dccWaitOnResume); + it->changeStatus(dccItem::dccWaitOnResume); str = "/resume " + it->who() + " " + it->file() + "\n"; emit outputLine(str.ascii()); break; diff --git a/ksirc/ioDCC.h b/ksirc/ioDCC.h index 791d5d19..216c0419 100644 --- a/ksirc/ioDCC.h +++ b/ksirc/ioDCC.h @@ -52,7 +52,7 @@ signals: private: // TQDict<TQProgressDialog> DlgList; //TQDict<KSProgress> DlgList; - //TQDict<DCCInfo> DCCtqStatus; + //TQDict<DCCInfo> DCCStatus; TQDict<dccItem> DCCGetItems; TQDict<dccItem> DCCSendItems; TQDict<dccItem> DCCChatItems; diff --git a/ksirc/ksopts.cpp b/ksirc/ksopts.cpp index c0d6a927..b62579db 100644 --- a/ksirc/ksopts.cpp +++ b/ksirc/ksopts.cpp @@ -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" ).tqarg( i ), &ircColors[i] ); nickHighlight[i] = - conf->readBoolEntry(TQString::tqfromLatin1( "nickHighlight-%1" ).tqarg( i ), + conf->readBoolEntry(TQString::fromLatin1( "nickHighlight-%1" ).tqarg( 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" ).tqarg( i ), ircColors[i] ); + conf->writeEntry( TQString::fromLatin1( "nickHighlight-%1" ).tqarg( 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(); } } diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index bd43d82c..ff198c02 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -245,7 +245,7 @@ Item *TextChunk::breakLine( int width ) return 0; } -Item::LayoutResettqStatus TextChunk::resetLayout() +Item::LayoutResetStatus TextChunk::resetLayout() { if ( m_originalTextLength == 0 ) @@ -376,12 +376,12 @@ Item *TextChunk::hardBreak( const StringPtr &rightHandSide ) selStart->offset -= m_text.len; selEnd->offset -= m_text.len; selStart->item = selEnd->item = chunk; - chunk->setSelectiontqStatus( m_selection ); + chunk->setSelectionStatus( m_selection ); m_selection = NoSelection; } else if ( selEnd->offset >= m_text.len ) { selEnd->offset -= m_text.len; selEnd->item = chunk; - chunk->setSelectiontqStatus( SelectionEnd ); + chunk->setSelectionStatus( SelectionEnd ); m_selection = SelectionStart; } } @@ -389,7 +389,7 @@ Item *TextChunk::hardBreak( const StringPtr &rightHandSide ) if ( selection && selection->offset >= m_text.len ) { selection->offset -= m_text.len; selection->item = chunk; - chunk->setSelectiontqStatus( m_selection ); + chunk->setSelectionStatus( m_selection ); m_selection = NoSelection; } @@ -433,7 +433,7 @@ int TextChunk::paintSelection( TQPainter &p, int x, const StringPtr &text ) const int width = m_metrics.width( str ); - const TQColorGroup &cg = m_parag->textView()->tqcolorGroup(); + const TQColorGroup &cg = m_parag->textView()->colorGroup(); if (m_props.bgSelColor.isValid()) p.fillRect( x, 0, width, height(), m_props.bgSelColor ); @@ -482,11 +482,11 @@ void TextChunk::mergeSelection( TextChunk *child, SelectionPoint *selection ) selection->item = this; - if ( ( m_selection == SelectionStart && child->selectiontqStatus() == SelectionEnd ) || - ( m_selection == SelectionEnd && child->selectiontqStatus() == SelectionStart ) ) + if ( ( m_selection == SelectionStart && child->selectionStatus() == SelectionEnd ) || + ( m_selection == SelectionEnd && child->selectionStatus() == SelectionStart ) ) m_selection = SelectionBoth; else - m_selection = child->selectiontqStatus(); + m_selection = child->selectionStatus(); } ImageItem::ImageItem( TextParag *parag, const TQPixmap &pixmap ) @@ -512,7 +512,7 @@ void ImageItem::paint( TQPainter &painter ) if (m_props.bgSelColor.isValid()) painter.fillRect( 0, 0, width(), h, m_props.bgSelColor ); else { - const TQColorGroup &cg = m_parag->textView()->tqcolorGroup(); + const TQColorGroup &cg = m_parag->textView()->colorGroup(); painter.fillRect( 0, 0, width(), h, cg.highlight() ); } } @@ -520,7 +520,7 @@ void ImageItem::paint( TQPainter &painter ) painter.drawPixmap( 0, y, m_pixmap ); } -Item::LayoutResettqStatus ImageItem::resetLayout() +Item::LayoutResetStatus ImageItem::resetLayout() { // nothin' to do return KeepItem; @@ -1081,7 +1081,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection { if ( i == start.item ) { - i->setSelectiontqStatus( Item::SelectionStart ); + i->setSelectionStatus( Item::SelectionStart ); StringPtr txt = i->text(); if ( !txt.isNull() ) @@ -1090,7 +1090,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection } else if ( i == end.item ) { - i->setSelectiontqStatus( Item::SelectionEnd ); + i->setSelectionStatus( Item::SelectionEnd ); StringPtr txt = i->text(); if ( !txt.isNull() ) @@ -1098,7 +1098,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection } else { - i->setSelectiontqStatus( Item::InSelection ); + i->setSelectionStatus( Item::InSelection ); selectedText += i->text().toTQString(); } @@ -1111,7 +1111,7 @@ void TextLine::clearSelection() { Item *i = m_items.first(); for (; i; i = m_items.next() ) - i->setSelectiontqStatus( Item::NoSelection ); + i->setSelectionStatus( Item::NoSelection ); } void TextLine::appendItem( Item *i, int layoutUpdatePolicy ) @@ -1840,7 +1840,7 @@ void TextView::contentsMousePressEvent( TQMouseEvent *ev ) Item *itemUnderMouse = itemAt( ev->pos(), &p, Item::SelectFuzzy ); if ( p.item && ( ev->button() & Qt::LeftButton ) ) { m_selectionMaybeStart = p; - p.item->setSelectiontqStatus( Item::NoSelection ); + p.item->setSelectionStatus( Item::NoSelection ); } if ( TextChunk *text = dynamic_cast<TextChunk *>( itemUnderMouse ) ) { StringPtr href = text->props().attributes[ "href" ]; @@ -2103,11 +2103,11 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection { if ( start.pos.x() == end.pos.x() ) { - i->setSelectiontqStatus( Item::NoSelection ); + i->setSelectionStatus( Item::NoSelection ); return TQString(); } - i->setSelectiontqStatus( Item::SelectionBoth ); + i->setSelectionStatus( Item::SelectionBoth ); // ### ugly const TextChunk *t = dynamic_cast<TextChunk *>( i ); @@ -2119,7 +2119,7 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection } else { - i->setSelectiontqStatus( Item::SelectionBoth ); + i->setSelectionStatus( Item::SelectionBoth ); // ### ugly TextChunk *t = dynamic_cast<TextChunk *>( i ); diff --git a/ksirc/kstextview.h b/ksirc/kstextview.h index 6b3813a8..4499f370 100644 --- a/ksirc/kstextview.h +++ b/ksirc/kstextview.h @@ -142,8 +142,8 @@ class SelectionPoint; class Item { public: - enum LayoutResettqStatus { DeleteItem, KeepItem }; - enum SelectiontqStatus { SelectionStart = 0, InSelection, SelectionEnd, SelectionBoth, + enum LayoutResetStatus { DeleteItem, KeepItem }; + enum SelectionStatus { SelectionStart = 0, InSelection, SelectionEnd, SelectionBoth, NoSelection }; enum SelectionAccuracy { SelectExact, SelectFuzzy }; @@ -163,13 +163,13 @@ public: virtual Item *breakLine( int width ); - virtual LayoutResettqStatus resetLayout() = 0; + virtual LayoutResetStatus resetLayout() = 0; virtual int calcSelectionOffset( int x ); - void setSelectiontqStatus( SelectiontqStatus status ) { m_selection = status; } + void setSelectionStatus( SelectionStatus status ) { m_selection = status; } - SelectiontqStatus selectiontqStatus() const { return m_selection; } + SelectionStatus selectionStatus() const { return m_selection; } void selectionOffsets( int &startOffset, int &endOffset ); @@ -194,7 +194,7 @@ protected: virtual void calcExtends() const = 0; - SelectiontqStatus m_selection; + SelectionStatus m_selection; TextLine *m_line; TextParag *m_parag; ItemProperties m_props; @@ -211,7 +211,7 @@ public: virtual Item *breakLine( int width ); - virtual LayoutResettqStatus resetLayout(); + virtual LayoutResetStatus resetLayout(); virtual int calcSelectionOffset( int x ); @@ -247,7 +247,7 @@ public: virtual void paint( TQPainter &painter ); - virtual LayoutResettqStatus resetLayout(); + virtual LayoutResetStatus resetLayout(); protected: virtual void calcExtends() const; diff --git a/ksirc/kstextviewtest.cpp b/ksirc/kstextviewtest.cpp index fd5133ac..ded2f45c 100644 --- a/ksirc/kstextviewtest.cpp +++ b/ksirc/kstextviewtest.cpp @@ -16,8 +16,8 @@ public: m_lines++; if ( m_lines > 15 ) m_view->removeParag( m_view->firstParag() ); - m_view->appendParag( TQString::tqfromLatin1( "<font color=#0000ff>color test</font><font color=#00ff00>color test</font><font color=#ff0000>color test</font><font color=#000088>color test</font><font color=#008800>color test</font><font color=#880000>color test</font><font color=#0000ff>color test</font><font color=#02ff00>color test</font><font color=#2000ff>color test</font>" ) ); - m_view->appendParag( TQString::tqfromLatin1( "<r>aaaaaa</r> bbbbbb cccccccc ddddddddd eeeeeee " ) ); + m_view->appendParag( TQString::fromLatin1( "<font color=#0000ff>color test</font><font color=#00ff00>color test</font><font color=#ff0000>color test</font><font color=#000088>color test</font><font color=#008800>color test</font><font color=#880000>color test</font><font color=#0000ff>color test</font><font color=#02ff00>color test</font><font color=#2000ff>color test</font>" ) ); + m_view->appendParag( TQString::fromLatin1( "<r>aaaaaa</r> bbbbbb cccccccc ddddddddd eeeeeee " ) ); m_view->setContentsPos( 0, m_view->contentsHeight() ); } private: @@ -33,17 +33,17 @@ int main( int argc, char **argv ) app.setMainWidget( &view ); view.show(); - view.appendParag( TQString::tqfromLatin1( "<b>bold</b>Normal<i>Italic hey!</i><r>reverse!</r>" ) ); - view.appendParag( TQString::tqfromLatin1( "bleh foo hey bar schubidu bliep blop" ) ); - view.appendParag( TQString::tqfromLatin1( "more longish paragraphs .. yaddayadda yadda" ) ); - view.appendParag( TQString::tqfromLatin1( "<tronical> hah! &" ) ); - view.appendParag( TQString::tqfromLatin1( "<a href=\"http://www.kde.org/\">url</a>" ) ); - view.appendParag( TQString::tqfromLatin1( "<font color=#0000ff bgcolor=#ff0000>color test</font>" ) ); - view.appendParag( TQString::tqfromLatin1( "<font color=\"#00ff00\">another color test</font>" ) ); - view.appendParag( TQString::tqfromLatin1( "<font color=\"#00ff00\" bgcolor=\"#ff0000\">another color test</font>" ) ); - view.appendParag( TQString::tqfromLatin1( "<i bleh>simple attr test</i><b leh foo=15 doo=\"& > 123 \" oof>complicated attr test</b>" ) ); - view.appendParag( TQString::tqfromLatin1( "\"<b doo=\"& > 123 \" oof>\"third attr test 2</b>\"" ) ); - view.appendParag( TQString::tqfromLatin1( "aaaaaa bbbbbb cccccccc ddddddddd eeeeeee" ) ); + view.appendParag( TQString::fromLatin1( "<b>bold</b>Normal<i>Italic hey!</i><r>reverse!</r>" ) ); + view.appendParag( TQString::fromLatin1( "bleh foo hey bar schubidu bliep blop" ) ); + view.appendParag( TQString::fromLatin1( "more longish paragraphs .. yaddayadda yadda" ) ); + view.appendParag( TQString::fromLatin1( "<tronical> hah! &" ) ); + view.appendParag( TQString::fromLatin1( "<a href=\"http://www.kde.org/\">url</a>" ) ); + view.appendParag( TQString::fromLatin1( "<font color=#0000ff bgcolor=#ff0000>color test</font>" ) ); + view.appendParag( TQString::fromLatin1( "<font color=\"#00ff00\">another color test</font>" ) ); + view.appendParag( TQString::fromLatin1( "<font color=\"#00ff00\" bgcolor=\"#ff0000\">another color test</font>" ) ); + view.appendParag( TQString::fromLatin1( "<i bleh>simple attr test</i><b leh foo=15 doo=\"& > 123 \" oof>complicated attr test</b>" ) ); + view.appendParag( TQString::fromLatin1( "\"<b doo=\"& > 123 \" oof>\"third attr test 2</b>\"" ) ); + view.appendParag( TQString::fromLatin1( "aaaaaa bbbbbb cccccccc ddddddddd eeeeeee" ) ); Timer t( &view ); return app.exec(); diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp index 4fb90d9b..62a4bca4 100644 --- a/ksirc/ksview.cpp +++ b/ksirc/ksview.cpp @@ -73,7 +73,7 @@ void KSircView::clear() TQString KSircView::makeTimeStamp() { TQTime now = TQTime::currentTime(); - TQString timeStamp = TQString::tqfromLatin1( "[%1:%2:%3] " ) + TQString timeStamp = TQString::fromLatin1( "[%1:%2:%3] " ) .tqarg( TQString::number( now.hour() ).rightJustify( 2, '0' ) ) .tqarg( TQString::number( now.minute() ).rightJustify( 2, '0' ) ) .tqarg( TQString::number( now.second() ).rightJustify( 2, '0' ) ); @@ -112,9 +112,9 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const richText = richText.tqarg( color.name() ); if ( !pixmap.isEmpty() ) - richText.prepend( TQString::tqfromLatin1( "<img src=\"%1\"></img>" ).tqarg( pixmap ) ); + richText.prepend( TQString::fromLatin1( "<img src=\"%1\"></img>" ).tqarg( pixmap ) ); - TQString timeStamp = TQString::tqfromLatin1( "<font color=\"%1\">%2</font>" ) + TQString timeStamp = TQString::fromLatin1( "<font color=\"%1\">%2</font>" ) .tqarg( ksopts->textColor.name() ) .tqarg( makeTimeStamp() ); m_timeStamps.append(timeStamp); @@ -131,11 +131,11 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const // '<nick message<' , which is supposedly a bug in TQt's reordering. The // same is done for [nick] and >nick< to catch queries. TQRegExp bidiRe( "^(<\\S+>)(.+)$" ); - text.replace( bidiRe, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe2( "^(\\[\\S+\\])(.+)$" ); - text.replace( bidiRe2, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe2, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe3( "^(>\\S+<)(.+)$" ); - text.replace( bidiRe3, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe3, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp nickCol( "~n(.+)~n" ); nickCol.setMinimal(true); @@ -199,7 +199,7 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const } if (parser.beeped()) { - KNotifyClient::event(winId(), TQString::tqfromLatin1("BeepReceived"), + KNotifyClient::event(winId(), TQString::fromLatin1("BeepReceived"), i18n("Beep Received")); } @@ -224,7 +224,7 @@ void KSircView::addRichText(const TQString &_text) timeStamp = re.cap(1); } else { - timeStamp = TQString::tqfromLatin1( "<font color=\"%1\">%2</font>" ) + timeStamp = TQString::fromLatin1( "<font color=\"%1\">%2</font>" ) .tqarg( ksopts->textColor.name() ) .tqarg( makeTimeStamp() ); if ( m_timestamps ) @@ -303,7 +303,7 @@ void KSircView::anchorClicked(const TQMouseEvent *ev, const TQString &url) void KSircView::openBrowser(const TQString &url ) { - (void) new KRun( KURL( url.startsWith("www") ? TQString::tqfromLatin1("http://") + url : url)); + (void) new KRun( KURL( url.startsWith("www") ? TQString::fromLatin1("http://") + url : url)); } void KSircView::copyLinkToClipboard( const TQString &url ) diff --git a/ksirc/logfile.cpp b/ksirc/logfile.cpp index e65be271..2246cd30 100644 --- a/ksirc/logfile.cpp +++ b/ksirc/logfile.cpp @@ -39,16 +39,16 @@ void LogFile::open() assert( m_file->isOpen() == true ); - log( TQString::tqfromLatin1( "### Log session started at " ) - + TQDateTime::tqcurrentDateTime().toString() - + TQString::tqfromLatin1( "###\n" ) ); + log( TQString::fromLatin1( "### Log session started at " ) + + TQDateTime::currentDateTime().toString() + + TQString::fromLatin1( "###\n" ) ); } void LogFile::closeLog() { - log( TQString::tqfromLatin1( "### Log session terminated at " ) - + TQDateTime::tqcurrentDateTime().toString() - + TQString::tqfromLatin1( "###\n" ) ); + log( TQString::fromLatin1( "### Log session terminated at " ) + + TQDateTime::currentDateTime().toString() + + TQString::fromLatin1( "###\n" ) ); if ( m_flushTimerId != -1 ) killTimer( m_flushTimerId ); @@ -77,7 +77,7 @@ TQString LogFile::makeLogFileName( const TQString &channel, const TQString &serv { TQString res = channel + '_'; - TQDate dt = TQDate::tqcurrentDate(); + TQDate dt = TQDate::currentDate(); TQString dateStr; dateStr.sprintf( "%.4d_%.2d_%.2d_", dt.year(), dt.month(), dt.day() ); res += dateStr; diff --git a/ksirc/objFinder.cpp b/ksirc/objFinder.cpp index c5283dbd..bb4fe5dc 100644 --- a/ksirc/objFinder.cpp +++ b/ksirc/objFinder.cpp @@ -67,7 +67,7 @@ TQObject *objFinder::find(const char *name, const char *inherits){ delete qobl; ++it; } - TQWidgetList *all = TQApplication::tqallWidgets(); + TQWidgetList *all = TQApplication::allWidgets(); TQWidgetListIt itW(*all); while(itW.current()){ if(len == strlen(itW.current()->name()) && @@ -93,7 +93,7 @@ void objFinder::dumpTree(){ it.current()->dumpObjectTree(); ++it; } - TQWidgetList *all = TQApplication::tqallWidgets(); + TQWidgetList *all = TQApplication::allWidgets(); TQWidgetListIt itW(*all); while(itW.current()){ kdDebug(5008) << itW.current()->className() << "::" << itW.current()->name("unnamed") << endl; @@ -119,7 +119,7 @@ TQStringList objFinder::allObjects(){ delete qobl; ++it; } - TQWidgetList *all = TQApplication::tqallWidgets(); + TQWidgetList *all = TQApplication::allWidgets(); TQWidgetListIt itW(*all); while(itW.current()){ TQString name; diff --git a/ksirc/openksircproc.dlg b/ksirc/openksircproc.dlg index 080199d9..1378f569 100644 --- a/ksirc/openksircproc.dlg +++ b/ksirc/openksircproc.dlg @@ -26,7 +26,7 @@ Label { Rect {10 10 100 30} Name {Label_1} Font {"helvetica" 12 63 0 0 0 0 0 0} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -42,7 +42,7 @@ PushButton { Variable {okButton} Font {"helvetica" 12 63 0 0 0 0 0 0} Signal {[Protected] clicked --> create_toplevel ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -56,7 +56,7 @@ PushButton { Rect {10 50 180 30} Name {PushButton_2} Signal {[Protected] clicked --> terminate ()} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } @@ -68,7 +68,7 @@ ComboBox { Rect {70 10 320 30} Name {ComboBox_1} Variable {nameSLE} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp index 20c020c7..5a646973 100644 --- a/ksirc/puke/controller.cpp +++ b/ksirc/puke/controller.cpp @@ -173,7 +173,7 @@ void PukeController::NewConnect(int) fcntl(cfd, F_SETFL, O_NONBLOCK); // Set it non-block so that // cfd() never blocks. - fdtqStatus *fds = new fdtqStatus(); + fdStatus *fds = new fdStatus(); fds->sr = new TQSocketNotifier(cfd, TQSocketNotifier::Read, this); fds->sw = new TQSocketNotifier(cfd, TQSocketNotifier::Write, this); connect(fds->sr, TQT_SIGNAL(activated(int)), @@ -868,7 +868,7 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) { return; } - TQString libName = "ksirc/lib"+TQString::tqfromLatin1(pm->cArg); + TQString libName = "ksirc/lib"+TQString::fromLatin1(pm->cArg); if (libName.right(3) == ".so") libName = libName.left(libName.length()-2)+"la"; diff --git a/ksirc/puke/controller.h b/ksirc/puke/controller.h index 92c8be98..c2a086f7 100644 --- a/ksirc/puke/controller.h +++ b/ksirc/puke/controller.h @@ -27,7 +27,7 @@ typedef struct { TQString server; bool writeable; TQSocketNotifier *sr,*sw; -} fdtqStatus; +} fdStatus; struct commandStruct { @@ -137,7 +137,7 @@ private: int iListenFd; bool bClosing; // Set true if we are closing, we don't try and close twice at the same time. TQSocketNotifier *qsnListen; - TQIntDict<fdtqStatus> qidConnectFd; + TQIntDict<fdStatus> qidConnectFd; /** * Controller ID is defined as 1 diff --git a/ksirc/puke/dcc_status.pm b/ksirc/puke/dcc_status.pm index 799c8cf5..410437e7 100644 --- a/ksirc/puke/dcc_status.pm +++ b/ksirc/puke/dcc_status.pm @@ -123,7 +123,7 @@ sub sendClicked { use vars qw(@ISA $KSIRC_DCC %KSIRC_DCC); -package DCCtqStatus; +package DCCStatus; use vars qw(@ISA); @ISA = qw(PFrame); @@ -330,7 +330,7 @@ sub hook_ksirc_dcc_request { my($size) = shift; my($mwho) = $who; if($KSIRC_DCCSTATUS == undef){ - $KSIRC_DCCSTATUS = new DCCtqStatus; + $KSIRC_DCCSTATUS = new DCCStatus; $KSIRC_DCCSTATUS->resize(400, 275); } @@ -473,13 +473,13 @@ addhook("dcc_disconnect", "ksirc_dcc_disconnect"); &print("*I* Done DCC Status"); -#$::test = new DCCtqStatus; +#$::test = new DCCStatus; #$::test->resize(400, 275); #$::test->show(); sub popup_dccstatus{ if($KSIRC_DCCSTATUS == undef){ - $KSIRC_DCCSTATUS = new DCCtqStatus; + $KSIRC_DCCSTATUS = new DCCStatus; $KSIRC_DCCSTATUS->resize(400, 275); } $KSIRC_DCCSTATUS->show(); @@ -487,7 +487,7 @@ sub popup_dccstatus{ sub popup_dccsend{ if($KSIRC_DCCSTATUS == undef){ - $KSIRC_DCCSTATUS = new DCCtqStatus; + $KSIRC_DCCSTATUS = new DCCStatus; $KSIRC_DCCSTATUS->resize(400, 275); } $KSIRC_DCCSTATUS->sendClicked(); diff --git a/ksirc/puke/plabel.cpp b/ksirc/puke/plabel.cpp index 41a68636..7567ac08 100644 --- a/ksirc/puke/plabel.cpp +++ b/ksirc/puke/plabel.cpp @@ -83,7 +83,7 @@ void PLabel::messageHandler(int fd, PukeMessage *pm) if(!checkWidget()) return; - widget()->tqsetAlignment(pm->iArg); + widget()->setAlignment(pm->iArg); pmRet.iCommand = - pm->iCommand; pmRet.iWinId = pm->iWinId; pmRet.iArg = 0; diff --git a/ksirc/puke/plabel.pm b/ksirc/puke/plabel.pm index efdcf490..bc557b5e 100644 --- a/ksirc/puke/plabel.pm +++ b/ksirc/puke/plabel.pm @@ -83,7 +83,7 @@ sub text { -sub tqsetAlignment { +sub setAlignment { my $self = shift; my $align = shift; diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp index cf3ac667..af041c19 100644 --- a/ksirc/puke/pwidget.cpp +++ b/ksirc/puke/pwidget.cpp @@ -209,12 +209,12 @@ void PWidget::messageHandler(int fd, PukeMessage *pm) int *pos; pos = (int *) pm->cArg; TQColor bg(pos[0], pos[1], pos[2]); - TQColorGroup cg = TQColorGroup(widget()->tqcolorGroup().foreground(), + TQColorGroup cg = TQColorGroup(widget()->colorGroup().foreground(), bg, - widget()->tqcolorGroup().light(), - widget()->tqcolorGroup().dark(), - widget()->tqcolorGroup().mid(), - widget()->tqcolorGroup().text(), + widget()->colorGroup().light(), + widget()->colorGroup().dark(), + widget()->colorGroup().mid(), + widget()->colorGroup().text(), bg); widget()->setPalette(TQPalette(cg,cg,cg)); diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index 9b3121d0..6448dd5a 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -386,7 +386,7 @@ void servercontroller::font_update(const TQFont &font) KConfig *kConfig = kapp->config(); kConfig->setGroup("GlobalOptions"); kConfig->sync(); - TQApplication::tqsetFont( font, true, "KSirc::TextView" ); + TQApplication::setFont( font, true, "KSirc::TextView" ); } void servercontroller::configChange() @@ -718,7 +718,7 @@ void servercontroller::showEvent( TQShowEvent *e ) { TQWidget::showEvent( e ); if ( !e->spontaneous() ) - saveDockingtqStatus(); + saveDockingStatus(); } void servercontroller::hideEvent( TQHideEvent * ) @@ -726,7 +726,7 @@ void servercontroller::hideEvent( TQHideEvent * ) /* TQWidget::hideEvent( e ); if ( !e->spontaneous() ) - saveDockingtqStatus(); + saveDockingStatus(); if(TQWidget::isMinimized()){ hide(); KWin::setState(winId(), NET::SkipTaskbar); @@ -734,7 +734,7 @@ void servercontroller::hideEvent( TQHideEvent * ) */ } -void servercontroller::saveDockingtqStatus() +void servercontroller::saveDockingStatus() { if ( we_are_exiting ) // we are hidden by closeEvent return; diff --git a/ksirc/servercontroller.dlg b/ksirc/servercontroller.dlg index 208d4508..7e515bdc 100644 --- a/ksirc/servercontroller.dlg +++ b/ksirc/servercontroller.dlg @@ -25,7 +25,7 @@ User { Rect {0 0 410 30} Name {User_2} Variable {MenuBar} - LayouttqStatus {NoLayout} + LayoutStatus {NoLayout} MinimumSize {10 10} MaximumSize {32767 32767} } diff --git a/ksirc/servercontroller.h b/ksirc/servercontroller.h index 891ececd..781627b3 100644 --- a/ksirc/servercontroller.h +++ b/ksirc/servercontroller.h @@ -206,7 +206,7 @@ protected: virtual void showEvent( TQShowEvent *e ); virtual void hideEvent( TQHideEvent *e ); virtual void closeEvent( TQCloseEvent * ); - void saveDockingtqStatus(); + void saveDockingStatus(); void saveGlobalProperties(KConfig *); void readGlobalProperties(KConfig *); diff --git a/ksirc/ssfepromptdata.cpp b/ksirc/ssfepromptdata.cpp index 563fc7eb..15349f44 100644 --- a/ksirc/ssfepromptdata.cpp +++ b/ksirc/ssfepromptdata.cpp @@ -31,7 +31,7 @@ ssfepromptdata::ssfepromptdata prompt->setMinimumSize( 10, 10 ); prompt->setMaximumSize( 32767, 32767 ); prompt->setText( "" ); - prompt->tqsetAlignment( 289 ); + prompt->setAlignment( 289 ); prompt->setMargin( -1 ); SLine = new TQLineEdit( this, "LineEdit_1" ); diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp index a470c3c7..91754dd8 100644 --- a/ksirc/topic.cpp +++ b/ksirc/topic.cpp @@ -34,13 +34,13 @@ KSircTopic::KSircTopic( TQWidget *parent, const char *name ) m_editor = 0; m_doEdit = false; m_height = 0; -// setBackgroundColor( tqcolorGroup().light() ); +// setBackgroundColor( colorGroup().light() ); setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); setTextFormat( RichText ); setWordWrap(TQTextEdit::NoWrap); doResize(); -// tqsetAlignment( tqalignment() | WordBreak ); +// setAlignment( tqalignment() | WordBreak ); } void KSircTopic::setText( const TQString &_text) @@ -65,11 +65,11 @@ void KSircTopic::setText( const TQString &_text) // '<nick message<' , which is supposedly a bug in TQt's reordering. The // same is done for [nick] and >nick< to catch queries. TQRegExp bidiRe( "^(<\\S+>)(.+)$" ); - text.replace( bidiRe, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe2( "^(\\[\\S+\\])(.+)$" ); - text.replace( bidiRe2, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe2, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe3( "^(>\\S+<)(.+)$" ); - text.replace( bidiRe3, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe3, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); KSParser parser; richText += parser.parse( text ); @@ -211,7 +211,7 @@ void KSircTopicEditor::focusOutEvent( TQFocusEvent * fe ) // menu if ( fe->reason() == TQFocusEvent::Popup ) { - TQWidget *focusw = tqApp->tqfocusWidget(); + TQWidget *focusw = tqApp->focusWidget(); if ( focusw && m_popup && focusw == m_popup ) return; } diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index bdc14b1d..ccd377f2 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -258,7 +258,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf lag = new TQLabel(nicks_box); lag->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - lag->tqsetAlignment(TQt::AlignCenter | TQt::SingleLine); + lag->setAlignment(TQt::AlignCenter | TQt::SingleLine); lag->setText(i18n("Lag: Wait")); @@ -587,9 +587,9 @@ void KSircTopLevel::setMode(TQString mode, int mode_type, TQString currentNick) { TQString command; if (mode_type == 0) - command = TQString::tqfromLatin1("/mode %1 %2\n").tqarg(m_channelInfo.channel()).tqarg(mode); + command = TQString::fromLatin1("/mode %1 %2\n").tqarg(m_channelInfo.channel()).tqarg(mode); else - command = TQString::tqfromLatin1("/mode %1 %2\n").tqarg(currentNick).tqarg(mode); + command = TQString::fromLatin1("/mode %1 %2\n").tqarg(currentNick).tqarg(mode); sirc_write(command); linee->setFocus(); } @@ -974,7 +974,7 @@ void KSircTopLevel::sirc_write(const TQString &str) return; } else if ( plain.startsWith( "/away" ) ) { - TQString awayEvalCommand = TQString::tqfromLatin1( "/eval $publicAway = %1\n" ).tqarg( ksopts->publicAway ? '1' : '0' ); + TQString awayEvalCommand = TQString::fromLatin1( "/eval $publicAway = %1\n" ).tqarg( ksopts->publicAway ? '1' : '0' ); emit outputUnicodeLine( awayEvalCommand ); } @@ -985,7 +985,7 @@ void KSircTopLevel::sirc_write(const TQString &str) if(!isSpecialWindow()) { // channel or private chat if(plain[0].latin1() != '/'){ - command.prepend(TQString::tqfromLatin1("/msg %1 ").tqarg(m_channelInfo.channel())); + command.prepend(TQString::fromLatin1("/msg %1 ").tqarg(m_channelInfo.channel())); } else if(plain.startsWith("/me ")) { command.remove(0, 3); @@ -1727,7 +1727,7 @@ void KSircTopLevel::outputUnicodeLine( const TQString &message ) void KSircTopLevel::setTopicIntern( const TQString &topic ) { - TQString command = TQString::tqfromLatin1( "/topic %1 %2\n" ).tqarg( m_channelInfo.channel() ).tqarg( topic ); + TQString command = TQString::fromLatin1( "/topic %1 %2\n" ).tqarg( m_channelInfo.channel() ).tqarg( topic ); sirc_write( command ); linee->setFocus(); } @@ -1739,14 +1739,14 @@ void KSircTopLevel::doChange(bool pers, TQString text) // beep only every 2 seconds otherwise it'll get very noisy in the room ;) if ( TQABS( lastBeep.secsTo( ctime ) ) > 1 ) { if ( pers ) { - int winId = !ticker ? tqtopLevelWidget()->winId() : ticker->winId(); + int winId = !ticker ? topLevelWidget()->winId() : ticker->winId(); KNotifyClient::event(winId, - TQString::tqfromLatin1("ChannelPersonal"), + TQString::fromLatin1("ChannelPersonal"), i18n("Your nick appeared on channel %1").tqarg(m_channelInfo.channel())); } else { - int winId = !ticker ? tqtopLevelWidget()->winId() : ticker->winId(); + int winId = !ticker ? topLevelWidget()->winId() : ticker->winId(); KNotifyClient::event(winId, - TQString::tqfromLatin1("ChannelChanged"), + TQString::fromLatin1("ChannelChanged"), i18n("Channel %1 changed").tqarg(m_channelInfo.channel())); } lastBeep = ctime; diff --git a/ktalkd/kcmktalkd/answmachpage.cpp b/ktalkd/kcmktalkd/answmachpage.cpp index 4a3947da..efff4e06 100644 --- a/ktalkd/kcmktalkd/answmachpage.cpp +++ b/ktalkd/kcmktalkd/answmachpage.cpp @@ -49,27 +49,27 @@ KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name, mail_edit->setMinimumWidth(150); mail_label = new TQLabel(mail_edit,i18n("&Mail address:"),this); mail_label->adjustSize(); - mail_label->tqsetAlignment( ShowPrefix | AlignVCenter ); + mail_label->setAlignment( ShowPrefix | AlignVCenter ); subj_edit = new TQLineEdit(this); subj_edit->adjustSize(); subj_edit->setMinimumWidth(150); subj_label = new TQLabel(subj_edit, i18n("Mail s&ubject:"),this); subj_label->adjustSize(); - subj_label->tqsetAlignment( ShowPrefix | AlignVCenter ); + subj_label->setAlignment( ShowPrefix | AlignVCenter ); subj_tip = new TQLabel(i18n("Use %s for the caller name"),this); - subj_tip->tqsetAlignment( ShowPrefix ); + subj_tip->setAlignment( ShowPrefix ); head_edit = new TQLineEdit(this); head_edit->adjustSize(); head_edit->setMinimumWidth(150); head_label = new TQLabel(head_edit, i18n("Mail &first line:"),this); head_label->adjustSize(); - head_label->tqsetAlignment( ShowPrefix | AlignVCenter ); + head_label->setAlignment( ShowPrefix | AlignVCenter ); head_tip = new TQLabel( i18n("Use first %s for caller name, and second %s for caller hostname"), this); - head_tip->tqsetAlignment( ShowPrefix ); + head_tip->setAlignment( ShowPrefix ); emptymail_cb = new TQCheckBox(i18n("&Receive a mail even if no message left"), this); emptymail_cb->adjustSize(); @@ -79,7 +79,7 @@ KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name, msg_ml->setMinimumWidth(150); msg_label = new TQLabel(msg_ml, i18n("&Banner displayed on answering machine startup:"),this); msg_label->adjustSize(); - msg_label->tqsetAlignment( ShowPrefix | AlignVCenter ); + msg_label->setAlignment( ShowPrefix | AlignVCenter ); int h = 10 + answmach_cb->height() + mail_edit->height() + subj_edit->height() + subj_tip->height() + head_edit->height() diff --git a/ktalkd/kcmktalkd/forwmachpage.cpp b/ktalkd/kcmktalkd/forwmachpage.cpp index 2046833d..33438651 100644 --- a/ktalkd/kcmktalkd/forwmachpage.cpp +++ b/ktalkd/kcmktalkd/forwmachpage.cpp @@ -45,7 +45,7 @@ KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name, address_edit->setMinimumWidth(150); address_label = new TQLabel(address_edit,i18n("&Destination (user or user@host):"),this); address_label->adjustSize(); - address_label->tqsetAlignment( ShowPrefix | AlignVCenter ); + address_label->setAlignment( ShowPrefix | AlignVCenter ); method_combo = new TQComboBox(this); method_combo->insertItem("FWA"); @@ -55,7 +55,7 @@ KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name, method_combo->setMinimumWidth(80); method_label = new TQLabel(method_combo, i18n("Forward &method:"),this); method_label->adjustSize(); - method_label->tqsetAlignment( ShowPrefix | AlignVCenter ); + method_label->setAlignment( ShowPrefix | AlignVCenter ); expl_label = new TQLabel(i18n( "FWA: Forward announcement only. Direct connection. Not recommended.\n\ diff --git a/lanbrowsing/kcmlisa/findnic.cpp b/lanbrowsing/kcmlisa/findnic.cpp index d7437848..721834c9 100644 --- a/lanbrowsing/kcmlisa/findnic.cpp +++ b/lanbrowsing/kcmlisa/findnic.cpp @@ -275,21 +275,21 @@ TQString flags_tos (unsigned int flags) if (flags & IFF_BROADCAST) { if (tmp.length()) { - tmp += TQString::tqfromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Broadcast"); } if (flags & IFF_MULTICAST) { if (tmp.length()) { - tmp += TQString::tqfromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Multicast"); } if (flags & IFF_LOOPBACK) { if (tmp.length()) { - tmp += TQString::tqfromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Loopback"); } diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp index 01bf9bc2..bbc613c9 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.cpp +++ b/lanbrowsing/kcmlisa/kcmlisa.cpp @@ -108,7 +108,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) hbox->setSpacing(10); // m_autoSetup=new TQPushButton(i18n("&Guided LISa Setup..."),hbox); m_autoSetup=new TQPushButton(i18n("Setup Wizard..."),hbox); - m_autoSetup->setFixedWidth( m_autoSetup->tqsizeHint().width() ); + m_autoSetup->setFixedWidth( m_autoSetup->sizeHint().width() ); m_suggestSettings=new TQPushButton(i18n("&Suggest Settings"),hbox); diff --git a/lanbrowsing/kcmlisa/setupwizard.cpp b/lanbrowsing/kcmlisa/setupwizard.cpp index f5b985e1..53b5033d 100644 --- a/lanbrowsing/kcmlisa/setupwizard.cpp +++ b/lanbrowsing/kcmlisa/setupwizard.cpp @@ -199,7 +199,7 @@ void SetupWizard::setupSearchPage() m_searchPage->setSpacing(KDialog::spacingHint()); m_searchPage->setMargin(KDialog::marginHint()); info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"),m_searchPage); - info->tqsetAlignment(AlignRight|AlignVCenter); + info->setAlignment(AlignRight|AlignVCenter); setHelpEnabled( m_searchPage, false ); } @@ -219,13 +219,13 @@ void SetupWizard::setupAddressesPage() "4. ranges for each part of the address, like <code>10-10.1-5.1-25.1-3;</code><br>" "You can also enter combinations of 1 to 4, separated by \";\", like<br>" "<code>192.168.0.0/255.255.255.0;10.0.0.0;10.0.1.1-10.0.1.100;</code><br>"),m_addressesPage); - info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); + info->setAlignment(AlignLeft|AlignVCenter|WordBreak); TQWidget *dummy=new TQWidget(m_addressesPage); m_addressesPage->setStretchFactor(dummy,10); m_addressesPage->setSpacing(KDialog::spacingHint()); m_addressesPage->setMargin(KDialog::marginHint()); info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"), m_addressesPage); - info->tqsetAlignment(AlignRight|AlignVCenter); + info->setAlignment(AlignRight|AlignVCenter); setHelpEnabled( m_addressesPage, false ); } @@ -238,7 +238,7 @@ void SetupWizard::setupAllowedPage() "Only hosts which fit into the addresses given here are accepted by LISa as clients. " "The list of hosts published by LISa will also only contain hosts which fit into this scheme.<br>" "Usually you enter your IP address/network mask here."),m_allowedAddressesPage); - info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); + info->setAlignment(AlignLeft|AlignVCenter|WordBreak); m_allowedAddresses=new KRestrictedLine(m_allowedAddressesPage,"0123456789./-;"); m_trustedHostsLabel=new TQLabel(m_allowedAddressesPage); @@ -247,7 +247,7 @@ void SetupWizard::setupAllowedPage() m_allowedAddressesPage->setSpacing(KDialog::spacingHint()); m_allowedAddressesPage->setMargin(KDialog::marginHint()); info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"), m_allowedAddressesPage); - info->tqsetAlignment(AlignRight|AlignVCenter); + info->setAlignment(AlignRight|AlignVCenter); setHelpEnabled( m_allowedAddressesPage, false ); } @@ -256,18 +256,18 @@ void SetupWizard::setupBcastPage() { m_bcastPage=new TQVBox(this); TQLabel *info=new TQLabel(i18n("<br>Enter your IP address and network mask here, like <code>192.168.0.1/255.255.255.0</code>"),m_bcastPage); - info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); + info->setAlignment(AlignLeft|AlignVCenter|WordBreak); m_bcastAddress=new KRestrictedLine(m_bcastPage,"0123456789./"); info=new TQLabel(i18n("<br>To reduce the network load, the LISa servers in one network<br>" "cooperate with each other. Therefore you have to enter the broadcast<br>" "address here. If you are connected to more than one network, choose <br>" "one of the broadcast addresses."),m_bcastPage); - info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); + info->setAlignment(AlignLeft|AlignVCenter|WordBreak); TQWidget *dummy=new TQWidget(m_bcastPage); m_bcastPage->setStretchFactor(dummy,10); m_bcastPage->setSpacing(KDialog::spacingHint()); info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"), m_bcastPage); - info->tqsetAlignment(AlignRight|AlignVCenter); + info->setAlignment(AlignRight|AlignVCenter); m_bcastPage->setSpacing(KDialog::spacingHint()); m_bcastPage->setMargin(KDialog::marginHint()); @@ -287,13 +287,13 @@ void SetupWizard::setupUpdateIntervalPage() "up to 16 times the value you enter here, if nobody accesses the LISa server. " "So if you enter 300 sec = 5 min here, this does not mean that LISa will ping " "your whole network every 5 minutes. The interval will increase up to 16 x 5 min = 80 min."),m_intervalPage); - info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); + info->setAlignment(AlignLeft|AlignVCenter|WordBreak); TQWidget *dummy=new TQWidget(m_intervalPage); m_intervalPage->setStretchFactor(dummy,10); m_intervalPage->setSpacing(KDialog::spacingHint()); m_intervalPage->setMargin(KDialog::marginHint()); info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"), m_intervalPage); - info->tqsetAlignment(AlignRight|AlignVCenter); + info->setAlignment(AlignRight|AlignVCenter); info->setTextFormat(TQt::RichText); setHelpEnabled( m_intervalPage, false ); @@ -338,7 +338,7 @@ void SetupWizard::setupAdvancedSettingsPage() //m_advancedPage->setMargin(KDialog::marginHint()); info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"), m_advancedPage); - info->tqsetAlignment(AlignRight|AlignVCenter); + info->setAlignment(AlignRight|AlignVCenter); connect(m_secondScan,TQT_SIGNAL(toggled(bool)),m_secondWait,TQT_SLOT(setEnabled(bool))); setHelpEnabled( m_advancedPage, false ); diff --git a/librss/article.cpp b/librss/article.cpp index 8c3fa313..4161e0d5 100644 --- a/librss/article.cpp +++ b/librss/article.cpp @@ -43,13 +43,13 @@ Article::Article(const TQDomNode &node) : d(new Private) { TQString elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) d->link = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("pubDate"))).isNull()) { + if (!(elemText = extractNode(node, TQString::fromLatin1("pubDate"))).isNull()) { time_t _time = KRFCDate::parseDate(elemText); /* \bug This isn't really the right way since it will set the date to * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that @@ -57,7 +57,7 @@ Article::Article(const TQDomNode &node) : d(new Private) */ d->pubDate.setTime_t(_time); } - if (!(elemText = extractNode(node, TQString::tqfromLatin1("dc:date"))).isNull()) { + if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull()) { time_t _time = KRFCDate::parseDateISO8601(elemText); /* \bug This isn't really the right way since it will set the date to * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that @@ -66,12 +66,12 @@ Article::Article(const TQDomNode &node) : d(new Private) d->pubDate.setTime_t(_time); } - TQDomNode n = node.namedItem(TQString::tqfromLatin1("guid")); + TQDomNode n = node.namedItem(TQString::fromLatin1("guid")); if (!n.isNull()) { d->guidIsPermaLink = true; - if (n.toElement().attribute(TQString::tqfromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false; + if (n.toElement().attribute(TQString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("guid"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("guid"))).isNull()) d->guid = elemText; } } diff --git a/librss/document.cpp b/librss/document.cpp index d6059f05..8a19aa3f 100644 --- a/librss/document.cpp +++ b/librss/document.cpp @@ -70,7 +70,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) TQDomNode rootNode = doc.documentElement(); // Determine the version of the present RSS markup. - TQString attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString()); + TQString attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString()); if (!attr.isNull()) { /* * Hardcoding these URLs is actually a bad idea, since the DTD doesn't @@ -80,33 +80,33 @@ Document::Document(const TQDomDocument &doc) : d(new Private) * distinguish the RSS versions by analyzing the relationship between * the nodes. */ - if (attr == TQString::tqfromLatin1("http://my.netscape.com/rdf/simple/0.9/")) + if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) d->version = v0_90; - else if (attr == TQString::tqfromLatin1("http://purl.org/rss/1.0/")) { + else if (attr == TQString::fromLatin1("http://purl.org/rss/1.0/")) { d->version = v1_0; } } else { - attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString()); + attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString()); if (!attr.isNull()) { - if (attr == TQString::tqfromLatin1("0.91")) + if (attr == TQString::fromLatin1("0.91")) d->version = v0_91; - else if (attr == TQString::tqfromLatin1("0.92")) + else if (attr == TQString::fromLatin1("0.92")) d->version = v0_92; - else if (attr == TQString::tqfromLatin1("0.93")) + else if (attr == TQString::fromLatin1("0.93")) d->version = v0_93; - else if (attr == TQString::tqfromLatin1("0.94")) + else if (attr == TQString::fromLatin1("0.94")) d->version = v0_94; - else if (attr == TQString::tqfromLatin1("2.0") || attr == TQString::tqfromLatin1("2")) + else if (attr == TQString::fromLatin1("2.0") || attr == TQString::fromLatin1("2")) d->version = v2_0; } } - TQDomNode channelNode = rootNode.namedItem(TQString::tqfromLatin1("channel")); + TQDomNode channelNode = rootNode.namedItem(TQString::fromLatin1("channel")); - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("title"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("description"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("link"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("link"))).isNull()) d->link = elemText; /* This is ugly but necessary since RSS 0.90 and 1.0 have a different parent @@ -118,218 +118,218 @@ Document::Document(const TQDomDocument &doc) : d(new Private) else parentNode = channelNode; - TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image")); + TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image")); if (!n.isNull()) d->image = new Image(n); - n = parentNode.namedItem(TQString::tqfromLatin1("textinput")); + n = parentNode.namedItem(TQString::fromLatin1("textinput")); if (!n.isNull()) d->textInput = new TextInput(n); // Our (hopefully faster) version of elementsByTagName() for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { const TQDomElement e = n.toElement(); - if (e.tagName() == TQString::tqfromLatin1("item")) + if (e.tagName() == TQString::fromLatin1("item")) d->articles.append(Article(e)); } - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("copyright"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull()) d->copyright = elemText; - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("language"))).isNull()) { - if (elemText == TQString::tqfromLatin1("af")) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("language"))).isNull()) { + if (elemText == TQString::fromLatin1("af")) d->language = af; - else if (elemText == TQString::tqfromLatin1("sq")) + else if (elemText == TQString::fromLatin1("sq")) d->language = sq; - else if (elemText == TQString::tqfromLatin1("eu")) + else if (elemText == TQString::fromLatin1("eu")) d->language = eu; - else if (elemText == TQString::tqfromLatin1("be")) + else if (elemText == TQString::fromLatin1("be")) d->language = be; - else if (elemText == TQString::tqfromLatin1("bg")) + else if (elemText == TQString::fromLatin1("bg")) d->language = bg; - else if (elemText == TQString::tqfromLatin1("ca")) + else if (elemText == TQString::fromLatin1("ca")) d->language = ca; - else if (elemText == TQString::tqfromLatin1("zh-cn")) + else if (elemText == TQString::fromLatin1("zh-cn")) d->language = zh_cn; - else if (elemText == TQString::tqfromLatin1("zh-tw")) + else if (elemText == TQString::fromLatin1("zh-tw")) d->language = zh_tw; - else if (elemText == TQString::tqfromLatin1("hr")) + else if (elemText == TQString::fromLatin1("hr")) d->language = hr; - else if (elemText == TQString::tqfromLatin1("cs")) + else if (elemText == TQString::fromLatin1("cs")) d->language = cs; - else if (elemText == TQString::tqfromLatin1("da")) + else if (elemText == TQString::fromLatin1("da")) d->language = da; - else if (elemText == TQString::tqfromLatin1("nl")) + else if (elemText == TQString::fromLatin1("nl")) d->language = nl; - else if (elemText == TQString::tqfromLatin1("nl-be")) + else if (elemText == TQString::fromLatin1("nl-be")) d->language = nl_be; - else if (elemText == TQString::tqfromLatin1("nl-nl")) + else if (elemText == TQString::fromLatin1("nl-nl")) d->language = nl_nl; - else if (elemText == TQString::tqfromLatin1("en")) + else if (elemText == TQString::fromLatin1("en")) d->language = en; - else if (elemText == TQString::tqfromLatin1("en-au")) + else if (elemText == TQString::fromLatin1("en-au")) d->language = en_au; - else if (elemText == TQString::tqfromLatin1("en-bz")) + else if (elemText == TQString::fromLatin1("en-bz")) d->language = en_bz; - else if (elemText == TQString::tqfromLatin1("en-ca")) + else if (elemText == TQString::fromLatin1("en-ca")) d->language = en_ca; - else if (elemText == TQString::tqfromLatin1("en-ie")) + else if (elemText == TQString::fromLatin1("en-ie")) d->language = en_ie; - else if (elemText == TQString::tqfromLatin1("en-jm")) + else if (elemText == TQString::fromLatin1("en-jm")) d->language = en_jm; - else if (elemText == TQString::tqfromLatin1("en-nz")) + else if (elemText == TQString::fromLatin1("en-nz")) d->language = en_nz; - else if (elemText == TQString::tqfromLatin1("en-ph")) + else if (elemText == TQString::fromLatin1("en-ph")) d->language = en_ph; - else if (elemText == TQString::tqfromLatin1("en-za")) + else if (elemText == TQString::fromLatin1("en-za")) d->language = en_za; - else if (elemText == TQString::tqfromLatin1("en-tt")) + else if (elemText == TQString::fromLatin1("en-tt")) d->language = en_tt; - else if (elemText == TQString::tqfromLatin1("en-gb")) + else if (elemText == TQString::fromLatin1("en-gb")) d->language = en_gb; - else if (elemText == TQString::tqfromLatin1("en-us")) + else if (elemText == TQString::fromLatin1("en-us")) d->language = en_us; - else if (elemText == TQString::tqfromLatin1("en-zw")) + else if (elemText == TQString::fromLatin1("en-zw")) d->language = en_zw; - else if (elemText == TQString::tqfromLatin1("fo")) + else if (elemText == TQString::fromLatin1("fo")) d->language = fo; - else if (elemText == TQString::tqfromLatin1("fi")) + else if (elemText == TQString::fromLatin1("fi")) d->language = fi; - else if (elemText == TQString::tqfromLatin1("fr")) + else if (elemText == TQString::fromLatin1("fr")) d->language = fr; - else if (elemText == TQString::tqfromLatin1("fr-be")) + else if (elemText == TQString::fromLatin1("fr-be")) d->language = fr_be; - else if (elemText == TQString::tqfromLatin1("fr-ca")) + else if (elemText == TQString::fromLatin1("fr-ca")) d->language = fr_ca; - else if (elemText == TQString::tqfromLatin1("fr-fr")) + else if (elemText == TQString::fromLatin1("fr-fr")) d->language = fr_fr; - else if (elemText == TQString::tqfromLatin1("fr-lu")) + else if (elemText == TQString::fromLatin1("fr-lu")) d->language = fr_lu; - else if (elemText == TQString::tqfromLatin1("fr-mc")) + else if (elemText == TQString::fromLatin1("fr-mc")) d->language = fr_mc; - else if (elemText == TQString::tqfromLatin1("fr-ch")) + else if (elemText == TQString::fromLatin1("fr-ch")) d->language = fr_ch; - else if (elemText == TQString::tqfromLatin1("gl")) + else if (elemText == TQString::fromLatin1("gl")) d->language = gl; - else if (elemText == TQString::tqfromLatin1("gd")) + else if (elemText == TQString::fromLatin1("gd")) d->language = gd; - else if (elemText == TQString::tqfromLatin1("de")) + else if (elemText == TQString::fromLatin1("de")) d->language = de; - else if (elemText == TQString::tqfromLatin1("de-at")) + else if (elemText == TQString::fromLatin1("de-at")) d->language = de_at; - else if (elemText == TQString::tqfromLatin1("de-de")) + else if (elemText == TQString::fromLatin1("de-de")) d->language = de_de; - else if (elemText == TQString::tqfromLatin1("de-li")) + else if (elemText == TQString::fromLatin1("de-li")) d->language = de_li; - else if (elemText == TQString::tqfromLatin1("de-lu")) + else if (elemText == TQString::fromLatin1("de-lu")) d->language = de_lu; - else if (elemText == TQString::tqfromLatin1("de-ch")) + else if (elemText == TQString::fromLatin1("de-ch")) d->language = de_ch; - else if (elemText == TQString::tqfromLatin1("el")) + else if (elemText == TQString::fromLatin1("el")) d->language = el; - else if (elemText == TQString::tqfromLatin1("hu")) + else if (elemText == TQString::fromLatin1("hu")) d->language = hu; - else if (elemText == TQString::tqfromLatin1("is")) + else if (elemText == TQString::fromLatin1("is")) d->language = is; - else if (elemText == TQString::tqfromLatin1("id")) + else if (elemText == TQString::fromLatin1("id")) d->language = id; - else if (elemText == TQString::tqfromLatin1("ga")) + else if (elemText == TQString::fromLatin1("ga")) d->language = ga; - else if (elemText == TQString::tqfromLatin1("it")) + else if (elemText == TQString::fromLatin1("it")) d->language = it; - else if (elemText == TQString::tqfromLatin1("it-it")) + else if (elemText == TQString::fromLatin1("it-it")) d->language = it_it; - else if (elemText == TQString::tqfromLatin1("it-ch")) + else if (elemText == TQString::fromLatin1("it-ch")) d->language = it_ch; - else if (elemText == TQString::tqfromLatin1("ja")) + else if (elemText == TQString::fromLatin1("ja")) d->language = ja; - else if (elemText == TQString::tqfromLatin1("ko")) + else if (elemText == TQString::fromLatin1("ko")) d->language = ko; - else if (elemText == TQString::tqfromLatin1("mk")) + else if (elemText == TQString::fromLatin1("mk")) d->language = mk; - else if (elemText == TQString::tqfromLatin1("no")) + else if (elemText == TQString::fromLatin1("no")) d->language = no; - else if (elemText == TQString::tqfromLatin1("pl")) + else if (elemText == TQString::fromLatin1("pl")) d->language = pl; - else if (elemText == TQString::tqfromLatin1("pt")) + else if (elemText == TQString::fromLatin1("pt")) d->language = pt; - else if (elemText == TQString::tqfromLatin1("pt-br")) + else if (elemText == TQString::fromLatin1("pt-br")) d->language = pt_br; - else if (elemText == TQString::tqfromLatin1("pt-pt")) + else if (elemText == TQString::fromLatin1("pt-pt")) d->language = pt_pt; - else if (elemText == TQString::tqfromLatin1("ro")) + else if (elemText == TQString::fromLatin1("ro")) d->language = ro; - else if (elemText == TQString::tqfromLatin1("ro-mo")) + else if (elemText == TQString::fromLatin1("ro-mo")) d->language = ro_mo; - else if (elemText == TQString::tqfromLatin1("ro-ro")) + else if (elemText == TQString::fromLatin1("ro-ro")) d->language = ro_ro; - else if (elemText == TQString::tqfromLatin1("ru")) + else if (elemText == TQString::fromLatin1("ru")) d->language = ru; - else if (elemText == TQString::tqfromLatin1("ru-mo")) + else if (elemText == TQString::fromLatin1("ru-mo")) d->language = ru_mo; - else if (elemText == TQString::tqfromLatin1("ru-ru")) + else if (elemText == TQString::fromLatin1("ru-ru")) d->language = ru_ru; - else if (elemText == TQString::tqfromLatin1("sr")) + else if (elemText == TQString::fromLatin1("sr")) d->language = sr; - else if (elemText == TQString::tqfromLatin1("sk")) + else if (elemText == TQString::fromLatin1("sk")) d->language = sk; - else if (elemText == TQString::tqfromLatin1("sl")) + else if (elemText == TQString::fromLatin1("sl")) d->language = sl; - else if (elemText == TQString::tqfromLatin1("es")) + else if (elemText == TQString::fromLatin1("es")) d->language = es; - else if (elemText == TQString::tqfromLatin1("es-ar")) + else if (elemText == TQString::fromLatin1("es-ar")) d->language = es_ar; - else if (elemText == TQString::tqfromLatin1("es-bo")) + else if (elemText == TQString::fromLatin1("es-bo")) d->language = es_bo; - else if (elemText == TQString::tqfromLatin1("es-cl")) + else if (elemText == TQString::fromLatin1("es-cl")) d->language = es_cl; - else if (elemText == TQString::tqfromLatin1("es-co")) + else if (elemText == TQString::fromLatin1("es-co")) d->language = es_co; - else if (elemText == TQString::tqfromLatin1("es-cr")) + else if (elemText == TQString::fromLatin1("es-cr")) d->language = es_cr; - else if (elemText == TQString::tqfromLatin1("es-do")) + else if (elemText == TQString::fromLatin1("es-do")) d->language = es_do; - else if (elemText == TQString::tqfromLatin1("es-ec")) + else if (elemText == TQString::fromLatin1("es-ec")) d->language = es_ec; - else if (elemText == TQString::tqfromLatin1("es-sv")) + else if (elemText == TQString::fromLatin1("es-sv")) d->language = es_sv; - else if (elemText == TQString::tqfromLatin1("es-gt")) + else if (elemText == TQString::fromLatin1("es-gt")) d->language = es_gt; - else if (elemText == TQString::tqfromLatin1("es-hn")) + else if (elemText == TQString::fromLatin1("es-hn")) d->language = es_hn; - else if (elemText == TQString::tqfromLatin1("es-mx")) + else if (elemText == TQString::fromLatin1("es-mx")) d->language = es_mx; - else if (elemText == TQString::tqfromLatin1("es-ni")) + else if (elemText == TQString::fromLatin1("es-ni")) d->language = es_ni; - else if (elemText == TQString::tqfromLatin1("es-pa")) + else if (elemText == TQString::fromLatin1("es-pa")) d->language = es_pa; - else if (elemText == TQString::tqfromLatin1("es-py")) + else if (elemText == TQString::fromLatin1("es-py")) d->language = es_py; - else if (elemText == TQString::tqfromLatin1("es-pe")) + else if (elemText == TQString::fromLatin1("es-pe")) d->language = es_pe; - else if (elemText == TQString::tqfromLatin1("es-pr")) + else if (elemText == TQString::fromLatin1("es-pr")) d->language = es_pr; - else if (elemText == TQString::tqfromLatin1("es-es")) + else if (elemText == TQString::fromLatin1("es-es")) d->language = es_es; - else if (elemText == TQString::tqfromLatin1("es-uy")) + else if (elemText == TQString::fromLatin1("es-uy")) d->language = es_uy; - else if (elemText == TQString::tqfromLatin1("es-ve")) + else if (elemText == TQString::fromLatin1("es-ve")) d->language = es_ve; - else if (elemText == TQString::tqfromLatin1("sv")) + else if (elemText == TQString::fromLatin1("sv")) d->language = sv; - else if (elemText == TQString::tqfromLatin1("sv-fi")) + else if (elemText == TQString::fromLatin1("sv-fi")) d->language = sv_fi; - else if (elemText == TQString::tqfromLatin1("sv-se")) + else if (elemText == TQString::fromLatin1("sv-se")) d->language = sv_se; - else if (elemText == TQString::tqfromLatin1("tr")) + else if (elemText == TQString::fromLatin1("tr")) d->language = tr; - else if (elemText == TQString::tqfromLatin1("uk")) + else if (elemText == TQString::fromLatin1("uk")) d->language = uk; else d->language = UndefinedLanguage; } - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("pubDate"))).isNull()) { + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("pubDate"))).isNull()) { time_t _time = KRFCDate::parseDate(elemText); /* \bug This isn't really the right way since it will set the date to * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that @@ -338,7 +338,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->pubDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("dc:date"))).isNull()) { + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("dc:date"))).isNull()) { time_t _time = KRFCDate::parseDateISO8601(elemText); /* \bug This isn't really the right way since it will set the date to * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that @@ -347,46 +347,46 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->pubDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("lastBuildDate"))).isNull()) { + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("lastBuildDate"))).isNull()) { time_t _time = KRFCDate::parseDate(elemText); d->lastBuildDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("rating"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("rating"))).isNull()) d->rating = elemText; - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("docs"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("docs"))).isNull()) d->docs = elemText; - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("managingEditor"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("managingEditor"))).isNull()) d->managingEditor = elemText; - if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("webMaster"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("webMaster"))).isNull()) d->webMaster = elemText; - n = channelNode.namedItem(TQString::tqfromLatin1("skipHours")); + n = channelNode.namedItem(TQString::fromLatin1("skipHours")); if (!n.isNull()) for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) - if (e.tagName() == TQString::tqfromLatin1("hour")) + if (e.tagName() == TQString::fromLatin1("hour")) d->skipHours.append(e.text().toUInt()); - n = channelNode.namedItem(TQString::tqfromLatin1("skipDays")); + n = channelNode.namedItem(TQString::fromLatin1("skipDays")); if (!n.isNull()) { Day day; TQString elemText; for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) - if (e.tagName() == TQString::tqfromLatin1("day")) { + if (e.tagName() == TQString::fromLatin1("day")) { elemText = e.text().lower(); - if (elemText == TQString::tqfromLatin1("monday")) + if (elemText == TQString::fromLatin1("monday")) day = Monday; - else if (elemText == TQString::tqfromLatin1("tuesday")) + else if (elemText == TQString::fromLatin1("tuesday")) day = Tuesday; - else if (elemText == TQString::tqfromLatin1("wednesday")) + else if (elemText == TQString::fromLatin1("wednesday")) day = Wednesday; - else if (elemText == TQString::tqfromLatin1("thursday")) + else if (elemText == TQString::fromLatin1("thursday")) day = Thursday; - else if (elemText == TQString::tqfromLatin1("friday")) + else if (elemText == TQString::fromLatin1("friday")) day = Friday; - else if (elemText == TQString::tqfromLatin1("saturday")) + else if (elemText == TQString::fromLatin1("saturday")) day = Saturday; - else if (elemText == TQString::tqfromLatin1("sunday")) + else if (elemText == TQString::fromLatin1("sunday")) day = Sunday; else day = UndefinedDay; @@ -410,13 +410,13 @@ Version Document::version() const TQString Document::verbVersion() const { switch (d->version) { - case v0_90: return TQString::tqfromLatin1("0.90"); - case v0_91: return TQString::tqfromLatin1("0.91"); - case v0_92: return TQString::tqfromLatin1("0.92"); - case v0_93: return TQString::tqfromLatin1("0.93"); - case v0_94: return TQString::tqfromLatin1("0.94"); - case v1_0: return TQString::tqfromLatin1("1.0"); - case v2_0: return TQString::tqfromLatin1("2.0"); + case v0_90: return TQString::fromLatin1("0.90"); + case v0_91: return TQString::fromLatin1("0.91"); + case v0_92: return TQString::fromLatin1("0.92"); + case v0_93: return TQString::fromLatin1("0.93"); + case v0_94: return TQString::fromLatin1("0.94"); + case v1_0: return TQString::fromLatin1("1.0"); + case v2_0: return TQString::fromLatin1("2.0"); } return TQString(); } diff --git a/librss/global.h b/librss/global.h index 95ca433f..c7e4cdeb 100644 --- a/librss/global.h +++ b/librss/global.h @@ -40,7 +40,7 @@ namespace RSS * Possible status values returned by the signal * Loader::loadingComplete(). */ - enum tqStatus { + enum Status { Success, /** * Nothing went wrong so far, but you still have to check * what values are returned by the classes since it's not diff --git a/librss/image.cpp b/librss/image.cpp index a1fe032c..242c65aa 100644 --- a/librss/image.cpp +++ b/librss/image.cpp @@ -47,17 +47,17 @@ Image::Image(const TQDomNode &node) : TQObject(), d(new Private) { TQString elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("url"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("url"))).isNull()) d->url = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) d->link = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("height"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("height"))).isNull()) d->height = elemText.toUInt(); - if (!(elemText = extractNode(node, TQString::tqfromLatin1("width"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("width"))).isNull()) d->width = elemText.toUInt(); } diff --git a/librss/loader.cpp b/librss/loader.cpp index b16c3d1e..e4523b07 100644 --- a/librss/loader.cpp +++ b/librss/loader.cpp @@ -197,7 +197,7 @@ Loader *Loader::create() Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), + connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), object, slot); return loader; } @@ -237,7 +237,7 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success) d->retriever = NULL; Document rssDoc; - tqStatus status = Success; + Status status = Success; if (success) { TQDomDocument doc; diff --git a/librss/loader.h b/librss/loader.h index 8eca6643..e3ae1b6f 100644 --- a/librss/loader.h +++ b/librss/loader.h @@ -197,8 +197,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), - * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, tqStatus))); + * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * @@ -222,7 +222,7 @@ namespace RSS * 'slotLoadingComplete' method might look like this: * * \code - * void MyClass::slotLoadingComplete(Loader *loader, Document doc, tqStatus status) + * void MyClass::slotLoadingComplete(Loader *loader, Document doc, Status status) * { * // Note that Loader::~Loader() is private, so you cannot delete Loader instances. * // You don't need to do that anyway since Loader instances delete themselves. @@ -304,9 +304,9 @@ namespace RSS * the case if you intend to call getPixmap() on Document::image()! * @param status A status byte telling whether there were any problems * while retrieving or parsing the data. - * @see Document, tqStatus + * @see Document, Status */ - void loadingComplete(Loader *loader, Document doc, tqStatus status); + void loadingComplete(Loader *loader, Document doc, Status status); private slots: void slotRetrieverDone(const TQByteArray &data, bool success); diff --git a/librss/testlibrss.cpp b/librss/testlibrss.cpp index d513b003..2cbbe913 100644 --- a/librss/testlibrss.cpp +++ b/librss/testlibrss.cpp @@ -10,12 +10,12 @@ using namespace RSS; void Tester::test() { Loader *loader = Loader::create(); - connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ), - this, TQT_SLOT( slotLoadingComplete( Loader *, Document, tqStatus ) ) ); + connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); loader->loadFrom( "http://sourceforge.net/export/rss2_projnews.php?group_id=29057&rss_fulltext=1", new FileRetriever ); } -void Tester::slotLoadingComplete( Loader *loader, Document doc, tqStatus status ) +void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status ) { if ( status == Success ) kdDebug() << "Successfully retrieverd '" << doc.title() << "'" << endl; diff --git a/librss/testlibrss.h b/librss/testlibrss.h index 9ec92ec7..d394abed 100644 --- a/librss/testlibrss.h +++ b/librss/testlibrss.h @@ -9,7 +9,7 @@ using RSS::Loader; using RSS::Document; -using RSS::tqStatus; +using RSS::Status; class Tester : public TQObject { @@ -19,7 +19,7 @@ class Tester : public TQObject void test(); private slots: - void slotLoadingComplete( Loader *loader, Document doc, tqStatus status ); + void slotLoadingComplete( Loader *loader, Document doc, Status status ); }; #endif diff --git a/librss/textinput.cpp b/librss/textinput.cpp index 265c93ed..f2af0940 100644 --- a/librss/textinput.cpp +++ b/librss/textinput.cpp @@ -38,13 +38,13 @@ TextInput::TextInput(const TQDomNode &node) : d(new Private) { TQString elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("name")))) + if (!(elemText = extractNode(node, TQString::fromLatin1("name")))) d->name = elemText; - if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) d->link = elemText; } diff --git a/wifi/kcmwifi/configadvanced.ui b/wifi/kcmwifi/configadvanced.ui index 3eda59d7..1e54d280 100644 --- a/wifi/kcmwifi/configadvanced.ui +++ b/wifi/kcmwifi/configadvanced.ui @@ -96,7 +96,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/wifi/kcmwifi/configcrypto.ui b/wifi/kcmwifi/configcrypto.ui index 76736675..41cfdf33 100644 --- a/wifi/kcmwifi/configcrypto.ui +++ b/wifi/kcmwifi/configcrypto.ui @@ -260,7 +260,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -310,25 +310,25 @@ <sender>le_key1</sender> <signal>textChanged(const TQString&)</signal> <receiver>ConfigCrypto</receiver> - <slot>slotUpdateKey1tqStatus(const TQString&)</slot> + <slot>slotUpdateKey1Status(const TQString&)</slot> </connection> <connection> <sender>le_key2</sender> <signal>textChanged(const TQString&)</signal> <receiver>ConfigCrypto</receiver> - <slot>slotUpdateKey2tqStatus(const TQString&)</slot> + <slot>slotUpdateKey2Status(const TQString&)</slot> </connection> <connection> <sender>le_key3</sender> <signal>textChanged(const TQString&)</signal> <receiver>ConfigCrypto</receiver> - <slot>slotUpdateKey3tqStatus(const TQString&)</slot> + <slot>slotUpdateKey3Status(const TQString&)</slot> </connection> <connection> <sender>le_key4</sender> <signal>textChanged(const TQString&)</signal> <receiver>ConfigCrypto</receiver> - <slot>slotUpdateKey4tqStatus(const TQString&)</slot> + <slot>slotUpdateKey4Status(const TQString&)</slot> </connection> </connections> <tabstops> @@ -345,10 +345,10 @@ <include location="local" impldecl="in implementation">configcrypto.ui.h</include> </includes> <Q_SLOTS> - <slot>slotUpdateKey1tqStatus( const TQString & key )</slot> - <slot>slotUpdateKey2tqStatus( const TQString & key )</slot> - <slot>slotUpdateKey3tqStatus( const TQString & key )</slot> - <slot>slotUpdateKey4tqStatus( const TQString & key )</slot> + <slot>slotUpdateKey1Status( const TQString & key )</slot> + <slot>slotUpdateKey2Status( const TQString & key )</slot> + <slot>slotUpdateKey3Status( const TQString & key )</slot> + <slot>slotUpdateKey4Status( const TQString & key )</slot> </Q_SLOTS> <functions> <function specifier="non virtual">load( const IfConfig & ifconfig )</function> diff --git a/wifi/kcmwifi/configcrypto.ui.h b/wifi/kcmwifi/configcrypto.ui.h index be561bff..acb98974 100644 --- a/wifi/kcmwifi/configcrypto.ui.h +++ b/wifi/kcmwifi/configcrypto.ui.h @@ -32,7 +32,7 @@ void ConfigCrypto::save( IfConfig &ifconfig ) } -void ConfigCrypto::slotUpdateKey1tqStatus(const TQString& key) +void ConfigCrypto::slotUpdateKey1Status(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { @@ -63,7 +63,7 @@ void ConfigCrypto::slotUpdateKey1tqStatus(const TQString& key) } } -void ConfigCrypto::slotUpdateKey2tqStatus(const TQString& key) +void ConfigCrypto::slotUpdateKey2Status(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { @@ -94,7 +94,7 @@ void ConfigCrypto::slotUpdateKey2tqStatus(const TQString& key) } } -void ConfigCrypto::slotUpdateKey3tqStatus(const TQString& key) +void ConfigCrypto::slotUpdateKey3Status(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { @@ -125,7 +125,7 @@ void ConfigCrypto::slotUpdateKey3tqStatus(const TQString& key) } } -void ConfigCrypto::slotUpdateKey4tqStatus(const TQString& key) +void ConfigCrypto::slotUpdateKey4Status(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { diff --git a/wifi/kcmwifi/ifconfigpagebase.ui b/wifi/kcmwifi/ifconfigpagebase.ui index 089284aa..f2e3df7d 100644 --- a/wifi/kcmwifi/ifconfigpagebase.ui +++ b/wifi/kcmwifi/ifconfigpagebase.ui @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>226</width> <height>20</height> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>196</width> <height>20</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>285</width> <height>20</height> @@ -286,7 +286,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>190</width> <height>20</height> @@ -354,7 +354,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>413</width> <height>20</height> @@ -392,7 +392,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>20</height> @@ -444,7 +444,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>396</width> <height>20</height> diff --git a/wifi/kcmwifi/mainconfigbase.ui b/wifi/kcmwifi/mainconfigbase.ui index 77e168c1..5fcb1dab 100644 --- a/wifi/kcmwifi/mainconfigbase.ui +++ b/wifi/kcmwifi/mainconfigbase.ui @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>146</width> <height>20</height> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>66</width> <height>20</height> diff --git a/wifi/kcmwifi/vendorconfig.cpp b/wifi/kcmwifi/vendorconfig.cpp index 395cbc58..e415c276 100644 --- a/wifi/kcmwifi/vendorconfig.cpp +++ b/wifi/kcmwifi/vendorconfig.cpp @@ -184,7 +184,7 @@ is incremented _after_ successful setup of each given config. */ TQString value = buffer.section ( ' ', 1, 1 ); kdDebug ( ) << "Variable " << var << " contains " << value << ".\n"; // evaluate the meaningful lines - if ( var.tqstartsWith ( "wireless", false ) ) + if ( var.startsWith ( "wireless", false ) ) { if ( var.endsWith ( "essid" ) ) { diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index b7d49abb..87c95b20 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -184,7 +184,7 @@ KWiFiManagerApp::slotLogESSID (TQString essid) if (!log_file.open (IO_WriteOnly | IO_Append)) kdDebug () << "Logging failed!" << endl; TQTextStream stream (&log_file); - stream << TQDateTime::tqcurrentDateTime().toString ().latin1 (); + stream << TQDateTime::currentDateTime().toString ().latin1 (); stream << " Entering network: " << essid.latin1() << endl; log_file.close (); } @@ -262,7 +262,7 @@ KWiFiManagerApp::slotChangeTrayIcon () } else if (((str == 0) && (mode == 2)) || (!validdata)) { - sstrength2.setText( TQString::tqfromLatin1("0") ); + sstrength2.setText( TQString::fromLatin1("0") ); ICON = strength->OOR_DOWN; if (led->state == true) led->Off (); @@ -286,7 +286,7 @@ KWiFiManagerApp::slotChangeTrayIcon () labelfont.setStretch( TQFont::Condensed ); labelfont.setBold( true ); sstrength2.setFont( labelfont ); - sstrength2.setFixedSize( sstrength2.tqsizeHint() ); + sstrength2.setFixedSize( sstrength2.sizeHint() ); } TQPixmap labeltemp = TQPixmap::grabWidget( &sstrength2 ); labeltemp.setMask( labeltemp.createHeuristicMask() ); @@ -363,7 +363,7 @@ KWiFiManagerApp::initView () TQGridLayout *zentraltqlayout = new TQGridLayout (view); zentraltqlayout->setMargin( KDialog::marginHint() ); speedmeter = new Speed (view, device); - status = new tqStatus (view, device); + status = new Status (view, device); location = new Locator (view, device); strength = new Strength (view, device); pictogram = new Picture (view, device); diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h index c52969ac..6a58de44 100644 --- a/wifi/kwifimanager.h +++ b/wifi/kwifimanager.h @@ -39,7 +39,7 @@ class KProcess; #include "interface_wireless.h" #include "interface_dcop.h" class Strength; -class tqStatus; +class Status; class Picture; class Locator; class Speed; @@ -115,7 +115,7 @@ private: Speed *speedmeter; TQBoxLayout *bla; TQLabel *profil; - tqStatus *status; + Status *status; Strength *strength; Picture *pictogram; Locator *location; diff --git a/wifi/locator.cpp b/wifi/locator.cpp index 6bb0cd62..2ca40398 100644 --- a/wifi/locator.cpp +++ b/wifi/locator.cpp @@ -35,12 +35,12 @@ Locator::generateLocWidget () sentence = new TQLabel (i18n ("AccessPoint: ") + whois (mac.local8Bit (), APs), this); setFixedSize (TQSize - (sentence->tqsizeHint ().width () + 2, - sentence->tqsizeHint ().height ())); + (sentence->sizeHint ().width () + 2, + sentence->sizeHint ().height ())); sentence-> setFixedSize (TQSize - (sentence->tqsizeHint ().width () + 2, - sentence->tqsizeHint ().height ())); + (sentence->sizeHint ().width () + 2, + sentence->sizeHint ().height ())); sentence->show (); widgetbild = TQPixmap::grabWidget (sentence); delete sentence; diff --git a/wifi/statistics.cpp b/wifi/statistics.cpp index 7dfe88b6..15295180 100644 --- a/wifi/statistics.cpp +++ b/wifi/statistics.cpp @@ -102,10 +102,10 @@ Statistics::paintEvent (TQPaintEvent *) { if (showStatsNoise) { statpainter->setPen (red); - statpainter->tqdrawPolyline (datensatz2, 1); + statpainter->drawPolyline (datensatz2, 1); } statpainter->setPen (blue); - statpainter->tqdrawPolyline (datensatz, 1); + statpainter->drawPolyline (datensatz, 1); } delete statpainter; } diff --git a/wifi/status.cpp b/wifi/status.cpp index 0bd45b3a..3d344800 100644 --- a/wifi/status.cpp +++ b/wifi/status.cpp @@ -22,13 +22,13 @@ #include <unistd.h> #include <sys/types.h> -tqStatus::tqStatus (TQWidget * parent, Interface_wireless * device) +Status::Status (TQWidget * parent, Interface_wireless * device) : TQWidget (parent, "KWiFiManager status") { this->device = device; } -bool tqStatus::generateStatsWidget () +bool Status::generateStatsWidget () { double freq = 0.; @@ -361,10 +361,10 @@ bool tqStatus::generateStatsWidget () else enc = new TQLabel (i18n ("active"), content); } - // content->setFixedSize (content->tqsizeHint ()); - content->setMinimumSize(content->tqsizeHint()); + // content->setFixedSize (content->sizeHint ()); + content->setMinimumSize(content->sizeHint()); if ( content->minimumWidth() < 280 ) content->setMinimumWidth( 280 ); - setFixedSize (content->tqminimumSize()); + setFixedSize (content->minimumSize()); content->show (); widgetbild = TQPixmap::grabWidget (content); delete @@ -373,7 +373,7 @@ bool tqStatus::generateStatsWidget () } void -tqStatus::paintEvent (TQPaintEvent *) +Status::paintEvent (TQPaintEvent *) { TQPainter *paintArea = new TQPainter (this); generateStatsWidget (); diff --git a/wifi/status.h b/wifi/status.h index dfdfd81d..59efff87 100644 --- a/wifi/status.h +++ b/wifi/status.h @@ -26,10 +26,10 @@ class Interface_wireless; -class tqStatus:public TQWidget +class Status:public TQWidget { public: - tqStatus (TQWidget * parent, Interface_wireless * device); + Status (TQWidget * parent, Interface_wireless * device); private: void paintEvent (TQPaintEvent *); bool generateStatsWidget (); diff --git a/wifi/strength.cpp b/wifi/strength.cpp index 4ca1dc08..38b809e6 100644 --- a/wifi/strength.cpp +++ b/wifi/strength.cpp @@ -63,7 +63,7 @@ TQSize Strength::mySizeHint () // up to now: this is the height required to get a decent logo display // now determine height of TQLabels to calculate the extra needed height TQLabel heightTest( "ABC", 0 ); - temp->setHeight( temp->height() + 2 * heightTest.tqsizeHint().height() + 10 ); + temp->setHeight( temp->height() + 2 * heightTest.sizeHint().height() + 10 ); return *temp; } @@ -149,7 +149,7 @@ Strength::updateInfo (TQPaintEvent *) else if (((strength == 0) && (mode == 2)) || (!validdata)) { sstrength1 = i18n("OUT OF RANGE"); - sstrength2 = TQString::tqfromLatin1("0"); + sstrength2 = TQString::fromLatin1("0"); strengthpainter->drawPixmap (50, 10, *OOR_DOWN); } else |