TDE
/
kpilot
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kpilot
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename old tq methods that no longer need a unique name

Browse Source
pull/2/head
Timothy Pearson 13 years ago
parent d55caffa62
commit e2574db445
79 changed files with 340 additions and 340 deletions
Show Stats Download Patch File Download Diff File

6
conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
Unescape View File

@ -193,7 +193,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@ -210,7 +210,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@ -263,7 +263,7 @@ Do NOT change these values: doing so will almost certainly result in data loss w
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>210</height>

8
conduits/abbrowserconduit/kaddressbookConduit.ui
Unescape View File

@ -51,7 +51,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@ -241,7 +241,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
@ -402,7 +402,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@ -710,7 +710,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>31</width>
<height>30</height>

2
conduits/docconduit/DOC-converter.cc
Unescape View File

@ -570,7 +570,7 @@ bool DOCConverter::convertPDBtoTXT()
if (rec)
{
PilotDOCBookmark bookie(rec);
docBookmark*bmk=new docBookmark(TQString::tqfromLatin1(bookie.bookmarkName), bookie.pos);
docBookmark*bmk=new docBookmark(TQString::fromLatin1(bookie.bookmarkName), bookie.pos);
bmks.append(bmk);
KPILOT_DELETE(rec);
} else {

70
conduits/docconduit/doc-conduit.cc
Unescape View File

@ -300,7 +300,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
}
if (!sinfo.pdbfilename.isEmpty() && DOCConduitSettings::keepPDBsLocally() ) {
PilotLocalDatabase*database=new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(),
TQString::tqfromLatin1(sinfo.dbinfo.name), false);
TQString::fromLatin1(sinfo.dbinfo.name), false);
if (database) {
if ( database->deleteDatabase() !=0 ) {
WARNINGKPILOT << "Unable to delete database " << sinfo.dbinfo.name << " on the PC" << endl;
@ -378,10 +378,10 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
if (!postSyncAction(database, sinfo, res))
emit logError(i18n("Unable to install the locally created PalmDOC %1 to the handheld.")
.tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name)));
.tqarg(TQString::fromLatin1(sinfo.dbinfo.name)));
if (!res)
emit logError(i18n("Conversion of PalmDOC \"%1\" failed.")
.tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name)));
.tqarg(TQString::fromLatin1(sinfo.dbinfo.name)));
// disconnect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &)));
// disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &)));
// KPILOT_DELETE(database);
@ -389,7 +389,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
else
{
emit logError(i18n("Unable to open or create the database %1.")
.tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name)));
.tqarg(TQString::fromLatin1(sinfo.dbinfo.name)));
}
return res;
}
@ -414,21 +414,21 @@ void DOCConduit::syncNextDB() {
// if creator and/or type don't match, go to next db
if (!isCorrectDBTypeCreator(dbinfo) ||
fDBNames.contains(TQString::tqfromLatin1(dbinfo.name)))
fDBNames.contains(TQString::fromLatin1(dbinfo.name)))
{
TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
return;
}
TQString txtfilename=constructTXTFileName(TQString::tqfromLatin1(dbinfo.name));
TQString pdbfilename=constructPDBFileName(TQString::tqfromLatin1(dbinfo.name));
TQString txtfilename=constructTXTFileName(TQString::fromLatin1(dbinfo.name));
TQString pdbfilename=constructPDBFileName(TQString::fromLatin1(dbinfo.name));
docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name),
docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name),
txtfilename, pdbfilename, eSyncNone);
syncInfo.dbinfo=dbinfo;
needsSync(syncInfo);
fSyncInfoList.append(syncInfo);
fDBNames.append(TQString::tqfromLatin1(dbinfo.name));
fDBNames.append(TQString::fromLatin1(dbinfo.name));
TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
return;
@ -476,12 +476,12 @@ void DOCConduit::syncNextTXT()
bool alreadySynced=fDBNames.contains(fl.baseName(TRUE));
if (!alreadySynced) {
docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name),
docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name),
txtfilename, pdbfilename, eSyncNone);
syncInfo.dbinfo=dbinfo;
needsSync(syncInfo);
fSyncInfoList.append(syncInfo);
fDBNames.append(TQString::tqfromLatin1(dbinfo.name));
fDBNames.append(TQString::fromLatin1(dbinfo.name));
} else {
#ifdef DEBUG
DEBUGKPILOT<<txtfilename<<" has already been synced, skipping it."<<endl;
@ -701,7 +701,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
FUNCTIONSETUP;
sinfo.direction = eSyncNone;
PilotDatabase*docdb=openDOCDatabase(TQString::tqfromLatin1(sinfo.dbinfo.name));
PilotDatabase*docdb=openDOCDatabase(TQString::fromLatin1(sinfo.dbinfo.name));
if (!fDBListSynced.contains(sinfo.handheldDB)) {
// the database wasn't included on last sync, so it has to be new.
#ifdef DEBUG
@ -716,29 +716,29 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
N N | C P H
*/
if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatNew;
else sinfo.fPCtqStatus=eStatDoesntExist;
if (docdb && docdb->isOpen()) sinfo.fPalmtqStatus=eStatNew;
else sinfo.fPalmtqStatus=eStatDoesntExist;
if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew;
else sinfo.fPCStatus=eStatDoesntExist;
if (docdb && docdb->isOpen()) sinfo.fPalmStatus=eStatNew;
else sinfo.fPalmStatus=eStatDoesntExist;
KPILOT_DELETE(docdb);
switch (eSyncDirection) {
case eSyncPDAToPC:
if (sinfo.fPalmtqStatus==eStatDoesntExist)
if (sinfo.fPalmStatus==eStatDoesntExist)
sinfo.direction=eSyncDelete;
else sinfo.direction=eSyncPDAToPC;
break;
case eSyncPCToPDA:
if (sinfo.fPCtqStatus==eStatDoesntExist)
if (sinfo.fPCStatus==eStatDoesntExist)
sinfo.direction=eSyncDelete;
else sinfo.direction=eSyncPCToPDA;
break;
case eSyncNone: // means actually both directions!
if (sinfo.fPCtqStatus==eStatNew) {
if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncConflict;
if (sinfo.fPCStatus==eStatNew) {
if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncConflict;
else sinfo.direction=eSyncPCToPDA;
} else {
if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncPDAToPC;
if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncPDAToPC;
else {
sinfo.direction=eSyncNone;
#ifdef DEBUG
@ -756,9 +756,9 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
}
// Text was included in the last sync
if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatDeleted;
if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatDeleted;
else if(pcTextChanged(sinfo.txtfilename)) {
sinfo.fPCtqStatus=eStatChanged;
sinfo.fPCStatus=eStatChanged;
#ifdef DEBUG
DEBUGKPILOT<<"PC side has changed!"<<endl;
#endif
@ -769,12 +769,12 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
#endif
}
if (!docdb || !docdb->isOpen()) sinfo.fPalmtqStatus=eStatDeleted;
if (!docdb || !docdb->isOpen()) sinfo.fPalmStatus=eStatDeleted;
else if (hhTextChanged(docdb)) {
#ifdef DEBUG
DEBUGKPILOT<<"Handheld side has changed!"<<endl;
#endif
sinfo.fPalmtqStatus=eStatChanged;
sinfo.fPalmStatus=eStatChanged;
#ifdef DEBUG
} else {
DEBUGKPILOT<<"Handheld side has NOT changed!"<<endl;
@ -800,7 +800,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
*/
if (sinfo.fPCtqStatus == eStatNone && sinfo.fPalmtqStatus==eStatNone) {
if (sinfo.fPCStatus == eStatNone && sinfo.fPalmStatus==eStatNone) {
#ifdef DEBUG
DEBUGKPILOT<<"Nothing has changed, not need for a sync."<<endl;
#endif
@ -813,12 +813,12 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
// to sync that direction
if (eSyncDirection==eSyncPCToPDA) {
if (sinfo.fPCtqStatus==eStatDeleted) sinfo.direction=eSyncDelete;
if (sinfo.fPCStatus==eStatDeleted) sinfo.direction=eSyncDelete;
else sinfo.direction=eSyncPCToPDA;
return true;
}
if (eSyncDirection==eSyncPDAToPC) {
if (sinfo.fPalmtqStatus==eStatDeleted) sinfo.direction=eSyncDelete;
if (sinfo.fPalmStatus==eStatDeleted) sinfo.direction=eSyncDelete;
else sinfo.direction=eSyncPDAToPC;
return true;
}
@ -830,8 +830,8 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
// if either is deleted, and the other is not changed, delete
if ( ((sinfo.fPCtqStatus==eStatDeleted) && (sinfo.fPalmtqStatus!=eStatChanged)) ||
((sinfo.fPalmtqStatus==eStatDeleted) && (sinfo.fPCtqStatus!=eStatChanged)) )
if ( ((sinfo.fPCStatus==eStatDeleted) && (sinfo.fPalmStatus!=eStatChanged)) ||
((sinfo.fPalmStatus==eStatDeleted) && (sinfo.fPCStatus!=eStatChanged)) )
{
#ifdef DEBUG
DEBUGKPILOT<<"DB was deleted on one side and not changed on "
@ -843,7 +843,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
// eStatDeleted (and both not changed) have already been treated, for all
// other values in combination with eStatNone, just copy the texts.
if (sinfo.fPCtqStatus==eStatNone) {
if (sinfo.fPCStatus==eStatNone) {
#ifdef DEBUG
DEBUGKPILOT<<"PC side has changed!"<<endl;
#endif
@ -851,7 +851,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
return true;
}
if (sinfo.fPalmtqStatus==eStatNone) {
if (sinfo.fPalmStatus==eStatNone) {
sinfo.direction=eSyncPCToPDA;
return true;
}
@ -922,11 +922,11 @@ PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const
if (DOCConduitSettings::keepPDBsLocally())
{
return new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(),
TQString::tqfromLatin1(dbinfo.name), false);
TQString::fromLatin1(dbinfo.name), false);
}
else
{
return deviceLink()->database(TQString::tqfromLatin1(dbinfo.name));
return deviceLink()->database(TQString::fromLatin1(dbinfo.name));
}
}
@ -950,7 +950,7 @@ bool DOCConduit::postSyncAction(PilotDatabase * database,
if (DOCConduitSettings::keepPDBsLocally() && !DOCConduitSettings::localSync())
{
PilotDatabase*db=deviceLink()->database(
TQString::tqfromLatin1(sinfo.dbinfo.name));
TQString::fromLatin1(sinfo.dbinfo.name));
#ifdef DEBUG
DEBUGKPILOT<<"Middle 1 Resetting sync flags for database "
<<sinfo.dbinfo.name<<endl;

8
conduits/docconduit/doc-conduit.h
Unescape View File

@ -41,7 +41,7 @@ typedef enum eSyncDirectionEnum {
eSyncDelete,
eSyncConflict
};
typedef enum eTextqStatus {
typedef enum eTexStatus {
eStatNone=0,
eStatNew=1,
eStatChanged=2,
@ -139,14 +139,14 @@ public:
txtfilename=txtfn;
pdbfilename=pdbfn;
direction=dir;
fPCtqStatus=eStatNone;
fPalmtqStatus=eStatNone;
fPCStatus=eStatNone;
fPalmStatus=eStatNone;
};
~docSyncInfo(){};
TQString handheldDB, txtfilename, pdbfilename;
DBInfo dbinfo;
eSyncDirectionEnum direction;
eTextqStatus fPCtqStatus, fPalmtqStatus;
eTexStatus fPCStatus, fPalmStatus;
};

16
conduits/docconduit/doc-conflictdialog.cc
Unescape View File

@ -51,11 +51,11 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
// First, insert the texts on top:
textLabel1 = new TQLabel(i18n("Here is a list of all text files and DOC databases the conduit found. The conduit tried to determine the correct sync direction, but for databases in bold red letters a conflict occurred (i.e. the text was changed both on the desktop and on the handheld). For these databases please specify which version is the current one."), page);
textLabel1->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
textLabel1->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
topLayout->addWidget(textLabel1);
textLabel2 = new TQLabel(i18n("You can also change the sync direction for databases without a conflict." ), page );
textLabel2->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
textLabel2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
topLayout->addWidget(textLabel2);
resolutionGroupBox = new TQGroupBox(i18n("DOC Databases"), page );
@ -70,7 +70,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
resolutionGroupBoxLayout = new TQGridLayout( big_box, syncInfo->size(), 3 );
resolutionGroupBoxLayout->tqsetAlignment( TQt::AlignTop );
resolutionGroupBoxLayout->setAlignment( TQt::AlignTop );
// Invisible button group for the information buttons to use the same slot for all of them (see Dallheimer's book, page 309f)
TQButtonGroup *bgroup = new TQButtonGroup( this );
@ -99,7 +99,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
resolutionGroupBoxLayout->addWidget( cE.dbname, cE.index, 0 );
cE.resolution=new TQComboBox( FALSE, big_box);
cE.resolution->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
cE.resolution->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
(TQSizePolicy::SizeType)0, 0, 0,
cE.resolution->sizePolicy().hasHeightForWidth() ) );
cE.resolution->clear();
@ -123,7 +123,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
topLayout->addWidget( resolutionGroupBox );
resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer");
if (tickleTimer) {
@ -150,7 +150,7 @@ ResolutionDialog::~ResolutionDialog()
KDialogBase::slotOk();
}
TQString eTexStatusToString(eTextqStatus stat) {
TQString eTexStatusToString(eTexStatus stat) {
switch(stat) {
case eStatNone: return i18n("unchanged");
case eStatNew: return i18n("new");
@ -169,8 +169,8 @@ void ResolutionDialog::slotInfo(int index) {
if (!syncInfo) return;
docSyncInfo si=(*syncInfo)[ix];
TQString text=i18n("Status of the database %1:\n\n").tqarg(si.handheldDB);
text+=i18n("Handheld: %1\n").tqarg(eTexStatusToString(si.fPalmtqStatus));
text+=i18n("Desktop: %1\n").tqarg(eTexStatusToString(si.fPCtqStatus));
text+=i18n("Handheld: %1\n").tqarg(eTexStatusToString(si.fPalmStatus));
text+=i18n("Desktop: %1\n").tqarg(eTexStatusToString(si.fPCStatus));
KMessageBox::information(this, text, i18n("Database information"));
}

8
conduits/docconduit/doc-setupdialog.ui
Unescape View File

@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -222,7 +222,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -304,7 +304,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -492,7 +492,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>

2
conduits/docconduit/kpalmdoc_dlg.cc
Unescape View File

@ -73,7 +73,7 @@ ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption)
connect(dlg->fTextToPDB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToPDB()));
connect(dlg->fPDBToText, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToText()));
resize(tqminimumSize());
resize(minimumSize());
}
ConverterDlg::~ConverterDlg()

12
conduits/docconduit/kpalmdoc_dlgbase.ui
Unescape View File

@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@ -181,7 +181,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@ -198,7 +198,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@ -299,7 +299,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>200</height>
@ -329,7 +329,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>190</height>

2
conduits/docconduit/pilotDOCEntry.h
Unescape View File

@ -50,7 +50,7 @@ public:
TQString getText() {
fText.Decompress();
return TQString::tqfromLatin1((const char *) fText.text());
return TQString::fromLatin1((const char *) fText.text());
};
void setText(TQString newtext, bool compressed = false) {
fText.setText((const unsigned char *) newtext.latin1(),

30
conduits/knotes/knotes-action.cc
Unescape View File

@ -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();
@ -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,7 +848,7 @@ void KNotesAction::cleanupMemos()
/* virtual */ TQString KNotesAction::statusString() const
{
switch(fActiontqStatus)
switch(fActionStatus)
{
case Init : return CSL1("Init");
case NewNotesToPilot :
@ -864,7 +864,7 @@ void KNotesAction::cleanupMemos()
case Done :
return CSL1("Done");
default :
return CSL1("Unknown (%1)").tqarg(fActiontqStatus);
return CSL1("Unknown (%1)").tqarg(fActionStatus);
}
}

2
conduits/knotes/knotes-action.h
Unescape View File

@ -45,7 +45,7 @@ public:
const TQStringList &a = TQStringList() );
virtual ~KNotesAction();
enum tqStatus { Init,
enum Status { Init,
ModifiedNotesToPilot,
DeleteNotesOnPilot,
NewNotesToPilot,

2
conduits/knotes/setup_base.ui
Unescape View File

@ -72,7 +72,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>101</height>

4
conduits/malconduit/mal-conduit.cc
Unescape View File

@ -144,7 +144,7 @@ void MALConduit::readConfig()
void MALConduit::saveConfig()
{
FUNCTIONSETUP;
MALConduitSettings::setLastMALSync( TQDateTime::tqcurrentDateTime() );
MALConduitSettings::setLastMALSync( TQDateTime::currentDateTime() );
MALConduitSettings::self()->writeConfig();
}
@ -152,7 +152,7 @@ void MALConduit::saveConfig()
bool MALConduit::skip()
{
TQDateTime now=TQDateTime::tqcurrentDateTime();
TQDateTime now=TQDateTime::currentDateTime();
TQDateTime lastSync=MALConduitSettings::lastMALSync();
if (!lastSync.isValid() || !now.isValid()) return false;

10
conduits/malconduit/mal-setup_dialog.ui
Unescape View File

@ -137,7 +137,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -245,7 +245,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -397,7 +397,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
@ -489,7 +489,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -559,7 +559,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>

2
conduits/memofileconduit/memofile-conduit.cc
Unescape View File

@ -368,7 +368,7 @@ void MemofileConduit::getModifiedFromPilot()
{
FUNCTIONSETUP;
DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl;
DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl;
}

2
conduits/memofileconduit/setup_base.ui
Unescape View File

@ -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>

2
conduits/notepadconduit/notepad-setup.ui
Unescape View File

@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>250</height>

2
conduits/null/setup_base.ui
Unescape View File

@ -109,7 +109,7 @@ the Null-conduit settings.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>

4
conduits/popmail/popmail-conduit.cc
Unescape View File

@ -319,7 +319,7 @@ void PopMailConduit::writeMessageToFile(FILE* sendf, struct Mail& theMail)
// if our struct indicates that it's dated, then use the date it
// holds. otherwise, provide current date. either way, we need to
// have a date...
TQDateTime date = TQDateTime::tqcurrentDateTime();
TQDateTime date = TQDateTime::currentDateTime();
if (theMail.dated)
{
date = readTm(theMail.date);
@ -377,7 +377,7 @@ void PopMailConduit::writeMessageToFile(FILE* sendf, struct Mail& theMail)
<< outbox
<< endl;
TQDateTime date = TQDateTime::tqcurrentDateTime();
TQDateTime date = TQDateTime::currentDateTime();
TQString dateString = date.toString(DATE_FORMAT);
DEBUGKPILOT << fname << ": Date format example: [" << dateString

2
conduits/popmail/setup-dialog.ui
Unescape View File

@ -47,7 +47,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>

2
conduits/recordconduit/setup_base.ui
Unescape View File

@ -128,7 +128,7 @@ the Record-conduit settings.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>

34
conduits/sysinfoconduit/sysinfo-conduit.cc
Unescape View File

@ -214,14 +214,14 @@ void SysInfoConduit::hardwareInfo()
* - #devicetype#
*/
KPilotSysInfo sysinfo = fHandle->getSysInfo();
fValues[CSL1("deviceid")] = TQString::tqfromLatin1(sysinfo.getProductID());
fValues[CSL1("deviceid")] = TQString::fromLatin1(sysinfo.getProductID());
const KPilotCard *device = fHandle->getCardInfo();
if (device)
{
fValues[CSL1("devicename")] = TQString::tqfromLatin1(device->getCardName());
fValues[CSL1("devicename")] = TQString::fromLatin1(device->getCardName());
fValues[CSL1("devicemodel")] = unknown; // TODO
fValues[CSL1("manufacturer")] = TQString::tqfromLatin1(device->getCardManufacturer());
fValues[CSL1("manufacturer")] = TQString::fromLatin1(device->getCardManufacturer());
}
else
{
@ -299,8 +299,8 @@ void SysInfoConduit::storageInfo()
const KPilotCard *device = fHandle->getCardInfo(1);
if (device) {
fValues[CSL1("cards")] = CSL1("%1 (%2, %3 kB of %3 kB free)")
.tqarg(TQString::tqfromLatin1(device->getCardName()))
.tqarg(TQString::tqfromLatin1(device->getCardManufacturer()))
.tqarg(TQString::fromLatin1(device->getCardName()))
.tqarg(TQString::fromLatin1(device->getCardManufacturer()))
.tqarg(device->getRamFree()/1024)
.tqarg(device->getRamSize()/1024);
KPILOT_DELETE(device);
@ -400,7 +400,7 @@ void SysInfoConduit::pcVersionInfo()
* - #kpilot#
* - #pilotlink#
*/
fValues[CSL1("kpilot")] = TQString::tqfromLatin1(KPILOT_VERSION);
fValues[CSL1("kpilot")] = TQString::fromLatin1(KPILOT_VERSION);
fValues[CSL1("kde")] = i18n("unknown");
fValues[CSL1("qt")] = i18n("unknown");
fValues[CSL1("os")] = i18n("unknown");
@ -408,23 +408,23 @@ void SysInfoConduit::pcVersionInfo()
struct utsname name;
if (uname (&name) >= 0) {
fValues[CSL1("os")] = CSL1("%1 %3, %5")
.tqarg(TQString::tqfromLatin1(name.sysname))
.tqarg(TQString::tqfromLatin1(name.release))
.tqarg(TQString::tqfromLatin1(name.machine));
fValues[CSL1("hostname")] = CSL1("%2").tqarg(TQString::tqfromLatin1(name.nodename));
.tqarg(TQString::fromLatin1(name.sysname))
.tqarg(TQString::fromLatin1(name.release))
.tqarg(TQString::fromLatin1(name.machine));
fValues[CSL1("hostname")] = CSL1("%2").tqarg(TQString::fromLatin1(name.nodename));
}
#ifdef TDE_VERSION_STRING
fValues[CSL1("kde")] = TQString::tqfromLatin1(TDE_VERSION_STRING);
fValues[CSL1("kde")] = TQString::fromLatin1(TDE_VERSION_STRING);
#endif
#ifdef TQT_VERSION_STR
fValues[CSL1("qt")] = TQString::tqfromLatin1(TQT_VERSION_STR);
fValues[CSL1("qt")] = TQString::fromLatin1(TQT_VERSION_STR);
#endif
fValues[CSL1("pilotlink")] = CSL1("%1.%2.%3%4")
.tqarg(PILOT_LINK_VERSION)
.tqarg(PILOT_LINK_MAJOR)
.tqarg(PILOT_LINK_MINOR)
#ifdef PILOT_LINK_PATCH
.tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH));
.tqarg(TQString::fromLatin1(PILOT_LINK_PATCH));
#else
.tqarg(TQString());
#endif
@ -470,7 +470,7 @@ void SysInfoConduit::writeFile()
{
FUNCTIONSETUP;
fValues[CSL1("date")] = TQDateTime::tqcurrentDateTime().toString(Qt::LocalDate);
fValues[CSL1("date")] = TQDateTime::currentDateTime().toString(Qt::LocalDate);
TQString output;
// Open the template file
@ -552,11 +552,11 @@ void SysInfoConduit::writeFile()
* %8 .. modifyDate
* %9 .. backupDate
*/
newpatt.replace(CSL1("%0"), TQString::tqfromLatin1(dbi.name));
newpatt.replace(CSL1("%0"), TQString::fromLatin1(dbi.name));
set_long(&tmpchr[0],dbi.type);
newpatt.replace(CSL1("%1"), TQString::tqfromLatin1(tmpchr));
newpatt.replace(CSL1("%1"), TQString::fromLatin1(tmpchr));
set_long(&tmpchr[0],dbi.creator);
newpatt.replace(CSL1("%2"), TQString::tqfromLatin1(tmpchr));
newpatt.replace(CSL1("%2"), TQString::fromLatin1(tmpchr));
newpatt.replace(CSL1("%3"), TQString::number(dbi.index));
newpatt.replace(CSL1("%4"), TQString::number(dbi.flags));
newpatt.replace(CSL1("%5"), TQString::number(dbi.miscFlags));

4
conduits/sysinfoconduit/sysinfo-setup_dialog.ui
Unescape View File

@ -48,7 +48,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>51</height>
@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>20</height>

2
conduits/timeconduit/time-conduit.cc
Unescape View File

@ -83,7 +83,7 @@ void TimeConduit::readConfig()
{
#ifdef DEBUG
DEBUGKPILOT << fname << ": Would have set time to "
<< TQDateTime::tqcurrentDateTime().toString() << endl;
<< TQDateTime::currentDateTime().toString() << endl;
#endif
return delayDone();
}

4
conduits/vcalconduit/hhtopcstate.cc
Unescape View File

@ -123,7 +123,7 @@ void HHToPCState::handleRecord( ConduitAction *ca )
{
KCal::Incidence *e = vccb->addRecord( r );
if ( vccb->config()->syncArchived() && archiveRecord ) {
e->setSynctqStatus( KCal::Incidence::SYNCDEL );
e->setSyncStatus( KCal::Incidence::SYNCDEL );
}
}
}
@ -218,7 +218,7 @@ void VCalConduitBase::slotPalmRecToPC()
{
KCal::Incidence*e=addRecord(r);
if (config()->syncArchived() && archiveRecord) {
e->setSynctqStatus(KCal::Incidence::SYNCDEL);
e->setSyncStatus(KCal::Incidence::SYNCDEL);
}
}
}

4
conduits/vcalconduit/korganizerConduit.ui
Unescape View File

@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -243,7 +243,7 @@ be saved in the calendar on the PC.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>31</height>

2
conduits/vcalconduit/pctohhstate.cc
Unescape View File

@ -120,7 +120,7 @@ void PCToHHState::handleRecord( ConduitAction *ca )
if( id > 0 && ( s = vccb->database()->readRecordById( id ) ) )
{
if( e->synctqStatus() == KCal::Incidence::SYNCDEL )
if( e->syncStatus() == KCal::Incidence::SYNCDEL )
{
vccb->deletePalmRecord( e, s );
}

4
conduits/vcalconduit/todo-conduit.cc
Unescape View File

@ -154,13 +154,13 @@ KCal::Incidence *TodoConduitPrivate::getNextModifiedIncidence()
}
if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator;
while (fAllTodosIterator != fAllTodos.end() &&
e && e->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId())
e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId())
{
e = (++fAllTodosIterator != fAllTodos.end()) ? *fAllTodosIterator : 0L;
#ifdef DEBUG
if(e)
DEBUGKPILOT<< e->summary()<<" had SyncStatus="<<e->synctqStatus()<<endl;
DEBUGKPILOT<< e->summary()<<" had SyncStatus="<<e->syncStatus()<<endl;
#endif
}

6
conduits/vcalconduit/todoRecord.cc
Unescape View File

@ -126,7 +126,7 @@ bool KCalSync::setTodo(KCal::Todo *e,
// COMPLETED? //
e->setCompleted(de->getComplete());
if ( de->getComplete() && !e->hasCompletedDate() ) {
e->setCompleted( TQDateTime::tqcurrentDateTime() );
e->setCompleted( TQDateTime::currentDateTime() );
}
e->setSummary(de->getDescription());
@ -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
// setSynctqStatus(SYNCMOD)!!!
e->setSynctqStatus(KCal::Incidence::SYNCNONE);
// setSyncStatus(SYNCMOD)!!!
e->setSyncStatus(KCal::Incidence::SYNCNONE);
return true;
}

2
conduits/vcalconduit/vcal-conduit.cc
Unescape View File

@ -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->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0)
e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0)
{
e = (++fAllEventsIterator != fAllEvents.end()) ? *fAllEventsIterator : 0L;
}

12
conduits/vcalconduit/vcal-conduitbase.cc
Unescape View File

@ -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->synctqStatus() != KCal::Incidence::SYNCNONE )
if ( ( e->syncStatus() != 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
// setSynctqStatus(SYNCMOD)!!!
e->setSynctqStatus(KCal::Incidence::SYNCNONE);
// setSyncStatus(SYNCMOD)!!!
e->setSyncStatus(KCal::Incidence::SYNCNONE);
fLocalDatabase->writeRecord( r );
}
else
@ -552,7 +552,7 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
return;
}
if ( e->synctqStatus() == KCal::Incidence::SYNCDEL )
if ( e->syncStatus() == KCal::Incidence::SYNCDEL )
{
DEBUGKPILOT << fname << ": don't write deleted incidence "
<< e->summary() << " to the palm" << endl;
@ -573,8 +573,8 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
// NOTE: This MUST be done last, since every other set* call
// calls updated(), which will trigger an
// setSynctqStatus(SYNCMOD)!!!
e->setSynctqStatus(KCal::Incidence::SYNCNONE);
// setSyncStatus(SYNCMOD)!!!
e->setSyncStatus(KCal::Incidence::SYNCNONE);
KPILOT_DELETE( r );
}
}

4
conduits/vcalconduit/vcalRecord.cc
Unescape View File

@ -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
// setSynctqStatus(SYNCMOD)!!!
e->setSynctqStatus(KCal::Incidence::SYNCNONE);
// setSyncStatus(SYNCMOD)!!!
e->setSyncStatus(KCal::Incidence::SYNCNONE);
return true;
}

16
kpilot/conduitConfigDialog.cc
Unescape View File

@ -139,7 +139,7 @@ ConduitTip::~ConduitTip()
s.append(CSL1("</qt>"));
}
tip(fListView->tqitemRect(l),s);
tip(fListView->itemRect(l),s);
}
// implement our own check list items so we can detect if a given item was checked/unchecked. We need
@ -192,7 +192,7 @@ static void addDescriptionPage(TQWidgetStack *parent,
l = new TQLabel(v);
l->setText(text);
l->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak);
l->setAlignment(TQt::AlignLeft | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak);
if (label) { *label = l; }
@ -227,7 +227,7 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n
fConduitList = new TQListView(this ,"ConduitList");
fConduitList->addColumn(TQString());
fConduitList->header()->hide();
fConduitList->tqsetSizePolicy(
fConduitList->setSizePolicy(
TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
mainLayout->addWidget(fConduitList);
@ -316,13 +316,13 @@ ConduitConfigWidget::ConduitConfigWidget(TQWidget *parent, const char *n,
// fConduitList->removeColumn(CONDUIT_COMMENT);
fillLists();
fConduitList->resize(fConduitList->tqsizeHint());
fConduitList->setMinimumSize(fConduitList->tqsizeHint());
fConduitList->setColumnWidth(0, fConduitList->tqsizeHint().width());
fConduitList->resize(fConduitList->sizeHint());
fConduitList->setMinimumSize(fConduitList->sizeHint());
fConduitList->setColumnWidth(0, fConduitList->sizeHint().width());
fConduitList->setResizeMode(TQListView::AllColumns);
fStack->resize(fStack->tqsizeHint()+TQSize(10,40));
fStack->setMinimumSize(fStack->tqsizeHint()+TQSize(10,40));
fStack->resize(fStack->sizeHint()+TQSize(10,40));
fStack->setMinimumSize(fStack->sizeHint()+TQSize(10,40));
TQObject::connect(fConduitList,
TQT_SIGNAL(selectionChanged(TQListViewItem *)),

4
kpilot/datebookWidget.cc
Unescape View File

@ -49,7 +49,7 @@ DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) :
TQGridLayout *g = new TQGridLayout(this,1,1,SPACING);
fDatePicker = new KDatePicker( this, "fDatePicker" );
fDatePicker->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fDatePicker->sizePolicy().hasHeightForWidth() ) );
fDatePicker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fDatePicker->sizePolicy().hasHeightForWidth() ) );
g->addMultiCellWidget(fDatePicker,0,0,0,2);
TQSpacerItem* spacer = new TQSpacerItem( 20, 180, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
@ -69,7 +69,7 @@ DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) :
fEventList->addColumn( i18n( "Al" ) );
fEventList->addColumn( i18n( "Rec" ) );
fEventList->addColumn( i18n( "Description" ) );
// fEventList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, fEventList->sizePolicy().hasHeightForWidth() ) );
// fEventList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, fEventList->sizePolicy().hasHeightForWidth() ) );
fEventList->setAllColumnsShowFocus( TRUE );
fEventList->setShowSortIndicator( TRUE );
fEventList->setResizeMode( KListView::/*LastColumn*/AllColumns );

2
kpilot/dbAppInfoEditor.cc
Unescape View File

@ -67,7 +67,7 @@ DBAppInfoEditor::DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent) :
{
TQLabel*tmpW = new TQLabel( i18n("To view the Application info block data, please install a hex editor (e.g. khexedit from tdeutils)."), this );
tmpW->setBackgroundMode( TQt::PaletteMid );
tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
tmpW->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
tmpW->setFrameShape( TQFrame::Panel );
tmpW->setFrameShadow( TQFrame::Sunken );
fAppInfoEdit = tmpW;

6
kpilot/dbFlagsEditor.cc
Unescape View File

@ -115,15 +115,15 @@ void DBFlagsEditor::fillWidgets()
{
// FUNCTIONSETUP
widget->fDBName->setText(TQString::tqfromLatin1(dbi->name));
widget->fDBName->setText(TQString::fromLatin1(dbi->name));
char buff[5];
set_long(buff, dbi->type);
buff[4]='\0';
widget->fType->setText(TQString::tqfromLatin1(buff));
widget->fType->setText(TQString::fromLatin1(buff));
set_long(buff, dbi->creator);
buff[4]='\0';
widget->fCreator->setText(TQString::tqfromLatin1(buff));
widget->fCreator->setText(TQString::fromLatin1(buff));
widget->fRessourceDB->setChecked(dbi->flags & dlpDBFlagResource);
widget->fReadOnly->setChecked(dbi->flags & dlpDBFlagReadOnly);

8
kpilot/dbFlagsEditor_base.ui
Unescape View File

@ -142,7 +142,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>60</height>
@ -317,7 +317,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>180</width>
<height>21</height>
@ -342,7 +342,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>31</width>
<height>70</height>

8
kpilot/dbRecordEditor.cc
Unescape View File

@ -138,13 +138,13 @@ void DBRecordEditor::initWidgets()
DBRecordEditorBaseLayout->addWidget( fRecordID, 0, 3 );
fFlagsGroup = new TQButtonGroup( fWidget, "fFlagsGroup" );
fFlagsGroup->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
fFlagsGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
(TQSizePolicy::SizeType)4, 0, 0, fFlagsGroup->sizePolicy().hasHeightForWidth() ) );
fFlagsGroup->setColumnLayout(0, Qt::Vertical );
fFlagsGroup->tqlayout()->setSpacing( 6 );
fFlagsGroup->tqlayout()->setMargin( 11 );
fFlagsGroupLayout = new TQGridLayout( fFlagsGroup->tqlayout() );
fFlagsGroupLayout->tqsetAlignment( TQt::AlignTop );
fFlagsGroupLayout->setAlignment( TQt::AlignTop );
fDirty = new TQCheckBox( fFlagsGroup, "fDirty" );
fFlagsGroupLayout->addWidget( fDirty, 0, 0 );
@ -192,7 +192,7 @@ void DBRecordEditor::initWidgets()
{
TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. kbytesedit from tdeutils)."), fWidget );
tmpW->setBackgroundMode( TQt::PaletteMid );
tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
tmpW->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
tmpW->setFrameShape( TQFrame::Panel );
tmpW->setFrameShadow( TQFrame::Sunken );
fRecordData = tmpW;
@ -202,7 +202,7 @@ void DBRecordEditor::initWidgets()
DBRecordEditorBaseLayout->addMultiCellWidget( fRecordData, 2, 2, 0, 3 );
languageChange();
resize( TQSize(600, 561).expandedTo(tqminimumSizeHint()) );
resize( TQSize(600, 561).expandedTo(minimumSizeHint()) );
}
void DBRecordEditor::fillWidgets()

