summaryrefslogtreecommitdiffstats
path: root/certmanager/lib/ui
diff options
context:
space:
mode:
Diffstat (limited to 'certmanager/lib/ui')
-rw-r--r--certmanager/lib/ui/adddirectoryservicedialog.ui4
-rw-r--r--certmanager/lib/ui/backendconfigwidget.cpp6
-rw-r--r--certmanager/lib/ui/cryptoconfigmodule.cpp14
-rw-r--r--certmanager/lib/ui/cryptoconfigmodule_p.h18
-rw-r--r--certmanager/lib/ui/directoryserviceswidget.cpp2
-rw-r--r--certmanager/lib/ui/directoryserviceswidgetbase.ui16
-rw-r--r--certmanager/lib/ui/dnattributeorderconfigwidget.cpp4
-rw-r--r--certmanager/lib/ui/kdhorizontalline.cpp22
-rw-r--r--certmanager/lib/ui/kdhorizontalline.h6
-rw-r--r--certmanager/lib/ui/keyapprovaldialog.cpp12
-rw-r--r--certmanager/lib/ui/keylistview.cpp38
-rw-r--r--certmanager/lib/ui/keylistview.h8
-rw-r--r--certmanager/lib/ui/keyrequester.cpp8
-rw-r--r--certmanager/lib/ui/keyselectiondialog.cpp18
-rw-r--r--certmanager/lib/ui/messagebox.cpp14
-rw-r--r--certmanager/lib/ui/passphrasedialog.cpp2
-rw-r--r--certmanager/lib/ui/progressdialog.cpp2
17 files changed, 97 insertions, 97 deletions
diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui
index fc6f07a2..30b89d2d 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 1052cff5..255cb981 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -50,7 +50,7 @@
#include <dcopclient.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqheader.h>
#include <tqtimer.h>
@@ -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::tqfromLatin1( protocolName )
+ ? TQString::fromLatin1( 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)" ).tqarg( protoName, impName );
+ "%1 (%2)" ).arg( protoName, impName );
}
const CryptoBackend::Protocol* mProtocol; // can be 0
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index a16dcd22..b97884a5 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -47,7 +47,7 @@
#include <tqgrid.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <tqhbox.h>
#include <tqpushbutton.h>
@@ -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 );
@@ -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.")
- .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
+ .arg( 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 );
}
}
@@ -356,7 +356,7 @@ TQString Kleo::CryptoConfigEntryGUI::description() const
{
TQString descr = mEntry->description();
if ( descr.isEmpty() ) // shouldn't happen
- descr = TQString( "<%1>" ).tqarg( mName );
+ descr = TQString( "<%1>" ).arg( mName );
return descr;
}
diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h
index 65cae249..0c5f0087 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 * tqlayout, TQWidget* parent, const char* name = 0 );
+ TQGridLayout * layout, 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 * tqlayout, TQWidget* widget, const char* name = 0 );
+ TQGridLayout * layout, TQWidget* widget, const char* name = 0 );
};
/**
@@ -154,7 +154,7 @@ namespace Kleo {
CryptoConfigEntryLineEdit( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
- TQGridLayout * tqlayout,
+ TQGridLayout * layout,
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 * tqlayout,
+ TQGridLayout * layout,
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 * tqlayout,
+ TQGridLayout * layout,
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 * tqlayout,
+ TQGridLayout * layout,
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 * tqlayout,
+ TQGridLayout * layout,
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 * tqlayout,
+ TQGridLayout * layout,
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 * tqlayout,
+ TQGridLayout * layout,
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 4975e381..7c576aa8 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 59a01461..fcc7d493 100644
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@@ -44,7 +44,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -126,7 +126,7 @@ If you do not use a directory service, you can still use local certificates.
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -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>
@@ -171,7 +171,7 @@ If you do not use a directory service, you can still use local certificates.
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -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 a4fc7d9a..e86bd1d9 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -46,7 +46,7 @@
#include <kapplication.h>
#include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqheader.h>
#include <tqlabel.h>
#include <tqlistview.h>
@@ -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 d736399f..c901a2fd 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();
@@ -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 tqalignment
+ if ( mAlign & AlignHCenter ) // center alignment
x = frameRect().width()/2 - tw/2;
- else if ( mAlign & AlignRight ) // right tqalignment
+ else if ( mAlign & AlignRight ) // right alignment
x = frameRect().width() - tw;
- else if ( mAlign & AlignLeft ) // left tqalignment
+ else if ( mAlign & AlignLeft ) // left alignment
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().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 466b54bc..530b8908 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 tqshape */
+ /*! \reimp to hard-code the frame shape */
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 afad1fb8..706c4d9c 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -51,7 +51,7 @@
#include <tqstringlist.h>
#include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqcombobox.h>
#include <tqscrollview.h>
@@ -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 32d5be21..100334f2 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 ) )
@@ -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 tqchildren won't have
+ // need to clear here, since in ~TQListView, our children 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 tqchildren first... When tqchildren are deleted in the
+ // delete the children first... When children 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 );
}
- tqrepaint();
+ repaint();
}
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 tqalignment ) {
+void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
if ( !ds ) {
- TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, cg, column, width, alignment );
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, tqalignment );
+ TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
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 tqalignment ) {
+void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
if ( !ds ) {
- TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, cg, column, width, alignment );
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, tqalignment );
+ TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
@@ -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 tqalignment ) {
+void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
if ( !ds ) {
- TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, cg, column, width, alignment );
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, tqalignment );
+ TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
@@ -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 tqalignment ) {
+void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
if ( !ds ) {
- TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, cg, column, width, alignment );
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, tqalignment );
+ TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 38ad0f5a..ada8354e 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 tqalignment );
+ void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
/*! \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 tqalignment );
+ void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
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 tqalignment );
+ void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
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 tqalignment );
+ void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
private:
GpgME::UserID::Signature mSignature;
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index ebde2c16..f793c0fa 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -72,7 +72,7 @@
// TQt
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqstring.h>
#include <tqstringlist.h>
@@ -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 );
@@ -231,7 +231,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) {
const TQString msg = i18n( "<qt><p>An error occurred while fetching "
"the keys from the backend:</p>"
"<p><b>%1</b></p></qt>" )
- .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+ .arg( 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 f017f202..998ff112 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -70,7 +70,7 @@
#include <tqlabel.h>
#include <tqpixmap.h>
#include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqwhatsthis.h>
#include <tqpopupmenu.h>
@@ -248,19 +248,19 @@ namespace {
"Created: %2\n"
"Expiry: %3\n"
"Fingerprint: %4" )
- .tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
+ .arg( 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"
"Expiry: %3\n"
"Fingerprint: %4\n"
"Issuer: %5" )
- .tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
+ .arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
creation, expiry,
- fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") )
- .tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
+ fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") )
+ .arg( 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->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
+ textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
mTopLayout->addWidget( textLabel );
} else {
KActiveLabel *textLabel = new KActiveLabel( text, page );
- textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
+ textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
mTopLayout->addWidget( textLabel );
}
}
@@ -567,7 +567,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) {
const TQString msg = i18n( "<qt><p>An error occurred while fetching "
"the keys from the backend:</p>"
"<p><b>%1</b></p></qt>" )
- .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+ .arg( 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 2dfe083d..429f7d01 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -48,11 +48,11 @@
#include <kguiitem.h>
#include <kdebug.h>
-#include <tqtextedit.h>
-#include <tqtextstream.h>
+#include <textedit.h>
+#include <textstream.h>
#include <tqvbox.h>
#include <tqapplication.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <gpg-error.h>
@@ -127,7 +127,7 @@ private:
if ( const int err = file.status() )
KMessageBox::error( this, i18n("Couldn't save to file \"%1\": %2")
- .tqarg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ),
+ .arg( 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")
- .tqarg( TQString::fromLocal8Bit( err.asString() ) ),
+ .arg( 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").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
+ ? i18n("Signing failed: %1").arg( 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").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
+ ? i18n("Encryption failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) )
: i18n("Encryption successful") ;
}
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index c97493d3..9ef0bad2 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -57,7 +57,7 @@
#include <klocale.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqfontmetrics.h>
struct Kleo::PassphraseDialog::Private {
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index e0149b8f..d6552922 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" ).tqarg( mBaseText, what ) );
+ setLabelText( i18n( "%1: %2" ).arg( mBaseText, what ) );
setProgress( current, total );
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 13:26:37 +0000