diff options
Diffstat (limited to 'conduits/memofileconduit')
| -rw-r--r-- | conduits/memofileconduit/memofile-conduit.cc | 6 | ||||
| -rw-r--r-- | conduits/memofileconduit/memofile.h | 4 | ||||
| -rw-r--r-- | conduits/memofileconduit/setup_base.ui | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/conduits/memofileconduit/memofile-conduit.cc b/conduits/memofileconduit/memofile-conduit.cc index 42461f5..1c65d12 100644 --- a/conduits/memofileconduit/memofile-conduit.cc +++ b/conduits/memofileconduit/memofile-conduit.cc @@ -43,7 +43,7 @@ #include <tqfile.h> #include <tqdir.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kconfig.h> #include <kdebug.h> @@ -120,7 +120,7 @@ MemofileConduit::~MemofileConduit() fCtrPC->setStartCount(_memofiles->count()); setFirstSync( _memofiles->isFirstSync() ); - addSyncLogEntry(i18n(" Syncing with %1.").tqarg(_memo_directory)); + addSyncLogEntry(i18n(" Syncing with %1.").arg(_memo_directory)); if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || _memofiles->isFirstSync() ) { addSyncLogEntry(i18n(" Copying Pilot to PC...")); @@ -368,7 +368,7 @@ void MemofileConduit::getModifiedFromPilot() { FUNCTIONSETUP; - DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl; + DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl; } diff --git a/conduits/memofileconduit/memofile.h b/conduits/memofileconduit/memofile.h index 1308e98..3ba9114 100644 --- a/conduits/memofileconduit/memofile.h +++ b/conduits/memofileconduit/memofile.h @@ -42,8 +42,8 @@ #include <tqfile.h> #include <tqdir.h> -#include <tqtextstream.h> -#include <tqtextcodec.h> +#include <textstream.h> +#include <textcodec.h> #include "pilotMemo.h" diff --git a/conduits/memofileconduit/setup_base.ui b/conduits/memofileconduit/setup_base.ui index d3bf795..fba82af 100644 --- a/conduits/memofileconduit/setup_base.ui +++ b/conduits/memofileconduit/setup_base.ui @@ -81,7 +81,7 @@ the Memofile-conduit settings.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>180</height> |