diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:57:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:57:02 -0600 |
| commit | d55caffa62947ca831ae0c21aada3b55eec24027 (patch) | |
| tree | 8a2a0ff56d7023011016a7e385f0f3b60ffea095 /conduits/memofileconduit | |
| parent | 631a19d8c5c5f69dc0d941c1997806fb422c79a6 (diff) | |
| download | kpilot-d55caffa62947ca831ae0c21aada3b55eec24027.tar.gz kpilot-d55caffa62947ca831ae0c21aada3b55eec24027.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 631a19d8c5c5f69dc0d941c1997806fb422c79a6.
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 1c65d12..42461f5 100644 --- a/conduits/memofileconduit/memofile-conduit.cc +++ b/conduits/memofileconduit/memofile-conduit.cc @@ -43,7 +43,7 @@ #include <tqfile.h> #include <tqdir.h> -#include <textcodec.h> +#include <tqtextcodec.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.").arg(_memo_directory)); + addSyncLogEntry(i18n(" Syncing with %1.").tqarg(_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 " << fActionStatus << endl; + DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl; } diff --git a/conduits/memofileconduit/memofile.h b/conduits/memofileconduit/memofile.h index 3ba9114..1308e98 100644 --- a/conduits/memofileconduit/memofile.h +++ b/conduits/memofileconduit/memofile.h @@ -42,8 +42,8 @@ #include <tqfile.h> #include <tqdir.h> -#include <textstream.h> -#include <textcodec.h> +#include <tqtextstream.h> +#include <tqtextcodec.h> #include "pilotMemo.h" diff --git a/conduits/memofileconduit/setup_base.ui b/conduits/memofileconduit/setup_base.ui index fba82af..d3bf795 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>180</height> |