summaryrefslogtreecommitdiffstats
path: root/src/commands
diff options
context:
space:
mode:
Diffstat (limited to 'src/commands')
-rw-r--r--src/commands/addentries.cpp6
-rw-r--r--src/commands/addentries.h2
-rw-r--r--src/commands/addloans.cpp10
-rw-r--r--src/commands/addloans.h2
-rw-r--r--src/commands/collectioncommand.cpp4
-rw-r--r--src/commands/collectioncommand.h2
-rw-r--r--src/commands/fieldcommand.cpp10
-rw-r--r--src/commands/fieldcommand.h2
-rw-r--r--src/commands/filtercommand.cpp4
-rw-r--r--src/commands/filtercommand.h2
-rw-r--r--src/commands/group.cpp2
-rw-r--r--src/commands/group.h4
-rw-r--r--src/commands/modifyentries.cpp6
-rw-r--r--src/commands/modifyentries.h2
-rw-r--r--src/commands/modifyloans.cpp2
-rw-r--r--src/commands/modifyloans.h2
-rw-r--r--src/commands/removeentries.cpp4
-rw-r--r--src/commands/removeentries.h2
-rw-r--r--src/commands/removeloans.cpp4
-rw-r--r--src/commands/removeloans.h2
-rw-r--r--src/commands/renamecollection.cpp4
-rw-r--r--src/commands/renamecollection.h8
-rw-r--r--src/commands/reorderfields.cpp2
-rw-r--r--src/commands/reorderfields.h2
-rw-r--r--src/commands/updateentries.cpp6
25 files changed, 48 insertions, 48 deletions
diff --git a/src/commands/addentries.cpp b/src/commands/addentries.cpp
index 6cd7636..9460ebd 100644
--- a/src/commands/addentries.cpp
+++ b/src/commands/addentries.cpp
@@ -37,7 +37,7 @@ void AddEntries::execute() {
// now check for default values
Data::FieldVec fields = m_coll->fields();
for(Data::FieldVec::Iterator field = fields.begin(); field != fields.end(); ++field) {
- const QString defaultValue = field->defaultValue();
+ const TQString defaultValue = field->defaultValue();
if(!defaultValue.isEmpty()) {
for(Data::EntryVec::Iterator entry = m_entries.begin(); entry != m_entries.end(); ++entry) {
if(entry->field(field).isEmpty()) {
@@ -58,7 +58,7 @@ void AddEntries::unexecute() {
Controller::self()->removedEntries(m_entries);
}
-QString AddEntries::name() const {
+TQString AddEntries::name() const {
return m_entries.count() > 1 ? i18n("Add Entries")
- : i18n("Add (Entry Title)", "Add %1").arg(m_entries.begin()->title());
+ : i18n("Add (Entry Title)", "Add %1").tqarg(m_entries.begin()->title());
}
diff --git a/src/commands/addentries.h b/src/commands/addentries.h
index 54d8e29..12f6441 100644
--- a/src/commands/addentries.h
+++ b/src/commands/addentries.h
@@ -31,7 +31,7 @@ public:
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
+ virtual TQString name() const;
private:
Data::CollPtr m_coll;
diff --git a/src/commands/addloans.cpp b/src/commands/addloans.cpp
index dab67d7..8b9bc27 100644
--- a/src/commands/addloans.cpp
+++ b/src/commands/addloans.cpp
@@ -41,7 +41,7 @@ void AddLoans::execute() {
bool wasEmpty = m_borrower->isEmpty();
// if there's no loaned field, we'll add one
- bool loanExisted = m_loans.begin()->entry()->collection()->hasField(QString::fromLatin1("loaned"));
+ bool loanExisted = m_loans.begin()->entry()->collection()->hasField(TQString::tqfromLatin1("loaned"));
m_addedLoanField = false; // assume we didn't add the field yet
// add the loans to the borrower
@@ -54,7 +54,7 @@ void AddLoans::execute() {
}
if(!loanExisted) {
Data::CollPtr c = m_loans.begin()->entry()->collection();
- Data::FieldPtr f = c->fieldByName(QString::fromLatin1("loaned"));
+ Data::FieldPtr f = c->fieldByName(TQString::tqfromLatin1("loaned"));
if(f) {
// notify everything that a new field was added
Controller::self()->addedField(c, f);
@@ -89,7 +89,7 @@ void AddLoans::unexecute() {
}
if(m_addedLoanField) {
Data::CollPtr c = m_loans.begin()->entry()->collection();
- Data::FieldPtr f = c->fieldByName(QString::fromLatin1("loaned"));
+ Data::FieldPtr f = c->fieldByName(TQString::tqfromLatin1("loaned"));
if(f) {
c->removeField(f);
Controller::self()->removedField(c, f);
@@ -104,7 +104,7 @@ void AddLoans::unexecute() {
Controller::self()->modifiedBorrower(m_borrower);
}
-QString AddLoans::name() const {
+TQString AddLoans::name() const {
return m_loans.count() > 1 ? i18n("Check-out Items")
- : i18n("Check-out (Entry Title)", "Check-out %1").arg(m_loans.begin()->entry()->title());
+ : i18n("Check-out (Entry Title)", "Check-out %1").tqarg(m_loans.begin()->entry()->title());
}
diff --git a/src/commands/addloans.h b/src/commands/addloans.h
index b80cbc3..b0db3ae 100644
--- a/src/commands/addloans.h
+++ b/src/commands/addloans.h
@@ -32,7 +32,7 @@ public:
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
+ virtual TQString name() const;
private:
Data::BorrowerPtr m_borrower;
diff --git a/src/commands/collectioncommand.cpp b/src/commands/collectioncommand.cpp
index 8955ea0..3d4e354 100644
--- a/src/commands/collectioncommand.cpp
+++ b/src/commands/collectioncommand.cpp
@@ -104,7 +104,7 @@ void CollectionCommand::unexecute() {
}
}
-QString CollectionCommand::name() const {
+TQString CollectionCommand::name() const {
switch(m_mode) {
case Append:
return i18n("Append Collection");
@@ -114,7 +114,7 @@ QString CollectionCommand::name() const {
return i18n("Replace Collection");
}
// hush warnings
- return QString::null;
+ return TQString();
}
void CollectionCommand::copyFields() {
diff --git a/src/commands/collectioncommand.h b/src/commands/collectioncommand.h
index ad0b2f4..38b4cbf 100644
--- a/src/commands/collectioncommand.h
+++ b/src/commands/collectioncommand.h
@@ -38,7 +38,7 @@ public:
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
+ virtual TQString name() const;
private:
void copyFields();
diff --git a/src/commands/fieldcommand.cpp b/src/commands/fieldcommand.cpp
index 6902e15..5ba080b 100644
--- a/src/commands/fieldcommand.cpp
+++ b/src/commands/fieldcommand.cpp
@@ -98,15 +98,15 @@ void FieldCommand::unexecute() {
}
}
-QString FieldCommand::name() const {
+TQString FieldCommand::name() const {
switch(m_mode) {
case FieldAdd:
- return i18n("Add %1 Field").arg(m_activeField->title());
+ return i18n("Add %1 Field").tqarg(m_activeField->title());
case FieldModify:
- return i18n("Modify %1 Field").arg(m_activeField->title());
+ return i18n("Modify %1 Field").tqarg(m_activeField->title());
case FieldRemove:
- return i18n("Delete %1 Field").arg(m_activeField->title());
+ return i18n("Delete %1 Field").tqarg(m_activeField->title());
}
// hush warnings
- return QString::null;
+ return TQString();
}
diff --git a/src/commands/fieldcommand.h b/src/commands/fieldcommand.h
index 0e5706f..c01c4a0 100644
--- a/src/commands/fieldcommand.h
+++ b/src/commands/fieldcommand.h
@@ -37,7 +37,7 @@ public:
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
+ virtual TQString name() const;
private:
Mode m_mode;
diff --git a/src/commands/filtercommand.cpp b/src/commands/filtercommand.cpp
index ba205e5..c95db13 100644
--- a/src/commands/filtercommand.cpp
+++ b/src/commands/filtercommand.cpp
@@ -92,7 +92,7 @@ void FilterCommand::unexecute() {
}
}
-QString FilterCommand::name() const {
+TQString FilterCommand::name() const {
switch(m_mode) {
case FilterAdd:
return i18n("Add Filter");
@@ -102,5 +102,5 @@ QString FilterCommand::name() const {
return i18n("Delete Filter");
}
// hush warnings
- return QString::null;
+ return TQString();
}
diff --git a/src/commands/filtercommand.h b/src/commands/filtercommand.h
index 93aa629..ff7daab 100644
--- a/src/commands/filtercommand.h
+++ b/src/commands/filtercommand.h
@@ -37,7 +37,7 @@ public:
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
+ virtual TQString name() const;
private:
Mode m_mode;
diff --git a/src/commands/group.cpp b/src/commands/group.cpp
index fd9cd76..eca542e 100644
--- a/src/commands/group.cpp
+++ b/src/commands/group.cpp
@@ -15,7 +15,7 @@
using Tellico::Command::Group;
-QString Group::name() const {
+TQString Group::name() const {
if(m_commands.count() == 1) {
return m_commands.getFirst()->name();
}
diff --git a/src/commands/group.h b/src/commands/group.h
index dc87bf9..6b48d5f 100644
--- a/src/commands/group.h
+++ b/src/commands/group.h
@@ -25,9 +25,9 @@ namespace Tellico {
class Group : public KMacroCommand {
public:
- Group(const QString& name) : KMacroCommand(name) {}
+ Group(const TQString& name) : KMacroCommand(name) {}
- virtual QString name() const;
+ virtual TQString name() const;
bool isEmpty() const { return m_commands.count() == 0; }
};
diff --git a/src/commands/modifyentries.cpp b/src/commands/modifyentries.cpp
index 895348e..9d8712a 100644
--- a/src/commands/modifyentries.cpp
+++ b/src/commands/modifyentries.cpp
@@ -44,7 +44,7 @@ void ModifyEntries::execute() {
}
// loans expose a field named "loaned", and the user might modify that without
// checking in the loan, so verify that. Heavy-handed, yes...
- const QString loaned = QString::fromLatin1("loaned");
+ const TQString loaned = TQString::tqfromLatin1("loaned");
bool hasLoanField = m_coll->hasField(loaned);
for(Data::EntryVecIt entry = m_entries.begin(); hasLoanField && entry != m_entries.end(); ++entry) {
if(entry->field(loaned).isEmpty()) {
@@ -68,9 +68,9 @@ void ModifyEntries::unexecute() {
//TODO: need to tell edit dialog that it's not modified
}
-QString ModifyEntries::name() const {
+TQString ModifyEntries::name() const {
return m_entries.count() > 1 ? i18n("Modify Entries")
- : i18n("Modify (Entry Title)", "Modify %1").arg(m_entries.begin()->title());
+ : i18n("Modify (Entry Title)", "Modify %1").tqarg(m_entries.begin()->title());
}
void ModifyEntries::swapValues() {
diff --git a/src/commands/modifyentries.h b/src/commands/modifyentries.h
index 4dfbda1..cf0699c 100644
--- a/src/commands/modifyentries.h
+++ b/src/commands/modifyentries.h
@@ -31,7 +31,7 @@ public:
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
+ virtual TQString name() const;
private:
void swapValues();
diff --git a/src/commands/modifyloans.cpp b/src/commands/modifyloans.cpp
index f8976e4..ebddfbc 100644
--- a/src/commands/modifyloans.cpp
+++ b/src/commands/modifyloans.cpp
@@ -71,6 +71,6 @@ void ModifyLoans::unexecute() {
}
}
-QString ModifyLoans::name() const {
+TQString ModifyLoans::name() const {
return i18n("Modify Loan");
}
diff --git a/src/commands/modifyloans.h b/src/commands/modifyloans.h
index 6f531ce..8f9534a 100644
--- a/src/commands/modifyloans.h
+++ b/src/commands/modifyloans.h
@@ -31,7 +31,7 @@ public:
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
+ virtual TQString name() const;
private:
Data::LoanPtr m_oldLoan;
diff --git a/src/commands/removeentries.cpp b/src/commands/removeentries.cpp
index 8d77fb6..bf2676b 100644
--- a/src/commands/removeentries.cpp
+++ b/src/commands/removeentries.cpp
@@ -44,7 +44,7 @@ void RemoveEntries::unexecute() {
Controller::self()->addedEntries(m_entries);
}
-QString RemoveEntries::name() const {
+TQString RemoveEntries::name() const {
return m_entries.count() > 1 ? i18n("Delete Entries")
- : i18n("Delete (Entry Title)", "Delete %1").arg(m_entries.begin()->title());
+ : i18n("Delete (Entry Title)", "Delete %1").tqarg(m_entries.begin()->title());
}
diff --git a/src/commands/removeentries.h b/src/commands/removeentries.h
index 71c5ed4..6c77d9d 100644
--- a/src/commands/removeentries.h
+++ b/src/commands/removeentries.h
@@ -31,7 +31,7 @@ public:
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
+ virtual TQString name() const;
private:
Data::CollPtr m_coll;
diff --git a/src/commands/removeloans.cpp b/src/commands/removeloans.cpp
index 5ceadc9..7ee321b 100644
--- a/src/commands/removeloans.cpp
+++ b/src/commands/removeloans.cpp
@@ -75,7 +75,7 @@ void RemoveLoans::unexecute() {
}
}
-QString RemoveLoans::name() const {
+TQString RemoveLoans::name() const {
return m_loans.count() > 1 ? i18n("Check-in Entries")
- : i18n("Check-in (Entry Title)", "Check-in %1").arg(m_loans.begin()->entry()->title());
+ : i18n("Check-in (Entry Title)", "Check-in %1").tqarg(m_loans.begin()->entry()->title());
}
diff --git a/src/commands/removeloans.h b/src/commands/removeloans.h
index 5b578b7..e1c32ca 100644
--- a/src/commands/removeloans.h
+++ b/src/commands/removeloans.h
@@ -31,7 +31,7 @@ public:
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
+ virtual TQString name() const;
private:
Data::LoanVec m_loans;
diff --git a/src/commands/renamecollection.cpp b/src/commands/renamecollection.cpp
index b2fcc39..9aaf022 100644
--- a/src/commands/renamecollection.cpp
+++ b/src/commands/renamecollection.cpp
@@ -19,7 +19,7 @@
using Tellico::Command::RenameCollection;
-RenameCollection::RenameCollection(Data::CollPtr coll_, const QString& newTitle_)
+RenameCollection::RenameCollection(Data::CollPtr coll_, const TQString& newTitle_)
: KCommand()
, m_coll(coll_)
, m_newTitle(newTitle_)
@@ -41,6 +41,6 @@ void RenameCollection::unexecute() {
Data::Document::self()->renameCollection(m_oldTitle);
}
-QString RenameCollection::name() const {
+TQString RenameCollection::name() const {
return i18n("Rename Collection");
}
diff --git a/src/commands/renamecollection.h b/src/commands/renamecollection.h
index bdbb64c..501c290 100644
--- a/src/commands/renamecollection.h
+++ b/src/commands/renamecollection.h
@@ -26,16 +26,16 @@ namespace Tellico {
*/
class RenameCollection : public KCommand {
public:
- RenameCollection(Data::CollPtr coll, const QString& newTitle);
+ RenameCollection(Data::CollPtr coll, const TQString& newTitle);
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
+ virtual TQString name() const;
private:
Data::CollPtr m_coll;
- QString m_oldTitle;
- QString m_newTitle;
+ TQString m_oldTitle;
+ TQString m_newTitle;
};
} // end namespace
diff --git a/src/commands/reorderfields.cpp b/src/commands/reorderfields.cpp
index 0c9f7fe..cefb946 100644
--- a/src/commands/reorderfields.cpp
+++ b/src/commands/reorderfields.cpp
@@ -50,6 +50,6 @@ void ReorderFields::unexecute() {
Controller::self()->reorderedFields(m_coll);
}
-QString ReorderFields::name() const {
+TQString ReorderFields::name() const {
return i18n("Reorder Fields");
}
diff --git a/src/commands/reorderfields.h b/src/commands/reorderfields.h
index 6a59050..6fb553f 100644
--- a/src/commands/reorderfields.h
+++ b/src/commands/reorderfields.h
@@ -31,7 +31,7 @@ public:
virtual void execute();
virtual void unexecute();
- virtual QString name() const;
+ virtual TQString name() const;
private:
Data::CollPtr m_coll;
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;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-20 16:35:49 +0000