From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ktnef/gui/attachpropertydialog.cpp | 4 ++-- ktnef/gui/attachpropertydialogbase.ui | 10 +++++----- ktnef/gui/ktnefmain.cpp | 4 ++-- ktnef/gui/ktnefview.cpp | 2 +- ktnef/gui/qwmf.cpp | 2 +- ktnef/gui/qwmf.h | 2 +- ktnef/gui/wmfstruct.h | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'ktnef/gui') diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp index 35cd65848..06e2685d6 100644 --- a/ktnef/gui/attachpropertydialog.cpp +++ b/ktnef/gui/attachpropertydialog.cpp @@ -53,7 +53,7 @@ void AttachPropertyDialog::setAttachment(KTNEFAttach *attach) s.append(" bytes"); size_->setText(s); KMimeType::Ptr mimetype = KMimeType::mimeType(attach->mimeTag()); - TQPixmap pix = loadRenderingPixmap( attach, colorGroup().background() ); + TQPixmap pix = loadRenderingPixmap( attach, tqcolorGroup().background() ); if ( !pix.isNull() ) icon_->setPixmap( pix ); else @@ -162,7 +162,7 @@ TQPixmap loadRenderingPixmap( KTNEFPropertySet *pSet, const TQColor& bgColor ) rendBuffer.open( IO_ReadOnly ); TQDataStream rendStream( &rendBuffer ); rendStream.setByteOrder( TQDataStream::LittleEndian ); - Q_UINT16 type, w, h; + TQ_UINT16 type, w, h; rendStream >> type >> w >> w; // read type and skip 4 bytes rendStream >> w >> h; rendBuffer.close(); diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui index 0d68c3ac4..a06db962b 100644 --- a/ktnef/gui/attachpropertydialogbase.ui +++ b/ktnef/gui/attachpropertydialogbase.ui @@ -4,7 +4,7 @@ AttachPropertyDialogBase - + 0 0 @@ -169,7 +169,7 @@ icon_ - + 16 16 @@ -211,7 +211,7 @@ - layout2 + tqlayout2 @@ -227,7 +227,7 @@ Expanding - + 150 20 @@ -274,7 +274,7 @@ saveClicked() - + klistview.h diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index 4c158a21d..ea44edbe1 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -358,7 +358,7 @@ void KTNEFMain::viewDragRequested( const TQValueList& list ) void KTNEFMain::slotEditToolbars() { - saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") ); + saveMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") ); KEditToolbar dlg(actionCollection()); connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); dlg.exec(); @@ -367,7 +367,7 @@ void KTNEFMain::slotEditToolbars() void KTNEFMain::slotNewToolbarConfig() { createGUI(); - applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") ); + applyMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") ); } void KTNEFMain::slotShowMessageProperties() diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp index a77098350..79d5f073b 100644 --- a/ktnef/gui/ktnefview.cpp +++ b/ktnef/gui/ktnefview.cpp @@ -49,7 +49,7 @@ Attachment::Attachment(TQListView *parent, KTNEFAttach *attach) if (!attach_->fileName().isEmpty()) setText(0, attach_->fileName()); KMimeType::Ptr mimeType = KMimeType::mimeType( attach_->mimeTag() ); setText(1, mimeType->comment()); - TQPixmap pix = loadRenderingPixmap( attach, parent->colorGroup().base() ); + TQPixmap pix = loadRenderingPixmap( attach, parent->tqcolorGroup().base() ); if ( !pix.isNull() ) setPixmap( 0, pix ); else diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp index 41b908d1c..f8e19411e 100644 --- a/ktnef/gui/qwmf.cpp +++ b/ktnef/gui/qwmf.cpp @@ -762,7 +762,7 @@ void QWinMetaFile::extTextOut( long num, short* parm ) mPainter.translate( -parm[ 1 ], -parm[ 0 ] ); } - // alignment + // tqalignment if ( mTextAlign & 0x06 ) x -= ( width / 2 ); if ( mTextAlign & 0x08 ) diff --git a/ktnef/gui/qwmf.h b/ktnef/gui/qwmf.h index 2a39b7b9e..5717b3938 100644 --- a/ktnef/gui/qwmf.h +++ b/ktnef/gui/qwmf.h @@ -136,7 +136,7 @@ public: // should be protected but cannot /****************** Text *******************/ /* set text color */ void setTextColor( long num, short* parms ); - /* set text alignment */ + /* set text tqalignment */ void setTextAlign( long num, short* parms ); /* draw text */ void textOut( long num, short* parms ); diff --git a/ktnef/gui/wmfstruct.h b/ktnef/gui/wmfstruct.h index ca4f1f7db..33a4a67c2 100644 --- a/ktnef/gui/wmfstruct.h +++ b/ktnef/gui/wmfstruct.h @@ -6,7 +6,7 @@ typedef short WORD; typedef int DWORD; -typedef Q_INT32 LONG; +typedef TQ_INT32 LONG; typedef void* _HANDLE; typedef struct _RECT @@ -53,7 +53,7 @@ struct WmfEnhMetaHeader WORD nHandles; // Number of handles in the handle table // Handle index zero is reserved. WORD sReserved; // Reserved. Must be zero. - DWORD nDescription; // Number of chars in the unicode description string + DWORD nDescription; // Number of chars in the tqunicode description string // This is 0 if there is no description string DWORD offDescription; // Offset to the metafile description record. // This is 0 if there is no description string -- cgit v1.2.1