krusader-commits

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.72,1.73

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2926/krusader_kde3/krusader

Modified Files:
	krusader.cpp 
Log Message:

FIXED: [ 946567 ] krusader minimizes to tray on desktop change


Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** krusader.cpp	18 Jul 2004 14:09:43 -0000	1.72
--- krusader.cpp	22 Jul 2004 15:58:38 -0000	1.73
***************
*** 42,45 ****
--- 42,46 ----
  #include <klocale.h>
  #include <kaccelmanager.h>
+ #include <kwin.h>
  
  #if KDE_IS_VERSION(3,2,0)
***************
*** 295,299 ****
      isModalTopWidget = actWnd->isModal();
  
!   if ( showTrayIcon && !isModalTopWidget && isMinimized() ) {
      sysTray->show();
      hide(); // needed to make sure krusader is removed from
--- 296,300 ----
      isModalTopWidget = actWnd->isModal();
  
!   if ( showTrayIcon && !isModalTopWidget && KWin::windowInfo( winId() ).isMinimized() ) {
      sysTray->show();
      hide(); // needed to make sure krusader is removed from

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.67,1.68

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7154/krusader/Panel

Modified Files:
	listpanel.cpp 
Log Message:
fixed: whatsthis --> tooltip 

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** listpanel.cpp	22 Jul 2004 10:16:43 -0000	1.67
--- listpanel.cpp	22 Jul 2004 13:08:17 -0000	1.68
***************
*** 54,57 ****
--- 54,58 ----
  #include <kstandarddirs.h>
  #include <kglobalsettings.h>
+ #include <qtooltip.h>
  #include <kdeversion.h>
  #include <qimage.h>
***************
*** 166,170 ****
     cdOtherButton->setFixedSize( 20, origin->button() ->height() );
     cdOtherButton->setText( i18n( "=" ) );
! 	QWhatsThis::add(  cdOtherButton, i18n( "Equal" ) );
     connect( cdOtherButton, SIGNAL( clicked() ), this, SLOT( slotFocusAndCDOther() ) );
  
--- 167,171 ----
     cdOtherButton->setFixedSize( 20, origin->button() ->height() );
     cdOtherButton->setText( i18n( "=" ) );
! 	QToolTip::add(  cdOtherButton, i18n( "Equal" ) );
     connect( cdOtherButton, SIGNAL( clicked() ), this, SLOT( slotFocusAndCDOther() ) );
  
***************
*** 172,176 ****
     cdUpButton->setFixedSize( 20, origin->button() ->height() );
     cdUpButton->setText( i18n( ".." ) );
! 	QWhatsThis::add(  cdUpButton, i18n( "Up" ) );
     connect( cdUpButton, SIGNAL( clicked() ), this, SLOT( slotFocusAndCDup() ) );
  
--- 173,177 ----
     cdUpButton->setFixedSize( 20, origin->button() ->height() );
     cdUpButton->setText( i18n( ".." ) );
! 	QToolTip::add(  cdUpButton, i18n( "Up" ) );
     connect( cdUpButton, SIGNAL( clicked() ), this, SLOT( slotFocusAndCDup() ) );
  
***************
*** 178,182 ****
     cdHomeButton->setFixedSize( 20, origin->button() ->height() );
     cdHomeButton->setText( i18n( "~" ) );
! 	QWhatsThis::add(  cdHomeButton, i18n( "Home" ) );
     connect( cdHomeButton, SIGNAL( clicked() ), this, SLOT( slotFocusAndCDHome() ) );
  
--- 179,183 ----
     cdHomeButton->setFixedSize( 20, origin->button() ->height() );
     cdHomeButton->setText( i18n( "~" ) );
! 	QToolTip::add(  cdHomeButton, i18n( "Home" ) );
     connect( cdHomeButton, SIGNAL( clicked() ), this, SLOT( slotFocusAndCDHome() ) );
  
***************
*** 184,188 ****
     cdRootButton->setFixedSize( 20, origin->button() ->height() );
     cdRootButton->setText( i18n( "/" ) );
! 	QWhatsThis::add(  cdRootButton, i18n( "Root" ) );
     connect( cdRootButton, SIGNAL( clicked() ), this, SLOT( slotFocusAndCDRoot() ) );
  
--- 185,189 ----
     cdRootButton->setFixedSize( 20, origin->button() ->height() );
     cdRootButton->setText( i18n( "/" ) );
! 	QToolTip::add(  cdRootButton, i18n( "Root" ) );
     connect( cdRootButton, SIGNAL( clicked() ), this, SLOT( slotFocusAndCDRoot() ) );
  

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.66,1.67

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15313/krusader/Panel

Modified Files:
	listpanel.cpp 
Log Message:
fix: handle /dev correctly in getDiskSpace 

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** listpanel.cpp	22 Jul 2004 09:08:44 -0000	1.66
--- listpanel.cpp	22 Jul 2004 10:16:43 -0000	1.67
***************
*** 427,430 ****
--- 427,435 ----
     }
  
+ 	// check for special filesystems;
+ 	if ( path.left(4) == "/dev") {
+ 		status->setText(i18n( "No space information on [dev]" ));
+ 		return;
+ 	}
  #if defined(BSD)
  	if ( path.left( 5 ) == "/procfs" ) { // /procfs is a special case - no volume information

[Krusader-commits] krusader_kde3 ChangeLog,1.252,1.253

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6096

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.252
retrieving revision 1.253
diff -C2 -d -r1.252 -r1.253
*** ChangeLog	21 Jul 2004 11:24:57 -0000	1.252
--- ChangeLog	22 Jul 2004 09:11:27 -0000	1.253
***************
*** 1,2 ****
--- 1,5 ----
+ ======================
+ 	FIX: mountman changes... read the email ;-)
+ 
  1.40
  ======================

[Krusader-commits] krusader_kde3/krusader/MountMan kmountman.h,1.11,1.12

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5834/krusader/MountMan

Modified Files:
	kmountman.h 
Log Message:
fix: mountman slimmed down to use KDiskFreeSp 

Index: kmountman.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** kmountman.h	5 Mar 2004 20:05:23 -0000	1.11
--- kmountman.h	22 Jul 2004 09:09:45 -0000	1.12
***************
*** 1,22 ****
  /***************************************************************************
!                                kmountman.h
!                             -------------------
!    begin                : Thu May 4 2000
!    copyright            : (C) 2000 by Shie Erlich & Rafi Yanai
!    e-mail               : kru...@us...
!    web site             : http://krusader.sourceforge.net
  ---------------------------------------------------------------------------
  ***************************************************************************
  
!  A
  
!     db   dD d8888b. db    db .d8888.  .d8b.  d8888b. d88888b d8888b.
!     88 ,8P' 88  `8D 88    88 88'  YP d8' `8b 88  `8D 88'     88  `8D
!     88,8P   88oobY' 88    88 `8bo.   88ooo88 88   88 88ooooo 88oobY'
!     88`8b   88`8b   88    88   `Y8b. 88~~~88 88   88 88~~~~~ 88`8b
!     88 `88. 88 `88. 88b  d88 db   8D 88   88 88  .8D 88.     88 `88.
!     YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
  
!                                                     H e a d e r    F i l e
  
  ***************************************************************************
--- 1,22 ----
  /***************************************************************************
!                               kmountman.h
!                            -------------------
!   begin                : Thu May 4 2000
!   copyright            : (C) 2000 by Shie Erlich & Rafi Yanai
!   e-mail               : kru...@us...
!   web site             : http://krusader.sourceforge.net
  ---------------------------------------------------------------------------
  ***************************************************************************
  
! A
  
!    db   dD d8888b. db    db .d8888.  .d8b.  d8888b. d88888b d8888b.
!    88 ,8P' 88  `8D 88    88 88'  YP d8' `8b 88  `8D 88'     88  `8D
!    88,8P   88oobY' 88    88 `8bo.   88ooo88 88   88 88ooooo 88oobY'
!    88`8b   88`8b   88    88   `Y8b. 88~~~88 88   88 88~~~~~ 88`8b
!    88 `88. 88 `88. 88b  d88 db   8D 88   88 88  .8D 88.     88 `88.
!    YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
  
!                                                    H e a d e r    F i l e
  
  ***************************************************************************
***************
*** 37,40 ****
--- 37,41 ----
  #include <qptrlist.h> 
  // KDE includes
+ #include <kdiskfreesp.h>
  #include <kdeversion.h>
  #include <kprocess.h>
***************
*** 42,46 ****
  #include <kio/jobclasses.h>
  #include <kio/global.h>
! #include <ktempfile.h>
  // krusader includes
  #include <stdlib.h>
--- 43,47 ----
  #include <kio/jobclasses.h>
  #include <kio/global.h>
! #include <ktempfile.h> 
  // krusader includes
  #include <stdlib.h>
***************
*** 49,67 ****
  namespace MountMan {
  
!   // forward definitions
!   class fsData;
  
!   class KMountMan : public QObject {
        Q_OBJECT
        friend class KMountManGUI;
  
!     public:
        enum mntStatus {DOESNT_EXIST, NOT_MOUNTED, MOUNTED};
  
        inline bool operational() {
!         return Operational;
        } // check this 1st
        inline bool ready() {
!         return Ready;
        } // poll on this until true
        void mainWindow();                               // opens up the GUI
--- 50,68 ----
  namespace MountMan {
  
!    // forward definitions
!    class fsData;
  
!    class KMountMan : public QObject {
        Q_OBJECT
        friend class KMountManGUI;
  
!    public:
        enum mntStatus {DOESNT_EXIST, NOT_MOUNTED, MOUNTED};
  
        inline bool operational() {
!          return Operational;
        } // check this 1st
        inline bool ready() {
!          return Ready;
        } // poll on this until true
        void mainWindow();                               // opens up the GUI
***************
*** 73,81 ****
        bool ejectable( QString path );
        QString convertSize( KIO::filesize_t size );
!       
        QString getMtab();          // reads the mount table
!       bool    checkMtabChanged(); // checks whether mtab was changed
!       
! 			
        //////////////////////////// service functions /////////////////////////////////
        static QString nextWord( QString &s );
--- 74,82 ----
        bool ejectable( QString path );
        QString convertSize( KIO::filesize_t size );
! 
        QString getMtab();          // reads the mount table
!       bool checkMtabChanged(); // checks whether mtab was changed
! 
! 
        //////////////////////////// service functions /////////////////////////////////
        static QString nextWord( QString &s );
***************
*** 84,106 ****
        ~KMountMan();
  
! 		public slots:
! 			void performAction(int idx);	
! 			void quickList();
! 			
! 		private:
! 			QString *_actions;
!     
! 		protected slots:
        void parseDfData( QString filename );  // parse a FULL list of filesystems
        void forceUpdate();
        void collectOutput( KProcess *p, char *buffer, int buflen );
!       void collectMtab(KProcess *p, char *buffer,int buflen);
        void finishUpdateFilesystems();
        void killMountMan();                  // called when df never finished (error)
  
!     signals:
        void updated();
  
!     protected:
        void mount( fsData *p );              // you don't want to call this one !
        void unmount( fsData *p );            // you don't want to call this one !
--- 85,107 ----
        ~KMountMan();
  
!    public slots:
!       void performAction( int idx );
!       void quickList();
! 
!    private:
!       QString *_actions;
! 
!    protected slots:
        void parseDfData( QString filename );  // parse a FULL list of filesystems
        void forceUpdate();
        void collectOutput( KProcess *p, char *buffer, int buflen );
!       void collectMtab( KProcess *p, char *buffer, int buflen );
        void finishUpdateFilesystems();
        void killMountMan();                  // called when df never finished (error)
  
!    signals:
        void updated();
  
!    protected:
        void mount( fsData *p );              // you don't want to call this one !
        void unmount( fsData *p );            // you don't want to call this one !
***************
*** 114,125 ****
        QString devFromMtab( QString mntPoint ); // returns device for a mountPoint
  
!     private:
        void clearOutput();
        inline QString getOutput() {
!         return QString( ( !outputBuffer ?
!                           QString::null : *outputBuffer ) );
        }
  
!     private:
        QStringList mountPoints;  // all mountPoints excluding SUPERMOUNTED ones
        QList<fsData> filesystems;
--- 115,126 ----
        QString devFromMtab( QString mntPoint ); // returns device for a mountPoint
  
!    private:
        void clearOutput();
        inline QString getOutput() {
!          return QString( ( !outputBuffer ?
!                            QString::null : *outputBuffer ) );
        }
  
!    private:
        QStringList mountPoints;  // all mountPoints excluding SUPERMOUNTED ones
        QList<fsData> filesystems;
***************
*** 134,158 ****
  
        QString mtab;       // the mount table
!   };
! 
!   // collects statistics about a path, create a label with the results and emit a singal
!   class statsCollector : public QObject {
!       Q_OBJECT
!     public:
!       statsCollector( QString, QObject * ); // this is what you'll need to use
! 
!     protected:
!       void getData( QString path, fsData * );     // returns info about the whereabouts of path
!       void parseDf( QString filename, fsData * ); // parse a single call for DF
! 
!     signals:
!       void gotStats( QString ); // emitted when we have the stats for a path
!   };
  
!   // Data container for a single-filesystem data
!   // maximum size supported is 2GB of 1kb blocks == 2048GB, enough.
!   /////////////////////////////////////////////////////////////////
!   class fsData {
!     public:
        fsData() : Name( 0 ), Type( 0 ), MntPoint( 0 ), TotalBlks( 0 ),
        FreeBlks( 0 ), Mounted( false ) {}
--- 135,145 ----
  
        QString mtab;       // the mount table
!    };
  
!    // Data container for a single-filesystem data
!    // maximum size supported is 2GB of 1kb blocks == 2048GB, enough.
!    /////////////////////////////////////////////////////////////////
!    class fsData {
!    public:
        fsData() : Name( 0 ), Type( 0 ), MntPoint( 0 ), TotalBlks( 0 ),
        FreeBlks( 0 ), Mounted( false ) {}
***************
*** 160,221 ****
        // get information
        inline QString name() {
!         return Name;
        }
        inline QString shortName() {
!         return Name.right( Name.length() - Name.find( "/", 1 ) - 1 );
        }
        inline QString type() {
!         return Type;
        }
        inline QString mntPoint() {
!         return MntPoint;
        }
        inline long totalBlks() {
!         return TotalBlks;
        }
        inline long freeBlks() {
!         return FreeBlks;
        }
        inline KIO::filesize_t totalBytes() {
!         return TotalBlks * 1024;
        }
        inline KIO::filesize_t freeBytes() {
!         return FreeBlks * 1024;
        }
        //////////////////// insert a good round function here /////////////////
        int usedPerct() {
!         if ( TotalBlks == 0 )
!           return 0;
!         float res = ( ( float ) (TotalBlks-FreeBlks) ) / ( ( float ) TotalBlks ) * 100;
!         if ( ( res - ( int ) res ) > 0.5 )
!           return ( int ) res + 1;
!         else
!           return ( int ) res;
        }
        inline bool mounted() {
!         return Mounted;
        }
  
        // set information
        inline void setName( QString n_ ) {
!         Name = n_;
        }
        inline void setType( QString t_ ) {
!         Type = t_;
        }
        inline void setMntPoint( QString m_ ) {
!         MntPoint = m_;
        }
        inline void setTotalBlks( long t_ ) {
!         TotalBlks = t_;
        }
        inline void setFreeBlks( long f_ ) {
!         FreeBlks = f_;
        }
        inline void setMounted( bool m_ ) {
!         Mounted = m_;
        }
  
!     private:
        QString Name;       // i.e: /dev/cdrom
        QString Type;       // i.e: iso9600
--- 147,208 ----
        // get information
        inline QString name() {
!          return Name;
        }
        inline QString shortName() {
!          return Name.right( Name.length() - Name.find( "/", 1 ) - 1 );
        }
        inline QString type() {
!          return Type;
        }
        inline QString mntPoint() {
!          return MntPoint;
        }
        inline long totalBlks() {
!          return TotalBlks;
        }
        inline long freeBlks() {
!          return FreeBlks;
        }
        inline KIO::filesize_t totalBytes() {
!          return TotalBlks * 1024;
        }
        inline KIO::filesize_t freeBytes() {
!          return FreeBlks * 1024;
        }
        //////////////////// insert a good round function here /////////////////
        int usedPerct() {
!          if ( TotalBlks == 0 )
!             return 0;
!          float res = ( ( float ) ( TotalBlks - FreeBlks ) ) / ( ( float ) TotalBlks ) * 100;
!          if ( ( res - ( int ) res ) > 0.5 )
!             return ( int ) res + 1;
!          else
!             return ( int ) res;
        }
        inline bool mounted() {
!          return Mounted;
        }
  
        // set information
        inline void setName( QString n_ ) {
!          Name = n_;
        }
        inline void setType( QString t_ ) {
!          Type = t_;
        }
        inline void setMntPoint( QString m_ ) {
!          MntPoint = m_;
        }
        inline void setTotalBlks( long t_ ) {
!          TotalBlks = t_;
        }
        inline void setFreeBlks( long f_ ) {
!          FreeBlks = f_;
        }
        inline void setMounted( bool m_ ) {
!          Mounted = m_;
        }
  
!    private:
        QString Name;       // i.e: /dev/cdrom
        QString Type;       // i.e: iso9600
***************
*** 226,234 ****
  
        // additional attributes of a filesystem, parsed from fstab
!     public:
        bool supermount;    // is the filesystem supermounted ?
        QString options;    // additional fstab options
  
!   };
  
  };
--- 213,221 ----
  
        // additional attributes of a filesystem, parsed from fstab
!    public:
        bool supermount;    // is the filesystem supermounted ?
        QString options;    // additional fstab options
  
!    };
  
  };

[Krusader-commits] krusader_kde3/krusader/MountMan kmountman.cpp,1.27,1.28

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5766/krusader/MountMan

Modified Files:
	kmountman.cpp 
Log Message:
fix: mountman slimmed down to use KDiskFreeSp 

Index: kmountman.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** kmountman.cpp	15 Jul 2004 14:09:14 -0000	1.27
--- kmountman.cpp	22 Jul 2004 09:09:19 -0000	1.28
***************
*** 1,5 ****
  /***************************************************************************
!                          kmountman.cpp
!                       -------------------
  copyright            : (C) 2000 by Shie Erlich & Rafi Yanai
  e-mail               : kru...@us...
--- 1,5 ----
  /***************************************************************************
!                         kmountman.cpp
!                      -------------------
  copyright            : (C) 2000 by Shie Erlich & Rafi Yanai
[...1635 lines suppressed...]
  
!    if ( idx < 0 )
!       return ;
!    bool domount = _actions[ idx ].left( 3 ) == "_M_";
!    QString mountPoint = _actions[ idx ].mid( 3 );
!    if ( !domount ) { // umount
!       unmount( mountPoint );
!    } else { // mount
!       mount( mountPoint );
!    }
  
!    // free memory
!    delete[] _actions;
!    _actions = 0L;
!    disconnect( ( ( KToolBarPopupAction* ) krMountMan ) ->popupMenu(), SIGNAL( activated( int ) ), 0, 0 );
  
! #endif /* KDE 3.2 */
  
+ }
  

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.65,1.66

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5677/krusader/Panel

