summaryrefslogtreecommitdiffstats
path: root/certmanager/lib/ui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:34:45 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:34:45 -0600
commit0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 (patch)
tree4138783f7dad757fc5fbfaa8d66a355288d3125e /certmanager/lib/ui
parent9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (diff)
downloadtdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.tar.gz
tdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'certmanager/lib/ui')
-rw-r--r--certmanager/lib/ui/adddirectoryservicedialog.ui4
-rw-r--r--certmanager/lib/ui/backendconfigwidget.cpp2
-rw-r--r--certmanager/lib/ui/cryptoconfigmodule.cpp8
-rw-r--r--certmanager/lib/ui/directoryserviceswidget.cpp2
-rw-r--r--certmanager/lib/ui/directoryserviceswidgetbase.ui10
-rw-r--r--certmanager/lib/ui/dnattributeorderconfigwidget.cpp2
-rw-r--r--certmanager/lib/ui/kdhorizontalline.cpp16
-rw-r--r--certmanager/lib/ui/kdhorizontalline.h4
-rw-r--r--certmanager/lib/ui/keyapprovaldialog.cpp10
-rw-r--r--certmanager/lib/ui/keylistview.cpp8
-rw-r--r--certmanager/lib/ui/keyrequester.cpp4
-rw-r--r--certmanager/lib/ui/keyselectiondialog.cpp8
12 files changed, 39 insertions, 39 deletions
diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui
index fc6f07a2e..30b89d2d8 100644
--- a/certmanager/lib/ui/adddirectoryservicedialog.ui
+++ b/certmanager/lib/ui/adddirectoryservicedialog.ui
@@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
@@ -136,7 +136,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>260</width>
<height>21</height>
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 1052cff52..1207ed0f0 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -144,7 +144,7 @@ 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::tqfromLatin1( protocolName )
+ ? TQString::fromLatin1( protocolName )
: i18n( "S/MIME" )
: i18n( "OpenPGP" );
// second one is implementation name (gpg, gpgsm...)
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index a16dcd22e..c7604e84e 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -122,10 +122,10 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
dialogHeight = 500;
else // small (800x600, 640x480) desktop
dialogHeight = 400;
- TQSize sz = scrollView->tqsizeHint();
+ TQSize sz = scrollView->sizeHint();
scrollView->setMinimumSize( sz.width()
- + scrollView->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
- TQMIN( compGUI->tqsizeHint().height(), dialogHeight ) );
+ + scrollView->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent),
+ TQMIN( compGUI->sizeHint().height(), dialogHeight ) );
}
if ( mComponentGUIs.empty() ) {
Q_ASSERT( face() == Plain );
@@ -136,7 +136,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
"information.")
.tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
TQLabel * label = new TQLabel( msg, vbox );
- label->tqsetAlignment( TQt::WordBreak );
+ label->setAlignment( TQt::WordBreak );
label->setMinimumHeight( fontMetrics().lineSpacing() * 5 );
}
}
diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp
index 4975e3818..7c576aa86 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::tqfromLatin1( "******" ) );
+ setText( 4, pass.isEmpty() ? TQString() : TQString::fromLatin1( "******" ) );
}
const TQString& password() const { return mPassword; }
diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui
index 59a014618..016712ebd 100644
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@@ -158,7 +158,7 @@ If you do not use a directory service, you can still use local certificates.
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>51</height>
@@ -187,7 +187,7 @@ If you do not use a directory service, you can still use local certificates.
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>47</width>
<height>20</height>
@@ -221,7 +221,7 @@ By clicking this button, you can select a new directory service to be used for r
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>47</width>
<height>20</height>
@@ -258,7 +258,7 @@ By clicking this button, you can remove the currently selected directory service
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>47</width>
<height>20</height>
@@ -277,7 +277,7 @@ By clicking this button, you can remove the currently selected directory service
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index a4fc7d9a1..4cfcfb20a 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -115,7 +115,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap
// the up/down/left/right arrow cross:
TQGridLayout * xlay = new TQGridLayout( 5, 3, 0, "xlay" );
- xlay->tqsetAlignment( AlignCenter );
+ xlay->setAlignment( AlignCenter );
static const struct {
const char * icon;
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index d736399f8..07dc7ef89 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().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+ const int va = tqstyle().styleHint( 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::tqsizeHint() const {
- return tqminimumSizeHint();
+TQSize KDHorizontalLine::sizeHint() const {
+ return minimumSizeHint();
}
-TQSize KDHorizontalLine::tqminimumSizeHint() const {
+TQSize KDHorizontalLine::minimumSizeHint() const {
const int w = fontMetrics().width( mTitle, mLenVisible ) +
fontMetrics().width( TQChar( ' ' ) );
const int h = fontMetrics().height();
@@ -147,13 +147,13 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
x = 0;
}
TQRect r( x, 0, tw, h );
- int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+ int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
if ( va & AlignTop )
r.moveBy( 0, fm.descent() );
- const TQColor pen( (TQRgb) tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
- if ( !tqstyle().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) )
+ const TQColor pen( (TQRgb) tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
+ if ( !tqstyle().styleHint( TQStyle::SH_UnderlineAccelerator, this ) )
va |= NoAccel;
- tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(),
+ tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(),
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 466b54bca..c62a18ddf 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -58,8 +58,8 @@ public:
/*! \reimp to hard-code the frame tqshape */
void setFrameStyle( int style );
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
TQSizePolicy sizePolicy() const;
static int indentHint();
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index afad1fb8e..3933b0a5e 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -170,8 +170,8 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
// calculate the optimal width for the dialog
const int dialogWidth = marginHint()
+ sv->frameWidth()
- + view->tqsizeHint().width()
- + sv->verticalScrollBar()->tqsizeHint().width()
+ + view->sizeHint().width()
+ + sv->verticalScrollBar()->sizeHint().width()
+ sv->frameWidth()
+ marginHint()
+ 2;
@@ -180,11 +180,11 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
+ fontMetrics().height()
+ spacingHint()
+ sv->frameWidth()
- + view->tqsizeHint().height()
- + sv->horizontalScrollBar()->tqsizeHint().height()
+ + view->sizeHint().height()
+ + sv->horizontalScrollBar()->sizeHint().height()
+ sv->frameWidth()
+ spacingHint()
- + actionButton( KDialogBase::Cancel )->tqsizeHint().height()
+ + actionButton( KDialogBase::Cancel )->sizeHint().height()
+ marginHint()
+ 2;
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index 32d5be217..075833b21 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -81,8 +81,8 @@ namespace {
if ( !item )
return;
- const TQRect tqitemRect = mKeyListView->tqitemRect( item );
- if ( !tqitemRect.isValid() )
+ const TQRect itemRect = mKeyListView->itemRect( item );
+ if ( !itemRect.isValid() )
return;
const int col = mKeyListView->header()->sectionAt( p.x() );
@@ -93,8 +93,8 @@ namespace {
if ( !headerRect.isValid() )
return;
- const TQRect cellRect( headerRect.left(), tqitemRect.top(),
- headerRect.width(), tqitemRect.height() );
+ const TQRect cellRect( headerRect.left(), itemRect.top(),
+ headerRect.width(), itemRect.height() );
TQString tipStr;
if ( const Kleo::KeyListViewItem * klvi = Kleo::lvi_cast<Kleo::KeyListViewItem>( item ) )
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index ebde2c163..3c1e264cd 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -117,7 +117,7 @@ void Kleo::KeyRequester::init()
// the button to unset any key:
mEraseButton = new KPushButton( this );
mEraseButton->setAutoDefault( false );
- mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+ mEraseButton->setSizePolicy( 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()) );
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+ setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Fixed ) );
setAllowedKeys( mKeyUsage );
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index f017f2024..b05d9ea28 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -250,7 +250,7 @@ namespace {
"Fingerprint: %4" )
.tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
creation, expiry,
- fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") );
+ fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") );
else
return i18n( "S/MIME key for %1\n"
"Created: %2\n"
@@ -259,7 +259,7 @@ namespace {
"Issuer: %5" )
.tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
creation, expiry,
- fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") )
+ fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") )
.tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
}
@@ -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->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
+ textLabel->setAlignment( textLabel->tqalignment() | TQt::WordBreak );
mTopLayout->addWidget( textLabel );
} else {
KActiveLabel *textLabel = new KActiveLabel( text, page );
- textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
+ textLabel->setAlignment( textLabel->tqalignment() | TQt::WordBreak );
mTopLayout->addWidget( textLabel );
}
}