TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

1 files changed, 12 insertions, 12 deletions

diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index 4dbd212..1174ee3 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -34,28 +34,28 @@
 
 TQMap<TQString, TQPixmap> *KDirMenu::_icons = 0;
 
-KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src,
+KDirMenu::KDirMenu ( TQWidget *tqparent, const KURL &_src,
             const TQString &_path, const TQString &_name, bool /*showfile*/ )
-    : TQPopupMenu(parent),
+    : TQPopupMenu(tqparent),
       path(_path),
       name(_name),
       src( _src ),
       action( 0 )
 {
-    children.setAutoDelete( true );
+    tqchildren.setAutoDelete( true );
     initIconMap( );
     connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) );
     connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) );
-    children.clear(); // just in case
+    tqchildren.clear(); // just in case
 
     TQFileInfo fileInfo(path);
     if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable())
-        action = new KAction(name, 0, this, TQT_SLOT(new_slot( ) ), this);
+        action = new KAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this));
 }
 KDirMenu::~KDirMenu( ) {
     delete action;
     clear( );
-    children.clear( );
+    tqchildren.clear( );
 }
 void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) {
     static const TQIconSet folder = SmallIconSet("folder");
@@ -76,11 +76,11 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) {
                                                KIcon::DefaultState, 0, true);
         if(icon.isNull())
            icon = CICON("folder");
-        insertItem( icon, escapedPath.replace( "&", "&&" ), submenu );
+        insertItem( icon, escapedPath.tqreplace( "&", "&&" ), submenu );
     }
     else
-        insertItem( folder, escapedPath.replace( "&", "&&" ), submenu );
-    children.append( submenu );
+        insertItem( folder, escapedPath.tqreplace( "&", "&&" ), submenu );
+    tqchildren.append( submenu );
     connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)),
             this, TQT_SLOT(slotFileSelected(const TQString &)));
 }
@@ -101,11 +101,11 @@ void KDirMenu::slotAboutToShow( ) {
 	setItemEnabled( insertItem( name ), false );
 
     // all dirs writeable and readable
-    TQDir dir(path, TQString::null,
+    TQDir dir(path, TQString(),
              TQDir::Name | TQDir::DirsFirst | TQDir::IgnoreCase,
              TQDir::Dirs | TQDir::Readable | TQDir::Executable);
 
-    const QFileInfoList* dirList = dir.entryInfoList();
+    const TQFileInfoList* dirList = dir.entryInfoList();
     if ( !dirList || dirList->isEmpty() ) {
         if ( action )
             action->setEnabled( false );
@@ -123,7 +123,7 @@ void KDirMenu::slotAboutToShow( ) {
     static const TQString& dot = KGlobal::staticQString( "." );
     static const TQString& dotdot = KGlobal::staticQString( ".." );
 
-    for ( QFileInfoListIterator it( *dirList ); *it; ++it ) {
+    for ( TQFileInfoListIterator it( *dirList ); *it; ++it ) {
         TQString fileName = (*it)->fileName();
         if ( fileName == dot || fileName == dotdot )
             continue;