summaryrefslogtreecommitdiffstats
path: root/conduits/vcalconduit
diff options
context:
space:
mode:
Diffstat (limited to 'conduits/vcalconduit')
-rw-r--r--conduits/vcalconduit/Makefile.am6
-rw-r--r--conduits/vcalconduit/cleanupstate.cc2
-rw-r--r--conduits/vcalconduit/hhtopcstate.cc4
-rw-r--r--conduits/vcalconduit/korganizerConduit.ui20
-rw-r--r--conduits/vcalconduit/pctohhstate.cc2
-rw-r--r--conduits/vcalconduit/teststate.cc2
-rw-r--r--conduits/vcalconduit/todo-conduit.cc6
-rw-r--r--conduits/vcalconduit/todo-conduit.h1
-rw-r--r--conduits/vcalconduit/todoRecord.cc4
-rw-r--r--conduits/vcalconduit/vcal-conduit.cc6
-rw-r--r--conduits/vcalconduit/vcal-conduit.h1
-rw-r--r--conduits/vcalconduit/vcal-conduitbase.cc30
-rw-r--r--conduits/vcalconduit/vcal-conduitbase.h1
-rw-r--r--conduits/vcalconduit/vcalRecord.cc4
14 files changed, 45 insertions, 44 deletions
diff --git a/conduits/vcalconduit/Makefile.am b/conduits/vcalconduit/Makefile.am
index 4f0dcd8..76aae3d 100644
--- a/conduits/vcalconduit/Makefile.am
+++ b/conduits/vcalconduit/Makefile.am
@@ -24,17 +24,15 @@ libvcalconduit_shared_la_SOURCES = vcalconduitSettings.kcfgc \
conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \
vcal-factory.cc vcal-setup.cc
-conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lkcal -lkresources
conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \
- ../../../libkcal/libkcal.la \
libvcalconduit_shared.la
conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h
conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \
todo-factory.cc todo-setup.cc
-conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lkcal -lkresources
conduit_todo_la_LIBADD = ../../lib/libkpilot.la \
- ../../../libkcal/libkcal.la \
libvcalconduit_shared.la
conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h
diff --git a/conduits/vcalconduit/cleanupstate.cc b/conduits/vcalconduit/cleanupstate.cc
index 209a0e9..76d756d 100644
--- a/conduits/vcalconduit/cleanupstate.cc
+++ b/conduits/vcalconduit/cleanupstate.cc
@@ -91,7 +91,7 @@ void CleanUpState::startSync( ConduitAction *ca )
vccb->addLogError( i18n( "An error occurred while uploading"
" \"%1\". You can try to upload "
"the temporary local file \"%2\" manually.")
- .arg(vccb->config()->calendarFile()).arg(fCalendarFile));
+ .tqarg(vccb->config()->calendarFile()).tqarg(fCalendarFile));
}
else {
KIO::NetAccess::removeTempFile( fCalendarFile );
diff --git a/conduits/vcalconduit/hhtopcstate.cc b/conduits/vcalconduit/hhtopcstate.cc
index 82024f1..4fa12af 100644
--- a/conduits/vcalconduit/hhtopcstate.cc
+++ b/conduits/vcalconduit/hhtopcstate.cc
@@ -123,7 +123,7 @@ void HHToPCState::handleRecord( ConduitAction *ca )
{
KCal::Incidence *e = vccb->addRecord( r );
if ( vccb->config()->syncArchived() && archiveRecord ) {
- e->setSyncStatus( KCal::Incidence::SYNCDEL );
+ e->setSynctqStatus( KCal::Incidence::SYNCDEL );
}
}
}
@@ -218,7 +218,7 @@ void VCalConduitBase::slotPalmRecToPC()
{
KCal::Incidence*e=addRecord(r);
if (config()->syncArchived() && archiveRecord) {
- e->setSyncStatus(KCal::Incidence::SYNCDEL);
+ e->setSynctqStatus(KCal::Incidence::SYNCDEL);
}
}
}
diff --git a/conduits/vcalconduit/korganizerConduit.ui b/conduits/vcalconduit/korganizerConduit.ui
index 7ff813a..b6cefab 100644
--- a/conduits/vcalconduit/korganizerConduit.ui
+++ b/conduits/vcalconduit/korganizerConduit.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>VCalWidget</class>
<author>Adriaan de Groot</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Form1</cstring>
</property>
@@ -44,7 +44,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QTabWidget" row="0" column="0">
+ <widget class="TQTabWidget" row="0" column="0">
<property name="name">
<cstring>tabWidget</cstring>
</property>
@@ -58,7 +58,7 @@
</property>
<property name="tqlayoutMargin" stdset="0">
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>Widget2</cstring>
</property>
@@ -86,7 +86,7 @@
</size>
</property>
</spacer>
- <widget class="QButtonGroup" row="0" column="0">
+ <widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>fSyncDestination</cstring>
</property>
@@ -97,7 +97,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>fSyncStdCalendar</cstring>
</property>
@@ -108,7 +108,7 @@
<string>&lt;qt&gt;Select this option to synchronize with the calendar specified by the KDE calendar settings.&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QRadioButton" row="1" column="0">
+ <widget class="TQRadioButton" row="1" column="0">
<property name="name">
<cstring>fSyncFile</cstring>
</property>
@@ -143,7 +143,7 @@
</widget>
</grid>
</widget>
- <widget class="QCheckBox" row="1" column="0">
+ <widget class="TQCheckBox" row="1" column="0">
<property name="name">
<cstring>fArchive</cstring>
</property>
@@ -157,7 +157,7 @@ be saved in the calendar on the PC.</string>
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -168,7 +168,7 @@ be saved in the calendar on the PC.</string>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>fTextLabel</cstring>
</property>
@@ -187,7 +187,7 @@ be saved in the calendar on the PC.</string>
<cstring>fConflictResolution</cstring>
</property>
</widget>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<item>
<property name="text">
<string>Use KPilot's Global Setting</string>
diff --git a/conduits/vcalconduit/pctohhstate.cc b/conduits/vcalconduit/pctohhstate.cc
index d2866fd..84d50ed 100644
--- a/conduits/vcalconduit/pctohhstate.cc
+++ b/conduits/vcalconduit/pctohhstate.cc
@@ -120,7 +120,7 @@ void PCToHHState::handleRecord( ConduitAction *ca )
if( id > 0 && ( s = vccb->database()->readRecordById( id ) ) )
{
- if( e->syncStatus() == KCal::Incidence::SYNCDEL )
+ if( e->synctqStatus() == KCal::Incidence::SYNCDEL )
{
vccb->deletePalmRecord( e, s );
}
diff --git a/conduits/vcalconduit/teststate.cc b/conduits/vcalconduit/teststate.cc
index c762d32..7088033 100644
--- a/conduits/vcalconduit/teststate.cc
+++ b/conduits/vcalconduit/teststate.cc
@@ -38,7 +38,7 @@
#include "teststate.h"
#include "vcal-conduitbase.h"
-TestState::TestState() : fCalendar( TQString::null )
+TestState::TestState() : fCalendar( TQString() )
{
fState = eTest;
}
diff --git a/conduits/vcalconduit/todo-conduit.cc b/conduits/vcalconduit/todo-conduit.cc
index 9b1007c..fee93d6 100644
--- a/conduits/vcalconduit/todo-conduit.cc
+++ b/conduits/vcalconduit/todo-conduit.cc
@@ -154,13 +154,13 @@ KCal::Incidence *TodoConduitPrivate::getNextModifiedIncidence()
}
if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator;
while (fAllTodosIterator != fAllTodos.end() &&
- e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId())
+ e && e->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId())
{
e = (++fAllTodosIterator != fAllTodos.end()) ? *fAllTodosIterator : 0L;
#ifdef DEBUG
if(e)
- DEBUGKPILOT<< e->summary()<<" had SyncStatus="<<e->syncStatus()<<endl;
+ DEBUGKPILOT<< e->summary()<<" had SynctqStatus="<<e->synctqStatus()<<endl;
#endif
}
@@ -230,7 +230,7 @@ const TQString TodoConduit::getTitle(PilotRecordBase *de)
{
return TQString(d->getDescription());
}
- return TQString::null;
+ return TQString();
}
diff --git a/conduits/vcalconduit/todo-conduit.h b/conduits/vcalconduit/todo-conduit.h
index 8d8780e..5938d41 100644
--- a/conduits/vcalconduit/todo-conduit.h
+++ b/conduits/vcalconduit/todo-conduit.h
@@ -64,6 +64,7 @@ public:
class TodoConduit : public VCalConduitBase
{
Q_OBJECT
+ TQ_OBJECT
public:
TodoConduit(KPilotLink *,
const char *name=0L,
diff --git a/conduits/vcalconduit/todoRecord.cc b/conduits/vcalconduit/todoRecord.cc
index 9bc0998..f3baaeb 100644
--- a/conduits/vcalconduit/todoRecord.cc
+++ b/conduits/vcalconduit/todoRecord.cc
@@ -134,8 +134,8 @@ bool KCalSync::setTodo(KCal::Todo *e,
// NOTE: This MUST be done last, since every other set* call
// calls updated(), which will trigger an
- // setSyncStatus(SYNCMOD)!!!
- e->setSyncStatus(KCal::Incidence::SYNCNONE);
+ // setSynctqStatus(SYNCMOD)!!!
+ e->setSynctqStatus(KCal::Incidence::SYNCNONE);
return true;
}
diff --git a/conduits/vcalconduit/vcal-conduit.cc b/conduits/vcalconduit/vcal-conduit.cc
index d882cf8..52bd759 100644
--- a/conduits/vcalconduit/vcal-conduit.cc
+++ b/conduits/vcalconduit/vcal-conduit.cc
@@ -155,7 +155,7 @@ KCal::Incidence *VCalConduitPrivate::getNextModifiedIncidence()
if ( fAllEventsIterator != fAllEvents.end() ) e = *fAllEventsIterator;
// Then walk the list until we find an unsynced entry
while ( fAllEventsIterator != fAllEvents.end() &&
- e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0)
+ e && e->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0)
{
e = (++fAllEventsIterator != fAllEvents.end()) ? *fAllEventsIterator : 0L;
}
@@ -200,7 +200,7 @@ const TQString VCalConduit::getTitle(PilotRecordBase *de)
{
PilotDateEntry*d=dynamic_cast<PilotDateEntry*>(de);
if (d) return TQString(d->getDescription());
- return TQString::null;
+ return TQString();
}
@@ -219,7 +219,7 @@ PilotRecord *VCalConduit::recordFromIncidence(PilotRecordBase *de, const KCal::I
(e->recurrenceType() == KCal::Recurrence::rYearlyPos) )
{
// Warn ahead of time
- emit logMessage(i18n("Event \"%1\" has a yearly recurrence other than by month, will change this to recurrence by month on handheld.").arg(e->summary()));
+ emit logMessage(i18n("Event \"%1\" has a yearly recurrence other than by month, will change this to recurrence by month on handheld.").tqarg(e->summary()));
}
PilotDateEntry *dateEntry = dynamic_cast<PilotDateEntry*>(de);
diff --git a/conduits/vcalconduit/vcal-conduit.h b/conduits/vcalconduit/vcal-conduit.h
index ed47d71..482e8e7 100644
--- a/conduits/vcalconduit/vcal-conduit.h
+++ b/conduits/vcalconduit/vcal-conduit.h
@@ -67,6 +67,7 @@ public:
class VCalConduit : public VCalConduitBase
{
Q_OBJECT
+ TQ_OBJECT
public:
VCalConduit(KPilotLink *,
const char *name=0L,
diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc
index cd288ba..33ae4f1 100644
--- a/conduits/vcalconduit/vcal-conduitbase.cc
+++ b/conduits/vcalconduit/vcal-conduitbase.cc
@@ -288,8 +288,8 @@ static void listResources( KCal::CalendarResources *p )
<< fCalendar->isLocalTime() << endl;
emit logMessage( fCalendar->isLocalTime() ?
- i18n( "Using local time zone: %1" ).arg( tz ) :
- i18n( "Using non-local time zone: %1" ).arg( tz ) );
+ i18n( "Using local time zone: %1" ).tqarg( tz ) :
+ i18n( "Using non-local time zone: %1" ).tqarg( tz ) );
KURL kurl( config()->calendarFile() );
if( !KIO::NetAccess::download( config()->calendarFile(),
@@ -298,7 +298,7 @@ static void listResources( KCal::CalendarResources *p )
emit logError(i18n( "You chose to sync with the file \"%1\", which "
"cannot be opened. Please make sure to supply a "
"valid file name in the conduit's configuration dialog. "
- "Aborting the conduit." ).arg( config()->calendarFile() ) );
+ "Aborting the conduit." ).tqarg( config()->calendarFile() ) );
KIO::NetAccess::removeTempFile( fCalendarFile );
return false;
}
@@ -321,14 +321,14 @@ static void listResources( KCal::CalendarResources *p )
emit logError( i18n( "You chose to sync with the file \"%1\", which "
"cannot be opened or created. Please make sure to supply a "
"valid file name in the conduit's configuration dialog. "
- "Aborting the conduit." ).arg( config()->calendarFile() ) );
+ "Aborting the conduit." ).tqarg( config()->calendarFile() ) );
return false;
}
fl.close();
setFirstSync( true );
}
addSyncLogEntry( i18n( "Syncing with file \"%1\"" )
- .arg( config()->calendarFile() ) );
+ .tqarg( config()->calendarFile() ) );
break;
}
@@ -353,8 +353,8 @@ static void listResources( KCal::CalendarResources *p )
#endif
addSyncLogEntry( i18n( "Syncing with standard calendar resource." ) );
emit logMessage( fCalendar->isLocalTime() ?
- i18n( "Using local time zone: %1" ).arg( tz ) :
- i18n( "Using non-local time zone: %1" ).arg( tz ) );
+ i18n( "Using local time zone: %1" ).tqarg( tz ) :
+ i18n( "Using non-local time zone: %1" ).tqarg( tz ) );
break;
default:
break;
@@ -433,7 +433,7 @@ int VCalConduitBase::resolveConflict( KCal::Incidence *e, PilotRecordBase *de )
return KMessageBox::No == questionYesNo(
query,
i18n( "Conflicting Entries" ),
- TQString::null,
+ TQString(),
0 /* Never timeout */,
i18n( "Handheld" ), i18n( "PC" ));
}
@@ -452,7 +452,7 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *)
if ( e && de )
{
// TODO: check for conflict, and if there is one, ask for resolution
- if ( ( e->syncStatus() != KCal::Incidence::SYNCNONE )
+ if ( ( e->synctqStatus() != KCal::Incidence::SYNCNONE )
&& r->isModified() )
{
// TODO: I have not yet found a way to complete ignore an item
@@ -468,8 +468,8 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *)
// NOTE: This MUST be done last, since every other set* call
// calls updated(), which will trigger an
- // setSyncStatus(SYNCMOD)!!!
- e->setSyncStatus(KCal::Incidence::SYNCNONE);
+ // setSynctqStatus(SYNCMOD)!!!
+ e->setSynctqStatus(KCal::Incidence::SYNCNONE);
fLocalDatabase->writeRecord( r );
}
else
@@ -552,7 +552,7 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
return;
}
- if ( e->syncStatus() == KCal::Incidence::SYNCDEL )
+ if ( e->synctqStatus() == KCal::Incidence::SYNCDEL )
{
DEBUGKPILOT << fname << ": don't write deleted incidence "
<< e->summary() << " to the palm" << endl;
@@ -573,15 +573,15 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
// NOTE: This MUST be done last, since every other set* call
// calls updated(), which will trigger an
- // setSyncStatus(SYNCMOD)!!!
- e->setSyncStatus(KCal::Incidence::SYNCNONE);
+ // setSynctqStatus(SYNCMOD)!!!
+ e->setSynctqStatus(KCal::Incidence::SYNCNONE);
KPILOT_DELETE( r );
}
}
const TQString VCalConduitBase::dbname()
{
- return TQString::null;
+ return TQString();
}
PilotRecord *VCalConduitBase::readRecordByIndex( int index )
diff --git a/conduits/vcalconduit/vcal-conduitbase.h b/conduits/vcalconduit/vcal-conduitbase.h
index 4e2f3ae..7f04cfd 100644
--- a/conduits/vcalconduit/vcal-conduitbase.h
+++ b/conduits/vcalconduit/vcal-conduitbase.h
@@ -75,6 +75,7 @@ public:
class VCalConduitBase : public ConduitAction
{
Q_OBJECT
+ TQ_OBJECT
public:
VCalConduitBase(KPilotLink *,
const char *name = 0L,
diff --git a/conduits/vcalconduit/vcalRecord.cc b/conduits/vcalconduit/vcalRecord.cc
index 898bc79..fc274b1 100644
--- a/conduits/vcalconduit/vcalRecord.cc
+++ b/conduits/vcalconduit/vcalRecord.cc
@@ -512,8 +512,8 @@ bool KCalSync::setEvent(KCal::Event *e,
// NOTE: This MUST be done last, since every other set* call
// calls updated(), which will trigger an
- // setSyncStatus(SYNCMOD)!!!
- e->setSyncStatus(KCal::Incidence::SYNCNONE);
+ // setSynctqStatus(SYNCMOD)!!!
+ e->setSynctqStatus(KCal::Incidence::SYNCNONE);
return true;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 13:56:18 +0000