From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/libkopete/private/kopeteemoticons.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'kopete/libkopete/private/kopeteemoticons.h') diff --git a/kopete/libkopete/private/kopeteemoticons.h b/kopete/libkopete/private/kopeteemoticons.h index 762a02a0..d9353189 100644 --- a/kopete/libkopete/private/kopeteemoticons.h +++ b/kopete/libkopete/private/kopeteemoticons.h @@ -26,16 +26,17 @@ namespace Kopete { -class KOPETE_EXPORT Emoticons : public QObject +class KOPETE_EXPORT Emoticons : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor: DON'T use it if you want to use the emoticon theme * chosen by the user. * Instead, use @ref Kopete::Emoticons::self() **/ - Emoticons( const TQString &theme = TQString::null ); + Emoticons( const TQString &theme = TQString() ); ~Emoticons( ); @@ -88,9 +89,9 @@ public: Token( TokenType t, const TQString &m, const TQString &p, const TQString &html ) : type( t ), text( m ), picPath( p ), picHTMLCode( html ) {} TokenType type; - QString text; - QString picPath; - QString picHTMLCode; + TQString text; + TQString picPath; + TQString picHTMLCode; }; @@ -119,7 +120,7 @@ public: * 4- /path/to/kiss.png * Note: quotation marks are used to emphasize white spaces. * @param message is the message to tokenize - * @param mode is a bitmask of ParseMode enum + * @param mode is a bittqmask of ParseMode enum * @return a TQValueList which consiste of ordered tokens of the text. * @author Engin AYDOGAN < engin@bzzzt.biz > * @since 23-03-05 @@ -180,7 +181,7 @@ private slots: * Fills the map with paths and emoticons * This needs to be done on every emoticon-theme change **/ - void initEmoticons ( const TQString &theme = TQString::null ); + void initEmoticons ( const TQString &theme = TQString() ); }; -- cgit v1.2.1