TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 54 insertions, 54 deletions

diff --git a/kplato/kptcalendarlistdialog.cc b/kplato/kptcalendarlistdialog.cc
index a319c616..5fe590ec 100644
--- a/kplato/kptcalendarlistdialog.cc
+++ b/kplato/kptcalendarlistdialog.cc
@@ -23,16 +23,16 @@
 #include "kptcommand.h"
 #include "kptpart.h"
 
-#include <qpushbutton.h>
-#include <qcombobox.h>
-#include <qheader.h>
-#include <qlabel.h>
-#include <qtextedit.h>
-#include <qlineedit.h>
-#include <qdatetimeedit.h>
-#include <qdatetime.h>
-#include <qtabwidget.h>
-#include <qtextbrowser.h>
+#include <tqpushbutton.h>
+#include <tqcombobox.h>
+#include <tqheader.h>
+#include <tqlabel.h>
+#include <tqtextedit.h>
+#include <tqlineedit.h>
+#include <tqdatetimeedit.h>
+#include <tqdatetime.h>
+#include <tqtabwidget.h>
+#include <tqtextbrowser.h>
 
 #include <klocale.h>
 
@@ -47,7 +47,7 @@ namespace KPlato
 class CalendarListViewItem : public KListViewItem
 {
 public:
-    CalendarListViewItem(CalendarListDialogImpl &pan, QListView *lv, Calendar *cal,  Calendar *orig=0)
+    CalendarListViewItem(CalendarListDialogImpl &pan, TQListView *lv, Calendar *cal,  Calendar *orig=0)
         : KListViewItem(lv, cal->name()), panel(pan) {
 
         calendar = cal;
@@ -87,14 +87,14 @@ public:
                 macro->addCommand(new CalendarModifyNameCmd(part, original, calendar->name()));
             }
             Calendar *c = base ? base->baseCalendar() : 0;
-            if (c != original->parent()) {
+            if (c != original->tqparent()) {
                 if (macro == 0) macro = new KMacroCommand("");
                 macro->addCommand(new CalendarModifyParentCmd(part, original, c));
                 //kdDebug()<<k_funcinfo<<"Base modified: "<<c->name()<<endl;
             }
             
             //kdDebug()<<k_funcinfo<<"Check for days deleted: "<<calendar->name()<<endl;
-            QPtrListIterator<CalendarDay> oit = original->days();
+            TQPtrListIterator<CalendarDay> oit = original->days();
             for (; oit.current(); ++oit) {
                 if (calendar->findDay(oit.current()->date()) == 0) {
                     if (macro == 0) macro = new KMacroCommand("");
@@ -104,7 +104,7 @@ public:
             }
         
             //kdDebug()<<k_funcinfo<<"Check for days added or modified: "<<calendar->name()<<endl;
-            QPtrListIterator<CalendarDay> cit = calendar->days();
+            TQPtrListIterator<CalendarDay> cit = calendar->days();
             for (; cit.current(); ++cit) {
                 CalendarDay *day = original->findDay(cit.current()->date());
                 if (day == 0) {
@@ -146,7 +146,7 @@ public:
     Calendar *original;
     CalendarListViewItem* base;
     CalendarListDialogImpl &panel;
-    QString oldText;
+    TQString oldText;
     
 protected:
     virtual void cancelRename(int col) {
@@ -163,14 +163,14 @@ private:
 };
 
 //----------------------------------------------------
-CalendarListDialog::CalendarListDialog(Project &p, QWidget *parent, const char *name)
-    : KDialogBase( Swallow, i18n("Calendar's Settings"), Ok|Cancel, Ok, parent, name, true, true),
+CalendarListDialog::CalendarListDialog(Project &p, TQWidget *tqparent, const char *name)
+    : KDialogBase( Swallow, i18n("Calendar's Settings"), Ok|Cancel, Ok, tqparent, name, true, true),
       project(p)
 {
     //kdDebug()<<k_funcinfo<<&p<<endl;
     dia = new CalendarListDialogImpl(p, this);
-    QPtrList<Calendar> list = p.calendars();
-    QPtrListIterator<Calendar> it = list;
+    TQPtrList<Calendar> list = p.calendars();
+    TQPtrListIterator<Calendar> it = list;
     for (; it.current(); ++it) {
         Calendar *c = new Calendar(it.current());
         //c->setProject(&p);
@@ -178,23 +178,23 @@ CalendarListDialog::CalendarListDialog(Project &p, QWidget *parent, const char *
     }
     dia->setBaseCalendars();
     
-    QListViewItem *f = dia->calendarList->firstChild();
+    TQListViewItem *f = dia->calendarList->firstChild();
     if (f) {
         dia->calendarList->setSelected(f, true);
     }
-    //kdDebug()<<"size="<<size().width()<<"x"<<size().height()<<" hint="<<sizeHint().width()<<"x"<<sizeHint().height()<<endl;
-    resize(QSize(725, 388).expandedTo(minimumSizeHint()));
+    //kdDebug()<<"size="<<size().width()<<"x"<<size().height()<<" hint="<<tqsizeHint().width()<<"x"<<tqsizeHint().height()<<endl;
+    resize(TQSize(725, 388).expandedTo(tqminimumSizeHint()));
 
     setMainWidget(dia);
     enableButtonOK(false);
 
-    connect(dia, SIGNAL(enableButtonOk(bool)), SLOT(enableButtonOK(bool)));
+    connect(dia, TQT_SIGNAL(enableButtonOk(bool)), TQT_SLOT(enableButtonOK(bool)));
 }
 
 KCommand *CalendarListDialog::buildCommand(Part *part) {
     //kdDebug()<<k_funcinfo<<endl;
     KMacroCommand *cmd = 0;
-    QListViewItemIterator cit(dia->calendarList);
+    TQListViewItemIterator cit(dia->calendarList);
     for (;cit.current(); ++cit) {
         CalendarListViewItem *item = dynamic_cast<CalendarListViewItem *>(cit.current());
         if (item) {
@@ -205,7 +205,7 @@ KCommand *CalendarListDialog::buildCommand(Part *part) {
             }
         }
     }
-    QPtrListIterator<CalendarListViewItem> it = dia->deletedItems();
+    TQPtrListIterator<CalendarListViewItem> it = dia->deletedItems();
     for (; it.current(); ++it) {
         //kdDebug()<<k_funcinfo<<"deleted: "<<it.current()->calendar->name()<<endl;
         if (it.current()->original) {
@@ -224,46 +224,46 @@ void CalendarListDialog::slotOk() {
 }
 
 //--------------------------------------------------
-CalendarListDialogImpl::CalendarListDialogImpl (Project &p, QWidget *parent) 
-    : CalendarListDialogBase(parent),
+CalendarListDialogImpl::CalendarListDialogImpl (Project &p, TQWidget *tqparent) 
+    : CalendarListDialogBase(tqparent),
       project(p),
       m_renameItem(0) {
 
     calendarList->header()->setStretchEnabled(true, 0);
     calendarList->setShowSortIndicator(true);
     calendarList->setSorting(0);
-    calendarList->setDefaultRenameAction(QListView::Accept);
+    calendarList->setDefaultRenameAction(TQListView::Accept);
 
     m_deletedItems.setAutoDelete(true);
     calendar->setEnabled(false);
 
     slotSelectionChanged();
 
-    connect(calendar, SIGNAL(obligatedFieldsFilled(bool)), SLOT(slotEnableButtonOk(bool)));
-    connect(calendar, SIGNAL(applyClicked()), SLOT(slotCalendarModified()));
+    connect(calendar, TQT_SIGNAL(obligatedFieldsFilled(bool)), TQT_SLOT(slotEnableButtonOk(bool)));
+    connect(calendar, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotCalendarModified()));
 
-    connect(bDelete, SIGNAL(clicked()), SLOT(slotDeleteClicked()));
-    connect(bAdd, SIGNAL(clicked()), SLOT(slotAddClicked()));
-    //connect(editName, SIGNAL(returnPressed()), SLOT(slotAddClicked()));
+    connect(bDelete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteClicked()));
+    connect(bAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked()));
+    //connect(editName, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotAddClicked()));
 
-    connect(calendarList, SIGNAL(selectionChanged()), SLOT(slotSelectionChanged()));
-    connect(calendarList, SIGNAL(doubleClicked(QListViewItem*, const QPoint&, int)), SLOT(slotListDoubleClicked(QListViewItem*, const QPoint&, int)));
-    connect(calendarList, SIGNAL(itemRenamed(QListViewItem*, int)), SLOT(slotItemRenamed(QListViewItem*, int)));
+    connect(calendarList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+    connect(calendarList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQT_SLOT(slotListDoubleClicked(TQListViewItem*, const TQPoint&, int)));
+    connect(calendarList, TQT_SIGNAL(itemRenamed(TQListViewItem*, int)), TQT_SLOT(slotItemRenamed(TQListViewItem*, int)));
     
-    connect (baseCalendar, SIGNAL(activated(int)), SLOT(slotBaseCalendarActivated(int)));
+    connect (baseCalendar, TQT_SIGNAL(activated(int)), TQT_SLOT(slotBaseCalendarActivated(int)));
 
     // Internal rename stuff
-    connect(this, SIGNAL(renameStarted(QListViewItem*, int)), SLOT(slotRenameStarted(QListViewItem*, int)));
-    connect(this, SIGNAL(startRename(QListViewItem*, int)), SLOT(slotStartRename(QListViewItem*, int)));
-    connect(this, SIGNAL(selectionChanged()), SLOT(slotSelectionChanged()));
+    connect(this, TQT_SIGNAL(renameStarted(TQListViewItem*, int)), TQT_SLOT(slotRenameStarted(TQListViewItem*, int)));
+    connect(this, TQT_SIGNAL(startRename(TQListViewItem*, int)), TQT_SLOT(slotStartRename(TQListViewItem*, int)));
+    connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
 }
 
 void CalendarListDialogImpl::setBaseCalendars() {
-    QListViewItemIterator it(calendarList);
+    TQListViewItemIterator it(calendarList);
     for (;it.current(); ++it) {
         CalendarListViewItem *item = dynamic_cast<CalendarListViewItem *>(it.current());
         if (item) {
-            item->base = findItem(item->calendar->parent());
+            item->base = findItem(item->calendar->tqparent());
         }
     }
 }
@@ -285,13 +285,13 @@ void CalendarListDialogImpl::slotBaseCalendarActivated(int id) {
 
 void CalendarListDialogImpl::slotSelectionChanged() {
     //kdDebug()<<k_funcinfo<<endl;
-    QListViewItem *item = calendarList->selectedItem();
+    TQListViewItem *item = calendarList->selectedItem();
     bDelete->setEnabled((bool)item);
     bAdd->setEnabled(true);
     slotSelectionChanged(item);
 }
 
-void CalendarListDialogImpl::slotSelectionChanged(QListViewItem *listItem) {
+void CalendarListDialogImpl::slotSelectionChanged(TQListViewItem *listItem) {
     //kdDebug()<<k_funcinfo<<endl;
     baseCalendarList.clear();
     baseCalendar->clear();
@@ -302,7 +302,7 @@ void CalendarListDialogImpl::slotSelectionChanged(QListViewItem *listItem) {
         baseCalendar->insertItem(i18n("None"));
         baseCalendarList.append(0);
         int me = 0, i = 0;
-        QListViewItemIterator it(calendarList);
+        TQListViewItemIterator it(calendarList);
         for (; it.current(); ++it) {
             CalendarListViewItem *item = dynamic_cast<CalendarListViewItem*>(it.current());
             if (item && cal != item && !item->hasBaseCalendar(cal)) {
@@ -311,7 +311,7 @@ void CalendarListDialogImpl::slotSelectionChanged(QListViewItem *listItem) {
                 i++;
                 if (item == cal->base) {
                     me = i;
-                    //kdDebug()<<k_funcinfo<<"item="<<item<<": cal="<<cal->calendar->name()<<" has parent "<<cal->base->calendar->name()<<endl;
+                    //kdDebug()<<k_funcinfo<<"item="<<item<<": cal="<<cal->calendar->name()<<" has tqparent "<<cal->base->calendar->name()<<endl;
                 }
             }
         }
@@ -352,18 +352,18 @@ void CalendarListDialogImpl::slotAddClicked() {
     CalendarListViewItem *item = new CalendarListViewItem(*this, calendarList, cal);
     item->setState(CalendarListViewItem::New);
     
-    slotListDoubleClicked(item, QPoint(), 0);
+    slotListDoubleClicked(item, TQPoint(), 0);
     
 }
 
-QPtrList<CalendarListViewItem> &CalendarListDialogImpl::deletedItems() {
+TQPtrList<CalendarListViewItem> &CalendarListDialogImpl::deletedItems() {
     return m_deletedItems;
 }
 
 CalendarListViewItem *CalendarListDialogImpl::findItem(Calendar *cal) {
     if (!cal)
         return 0;
-    QListViewItemIterator it(calendarList);
+    TQListViewItemIterator it(calendarList);
     for (;it.current(); ++it) {
         CalendarListViewItem *item = dynamic_cast<CalendarListViewItem *>(it.current());
         if (item && (cal == item->original || cal == item->calendar)) {
@@ -374,7 +374,7 @@ CalendarListViewItem *CalendarListDialogImpl::findItem(Calendar *cal) {
     return 0;
 }
 
-void CalendarListDialogImpl::slotItemRenamed(QListViewItem *itm, int col) {
+void CalendarListDialogImpl::slotItemRenamed(TQListViewItem *itm, int col) {
     //kdDebug()<<k_funcinfo<<itm->text(0)<<endl;
     itm->setRenameEnabled(col, false);
     m_renameItem = 0;
@@ -397,20 +397,20 @@ void CalendarListDialogImpl::slotItemRenamed(QListViewItem *itm, int col) {
 }
 
 // We don't get notified when rename is cancelled, this is called from the item
-void CalendarListDialogImpl::renameStopped(QListViewItem */*item*/) {
+void CalendarListDialogImpl::renameStopped(TQListViewItem */*item*/) {
     //kdDebug()<<k_funcinfo<<(item?item->text(0):"")<<endl;
     m_renameItem = 0;
     emit selectionChanged();
 }
 
-void CalendarListDialogImpl::slotListDoubleClicked(QListViewItem *item, const QPoint&, int col) {
+void CalendarListDialogImpl::slotListDoubleClicked(TQListViewItem *item, const TQPoint&, int col) {
     //kdDebug()<<k_funcinfo<<(item?item->text(0):"")<<endl;
     if (m_renameItem)
         return;
     slotStartRename(item, col);
 }
 
-void CalendarListDialogImpl::slotRenameStarted(QListViewItem */*item*/, int /*col*/) {
+void CalendarListDialogImpl::slotRenameStarted(TQListViewItem */*item*/, int /*col*/) {
     //kdDebug()<<k_funcinfo<<(item?item->text(0):"")<<endl;
     if (calendarList->isRenaming()) {
         bDelete->setEnabled(false);
@@ -418,7 +418,7 @@ void CalendarListDialogImpl::slotRenameStarted(QListViewItem */*item*/, int /*co
     }
 }
 
-void CalendarListDialogImpl::slotStartRename(QListViewItem *item, int col) {
+void CalendarListDialogImpl::slotStartRename(TQListViewItem *item, int col) {
     //kdDebug()<<k_funcinfo<<(item?item->text(0):"")<<endl;
     static_cast<CalendarListViewItem*>(item)->oldText = item->text(col);
     item->setRenameEnabled(col, true);