10
kpilot/dbviewerWidget.cc
Unescape View File

@ -87,7 +87,7 @@ void GenericDBWidget::setupWidget()
TQGridLayout *g1 = new TQGridLayout( 0, 1, 1);
fDBInfo = new KTextEdit( this );
fDBInfo->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, 0, 0, fDBInfo->sizePolicy().hasHeightForWidth() ) );
fDBInfo->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, 0, 0, fDBInfo->sizePolicy().hasHeightForWidth() ) );
fDBInfo->setReadOnly( TRUE );
g1->addWidget( fDBInfo, 0, 0 );
fDBInfoButton = new KPushButton( i18n( "General Database &Information" ), this );
@ -117,7 +117,7 @@ void GenericDBWidget::setupWidget()
g->addMultiCellLayout( g1, 0, 1, 1, 1 );
resize( TQSize(682, 661).expandedTo(tqminimumSizeHint()) );
resize( TQSize(682, 661).expandedTo(minimumSizeHint()) );
connect(fDBList, TQT_SIGNAL(highlighted(const TQString &)),
this, TQT_SLOT(slotSelected(const TQString &)));
@ -192,14 +192,14 @@ void GenericDBWidget::slotSelected(const TQString &dbname)
}
dbinfo=fDB->getDBInfo();
display.append(i18n("<B>Database:</B> %1, %2 records<BR>")
.tqarg(TQString::tqfromLatin1(dbinfo.name)).tqarg(fDB->recordCount()));
.tqarg(TQString::fromLatin1(dbinfo.name)).tqarg(fDB->recordCount()));
char buff[5];
set_long(buff, dbinfo.type);
buff[4]='\0';
TQString tp = TQString::tqfromLatin1(buff);
TQString tp = TQString::fromLatin1(buff);
set_long(buff, dbinfo.creator);
buff[4]='\0';
TQString cr = TQString::tqfromLatin1(buff);
TQString cr = TQString::fromLatin1(buff);
display.append(i18n("<B>Type:</B> %1, <B>Creator:</B> %2<br><br>").tqarg(tp).tqarg(cr));
int currentRecord = 0;

