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/commands/updateentries.cpp | |
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/commands/updateentries.cpp')
-rw-r--r-- | src/commands/updateentries.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/commands/updateentries.cpp b/src/commands/updateentries.cpp index cb2f850..6b53102 100644 --- a/src/commands/updateentries.cpp +++ b/src/commands/updateentries.cpp @@ -37,7 +37,7 @@ public: virtual void execute() {} // does nothing virtual void unexecute() {} // does nothing - virtual QString name() const { return QString(); } + virtual TQString name() const { return TQString(); } Data::EntryPtr oldEntry() const { return m_oldEntry; } private: @@ -47,7 +47,7 @@ private: } UpdateEntries::UpdateEntries(Data::CollPtr coll_, Data::EntryPtr oldEntry_, Data::EntryPtr newEntry_, bool overWrite_) - : Group(i18n("Modify (Entry Title)", "Modify %1").arg(newEntry_->title())) + : Group(i18n("Modify (Entry Title)", "Modify %1").tqarg(newEntry_->title())) , m_coll(coll_) , m_oldEntry(oldEntry_) , m_newEntry(newEntry_) @@ -61,7 +61,7 @@ void UpdateEntries::execute() { // do this here instead of the constructor because several UpdateEntries may be in one command // and I don't want to add new fields multiple times - QPair<Data::FieldVec, Data::FieldVec> p = Kernel::self()->mergeFields(m_coll, + TQPair<Data::FieldVec, Data::FieldVec> p = Kernel::self()->mergeFields(m_coll, m_newEntry->collection()->fields(), m_newEntry); Data::FieldVec modifiedFields = p.first; |