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, 61 insertions, 61 deletions

diff --git a/src/filterdialog.cpp b/src/filterdialog.cpp
index ab65490..d2cecd8 100644
--- a/src/filterdialog.cpp
+++ b/src/filterdialog.cpp
@@ -11,7 +11,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// The layout borrows heavily from kmsearchpatternedit.cpp in kmail
+// The tqlayout borrows heavily from kmsearchpatternedit.cpp in kmail
 // which is authored by Marc Mutz <Marc@Mutz.com> under the GPL
 
 #include "filterdialog.h"
@@ -29,21 +29,21 @@
 #include <kregexpeditorinterface.h>
 #include <kiconloader.h>
 
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qradiobutton.h>
-#include <qvbuttongroup.h>
-#include <qhbox.h>
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qapplication.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqradiobutton.h>
+#include <tqvbuttongroup.h>
+#include <tqhbox.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqapplication.h>
 
 using Tellico::FilterRuleWidget;
 using Tellico::FilterRuleWidgetLister;
 using Tellico::FilterDialog;
 
-FilterRuleWidget::FilterRuleWidget(FilterRule* rule_, QWidget* parent_, const char* name_/*=0*/)
-    : QHBox(parent_, name_), m_editRegExp(0), m_editRegExpDialog(0) {
+FilterRuleWidget::FilterRuleWidget(FilterRule* rule_, TQWidget* tqparent_, const char* name_/*=0*/)
+    : TQHBox(tqparent_, name_), m_editRegExp(0), m_editRegExpDialog(0) {
   initLists();
   initWidget();
 
@@ -65,7 +65,7 @@ void FilterRuleWidget::initLists() {
   if(m_ruleFuncList.isEmpty()) {
     // also see FilterRule::matches() and FilterRule::Function
     // if you change the following strings!
-    m_ruleFuncList.append(i18n("contains"));
+    m_ruleFuncList.append(i18n("tqcontains"));
     m_ruleFuncList.append(i18n("does not contain"));
     m_ruleFuncList.append(i18n("equals"));
     m_ruleFuncList.append(i18n("does not equal"));
@@ -78,18 +78,18 @@ void FilterRuleWidget::initWidget() {
   setSpacing(4);
 
   m_ruleField = new KComboBox(this);
-  connect(m_ruleField, SIGNAL(activated(int)), SIGNAL(signalModified()));
-  connect(m_ruleField, SIGNAL(activated(int)), SLOT(slotRuleFieldChanged(int)));
+  connect(m_ruleField, TQT_SIGNAL(activated(int)), TQT_SIGNAL(signalModified()));
+  connect(m_ruleField, TQT_SIGNAL(activated(int)), TQT_SLOT(slotRuleFieldChanged(int)));
 
   m_ruleFunc = new KComboBox(this);
-  connect(m_ruleFunc, SIGNAL(activated(int)), SIGNAL(signalModified()));
+  connect(m_ruleFunc, TQT_SIGNAL(activated(int)), TQT_SIGNAL(signalModified()));
   m_ruleValue = new KLineEdit(this);
-  connect(m_ruleValue, SIGNAL(textChanged(const QString&)), SIGNAL(signalModified()));
+  connect(m_ruleValue, TQT_SIGNAL(textChanged(const TQString&)), TQT_SIGNAL(signalModified()));
 
-  if(!KTrader::self()->query(QString::fromLatin1("KRegExpEditor/KRegExpEditor")).isEmpty()) {
+  if(!KTrader::self()->query(TQString::tqfromLatin1("KRegExpEditor/KRegExpEditor")).isEmpty()) {
     m_editRegExp = new KPushButton(i18n("Edit..."), this);
-    connect(m_editRegExp, SIGNAL(clicked()), this, SLOT(slotEditRegExp()));
-    connect(m_ruleFunc, SIGNAL(activated(int)), this, SLOT(slotRuleFunctionChanged(int)));
+    connect(m_editRegExp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditRegExp()));
+    connect(m_ruleFunc, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotRuleFunctionChanged(int)));
     slotRuleFunctionChanged(m_ruleFunc->currentItem());
   }
 
@@ -101,22 +101,22 @@ void FilterRuleWidget::initWidget() {
   m_ruleFunc->insertStringList(m_ruleFuncList);
 //  m_ruleFunc->adjustSize();
 
-//  connect(m_ruleField, SIGNAL(textChanged(const QString &)),
-//          this, SIGNAL(fieldChanged(const QString &)));
-//  connect(m_ruleValue, SIGNAL(textChanged(const QString &)),
-//          this, SIGNAL(contentsChanged(const QString &)));
+//  connect(m_ruleField, TQT_SIGNAL(textChanged(const TQString &)),
+//          this, TQT_SIGNAL(fieldChanged(const TQString &)));
+//  connect(m_ruleValue, TQT_SIGNAL(textChanged(const TQString &)),
+//          this, TQT_SIGNAL(contentsChanged(const TQString &)));
 }
 
 void FilterRuleWidget::slotEditRegExp() {
   if(m_editRegExpDialog == 0) {
-    m_editRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<QDialog>(QString::fromLatin1("KRegExpEditor/KRegExpEditor"),
-                                                                                    QString::null, this);
+    m_editRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>(TQString::tqfromLatin1("KRegExpEditor/KRegExpEditor"),
+                                                                                    TQString(), TQT_TQOBJECT(this));
   }
 
-  KRegExpEditorInterface* iface = static_cast<KRegExpEditorInterface *>(m_editRegExpDialog->qt_cast(QString::fromLatin1("KRegExpEditorInterface")));
+  KRegExpEditorInterface* iface = static_cast<KRegExpEditorInterface *>(m_editRegExpDialog->qt_cast(TQString::tqfromLatin1("KRegExpEditorInterface")));
   if(iface) {
     iface->setRegExp(m_ruleValue->text());
-    if(m_editRegExpDialog->exec() == QDialog::Accepted) {
+    if(m_editRegExpDialog->exec() == TQDialog::Accepted) {
       m_ruleValue->setText(iface->regExp());
     }
   }
@@ -124,7 +124,7 @@ void FilterRuleWidget::slotEditRegExp() {
 
 void FilterRuleWidget::slotRuleFieldChanged(int which_) {
   Q_UNUSED(which_);
-  QString fieldTitle = m_ruleField->currentText();
+  TQString fieldTitle = m_ruleField->currentText();
   if(fieldTitle.isEmpty() || fieldTitle[0] == '<') {
     m_ruleValue->setCompletionObject(0);
     return;
@@ -172,7 +172,7 @@ void FilterRuleWidget::setRule(const FilterRule* rule_) {
 }
 
 Tellico::FilterRule* FilterRuleWidget::rule() const {
-  QString field; // empty string
+  TQString field; // empty string
   if(m_ruleField->currentItem() > 0) { // 0 is "All Fields", field is empty
     field = Kernel::self()->fieldNameByTitle(m_ruleField->currentText());
   }
@@ -207,8 +207,8 @@ namespace {
   static const int FILTER_MAX_RULES = 8;
 }
 
-FilterRuleWidgetLister::FilterRuleWidgetLister(QWidget* parent_, const char* name_)
-    : KWidgetLister(FILTER_MIN_RULE_WIDGETS, FILTER_MAX_RULES, parent_, name_) {
+FilterRuleWidgetLister::FilterRuleWidgetLister(TQWidget* tqparent_, const char* name_)
+    : KWidgetLister(FILTER_MIN_RULE_WIDGETS, FILTER_MAX_RULES, tqparent_, name_) {
 //  slotClear();
 }
 
@@ -229,11 +229,11 @@ void FilterRuleWidgetLister::setFilter(Filter::Ptr filter_) {
   }
 
   // set the right number of widgets
-  setNumberOfShownWidgetsTo(QMAX(count, mMinWidgets));
+  setNumberOfShownWidgetsTo(TQMAX(count, mMinWidgets));
 
   // load the actions into the widgets
-  QPtrListIterator<QWidget> wIt(mWidgetList);
-  for(QPtrListIterator<FilterRule> rIt(*filter_); rIt.current() && wIt.current(); ++rIt, ++wIt) {
+  TQPtrListIterator<TQWidget> wIt(mWidgetList);
+  for(TQPtrListIterator<FilterRule> rIt(*filter_); rIt.current() && wIt.current(); ++rIt, ++wIt) {
     static_cast<FilterRuleWidget*>(*wIt)->setRule(*rIt);
   }
   for( ; wIt.current(); ++wIt) { // clear any remaining
@@ -253,19 +253,19 @@ void FilterRuleWidgetLister::setFocus() {
   }
 }
 
-QWidget* FilterRuleWidgetLister::createWidget(QWidget* parent_) {
-  QWidget* w = new FilterRuleWidget(static_cast<Tellico::FilterRule*>(0), parent_);
-  connect(w, SIGNAL(signalModified()), SIGNAL(signalModified()));
+TQWidget* FilterRuleWidgetLister::createWidget(TQWidget* tqparent_) {
+  TQWidget* w = new FilterRuleWidget(static_cast<Tellico::FilterRule*>(0), tqparent_);
+  connect(w, TQT_SIGNAL(signalModified()), TQT_SIGNAL(signalModified()));
   return w;
 }
 
-void FilterRuleWidgetLister::clearWidget(QWidget* widget_) {
+void FilterRuleWidgetLister::clearWidget(TQWidget* widget_) {
   if(widget_) {
     static_cast<FilterRuleWidget*>(widget_)->reset();
   }
 }
 
-const QPtrList<QWidget>& FilterRuleWidgetLister::widgetList() const {
+const TQPtrList<TQWidget>& FilterRuleWidgetLister::widgetList() const {
   return mWidgetList;
 }
 
@@ -277,8 +277,8 @@ namespace {
 
 // modal dialog so I don't have to worry about updating stuff
 // don't show apply button if not saving, i.e. just modifying existing filter
-FilterDialog::FilterDialog(Mode mode_, QWidget* parent_, const char* name_/*=0*/)
-    : KDialogBase(parent_, name_, true,
+FilterDialog::FilterDialog(Mode mode_, TQWidget* tqparent_, const char* name_/*=0*/)
+    : KDialogBase(tqparent_, name_, true,
                   (mode_ == CreateFilter ? i18n("Advanced Filter") : i18n("Modify Filter")),
                   (mode_ == CreateFilter ? Help|Ok|Apply|Cancel : Help|Ok|Cancel),
                   Ok, false),
@@ -287,46 +287,46 @@ FilterDialog::FilterDialog(Mode mode_, QWidget* parent_, const char* name_/*=0*/
 }
 
 void FilterDialog::init() {
-  QWidget* page = new QWidget(this);
+  TQWidget* page = new TQWidget(this);
   setMainWidget(page);
-  QVBoxLayout* topLayout = new QVBoxLayout(page, 0, KDialog::spacingHint());
+  TQVBoxLayout* topLayout = new TQVBoxLayout(page, 0, KDialog::spacingHint());
 
-  QGroupBox* m_matchGroup = new QGroupBox(1, Qt::Horizontal, i18n("Filter Criteria"), page);
+  TQGroupBox* m_matchGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Filter Criteria"), page);
   topLayout->addWidget(m_matchGroup);
 
-  QVButtonGroup* bg = new QVButtonGroup(m_matchGroup);
-  bg->setFrameShape(QFrame::NoFrame);
+  TQVButtonGroup* bg = new TQVButtonGroup(m_matchGroup);
+  bg->setFrameShape(TQFrame::NoFrame);
   bg->setInsideMargin(0);
-  m_matchAll = new QRadioButton(i18n("Match a&ll of the following"), bg);
-  m_matchAny = new QRadioButton(i18n("Match an&y of the following"), bg);
+  m_matchAll = new TQRadioButton(i18n("Match a&ll of the following"), bg);
+  m_matchAny = new TQRadioButton(i18n("Match an&y of the following"), bg);
   m_matchAll->setChecked(true);
-  connect(bg, SIGNAL(clicked(int)), SLOT(slotFilterChanged()));
+  connect(bg, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotFilterChanged()));
 
   m_ruleLister = new FilterRuleWidgetLister(m_matchGroup);
-  connect(m_ruleLister, SIGNAL(widgetRemoved()), SLOT(slotShrink()));
-  connect(m_ruleLister, SIGNAL(signalModified()), SLOT(slotFilterChanged()));
+  connect(m_ruleLister, TQT_SIGNAL(widgetRemoved()), TQT_SLOT(slotShrink()));
+  connect(m_ruleLister, TQT_SIGNAL(signalModified()), TQT_SLOT(slotFilterChanged()));
   m_ruleLister->setFocus();
 
-  QHBoxLayout* blay = new QHBoxLayout(topLayout);
-  blay->addWidget(new QLabel(i18n("Filter name:"), page));
+  TQHBoxLayout* blay = new TQHBoxLayout(topLayout);
+  blay->addWidget(new TQLabel(i18n("Filter name:"), page));
 
   m_filterName = new KLineEdit(page);
   blay->addWidget(m_filterName);
-  connect(m_filterName, SIGNAL(textChanged(const QString&)), SLOT(slotFilterChanged()));
+  connect(m_filterName, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotFilterChanged()));
 
   // only when creating a new filter can it be saved
   if(m_mode == CreateFilter) {
-    m_saveFilter = new KPushButton(SmallIconSet(QString::fromLatin1("filter")), i18n("&Save Filter"), page);
+    m_saveFilter = new KPushButton(SmallIconSet(TQString::tqfromLatin1("filter")), i18n("&Save Filter"), page);
     blay->addWidget(m_saveFilter);
     m_saveFilter->setEnabled(false);
-    connect(m_saveFilter, SIGNAL(clicked()), SLOT(slotSaveFilter()));
+    connect(m_saveFilter, TQT_SIGNAL(clicked()), TQT_SLOT(slotSaveFilter()));
     enableButtonApply(false);
   }
   enableButtonOK(false); // disable at start
   actionButton(Help)->setDefault(false); // Help automatically becomes default when OK is disabled
   actionButton(Cancel)->setDefault(true); // Help automatically becomes default when OK is disabled
-  setMinimumWidth(QMAX(minimumWidth(), FILTER_MIN_WIDTH));
-  setHelp(QString::fromLatin1("filter-dialog"));
+  setMinimumWidth(TQMAX(minimumWidth(), FILTER_MIN_WIDTH));
+  setHelp(TQString::tqfromLatin1("filter-dialog"));
 }
 
 Tellico::FilterPtr FilterDialog::currentFilter() {
@@ -341,7 +341,7 @@ Tellico::FilterPtr FilterDialog::currentFilter() {
   }
 
   m_filter->clear(); // deletes all old rules
-  for(QPtrListIterator<QWidget> it(m_ruleLister->widgetList()); it.current(); ++it) {
+  for(TQPtrListIterator<TQWidget> it(m_ruleLister->widgetList()); it.current(); ++it) {
     FilterRuleWidget* rw = static_cast<FilterRuleWidget*>(it.current());
     FilterRule* rule = rw->rule();
     if(rule && !rule->isEmpty()) {
@@ -390,8 +390,8 @@ void FilterDialog::slotClear() {
 
 void FilterDialog::slotShrink() {
   updateGeometry();
-  QApplication::sendPostedEvents();
-  resize(width(), sizeHint().height());
+  TQApplication::sendPostedEvents();
+  resize(width(), tqsizeHint().height());
 }
 
 void FilterDialog::slotFilterChanged() {