summaryrefslogtreecommitdiffstats
path: root/kpilot/conduits/vcalconduit
diff options
context:
space:
mode:
Diffstat (limited to 'kpilot/conduits/vcalconduit')
-rw-r--r--kpilot/conduits/vcalconduit/cleanupstate.cc6
-rw-r--r--kpilot/conduits/vcalconduit/hhtopcstate.cc6
-rw-r--r--kpilot/conduits/vcalconduit/kcalRecord.cc12
-rw-r--r--kpilot/conduits/vcalconduit/pctohhstate.cc4
-rw-r--r--kpilot/conduits/vcalconduit/teststate.cc8
-rw-r--r--kpilot/conduits/vcalconduit/todo-conduit.cc16
-rw-r--r--kpilot/conduits/vcalconduit/todo-conduit.h6
-rw-r--r--kpilot/conduits/vcalconduit/todo-setup.cc6
-rw-r--r--kpilot/conduits/vcalconduit/todo-setup.h4
-rw-r--r--kpilot/conduits/vcalconduit/todoRecord.cc2
-rw-r--r--kpilot/conduits/vcalconduit/vcal-conduit.cc12
-rw-r--r--kpilot/conduits/vcalconduit/vcal-conduit.h6
-rw-r--r--kpilot/conduits/vcalconduit/vcal-conduitbase.cc24
-rw-r--r--kpilot/conduits/vcalconduit/vcal-conduitbase.h12
-rw-r--r--kpilot/conduits/vcalconduit/vcal-setup.cc6
-rw-r--r--kpilot/conduits/vcalconduit/vcal-setup.h4
-rw-r--r--kpilot/conduits/vcalconduit/vcal-setupbase.cc18
-rw-r--r--kpilot/conduits/vcalconduit/vcal-setupbase.h2
-rw-r--r--kpilot/conduits/vcalconduit/vcalRecord.cc14
19 files changed, 84 insertions, 84 deletions
diff --git a/kpilot/conduits/vcalconduit/cleanupstate.cc b/kpilot/conduits/vcalconduit/cleanupstate.cc
index 29b1f6ea5..209a0e918 100644
--- a/kpilot/conduits/vcalconduit/cleanupstate.cc
+++ b/kpilot/conduits/vcalconduit/cleanupstate.cc
@@ -29,7 +29,7 @@
#include <options.h>
#include <kio/netaccess.h>
-#include <qfile.h>
+#include <tqfile.h>
#include "pilotDatabase.h"
@@ -74,7 +74,7 @@ void CleanUpState::startSync( ConduitAction *ca )
}
KCal::Calendar *fCalendar = vccb->calendar();
- QString fCalendarFile = vccb->calendarFile();
+ TQString fCalendarFile = vccb->calendarFile();
if ( fCalendar )
{
@@ -96,7 +96,7 @@ void CleanUpState::startSync( ConduitAction *ca )
else {
KIO::NetAccess::removeTempFile( fCalendarFile );
}
- QFile backup( fCalendarFile + CSL1( "~" ) );
+ TQFile backup( fCalendarFile + CSL1( "~" ) );
backup.remove();
}
break;
diff --git a/kpilot/conduits/vcalconduit/hhtopcstate.cc b/kpilot/conduits/vcalconduit/hhtopcstate.cc
index 79089671d..82024f123 100644
--- a/kpilot/conduits/vcalconduit/hhtopcstate.cc
+++ b/kpilot/conduits/vcalconduit/hhtopcstate.cc
@@ -186,13 +186,13 @@ void VCalConduitBase::slotPalmRecToPC()
if ( syncMode()==SyncMode::eCopyHHToPC )
{
emit logMessage(i18n("Cleaning up ..."));
- QTimer::singleShot(0, this, SLOT(cleanup()));
+ TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
return;
}
else
{
emit logMessage(i18n("Copying records to Pilot ..."));
- QTimer::singleShot(0 ,this,SLOT(slotPCRecToPalm()));
+ TQTimer::singleShot(0 ,this,TQT_SLOT(slotPCRecToPalm()));
return;
}
}
@@ -244,6 +244,6 @@ void VCalConduitBase::slotPalmRecToPC()
KPILOT_DELETE(r);
KPILOT_DELETE(s);
- QTimer::singleShot(0,this,SLOT(slotPalmRecToPC()));
+ TQTimer::singleShot(0,this,TQT_SLOT(slotPalmRecToPC()));
}
*/
diff --git a/kpilot/conduits/vcalconduit/kcalRecord.cc b/kpilot/conduits/vcalconduit/kcalRecord.cc
index f12d9b8c3..598866dc5 100644
--- a/kpilot/conduits/vcalconduit/kcalRecord.cc
+++ b/kpilot/conduits/vcalconduit/kcalRecord.cc
@@ -49,8 +49,8 @@ void KCalSync::setCategory(PilotRecordBase *de,
return;
}
- QString deCategory;
- QStringList eventCategories = e->categories();
+ TQString deCategory;
+ TQStringList eventCategories = e->categories();
if (eventCategories.size() < 1)
{
// This event has no categories.
@@ -70,14 +70,14 @@ void KCalSync::setCategory(PilotRecordBase *de,
}
}
- QStringList availableHandheldCategories = Pilot::categoryNames(&info);
+ TQStringList availableHandheldCategories = Pilot::categoryNames(&info);
// Either the record is unfiled, and should be filed, or
// it has a category set which is not in the list of
// categories that the event has. So go looking for
// a category that is available both for the event
// and on the handheld.
- for ( QStringList::ConstIterator it = eventCategories.begin();
+ for ( TQStringList::ConstIterator it = eventCategories.begin();
it != eventCategories.end(); ++it )
{
// Odd, an empty category string.
@@ -113,9 +113,9 @@ void KCalSync::setCategory(KCal::Incidence *e,
return;
}
- QStringList cats=e->categories();
+ TQStringList cats=e->categories();
int cat = de->category();
- QString newcat = Pilot::categoryName(&info,cat);
+ TQString newcat = Pilot::categoryName(&info,cat);
DEBUGKPILOT << fname << ": palm category id: [" << cat <<
"], label: [" << newcat << "]" << endl;
diff --git a/kpilot/conduits/vcalconduit/pctohhstate.cc b/kpilot/conduits/vcalconduit/pctohhstate.cc
index b68771f13..d2866fd19 100644
--- a/kpilot/conduits/vcalconduit/pctohhstate.cc
+++ b/kpilot/conduits/vcalconduit/pctohhstate.cc
@@ -111,8 +111,8 @@ void PCToHHState::handleRecord( ConduitAction *ca )
DEBUGKPILOT << fname << ": found PC entry with pilotID " << id <<endl;
DEBUGKPILOT << fname << ": Description: " << e->summary() << endl;
- QDateTime start_time = e->dtStart();
- QDateTime end_time = e->dtEnd();
+ TQDateTime start_time = e->dtStart();
+ TQDateTime end_time = e->dtEnd();
DEBUGKPILOT << fname << ": Time: "<< start_time.toString() << " until "
<< end_time.toString() << endl;
diff --git a/kpilot/conduits/vcalconduit/teststate.cc b/kpilot/conduits/vcalconduit/teststate.cc
index d8c8e56cc..c762d32b4 100644
--- a/kpilot/conduits/vcalconduit/teststate.cc
+++ b/kpilot/conduits/vcalconduit/teststate.cc
@@ -28,8 +28,8 @@
#include <options.h>
-#include <qdatetime.h>
-#include <qfile.h>
+#include <tqdatetime.h>
+#include <tqfile.h>
#include "pilotSerialDatabase.h"
#include "pilotLocalDatabase.h"
@@ -38,7 +38,7 @@
#include "teststate.h"
#include "vcal-conduitbase.h"
-TestState::TestState() : fCalendar( QString::null )
+TestState::TestState() : fCalendar( TQString::null )
{
fState = eTest;
}
@@ -109,7 +109,7 @@ void TestState::finishSync( ConduitAction *ca )
// No more records present on the device so lets dump the
// readed records in a file.
- QFile f( CSL1("dump.ics") );
+ TQFile f( CSL1("dump.ics") );
if( !f.exists() )
{
f.open( IO_WriteOnly );
diff --git a/kpilot/conduits/vcalconduit/todo-conduit.cc b/kpilot/conduits/vcalconduit/todo-conduit.cc
index 302ada565..9b1007c20 100644
--- a/kpilot/conduits/vcalconduit/todo-conduit.cc
+++ b/kpilot/conduits/vcalconduit/todo-conduit.cc
@@ -34,8 +34,8 @@
#include "options.h"
-#include <qdatetime.h>
-#include <qtextcodec.h>
+#include <tqdatetime.h>
+#include <tqtextcodec.h>
#include <libkcal/calendar.h>
#include <libkcal/todo.h>
@@ -110,8 +110,8 @@ KCal::Incidence *TodoConduitPrivate::findIncidence(PilotRecordBase *tosearch)
PilotTodoEntry*entry=dynamic_cast<PilotTodoEntry*>(tosearch);
if (!entry) return 0L;
- QString title=entry->getDescription();
- QDateTime dt=readTm( entry->getDueDate() );
+ TQString title=entry->getDescription();
+ TQDateTime dt=readTm( entry->getDueDate() );
KCal::Todo::List::ConstIterator it;
for( it = fAllTodos.begin(); it != fAllTodos.end(); ++it ) {
@@ -176,7 +176,7 @@ KCal::Incidence *TodoConduitPrivate::getNextModifiedIncidence()
TodoConduit::TodoConduit(KPilotLink *d,
const char *n,
- const QStringList &a) : VCalConduitBase(d,n,a),
+ const TQStringList &a) : VCalConduitBase(d,n,a),
fTodoAppInfo( 0L )
{
FUNCTIONSETUP;
@@ -223,14 +223,14 @@ void TodoConduit::_getAppInfo()
-const QString TodoConduit::getTitle(PilotRecordBase *de)
+const TQString TodoConduit::getTitle(PilotRecordBase *de)
{
PilotTodoEntry*d=dynamic_cast<PilotTodoEntry*>(de);
if (d)
{
- return QString(d->getDescription());
+ return TQString(d->getDescription());
}
- return QString::null;
+ return TQString::null;
}
diff --git a/kpilot/conduits/vcalconduit/todo-conduit.h b/kpilot/conduits/vcalconduit/todo-conduit.h
index 3364d61f2..8d8780eba 100644
--- a/kpilot/conduits/vcalconduit/todo-conduit.h
+++ b/kpilot/conduits/vcalconduit/todo-conduit.h
@@ -67,13 +67,13 @@ Q_OBJECT
public:
TodoConduit(KPilotLink *,
const char *name=0L,
- const QStringList &args = QStringList());
+ const TQStringList &args = TQStringList());
virtual ~TodoConduit();
protected:
- virtual const QString getTitle(PilotRecordBase *de);
+ virtual const TQString getTitle(PilotRecordBase *de);
- virtual const QString dbname() { return CSL1("ToDoDB"); };
+ virtual const TQString dbname() { return CSL1("ToDoDB"); };
virtual void preSync();
virtual VCalConduitPrivateBase *createPrivateCalendarData(KCal::Calendar *fCalendar)
{
diff --git a/kpilot/conduits/vcalconduit/todo-setup.cc b/kpilot/conduits/vcalconduit/todo-setup.cc
index eb1c98c91..19a731c5a 100644
--- a/kpilot/conduits/vcalconduit/todo-setup.cc
+++ b/kpilot/conduits/vcalconduit/todo-setup.cc
@@ -29,7 +29,7 @@
#include "options.h"
-#include <qbuttongroup.h>
+#include <tqbuttongroup.h>
#include <kaboutdata.h>
#include "korganizerConduit.h"
@@ -38,7 +38,7 @@
-ToDoWidgetSetup::ToDoWidgetSetup(QWidget *w, const char *n) :
+ToDoWidgetSetup::ToDoWidgetSetup(TQWidget *w, const char *n) :
VCalWidgetSetupBase(w,n)
{
FUNCTIONSETUP;
@@ -74,7 +74,7 @@ ToDoWidgetSetup::~ToDoWidgetSetup()
FUNCTIONSETUP;
}
-/* static */ ConduitConfigBase *ToDoWidgetSetup::create(QWidget *w, const char *n)
+/* static */ ConduitConfigBase *ToDoWidgetSetup::create(TQWidget *w, const char *n)
{
return new ToDoWidgetSetup(w,n);
}
diff --git a/kpilot/conduits/vcalconduit/todo-setup.h b/kpilot/conduits/vcalconduit/todo-setup.h
index 9eebd3a3d..b9b919c92 100644
--- a/kpilot/conduits/vcalconduit/todo-setup.h
+++ b/kpilot/conduits/vcalconduit/todo-setup.h
@@ -34,11 +34,11 @@
class ToDoWidgetSetup : public VCalWidgetSetupBase
{
public:
- ToDoWidgetSetup(QWidget *,const char *);
+ ToDoWidgetSetup(TQWidget *,const char *);
virtual ~ToDoWidgetSetup();
virtual VCalConduitSettings*config();
- static ConduitConfigBase *create(QWidget *, const char *);
+ static ConduitConfigBase *create(TQWidget *, const char *);
} ;
#endif
diff --git a/kpilot/conduits/vcalconduit/todoRecord.cc b/kpilot/conduits/vcalconduit/todoRecord.cc
index 7db753fb5..7618df368 100644
--- a/kpilot/conduits/vcalconduit/todoRecord.cc
+++ b/kpilot/conduits/vcalconduit/todoRecord.cc
@@ -126,7 +126,7 @@ bool KCalSync::setTodo(KCal::Todo *e,
// COMPLETED? //
e->setCompleted(de->getComplete());
if ( de->getComplete() && !e->hasCompletedDate() ) {
- e->setCompleted( QDateTime::currentDateTime() );
+ e->setCompleted( TQDateTime::currentDateTime() );
}
e->setSummary(de->getDescription());
diff --git a/kpilot/conduits/vcalconduit/vcal-conduit.cc b/kpilot/conduits/vcalconduit/vcal-conduit.cc
index 0eea42733..d882cf8f8 100644
--- a/kpilot/conduits/vcalconduit/vcal-conduit.cc
+++ b/kpilot/conduits/vcalconduit/vcal-conduit.cc
@@ -104,8 +104,8 @@ KCal::Incidence *VCalConduitPrivate::findIncidence(PilotRecordBase *tosearch)
PilotDateEntry*entry=dynamic_cast<PilotDateEntry*>(tosearch);
if (!entry) return 0L;
- QString title=entry->getDescription();
- QDateTime dt=readTm( entry->getEventStart() );
+ TQString title=entry->getDescription();
+ TQDateTime dt=readTm( entry->getEventStart() );
KCal::Event::List::ConstIterator it;
for( it = fAllEvents.begin(); it != fAllEvents.end(); ++it ) {
@@ -170,7 +170,7 @@ KCal::Incidence *VCalConduitPrivate::getNextModifiedIncidence()
VCalConduit::VCalConduit(KPilotLink *d,
const char *n,
- const QStringList &a) :
+ const TQStringList &a) :
VCalConduitBase(d,n,a),
fAppointmentAppInfo( 0L )
{
@@ -196,11 +196,11 @@ void VCalConduit::_getAppInfo()
fAppointmentAppInfo = new PilotDateInfo( fDatabase );
}
-const QString VCalConduit::getTitle(PilotRecordBase *de)
+const TQString VCalConduit::getTitle(PilotRecordBase *de)
{
PilotDateEntry*d=dynamic_cast<PilotDateEntry*>(de);
- if (d) return QString(d->getDescription());
- return QString::null;
+ if (d) return TQString(d->getDescription());
+ return TQString::null;
}
diff --git a/kpilot/conduits/vcalconduit/vcal-conduit.h b/kpilot/conduits/vcalconduit/vcal-conduit.h
index c41ceb906..ed47d712f 100644
--- a/kpilot/conduits/vcalconduit/vcal-conduit.h
+++ b/kpilot/conduits/vcalconduit/vcal-conduit.h
@@ -70,11 +70,11 @@ Q_OBJECT
public:
VCalConduit(KPilotLink *,
const char *name=0L,
- const QStringList &args = QStringList());
+ const TQStringList &args = TQStringList());
virtual ~VCalConduit();
protected:
- virtual const QString dbname() { return CSL1("DatebookDB"); };
+ virtual const TQString dbname() { return CSL1("DatebookDB"); };
virtual void preSync() {VCalConduitBase::preSync(); _getAppInfo(); };
virtual VCalConduitPrivateBase *createPrivateCalendarData(KCal::Calendar *fCalendar);
@@ -84,7 +84,7 @@ protected:
virtual PilotRecordBase *newPilotEntry(PilotRecord*r);
virtual KCal::Incidence*newIncidence();
- virtual const QString getTitle(PilotRecordBase *de);
+ virtual const TQString getTitle(PilotRecordBase *de);
virtual VCalConduitSettings *config();
public:
static VCalConduitSettings *theConfig();
diff --git a/kpilot/conduits/vcalconduit/vcal-conduitbase.cc b/kpilot/conduits/vcalconduit/vcal-conduitbase.cc
index a9fc6376b..cd288ba59 100644
--- a/kpilot/conduits/vcalconduit/vcal-conduitbase.cc
+++ b/kpilot/conduits/vcalconduit/vcal-conduitbase.cc
@@ -33,8 +33,8 @@
#include <options.h>
-#include <qtimer.h>
-#include <qfile.h>
+#include <tqtimer.h>
+#include <tqfile.h>
#include <kmessagebox.h>
#include <kio/netaccess.h>
@@ -66,7 +66,7 @@
VCalConduitBase::VCalConduitBase(KPilotLink *d,
const char *n,
- const QStringList &a) :
+ const TQStringList &a) :
ConduitAction(d,n,a),
fCalendar(0L),
fP(0L)
@@ -176,7 +176,7 @@ VCalConduitBase::~VCalConduitBase()
if (!syncMode().isTest() && !openCalendar() ) goto error;
// Start processing the sync
- QTimer::singleShot(0, this, SLOT(slotProcess()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotProcess()));
return true;
error:
@@ -200,13 +200,13 @@ void VCalConduitBase::slotProcess() {
if( hasNextRecord )
{
fState->handleRecord( this );
- QTimer::singleShot( 0, this, SLOT( slotProcess() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotProcess() ) );
}
// Else finish the current state if there is one
else if( fState )
{
fState->finishSync( this );
- QTimer::singleShot( 0, this, SLOT( slotProcess() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotProcess() ) );
}
// No state so sync is finished
else
@@ -245,7 +245,7 @@ static void listResources( KCal::CalendarResources *p )
// this part taken from adcalendarbase.cpp:
korgcfg.setGroup( "Time & Date" );
- QString tz(korgcfg.readEntry( "TimeZoneId" ) );
+ TQString tz(korgcfg.readEntry( "TimeZoneId" ) );
DEBUGKPILOT << fname << ": KOrganizer's time zone = " << tz << endl;
@@ -312,7 +312,7 @@ static void listResources( KCal::CalendarResources *p )
// Try to create empty file. if it fails,
// no valid file name was given.
- QFile fl(fCalendarFile);
+ TQFile fl(fCalendarFile);
if (!fl.open(IO_WriteOnly | IO_Append))
{
DEBUGKPILOT << fname << "Invalid calendar file name "
@@ -422,7 +422,7 @@ int VCalConduitBase::resolveConflict( KCal::Incidence *e, PilotRecordBase *de )
if ( getConflictResolution() == SyncAction::eAskUser )
{
// TODO: This is messed up!!!
- QString query = i18n( "The following item was modified "
+ TQString query = i18n( "The following item was modified "
"both on the Handheld and on your PC:\nPC entry:\n\t" );
query += e->summary();
query += i18n( "\nHandheld entry:\n\t" );
@@ -433,7 +433,7 @@ int VCalConduitBase::resolveConflict( KCal::Incidence *e, PilotRecordBase *de )
return KMessageBox::No == questionYesNo(
query,
i18n( "Conflicting Entries" ),
- QString::null,
+ TQString::null,
0 /* Never timeout */,
i18n( "Handheld" ), i18n( "PC" ));
}
@@ -579,9 +579,9 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
}
}
-const QString VCalConduitBase::dbname()
+const TQString VCalConduitBase::dbname()
{
- return QString::null;
+ return TQString::null;
}
PilotRecord *VCalConduitBase::readRecordByIndex( int index )
diff --git a/kpilot/conduits/vcalconduit/vcal-conduitbase.h b/kpilot/conduits/vcalconduit/vcal-conduitbase.h
index 7d2fc6588..4e2f3ae10 100644
--- a/kpilot/conduits/vcalconduit/vcal-conduitbase.h
+++ b/kpilot/conduits/vcalconduit/vcal-conduitbase.h
@@ -30,7 +30,7 @@
*/
-#include <qstring.h>
+#include <tqstring.h>
#include <libkcal/calendarlocal.h>
@@ -78,7 +78,7 @@ class VCalConduitBase : public ConduitAction
public:
VCalConduitBase(KPilotLink *,
const char *name = 0L,
- const QStringList &args = QStringList());
+ const TQStringList &args = TQStringList());
virtual ~VCalConduitBase();
/*********************************************************************
@@ -86,13 +86,13 @@ public:
*********************************************************************/
protected:
KCal::Calendar *fCalendar;
- QString fCalendarFile;
+ TQString fCalendarFile;
VCalConduitPrivateBase *fP;
ConduitState *fState;
bool hasNextRecord;
- virtual const QString dbname() = 0;
- virtual const QString getTitle(PilotRecordBase *de) = 0;
+ virtual const TQString dbname() = 0;
+ virtual const TQString getTitle(PilotRecordBase *de) = 0;
virtual void readConfig();
virtual bool exec();
@@ -147,7 +147,7 @@ public:
// Getters
KCal::Calendar *calendar() const { return fCalendar; };
- QString calendarFile() const { return fCalendarFile; };
+ TQString calendarFile() const { return fCalendarFile; };
virtual VCalConduitSettings *config() = 0;
virtual PilotDatabase *database() const { return fDatabase; };
diff --git a/kpilot/conduits/vcalconduit/vcal-setup.cc b/kpilot/conduits/vcalconduit/vcal-setup.cc
index 666e9ee0a..0361c3255 100644
--- a/kpilot/conduits/vcalconduit/vcal-setup.cc
+++ b/kpilot/conduits/vcalconduit/vcal-setup.cc
@@ -29,7 +29,7 @@
#include "options.h"
-#include <qbuttongroup.h>
+#include <tqbuttongroup.h>
#include <kaboutdata.h>
#include "korganizerConduit.h"
@@ -37,7 +37,7 @@
#include "vcal-setup.h"
-VCalWidgetSetup::VCalWidgetSetup(QWidget *w, const char *n) :
+VCalWidgetSetup::VCalWidgetSetup(TQWidget *w, const char *n) :
VCalWidgetSetupBase(w,n)
{
KAboutData *fAbout = new KAboutData("vcalConduit",
@@ -71,7 +71,7 @@ VCalWidgetSetup::VCalWidgetSetup(QWidget *w, const char *n) :
}
-/* static */ ConduitConfigBase *VCalWidgetSetup::create(QWidget *w,const char *n)
+/* static */ ConduitConfigBase *VCalWidgetSetup::create(TQWidget *w,const char *n)
{
return new VCalWidgetSetup(w,n);
}
diff --git a/kpilot/conduits/vcalconduit/vcal-setup.h b/kpilot/conduits/vcalconduit/vcal-setup.h
index 407c0d99f..20723ceb8 100644
--- a/kpilot/conduits/vcalconduit/vcal-setup.h
+++ b/kpilot/conduits/vcalconduit/vcal-setup.h
@@ -37,8 +37,8 @@ class VCalConduitSettings;
class VCalWidgetSetup : public VCalWidgetSetupBase
{
public:
- VCalWidgetSetup(QWidget *, const char *);
- static ConduitConfigBase *create(QWidget *, const char *);
+ VCalWidgetSetup(TQWidget *, const char *);
+ static ConduitConfigBase *create(TQWidget *, const char *);
protected:
virtual VCalConduitSettings*config();
} ;
diff --git a/kpilot/conduits/vcalconduit/vcal-setupbase.cc b/kpilot/conduits/vcalconduit/vcal-setupbase.cc
index 3e97987fa..643dee645 100644
--- a/kpilot/conduits/vcalconduit/vcal-setupbase.cc
+++ b/kpilot/conduits/vcalconduit/vcal-setupbase.cc
@@ -29,9 +29,9 @@
#include "options.h"
-#include <qcheckbox.h>
-#include <qbuttongroup.h>
-#include <qcombobox.h>
+#include <tqcheckbox.h>
+#include <tqbuttongroup.h>
+#include <tqcombobox.h>
#include <kurlrequester.h>
@@ -39,7 +39,7 @@
#include "vcalconduitSettings.h"
#include "vcal-setupbase.h"
-VCalWidgetSetupBase::VCalWidgetSetupBase(QWidget *w, const char *n) :
+VCalWidgetSetupBase::VCalWidgetSetupBase(TQWidget *w, const char *n) :
ConduitConfigBase(w,n),
fConfigWidget(new VCalWidget(w))
{
@@ -49,11 +49,11 @@ VCalWidgetSetupBase::VCalWidgetSetupBase(QWidget *w, const char *n) :
fConfigWidget->fCalendarFile->setMode(KFile::File);
fConfigWidget->fCalendarFile->setFilter(CSL1("*.vcs *.ics|ICalendars\n*.*|All Files (*.*)"));
-#define CM(a,b) connect(fConfigWidget->a,b,this,SLOT(modified()));
- CM(fSyncDestination,SIGNAL(clicked(int)));
- CM(fCalendarFile,SIGNAL(textChanged(const QString &)));
- CM(fArchive,SIGNAL(toggled(bool)));
- CM(fConflictResolution,SIGNAL(activated(int)));
+#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified()));
+ CM(fSyncDestination,TQT_SIGNAL(clicked(int)));
+ CM(fCalendarFile,TQT_SIGNAL(textChanged(const TQString &)));
+ CM(fArchive,TQT_SIGNAL(toggled(bool)));
+ CM(fConflictResolution,TQT_SIGNAL(activated(int)));
#undef CM
}
diff --git a/kpilot/conduits/vcalconduit/vcal-setupbase.h b/kpilot/conduits/vcalconduit/vcal-setupbase.h
index 7863659bd..a14bf14d8 100644
--- a/kpilot/conduits/vcalconduit/vcal-setupbase.h
+++ b/kpilot/conduits/vcalconduit/vcal-setupbase.h
@@ -37,7 +37,7 @@ class VCalConduitSettings;
class VCalWidgetSetupBase : public ConduitConfigBase
{
public:
- VCalWidgetSetupBase(QWidget *, const char *);
+ VCalWidgetSetupBase(TQWidget *, const char *);
virtual ~VCalWidgetSetupBase();
virtual void load();
diff --git a/kpilot/conduits/vcalconduit/vcalRecord.cc b/kpilot/conduits/vcalconduit/vcalRecord.cc
index f9866d91a..898bc7986 100644
--- a/kpilot/conduits/vcalconduit/vcalRecord.cc
+++ b/kpilot/conduits/vcalconduit/vcalRecord.cc
@@ -70,7 +70,7 @@ static void setAlarms(KCal::Event *e, const PilotDateEntry *de)
e->clearAlarms();
if (!de->isAlarmEnabled()) return;
-// QDateTime alarmDT = readTm(de->getEventStart());
+// TQDateTime alarmDT = readTm(de->getEventStart());
int advanceUnits = de->getAdvanceUnits();
switch (advanceUnits)
@@ -117,7 +117,7 @@ static void setRecurrence(KCal::Event *event,const PilotDateEntry *dateEntry)
KCal::Recurrence *recur = event->recurrence();
int freq = dateEntry->getRepeatFrequency();
bool repeatsForever = dateEntry->getRepeatForever();
- QDate endDate, evt;
+ TQDate endDate, evt;
if (!repeatsForever)
{
@@ -131,7 +131,7 @@ static void setRecurrence(KCal::Event *event,const PilotDateEntry *dateEntry)
#endif
}
- QBitArray dayArray(7);
+ TQBitArray dayArray(7);
switch(dateEntry->getRepeatType())
{
@@ -326,7 +326,7 @@ static void setRecurrence(PilotDateEntry*dateEntry, const KCal::Event *event)
// first we have 'fake type of recurrence' when a multi-day event is passed to the pilot, it is converted to an event
// which recurs daily a number of times. if the event itself recurs, this will be overridden, and
// only the first day will be included in the event!!!!
- QDateTime startDt(readTm(dateEntry->getEventStart())), endDt(readTm(dateEntry->getEventEnd()));
+ TQDateTime startDt(readTm(dateEntry->getEventStart())), endDt(readTm(dateEntry->getEventEnd()));
if (startDt.daysTo(endDt))
{
isMultiDay=true;
@@ -350,7 +350,7 @@ static void setRecurrence(PilotDateEntry*dateEntry, const KCal::Event *event)
int freq=r->frequency();
- QDate endDate=r->endDate();
+ TQDate endDate=r->endDate();
if ( r->duration() < 0 || !endDate.isValid() )
{
@@ -366,7 +366,7 @@ static void setRecurrence(PilotDateEntry*dateEntry, const KCal::Event *event)
DEBUGKPILOT<< "duration: "<<r->duration() << ", endDate: "<<endDate.toString()<< ", ValidEndDate: "<<endDate.isValid()<<", NullEndDate: "<<endDate.isNull()<<endl;
#endif
- QBitArray dayArray(7), dayArrayPalm(7);
+ TQBitArray dayArray(7), dayArrayPalm(7);
switch(recType)
{
case KCal::Recurrence::rDaily:
@@ -392,7 +392,7 @@ static void setRecurrence(PilotDateEntry*dateEntry, const KCal::Event *event)
if (r->monthPositions().count()>0)
{
// Only take the first monthly position, as the palm allows only one
- QValueList<KCal::RecurrenceRule::WDayPos> mps=r->monthPositions();
+ TQValueList<KCal::RecurrenceRule::WDayPos> mps=r->monthPositions();
KCal::RecurrenceRule::WDayPos mp=mps.first();
int week = mp.pos();
int day = (mp.day()+1) % 7; // rotate because of different offset