Modified Files:
	listpanel.cpp 
Log Message:
fix: mountman slimmed down to use KDiskFreeSp 

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** listpanel.cpp	11 Jul 2004 08:44:46 -0000	1.65
--- listpanel.cpp	22 Jul 2004 09:08:44 -0000	1.66
***************
*** 1,5 ****
  /***************************************************************************
!                            listpanel.cpp
!                         -------------------
  copyright            : (C) 2000 by Shie Erlich & Rafi Yanai
  e-mail               : kru...@us...
--- 1,5 ----
  /***************************************************************************
!                          listpanel.cpp
!                       -------------------
  copyright            : (C) 2000 by Shie Erlich & Rafi Yanai
[...1577 lines suppressed...]
!          case Key_Down :
!          if ( e->state() == ControlButton ) { // give the keyboard focus to the command line
!             if ( krApp->mainView->cmdLine->isVisible() )
!                krApp->mainView->cmdLineFocus();
!             else if ( krApp->mainView->terminal_dock->isVisible() )
!                krApp->mainView->terminal_dock->setFocus();
!             return ;
!          } else
!             e->ignore();
!          break;
  
!          default:
!          // if we got this, it means that the view is not doing
!          // the quick search thing, so send the characters to the commandline, if normal key
!          if ( e->state() == NoButton )
!             krApp->mainView->cmdLine->addText( e->text() );
  
!          //e->ignore();
!    }
  }

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.h,1.18,1.19

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5633/krusader/Panel

Modified Files:
	listpanel.h 
Log Message:
fix: mountman slimmed down to use KDiskFreeSp 

Index: listpanel.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** listpanel.h	18 Apr 2004 19:26:00 -0000	1.18
--- listpanel.h	22 Jul 2004 09:08:18 -0000	1.19
***************
*** 1,32 ****
  /***************************************************************************
!                                 listpanel.h
!                              -------------------
!     begin                : Thu May 4 2000
!     copyright            : (C) 2000 by Shie Erlich & Rafi Yanai
!     e-mail               : kru...@us...
!     web site             : http://krusader.sourceforge.net
!  ---------------------------------------------------------------------------
!   Description
!  ***************************************************************************
  
!   A
  
!      db   dD d8888b. db    db .d8888.  .d8b.  d8888b. d88888b d8888b.
!      88 ,8P' 88  `8D 88    88 88'  YP d8' `8b 88  `8D 88'     88  `8D
!      88,8P   88oobY' 88    88 `8bo.   88ooo88 88   88 88ooooo 88oobY'
!      88`8b   88`8b   88    88   `Y8b. 88~~~88 88   88 88~~~~~ 88`8b
!      88 `88. 88 `88. 88b  d88 db   8D 88   88 88  .8D 88.     88 `88.
!      YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
  
!                                                      H e a d e r    F i l e
  
!  ***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  ***************************************************************************/
  
  
--- 1,32 ----
  /***************************************************************************
!                                listpanel.h
!                             -------------------
!    begin                : Thu May 4 2000
!    copyright            : (C) 2000 by Shie Erlich & Rafi Yanai
!    e-mail               : kru...@us...
!    web site             : http://krusader.sourceforge.net
! ---------------------------------------------------------------------------
!  Description
! ***************************************************************************
  
!  A
  
!     db   dD d8888b. db    db .d8888.  .d8b.  d8888b. d88888b d8888b.
!     88 ,8P' 88  `8D 88    88 88'  YP d8' `8b 88  `8D 88'     88  `8D
!     88,8P   88oobY' 88    88 `8bo.   88ooo88 88   88 88ooooo 88oobY'
!     88`8b   88`8b   88    88   `Y8b. 88~~~88 88   88 88~~~~~ 88`8b
!     88 `88. 88 `88. 88b  d88 db   8D 88   88 88  .8D 88.     88 `88.
!     YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
  
!                                                     H e a d e r    F i l e
  
! ***************************************************************************
! *                                                                         *
! *   This program is free software; you can redistribute it and/or modify  *
! *   it under the terms of the GNU General Public License as published by  *
! *   the Free Software Foundation; either version 2 of the License, or     *
! *   (at your option) any later version.                                   *
! *                                                                         *
! ***************************************************************************/
  
  
***************
*** 52,55 ****
--- 52,56 ----
  #include <klineedit.h>
  #include <qguardedptr.h>
+ #include <kdiskfreesp.h>
  #include "krview.h"
  #include "../Dialogs/krsqueezedtextlabel.h"
***************
*** 59,63 ****
  class KRdirWatch;
  class PanelFunc;
- class statsCollector;
  class KrView;
  class KURLRequester;
--- 60,63 ----
***************
*** 68,140 ****
  
  class ListPanel : public QWidget {
! friend class ListPanelFunc;
! 	Q_OBJECT
  public:
! 	//enum FilterSpec{ALL,EXEC,CUSTOM};
  
!   // constructor create the panel, but DOESN'T fill it with data, use start()
!   ListPanel(QWidget *parent, bool &left, const char *name=0);
!  ~ListPanel();
!   void start(QString path = QString::null);
!   inline QString getPath(){return virtualPath;}
!   QString getCurrentName();
!   void getSelectedNames(QStringList* fileNames) { view->getSelectedItems(fileNames); }
!   void setPanelToolbar();
  
  public slots:
!   void gotStats(QString); // displays filesystem status
!   void popRightClickMenu(const QPoint&);
!   void select(bool, bool);      // see doc in ListPanel
!   void invertSelection();       // see doc in ListPanel
!   void slotFocusOnMe(); // give this VFS the focus (the path bar)
! 	void slotUpdate();			                  // when the vfs finish to update...
!   void slotUpdateTotals();
! 	void slotStartUpdate();                   // internal
! 	void slotGetStats(QString path);          // get the disk-free stats
! 	void setFilter(KrView::FilterSpec f);
!   void slotFocusAndCDRoot();
!   void slotFocusAndCDHome();
!   void slotFocusAndCDup();
!   void slotFocusAndCDOther();
  
! ///////////////////////// service functions - called internally ////////////////////////
!   inline void setOther(ListPanel *panel) { otherPanel=panel; }
!  	void prepareToDelete();                   // internal use only
  
  protected:
!   virtual void keyPressEvent( QKeyEvent *e );
  
  protected slots:
!   void handleDropOnView(QDropEvent *);     // handles drops on the view only
!   void startDragging(QStringList, QPixmap);
  
  signals:
! 	void signalStatus(QString msg);       // emmited when we need to update the status bar
! 	void cmdLineUpdate(QString p);	      // emitted when we need to update the command line
!   void pathChanged(ListPanel *panel);
!   void activePanelChanged(ListPanel *p);// emitted when the user changes panels
!   void finishedDragging();              // currently
  
  public:
!   ListPanelFunc	*func;
!   KrView *view;
! 	ListPanel		*otherPanel;
! 	QString 		 virtualPath;
! 	QString      realPath;
! 	int          colorMask;
! 	bool         compareMode;
!   //FilterSpec	   filter;
! 	QString			   filterMask;
! 	QPixmap        currDragPix;
! 	QListViewItem *currDragItem;
! 	QGuardedPtr<QObject> statsAgent;
! 	KrSqueezedTextLabel *status,*totals;
     KrQuickSearch *quickSearch;
! 	KURLRequester   *origin;
! 	QGridLayout   *layout;
! 	  QToolButton *cdRootButton;
! 	  QToolButton *cdHomeButton;
! 	  QToolButton *cdUpButton;
! 	  QToolButton *cdOtherButton;
  
     BookmarksButton *bookmarksButton;
--- 68,146 ----
  
  class ListPanel : public QWidget {
!    friend class ListPanelFunc;
!    Q_OBJECT
  public:
!    //enum FilterSpec{ALL,EXEC,CUSTOM};
  
!    // constructor create the panel, but DOESN'T fill it with data, use start()
!    ListPanel( QWidget *parent, bool &left, const char *name = 0 );
!    ~ListPanel();
!    void start( QString path = QString::null );
!    inline QString getPath() {
!       return virtualPath;
!    }
!    QString getCurrentName();
!    void getSelectedNames( QStringList* fileNames ) {
!       view->getSelectedItems( fileNames );
!    }
!    void setPanelToolbar();
  
  public slots:
!    void gotStats( const QString &mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail); // displays filesystem status
!    void popRightClickMenu( const QPoint& );
!    void select( bool, bool );      // see doc in ListPanel
!    void invertSelection();       // see doc in ListPanel
!    void slotFocusOnMe(); // give this VFS the focus (the path bar)
!    void slotUpdate();			                  // when the vfs finish to update...
!    void slotUpdateTotals();
!    void slotStartUpdate();                   // internal
!    void slotGetStats( QString path );          // get the disk-free stats
!    void setFilter( KrView::FilterSpec f );
!    void slotFocusAndCDRoot();
!    void slotFocusAndCDHome();
!    void slotFocusAndCDup();
!    void slotFocusAndCDOther();
  
!    ///////////////////////// service functions - called internally ////////////////////////
!    inline void setOther( ListPanel *panel ) {
!       otherPanel = panel;
!    }
!    void prepareToDelete();                   // internal use only
  
  protected:
!    virtual void keyPressEvent( QKeyEvent *e );
  
  protected slots:
!    void handleDropOnView( QDropEvent * );     // handles drops on the view only
!    void startDragging( QStringList, QPixmap );
  
  signals:
!    void signalStatus( QString msg );       // emmited when we need to update the status bar
!    void cmdLineUpdate( QString p );	      // emitted when we need to update the command line
!    void pathChanged( ListPanel *panel );
!    void activePanelChanged( ListPanel *p ); // emitted when the user changes panels
!    void finishedDragging();              // currently
  
  public:
!    ListPanelFunc	*func;
!    KrView *view;
!    ListPanel	*otherPanel;
!    QString virtualPath;
!    QString realPath;
!    int colorMask;
!    bool compareMode;
!    //FilterSpec	   filter;
!    QString	filterMask;
!    QPixmap currDragPix;
!    QListViewItem *currDragItem;
!    KDiskFreeSp* statsAgent;
!    KrSqueezedTextLabel *status, *totals;
     KrQuickSearch *quickSearch;
!    KURLRequester *origin;
!    QGridLayout *layout;
!    QToolButton *cdRootButton;
!    QToolButton *cdHomeButton;
!    QToolButton *cdUpButton;
!    QToolButton *cdOtherButton;
  
     BookmarksButton *bookmarksButton;
***************
*** 143,147 ****
  
  private:
!   bool &_left;
  };
  
--- 149,153 ----
  
  private:
!    bool &_left;
  };
  

