From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- certmanager/lib/ui/adddirectoryservicedialog.ui | 4 +-- certmanager/lib/ui/backendconfigwidget.cpp | 6 ++-- certmanager/lib/ui/cryptoconfigmodule.cpp | 14 ++++---- certmanager/lib/ui/cryptoconfigmodule_p.h | 18 +++++----- certmanager/lib/ui/directoryserviceswidget.cpp | 2 +- certmanager/lib/ui/directoryserviceswidgetbase.ui | 16 ++++----- .../lib/ui/dnattributeorderconfigwidget.cpp | 4 +-- certmanager/lib/ui/kdhorizontalline.cpp | 22 ++++++------- certmanager/lib/ui/kdhorizontalline.h | 6 ++-- certmanager/lib/ui/keyapprovaldialog.cpp | 12 +++---- certmanager/lib/ui/keylistview.cpp | 38 +++++++++++----------- certmanager/lib/ui/keylistview.h | 8 ++--- certmanager/lib/ui/keyrequester.cpp | 8 ++--- certmanager/lib/ui/keyselectiondialog.cpp | 18 +++++----- certmanager/lib/ui/messagebox.cpp | 14 ++++---- certmanager/lib/ui/passphrasedialog.cpp | 2 +- certmanager/lib/ui/progressdialog.cpp | 2 +- 17 files changed, 97 insertions(+), 97 deletions(-) (limited to 'certmanager/lib/ui') diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui index 30b89d2d8..fc6f07a2e 100644 --- a/certmanager/lib/ui/adddirectoryservicedialog.ui +++ b/certmanager/lib/ui/adddirectoryservicedialog.ui @@ -75,7 +75,7 @@ Expanding - + 20 60 @@ -136,7 +136,7 @@ Expanding - + 260 21 diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 255cb981a..1052cff52 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include @@ -144,13 +144,13 @@ private: // First one is the generic name (find a nice one for OpenPGP, SMIME) const TQString protoName = qstricmp( protocolName, "openpgp" ) != 0 ? qstricmp( protocolName, "smime" ) != 0 - ? TQString::fromLatin1( protocolName ) + ? TQString::tqfromLatin1( protocolName ) : i18n( "S/MIME" ) : i18n( "OpenPGP" ); // second one is implementation name (gpg, gpgsm...) const TQString impName = protocol ? protocol->displayName() : i18n( "failed" ); return i18n( "Items in Kleo::BackendConfigWidget listview (1: protocol; 2: implementation name)", - "%1 (%2)" ).arg( protoName, impName ); + "%1 (%2)" ).tqarg( protoName, impName ); } const CryptoBackend::Protocol* mProtocol; // can be 0 diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index b97884a5c..a16dcd22e 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include #include @@ -122,10 +122,10 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg dialogHeight = 500; else // small (800x600, 640x480) desktop dialogHeight = 400; - TQSize sz = scrollView->sizeHint(); + TQSize sz = scrollView->tqsizeHint(); scrollView->setMinimumSize( sz.width() - + scrollView->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent), - TQMIN( compGUI->sizeHint().height(), dialogHeight ) ); + + scrollView->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent), + TQMIN( compGUI->tqsizeHint().height(), dialogHeight ) ); } if ( mComponentGUIs.empty() ) { Q_ASSERT( face() == Plain ); @@ -134,9 +134,9 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg "properly. It did not return any components. " "Try running \"%1\" on the command line for more " "information.") - .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" ); + .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" ); TQLabel * label = new TQLabel( msg, vbox ); - label->setAlignment( TQt::WordBreak ); + label->tqsetAlignment( TQt::WordBreak ); label->setMinimumHeight( fontMetrics().lineSpacing() * 5 ); } } @@ -356,7 +356,7 @@ TQString Kleo::CryptoConfigEntryGUI::description() const { TQString descr = mEntry->description(); if ( descr.isEmpty() ) // shouldn't happen - descr = TQString( "<%1>" ).arg( mName ); + descr = TQString( "<%1>" ).tqarg( mName ); return descr; } diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h index 0c5f0087b..65cae2499 100644 --- a/certmanager/lib/ui/cryptoconfigmodule_p.h +++ b/certmanager/lib/ui/cryptoconfigmodule_p.h @@ -82,7 +82,7 @@ namespace Kleo { public: CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group, - TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); bool save(); void load(); @@ -102,7 +102,7 @@ namespace Kleo { static CryptoConfigEntryGUI* createEntryGUI( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, TQWidget* widget, const char* name = 0 ); + TQGridLayout * tqlayout, TQWidget* widget, const char* name = 0 ); }; /** @@ -154,7 +154,7 @@ namespace Kleo { CryptoConfigEntryLineEdit( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -174,7 +174,7 @@ namespace Kleo { CryptoConfigEntryPath( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -194,7 +194,7 @@ namespace Kleo { CryptoConfigEntryDirPath( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -214,7 +214,7 @@ namespace Kleo { CryptoConfigEntryURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -234,7 +234,7 @@ namespace Kleo { CryptoConfigEntrySpinBox( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -254,7 +254,7 @@ namespace Kleo { CryptoConfigEntryCheckBox( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -273,7 +273,7 @@ namespace Kleo { CryptoConfigEntryLDAPURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp index 7c576aa86..4975e3818 100644 --- a/certmanager/lib/ui/directoryserviceswidget.cpp +++ b/certmanager/lib/ui/directoryserviceswidget.cpp @@ -63,7 +63,7 @@ public: void setPassword( const TQString& pass ) { mPassword = pass; - setText( 4, pass.isEmpty() ? TQString() : TQString::fromLatin1( "******" ) ); + setText( 4, pass.isEmpty() ? TQString() : TQString::tqfromLatin1( "******" ) ); } const TQString& password() const { return mPassword; } diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui index fcc7d493c..59a014618 100644 --- a/certmanager/lib/ui/directoryserviceswidgetbase.ui +++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui @@ -44,7 +44,7 @@ - layout2 + tqlayout2 @@ -126,7 +126,7 @@ If you do not use a directory service, you can still use local certificates. - layout1 + tqlayout1 @@ -158,7 +158,7 @@ If you do not use a directory service, you can still use local certificates. Expanding - + 20 51 @@ -171,7 +171,7 @@ If you do not use a directory service, you can still use local certificates. - layout3 + tqlayout3 @@ -187,7 +187,7 @@ If you do not use a directory service, you can still use local certificates. Expanding - + 47 20 @@ -221,7 +221,7 @@ By clicking this button, you can select a new directory service to be used for r Expanding - + 47 20 @@ -258,7 +258,7 @@ By clicking this button, you can remove the currently selected directory service Expanding - + 47 20 @@ -277,7 +277,7 @@ By clicking this button, you can remove the currently selected directory service Expanding - + 20 16 diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index e86bd1d9d..a4fc7d9a1 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include #include @@ -115,7 +115,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap // the up/down/left/right arrow cross: TQGridLayout * xlay = new TQGridLayout( 5, 3, 0, "xlay" ); - xlay->setAlignment( AlignCenter ); + xlay->tqsetAlignment( AlignCenter ); static const struct { const char * icon; diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index c901a2fd1..d736399f8 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -97,7 +97,7 @@ void KDHorizontalLine::calculateFrame() { qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() ); if ( mLenVisible ) { // but do we also have a visible label? TQRect r = rect(); - const int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); + const int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if( va & AlignVCenter ) r.setTop( fm.height() / 2 ); // frame rect should be else if( va & AlignTop ) @@ -115,11 +115,11 @@ TQSizePolicy KDHorizontalLine::sizePolicy() const { return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } -TQSize KDHorizontalLine::sizeHint() const { - return minimumSizeHint(); +TQSize KDHorizontalLine::tqsizeHint() const { + return tqminimumSizeHint(); } -TQSize KDHorizontalLine::minimumSizeHint() const { +TQSize KDHorizontalLine::tqminimumSizeHint() const { const int w = fontMetrics().width( mTitle, mLenVisible ) + fontMetrics().width( TQChar( ' ' ) ); const int h = fontMetrics().height(); @@ -134,11 +134,11 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { const int h = fm.height(); const int tw = fm.width( mTitle, mLenVisible ) + fm.width(TQChar(' ')); int x; - if ( mAlign & AlignHCenter ) // center alignment + if ( mAlign & AlignHCenter ) // center tqalignment x = frameRect().width()/2 - tw/2; - else if ( mAlign & AlignRight ) // right alignment + else if ( mAlign & AlignRight ) // right tqalignment x = frameRect().width() - tw; - else if ( mAlign & AlignLeft ) // left alignment + else if ( mAlign & AlignLeft ) // left tqalignment x = 0; else { // auto align if( TQApplication::reverseLayout() ) @@ -147,13 +147,13 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { x = 0; } TQRect r( x, 0, tw, h ); - int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); + int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if ( va & AlignTop ) r.moveBy( 0, fm.descent() ); - const TQColor pen( (TQRgb) tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); - if ( !tqstyle().styleHint( TQStyle::SH_UnderlineAccelerator, this ) ) + const TQColor pen( (TQRgb) tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); + if ( !tqstyle().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) ) va |= NoAccel; - tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(), + tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(), isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen ); paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title } diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h index 530b89081..466b54bca 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -55,11 +55,11 @@ public: TQString title() const { return mTitle; } - /*! \reimp to hard-code the frame shape */ + /*! \reimp to hard-code the frame tqshape */ void setFrameStyle( int style ); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; TQSizePolicy sizePolicy() const; static int indentHint(); diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 706c4d9cb..afad1fb8e 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include @@ -170,8 +170,8 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector & recipients // calculate the optimal width for the dialog const int dialogWidth = marginHint() + sv->frameWidth() - + view->sizeHint().width() - + sv->verticalScrollBar()->sizeHint().width() + + view->tqsizeHint().width() + + sv->verticalScrollBar()->tqsizeHint().width() + sv->frameWidth() + marginHint() + 2; @@ -180,11 +180,11 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector & recipients + fontMetrics().height() + spacingHint() + sv->frameWidth() - + view->sizeHint().height() - + sv->horizontalScrollBar()->sizeHint().height() + + view->tqsizeHint().height() + + sv->horizontalScrollBar()->tqsizeHint().height() + sv->frameWidth() + spacingHint() - + actionButton( KDialogBase::Cancel )->sizeHint().height() + + actionButton( KDialogBase::Cancel )->tqsizeHint().height() + marginHint() + 2; diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index 100334f20..32d5be217 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -81,8 +81,8 @@ namespace { if ( !item ) return; - const TQRect itemRect = mKeyListView->itemRect( item ); - if ( !itemRect.isValid() ) + const TQRect tqitemRect = mKeyListView->tqitemRect( item ); + if ( !tqitemRect.isValid() ) return; const int col = mKeyListView->header()->sectionAt( p.x() ); @@ -93,8 +93,8 @@ namespace { if ( !headerRect.isValid() ) return; - const TQRect cellRect( headerRect.left(), itemRect.top(), - headerRect.width(), itemRect.height() ); + const TQRect cellRect( headerRect.left(), tqitemRect.top(), + headerRect.width(), tqitemRect.height() ); TQString tipStr; if ( const Kleo::KeyListViewItem * klvi = Kleo::lvi_cast( item ) ) @@ -173,7 +173,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis Kleo::KeyListView::~KeyListView() { d->updateTimer->stop(); - // need to clear here, since in ~TQListView, our children won't have + // need to clear here, since in ~TQListView, our tqchildren won't have // a valid listView() pointing to us anymore, and their dtors try to // unregister from us. clear(); @@ -395,7 +395,7 @@ Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, KeyListViewIte } Kleo::KeyListViewItem::~KeyListViewItem() { - // delete the children first... When children are deleted in the + // delete the tqchildren first... When tqchildren are deleted in the // TQLVI dtor, they don't have listView() anymore, thus they don't // call deregister( this ), leading to stale entries in the // itemMap... @@ -428,7 +428,7 @@ void Kleo::KeyListViewItem::setKey( const GpgME::Key & key ) { if ( const TQPixmap * pix = cs->pixmap( key, i ) ) setPixmap( i, *pix ); } - repaint(); + tqrepaint(); } TQString Kleo::KeyListViewItem::toolTip( int col ) const { @@ -444,10 +444,10 @@ int Kleo::KeyListViewItem::compare( TQListViewItem * item, int col, bool ascendi return listView()->columnStrategy()->compare( this->key(), that->key(), col ); } -void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { +void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, tqalignment ); return; } const TQColor fg = ds->keyForeground( key(), cg.text() ); @@ -459,7 +459,7 @@ void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, i _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } void Kleo::KeyListViewItem::insertItem( TQListViewItem * qlvi ) { @@ -536,10 +536,10 @@ int Kleo::SubkeyKeyListViewItem::compare( TQListViewItem * item, int col, bool a return listView()->columnStrategy()->subkeyCompare( this->subkey(), that->subkey(), col ); } -void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { +void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, tqalignment ); return; } const TQColor fg = ds->subkeyForeground( subkey(), cg.text() ); @@ -551,7 +551,7 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } @@ -615,10 +615,10 @@ int Kleo::UserIDKeyListViewItem::compare( TQListViewItem * item, int col, bool a } -void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { +void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, tqalignment ); return; } const TQColor fg = ds->useridForeground( userID(), cg.text() ); @@ -630,7 +630,7 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } @@ -693,10 +693,10 @@ int Kleo::SignatureKeyListViewItem::compare( TQListViewItem * item, int col, boo return listView()->columnStrategy()->signatureCompare( this->signature(), that->signature(), col ); } -void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { +void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, tqalignment ); return; } const TQColor fg = ds->signatureForeground( signature(), cg.text() ); @@ -708,7 +708,7 @@ void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGrou _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index ada8354e2..38ad0f5ab 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -91,7 +91,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); /*! \reimp */ void insertItem( TQListViewItem * item ); /*! \reimp */ @@ -127,7 +127,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); private: GpgME::Subkey mSubkey; @@ -159,7 +159,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); private: GpgME::UserID mUserID; @@ -191,7 +191,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); private: GpgME::UserID::Signature mSignature; diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index f793c0fa9..ebde2c163 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -72,7 +72,7 @@ // TQt #include -#include +#include #include #include #include @@ -117,7 +117,7 @@ void Kleo::KeyRequester::init() // the button to unset any key: mEraseButton = new KPushButton( this ); mEraseButton->setAutoDefault( false ); - mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); mEraseButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) ); TQToolTip::add( mEraseButton, i18n("Clear") ); @@ -133,7 +133,7 @@ void Kleo::KeyRequester::init() connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) ); connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) ); - setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); setAllowedKeys( mKeyUsage ); @@ -231,7 +231,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { const TQString msg = i18n( "

