Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 031454e56009d576589c28757f6c6fcf4884095e.

1 files changed, 17 insertions, 17 deletions

diff --git a/src/groupview.cpp b/src/groupview.cpp
index 24e945c..a392eca 100644
--- a/src/groupview.cpp
+++ b/src/groupview.cpp
@@ -57,8 +57,8 @@ GroupView::GroupView(TQWidget* parent_, const char* name_/*=0*/)
   connect(this, TQT_SIGNAL(collapsed(TQListViewItem*)),
           TQT_SLOT(slotCollapsed(TQListViewItem*)));
 
-  m_groupOpenPixmap = SmallIcon(TQString::fromLatin1("folder_open"));
-  m_groupClosedPixmap = SmallIcon(TQString::fromLatin1("folder"));
+  m_groupOpenPixmap = SmallIcon(TQString::tqfromLatin1("folder_open"));
+  m_groupClosedPixmap = SmallIcon(TQString::tqfromLatin1("folder"));
 }
 
 Tellico::EntryGroupItem* GroupView::addGroup(Data::EntryGroup* group_) {
@@ -71,7 +71,7 @@ Tellico::EntryGroupItem* GroupView::addGroup(Data::EntryGroup* group_) {
   }
   EntryGroupItem* item = new EntryGroupItem(this, group_, type);
   if(group_->groupName() == i18n(Data::Collection::s_emptyGroupTitle)) {
-    item->setPixmap(0, SmallIcon(TQString::fromLatin1("folder_red")));
+    item->setPixmap(0, SmallIcon(TQString::tqfromLatin1("folder_red")));
     item->setSortWeight(10);
   } else {
     item->setPixmap(0, m_groupClosedPixmap);
@@ -248,11 +248,11 @@ void GroupView::contextMenuRequested(TQListViewItem* item_, const TQPoint& point
   KPopupMenu menu(this);
   GUI::ListViewItem* item = static_cast<GUI::ListViewItem*>(item_);
   if(item->isEntryGroupItem()) {
-    menu.insertItem(SmallIconSet(TQString::fromLatin1("2downarrow")),
+    menu.insertItem(SmallIconSet(TQString::tqfromLatin1("2downarrow")),
                     i18n("Expand All Groups"), this, TQT_SLOT(slotExpandAll()));
-    menu.insertItem(SmallIconSet(TQString::fromLatin1("2uparrow")),
+    menu.insertItem(SmallIconSet(TQString::tqfromLatin1("2uparrow")),
                     i18n("Collapse All Groups"), this, TQT_SLOT(slotCollapseAll()));
-    menu.insertItem(SmallIconSet(TQString::fromLatin1("filter")),
+    menu.insertItem(SmallIconSet(TQString::tqfromLatin1("filter")),
                     i18n("Filter by Group"), this, TQT_SLOT(slotFilterGroup()));
   } else if(item->isEntryItem()) {
     Controller::self()->plugEntryActions(&menu);
@@ -264,7 +264,7 @@ void GroupView::slotCollapsed(TQListViewItem* item_) {
   // only change icon for group items
   if(static_cast<GUI::ListViewItem*>(item_)->isEntryGroupItem()) {
     if(item_->text(0) == i18n(Data::Collection::s_emptyGroupTitle)) {
-      item_->setPixmap(0, SmallIcon(TQString::fromLatin1("folder_red")));
+      item_->setPixmap(0, SmallIcon(TQString::tqfromLatin1("folder_red")));
     } else {
       item_->setPixmap(0, m_groupClosedPixmap);
     }
@@ -281,7 +281,7 @@ void GroupView::slotExpanded(TQListViewItem* item_) {
 
   setUpdatesEnabled(false);
   if(item->text(0) == i18n(Data::Collection::s_emptyGroupTitle)) {
-    item->setPixmap(0, SmallIcon(TQString::fromLatin1("folder_red_open")));
+    item->setPixmap(0, SmallIcon(TQString::tqfromLatin1("folder_red_open")));
   } else {
     item->setPixmap(0, m_groupOpenPixmap);
   }
@@ -316,11 +316,11 @@ void GroupView::addCollection(Data::CollPtr coll_) {
   // when the coll gets set for the first time, the pixmaps need to be updated
   if((m_coll->hasField(m_groupBy) && m_coll->fieldByName(m_groupBy)->formatFlag() == Data::Field::FormatName)
      || m_groupBy == Data::Collection::s_peopleGroupName) {
-    m_groupOpenPixmap = UserIcon(TQString::fromLatin1("person-open"));
-    m_groupClosedPixmap = UserIcon(TQString::fromLatin1("person"));
+    m_groupOpenPixmap = UserIcon(TQString::tqfromLatin1("person-open"));
+    m_groupClosedPixmap = UserIcon(TQString::tqfromLatin1("person"));
   }
 
-  Data::FieldPtr f = coll_->fieldByName(TQString::fromLatin1("title"));
+  Data::FieldPtr f = coll_->fieldByName(TQString::tqfromLatin1("title"));
   if(f) {
     setComparison(0, ListViewComparison::create(f));
   }
@@ -344,11 +344,11 @@ void GroupView::setGroupField(const TQString& groupField_) {
   }
   if((m_coll->hasField(groupField_) && m_coll->fieldByName(groupField_)->formatFlag() == Data::Field::FormatName)
      || groupField_ == Data::Collection::s_peopleGroupName) {
-    m_groupOpenPixmap = UserIcon(TQString::fromLatin1("person-open"));
-    m_groupClosedPixmap = UserIcon(TQString::fromLatin1("person"));
+    m_groupOpenPixmap = UserIcon(TQString::tqfromLatin1("person-open"));
+    m_groupClosedPixmap = UserIcon(TQString::tqfromLatin1("person"));
   } else {
-    m_groupOpenPixmap = SmallIcon(TQString::fromLatin1("folder_open"));
-    m_groupClosedPixmap = SmallIcon(TQString::fromLatin1("folder"));
+    m_groupOpenPixmap = SmallIcon(TQString::tqfromLatin1("folder_open"));
+    m_groupClosedPixmap = SmallIcon(TQString::tqfromLatin1("folder"));
   }
   updateHeader();
   populateCollection();
@@ -463,7 +463,7 @@ void GroupView::updateHeader(Data::FieldPtr field_/*=0*/) {
   if(sortStyle() == ListView::SortByText) {
     setColumnText(0, t);
   } else {
-    setColumnText(0, i18n("%1 (Sort by Count)").arg(t));
+    setColumnText(0, i18n("%1 (Sort by Count)").tqarg(t));
   }
 }
 
@@ -486,7 +486,7 @@ void GroupView::resetComparisons() {
   if(!m_coll) {
     return;
   }
-  Data::FieldPtr f = m_coll->fieldByName(TQString::fromLatin1("title"));
+  Data::FieldPtr f = m_coll->fieldByName(TQString::tqfromLatin1("title"));
   if(f) {
     setComparison(0, ListViewComparison::create(f));
   }