[Krusader-commits] krusader_kde3 ChangeLog,1.251,1.252 README,1.22,1.23

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3687

Modified Files:
	ChangeLog README 
Log Message:


Index: README
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/README,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** README	23 Jun 2004 13:52:55 -0000	1.22
--- README	21 Jul 2004 11:24:57 -0000	1.23
***************
*** 1,6 ****
! Krusader 1.40-beta2
! ===================
! This second beta in the 1.40 series is focussed on bugfixes and translation
! updates.
  
  Notice: if you've got bugs to report, please do it using krusader's website,
--- 1,27 ----
! Krusader 1.40
! =============
! The team is pleased to announce 1.40 stable.
! Many things changed since 1.30, so here's some hightlights:
! 
! * Configuring custom color for the panel (much requested feature)
! * Quick-mode for mountman (just press and HOLD the mountman icon)
! * Panel is now configurable (which columns to show, show icons or not ...)
! * Support for single-click selection mode
! * New toolbar for the panel
! * a Locate frontend
! * A new konfigurator (thanks to csaba)
! * New quick-search mode for the panel (thanks to heiner)
! * Ability to edit/view files from the search results window
! * A folder-history button, a-la-total commander. thanks to Hans Loffler
! * Synchronizer (thanks csaba)
! * File splitter
! 
! and that's without mentioning other features and COUNTLESS bug fixes.
! Please check the changelog for information, as many high-profile bugs were fixed.
! 
! I would especially like to thank the rest of the team (Csaba, Heiner, Jonas, Frank
! and Dirk) that really "made their bones" by supporting the project in a time
! where nor Rafi nor myself were able to. This version is largely their work.
! 
  
  Notice: if you've got bugs to report, please do it using krusader's website,

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.251
retrieving revision 1.252
diff -C2 -d -r1.251 -r1.252
*** ChangeLog	18 Jul 2004 14:10:30 -0000	1.251
--- ChangeLog	21 Jul 2004 11:24:57 -0000	1.252
***************
*** 1,3 ****
!     ADDED: when searching in files (grep), push the string we're searching for into
             the clipboard when pressing F3 or F4. this saves an extra copy when searching
             inside the file
--- 1,5 ----
! 1.40
! ======================
! 	ADDED: when searching in files (grep), push the string we're searching for into
             the clipboard when pressing F3 or F4. this saves an extra copy when searching
             inside the file

[Krusader-commits] krusader_kde3 configure.in.in,1.18,1.19

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1442

Modified Files:
	configure.in.in 
Log Message:


Index: configure.in.in
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/configure.in.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** configure.in.in	23 Jun 2004 11:44:03 -0000	1.18
--- configure.in.in	21 Jul 2004 11:11:16 -0000	1.19
***************
*** 1,5 ****
  #MIN_CONFIG(3)
  
! AM_INIT_AUTOMAKE(krusader,1.40-beta2)
  
  dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
--- 1,5 ----
  #MIN_CONFIG(3)
  
! AM_INIT_AUTOMAKE(krusader,1.40)
  
  dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__

[Krusader-commits] krusader_kde3/krusader panelmanager.cpp,1.11,1.12

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31025/krusader

Modified Files:
	panelmanager.cpp 
Log Message:
fixed: new tab didn't open in home dir 

Index: panelmanager.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** panelmanager.cpp	22 Apr 2004 14:18:22 -0000	1.11
--- panelmanager.cpp	19 Jul 2004 13:36:29 -0000	1.12
***************
*** 95,99 ****
  
  void PanelManager::slotNewTab() {
!   slotNewTab("~");
  }
  
--- 95,99 ----
  
  void PanelManager::slotNewTab() {
!   slotNewTab(QDir::home().absPath());
  }
  

[Krusader-commits] krusader_kde3 ChangeLog,1.250,1.251

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29371

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.250
retrieving revision 1.251
diff -C2 -d -r1.250 -r1.251
*** ChangeLog	18 Jul 2004 10:11:01 -0000	1.250
--- ChangeLog	18 Jul 2004 14:10:30 -0000	1.251
***************
*** 3,6 ****
--- 3,7 ----
             inside the file
      ADDED: Catalan translation
+ 	 DISABLED usermenu for 1.40
  	 FIXED: [ 962340 ] Alt-T broken to call Tools menu
  	 FIXED: [ 980252 ] Compare by Content: right/left position swapped

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.71,1.72

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29257/krusader

Modified Files:
	krusader.cpp 
Log Message:
disabled usermenu for 1.40 

Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** krusader.cpp	18 Jul 2004 10:10:24 -0000	1.71
--- krusader.cpp	18 Jul 2004 14:09:43 -0000	1.72
***************
*** 486,489 ****
--- 486,490 ----
    actUserMenu = new KAction( i18n( "User Menu" ), ALT + Key_QuoteLeft, SLOTS,
                               SLOT( userMenu() ), actionCollection(), "user menu" );
+ 		actUserMenu->setEnabled(false);
    // and at last we can set the tool-tips
    actSelect->setToolTip( i18n( "Highlight files by using a filter" ) );

[Krusader-commits] krusader_kde3 ChangeLog,1.249,1.250

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23641

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.249
retrieving revision 1.250
diff -C2 -d -r1.249 -r1.250
*** ChangeLog	18 Jul 2004 10:04:51 -0000	1.249
--- ChangeLog	18 Jul 2004 10:11:01 -0000	1.250
***************
*** 3,6 ****
--- 3,7 ----
             inside the file
      ADDED: Catalan translation
+ 	 FIXED: [ 962340 ] Alt-T broken to call Tools menu
  	 FIXED: [ 980252 ] Compare by Content: right/left position swapped
  	 FIXED: [ 990141 ] F3/F4 in root mode trouble with permissions    

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.70,1.71

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23597/krusader

Modified Files:
	krusader.cpp 
Log Message:
[ 962340 ] Alt-T broken to call Tools menu 

Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** krusader.cpp	5 Jul 2004 21:13:14 -0000	1.70
--- krusader.cpp	18 Jul 2004 10:10:24 -0000	1.71
***************
*** 402,406 ****
    actSelectColorMask = new KAction( i18n( "Co&nfigure compare-mode" ), 0,
                                      SLOTS, SLOT( selectCompareMask() ), actionCollection(), "select colormask" );
!   actTest = new KAction( i18n( "&Test Archive(s)" ), "ark", ALT + Key_T,
                           SLOTS, SLOT( testArchive() ), actionCollection(), "test archives" );
    actFTPConnect = new KAction( i18n( "&Net Connections" ), "domtreeviewer", CTRL + Key_C,
--- 402,406 ----
    actSelectColorMask = new KAction( i18n( "Co&nfigure compare-mode" ), 0,
                                      SLOTS, SLOT( selectCompareMask() ), actionCollection(), "select colormask" );
!   actTest = new KAction( i18n( "T&est Archive(s)" ), "ark", ALT + Key_E,
                           SLOTS, SLOT( testArchive() ), actionCollection(), "test archives" );
    actFTPConnect = new KAction( i18n( "&Net Connections" ), "domtreeviewer", CTRL + Key_C,

[Krusader-commits] krusader_kde3/krusader/Search krsearchdialogbase.cpp,1.10,1.11

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23302/krusader/Search

Modified Files:
	krsearchdialogbase.cpp 
Log Message:
 

Index: krsearchdialogbase.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialogbase.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** krsearchdialogbase.cpp	4 Apr 2004 23:09:01 -0000	1.10
--- krsearchdialogbase.cpp	18 Jul 2004 10:07:22 -0000	1.11
***************
*** 322,326 ****
      containsTextCase = new QCheckBox( GroupBox14, "containsTextCase" );
      containsTextCase->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, containsTextCase->sizePolicy().hasHeightForWidth() ) );
!     containsTextCase->setText( i18n( "Cas&e sensetive" ) );
      containsTextCase->setChecked( TRUE );
      Layout7->addWidget( containsTextCase );
--- 322,326 ----
      containsTextCase = new QCheckBox( GroupBox14, "containsTextCase" );
      containsTextCase->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, containsTextCase->sizePolicy().hasHeightForWidth() ) );
!     containsTextCase->setText( i18n( "Cas&e sensitive" ) );
      containsTextCase->setChecked( TRUE );
      Layout7->addWidget( containsTextCase );

[Krusader-commits] krusader_kde3 ChangeLog,1.248,1.249

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23009

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.248
retrieving revision 1.249
diff -C2 -d -r1.248 -r1.249
*** ChangeLog	12 Jul 2004 13:59:25 -0000	1.248
--- ChangeLog	18 Jul 2004 10:04:51 -0000	1.249
***************
*** 3,7 ****
             inside the file
      ADDED: Catalan translation
!     FIXED: [ 959916 ] Krusader window too large on startup
      FIXED: username and group information are wrong for ftp_vfs
      FIXED: UMR (uninitialized memory read) in vfs::fromPathOrURL
--- 3,9 ----
             inside the file
      ADDED: Catalan translation
! 	 FIXED: [ 980252 ] Compare by Content: right/left position swapped
! 	 FIXED: [ 990141 ] F3/F4 in root mode trouble with permissions    
! 	 FIXED: [ 959916 ] Krusader window too large on startup
      FIXED: username and group information are wrong for ftp_vfs
      FIXED: UMR (uninitialized memory read) in vfs::fromPathOrURL

[Krusader-commits] krusader_kde3/krusader krslots.cpp,1.53,1.54

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22984/krusader

Modified Files:
	krslots.cpp 
Log Message:
[ 980252 ] Compare by Content: right/left position swapped 

Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** krslots.cpp	10 May 2004 19:08:42 -0000	1.53
--- krslots.cpp	18 Jul 2004 10:04:25 -0000	1.54
***************
*** 151,157 ****
    QString name1, name2;
  
-   ((ListPanel*)ACTIVE_PANEL)->getSelectedNames(&lst1);
-   ((ListPanel*)ACTIVE_PANEL->otherPanel)->getSelectedNames(&lst2);
  
    // first, see if we've got exactly 1 selected file, if not, try the current one
    if (lst1.count() == 1) name1 = lst1[0];
--- 151,159 ----
    QString name1, name2;
  
  
+   //((ListPanel*)MAIN_VIEW->left->getSelectedNames(&lst1);
+   MAIN_VIEW->left->getSelectedNames(&lst1);
+   MAIN_VIEW->right->getSelectedNames(&lst2);
+   
    // first, see if we've got exactly 1 selected file, if not, try the current one
    if (lst1.count() == 1) name1 = lst1[0];
***************
*** 167,172 ****
    // else implied: all ok, let's call kdiff
  	// but if one of the files isn't local, download them first
! 	KURL url1 = ACTIVE_FUNC->files()->vfs_getFile(name1);
! 	KURL url2 = ACTIVE_PANEL->otherPanel->func->files()->vfs_getFile(name2);
  
  	QString tmp1 = QString::null, tmp2 = QString::null;
--- 169,174 ----
    // else implied: all ok, let's call kdiff
  	// but if one of the files isn't local, download them first
! 	KURL url1 = MAIN_VIEW->left->func->files()->vfs_getFile(name1);
! 	KURL url2 = MAIN_VIEW->right->func->files()->vfs_getFile(name2);
  
  	QString tmp1 = QString::null, tmp2 = QString::null;

[Krusader-commits] krusader_kde3/krusader/VFS krpermhandler.cpp,1.11,1.12

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14193/krusader/VFS

Modified Files:
	krpermhandler.cpp 
Log Message:
[ 990141 ] F3/F4 in root mode trouble with permissions 

