diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-02 06:40:27 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-02 06:40:27 +0000 |
| commit | 2595a15ebeb6fc46b7cb241d01ec0c2460ec2111 (patch) | |
| tree | 18a8f0f4ac5a86dacfa74c3537551ec39bc85e75 /src/entrymerger.h | |
| parent | 1d90725a4001fab9d3922b2cbcceeee5e2d1686f (diff) | |
| download | tellico-2595a15ebeb6fc46b7cb241d01ec0c2460ec2111.tar.gz tellico-2595a15ebeb6fc46b7cb241d01ec0c2460ec2111.zip | |
TQt4 port tellico
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/tellico@1239054 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/entrymerger.h')
| -rw-r--r-- | src/entrymerger.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/entrymerger.h b/src/entrymerger.h index 46e23ca..795c668 100644 --- a/src/entrymerger.h +++ b/src/entrymerger.h @@ -16,17 +16,18 @@ #include "datavectors.h" -#include <qobject.h> +#include <tqobject.h> namespace Tellico { /** * @author Robby Stephenson */ -class EntryMerger : public QObject { +class EntryMerger : public TQObject { Q_OBJECT + TQ_OBJECT public: - EntryMerger(Data::EntryVec entries, QObject* parent); + EntryMerger(Data::EntryVec entries, TQObject* tqparent); public slots: void slotCancel(); |