2
kpilot/fileInstallWidget.cc
Unescape View File

@ -116,7 +116,7 @@ FileInstallWidget::~FileInstallWidget()
static inline bool pdbOrPrc(const TQString &s)
{
return s.tqendsWith(CSL1(".pdb"),false) || s.tqendsWith(CSL1(".prc"),false) ;
return s.endsWith(CSL1(".pdb"),false) || s.endsWith(CSL1(".prc"),false) ;
}
void FileInstallWidget::dragEnterEvent(TQDragEnterEvent *event)

2
kpilot/fileInstaller.cc
Unescape View File

@ -105,7 +105,7 @@ void FileInstaller::deleteFiles(const TQStringList &files)
{
FUNCTIONSETUP;
if(!(s.tqendsWith(CSL1(".pdb"), false) || s.tqendsWith(CSL1(".prc"), false))) {
if(!(s.endsWith(CSL1(".pdb"), false) || s.endsWith(CSL1(".prc"), false))) {
KMessageBox::detailedSorry(w, i18n("Cannot install %1").tqarg(s),
i18n("Only PalmOS database files (like *.pdb and *.prc) can be installed by the file installer."));
return false;

24
kpilot/hotSync.cc
Unescape View File

@ -117,7 +117,7 @@ public:
set_long( &buff[1], info->creator );
buff[5] = ']';
buff[6] = '\0';
TQString creator = TQString::tqfromLatin1( buff );
TQString creator = TQString::fromLatin1( buff );
TQString dbname = Pilot::fromPilot( info->name, 32 );
@ -349,18 +349,18 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
if (fP->fFullBackup)
{
fActiontqStatus = FullBackup;
fActionStatus = FullBackup;
addSyncLogEntry(i18n("Full backup started."));
}
else
{
fActiontqStatus = FastBackup;
fActionStatus = FastBackup;
addSyncLogEntry(i18n("Fast backup started"));
}
if (!checkBackupDirectory(fP->fBackupDir))
{
fActiontqStatus=BackupIncomplete;
fActionStatus=BackupIncomplete;
// Don't issue an error message, checkBackupDirectory
// did this already...
return false;
@ -386,7 +386,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
{
addSyncLogEntry(i18n("Exiting on cancel."));
endBackup();
fActiontqStatus = BackupIncomplete;
fActionStatus = BackupIncomplete;
return;
}
@ -403,7 +403,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
addSyncLogEntry( i18n("Fast backup complete.") );
}
endBackup();
fActiontqStatus = BackupComplete;
fActionStatus = BackupComplete;
return;
}
@ -557,7 +557,7 @@ void BackupAction::endBackup()
FUNCTIONSETUP;
fP->fDBIndex = (-1);
fActiontqStatus = BackupEnded;
fActionStatus = BackupEnded;
fP->fDeviceDBs.sort();
TQString old( TQString::null );
TQStringList::Iterator itr = fP->fDeviceDBs.begin();
@ -993,7 +993,7 @@ void RestoreAction::setDirectory( const TQString &path )
{
WARNINGKPILOT << "Restore directory "
<< dirname << " does not exist." << endl;
fActiontqStatus = Error;
fActionStatus = Error;
addSyncLogEntry(i18n("Restore directory does not exist.") +
CSL1(" ") + i18n("Restore not performed."));
return false;
@ -1047,7 +1047,7 @@ void RestoreAction::setDirectory( const TQString &path )
fP->fDBIndex = 0;
fP->fDBIterator = fP->fDBList.begin();
fActiontqStatus = InstallingFiles;
fActionStatus = InstallingFiles;
TQObject::connect(&(fP->fTimer), TQT_SIGNAL(timeout()),
this, TQT_SLOT(installNextFile()));
@ -1060,14 +1060,14 @@ void RestoreAction::setDirectory( const TQString &path )
{
FUNCTIONSETUP;
Q_ASSERT(fActiontqStatus == InstallingFiles);
Q_ASSERT(fActionStatus == InstallingFiles);
if (fP->fDBIterator == fP->fDBList.end())
{
fP->fTimer.stop();
fActiontqStatus = Done;
fActionStatus = Done;
addSyncLogEntry(i18n("OK."));
delayDone();
return;
@ -1083,7 +1083,7 @@ void RestoreAction::setDirectory( const TQString &path )
{
WARNINGKPILOT << "Restore apparently canceled." << endl;
logMessage(i18n("Restore incomplete."));
fActiontqStatus = Done;
fActionStatus = Done;
emit syncDone(this);
return;

4
kpilot/hotSync.h
Unescape View File

@ -65,7 +65,7 @@ public:
*/
BackupAction(KPilotLink *, bool full);
enum tqStatus { Init,
enum Status { Init,
Error,
FastBackup,
FullBackup,
@ -150,7 +150,7 @@ Q_OBJECT
public:
RestoreAction(KPilotLink *,TQWidget *w=0L);
typedef enum { InstallingFiles, GettingFileInfo,Done } tqStatus;
typedef enum { InstallingFiles, GettingFileInfo,Done } Status;
virtual TQString statusString() const;
/** By default, a path based on the user name (either

22
kpilot/internalEditorAction.cc
Unescape View File

@ -60,7 +60,7 @@ bool InternalEditorAction::exec()
{
FUNCTIONSETUP;
emit logMessage(i18n("[Internal Editors]"));
fInternalEditorSynctqStatus=eSyncStarted;
fInternalEditorSyncStatus=eSyncStarted;
TQTimer::singleShot(0, this, TQT_SLOT(syncDirtyDB()));
return true;
}
@ -69,9 +69,9 @@ void InternalEditorAction::syncDirtyDB()
{
FUNCTIONSETUP;
if (fInternalEditorSynctqStatus!=eSyncDirtyDB)
if (fInternalEditorSyncStatus!=eSyncDirtyDB)
{
fInternalEditorSynctqStatus=eSyncDirtyDB;
fInternalEditorSyncStatus=eSyncDirtyDB;
dirtyDBs=KPilotSettings::dirtyDatabases();
emit logMessage(i18n("Databases with changed records: %1").tqarg(dirtyDBs.join(CSL1(", "))));
dbIter=dirtyDBs.begin();
@ -217,7 +217,7 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
TQGridLayout*tqlayout = new TQGridLayout( page, 1, 1);
TQLabel *label=new TQLabel(dialogText, page);
label->tqsetAlignment( TQLabel::WordBreak );
label->setAlignment( TQLabel::WordBreak );
tqlayout->addMultiCellWidget( label, 0,0, 0,1 );
tqlayout->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Minimum,
@ -262,7 +262,7 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
{
TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from tdeutils)."), page );
tmpW->setBackgroundMode( TQt::PaletteMid );
tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
tmpW->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
tmpW->setFrameShape( TQFrame::Panel );
tmpW->setFrameShadow( TQFrame::Sunken );
hexEdit = tmpW;
@ -290,7 +290,7 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
{
TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from tdeutils)."), page );
tmpW->setBackgroundMode( TQt::PaletteMid );
tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
tmpW->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
tmpW->setFrameShape( TQFrame::Panel );
tmpW->setFrameShadow( TQFrame::Sunken );
hexEdit = tmpW;
@ -308,9 +308,9 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
void InternalEditorAction::syncFlagsChangedDB()
{
FUNCTIONSETUP;
if (fInternalEditorSynctqStatus!=eSyncFlagsChangedDB)
if (fInternalEditorSyncStatus!=eSyncFlagsChangedDB)
{
fInternalEditorSynctqStatus=eSyncFlagsChangedDB;
fInternalEditorSyncStatus=eSyncFlagsChangedDB;
dirtyDBs=KPilotSettings::flagsChangedDatabases();
emit logMessage(i18n("Databases with changed flags: %1").tqarg(dirtyDBs.join(CSL1(", "))));
dbIter=dirtyDBs.begin();
@ -349,9 +349,9 @@ return;
void InternalEditorAction::syncAppBlockChangedDB()
{
FUNCTIONSETUP;
if (fInternalEditorSynctqStatus!=eSyncAppBlockChangedDB)
if (fInternalEditorSyncStatus!=eSyncAppBlockChangedDB)
{
fInternalEditorSynctqStatus=eSyncAppBlockChangedDB;
fInternalEditorSyncStatus=eSyncAppBlockChangedDB;
dirtyDBs=KPilotSettings::appBlockChangedDatabases();
emit logMessage(i18n("Databases with changed AppBlock: %1").tqarg(dirtyDBs.join(CSL1(", "))));
dbIter=dirtyDBs.begin();
@ -387,7 +387,7 @@ void InternalEditorAction::syncAppBlockChangedDB()
void InternalEditorAction::cleanup()
{
FUNCTIONSETUP;
fInternalEditorSynctqStatus=eSyncFinished;
fInternalEditorSyncStatus=eSyncFinished;
emit syncDone(this);
}

4
kpilot/internalEditorAction.h
Unescape View File

@ -57,13 +57,13 @@ private:
PilotRecord*localrec, PilotRecord*serialrec, PilotDatabase*db);
TQStringList dirtyDBs;
TQStringList::Iterator dbIter;
enum eInternalEditorSynctqStatus {
enum eInternalEditorSyncStatus {
eSyncStarted,
eSyncDirtyDB,
eSyncFlagsChangedDB,
eSyncAppBlockChangedDB,
eSyncFinished
} fInternalEditorSynctqStatus;
} fInternalEditorSyncStatus;
} ;
#endif

38
kpilot/kpilot.cc
Unescape View File

@ -104,7 +104,7 @@ KPilotInstaller::KPilotInstaller() :
fQuitAfterCopyComplete(false),
fManagingWidget(0L),
fDaemonWasRunning(true),
fApptqStatus(Startup),
fAppStatus(Startup),
fFileInstallWidget(0L),
fLogWidget(0L)
{
@ -143,7 +143,7 @@ void KPilotInstaller::startDaemonIfNeeded()
{
FUNCTIONSETUP;
fApptqStatus=WaitingForDaemon;
fAppStatus=WaitingForDaemon;
TQString daemonError;
TQCString daemonDCOP;
@ -180,7 +180,7 @@ void KPilotInstaller::startDaemonIfNeeded()
"KPilot daemon. The system error message "
"was: &quot;%1&quot;").tqarg(daemonError));
}
fApptqStatus=Error;
fAppStatus=Error;
}
else
{
@ -196,7 +196,7 @@ void KPilotInstaller::startDaemonIfNeeded()
i18n("Daemon status is `%1'")
.tqarg(s.isEmpty() ? i18n("not running") : s ));
}
fApptqStatus=Normal;
fAppStatus=Normal;
}
}
@ -228,7 +228,7 @@ void KPilotInstaller::setupWidget()
fManagingWidget = new KJanusWidget(this,"mainWidget",
KJanusWidget::IconList);
fManagingWidget->setMinimumSize(fManagingWidget->tqsizeHint());
fManagingWidget->setMinimumSize(fManagingWidget->sizeHint());
fManagingWidget->show();
setCentralWidget(fManagingWidget);
connect( fManagingWidget, TQT_SIGNAL( aboutToShowPage ( TQWidget* ) ),
@ -238,7 +238,7 @@ void KPilotInstaller::setupWidget()
initMenu();
initComponents();
setMinimumSize(tqsizeHint() + TQSize(10,60));
setMinimumSize(sizeHint() + TQSize(10,60));
createGUI(CSL1("kpilotui.rc"), false);
setAutoSaveSettings();
@ -401,7 +401,7 @@ void KPilotInstaller::slotPCtoHHRequested()
i18n("Please press the HotSync button."));
}
/* virtual DCOP */ ASYNC KPilotInstaller::daemontqStatus(int i)
/* virtual DCOP */ ASYNC KPilotInstaller::daemonStatus(int i)
{
FUNCTIONSETUP;
DEBUGKPILOT << fname << ": Received daemon message " << i << endl;
@ -409,17 +409,17 @@ void KPilotInstaller::slotPCtoHHRequested()
switch(i)
{
case KPilotDCOP::StartOfHotSync :
if (fApptqStatus==Normal)
if (fAppStatus==Normal)
{
fApptqStatus=WaitingForDaemon;
fAppStatus=WaitingForDaemon;
componentPreSync();
}
break;
case KPilotDCOP::EndOfHotSync :
if (fApptqStatus==WaitingForDaemon)
if (fAppStatus==WaitingForDaemon)
{
componentPostSync();
fApptqStatus=Normal;
fAppStatus=Normal;
}
break;
case KPilotDCOP::DaemonQuit :
@ -429,7 +429,7 @@ void KPilotInstaller::slotPCtoHHRequested()
fLogWidget->logMessage(i18n("No further HotSyncs are possible."));
fLogWidget->logMessage(i18n("Restart the daemon to HotSync again."));
}
fApptqStatus=WaitingForDaemon;
fAppStatus=WaitingForDaemon;
break;
case KPilotDCOP::None :
WARNINGKPILOT << "Unhandled status message " << i << endl;
@ -437,7 +437,7 @@ void KPilotInstaller::slotPCtoHHRequested()
}
}
/* virtual DCOP*/ int KPilotInstaller::kpilotqStatus()
/* virtual DCOP*/ int KPilotInstaller::kpiloStatus()
{
return status();
}
@ -920,7 +920,7 @@ void KPilotInstaller::componentUpdate()
{
FUNCTIONSETUP;
if ( fApptqStatus!=Normal || fConfigureKPilotDialogInUse )
if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse )
{
if (fLogWidget)
{
@ -928,7 +928,7 @@ void KPilotInstaller::componentUpdate()
}
return;
}
fApptqStatus=UIBusy;
fAppStatus=UIBusy;
fConfigureKPilotDialogInUse = true;
if (runWizard(getDaemon(),this) == OK)
@ -937,14 +937,14 @@ void KPilotInstaller::componentUpdate()
}
fConfigureKPilotDialogInUse = false;
fApptqStatus=Normal;
fAppStatus=Normal;
}
/* virtual DCOP */ ASYNC KPilotInstaller::configure()
{
FUNCTIONSETUP;
if ( fApptqStatus!=Normal || fConfigureKPilotDialogInUse )
if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse )
{
if (fLogWidget)
{
@ -952,7 +952,7 @@ void KPilotInstaller::componentUpdate()
}
return;
}
fApptqStatus=UIBusy;
fAppStatus=UIBusy;
fConfigureKPilotDialogInUse = true;
if (runConfigure(getDaemon(),this))
{
@ -960,7 +960,7 @@ void KPilotInstaller::componentUpdate()
}
fConfigureKPilotDialogInUse = false;
fApptqStatus=Normal;
fAppStatus=Normal;
}

8
kpilot/kpilot.h
Unescape View File

@ -70,7 +70,7 @@ public:
void addComponentPage(PilotComponent *, const TQString &name);
KPilotqStatus status() const { return fApptqStatus; } ;
KPiloStatus status() const { return fAppStatus; } ;
protected:
@ -122,8 +122,8 @@ public:
/**
* This is the DCOP interface from the daemon to KPilot.
*/
virtual ASYNC daemontqStatus(int);
virtual int kpilotqStatus();
virtual ASYNC daemonStatus(int);
virtual int kpiloStatus();
public slots:
/**
@ -175,7 +175,7 @@ private:
KJanusWidget *fManagingWidget;
bool fDaemonWasRunning;
KPilotqStatus fApptqStatus;
KPiloStatus fAppStatus;
FileInstallWidget *fFileInstallWidget;
LogWidget *fLogWidget;

2
kpilot/kpilotConfig.cc
Unescape View File

@ -234,7 +234,7 @@ static void update440()
const char **s = oldconduits;
while (*s)
{
TQString libname = CSL1("trinity/lib%1conduit.so").tqarg(TQString::tqfromLatin1(*s));
TQString libname = CSL1("trinity/lib%1conduit.so").tqarg(TQString::fromLatin1(*s));
TQString foundlib = ::locate("lib",libname);
if (!foundlib.isEmpty())
{

8
kpilot/kpilotConfigDialog_backup.ui
Unescape View File

@ -44,7 +44,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@ -97,7 +97,7 @@
<property name="name">
<cstring>TextLabel5</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@ -117,7 +117,7 @@
<property name="name">
<cstring>TextLabel6</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@ -194,7 +194,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>41</height>

2
kpilot/kpilotConfigDialog_device.ui
Unescape View File

@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>90</height>

2
kpilot/kpilotConfigDialog_startup.ui
Unescape View File

@ -105,7 +105,7 @@ KPilot's settings.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>31</height>

2
kpilot/kpilotConfigDialog_sync.ui
Unescape View File

@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>170</height>

2
kpilot/kpilotConfigDialog_viewers.ui
Unescape View File

@ -136,7 +136,7 @@ KPilot's settings.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>41</height>

4
kpilot/kpilotConfigWizard_app.ui
Unescape View File

@ -79,7 +79,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>120</height>
@ -96,7 +96,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W
<property name="sizeType">
<enum>Minimum</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>12</height>

2
kpilot/kpilotConfigWizard_user.ui
Unescape View File

@ -149,7 +149,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>70</height>

6
kpilot/kpilotDCOP.h
Unescape View File

@ -43,7 +43,7 @@ public:
StartOfHotSync=1,
EndOfHotSync=2,
DaemonQuit=4 } ;
enum KPilotqStatus {
enum KPiloStatus {
Startup=1,
WaitingForDaemon=2,
Normal=10,
@ -55,7 +55,7 @@ k_dcop:
* This is the method the daemon uses to report
* changes in its state.
*/
virtual ASYNC daemontqStatus(int) = 0;
virtual ASYNC daemonStatus(int) = 0;
/**
* This is the method the daemon uses to popup
@ -67,7 +67,7 @@ k_dcop:
/**
* Report KPilot's state back to the daemon.
*/
virtual int kpilotqStatus() = 0;
virtual int kpiloStatus() = 0;
} ;

24
kpilot/kpilotProbeDialog.cc
Unescape View File

@ -95,15 +95,15 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) :
TQVBox *mainWidget = makeVBoxMainWidget();
fInfoText = new TQLabel( i18n( "KPilot is now trying to automatically detect the device of your handheld. Please press the hotsync button if you have not done so already." ), mainWidget, "fInfoText" );
fInfoText->tqsetAlignment( TQLabel::WordBreak );
fInfoText->setAlignment( TQLabel::WordBreak );
fStatusGroup = new TQGroupBox( i18n("Status"), mainWidget, "fStatusGroup" );
fStatusGroup->setColumnLayout(0, Qt::Vertical );
fStatusGroupLayout = new TQGridLayout( fStatusGroup->tqlayout() );
ftqStatus = new TQLabel( i18n("Autodetection not yet started..."), fStatusGroup, "fStatus" );
ftqStatus->tqsetAlignment( TQLabel::WordBreak );
fStatusGroupLayout->addWidget( ftqStatus, 0, 0 );
fStatus = new TQLabel( i18n("Autodetection not yet started..."), fStatusGroup, "fStatus" );
fStatus->setAlignment( TQLabel::WordBreak );
fStatusGroupLayout->addWidget( fStatus, 0, 0 );
fProgress = new KProgress( 100, fStatusGroup, "fProgress" );
fStatusGroupLayout->addWidget( fProgress, 1, 0 );
@ -114,10 +114,10 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) :
fResultsGroup->setEnabled( FALSE );
fResultsGroup->setColumnLayout(0, Qt::Vertical );
fResultsGroupLayout = new TQGridLayout( fResultsGroup->tqlayout() );
fResultsGroupLayout->tqsetAlignment( TQt::AlignTop );
fResultsGroupLayout->setAlignment( TQt::AlignTop );
fUserLabel = new TQLabel( i18n( "Handheld user:" ), fResultsGroup, "fUserLabel" );
fUserLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fUserLabel->sizePolicy().hasHeightForWidth() ) );
fUserLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fUserLabel->sizePolicy().hasHeightForWidth() ) );
fResultsGroupLayout->addWidget( fUserLabel, 0, 0 );
fDeviceLabel = new TQLabel( i18n( "Device:" ), fResultsGroup, "fDeviceLabel" );
@ -130,7 +130,7 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) :
fResultsGroupLayout->addWidget( fDevice, 1, 1 );
resize( TQSize(459, 298).expandedTo(tqminimumSizeHint()) );
resize( TQSize(459, 298).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
enableButtonOK(false);
@ -192,7 +192,7 @@ void ProbeDialog::startDetection()
disconnectDevices();
fProgress->setProgress(0);
ftqStatus->setText( i18n("Starting detection...") );
fStatus->setText( i18n("Starting detection...") );
TQTimer::singleShot(0, this, TQT_SLOT(processEvents()) );
processEvents();
PilotDaemonDCOP_stub *daemonStub = new PilotDaemonDCOP_stub("kpilotDaemon", "KPilotDaemonIface");
@ -230,7 +230,7 @@ void ProbeDialog::startDetection()
processEvents();
}
}
ftqStatus->setText( i18n("Waiting for handheld to connect...") );
fStatus->setText( i18n("Waiting for handheld to connect...") );
mProbeDevicesIndex=0;
detect();
@ -263,7 +263,7 @@ void ProbeDialog::timeout()
{
disconnectDevices();
if (!mDetected) {
ftqStatus->setText( i18n("Timeout reached, could not detect a handheld.") );
fStatus->setText( i18n("Timeout reached, could not detect a handheld.") );
KMessageBox::information ( this, i18n("<qt>A handheld could not be detected. Possible check the following things:</p>"
"<ul><li> Have you pressed the hotsync button on the handheld?\n"
"<li> Make sure the device sits in the cradle correctly.\n"
@ -285,7 +285,7 @@ void ProbeDialog::connection( KPilotDeviceLink*lnk)
mUserName = usr.name();
mDevice = mActiveLink->pilotPath();
ftqStatus->setText( i18n("Found a connected device on %1").tqarg(mDevice) );
fStatus->setText( i18n("Found a connected device on %1").tqarg(mDevice) );
fUser->setText( mUserName );
fDevice->setText( mDevice );
mDetected = true;
@ -335,7 +335,7 @@ void ProbeDialog::disconnectDevices()
{
FUNCTIONSETUP;
if (!mDetected) ftqStatus->setText( i18n("Disconnected from all devices") );
if (!mDetected) fStatus->setText( i18n("Disconnected from all devices") );
fProcessEventsTimer->stop( );
fTimeoutTimer->stop();
fProgressTimer->stop();

2
kpilot/kpilotProbeDialog.h
Unescape View File

@ -78,7 +78,7 @@ protected:
TQLabel* fUser;
TQLabel* fDevice;
TQGroupBox* fStatusGroup;
TQLabel* ftqStatus;
TQLabel* fStatus;
KProgress* fProgress;
TQTimer* fProcessEventsTimer;

10
kpilot/logFile.cc
Unescape View File

@ -70,21 +70,21 @@ LogFile::LogFile() : DCOPObject("LogIface"), TQObject(), fOutfile(0L), fSyncing(
fSyncing = true;
fLogStream.setDevice(TQT_TQIODEVICE(fOutfile));
fLogStream<<(CSL1("KPilot HotSync log, %1").tqarg(TQDateTime::tqcurrentDateTime().toString()))<<endl<<endl<<endl;
fLogStream<<(CSL1("Version: KPilot %1").tqarg(TQString::tqfromLatin1(KPILOT_VERSION)))<<endl;
fLogStream<<(CSL1("KPilot HotSync log, %1").tqarg(TQDateTime::currentDateTime().toString()))<<endl<<endl<<endl;
fLogStream<<(CSL1("Version: KPilot %1").tqarg(TQString::fromLatin1(KPILOT_VERSION)))<<endl;
fLogStream<<(CSL1("Version: pilot-link %1.%2.%3%4" )
.tqarg(PILOT_LINK_VERSION).tqarg(PILOT_LINK_MAJOR).tqarg(PILOT_LINK_MINOR)
#ifdef PILOT_LINK_PATCH
.tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH))
.tqarg(TQString::fromLatin1(PILOT_LINK_PATCH))
#else
.tqarg(TQString())
#endif
)<<endl;
#ifdef TDE_VERSION_STRING
fLogStream<<(CSL1("Version: KDE %1" ).tqarg(TQString::tqfromLatin1(TDE_VERSION_STRING)) )<<endl;
fLogStream<<(CSL1("Version: KDE %1" ).tqarg(TQString::fromLatin1(TDE_VERSION_STRING)) )<<endl;
#endif
#ifdef TQT_VERSION_STR
fLogStream<<(CSL1("Version: TQt %1" ).tqarg(TQString::tqfromLatin1(TQT_VERSION_STR)) )<<endl;
fLogStream<<(CSL1("Version: TQt %1" ).tqarg(TQString::fromLatin1(TQT_VERSION_STR)) )<<endl;
#endif
fLogStream<<endl<<endl;

14
kpilot/logWidget.cc
Unescape View File

@ -95,24 +95,24 @@ LogWidget::LogWidget(TQWidget * parent) :
TQString initialText ;
initialText.append(CSL1("<b>Version:</b> KPilot %1" TE_EOL)
.tqarg(TQString::tqfromLatin1(KPILOT_VERSION)));
.tqarg(TQString::fromLatin1(KPILOT_VERSION)));
initialText.append(CSL1("<b>Version:</b> pilot-link %1.%2.%3%4" TE_EOL)
.tqarg(PILOT_LINK_VERSION)
.tqarg(PILOT_LINK_MAJOR)
.tqarg(PILOT_LINK_MINOR)
#ifdef PILOT_LINK_PATCH
.tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH))
.tqarg(TQString::fromLatin1(PILOT_LINK_PATCH))
#else
.tqarg(TQString())
#endif
);
#ifdef TDE_VERSION_STRING
initialText.append(CSL1("<b>Version:</b> KDE %1" TE_EOL)
.tqarg(TQString::tqfromLatin1(TDE_VERSION_STRING)));
.tqarg(TQString::fromLatin1(TDE_VERSION_STRING)));
#endif
#ifdef TQT_VERSION_STR
initialText.append(CSL1("<b>Version:</b> TQt %1" TE_EOL)
.tqarg(TQString::tqfromLatin1(TQT_VERSION_STR)));
.tqarg(TQString::fromLatin1(TQT_VERSION_STR)));
#endif
initialText.append(CSL1(TE_EOL));
@ -172,7 +172,7 @@ LogWidget::LogWidget(TQWidget * parent) :
// This latin1() is ok; KPILOT_VERSION is a #define
// of a constant string.
int textWidth =fontMetrics().width(
TQString::tqfromLatin1(KPILOT_VERSION)) ;
TQString::fromLatin1(KPILOT_VERSION)) ;
int textHeight = fontMetrics().height();
#ifdef DEBUG
@ -189,10 +189,10 @@ LogWidget::LogWidget(TQWidget * parent) :
black);
painter.drawText(splash.width() - 25 - textWidth,
splash.height() - 8,
TQString::tqfromLatin1(KPILOT_VERSION));
TQString::fromLatin1(KPILOT_VERSION));
fSplash = new TQLabel(this);
fSplash->setPixmap(splash);
fSplash->tqsetAlignment(AlignCenter);
fSplash->setAlignment(AlignCenter);
TQTimer::singleShot(3000,this,TQT_SLOT(hideSplash()));
grid->addMultiCellWidget(fSplash,1,3,1,2);
grid->addColSpacing(0,10);