Index: krpermhandler.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/krpermhandler.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** krpermhandler.cpp	20 Sep 2003 13:46:37 -0000	1.11
--- krpermhandler.cpp	18 Jul 2004 08:42:16 -0000	1.12
***************
*** 56,59 ****
--- 56,62 ----
  
  char KRpermHandler::writeable(QString perm, gid_t gid, uid_t uid){
+ 	// root override
+ 	if (getuid()==0) 
+ 		return ALLOWED_PERM;  
    // first check other permissions.
  	if ( perm[8]!='-' ) return ALLOWED_PERM;
***************
*** 69,72 ****
--- 72,78 ----
  
  char KRpermHandler::readable(QString perm, gid_t gid, uid_t uid){
+ 	// root override
+ 	if (getuid()==0) 
+ 		return ALLOWED_PERM;
  	// first check other permissions.
  	if ( perm[7]!='-' ) return ALLOWED_PERM;

[Krusader-commits] krusader_kde3/krusader/MountMan kmountman.cpp,1.26,1.27

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8745/krusader/MountMan

Modified Files:
	kmountman.cpp 
Log Message:
fix: compatability with solaris (thanks to heiner)


Index: kmountman.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** kmountman.cpp	6 Jul 2004 07:13:12 -0000	1.26
--- kmountman.cpp	15 Jul 2004 14:09:14 -0000	1.27
***************
*** 72,81 ****
  KMountMan::KMountMan() : QObject(), Ready( false ), Operational( false ),
  outputBuffer( 0 ), tempFile( 0 ), mountManGui( 0 ), mtab( "" ) {
- #ifdef _OS_SOLARIS_
-   // disable mountman on solaris because of df issues.
-   // at least until we find a solaris box to test on
-   Operational = Ready = false;
-   return;
- #endif
  #if KDE_IS_VERSION(3,2,0)
    _actions = 0L;
--- 72,75 ----
***************
*** 160,163 ****
--- 154,158 ----
    // and read it into the temporary array
    QTextStream t( &fstab );
+ //kdWarning() << "debug: createFilesystems" << endl;
    while ( !fstab.atEnd() ) {
      s = t.readLine();
***************
*** 166,174 ****
--- 161,175 ----
      // temp[0]==name, temp[1]==type, temp[2]==mount point, temp[3]==options
      // temp[4] is reserved for special cases, right now, only for supermount
+ //kdWarning() << "debug: " << s << endl;
      bool remark = false;
      ( temp[ 0 ][ i ] ) = nextWord( s, ' ' );
+ #if defined(_OS_SOLARIS_)
+     nextWord( s, ' ' );
+ #endif
      ( temp[ 2 ][ i ] ) = nextWord( s, ' ' );
      ( temp[ 1 ][ i ] ) = nextWord( s, ' ' );
+ #if !defined(_OS_SOLARIS_)
      ( temp[ 3 ][ i ] ) = nextWord( s, ' ' );
+ #endif
      // now, we check if a remark was inserted in the line
      for ( int cnt = 0; cnt < 3; ++cnt )
***************
*** 201,205 ****
    for ( j = 0; j <= i; ++j ) {
      if ( temp[ 0 ][ j ] == "" || temp[ 0 ][ j ] == "tmpfs" || temp[ 0 ][ j ] == "none" || temp[ 0 ][ j ] == "proc" ||
! #ifdef BSD
           temp[ 0 ][ j ] == "swap" || temp[ 1 ][ j ] == "procfs" || temp[ 1 ][ j ] == "/dev/pts" ||        // FreeBSD: procfs instead of proc
  #else
--- 202,206 ----
    for ( j = 0; j <= i; ++j ) {
      if ( temp[ 0 ][ j ] == "" || temp[ 0 ][ j ] == "tmpfs" || temp[ 0 ][ j ] == "none" || temp[ 0 ][ j ] == "proc" ||
! #if defined(BSD)
           temp[ 0 ][ j ] == "swap" || temp[ 1 ][ j ] == "procfs" || temp[ 1 ][ j ] == "/dev/pts" ||        // FreeBSD: procfs instead of proc
  #else
***************
*** 236,240 ****
    kdDebug() << "Mt.Man: found the following:\n" << forDebugOnly << "Trying DF..." << endl;
  
! #ifdef BSD
    // FreeBSD problem: df does not retrive fs type.
    // Workaround: execute mount -p and merge result.
--- 237,241 ----
    kdDebug() << "Mt.Man: found the following:\n" << forDebugOnly << "Trying DF..." << endl;
  
! #if defined(BSD) || defined(_OS_SOLARIS_)
    // FreeBSD problem: df does not retrive fs type.
    // Workaround: execute mount -p and merge result.
***************
*** 255,258 ****
--- 256,260 ----
    QString str = getOutput();
    QTextStream t2( str, IO_ReadOnly );
+ //kdWarning() << "debug: mount -p" << endl;
    while ( !t2.atEnd() ) {
      s = t2.readLine();
***************
*** 261,265 ****
--- 263,271 ----
      // temp[0]==name, temp[1]==type, temp[2]==mount point, temp[3]==options
      // temp[4] is reserved for special cases, right now, only for supermount
+ //kdWarning() << "debug: " << s << endl;
      QString temp0 = nextWord( s, ' ' );
+ #ifdef _OS_SOLARIS_
+ QString temp4 = nextWord( s, ' ' ); // skip '-' column
+ #endif
      QString temp2 = nextWord( s, ' ' );
      QString temp1 = nextWord( s, ' ' );
***************
*** 274,281 ****
        system->setMntPoint( temp2 );
        system->supermount = false;
!       system->options = temp3;
        filesystems.append( system );
        ++noOfFilesystems;
!       kdWarning() << "Mt.Man: filesystem [" << temp0 << "] found by mount -p is unlisted in /etc/fstab." << endl;
        }
      }
--- 280,289 ----
        system->setMntPoint( temp2 );
        system->supermount = false;
! #ifndef _OS_SOLARIS_
!       system->options = temp3; // unknown column on solaris
! #endif
        filesystems.append( system );
        ++noOfFilesystems;
!       kdWarning() << "Mt.Man: filesystem [" << temp0 << "] found by mount -p is unlisted in "  << QString(FSTAB) << endl;
        }
      }
***************
*** 299,304 ****
    dfProc.clearArguments();
    dfProc.setExecutable( KrServices::fullPathName( "df" ) );
! #ifdef BSD
    dfProc << ">" << tempFile->name(); // FreeBSD: df instead of df -T -P
  #else
    dfProc << "-T" << "-P" << ">" << tempFile->name();
--- 307,314 ----
    dfProc.clearArguments();
    dfProc.setExecutable( KrServices::fullPathName( "df" ) );
! #if defined(BSD)
    dfProc << ">" << tempFile->name(); // FreeBSD: df instead of df -T -P
+ #elif defined(_OS_SOLARIS_)
+   dfProc << "-k" << ">" << tempFile->name(); // Solaris: df -k instead of df -T -P
  #else
    dfProc << "-T" << "-P" << ">" << tempFile->name();
***************
*** 335,339 ****
    for ( it = filesystems.first() ; ( it != 0 ) ; it = filesystems.next() ) {
      if ( followLink( it->name() ) == followLink( name ) ) break;
! #ifdef BSD
      if ( name.left( 2 ) == "//" && !strcasecmp( followLink( it->name() ).latin1(), followLink( name ).latin1() ) ) break; // FreeBSD: ignore case due to smbfs mounts
  #endif
--- 345,349 ----
    for ( it = filesystems.first() ; ( it != 0 ) ; it = filesystems.next() ) {
      if ( followLink( it->name() ) == followLink( name ) ) break;
! #if defined(BSD) || defined(_OS_SOLARIS_)
      if ( name.left( 2 ) == "//" && !strcasecmp( followLink( it->name() ).latin1(), followLink( name ).latin1() ) ) break; // FreeBSD: ignore case due to smbfs mounts
  #endif
***************
*** 442,458 ****
    // now that we have a QString containing all the output of DF, let's get to work.
    int countFilesystems = 0; // sucessfully found filesystems
    while ( !t.eof() ) {
      bool newFS = false;
      s2 = s = t.readLine();  // this is the important one!
      temp = nextWord( s, ' ' );
      // avoid adding unwanted filesystems to the list
      if ( temp == "tmpfs" ) continue;
! #ifdef BSD
      if ( temp == "procfs" ) continue; // FreeBSD: ignore procfs too
  #endif
      temp = followLink( temp );  // make sure DF gives us the true device and not a link
      fsData* loc = location( temp ); // where is the filesystem located in our list?
      if ( loc == 0 ) {
!       kdWarning() << "Mt.Man: filesystem [" << temp << "] found by DF is unlisted in /etc/fstab." << endl;
        loc = new fsData();
        loc->supermount = false;
--- 452,472 ----
    // now that we have a QString containing all the output of DF, let's get to work.
    int countFilesystems = 0; // sucessfully found filesystems
+ //kdWarning() << "debug: parseDfData" << endl;
    while ( !t.eof() ) {
      bool newFS = false;
      s2 = s = t.readLine();  // this is the important one!
+ //kdWarning() << "debug: " << s << endl;
      temp = nextWord( s, ' ' );
      // avoid adding unwanted filesystems to the list
      if ( temp == "tmpfs" ) continue;
! #if defined(BSD)
      if ( temp == "procfs" ) continue; // FreeBSD: ignore procfs too
+ #elif defined(_OS_SOLARIS_)
+     if ( temp == "proc" || temp == "swap") continue; // Solaris: ignore procfs too
  #endif
      temp = followLink( temp );  // make sure DF gives us the true device and not a link
      fsData* loc = location( temp ); // where is the filesystem located in our list?
      if ( loc == 0 ) {
!       kdWarning() << "Mt.Man: filesystem [" << temp << "] found by DF is unlisted in " << QString(FSTAB) << endl;
        loc = new fsData();
        loc->supermount = false;
***************
*** 465,469 ****
        newFS = true;
        }
! #ifndef BSD
      temp = nextWord( s, ' ' );   // catch the TYPE
      // is it supermounted ?
--- 479,483 ----
        newFS = true;
        }
! #if !defined(BSD) && !defined(_OS_SOLARIS_)
      temp = nextWord( s, ' ' );   // catch the TYPE
      // is it supermounted ?
***************
*** 472,476 ****
      if ( loc->type() != temp ) {
        kdWarning() << "Mt.Man: according to DF, filesystem [" << loc->name() <<
!       "] has a different type from what's stated in /etc/fstab." << endl;
        loc->setType( temp );  // DF knows best
        }
--- 486,490 ----
      if ( loc->type() != temp ) {
        kdWarning() << "Mt.Man: according to DF, filesystem [" << loc->name() <<
!       "] has a different type from what's stated in " << QString(FSTAB) << endl;
        loc->setType( temp );  // DF knows best
        }
***************
*** 674,678 ****
  // returns true if the path is an ejectable mount point (at the moment CDROM)
  bool KMountMan::ejectable( QString path ) {
! #ifndef BSD
    fsData * it;
    for ( it = filesystems.first() ; ( it != 0 ) ; it = filesystems.next() )
--- 688,692 ----
  // returns true if the path is an ejectable mount point (at the moment CDROM)
  bool KMountMan::ejectable( QString path ) {
! #if !defined(BSD) && !defined(_OS_SOLARIS_)
    fsData * it;
    for ( it = filesystems.first() ; ( it != 0 ) ; it = filesystems.next() )
***************
*** 696,700 ****
  	return;
    }
! #ifdef BSD
    if ( path.left( 5 ) == "/procfs" ) { // /procfs is a special case - no volume information
      stats = i18n( "No space information on a [procfs]" );
--- 710,714 ----
  	return;
    }
! #if defined(BSD)
    if ( path.left( 5 ) == "/procfs" ) { // /procfs is a special case - no volume information
      stats = i18n( "No space information on a [procfs]" );
***************
*** 735,739 ****
    s = t.readLine();  // read the 1st line - it's trash for us
    s = t.readLine();  // this is the important one!
! #ifndef BSD
    data->setName( KMountMan::nextWord( s, ' ' ) );
  #endif
--- 749,754 ----
    s = t.readLine();  // read the 1st line - it's trash for us
    s = t.readLine();  // this is the important one!
! //kdWarning() << "debug: parseDf: " << s << endl;
! #if !defined(BSD) && !defined(_OS_SOLARIS_)
    data->setName( KMountMan::nextWord( s, ' ' ) );
  #endif
***************
*** 758,764 ****
    KShellProcess dfProc;
    QString tmpFile = krApp->getTempFile();
! 
! #ifdef BSD
    dfProc << KrServices::fullPathName ( "df" ) << "\"" + path + "\"" << ">" << tmpFile; // FreeBSD: df instead of df -T -P
  #else
    dfProc << KrServices::fullPathName ( "df" ) << "-T" << "-P" << "\"" + path + "\"" << ">" << tmpFile;
--- 773,782 ----
    KShellProcess dfProc;
    QString tmpFile = krApp->getTempFile();
! #if defined(BSD)
    dfProc << KrServices::fullPathName ( "df" ) << "\"" + path + "\"" << ">" << tmpFile; // FreeBSD: df instead of df -T -P
+ //kdWarning() << "debug: parseDf command: " << KrServices::fullPathName ( "df" ) << " \"" + path + "\" > " << tmpFile << endl;
+ #elif defined(_OS_SOLARIS_)
+   dfProc << KrServices::fullPathName ( "df" ) << "-k" << "\"" + path + "\"" << ">" << tmpFile; // Solaris: df -k instead of df -T -P
+ //kdWarning() << "debug: parseDf command: " << KrServices::fullPathName ( "df" ) << " -k \"" + path + "\" > " << tmpFile << endl;
  #else
    dfProc << KrServices::fullPathName ( "df" ) << "-T" << "-P" << "\"" + path + "\"" << ">" << tmpFile;

[Krusader-commits] krusader_kde3/krusader krusaderview.cpp,1.12,1.13

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21318/krusader_kde3/krusader

Modified Files:
	krusaderview.cpp 
Log Message:

FIXED: [ 959916 ] Krusader window too large on startup


Index: krusaderview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusaderview.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** krusaderview.cpp	7 Feb 2004 10:47:02 -0000	1.12
--- krusaderview.cpp	12 Jul 2004 13:59:25 -0000	1.13
***************
*** 75,79 ****
    // create the function keys widget
    fnKeys = new KFnKeys( this );
!   fnKeys->show();
    QWhatsThis::add
      ( fnKeys, i18n( "Function keys allow to perform fast "
--- 75,79 ----
    // create the function keys widget
    fnKeys = new KFnKeys( this );
!   fnKeys->hide();
    QWhatsThis::add
      ( fnKeys, i18n( "Function keys allow to perform fast "

[Krusader-commits] krusader_kde3 ChangeLog,1.247,1.248

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21318/krusader_kde3

Modified Files:
	ChangeLog 
Log Message:

FIXED: [ 959916 ] Krusader window too large on startup


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.247
retrieving revision 1.248
diff -C2 -d -r1.247 -r1.248
*** ChangeLog	7 Jul 2004 14:22:14 -0000	1.247
--- ChangeLog	12 Jul 2004 13:59:25 -0000	1.248
***************
*** 1,6 ****
      ADDED: when searching in files (grep), push the string we're searching for into
             the clipboard when pressing F3 or F4. this saves an extra copy when searching
! 	   inside the file
      ADDED: Catalan translation
      FIXED: username and group information are wrong for ftp_vfs
      FIXED: UMR (uninitialized memory read) in vfs::fromPathOrURL
--- 1,7 ----
      ADDED: when searching in files (grep), push the string we're searching for into
             the clipboard when pressing F3 or F4. this saves an extra copy when searching
!            inside the file
      ADDED: Catalan translation
+     FIXED: [ 959916 ] Krusader window too large on startup
      FIXED: username and group information are wrong for ftp_vfs
      FIXED: UMR (uninitialized memory read) in vfs::fromPathOrURL

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.64,1.65

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32659/krusader/Panel

Modified Files:
	listpanel.cpp 
Log Message:
make sure we initialize the first vfs with a valid url


Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** listpanel.cpp	17 Jun 2004 14:50:17 -0000	1.64
--- listpanel.cpp	11 Jul 2004 08:44:46 -0000	1.65
***************
*** 369,373 ****
  
    realPath = virtualPath;
!   func->openUrl( vfs::fromPathOrURL(virtualPath) );
  }
  
--- 369,376 ----
  
    realPath = virtualPath;
!   KURL url = vfs::fromPathOrURL(virtualPath);
!   if (!url.isValid()) 
!     url = "/";
!   func->openUrl( url );
  }
  

[Krusader-commits] Re: [Krusader-devel] Automake 1.8.x problems

[Heiner <h.e...@gm...>]

Hi!

I am neither an expert nor a friend of automake, but are you sure, that this 
patch enables automake 1.8? The following lines do not tell anything about 
1.8!

Heiner

> Index: detect-autoconf.sh
> ===================================================================
> RCS file: /cvsroot/krusader/krusader_kde3/admin/detect-autoconf.sh,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -C2 -d -r1.2 -r1.3
> *** detect-autoconf.sh	8 May 2003 19:09:27 -0000	1.2
> --- detect-autoconf.sh	7 Jul 2004 15:54:48 -0000	1.3
> ***************
> *** 52,64 ****
>   checkAutomakeAclocal ()
>   {
> !   if test -z "$UNSERMAKE"; then
> !     if test -x "`$WHICH automake-1.6`" ; then
> !       AUTOMAKE="`$WHICH automake-1.6`"
> !       ACLOCAL="`$WHICH aclocal-1.6`"
> !     elif test -x "`$WHICH automake-1.7`" ; then
> !       AUTOMAKE="`$WHICH automake-1.7`"
> !       ACLOCAL="`$WHICH aclocal-1.7`"
> !     fi
> !   else
>        AUTOMAKE="$UNSERMAKE"
>     fi
> --- 67,78 ----
>   checkAutomakeAclocal ()
>   {
> !  if test -x "`$WHICH automake-1.6 2>/dev/null`" ; then
> !     AUTOMAKE="`$WHICH automake-1.6`"
> !     ACLOCAL="`$WHICH aclocal-1.6`"
> !   elif test -x "`$WHICH automake-1.7 2>/dev/null`" ; then
> !     AUTOMAKE="`$WHICH automake-1.7`"
> !     ACLOCAL="`$WHICH aclocal-1.7`"
> !   fi
> !   if test -n "$UNSERMAKE"; then
>        AUTOMAKE="$UNSERMAKE"
>     fi
>
> Index: libtool.m4.in
> ===================================================================

[Krusader-commits] krusader_kde3/admin Doxyfile.am,1.1,1.2 Doxyfile.global,1.1,1.2 Makefile.common,1.3,1.4 acinclude.m4.in,1.3,1.4 am_edit,1.3,1.4 conf.change.pl,1.3,1.4 config.pl,1.3,1.4 cvs-clean.pl,1.1,1.2 cvs.sh,1.2,1.3 debianrules,1.3,1.4 depcomp,1.2,1.3 detect-autoconf.sh,1.2,1.3 install-sh,1.2,1.3 libtool.m4.in,1.3,1.4 ltmain.sh,1.2,1.3

[Rafi Y. <ya...@us...>]

Update of /cvsroot/krusader/krusader_kde3/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28484/admin

Modified Files:
	Doxyfile.am Doxyfile.global Makefile.common acinclude.m4.in 
	am_edit conf.change.pl config.pl cvs-clean.pl cvs.sh 
	debianrules depcomp detect-autoconf.sh install-sh 
	libtool.m4.in ltmain.sh 
Log Message:
Updated the admin folder to files from kdevelop 3.0.4

Index: cvs-clean.pl
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/admin/cvs-clean.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cvs-clean.pl	29 Oct 2002 19:49:23 -0000	1.1
--- cvs-clean.pl	7 Jul 2004 15:54:48 -0000	1.2
***************
*** 8,12 ****
  #  inspired by the "old" cvs-clean target from Makefile.common
  #
! # This file is free software in terms of the BSD licence. That means
  # that you can do anything with it except removing this license or
  # the above copyright notice. There is NO WARRANTY of any kind.
--- 8,12 ----
  #  inspired by the "old" cvs-clean target from Makefile.common
  #
! # This file is free software in terms of the BSD license. That means
  # that you can do anything with it except removing this license or
  # the above copyright notice. There is NO WARRANTY of any kind.

Index: detect-autoconf.sh
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/admin/detect-autoconf.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** detect-autoconf.sh	8 May 2003 19:09:27 -0000	1.2
--- detect-autoconf.sh	7 Jul 2004 15:54:48 -0000	1.3
***************
*** 14,28 ****
  checkAutoconf()
  {
!   if test -x "`$WHICH autoconf-2.5x`" ; then	
      AUTOCONF="`$WHICH autoconf-2.5x`"
!   elif test -x "`$WHICH autoconf-2.54`" ; then
      AUTOCONF="`$WHICH autoconf-2.54`"
!   elif test -x "`$WHICH autoconf-2.53`" ; then
      AUTOCONF="`$WHICH autoconf-2.53`"
!   elif test -x "`$WHICH autoconf-2.53a`" ; then
      AUTOCONF="`$WHICH autoconf-2.53a`"
!   elif test -x "`$WHICH autoconf-2.52`" ; then
      AUTOCONF="`$WHICH autoconf-2.52`"
!   elif test -x "`$WHICH autoconf2.50`" ; then
      AUTOCONF="`$WHICH autoconf2.50`"
    fi
--- 14,34 ----
  checkAutoconf()
  {
!   if test -x "`$WHICH autoconf-2.5x 2>/dev/null`" ; then	
      AUTOCONF="`$WHICH autoconf-2.5x`"
!   elif test -x "`$WHICH autoconf-2.57 2>/dev/null`" ; then
!     AUTOCONF="`$WHICH autoconf-2.57`"
!   elif test -x "`$WHICH autoconf-2.56 2>/dev/null`" ; then
!     AUTOCONF="`$WHICH autoconf-2.56`"
!   elif test -x "`$WHICH autoconf-2.55 2>/dev/null`" ; then
!     AUTOCONF="`$WHICH autoconf-2.55`"
!   elif test -x "`$WHICH autoconf-2.54 2>/dev/null`" ; then
      AUTOCONF="`$WHICH autoconf-2.54`"
!   elif test -x "`$WHICH autoconf-2.53 2>/dev/null`" ; then
      AUTOCONF="`$WHICH autoconf-2.53`"
!   elif test -x "`$WHICH autoconf-2.53a 2>/dev/null`" ; then
      AUTOCONF="`$WHICH autoconf-2.53a`"
!   elif test -x "`$WHICH autoconf-2.52 2>/dev/null`" ; then
      AUTOCONF="`$WHICH autoconf-2.52`"
!   elif test -x "`$WHICH autoconf2.50 2>/dev/null`" ; then
      AUTOCONF="`$WHICH autoconf2.50`"
    fi
***************
*** 31,49 ****
  checkAutoheader()
  {
!   if test -x "`$WHICH autoheader-2.5x`" ; then
      AUTOHEADER="`$WHICH autoheader-2.5x`"
      AUTOM4TE="`$WHICH autom4te-2.5x`"
!   elif test -x "`$WHICH autoheader-2.54`" ; then
      AUTOHEADER="`$WHICH autoheader-2.54`"
      AUTOM4TE="`$WHICH autom4te-2.54`"
!   elif test -x "`$WHICH autoheader-2.53`" ; then
      AUTOHEADER="`$WHICH autoheader-2.53`"
      AUTOM4TE="`$WHICH autom4te-2.53`"
!   elif test -x "`$WHICH autoheader-2.53a`" ; then
      AUTOHEADER="`$WHICH autoheader-2.53a`"
      AUTOM4TE="`$WHICH autom4te-2.53a`"
!   elif test -x "`$WHICH autoheader-2.52`" ; then
      AUTOHEADER="`$WHICH autoheader-2.52`"
!   elif test -x "`$WHICH autoheader2.50`" ; then
      AUTOHEADER="`$WHICH autoheader2.50`"
    fi
--- 37,64 ----
  checkAutoheader()
  {
!   if test -x "`$WHICH autoheader-2.5x 2>/dev/null`" ; then
      AUTOHEADER="`$WHICH autoheader-2.5x`"
      AUTOM4TE="`$WHICH autom4te-2.5x`"
!   elif test -x "`$WHICH autoheader-2.57 2>/dev/null`" ; then
!     AUTOHEADER="`$WHICH autoheader-2.57`"
!     AUTOM4TE="`$WHICH autom4te-2.57`"
!   elif test -x "`$WHICH autoheader-2.56 2>/dev/null`" ; then
!     AUTOHEADER="`$WHICH autoheader-2.56`"
!     AUTOM4TE="`$WHICH autom4te-2.56`"
!   elif test -x "`$WHICH autoheader-2.55 2>/dev/null`" ; then
!     AUTOHEADER="`$WHICH autoheader-2.55`"
!     AUTOM4TE="`$WHICH autom4te-2.55`"
!   elif test -x "`$WHICH autoheader-2.54 2>/dev/null`" ; then
      AUTOHEADER="`$WHICH autoheader-2.54`"
      AUTOM4TE="`$WHICH autom4te-2.54`"
!   elif test -x "`$WHICH autoheader-2.53 2>/dev/null`" ; then
      AUTOHEADER="`$WHICH autoheader-2.53`"
      AUTOM4TE="`$WHICH autom4te-2.53`"
!   elif test -x "`$WHICH autoheader-2.53a 2>/dev/null`" ; then
      AUTOHEADER="`$WHICH autoheader-2.53a`"
      AUTOM4TE="`$WHICH autom4te-2.53a`"
!   elif test -x "`$WHICH autoheader-2.52 2>/dev/null`" ; then
      AUTOHEADER="`$WHICH autoheader-2.52`"
!   elif test -x "`$WHICH autoheader2.50 2>/dev/null`" ; then
      AUTOHEADER="`$WHICH autoheader2.50`"
    fi
***************
*** 52,64 ****
  checkAutomakeAclocal ()
  {
!   if test -z "$UNSERMAKE"; then
!     if test -x "`$WHICH automake-1.6`" ; then
!       AUTOMAKE="`$WHICH automake-1.6`"
!       ACLOCAL="`$WHICH aclocal-1.6`"
!     elif test -x "`$WHICH automake-1.7`" ; then
!       AUTOMAKE="`$WHICH automake-1.7`"
!       ACLOCAL="`$WHICH aclocal-1.7`"
!     fi
!   else
       AUTOMAKE="$UNSERMAKE"
    fi
--- 67,78 ----
  checkAutomakeAclocal ()
  {
!  if test -x "`$WHICH automake-1.6 2>/dev/null`" ; then
!     AUTOMAKE="`$WHICH automake-1.6`"
!     ACLOCAL="`$WHICH aclocal-1.6`"
!   elif test -x "`$WHICH automake-1.7 2>/dev/null`" ; then
!     AUTOMAKE="`$WHICH automake-1.7`"
!     ACLOCAL="`$WHICH aclocal-1.7`"
!   fi
!   if test -n "$UNSERMAKE"; then 
       AUTOMAKE="$UNSERMAKE"
    fi

Index: libtool.m4.in
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/admin/libtool.m4.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** libtool.m4.in	8 May 2003 19:09:27 -0000	1.3
--- libtool.m4.in	7 Jul 2004 15:54:48 -0000	1.4
***************
*** 25,28 ****
--- 25,39 ----
  # serial 47 AC_PROG_LIBTOOL
  
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+ # -----------------------------------------------------------
+ # If this macro is not defined by Autoconf, define it here.
+ m4_ifdef([AC_PROVIDE_IFELSE],
+          [],
+          [m4_define([AC_PROVIDE_IFELSE],
[...4244 lines suppressed...]
!   while true; do
!     cat conftest.in conftest.in >conftest.tmp
!     mv conftest.tmp conftest.in
!     cp conftest.in conftest.nl
!     echo >>conftest.nl
!     $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
!     cmp -s conftest.out conftest.nl || break
!     # 10000 chars as input seems more than enough
!     test $lt_ac_count -gt 10 && break
!     lt_ac_count=`expr $lt_ac_count + 1`
!     if test $lt_ac_count -gt $lt_ac_max; then
!       lt_ac_max=$lt_ac_count
!       lt_cv_path_SED=$lt_ac_sed
      fi
    done
! done
  ])
+ SED=$lt_cv_path_SED
  AC_MSG_RESULT([$SED])
  ])

Index: acinclude.m4.in
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/admin/acinclude.m4.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** acinclude.m4.in	8 May 2003 19:09:27 -0000	1.3
--- acinclude.m4.in	7 Jul 2004 15:54:48 -0000	1.4
***************
*** 27,44 ****
  dnl and kdebase or configure.in.in if present.
  
- dnl ------------------------------------------------------------------------
- dnl Forward compatibility macros (make autoconf 2.13 look like 2.50),
- dnl thanks to Raja R Harinath.
- dnl ------------------------------------------------------------------------
- dnl
- ifdef([_AC_PATH_X_XMKMF],[],
-    [AC_DEFUN([_AC_PATH_X_XMKMF],[AC_PATH_X_XMKMF])])
- ifdef([AC_OUTPUT_SUBDIRS],[],
[...4084 lines suppressed...]
+ at the same time. Dunno where the bug is, but until somebody figured out,
+ better disable the optional version scripts.
+ #endif
+ 
    foo = 42;
  ], kde_supports_versionmaps=yes, kde_supports_versionmaps=no)
***************
*** 5414,5415 ****
--- 5343,5353 ----
  _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)])
  ])
+ 
+ AC_DEFUN([KDE_CHECK_PERL],
+ [
+ 	KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [
+ 		    AC_MSG_ERROR([No Perl found in your $PATH.
+ We need perl to generate some code.])
+ 	])
+     AC_SUBST(PERL)
+ ])

Index: ltmain.sh
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/admin/ltmain.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ltmain.sh	13 Aug 2002 22:37:30 -0000	1.2
--- ltmain.sh	7 Jul 2004 15:54:48 -0000	1.3
***************
*** 2,6 ****
  # NOTE: Changing this file will not affect anything until you rerun configure.
  #
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
  # Free Software Foundation, Inc.
  # Originally by Gordon Matzigkeit <go...@gn...>, 1996
--- 2,6 ----
  # NOTE: Changing this file will not affect anything until you rerun configure.
  #
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
  # Free Software Foundation, Inc.
[...3135 lines suppressed...]
  
--- 6313,6317 ----
  esac
  
! $echo
  $echo "Try \`$modename --help' for more information about other modes."
  
***************
*** 5564,5568 ****
  
  # ### BEGIN LIBTOOL TAG CONFIG: disable-static
! build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
  # ### END LIBTOOL TAG CONFIG: disable-static
  
--- 6335,6339 ----
  
  # ### BEGIN LIBTOOL TAG CONFIG: disable-static
! build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
  # ### END LIBTOOL TAG CONFIG: disable-static
  

Index: Doxyfile.global
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/admin/Doxyfile.global,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Doxyfile.global	8 May 2003 19:09:27 -0000	1.1
--- Doxyfile.global	7 Jul 2004 15:54:48 -0000	1.2
***************
*** 1,3 ****
! # Doxyfile 1.2.15
  
  # This file describes the settings to be used by the documentation system
--- 1,3 ----
! # Doxyfile 1.3.5
  
  # This file describes the settings to be used by the documentation system
***************
*** 12,16 ****
  
  #---------------------------------------------------------------------------
! # General configuration options
  #---------------------------------------------------------------------------
  
--- 12,16 ----
  
  #---------------------------------------------------------------------------
! # Project related configuration options
  #---------------------------------------------------------------------------
  
***************
*** 37,46 ****
  # information to generate all constant output in the proper language. 
  # The default language is English, other supported languages are: 
! # Brazilian, Chinese, Croatian, Czech, Danish, Dutch, Finnish, French, 
! # German, Greek, Hungarian, Italian, Japanese, Korean, Norwegian, Polish, 
! # Portuguese, Romanian, Russian, Slovak, Slovene, Spanish and Swedish.
  
  OUTPUT_LANGUAGE        = English
  
  # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
  # documentation are documented, even if no documentation was available. 
--- 37,190 ----
  # information to generate all constant output in the proper language. 
  # The default language is English, other supported languages are: 
! # Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
! # Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
! # (Japanese with English messages), Korean, Norwegian, Polish, Portuguese, 
! # Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
  
  OUTPUT_LANGUAGE        = English
  
+ # This tag can be used to specify the encoding used in the generated output. 
+ # The encoding is not always determined by the language that is chosen, 
+ # but also whether or not the output is meant for Windows or non-Windows users. 
+ # In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
+ # forces the Windows encoding (this is the default for the Windows binary), 
+ # whereas setting the tag to NO uses a Unix-style encoding (the default for 
+ # all platforms other than Windows).
+ 
+ USE_WINDOWS_ENCODING   = NO
+ 
+ # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+ # include brief member descriptions after the members that are listed in 
+ # the file and class documentation (similar to JavaDoc). 
+ # Set to NO to disable this.
+ 
+ BRIEF_MEMBER_DESC      = NO
+ 
+ # If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+ # the brief description of a member or function before the detailed description. 
+ # Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+ # brief descriptions will be completely suppressed.
+ 
+ REPEAT_BRIEF           = YES
+ 
+ # This tag implements a quasi-intelligent brief description abbreviator 
+ # that is used to form the text in various listings. Each string 
+ # in this list, if found as the leading text of the brief description, will be 
+ # stripped from the text and the result after processing the whole list, is used 
+ # as the annotated text. Otherwise, the brief description is used as-is. If left 
+ # blank, the following values are used ("$name" is automatically replaced with the 
+ # name of the entity): "The $name class" "The $name widget" "The $name file" 
+ # "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
+ 
+ ABBREVIATE_BRIEF       = 
+ 
+ # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+ # Doxygen will generate a detailed section even if there is only a brief 
+ # description.
+ 
+ ALWAYS_DETAILED_SEC    = YES
+ 
+ # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
+ # members of a class in the documentation of that class as if those members were 
+ # ordinary class members. Constructors, destructors and assignment operators of 
+ # the base classes will not be shown.
+ 
+ INLINE_INHERITED_MEMB  = NO
+ 
+ # If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+ # path before files name in the file list and in the header files. If set 
+ # to NO the shortest path that makes the file name unique will be used.
+ 
+ FULL_PATH_NAMES        = NO
+ 
+ # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+ # can be used to strip a user-defined part of the path. Stripping is 
+ # only done if one of the specified strings matches the left-hand part of 
+ # the path. It is allowed to use relative paths in the argument list.
+ 
+ STRIP_FROM_PATH        = 
+ 
+ # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+ # (but less readable) file names. This can be useful is your file systems 
+ # doesn't support long names like on DOS, Mac, or CD-ROM.
+ 
+ SHORT_NAMES            = NO
+ 
+ # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+ # will interpret the first line (until the first dot) of a JavaDoc-style 
+ # comment as the brief description. If set to NO, the JavaDoc 
+ # comments will behave just like the Qt-style comments (thus requiring an 
+ # explicit @brief command for a brief description.
+ 
+ JAVADOC_AUTOBRIEF      = YES
+ 
+ # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+ # treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+ # comments) as a brief description. This used to be the default behaviour. 
+ # The new default is to treat a multi-line C++ comment block as a detailed 
+ # description. Set this tag to YES if you prefer the old behaviour instead.
+ 
+ MULTILINE_CPP_IS_BRIEF = NO
+ 
+ # If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+ # will output the detailed description near the top, like JavaDoc.
+ # If set to NO, the detailed description appears after the member 
+ # documentation.
+ 
+ DETAILS_AT_TOP         = NO
+ 
+ # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+ # member inherits the documentation from any documented member that it 
+ # re-implements.
+ 
+ INHERIT_DOCS           = YES
+ 
+ # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+ # tag is set to YES, then doxygen will reuse the documentation of the first 
+ # member in the group (if any) for the other members of the group. By default 
+ # all members of a group must be documented explicitly.
+ 
+ DISTRIBUTE_GROUP_DOC   = NO
+ 
+ # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+ # Doxygen uses this value to replace tabs by spaces in code fragments.
+ 
+ TAB_SIZE               = 4
+ 
+ # This tag can be used to specify a number of aliases that acts 
+ # as commands in the documentation. An alias has the form "name=value". 
+ # For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+ # put the command \sideeffect (or @sideeffect) in the documentation, which 
+ # will result in a user-defined paragraph with heading "Side Effects:". 
+ # You can put \n's in the value part of an alias to insert newlines.
+ 
+ ALIASES                = obsolete=@deprecated
+ 
+ # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
+ # only. Doxygen will then generate output that is more tailored for C. 
+ # For instance, some of the names that are used will be different. The list 
+ # of all members will be omitted, etc.
+ 
+ OPTIMIZE_OUTPUT_FOR_C  = NO
+ 
+ # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
+ # only. Doxygen will then generate output that is more tailored for Java. 
+ # For instance, namespaces will be presented as packages, qualified scopes 
+ # will look different, etc.
+ 
+ OPTIMIZE_OUTPUT_JAVA   = NO
+ 
+ # Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+ # the same type (for instance a group of public functions) to be put as a 
+ # subgroup of that type (e.g. under the Public Functions section). Set it to 
+ # NO to prevent subgrouping. Alternatively, this can be done per class using 
+ # the \nosubgrouping command.
+ 
+ SUBGROUPING            = YES
+ 
+ #---------------------------------------------------------------------------
+ # Build related configuration options
+ #---------------------------------------------------------------------------
+ 
  # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
  # documentation are documented, even if no documentation was available. 
***************
*** 76,123 ****
  # If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
  # undocumented classes that are normally visible in the class hierarchy. 
! # If set to NO (the default) these class will be included in the various 
  # overviews. This option has no effect if EXTRACT_ALL is enabled.
  
  HIDE_UNDOC_CLASSES     = YES
  
! # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
! # include brief member descriptions after the members that are listed in 
! # the file and class documentation (similar to JavaDoc). 
! # Set to NO to disable this.
! 
! BRIEF_MEMBER_DESC      = YES
! 
! # If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
! # the brief description of a member or function before the detailed description. 
! # Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
! # brief descriptions will be completely suppressed.
! 
! REPEAT_BRIEF           = YES
! 
! # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
! # Doxygen will generate a detailed section even if there is only a brief 
! # description.
! 
! ALWAYS_DETAILED_SEC    = YES
! 
! # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
! # members of a class in the documentation of that class as if those members were 
! # ordinary class members. Constructors, destructors and assignment operators of 
! # the base classes will not be shown.
! 
! INLINE_INHERITED_MEMB  = NO
! 
! # If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
! # path before files name in the file list and in the header files. If set 
! # to NO the shortest path that makes the file name unique will be used.
  
! FULL_PATH_NAMES        = NO
  
! # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
! # can be used to strip a user defined part of the path. Stripping is 
! # only done if one of the specified strings matches the left-hand part of 
! # the path. It is allowed to use relative paths in the argument list.
  
! STRIP_FROM_PATH        = 
  
  # The INTERNAL_DOCS tag determines if documentation 
--- 220,241 ----
  # If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
  # undocumented classes that are normally visible in the class hierarchy. 
! # If set to NO (the default) these classes will be included in the various 
  # overviews. This option has no effect if EXTRACT_ALL is enabled.
  
  HIDE_UNDOC_CLASSES     = YES
  
! # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
! # friend (class|struct|union) declarations. 
! # If set to NO (the default) these declarations will be included in the 
! # documentation.
  
! HIDE_FRIEND_COMPOUNDS  = NO
  
! # If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
! # documentation blocks found inside the body of a function. 
! # If set to NO (the default) these blocks will be appended to the 
! # function's detailed documentation block.
  
! HIDE_IN_BODY_DOCS      = NO
  
  # The INTERNAL_DOCS tag determines if documentation 
***************
*** 128,151 ****
  INTERNAL_DOCS          = NO
  
- # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
- # doxygen to hide any special comment blocks from generated source code 
- # fragments. Normal C and C++ comments will always remain visible.
- 
- STRIP_CODE_COMMENTS    = YES
- 
  # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
! # file names in lower case letters. If set to YES upper case letters are also 
  # allowed. This is useful if you have classes or files whose names only differ 
  # in case and if your file system supports case sensitive file names. Windows 
! # users are adviced to set this option to NO.
  
  CASE_SENSE_NAMES       = YES
  
- # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
- # (but less readable) file names. This can be useful is your file systems 
- # doesn't support long names like on DOS, Mac, or CD-ROM.
- 
- SHORT_NAMES            = NO
- 
  # If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
  # will show members with their full class and namespace scopes in the 
--- 246,257 ----
  INTERNAL_DOCS          = NO
  
  # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
! # file names in lower-case letters. If set to YES upper-case letters are also 
  # allowed. This is useful if you have classes or files whose names only differ 
  # in case and if your file system supports case sensitive file names. Windows 
! # users are advised to set this option to NO.
  
  CASE_SENSE_NAMES       = YES
  
  # If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
  # will show members with their full class and namespace scopes in the 
***************
*** 154,183 ****
  HIDE_SCOPE_NAMES       = NO
  
- # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
- # will generate a verbatim copy of the header file for each class for 
- # which an include is specified. Set to NO to disable this.
- 
- VERBATIM_HEADERS       = YES
- 
  # If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
! # will put list of the files that are included by a file in the documentation 
  # of that file.
  
  SHOW_INCLUDE_FILES     = YES
  
- # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
- # will interpret the first line (until the first dot) of a JavaDoc-style 
- # comment as the brief description. If set to NO, the JavaDoc 
- # comments  will behave just like the Qt-style comments (thus requiring an 
- # explict @brief command for a brief description.
- 
- JAVADOC_AUTOBRIEF      = YES
- 
- # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
- # member inherits the documentation from any documented member that it 
- # reimplements.
- 
- INHERIT_DOCS           = YES
- 
  # If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
  # is inserted in the documentation for inline members.
--- 260,269 ----
  HIDE_SCOPE_NAMES       = NO
  
  # If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
! # will put a list of the files that are included by a file in the documentation 
  # of that file.
  
  SHOW_INCLUDE_FILES     = YES
  
  # If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
  # is inserted in the documentation for inline members.
***************
*** 192,207 ****
  SORT_MEMBER_DOCS       = NO
  
- # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
- # tag is set to YES, then doxygen will reuse the documentation of the first 
- # member in the group (if any) for the other members of the group. By default 
- # all members of a group must be documented explicitly.
- 
- DISTRIBUTE_GROUP_DOC   = NO
- 
- # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
- # Doxygen uses this value to replace tabs by spaces in code fragments.
- 
- TAB_SIZE               = 4
- 
  # The GENERATE_TODOLIST tag can be used to enable (YES) or 
  # disable (NO) the todo list. This list is created by putting \todo 
--- 278,281 ----
***************
*** 222,241 ****
  GENERATE_BUGLIST       = YES
  
! # This tag can be used to specify a number of aliases that acts 
! # as commands in the documentation. An alias has the form "name=value". 
! # For example adding "sideeffect=\par Side Effects:\n" will allow you to 
! # put the command \sideeffect (or @sideeffect) in the documentation, which 
! # will result in a user defined paragraph with heading "Side Effects:". 
! # You can put \n's in the value part of an alias to insert newlines.
! 
! # @ref in KDE docu are for kdoc, doxygen doesn't need them, so we alias them
! # to nothing here
  
! ALIASES                = libdoc=@mainpage \
!                          sect=<p><b> \
!                          reimplemented= \
!                          "deprecated=<b>This class or method is obsolete, it is provided for compatibility only.</b>" \
!                          obsolete=@deprecated \
! 			 ref=
  
  # The ENABLED_SECTIONS tag can be used to enable conditional 
--- 296,304 ----
  GENERATE_BUGLIST       = YES
  
! # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
! # disable (NO) the deprecated list. This list is created by putting 
! # \deprecated commands in the documentation.
  
! GENERATE_DEPRECATEDLIST= YES
  
  # The ENABLED_SECTIONS tag can be used to enable conditional 
***************
*** 245,249 ****
  
  # The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
! # the initial value of a variable or define consist of for it to appear in 
  # the documentation. If the initializer consists of more lines than specified 
  # here it will be hidden. Use a value of 0 to hide initializers completely. 
--- 308,312 ----
  
  # The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
! # the initial value of a variable or define consists of for it to appear in 
  # the documentation. If the initializer consists of more lines than specified 
  # here it will be hidden. Use a value of 0 to hide initializers completely. 
***************
*** 254,271 ****
  MAX_INITIALIZER_LINES  = 30
  
- # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
- # only. Doxygen will then generate output that is more tailored for C. 
- # For instance some of the names that are used will be different. The list 
- # of all members will be omitted, etc.
- 
- OPTIMIZE_OUTPUT_FOR_C  = NO
- 
- # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
- # only. Doxygen will then generate output that is more tailored for Java. 
- # For instance namespaces will be presented as packages, qualified scopes 
- # will look different, etc.
- 
- OPTIMIZE_OUTPUT_JAVA   = NO
- 
  # Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
  # at the bottom of the documentation of classes and structs. If set to YES the 
--- 317,320 ----
***************
*** 295,298 ****
--- 344,354 ----
  WARN_IF_UNDOCUMENTED   = NO
  
+ # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+ # potential errors in the documentation, such as not documenting some 
+ # parameters in a documented function, or documenting parameters that 
+ # don't exist or using markup commands wrongly.
+ 
+ WARN_IF_DOC_ERROR      = YES
+ 
  # The WARN_FORMAT tag determines the format of the warning messages that 
  # doxygen can produce. The string should contain the $file, $line, and $text 
***************
*** 324,333 ****
  # blank the following patterns are tested: 
  # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
! # *.h++ *.idl *.odl
  
  FILE_PATTERNS          = *.h \
                           *.cpp \
                           *.cc \
!                          *.hpp
  
  # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
--- 380,394 ----
  # blank the following patterns are tested: 
  # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
! # *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
  
  FILE_PATTERNS          = *.h \
                           *.cpp \
                           *.cc \
!                          *.hpp \
!                          *.dox \
!                          *.c++ \
!                          *.cxx \
!                          *.h++ \
!                          *.hh
  
  # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
***************
*** 396,400 ****
  # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
  # INPUT_FILTER) will be used to filter the input files when producing source 
! # files to browse.
  
  FILTER_SOURCE_FILES    = NO
--- 457,461 ----
  # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
  # INPUT_FILTER) will be used to filter the input files when producing source 
! # files to browse (i.e. when SOURCE_BROWSER is set to YES).
  
  FILTER_SOURCE_FILES    = NO
***************
*** 405,409 ****
  
  # If the SOURCE_BROWSER tag is set to YES then a list of source files will 
! # be generated. Documented entities will be cross-referenced with these sources.
  
  SOURCE_BROWSER         = YES
--- 466,472 ----
  
  # If the SOURCE_BROWSER tag is set to YES then a list of source files will 
! # be generated. Documented entities will be cross-referenced with these sources. 
! # Note: To get rid of all source code in the generated output, make sure also 
! # VERBATIM_HEADERS is set to NO.
  
  SOURCE_BROWSER         = YES
***************
*** 414,417 ****
--- 477,486 ----
  INLINE_SOURCES         = NO
  
+ # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+ # doxygen to hide any special comment blocks from generated source code 
+ # fragments. Normal C and C++ comments will always remain visible.
+ 
+ STRIP_CODE_COMMENTS    = YES
+ 
  # If the REFERENCED_BY_RELATION tag is set to YES (the default) 
  # then for each documented function all documented 
***************
*** 426,429 ****
--- 495,504 ----
  REFERENCES_RELATION    = YES
  
+ # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+ # will generate a verbatim copy of the header file for each class for 
+ # which an include is specified. Set to NO to disable this.
+ 
+ VERBATIM_HEADERS       = YES
+ 
  #---------------------------------------------------------------------------
  # configuration options related to the alphabetical class index
***************
*** 482,489 ****
  HTML_FOOTER            = ../apidocs/common/footer.html
  
! # The HTML_STYLESHEET tag can be used to specify a user defined cascading 
  # style sheet that is used by each HTML page. It can be used to 
  # fine-tune the look of the HTML output. If the tag is left blank doxygen 
! # will generate a default style sheet
  
  HTML_STYLESHEET        = ../apidocs/common/doxygen.css
--- 557,566 ----
  HTML_FOOTER            = ../apidocs/common/footer.html
  
! # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
  # style sheet that is used by each HTML page. It can be used to 
  # fine-tune the look of the HTML output. If the tag is left blank doxygen 
! # will generate a default style sheet. Note that doxygen will try to copy 
! # the style sheet file to the HTML output directory, so don't put your own 
! # stylesheet in the HTML output directory as well, or it will be erased!
  
  HTML_STYLESHEET        = ../apidocs/common/doxygen.css
***************
*** 502,505 ****
--- 579,596 ----
  GENERATE_HTMLHELP      = NO
  
+ # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+ # be used to specify the file name of the resulting .chm file. You 
+ # can add a path in front of the file if the result should not be 
+ # written to the html output directory.
+ 
+ CHM_FILE               = 
+ 
+ # If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+ # be used to specify the location (absolute path including file name) of 
+ # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+ # the HTML help compiler on the generated index.hhp.
+ 
+ HHC_LOCATION           = 
+ 
  # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
  # controls if a separate .chi index file is generated (YES) or that 
***************
*** 515,519 ****
  
  # The TOC_EXPAND flag can be set to YES to add extra items for group members 
! # to the contents of the Html help documentation and to the tree view.
  
  TOC_EXPAND             = NO
--- 606,610 ----
  
  # The TOC_EXPAND flag can be set to YES to add extra items for group members 
! # to the contents of the HTML help documentation and to the tree view.
  
  TOC_EXPAND             = NO
***************
*** 533,540 ****
  # generated containing a tree-like index structure (just like the one that 
  # is generated for HTML Help). For this to work a browser that supports 
! # JavaScript and frames is required (for instance Mozilla, Netscape 4.0+, 
! # or Internet explorer 4.0+). Note that for large projects the tree generation 
! # can take a very long time. In such cases it is better to disable this feature. 
! # Windows users are probably better off using the HTML help feature.
  
  GENERATE_TREEVIEW      = NO
--- 624,630 ----
  # generated containing a tree-like index structure (just like the one that 
  # is generated for HTML Help). For this to work a browser that supports 
! # JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
! # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
! # probably better off using the HTML help feature.
  
  GENERATE_TREEVIEW      = NO
***************
*** 561,565 ****
  LATEX_OUTPUT           = 
  
! # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be invoked. If left blank `latex' will be used as the default command name.
  
  LATEX_CMD_NAME         = latex
--- 651,656 ----
  LATEX_OUTPUT           = 
  
! # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
! # invoked. If left blank `latex' will be used as the default command name.
  
  LATEX_CMD_NAME         = latex
***************
*** 615,618 ****
--- 706,715 ----
  LATEX_BATCHMODE        = NO
  
+ # If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+ # include the index chapters (such as File Index, Compound Index, etc.) 
+ # in the output.
+ 
+ LATEX_HIDE_INDICES     = NO
+ 
  #---------------------------------------------------------------------------
  # configuration options related to the RTF output
***************
*** 620,624 ****
  
  # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
! # The RTF output is optimised for Word 97 and may not look very pretty with 
  # other RTF readers or editors.
  
--- 717,721 ----
  
  # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
! # The RTF output is optimized for Word 97 and may not look very pretty with 
  # other RTF readers or editors.
  
***************
*** 647,651 ****
  
  # Load stylesheet definitions from file. Syntax is similar to doxygen's 
! # config file, i.e. a series of assigments. You only have to provide 
  # replacements, missing definitions are set to their default value.
  
--- 744,748 ----
  
  # Load stylesheet definitions from file. Syntax is similar to doxygen's 
! # config file, i.e. a series of assignments. You only have to provide 
  # replacements, missing definitions are set to their default value.
  
***************
*** 691,700 ****
  # If the GENERATE_XML tag is set to YES Doxygen will 
  # generate an XML file that captures the structure of 
! # the code including all documentation. Note that this 
! # feature is still experimental and incomplete at the 
! # moment.
  
  GENERATE_XML           = NO
  
  #---------------------------------------------------------------------------
  # configuration options for the AutoGen Definitions output
--- 788,820 ----
  # If the GENERATE_XML tag is set to YES Doxygen will 
  # generate an XML file that captures the structure of 
! # the code including all documentation.
  
  GENERATE_XML           = NO
  
+ # The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+ # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+ # put in front of it. If left blank `xml' will be used as the default path.
+ 
+ XML_OUTPUT             = xml
+ 
+ # The XML_SCHEMA tag can be used to specify an XML schema, 
+ # which can be used by a validating XML parser to check the 
+ # syntax of the XML files.
+ 
+ XML_SCHEMA             = 
+ 
+ # The XML_DTD tag can be used to specify an XML DTD, 
+ # which can be used by a validating XML parser to check the 
+ # syntax of the XML files.
+ 
+ XML_DTD                = 
+ 
+ # If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+ # dump the program listings (including syntax highlighting 
+ # and cross-referencing information) to the XML output. Note that 
+ # enabling this will significantly increase the size of the XML output.
+ 
+ XML_PROGRAMLISTING     = NO
+ 
  #---------------------------------------------------------------------------
  # configuration options for the AutoGen Definitions output
***************
*** 710,713 ****
--- 830,866 ----
  
  #---------------------------------------------------------------------------
+ # configuration options related to the Perl module output
+ #---------------------------------------------------------------------------
+ 
+ # If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+ # generate a Perl module file that captures the structure of 
+ # the code including all documentation. Note that this 
+ # feature is still experimental and incomplete at the 
+ # moment.
+ 
+ GENERATE_PERLMOD       = NO
+ 
+ # If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+ # the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+ # to generate PDF and DVI output from the Perl module output.
+ 
+ PERLMOD_LATEX          = NO
+ 
+ # If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+ # nicely formatted so it can be parsed by a human reader.  This is useful 
+ # if you want to understand what is going on.  On the other hand, if this 
+ # tag is set to NO the size of the Perl module output will be much smaller 
+ # and Perl will parse it just the same.
+ 
+ PERLMOD_PRETTY         = YES
+ 
+ # The names of the make variables in the generated doxyrules.make file 
+ # are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+ # This is useful so different doxyrules.make files included by the same 
+ # Makefile don't overwrite each other's variables.
+ 
+ PERLMOD_MAKEVAR_PREFIX = 
+ 
+ #---------------------------------------------------------------------------
  # Configuration options related to the preprocessor   
  #---------------------------------------------------------------------------
***************
*** 756,762 ****
  # omitted =1 is assumed.
  
! PREDEFINED             = QT_VERSION=305
  
! # If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then 
  # this tag can be used to specify a list of macro names that should be expanded. 
  # The macro definition that is found in the sources will be used. 
--- 909,916 ----
  # omitted =1 is assumed.
  
! PREDEFINED             = QT_VERSION=320 \
!                          __cplusplus
  
! # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
  # this tag can be used to specify a list of macro names that should be expanded. 
  # The macro definition that is found in the sources will be used. 
***************
*** 767,772 ****
  # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
  # doxygen's preprocessor will remove all function-like macros that are alone 
! # on a line and do not end with a semicolon. Such function macros are typically 
! # used for boiler-plate code, and will confuse the parser if not removed.
  
  SKIP_FUNCTION_MACROS   = YES
--- 921,927 ----
  # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
  # doxygen's preprocessor will remove all function-like macros that are alone 
! # on a line, have an all uppercase name, and do not end with a semicolon. Such 
! # function macros are typically used for boiler-plate code, and will confuse the 
! # parser if not removed.
  
  SKIP_FUNCTION_MACROS   = YES
***************
*** 776,780 ****
  #---------------------------------------------------------------------------
  
! # The TAGFILES tag can be used to specify one or more tagfiles.
  
  TAGFILES               = 
--- 931,948 ----
  #---------------------------------------------------------------------------
  
! # The TAGFILES option can be used to specify one or more tagfiles. 
! # Optionally an initial location of the external documentation 
! # can be added for each tagfile. The format of a tag file without 
! # this location is as follows: 
! #   TAGFILES = file1 file2 ... 
! # Adding location for the tag files is done as follows: 
! #   TAGFILES = file1=loc1 "file2 = loc2" ... 
! # where "loc1" and "loc2" can be relative or absolute paths or 
! # URLs. If a location is present for each tag, the installdox tool 
! # does not have to be run to correct the links.
! # Note that each tag file must have a unique name
! # (where the name does NOT include the path)
! # If a tag file is not located in the directory in which doxygen 
! # is run, you must also specify the path to the tagfile here.
  
  TAGFILES               = 
***************
*** 807,817 ****
  
  # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
! # generate a inheritance diagram (in Html, RTF and LaTeX) for classes with base or 
  # super classes. Setting the tag to NO turns the diagrams off. Note that this 
! # option is superceded by the HAVE_DOT option below. This is only a fallback. It is 
! # recommended to install and use dot, since it yield more powerful graphs.
  
  CLASS_DIAGRAMS         = YES
  
  # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
  # available from the path. This tool is part of Graphviz, a graph visualization 
--- 975,991 ----
  
  # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
! # generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
  # super classes. Setting the tag to NO turns the diagrams off. Note that this 
! # option is superseded by the HAVE_DOT option below. This is only a fallback. It is 
! # recommended to install and use dot, since it yields more powerful graphs.
  
  CLASS_DIAGRAMS         = YES
  
+ # If set to YES, the inheritance and collaboration graphs will hide 
+ # inheritance and usage relations if the target is undocumented 
+ # or is not a class.
+ 
+ HIDE_UNDOC_RELATIONS   = NO
+ 
  # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
  # available from the path. This tool is part of Graphviz, a graph visualization 
***************
*** 835,838 ****
--- 1009,1018 ----
  COLLABORATION_GRAPH    = YES
  
+ # If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+ # collaboration diagrams in a style similar to the OMG's Unified Modeling 
+ # Language.
+ 
+ UML_LOOK               = NO
+ 
  # If set to YES, the inheritance and collaboration graphs will show the 
  # relations between templates and their instances.
***************
*** 840,849 ****
  TEMPLATE_RELATIONS     = YES
  
- # If set to YES, the inheritance and collaboration graphs will hide 
- # inheritance and usage relations if the target is undocumented 
- # or is not a class.
- 
- HIDE_UNDOC_RELATIONS   = NO
- 
  # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
  # tags are set to YES then doxygen will generate a graph for each documented 
--- 1020,1023 ----
***************
*** 860,867 ****
  INCLUDED_BY_GRAPH      = YES
  
  # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
  # will graphical hierarchy of all classes instead of a textual one.
  
! GRAPHICAL_HIERARCHY    = NO
  
  # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
--- 1034,1049 ----
  INCLUDED_BY_GRAPH      = YES
  
+ # If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+ # generate a call dependency graph for every global function or class method. 
+ # Note that enabling this option will significantly increase the time of a run. 
+ # So in most cases it will be better to enable call graphs for selected 
+ # functions only using the \callgraph command.
+ 
+ CALL_GRAPH             = NO
+ 
  # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
  # will graphical hierarchy of all classes instead of a textual one.
  
! GRAPHICAL_HIERARCHY    = YES
  
  # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
***************
*** 898,901 ****
--- 1080,1094 ----
  MAX_DOT_GRAPH_HEIGHT   = 1024
  
+ # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+ # graphs generated by dot. A depth value of 3 means that only nodes reachable 
+ # from the root by following a path via at most 3 edges will be shown. Nodes that 
+ # lay further from the root node will be omitted. Note that setting this option to 
+ # 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
+ # note that a graph may be further truncated if the graph's image dimensions are 
+ # not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
+ # If 0 is used for the depth value (the default), the graph is not depth-constrained.
+ 
+ MAX_DOT_GRAPH_DEPTH    = 0
+ 
  # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
  # generate a legend page explaining the meaning of the various boxes and 
***************
*** 905,909 ****
  
  # If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
! # remove the intermedate dot files that are used to generate 
  # the various graphs.
  
--- 1098,1102 ----
  
  # If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
! # remove the intermediate dot files that are used to generate 
  # the various graphs.
  
***************
*** 918,954 ****
  
  SEARCHENGINE           = NO
- 
- # The CGI_NAME tag should be the name of the CGI script that 
- # starts the search engine (doxysearch) with the correct parameters. 
- # A script with this name will be generated by doxygen.
- 
- CGI_NAME               = 
- 
- # The CGI_URL tag should be the absolute URL to the directory where the 
- # cgi binaries are located. See the documentation of your http daemon for 
- # details.
- 
- CGI_URL                = 
- 
- # The DOC_URL tag should be the absolute URL to the directory where the 
- # documentation is located. If left blank the absolute path to the 
- # documentation, with file:// prepended to it, will be used.
- 
- DOC_URL                = 
- 
- # The DOC_ABSPATH tag should be the absolute path to the directory where the 
- # documentation is located. If left blank the directory on the local machine 
- # will be used.
- 
- DOC_ABSPATH            = 
- 
- # The BIN_ABSPATH tag must point to the directory where the doxysearch binary 
- # is installed.
- 
- BIN_ABSPATH            = 
- 
- # The EXT_DOC_PATHS tag can be used to specify one or more paths to 
- # documentation generated for other projects. This allows doxysearch to search 
- # the documentation for these projects as well.
- 
- EXT_DOC_PATHS          = 
--- 1111,1112 ----

Index: Makefile.common
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/admin/Makefile.common,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.common	8 May 2003 19:09:27 -0000	1.3
--- Makefile.common	7 Jul 2004 15:54:48 -0000	1.4
***************
*** 7,11 ****
  SHELL=/bin/sh
  
! cvs dist cvs-clean configure.in configure.files subdirs package-messages package-merge:
  	@admindir=$(admindir); \
  	if test "x$$admindir" = x; then \
--- 7,11 ----
  SHELL=/bin/sh
  
! cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4:
  	@admindir=$(admindir); \
  	if test "x$$admindir" = x; then \
***************
*** 24,31 ****
  		MAKE="$(MAKE)" POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \
  	  	$(SHELL) $$admindir/cvs.sh package-merge ;\
! 	else MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\
  	fi
  
! configure.in: configure.files $(shell test -f configure.files && cat configure.files) subdirs
  configure.files: subdirs
  
--- 24,32 ----
  		MAKE="$(MAKE)" POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \
  	  	$(SHELL) $$admindir/cvs.sh package-merge ;\
! 	else \
! 		MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\
  	fi
  
! configure.in: configure.files subdirs
  configure.files: subdirs
  

Index: cvs.sh
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/admin/cvs.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cvs.sh	8 May 2003 19:09:27 -0000	1.2
--- cvs.sh	7 Jul 2004 15:54:48 -0000	1.3
***************
*** 15,19 ****
      \\\\\\n    || mv \\\$CONFIG_STATUS.bak \\\$CONFIG_STATUS\
      \\n  rm -f \\\$CONFIG_STATUS.bak\\nfi\
!     \\n\" if /^\\s*chmod\\s+.*\\+x\\s+.*CONFIG_STATUS/;" configure
    fi
  }
--- 15,19 ----
      \\\\\\n    || mv \\\$CONFIG_STATUS.bak \\\$CONFIG_STATUS\
      \\n  rm -f \\\$CONFIG_STATUS.bak\\nfi\
!     \\n\" if /^\\s*chmod\\s+.*\\+x\\s+.*CONFIG_STATUS/; s,^#line.*LINENO.*\$,/* \$& */, ;" configure
    fi
  }
***************
*** 28,32 ****
  check_autotool_versions()
  {
! AUTOCONF_VERSION=`$AUTOCONF --version | head -1`
  case $AUTOCONF_VERSION in
    Autoconf*2.5* | autoconf*2.5* ) : ;;
--- 28,32 ----
  check_autotool_versions()
  {
! AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
  case $AUTOCONF_VERSION in
    Autoconf*2.5* | autoconf*2.5* ) : ;;
***************
*** 43,47 ****
  esac
   
! AUTOHEADER_VERSION=`$AUTOHEADER --version | head -1`
  case $AUTOHEADER_VERSION in
    Autoconf*2.5* | autoheader*2.5* ) : ;;
--- 43,47 ----
  esac
   
! AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
  case $AUTOHEADER_VERSION in
    Autoconf*2.5* | autoheader*2.5* ) : ;;
***************
*** 58,62 ****
  esac
  
! AUTOMAKE_STRING=`$AUTOMAKE --version | head -1`
  case $AUTOMAKE_STRING in
    automake*1.5d* | automake*1.5* | automake*1.5-* )
--- 58,62 ----
  esac
  
! AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
  case $AUTOMAKE_STRING in
    automake*1.5d* | automake*1.5* | automake*1.5-* )
***************
*** 65,69 ****
      exit 1
      ;;
!   automake*1.6.* | automake*1.7* ) : ;;
    "" )
      echo "*** AUTOMAKE NOT FOUND!."
--- 65,69 ----
      exit 1
      ;;
!   automake*1.6.* | automake*1.7* | automake*1.8.* ) : ;;
    "" )
      echo "*** AUTOMAKE NOT FOUND!."
***************
*** 100,110 ****
  ### with a little thought.
  if test -r configure.in.in; then
!   rm -f subdirs configure.in
!   echo "*** Creating list of subdirectories"
!   subdirs
!   echo "*** Creating configure.in"
!   configure_files
!   strip_makefile
!   $MAKE -f $makefile_wo top_srcdir=. ./configure.in || exit 1
  fi
  
--- 100,120 ----
  ### with a little thought.
  if test -r configure.in.in; then
!     rm -f configure.in
!     echo "*** Creating list of subdirectories"
!     create_subdirs
! 
!     if test -r Makefile.am.in; then
!         echo "*** Creating Makefile.am"
!         if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then 
!             strip_makefile
!             $MAKE -f $makefile_wo top_srcdir=. ./Makefile.am || exit 1
!         else
!             Makefile_am
!         fi
!      fi
!      echo "*** Creating configure.in"
!      configure_files
!      strip_makefile
!      $MAKE -f $makefile_wo top_srcdir=. ./configure.in || exit 1
  fi
  
***************
*** 151,155 ****
  fi
  if test -r configure.in.in; then
!   subdirs
    configure_files
    strip_makefile
--- 161,166 ----
  fi
  if test -r configure.in.in; then
!   create_subdirs
!   Makefile_am
    configure_files
    strip_makefile
***************
*** 187,193 ****
  $ACLOCAL
  $AUTOHEADER
! $AUTOMAKE --foreign --include-deps
  perl -w ../admin/am_edit
  call_and_fix_autoconf
  }
  
--- 198,205 ----
  $ACLOCAL
  $AUTOHEADER
! $AUTOMAKE
  perl -w ../admin/am_edit
  call_and_fix_autoconf
+ touch stamp-h.in
  }
  
***************
*** 206,236 ****
    done
  fi
! mfs=`find . -type d -print | fgrep -v "/." | \
!      sed -e "s#\./##" -e "/^debian/d" | sort`
! for i in $mfs; do
!   topleveldir=`echo $i| sed -e "s#/.*##"`
    if test -f $topleveldir/configure.in; then
  	continue
    fi
!   if test -f $i/Makefile.am; then :; else
! 	continue
!   fi
!   if test -s inst-apps; then
!     if grep "\"^$topleveldir\"" inst-apps > /dev/null 2>&1; then
  	continue
-     fi
-   fi
-   if test "$i" = "."; then
-      echo "AC_CONFIG_FILES([ Makefile ])" >> configure.in.new
-   else
-      echo "AC_CONFIG_FILES([ $i/Makefile ])" >> configure.in.new
-   fi
-   if test -n "$UNSERMAKE"; then
-       if test "$i" = "."; then
-         echo "AC_CONFIG_FILES([ Makefile.rules ])" >> configure.in.new
-       else
-         echo "AC_CONFIG_FILES([ $i/Makefile.rules ])" >> configure.in.new
-       fi
    fi
  done
  
--- 218,256 ----
    done
  fi
! 
! echo "AC_CONFIG_FILES([ Makefile ])" >> configure.in.new
! if test -n "$UNSERMAKE"; then
!   echo "AC_CONFIG_FILES([ Makefile.rules ])" >> configure.in.new
!   echo "AC_CONFIG_FILES([ Makefile.calls ])" >> configure.in.new
! fi
! 
! if test -f inst-apps; then
!     topleveldirs=`cat inst-apps`
! else
!     topleveldirs=
!     for dir in `ls -1d * | sort`; do
! 	if test "$dir" != "debian" && test -d $dir; then
! 	    topleveldirs="$topleveldirs $dir"
! 	fi
!     done
! fi
! 
! for topleveldir in $topleveldirs; do 
    if test -f $topleveldir/configure.in; then
  	continue
    fi
!   if test -f $topleveldir/Makefile.am; then :; else
  	continue
    fi
+ 
+   mfs=`find $topleveldir -name Makefile.am -print | fgrep -v "/." | \
+        sed -e 's#\./##; s#/Makefile.am$##' | sort | sed -e 's#$#/Makefile#'`
+   for i in $mfs; do
+      echo "AC_CONFIG_FILES([ $i ])" >> configure.in.new
+      if test -n "$UNSERMAKE"; then
+         echo "AC_CONFIG_FILES([ $i.rules ])" >> configure.in.new
+ 	echo "AC_CONFIG_FILES([ $i.calls ])" >> configure.in.new
+      fi
+   done
  done
  
***************
*** 251,258 ****
  modulename=
  if test -f configure.in.in; then
!    if head -2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
        kde_use_qt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
     fi
!    if head -2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
        line=`grep "^AM_INIT_AUTOMAKE(" configure.in.in`
        if test -n "$line"; then
--- 271,278 ----
  modulename=
  if test -f configure.in.in; then
!    if head -n 2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
        kde_use_qt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
     fi
!    if head -n 2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
        line=`grep "^AM_INIT_AUTOMAKE(" configure.in.in`
        if test -n "$line"; then
***************
*** 294,302 ****
  rm -f configure.files
  touch configure.files
! if test -f configure.in.in && head -2 configure.in.in | grep "^#MIN_CONFIG" > /dev/null; then
  	echo $admindir/configure.in.min >> configure.files
  fi
  test -f configure.in.in && echo configure.in.in >> configure.files
! list=`find . -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | sort`
  for i in $list; do if test -f $i && test `dirname $i` != "." ; then
    echo $i >> configure.files
--- 314,333 ----
  rm -f configure.files
  touch configure.files
! if test -f configure.in.in && head -n 2 configure.in.in | grep "^#MIN_CONFIG" > /dev/null; then
  	echo $admindir/configure.in.min >> configure.files
  fi
  test -f configure.in.in && echo configure.in.in >> configure.files
! # we collect files in the subdirs and do some sorting tricks, so subsubdirs come after subdirs
! if test -f inst-apps; then
!    inst=`cat inst-apps`
!    list=""
!    for i in $inst; do
!       list="$list `find $i/ -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \
! 		sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`"
!    done
! else
!    list=`find . -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \
! 		sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`
! fi
  for i in $list; do if test -f $i && test `dirname $i` != "." ; then
    echo $i >> configure.files
***************
*** 306,315 ****
  }
  
  subdirs()
  {
  dirs=
! compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head -1`
! compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -1`
! for i in `ls -1`; do
      if test -f $i/Makefile.am; then
         case " $compilefirst $compilelast " in
--- 337,377 ----
  }
  
