From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: TQt4 port koffice This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- karbon/commands/vcommand.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'karbon/commands/vcommand.h') diff --git a/karbon/commands/vcommand.h b/karbon/commands/vcommand.h index 254e27eb..36c63996 100644 --- a/karbon/commands/vcommand.h +++ b/karbon/commands/vcommand.h @@ -24,8 +24,8 @@ //#include -#include -#include +#include +#include #include "vvisitor.h" @@ -48,7 +48,7 @@ public: * @param name the name of the command (appears in command history) * @param icon the icon of the command (appears in command history) */ - VCommand( VDocument* doc, const QString& name, const QString& icon = "14_action" ) + VCommand( VDocument* doc, const TQString& name, const TQString& icon = "14_action" ) : m_document( doc ), m_name( name ), m_icon( icon ) { // A crash because of an assert() is not much better than an crash because of a null @@ -88,7 +88,7 @@ public: * * @return the command name */ - QString name() const + TQString name() const { return m_name; } @@ -98,7 +98,7 @@ public: * * @param name the new command name */ - void setName( const QString& name ) + void setName( const TQString& name ) { m_name = name; } @@ -108,7 +108,7 @@ public: * * @return the command icon */ - QString icon() const + TQString icon() const { return m_icon; } @@ -126,8 +126,8 @@ public: private: VDocument* m_document; - QString m_name; - QString m_icon; + TQString m_name; + TQString m_icon; }; /** @@ -140,9 +140,10 @@ private: * oldest undone command. That makes it possible to go back and forth to a * specific document state. */ -class VCommandHistory : public QObject +class VCommandHistory : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -219,7 +220,7 @@ public: * * @return pointer to the list of commands */ - const QPtrList* commands() const + const TQPtrList* commands() const { return & m_commands; } @@ -310,7 +311,7 @@ private: unsigned int m_redoLimit; KAction *m_undo; KAction *m_redo; - QPtrList m_commands; + TQPtrList m_commands; int m_savedPos; }; -- cgit v1.2.1