TQt4 port kdeadmin

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1237416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 9 deletions

diff --git a/kuser/kuservw.cpp b/kuser/kuservw.cpp
index f34581c..8f769e5 100644
--- a/kuser/kuservw.cpp
+++ b/kuser/kuservw.cpp
@@ -24,8 +24,8 @@
 #include "kuservw.h"
 
 
-KUserViewItem::KUserViewItem(KListView *parent, KU::KUser *aku)
- : KListViewItem(parent), mUser(aku)
+KUserViewItem::KUserViewItem(KListView *tqparent, KU::KUser *aku)
+ : KListViewItem(tqparent), mUser(aku)
 {
 }
 
@@ -45,7 +45,7 @@ int KUserViewItem::compare( TQListViewItem *i, int col, bool ascending ) const
 }
 
 void KUserViewItem::paintCell( TQPainter *p, const TQColorGroup &cg,
-                               int column, int width, int alignment )
+                               int column, int width, int tqalignment )
 {
     TQColorGroup _cg( cg );
     TQColor c = _cg.text();
@@ -53,7 +53,7 @@ void KUserViewItem::paintCell( TQPainter *p, const TQColorGroup &cg,
     if ( mUser->getDisabled() )
         _cg.setColor( TQColorGroup::Text, KGlobalSettings::visitedLinkColor() );
 
-    KListViewItem::paintCell( p, _cg, column, width, alignment );
+    KListViewItem::paintCell( p, _cg, column, width, tqalignment );
 
     _cg.setColor( TQColorGroup::Text, c );
 }
@@ -63,25 +63,25 @@ TQString KUserViewItem::text(int num) const
   switch(num)
   {
      case 0: return mUser->getCaps() & KU::KUser::Cap_POSIX ? 
-      TQString::number( mUser->getUID() ) : TQString::null;
+      TQString::number( mUser->getUID() ) : TQString();
      case 1: return mUser->getName();
      case 2: return mUser->getFullName();
      case 3: return mUser->getHomeDir();
      case 4: return mUser->getShell();
      case 5: return mUser->getSID().getDOM();
      case 6: return mUser->getCaps() & KU::KUser::Cap_Samba ? 
-      TQString::number( mUser->getSID().getRID() ) : TQString::null;
+      TQString::number( mUser->getSID().getRID() ) : TQString();
      case 7: return mUser->getLoginScript();
      case 8: return mUser->getProfilePath();
      case 9: return mUser->getHomeDrive();
      case 10: return mUser->getHomePath();
   }
 
-  return TQString::null;
+  return TQString();
 }
 
-KUserView::KUserView(TQWidget *parent, const char *name)
-  : KListView( parent, name )
+KUserView::KUserView(TQWidget *tqparent, const char *name)
+  : KListView( tqparent, name )
 {
   setSelectionMode( TQListView::Extended );
 }