2
kpilot/memoWidget.cc
Unescape View File

@ -591,7 +591,7 @@ void MemoWidget::slotAddMemo()
FUNCTIONSETUP;
int currentCatID = findSelectedCategory(fCatList,
d->fMemoAppInfo->categoryInfo(), true);
addMemo(TQDateTime::tqcurrentDateTime().toString(), currentCatID);
addMemo(TQDateTime::currentDateTime().toString(), currentCatID);
}
void MemoWidget::slotImportMemo()

50
kpilot/pilotDaemon.cc
Unescape View File

@ -279,7 +279,7 @@ void PilotDaemonTray::endHotSync()
PilotDaemon::PilotDaemon() :
DCOPObject("KPilotDaemonIface"),
fDaemontqStatus(INIT),
fDaemonStatus(INIT),
fPostSyncAction(None),
fPilotLink(0L),
fNextSyncType(SyncAction::SyncMode::eHotSync,true),
@ -297,7 +297,7 @@ PilotDaemon::PilotDaemon() :
setupPilotLink();
reloadSettings();
if (fDaemontqStatus == ERROR)
if (fDaemonStatus == ERROR)
{
WARNINGKPILOT << "Connecting to device failed." << endl;
return;
@ -403,7 +403,7 @@ void PilotDaemon::showTray()
DEBUGKPILOT << fname << ": Tray icon displayed." << endl;
#endif
updateTraytqStatus();
updateTrayStatus();
}
/* DCOP ASYNC */ void PilotDaemon::setTempDevice(TQString d)
@ -420,7 +420,7 @@ void PilotDaemon::showTray()
{
FUNCTIONSETUP;
switch (fDaemontqStatus)
switch (fDaemonStatus)
{
case INIT:
case HOTSYNC_END:
@ -508,7 +508,7 @@ void PilotDaemon::showTray()
}
}
updateTraytqStatus();
updateTrayStatus();
logProgress(TQString(),0);
}
@ -516,7 +516,7 @@ void PilotDaemon::showTray()
{
fIsListening=false;
fTray->changeIcon(PilotDaemonTray::NotListening);
fDaemontqStatus=NOT_LISTENING;
fDaemonStatus=NOT_LISTENING;
fPilotLink->close();
}
@ -524,7 +524,7 @@ void PilotDaemon::showTray()
{
fIsListening=true;
fTray->changeIcon(PilotDaemonTray::Normal);
fDaemontqStatus=INIT;
fDaemonStatus=INIT;
fPilotLink->reset();
}
@ -616,13 +616,13 @@ bool PilotDaemon::setupPilotLink()
// Using switch to make sure we cover all the cases.
//
//
switch (fDaemontqStatus)
switch (fDaemonStatus)
{
case INIT:
case HOTSYNC_END:
case ERROR:
case NOT_LISTENING:
getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit);
getKPilot().daemonStatus(KPilotDCOP::DaemonQuit);
kapp->quit();
break;
case READY:
@ -655,7 +655,7 @@ bool PilotDaemon::setupPilotLink()
return;
}
updateTraytqStatus();
updateTrayStatus();
if (fTray && (fTray->fSyncTypeMenu))
{
@ -799,8 +799,8 @@ bool PilotDaemon::killDaemonOnExit()
return KPilotSettings::killDaemonAtExit();
}
typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLocktqStatus;
static KDesktopLocktqStatus isKDesktopLockRunning()
typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLockStatus;
static KDesktopLockStatus isKDesktopLockRunning()
{
if (!KPilotSettings::screenlockSecure()) return NotLocked;
@ -847,7 +847,7 @@ static void informOthers(KPilotDCOP_stub &kpilot,
LoggerDCOP_stub &log,
LoggerDCOP_stub &filelog)
{
kpilot.daemontqStatus(KPilotDCOP::StartOfHotSync);
kpilot.daemonStatus(KPilotDCOP::StartOfHotSync);
log.logStartSync();
filelog.logStartSync();
}
@ -864,7 +864,7 @@ static bool isSyncPossible(ActionQueue *fSyncStack,
* just tell the user that the sync couldn't run because
* of that.
*/
int kpilotstatus = kpilot.kpilotqStatus();
int kpilotstatus = kpilot.kpiloStatus();
DCOPStub::Status callstatus = kpilot.status();
#ifdef DEBUG
@ -1003,7 +1003,7 @@ bool PilotDaemon::shouldBackup()
(void) PilotDatabase::instanceCount();
#endif
fDaemontqStatus = HOTSYNC_START ;
fDaemonStatus = HOTSYNC_START ;
if (fTray)
{
fTray->startHotSync();
@ -1120,7 +1120,7 @@ launch:
TQTimer::singleShot(0,fSyncStack,TQT_SLOT(execConduit()));
updateTraytqStatus();
updateTrayStatus();
}
/* slot */ void PilotDaemon::logMessage(const TQString & s)
@ -1129,7 +1129,7 @@ launch:
getLogger().logMessage(s);
getFileLogger().logMessage(s);
updateTraytqStatus(s);
updateTrayStatus(s);
}
/* slot */ void PilotDaemon::logError(const TQString & s)
@ -1138,7 +1138,7 @@ launch:
getLogger().logError(s);
getFileLogger().logError(s);
updateTraytqStatus(s);
updateTrayStatus(s);
}
/* slot */ void PilotDaemon::logProgress(const TQString & s, int i)
@ -1147,7 +1147,7 @@ launch:
getLogger().logProgress(s, i);
getFileLogger().logProgress(s, i);
if (!s.isEmpty()) updateTraytqStatus(s);
if (!s.isEmpty()) updateTrayStatus(s);
}
/* slot */ void PilotDaemon::endHotSync()
@ -1166,15 +1166,15 @@ launch:
getFileLogger().logProgress(i18n("HotSync Completed.<br>"), 100);
getLogger().logEndSync();
getFileLogger().logEndSync();
getKPilot().daemontqStatus(KPilotDCOP::EndOfHotSync);
KPilotSettings::setLastSyncTime(TQDateTime::tqcurrentDateTime());
getKPilot().daemonStatus(KPilotDCOP::EndOfHotSync);
KPilotSettings::setLastSyncTime(TQDateTime::currentDateTime());
KPilotSettings::self()->writeConfig();
fDaemontqStatus = HOTSYNC_END;
fDaemonStatus = HOTSYNC_END;
if (fPostSyncAction & Quit)
{
getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit);
getKPilot().daemonStatus(KPilotDCOP::DaemonQuit);
kapp->quit();
}
if (fPostSyncAction & ReloadSettings)
@ -1191,7 +1191,7 @@ launch:
(void) PilotDatabase::instanceCount();
updateTraytqStatus();
updateTrayStatus();
}
@ -1264,7 +1264,7 @@ void PilotDaemon::slotRunConfig()
}
}
void PilotDaemon::updateTraytqStatus(const TQString &s)
void PilotDaemon::updateTrayStatus(const TQString &s)
{
if (!fTray) return;

8
kpilot/pilotDaemon.h
Unescape View File

@ -138,7 +138,7 @@ public:
PilotDaemon();
~PilotDaemon();
enum DaemontqStatus
enum DaemonStatus
{
HOTSYNC_START, // Hotsync is running
HOTSYNC_END, // Hotsync is cleaning up
@ -149,7 +149,7 @@ public:
NOT_LISTENING
};
DaemontqStatus status() const { return fDaemontqStatus; } ;
DaemonStatus status() const { return fDaemonStatus; } ;
/* DCOP */ virtual TQString statusString();
/* DCOP */ virtual TQString shorStatusString();
@ -198,7 +198,7 @@ public:
virtual bool killDaemonOnExit();
protected:
DaemontqStatus fDaemontqStatus;
DaemonStatus fDaemonStatus;
enum postSyncActions {
None=0,
@ -244,7 +244,7 @@ private:
/**
* Set or change the tooltip displayed by the tray icon.
*/
void updateTraytqStatus(const TQString &s=TQString());
void updateTrayStatus(const TQString &s=TQString());
FileInstaller *fInstaller;

2
kpilot/todoEditor_base.ui
Unescape View File

@ -127,7 +127,7 @@
<property name="name">
<cstring>fDescription</cstring>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>32767</width>
<height>80</height>

2
lib/actions.cc
Unescape View File

@ -52,7 +52,7 @@ WelcomeAction::WelcomeAction(KPilotLink *p) :
FUNCTIONSETUP;
addSyncLogEntry(i18n("KPilot %1 HotSync starting...\n")
.tqarg(TQString::tqfromLatin1(KPILOT_VERSION)));
.tqarg(TQString::fromLatin1(KPILOT_VERSION)));
emit logMessage( i18n("Using encoding %1 on the handheld.").tqarg(Pilot::codecName()) );
emit syncDone(this);
return true;

38
lib/kpilotdevicelink.cc
Unescape View File

@ -155,7 +155,7 @@ void DeviceCommThread::reset()
// Timer already deleted by close() call.
startOpenTimer(this,fOpenTimer);
link()->fLinktqStatus = WaitingForDevice;
link()->fLinkStatus = WaitingForDevice;
}
/**
@ -176,9 +176,9 @@ void DeviceCommThread::openDevice()
// This transition (from Waiting to Found) can only be
// taken once.
//
if (link()->fLinktqStatus == WaitingForDevice)
if (link()->fLinkStatus == WaitingForDevice)
{
link()->fLinktqStatus = FoundDevice;
link()->fLinkStatus = FoundDevice;
}
if (link()->fMessages->shouldPrint(Messages::OpenMessage))
@ -244,7 +244,7 @@ bool DeviceCommThread::open(const TQString &device)
<< link()->fRealPilotPath << "] already connected." << endl;
WARNINGKPILOT << msg << endl;
link()->fLinktqStatus = PilotLinkError;
link()->fLinkStatus = PilotLinkError;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg));
@ -263,7 +263,7 @@ bool DeviceCommThread::open(const TQString &device)
DEBUGKPILOT << msg << endl;
DEBUGKPILOT << "(" << strerror(e) << ")" << endl;
link()->fLinktqStatus = PilotLinkError;
link()->fLinkStatus = PilotLinkError;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg));
@ -272,7 +272,7 @@ bool DeviceCommThread::open(const TQString &device)
DEBUGKPILOT << fname << ": Got socket: [" << fTempSocket << "]" << endl;
link()->fLinktqStatus = CreatedSocket;
link()->fLinkStatus = CreatedSocket;
DEBUGKPILOT << fname << ": Binding to path: ["
<< link()->fRealPilotPath << "]" << endl;
@ -291,7 +291,7 @@ bool DeviceCommThread::open(const TQString &device)
DEBUGKPILOT << msg << endl;
DEBUGKPILOT << "(" << strerror(e) << ")" << endl;
link()->fLinktqStatus = PilotLinkError;
link()->fLinkStatus = PilotLinkError;
if (link()->fMessages->shouldPrint(Messages::OpenFailMessage))
{
@ -301,7 +301,7 @@ bool DeviceCommThread::open(const TQString &device)
return false;
}
link()->fLinktqStatus = DeviceOpen;
link()->fLinkStatus = DeviceOpen;
DeviceMap::self()->bindDevice(link()->fRealPilotPath);
fSocketNotifier = new TQSocketNotifier(fTempSocket,
@ -411,16 +411,16 @@ void DeviceCommThread::acceptDevice()
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)")
.tqarg(TQString::fromLocal8Bit(s))));
link()->fLinktqStatus = PilotLinkError;
link()->fLinkStatus = PilotLinkError;
reset();
return;
}
DEBUGKPILOT << fname << ": Link accept done." << endl;
if ((link()->fLinktqStatus != DeviceOpen) || (fPilotSocket == -1))
if ((link()->fLinkStatus != DeviceOpen) || (fPilotSocket == -1))
{
link()->fLinktqStatus = PilotLinkError;
link()->fLinkStatus = PilotLinkError;
WARNINGKPILOT << "Already connected or unable to connect!" << endl;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)")
@ -440,7 +440,7 @@ void DeviceCommThread::acceptDevice()
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError,
i18n("Unable to read system information from Pilot")));
link()->fLinktqStatus=PilotLinkError;
link()->fLinkStatus=PilotLinkError;
reset();
return;
}
@ -488,7 +488,7 @@ void DeviceCommThread::acceptDevice()
"Perhaps you have a password set on the device?")));
}
link()->fLinktqStatus = AcceptedDevice;
link()->fLinkStatus = AcceptedDevice;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString(), 100));
@ -529,7 +529,7 @@ void DeviceCommThread::run()
KPilotDeviceLink::KPilotDeviceLink(TQObject * parent, const char *name,
const TQString &tempDevice) :
KPilotLink(parent, name), fLinktqStatus(Init), fWorkaroundUSB(false),
KPilotLink(parent, name), fLinkStatus(Init), fWorkaroundUSB(false),
fPilotSocket(-1), fTempDevice(tempDevice), fMessages(new Messages(this)), fDeviceCommThread(0L)
{
FUNCTIONSETUP;
@ -550,7 +550,7 @@ KPilotDeviceLink::~KPilotDeviceLink()
/* virtual */bool KPilotDeviceLink::isConnected() const
{
return fLinktqStatus == AcceptedDevice;
return fLinkStatus == AcceptedDevice;
}
/* virtual */bool KPilotDeviceLink::event(TQEvent *e)
@ -640,7 +640,7 @@ void KPilotDeviceLink::reset(const TQString & dP)
{
FUNCTIONSETUP;
fLinktqStatus = Init;
fLinkStatus = Init;
// Release all resources
//
@ -670,7 +670,7 @@ void KPilotDeviceLink::startCommThread()
TQString msg = i18n("The Pilot device is not configured yet.");
WARNINGKPILOT << msg << endl;
fLinktqStatus = PilotLinkError;
fLinkStatus = PilotLinkError;
emit logError(msg);
return;
@ -689,7 +689,7 @@ void KPilotDeviceLink::reset()
checkDevice();
fLinktqStatus = WaitingForDevice;
fLinkStatus = WaitingForDevice;
startCommThread();
}
@ -788,7 +788,7 @@ int KPilotDeviceLink::openConduit()
return dlp_OpenConduit(fPilotSocket);
}
TQString KPilotDeviceLink::statusString(LinktqStatus l)
TQString KPilotDeviceLink::statusString(LinkStatus l)
{
TQString s= CSL1("KPilotDeviceLink=");

12
lib/kpilotdevicelink.h
Unescape View File

@ -42,7 +42,7 @@ class DeviceCommThread; ///< Thread for doing all palm device communications
* it waits for the actual device to become available, and
* then becomes ready to handle syncing.
*/
enum LinktqStatus {
enum LinkStatus {
Init,
WaitingForDevice,
FoundDevice,
@ -100,15 +100,15 @@ public:
/**
* Get the status (state enum) of this link.
* @return The LinktqStatus enum for the link's current state.
* @return The LinkStatus enum for the link's current state.
*/
LinktqStatus status() const
LinkStatus status() const
{
return fLinktqStatus;
return fLinkStatus;
}
/** Get a human-readable string for the given status @p l. */
static TQString statusString(LinktqStatus l);
static TQString statusString(LinkStatus l);
// The following API is the actual implementation of
// the KPilotLink API, for documentation see that file.
@ -141,7 +141,7 @@ protected:
private:
LinktqStatus fLinktqStatus;
LinkStatus fLinkStatus;
public:

4
lib/options.h
Unescape View File

@ -176,7 +176,7 @@ KDE_EXPORT struct tm writeTm(const TQDate &dt);
// variant is to handle plurals and is wrong, but unavoidable.
//
//
#define TODO_I18N(a) TQString::tqfromLatin1(a)
#define TODO_I18N(a) TQString::fromLatin1(a)
#define TODO_I18N_P(a,b,c) ((c>1) ? a : b)
// Handle some cases for TQT_NO_CAST_ASCII and NO_ASCII_CAST.
@ -190,6 +190,6 @@ KDE_EXPORT struct tm writeTm(const TQDate &dt);
// with constant strings.
//
//
#define CSL1(a) TQString::tqfromLatin1(a "")
#define CSL1(a) TQString::fromLatin1(a "")
#endif

2
lib/pilot.cc
Unescape View File

@ -137,7 +137,7 @@ bool setupPilotCodec(const TQString &s)
TQString codecName()
{
return TQString::tqfromLatin1(codec->name());
return TQString::fromLatin1(codec->name());
}
TQString category(const struct CategoryAppInfo *info, unsigned int i)

6
lib/pilotLocalDatabase.cc
Unescape View File

@ -182,9 +182,9 @@ bool PilotLocalDatabase::createDatabase(long creator, long type, int, int flags,
fDBInfo.version=version;
fDBInfo.modnum=0;
fDBInfo.index=0;
fDBInfo.createDate=(TQDateTime::tqcurrentDateTime()).toTime_t();
fDBInfo.modifyDate=(TQDateTime::tqcurrentDateTime()).toTime_t();
fDBInfo.backupDate=(TQDateTime::tqcurrentDateTime()).toTime_t();
fDBInfo.createDate=(TQDateTime::currentDateTime()).toTime_t();
fDBInfo.modifyDate=(TQDateTime::currentDateTime()).toTime_t();
fDBInfo.backupDate=(TQDateTime::currentDateTime()).toTime_t();
delete[] fAppInfo;
fAppInfo=0L;

6
lib/plugin.cc
Unescape View File

@ -126,14 +126,14 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
TQPixmap applicationIcon =
l->loadIcon(TQString::tqfromLatin1(p->appName()),
l->loadIcon(TQString::fromLatin1(p->appName()),
KIcon::Desktop,
64, KIcon::DefaultState, 0L,
true);
if (applicationIcon.isNull())
{
applicationIcon = l->loadIcon(TQString::tqfromLatin1("kpilot"),
applicationIcon = l->loadIcon(TQString::fromLatin1("kpilot"),
KIcon::Desktop);
}
@ -706,7 +706,7 @@ TQString findArgument(const TQStringList &a, const TQString &arg)
if (!lib->hasSymbol(symbol.latin1())) return TQString();
return TQString::tqfromLatin1(*((const char **)(lib->symbol(symbol.latin1()))));
return TQString::fromLatin1(*((const char **)(lib->symbol(symbol.latin1()))));
}

12
lib/syncAction.cc
Unescape View File

@ -101,7 +101,7 @@ SyncAction::~SyncAction()
if (!r)
{
emit logError(i18n("The conduit %1 could not be executed.")
.tqarg(TQString::tqfromLatin1(name())));
.tqarg(TQString::fromLatin1(name())));
delayDone();
}
}
@ -142,7 +142,7 @@ SyncAction::SyncMode::SyncMode(const TQStringList &args) :
int i = 0;
while(maps[i].name)
{
if (args.contains(TQString::tqfromLatin1(maps[i].name)))
if (args.contains(TQString::fromLatin1(maps[i].name)))
{
fMode = maps[i].mode;
break;
@ -181,7 +181,7 @@ TQStringList SyncAction::SyncMode::list() const
{
if ( fMode == maps[i].mode )
{
l.append(TQString::tqfromLatin1(maps[i].name));
l.append(TQString::fromLatin1(maps[i].name));
break;
}
i++;
@ -189,7 +189,7 @@ TQStringList SyncAction::SyncMode::list() const
if ( !maps[i].name )
{
WARNINGKPILOT << "Mode " << fMode << " does not have a name." << endl;
l.append(TQString::tqfromLatin1(maps[0].name));
l.append(TQString::fromLatin1(maps[0].name));
}
if (isTest()) l.append(CSL1("--test"));
@ -357,7 +357,7 @@ int SyncAction::questionYesNo(const TQString & text,
label1->setPixmap(TQMessageBox::standardIcon(TQMessageBox::Information));
lay->add( label1 );
TQLabel *label2 = new TQLabel( text, contents);
label2->setMinimumSize(label2->tqsizeHint());
label2->setMinimumSize(label2->sizeHint());
lay->add(label2);
lay->addStretch(1);
@ -469,7 +469,7 @@ int SyncAction::questionYesNoCancel(const TQString & text,
label1->setPixmap(TQMessageBox::standardIcon(TQMessageBox::Information));
lay->add( label1 );
TQLabel *label2 = new TQLabel( text, contents);
label2->setMinimumSize(label2->tqsizeHint());
label2->setMinimumSize(label2->sizeHint());
lay->add(label2);
lay->addStretch(1);

6
lib/syncAction.h
Unescape View File

@ -60,7 +60,7 @@ public:
const char *name=0L);
~SyncAction();
typedef enum { Error=-1 } tqStatus;
typedef enum { Error=-1 } Status;
/** A syncaction has a status, which can be expressed as an
* integer. Subclasses are expected to define their own status
@ -68,7 +68,7 @@ public:
*/
int status() const
{
return fActiontqStatus;
return fActionStatus;
}
/** Return a human-readable representation of the status. */
virtual TQString statusString() const;
@ -156,7 +156,7 @@ public:
protected:
/** Connection to the device. @todo make private. */
KPilotLink *fHandle;
int fActiontqStatus;
int fActionStatus;
/** Returns a pointer to the connection to the device. */
inline KPilotLink *deviceLink() const

2
tests/exportdatebook.cc
Unescape View File

@ -123,7 +123,7 @@ int main(int argc, char **argv)
KCalSync::setEvent(event, d,*fAppointmentAppInfo->categoryInfo());
event->setSynctqStatus( KCal::Incidence::SYNCNONE );
event->setSyncStatus( KCal::Incidence::SYNCNONE );
calendar->addEvent(event);

2
tests/importdatebook.cc
Unescape View File

@ -87,7 +87,7 @@ int main(int argc, char **argv)
<< "], creating DatebookDB in: [" << datadir
<< "]" << endl;
KCal::CalendarLocal *calendar = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") );
KCal::CalendarLocal *calendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
if (!calendar || !calendar->load( vcalfile ))
{
return 1;

6
tests/mergecalendars.cc
Unescape View File

@ -96,8 +96,8 @@ int main(int argc, char **argv)
DEBUGKPILOT << "Will save newfile to: [" << newfilesave
<< "]" << endl << endl;
KCal::CalendarLocal *calkorg = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") );
KCal::CalendarLocal *calnew = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") );
KCal::CalendarLocal *calkorg = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
KCal::CalendarLocal *calnew = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
if (!calkorg || !calnew)
{
WARNINGKPILOT << "Unable to create base calendar objects." << endl;
@ -154,7 +154,7 @@ int main(int argc, char **argv)
<< pilotId << "]" << endl;
ev->setPilotId(pilotId);
ev->setSynctqStatus(KCal::Incidence::SYNCMOD);
ev->setSyncStatus(KCal::Incidence::SYNCMOD);
++numkorgpilotids;
}

2
tests/testcategories.cc
Unescape View File

@ -123,7 +123,7 @@ void categoryNames( const TQString &dir )
DEBUGKPILOT << "# Expect three truncation errors and two bad category numbers." << endl;
for (unsigned int i=0; i<Pilot::CATEGORY_COUNT+2; i++)
{
TQString name = TQString::tqfromLatin1(funnyname+funnyname_length-i-3);
TQString name = TQString::fromLatin1(funnyname+funnyname_length-i-3);
if (!appinfo->setCategoryName(i,name))
{
WARNINGKPILOT << "Failed to set category " << i << " name to <" << name << ">" << endl;

4
tests/testdatabase.cc
Unescape View File

@ -105,7 +105,7 @@ int checkDatabase(const char *path, recordInfo *info)
{
FUNCTIONSETUP;
PilotLocalDatabase db(TQString::tqfromLatin1(path));
PilotLocalDatabase db(TQString::fromLatin1(path));
if (!db.isOpen())
{
kdDebug() << "No database " << path << endl;
@ -191,7 +191,7 @@ TQStringList listCategories()
cats.append(s);
/*
if (i<((sizeof(categoryNames) / sizeof(categoryNames[0]))))
m->setCategoryName(i,TQString::tqfromLatin1(categoryNames[i]));
m->setCategoryName(i,TQString::fromLatin1(categoryNames[i]));
*/
}

Write Preview
Loading…
Cancel
Save