+ create_subdirs()
+ {
+ if grep '\$(top_srcdir)/subdirs:' $makefile_am >/dev/null; then 
+     # as many modules contain rules to create subdirs without any
+     # dependencies make won't create it unless there is no file.
+     # so we check if that's a dummy rule or one that works
+     rm -f subdirs.cvs.sh.$$
+     if test -f subdirs; then
+ 	mv subdirs subdirs.cvs.sh.$$
+     fi
+     strip_makefile
+     $MAKE -f $makefile_wo top_srcdir=. ./subdirs || exit 1
+     if test -f subdirs.cvs.sh.$$; then
+ 	if test -s subdirs; then
+ 	    rm subdirs.cvs.sh.$$ 
+ 	else
+ 	    mv subdirs.cvs.sh.$$ subdirs
+ 	fi
+     fi
+ else
+     subdirs
+ fi
+ }
+ 
  subdirs()
  {
  dirs=
! idirs=
! if test -f inst-apps; then
!    idirs=`cat inst-apps`
! else
!    idirs=`ls -1 | sort`
! fi
! 
! compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head -n 1`
! compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -n 1`
! for i in $idirs; do
      if test -f $i/Makefile.am; then
         case " $compilefirst $compilelast " in
***************
*** 327,335 ****
  
  (for d in $dirs; do 
!    list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -1`
     for s in $list; do
     ...
 
[truncated message content]