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

1 files changed, 55 insertions, 55 deletions

diff --git a/src/gui/tablefieldwidget.cpp b/src/gui/tablefieldwidget.cpp
index 30f89b4..bac3ea0 100644
--- a/src/gui/tablefieldwidget.cpp
+++ b/src/gui/tablefieldwidget.cpp
@@ -21,7 +21,7 @@
 #include <kiconloader.h>
 #include <kinputdialog.h>
 
-#include <qtable.h>
+#include <tqtable.h>
 
 namespace {
   static const int MIN_TABLE_ROWS = 5;
@@ -30,18 +30,18 @@ namespace {
 
 using Tellico::GUI::TableFieldWidget;
 
-TableFieldWidget::TableFieldWidget(Data::FieldPtr field_, QWidget* parent_, const char* name_/*=0*/)
-    : FieldWidget(field_, parent_, name_), m_field(field_), m_row(-1), m_col(-1) {
+TableFieldWidget::TableFieldWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/)
+    : FieldWidget(field_, tqparent_, name_), m_field(field_), m_row(-1), m_col(-1) {
 
   bool ok;
-  m_columns = Tellico::toUInt(field_->property(QString::fromLatin1("columns")), &ok);
+  m_columns = Tellico::toUInt(field_->property(TQString::tqfromLatin1("columns")), &ok);
   if(!ok) {
     m_columns = 1;
   } else {
-    m_columns = QMIN(m_columns, MAX_TABLE_COLS); // max of 5 columns
+    m_columns = TQMIN(m_columns, MAX_TABLE_COLS); // max of 5 columns
   }
 
-  m_table = new QTable(MIN_TABLE_ROWS, m_columns, this);
+  m_table = new TQTable(MIN_TABLE_ROWS, m_columns, this);
   labelColumns(m_field);
   // allow renaming of column titles
   m_table->horizontalHeader()->setClickEnabled(true);
@@ -49,45 +49,45 @@ TableFieldWidget::TableFieldWidget(Data::FieldPtr field_, QWidget* parent_, cons
 
   m_table->verticalHeader()->setClickEnabled(true);
   m_table->verticalHeader()->installEventFilter(this);
-  connect(m_table->verticalHeader(), SIGNAL(indexChange(int, int, int)), SIGNAL(modified()));
+  connect(m_table->verticalHeader(), TQT_SIGNAL(indexChange(int, int, int)), TQT_SIGNAL(modified()));
 
   m_table->setDragEnabled(false);
-  m_table->setFocusStyle(QTable::FollowStyle);
+  m_table->setFocusStyle(TQTable::FollowStyle);
   m_table->setRowMovingEnabled(true); // rows can be moved
   m_table->setColumnMovingEnabled(false); // columns remain fixed
 
   m_table->setColumnStretchable(m_columns-1, true);
   m_table->adjustColumn(m_columns-1);
-  m_table->setSelectionMode(QTable::NoSelection);
-  m_table->setHScrollBarMode(QScrollView::AlwaysOff);
+  m_table->setSelectionMode(TQTable::NoSelection);
+  m_table->setHScrollBarMode(TQScrollView::AlwaysOff);
 
-  connect(m_table, SIGNAL(valueChanged(int, int)), SIGNAL(modified()));
-  connect(m_table, SIGNAL(currentChanged(int, int)), SLOT(slotCheckRows(int, int)));
-  connect(m_table, SIGNAL(valueChanged(int, int)), SLOT(slotResizeColumn(int, int)));
-  connect(m_table, SIGNAL(contextMenuRequested(int, int, const QPoint&)), SLOT(contextMenu(int, int, const QPoint&)));
+  connect(m_table, TQT_SIGNAL(valueChanged(int, int)), TQT_SIGNAL(modified()));
+  connect(m_table, TQT_SIGNAL(currentChanged(int, int)), TQT_SLOT(slotCheckRows(int, int)));
+  connect(m_table, TQT_SIGNAL(valueChanged(int, int)), TQT_SLOT(slotResizeColumn(int, int)));
+  connect(m_table, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint&)), TQT_SLOT(contextMenu(int, int, const TQPoint&)));
 
   registerWidget();
 }
 
-QString TableFieldWidget::text() const {
-  QString text, str, rstack, cstack, rowStr;
+TQString TableFieldWidget::text() const {
+  TQString text, str, rstack, cstack, rowStr;
   for(int row = 0; row < m_table->numRows(); ++row) {
     rowStr.truncate(0);
     cstack.truncate(0);
     for(int col = 0; col < m_table->numCols(); ++col) {
       str = m_table->text(row, col).simplifyWhiteSpace();
       if(str.isEmpty()) {
-        cstack += QString::fromLatin1("::");
+        cstack += TQString::tqfromLatin1("::");
       } else {
-        rowStr += cstack + str + QString::fromLatin1("::");
+        rowStr += cstack + str + TQString::tqfromLatin1("::");
         cstack.truncate(0);
       }
     }
     if(rowStr.isEmpty()) {
-      rstack += QString::fromLatin1("; ");
+      rstack += TQString::tqfromLatin1("; ");
     } else {
       rowStr.truncate(rowStr.length()-2); // remove last semi-colon and space
-      text += rstack + rowStr + QString::fromLatin1("; ");
+      text += rstack + rowStr + TQString::tqfromLatin1("; ");
       rstack.truncate(0);
     }
   }
@@ -114,8 +114,8 @@ QString TableFieldWidget::text() const {
   return text;
 }
 
-void TableFieldWidget::setText(const QString& text_) {
-  QStringList list = Data::Field::split(text_, true);
+void TableFieldWidget::setText(const TQString& text_) {
+  TQStringList list = Data::Field::split(text_, true);
   // add additional rows if needed
   if(static_cast<int>(list.count()) > m_table->numRows()) {
     m_table->insertRows(m_table->numRows(), list.count()-m_table->numRows());
@@ -123,12 +123,12 @@ void TableFieldWidget::setText(const QString& text_) {
   int row;
   for(row = 0; row < static_cast<int>(list.count()); ++row) {
     for(int col = 0; col < m_table->numCols(); ++col) {
-      m_table->setText(row, col, list[row].section(QString::fromLatin1("::"), col, col));
+      m_table->setText(row, col, list[row].section(TQString::tqfromLatin1("::"), col, col));
     }
     m_table->showRow(row);
   }
   // remove any un-needed rows
-  int minRow = QMAX(row, MIN_TABLE_ROWS);
+  int minRow = TQMAX(row, MIN_TABLE_ROWS);
   for(row = m_table->numRows()-1; row >= minRow; --row) {
     m_table->removeRow(row);
   }
@@ -145,7 +145,7 @@ void TableFieldWidget::clear() {
       wasEmpty = false;
     }
     for(int col = 0; col < m_table->numCols(); ++col) {
-      m_table->setText(row, col, QString::null);
+      m_table->setText(row, col, TQString());
     }
     if(row >= MIN_TABLE_ROWS) {
       m_table->removeRow(row);
@@ -158,7 +158,7 @@ void TableFieldWidget::clear() {
   }
 }
 
-QWidget* TableFieldWidget::widget() {
+TQWidget* TableFieldWidget::widget() {
   return m_table;
 }
 
@@ -176,13 +176,13 @@ void TableFieldWidget::slotRenameColumn() {
   if(m_col < 0 || m_col >= m_columns) {
     return;
   }
-  QString name = m_table->horizontalHeader()->label(m_col);
+  TQString name = m_table->horizontalHeader()->label(m_col);
   bool ok;
-  QString newName = KInputDialog::getText(i18n("Rename Column"), i18n("New column name:"),
+  TQString newName = KInputDialog::getText(i18n("Rename Column"), i18n("New column name:"),
                                           name, &ok, this);
   if(ok && !newName.isEmpty()) {
     Data::FieldPtr newField = new Data::Field(*m_field);
-    newField->setProperty(QString::fromLatin1("column%1").arg(m_col+1), newName);
+    newField->setProperty(TQString::tqfromLatin1("column%1").tqarg(m_col+1), newName);
     if(Kernel::self()->modifyField(newField)) {
       m_field = newField;
       labelColumns(m_field);
@@ -201,9 +201,9 @@ bool TableFieldWidget::emptyRow(int row_) const {
 
 void TableFieldWidget::labelColumns(Data::FieldPtr field_) {
   for(int i = 0; i < m_columns; ++i) {
-    QString s = field_->property(QString::fromLatin1("column%1").arg(i+1));
+    TQString s = field_->property(TQString::tqfromLatin1("column%1").tqarg(i+1));
     if(s.isEmpty()) {
-      s = i18n("Column %1").arg(i+1);
+      s = i18n("Column %1").tqarg(i+1);
     }
     m_table->horizontalHeader()->setLabel(i, s);
   }
@@ -211,11 +211,11 @@ void TableFieldWidget::labelColumns(Data::FieldPtr field_) {
 
 void TableFieldWidget::updateFieldHook(Data::FieldPtr, Data::FieldPtr newField_) {
   bool ok;
-  m_columns = Tellico::toUInt(newField_->property(QString::fromLatin1("columns")), &ok);
+  m_columns = Tellico::toUInt(newField_->property(TQString::tqfromLatin1("columns")), &ok);
   if(!ok) {
     m_columns = 1;
   } else {
-    m_columns = QMIN(m_columns, MAX_TABLE_COLS); // max of 5 columns
+    m_columns = TQMIN(m_columns, MAX_TABLE_COLS); // max of 5 columns
   }
   if(m_columns != m_table->numCols()) {
     m_table->setNumCols(m_columns);
@@ -224,11 +224,11 @@ void TableFieldWidget::updateFieldHook(Data::FieldPtr, Data::FieldPtr newField_)
   labelColumns(newField_);
 }
 
-bool TableFieldWidget::eventFilter(QObject* obj_, QEvent* ev_) {
-  if(ev_->type() == QEvent::MouseButtonPress
-      && static_cast<QMouseEvent*>(ev_)->button() == Qt::RightButton) {
-    if(obj_ == m_table->horizontalHeader()) {
-      QMouseEvent* ev = static_cast<QMouseEvent*>(ev_);
+bool TableFieldWidget::eventFilter(TQObject* obj_, TQEvent* ev_) {
+  if(ev_->type() == TQEvent::MouseButtonPress
+      && TQT_TQMOUSEEVENT(ev_)->button() == Qt::RightButton) {
+    if(TQT_BASE_OBJECT(obj_) == TQT_BASE_OBJECT(m_table->horizontalHeader())) {
+      TQMouseEvent* ev = TQT_TQMOUSEEVENT(ev_);
       // might be scrolled
       int pos = ev->x() + m_table->horizontalHeader()->offset();
       int col = m_table->horizontalHeader()->sectionAt(pos);
@@ -238,12 +238,12 @@ bool TableFieldWidget::eventFilter(QObject* obj_, QEvent* ev_) {
       m_row = -1;
       m_col = col;
       KPopupMenu menu(this);
-      menu.insertItem(SmallIconSet(QString::fromLatin1("edit")), i18n("Rename Column..."),
-                      this, SLOT(slotRenameColumn()));
+      menu.insertItem(SmallIconSet(TQString::tqfromLatin1("edit")), i18n("Rename Column..."),
+                      this, TQT_SLOT(slotRenameColumn()));
       menu.exec(ev->globalPos());
       return true;
-    } else if(obj_ == m_table->verticalHeader()) {
-      QMouseEvent* ev = static_cast<QMouseEvent*>(ev_);
+    } else if(TQT_BASE_OBJECT(obj_) == TQT_BASE_OBJECT(m_table->verticalHeader())) {
+      TQMouseEvent* ev = TQT_TQMOUSEEVENT(ev_);
       // might be scrolled
       int pos = ev->y() + m_table->verticalHeader()->offset();
       int row = m_table->verticalHeader()->sectionAt(pos);
@@ -260,7 +260,7 @@ bool TableFieldWidget::eventFilter(QObject* obj_, QEvent* ev_) {
   return FieldWidget::eventFilter(obj_, ev_);
 }
 
-void TableFieldWidget::contextMenu(int row_, int col_, const QPoint& p_) {
+void TableFieldWidget::contextMenu(int row_, int col_, const TQPoint& p_) {
   // might get called with col == -1 for clicking on vertical header
   // but a negative row means clicking outside bounds of table
   if(row_ < 0) {
@@ -271,29 +271,29 @@ void TableFieldWidget::contextMenu(int row_, int col_, const QPoint& p_) {
 
   int id;
   KPopupMenu menu(this);
-  menu.insertItem(SmallIconSet(QString::fromLatin1("insrow")), i18n("Insert Row"),
-                  this, SLOT(slotInsertRow()));
-  menu.insertItem(SmallIconSet(QString::fromLatin1("remrow")), i18n("Remove Row"),
-                  this, SLOT(slotRemoveRow()));
-  id = menu.insertItem(SmallIconSet(QString::fromLatin1("1uparrow")), i18n("Move Row Up"),
-                       this, SLOT(slotMoveRowUp()));
+  menu.insertItem(SmallIconSet(TQString::tqfromLatin1("insrow")), i18n("Insert Row"),
+                  this, TQT_SLOT(slotInsertRow()));
+  menu.insertItem(SmallIconSet(TQString::tqfromLatin1("remrow")), i18n("Remove Row"),
+                  this, TQT_SLOT(slotRemoveRow()));
+  id = menu.insertItem(SmallIconSet(TQString::tqfromLatin1("1uparrow")), i18n("Move Row Up"),
+                       this, TQT_SLOT(slotMoveRowUp()));
   if(m_row == 0) {
     menu.setItemEnabled(id, false);
   }
-  id = menu.insertItem(SmallIconSet(QString::fromLatin1("1downarrow")), i18n("Move Row Down"),
-                       this, SLOT(slotMoveRowDown()));
+  id = menu.insertItem(SmallIconSet(TQString::tqfromLatin1("1downarrow")), i18n("Move Row Down"),
+                       this, TQT_SLOT(slotMoveRowDown()));
   if(m_row == m_table->numRows()-1) {
     menu.setItemEnabled(id, false);
   }
   menu.insertSeparator();
-  id = menu.insertItem(SmallIconSet(QString::fromLatin1("edit")), i18n("Rename Column..."),
-                       this, SLOT(slotRenameColumn()));
+  id = menu.insertItem(SmallIconSet(TQString::tqfromLatin1("edit")), i18n("Rename Column..."),
+                       this, TQT_SLOT(slotRenameColumn()));
   if(m_col < 0 || m_col > m_columns-1) {
     menu.setItemEnabled(id, false);
   }
   menu.insertSeparator();
-  menu.insertItem(SmallIconSet(QString::fromLatin1("locationbar_erase")), i18n("Clear Table"),
-                  this, SLOT(clear()));
+  menu.insertItem(SmallIconSet(TQString::tqfromLatin1("locationbar_erase")), i18n("Clear Table"),
+                  this, TQT_SLOT(clear()));
   menu.exec(p_);
 }