From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
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
---
 certmanager/conf/appearanceconfigwidget.cpp    | 22 +++++++++++-----------
 certmanager/conf/appearanceconfigwidgetbase.ui |  8 ++++----
 certmanager/conf/configuredialog.cpp           | 12 ++++++------
 3 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'certmanager/conf')

diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 27797dfe7..77a97bb48 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -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<CategoryListViewItem *>( lvit.current() );
     item->setDefaultAppearance();
-    item->repaint();
+    item->tqrepaint();
   }
   emit changed();
 }
@@ -330,7 +330,7 @@ void AppearanceConfigWidget::slotItalicClicked()
   CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
   if ( item ) {
     item->toggleItalic();
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
@@ -340,7 +340,7 @@ void AppearanceConfigWidget::slotBoldClicked()
   CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
   if ( item ) {
     item->toggleBold();
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
@@ -350,7 +350,7 @@ void AppearanceConfigWidget::slotStrikeoutClicked()
   CategoryListViewItem* item = static_cast<CategoryListViewItem*>(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 b432ac8c6..60e10c21a 100644
--- a/certmanager/conf/appearanceconfigwidgetbase.ui
+++ b/certmanager/conf/appearanceconfigwidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AppearanceConfigWidgetBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -37,7 +37,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -119,7 +119,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>100</height>
@@ -211,5 +211,5 @@
     <slot access="protected">slotBoldClicked()</slot>
     <slot access="protected">slotStrikeoutClicked()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index e9f16f109..aa161fc74 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() {
-- 
cgit v1.2.1