An error occurred while fetching " "the keys from the backend:

" "

%1

" ) - .arg( TQString::fromLocal8Bit( err.asString() ) ); + .tqarg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); } diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 998ff1122..f017f2024 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -70,7 +70,7 @@ #include #include #include -#include +#include #include #include #include @@ -248,19 +248,19 @@ namespace { "Created: %2\n" "Expiry: %3\n" "Fingerprint: %4" ) - .arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"), + .tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"), creation, expiry, - fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") ); + fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") ); else return i18n( "S/MIME key for %1\n" "Created: %2\n" "Expiry: %3\n" "Fingerprint: %4\n" "Issuer: %5" ) - .arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"), + .tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"), creation, expiry, - fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") ) - .arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") ); + fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") ) + .tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") ); } const TQPixmap * ColumnStrategy::pixmap( const GpgME::Key & key, int col ) const { @@ -374,11 +374,11 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection KActiveLabel *textLabel = new KActiveLabel( text, page ); disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) ); connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) ); - textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); + textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } else { KActiveLabel *textLabel = new KActiveLabel( text, page ); - textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); + textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } } @@ -567,7 +567,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { const TQString msg = i18n( "

An error occurred while fetching " "the keys from the backend:

" "

%1

" ) - .arg( TQString::fromLocal8Bit( err.asString() ) ); + .tqarg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); } diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index 429f7d010..2dfe083d5 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -48,11 +48,11 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include #include @@ -127,7 +127,7 @@ private: if ( const int err = file.status() ) KMessageBox::error( this, i18n("Couldn't save to file \"%1\": %2") - .arg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ), + .tqarg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ), i18n("File Save Error") ); } void slotUser2() { @@ -159,7 +159,7 @@ void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString & if ( err.code() != GPG_ERR_NO_DATA ) { KMessageBox::information( parent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1") - .arg( TQString::fromLocal8Bit( err.asString() ) ), + .tqarg( TQString::fromLocal8Bit( err.asString() ) ), i18n("GnuPG Audit Log Error") ); return; } @@ -194,7 +194,7 @@ void MessageBox::auditLog( TQWidget * parent, const TQString & log ) { static TQString to_information_string( const SigningResult & result ) { return result.error() - ? i18n("Signing failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) ) + ? i18n("Signing failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) ) : i18n("Signing successful") ; } @@ -204,7 +204,7 @@ static TQString to_error_string( const SigningResult & result ) { static TQString to_information_string( const EncryptionResult & result ) { return result.error() - ? i18n("Encryption failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) ) + ? i18n("Encryption failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) ) : i18n("Encryption successful") ; } diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index 9ef0bad21..c97493d31 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -57,7 +57,7 @@ #include #include -#include +#include #include struct Kleo::PassphraseDialog::Private { diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index d6552922c..e0149b8f3 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.cpp @@ -83,7 +83,7 @@ void Kleo::ProgressDialog::slotProgress( const TQString & what, int current, int else if ( what.isEmpty() ) setLabelText( mBaseText ); else - setLabelText( i18n( "%1: %2" ).arg( mBaseText, what ) ); + setLabelText( i18n( "%1: %2" ).tqarg( mBaseText, what ) ); setProgress( current, total ); } -- cgit v1.2.1