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

This reverts commit 031454e56009d576589c28757f6c6fcf4884095e.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp
index 4b60540..cf233bd 100644
--- a/src/translators/csvimporter.cpp
+++ b/src/translators/csvimporter.cpp
@@ -37,7 +37,7 @@ extern "C" {
 #include <kmessagebox.h>
 
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
@@ -99,7 +99,7 @@ CSVImporter::CSVImporter(const KURL& url_) : Tellico::Import::TextImporter(url_)
     m_coll(0),
     m_existingCollection(0),
     m_firstRowHeader(false),
-    m_delimiter(TQString::fromLatin1(",")),
+    m_delimiter(TQString::tqfromLatin1(",")),
     m_cancelled(false),
     m_widget(0),
     m_table(0),
@@ -202,7 +202,7 @@ Tellico::Data::CollPtr CSVImporter::collection() {
   }
 
   {
-    KConfigGroup config(KGlobal::config(), TQString::fromLatin1("ImportOptions - CSV"));
+    KConfigGroup config(KGlobal::config(), TQString::tqfromLatin1("ImportOptions - CSV"));
     config.writeEntry("Delimiter", m_delimiter);
     config.writeEntry("First Row Titles", m_firstRowHeader);
   }
@@ -238,8 +238,8 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) {
 
   TQHBox* hbox2 = new TQHBox(group);
   m_delimiterGroup = new TQButtonGroup(0, Qt::Vertical, i18n("Delimiter"), hbox2);
-  TQGridLayout* m_delimiterGroupLayout = new TQGridLayout(m_delimiterGroup->layout(), 3, 3);
-  m_delimiterGroupLayout->setAlignment(TQt::AlignTop);
+  TQGridLayout* m_delimiterGroupLayout = new TQGridLayout(m_delimiterGroup->tqlayout(), 3, 3);
+  m_delimiterGroupLayout->tqsetAlignment(TQt::AlignTop);
   TQWhatsThis::add(m_delimiterGroup, i18n("In addition to a comma, other characters may be used as "
                                          "a delimiter, separating each value in the file."));
   connect(m_delimiterGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotDelimiter()));
@@ -314,13 +314,13 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) {
 
   m_setColumnBtn = new KPushButton(i18n("&Assign Field"), hbox);
   hlay->addWidget(m_setColumnBtn);
-  m_setColumnBtn->setIconSet(SmallIconSet(TQString::fromLatin1("apply")));
+  m_setColumnBtn->setIconSet(SmallIconSet(TQString::tqfromLatin1("apply")));
   connect(m_setColumnBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetColumnTitle()));
   hlay->addStretch(10);
 
   l->addStretch(1);
 
-  KConfigGroup config(KGlobal::config(), TQString::fromLatin1("ImportOptions - CSV"));
+  KConfigGroup config(KGlobal::config(), TQString::tqfromLatin1("ImportOptions - CSV"));
   m_delimiter = config.readEntry("Delimiter", m_delimiter);
   m_firstRowHeader = config.readBoolEntry("First Row Titles", m_firstRowHeader);