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/conf/appearanceconfigpage.cpp | 2 +- certmanager/conf/appearanceconfigwidget.cpp | 24 ++++++++++++------------ certmanager/conf/appearanceconfigwidgetbase.ui | 4 ++-- certmanager/conf/configuredialog.cpp | 12 ++++++------ certmanager/conf/dirservconfigpage.cpp | 6 +++--- certmanager/conf/dnorderconfigpage.cpp | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) (limited to 'certmanager/conf') diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index 02889b9e8..9e5d0f74a 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -30,7 +30,7 @@ */ #include "appearanceconfigpage.h" -#include +#include #include "appearanceconfigwidget.h" #include #include diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp index ad9089551..309d03be1 100644 --- a/certmanager/conf/appearanceconfigwidget.cpp +++ b/certmanager/conf/appearanceconfigwidget.cpp @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include #include @@ -139,7 +139,7 @@ private: setText( 0, name ); } - 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: TQColor mForegroundColor, mBackgroundColor; @@ -152,7 +152,7 @@ private: bool mDirty; }; -void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { +void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { TQColorGroup _cg = cg; TQFont font = p->font(); if ( mHasFont ) @@ -172,7 +172,7 @@ void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, in if ( mBackgroundColor.isValid() ) _cg.setColor( TQColorGroup::Base, mBackgroundColor ); - TQListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } //// @@ -227,7 +227,7 @@ void AppearanceConfigWidget::slotDefaultClicked() if ( !item ) return; item->setDefaultAppearance(); - item->repaint(); + item->tqrepaint(); slotSelectionChanged( item ); emit changed(); } @@ -280,7 +280,7 @@ void AppearanceConfigWidget::slotForegroundClicked() { int result = KColorDialog::getColor( fg ); if ( result == KColorDialog::Accepted ) { item->setForegroundColor( fg ); - item->repaint(); + item->tqrepaint(); emit changed(); } } @@ -294,7 +294,7 @@ void AppearanceConfigWidget::slotBackgroundClicked() { int result = KColorDialog::getColor( bg ); if ( result == KColorDialog::Accepted ) { item->setBackgroundColor( bg ); - item->repaint(); + item->tqrepaint(); emit changed(); } } @@ -308,7 +308,7 @@ void AppearanceConfigWidget::slotFontClicked() { int result = KFontDialog::getFont( font ); if ( result == KFontDialog::Accepted ) { item->setFont( font ); - item->repaint(); + item->tqrepaint(); emit changed(); } } @@ -320,7 +320,7 @@ void AppearanceConfigWidget::defaults() for ( ; lvit.current() ; ++lvit ) { CategoryListViewItem* item = static_cast( lvit.current() ); item->setDefaultAppearance(); - item->repaint(); + item->tqrepaint(); } emit changed(); } @@ -330,7 +330,7 @@ void AppearanceConfigWidget::slotItalicClicked() CategoryListViewItem* item = static_cast(categoriesLV->selectedItem() ); if ( item ) { item->toggleItalic(); - item->repaint(); + item->tqrepaint(); emit changed(); } } @@ -340,7 +340,7 @@ void AppearanceConfigWidget::slotBoldClicked() CategoryListViewItem* item = static_cast(categoriesLV->selectedItem() ); if ( item ) { item->toggleBold(); - item->repaint(); + item->tqrepaint(); emit changed(); } } @@ -350,7 +350,7 @@ void AppearanceConfigWidget::slotStrikeoutClicked() CategoryListViewItem* item = static_cast(categoriesLV->selectedItem() ); if ( item ) { item->toggleStrikeout(); - item->repaint(); + item->tqrepaint(); emit changed(); } } diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui index 570292013..0d97a877b 100644 --- a/certmanager/conf/appearanceconfigwidgetbase.ui +++ b/certmanager/conf/appearanceconfigwidgetbase.ui @@ -37,7 +37,7 @@ - layout2 + tqlayout2 @@ -119,7 +119,7 @@ Expanding - + 20 100 diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp index db9c7739f..2aa622d08 100644 --- a/certmanager/conf/configuredialog.cpp +++ b/certmanager/conf/configuredialog.cpp @@ -52,9 +52,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal // the KCMultiDialog starts with the size of the first kcm, not // the largest one. This way at least after the first showing of // the largest kcm the size is kept. - const KConfigGroup geometry( KGlobal::config(), "Geometry" ); - const int width = geometry.readNumEntry( "ConfigureDialogWidth" ); - const int height = geometry.readNumEntry( "ConfigureDialogHeight" ); + const KConfigGroup tqgeometry( KGlobal::config(), "Geometry" ); + const int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" ); + const int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" ); if ( width != 0 && height != 0 ) { setMinimumSize( width, height ); } @@ -62,9 +62,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal } void ConfigureDialog::hideEvent( TQHideEvent * ) { - KConfigGroup geometry( KGlobal::config(), "Geometry" ); - geometry.writeEntry( "ConfigureDialogWidth", width() ); - geometry.writeEntry( "ConfigureDialogHeight",height() ); + KConfigGroup tqgeometry( KGlobal::config(), "Geometry" ); + tqgeometry.writeEntry( "ConfigureDialogWidth", width() ); + tqgeometry.writeEntry( "ConfigureDialogHeight",height() ); } ConfigureDialog::~ConfigureDialog() { diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index a90a6c091..436ef28ec 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include @@ -283,11 +283,11 @@ Kleo::CryptoConfigEntry* DirectoryServicesConfigurationPage::configEntry( const { Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName ); if ( !entry ) { - KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) ); + KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) ); return 0; } if( entry->argType() != argType || entry->isList() != isList ) { - KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) ); + KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) ); return 0; } return entry; diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index b16c9a90b..a224b6f7a 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/certmanager/conf/dnorderconfigpage.cpp @@ -36,7 +36,7 @@ #include -#include +#include DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name ) : KCModule( parent, name ) -- cgit v1.2.1