diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:34 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:34 -0600 |
| commit | 83677e35509b4dafac63b76995652bdf3b49f209 (patch) | |
| tree | 591f1dc22278addb439726c42896376b17bb42bd /kopete/libkopete/private/kopeteviewmanager.cpp | |
| parent | 808e453c56036211f57482ed847d54aca01bba68 (diff) | |
| download | tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.tar.gz tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
Diffstat (limited to 'kopete/libkopete/private/kopeteviewmanager.cpp')
| -rw-r--r-- | kopete/libkopete/private/kopeteviewmanager.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 486558b7..7023729c 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <klocale.h> #include <tqptrlist.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <kplugininfo.h> #include <knotification.h> #include <kglobal.h> @@ -132,7 +132,7 @@ KopeteView *KopeteViewManager::view( Kopete::ChatSession* session, const TQStrin } if( !viewPlugin ) - viewPlugin = (Kopete::ViewPlugin*)pluginManager->loadPlugin( TQString::fromLatin1("kopete_chatwindow") ); + viewPlugin = (Kopete::ViewPlugin*)pluginManager->loadPlugin( TQString::tqfromLatin1("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->topLevelWidget()->winId(), NET::WMDesktop ).isOnCurrentDesktop()); + appendMessageEvent = appendMessageEvent && (!d->queueOnlyMessagesOnAnotherDesktop || !KWin::windowInfo( w->tqtopLevelWidget()->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::fromLatin1("..."); + msgText = msgText.left(88) + TQString::tqfromLatin1("..."); TQString event; TQString body =i18n( "<qt>Incoming message from %1<br>\"%2\"</qt>" ); @@ -227,16 +227,16 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi switch( msg.importance() ) { case Kopete::Message::Low: - event = TQString::fromLatin1( "kopete_contact_lowpriority" ); + event = TQString::tqfromLatin1( "kopete_contact_lowpriority" ); break; case Kopete::Message::Highlight: - event = TQString::fromLatin1( "kopete_contact_highlight" ); + event = TQString::tqfromLatin1( "kopete_contact_highlight" ); body = i18n( "<qt>A highlighted message arrived from %1<br>\"%2\"</qt>" ); break; default: - event = TQString::fromLatin1( "kopete_contact_incoming" ); + event = TQString::tqfromLatin1( "kopete_contact_incoming" ); } - KNotification *notify=KNotification::event(msg.from()->metaContact() , event, body.arg( TQStyleSheet::escape(msgFrom), TQStyleSheet::escape(msgText) ), 0, /*msg.from()->metaContact(),*/ + KNotification *notify=KNotification::event(msg.from()->metaContact() , event, body.tqarg( TQStyleSheet::escape(msgFrom), TQStyleSheet::escape(msgText) ), 0, /*msg.from()->metaContact(),*/ w , i18n("View") ); connect(notify,TQT_SIGNAL(activated(unsigned int )), manager , TQT_SLOT(raiseView()) ); |