diff options
Diffstat (limited to 'conduits/knotes')
| -rw-r--r-- | conduits/knotes/knotes-action.cc | 40 | ||||
| -rw-r--r-- | conduits/knotes/knotes-action.h | 2 | ||||
| -rw-r--r-- | conduits/knotes/setup_base.ui | 2 |
3 files changed, 22 insertions, 22 deletions
diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc index 7664f46..ca32913 100644 --- a/conduits/knotes/knotes-action.cc +++ b/conduits/knotes/knotes-action.cc @@ -79,7 +79,7 @@ public: int memo() const { return memoId; } ; KNoteID_t note() const { return noteId; } ; inline bool valid() const { return (memoId>0) && (!noteId.isEmpty()) ; } ; - TQString toString() const { return CSL1("<%1,%2>").tqarg(noteId).tqarg(memoId); } ; + TQString toString() const { return CSL1("<%1,%2>").arg(noteId).arg(memoId); } ; static NoteAndMemo findNote(const TQValueList<NoteAndMemo> &,KNoteID_pt note); static NoteAndMemo findMemo(const TQValueList<NoteAndMemo> &,int memo); @@ -234,7 +234,7 @@ KNotesAction::KNotesAction(KPilotLink *o, } fP->fTimer = new TQTimer(this); - fActiontqStatus = Init; + fActionStatus = Init; // this is not needed. As it is done in the initstate in process(); // resetIndexes(); @@ -269,7 +269,7 @@ bool KNotesAction::openKNotesResource() } else { - emit logError( i18n("Could not load the resource at: %1").tqarg(mURL.path()) ); + emit logError( i18n("Could not load the resource at: %1").arg(mURL.path()) ); return false; } } @@ -308,9 +308,9 @@ void KNotesAction::listNotes() { FUNCTIONSETUP; - DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl; + DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl; - switch(fActiontqStatus) + switch(fActionStatus) { case Init: resetIndexes(); @@ -321,16 +321,16 @@ void KNotesAction::listNotes() case SyncAction::SyncMode::eBackup: case SyncAction::SyncMode::eRestore: // Impossible! - fActiontqStatus = Done; + fActionStatus = Done; break; case SyncAction::SyncMode::eCopyHHToPC : listNotes(); // Debugging - fActiontqStatus = MemosToKNotes; + fActionStatus = MemosToKNotes; break; case SyncAction::SyncMode::eHotSync: case SyncAction::SyncMode::eFullSync: case SyncAction::SyncMode::eCopyPCToHH: - fActiontqStatus = ModifiedNotesToPilot; + fActionStatus = ModifiedNotesToPilot; break; } break; @@ -338,14 +338,14 @@ void KNotesAction::listNotes() if (modifyNoteOnPilot()) { resetIndexes(); - fActiontqStatus = DeleteNotesOnPilot; + fActionStatus = DeleteNotesOnPilot; } break; case DeleteNotesOnPilot: if (deleteNoteOnPilot()) { resetIndexes(); - fActiontqStatus = NewNotesToPilot; + fActionStatus = NewNotesToPilot; } break; case NewNotesToPilot : @@ -359,14 +359,14 @@ void KNotesAction::listNotes() case SyncAction::SyncMode::eRestore: case SyncAction::SyncMode::eCopyHHToPC : // Impossible! - fActiontqStatus = Done; + fActionStatus = Done; break; case SyncAction::SyncMode::eHotSync: case SyncAction::SyncMode::eFullSync: - fActiontqStatus = MemosToKNotes; + fActionStatus = MemosToKNotes; break; case SyncAction::SyncMode::eCopyPCToHH: - fActiontqStatus = Cleanup; + fActionStatus = Cleanup; break; } } @@ -374,7 +374,7 @@ void KNotesAction::listNotes() case MemosToKNotes : if (syncMemoToKNotes()) { - fActiontqStatus=Cleanup; + fActionStatus=Cleanup; } break; case Cleanup : @@ -791,7 +791,7 @@ void KNotesAction::cleanupMemos() KNotesConduitSettings::setMemoIds(memos); KNotesConduitSettings::self()->writeConfig(); - fActiontqStatus=Done; + fActionStatus=Done; fDatabase->cleanup(); fDatabase->resetSyncFlags(); fLocalDatabase->cleanup(); @@ -848,23 +848,23 @@ void KNotesAction::cleanupMemos() /* virtual */ TQString KNotesAction::statusString() const { - switch(fActiontqStatus) + switch(fActionStatus) { case Init : return CSL1("Init"); case NewNotesToPilot : return CSL1("NewNotesToPilot key=%1"); - // TODO DCOP_REMOVAL .tqarg(fP->fIndex.key()); + // TODO DCOP_REMOVAL .arg(fP->fIndex.key()); case ModifiedNotesToPilot : return CSL1("ModifiedNotesToPilot key=%1"); - //TODO DCOP_REMOVAL .tqarg(fP->fIndex.key()); + //TODO DCOP_REMOVAL .arg(fP->fIndex.key()); case MemosToKNotes : return CSL1("MemosToKNotes rec=%1") - .tqarg(fP->fRecordIndex); + .arg(fP->fRecordIndex); case Cleanup : return CSL1("Cleanup"); case Done : return CSL1("Done"); default : - return CSL1("Unknown (%1)").tqarg(fActiontqStatus); + return CSL1("Unknown (%1)").arg(fActionStatus); } } diff --git a/conduits/knotes/knotes-action.h b/conduits/knotes/knotes-action.h index 223dfe2..bd057b7 100644 --- a/conduits/knotes/knotes-action.h +++ b/conduits/knotes/knotes-action.h @@ -45,7 +45,7 @@ public: const TQStringList &a = TQStringList() ); virtual ~KNotesAction(); - enum tqStatus { Init, + enum Status { Init, ModifiedNotesToPilot, DeleteNotesOnPilot, NewNotesToPilot, diff --git a/conduits/knotes/setup_base.ui b/conduits/knotes/setup_base.ui index 15d902f..1757b88 100644 --- a/conduits/knotes/setup_base.ui +++ b/conduits/knotes/setup_base.ui @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>101</height> |