Package: esvn
Version: 0.6.11+1-4
Severity: wishlist
Tags: patch

the upstream website is useless, so i'm posting this here:

first of all, there are a few compile fixes. dunno how it worked so far
...

second, the commit window messes up the recursion, so directories appear
is seemingly random order. i fixed this and made the code more qt (==
cute ;) in one go.

diff -ur esvn-0.6.11+1/.ui/frm_main.ui esvn-0.6.11+1-ossi/.ui/frm_main.ui
--- esvn-0.6.11+1/.ui/frm_main.ui	2005-01-10 08:08:27.000000000 +0100
+++ esvn-0.6.11+1-ossi/.ui/frm_main.ui	2007-07-05 21:40:24.000000000 +0200
@@ -3007,6 +3007,6 @@
 <pixmapinproject/>
 <layoutdefaults spacing="1" margin="1"/>
 <includehints>
-    <includehint>cmd_lineedit.h</includehint>
+    <includehint>src/cmd_lineedit.h</includehint>
 </includehints>
 </UI>
diff -ur esvn-0.6.11+1/src/cmd_lineedit.h esvn-0.6.11+1-ossi/src/cmd_lineedit.h
--- esvn-0.6.11+1/src/cmd_lineedit.h	2004-09-13 20:55:37.000000000 +0200
+++ esvn-0.6.11+1-ossi/src/cmd_lineedit.h	2007-07-05 21:41:50.000000000 +0200
@@ -14,6 +14,9 @@
 *                                                                         *
 ***************************************************************************/
 
+#ifndef CMD_LINEEDIT_H
+#define CMD_LINEEDIT_H
+
 #include <vector>
 
 #include <qlineedit.h>
@@ -37,4 +40,4 @@
 	size_t pos;
 };
 
-
+#endif
diff -ur esvn-0.6.11+1/src/commitwindow.cpp esvn-0.6.11+1-ossi/src/commitwindow.cpp
--- esvn-0.6.11+1/src/commitwindow.cpp	2005-01-27 00:31:37.000000000 +0100
+++ esvn-0.6.11+1-ossi/src/commitwindow.cpp	2007-07-05 22:02:39.000000000 +0200
@@ -6,7 +6,7 @@
 #include <qfileinfo.h>
 #include <qdir.h>
 #include <qpushbutton.h>
-#include <queue>
+#include <qvaluestack.h>
 
 /* 
  *  Constructs a C_CommitWindow which is a child of 'parent', with the 
@@ -76,11 +76,11 @@
 #else
     QString basePath = QDir(path.FullPath()).absPath();
 
-    queue<QDir> Q;
+    QValueStack<QDir> Q;
     Q.push( QDir(path.FullPath()) );
 
     while( !Q.empty() ) {
-        QDir d = Q.front(); Q.pop();
+        QDir d = Q.pop();
         d.setFilter( QDir::Dirs|QDir::Files|QDir::Hidden );
 //         qDebug("Dir: %s", d.path().latin1());
 
@@ -107,13 +107,12 @@
 //             qDebug("%s: check status of %s", d.path().latin1(), i->first.latin1());
             switch( file.getStatus() ) {
             case C_SvnFile::Add:
-//                 qDebug( "%s is added", (localPath + it.current()->fileName()).latin1() );
+//                 qDebug( "%s is added", fi.filePath().latin1() );
                 new QListBoxCheck(files_to_commit, QPixmap::fromMimeSource("FileAdded16x16.xpm"), localPath + i->first, true);
                 break;
             case C_SvnFile::Modify:
-//                 qDebug( "%s is modified", (localPath + it.current()->fileName()).latin1() );
+//                 qDebug( "%s is modified", fi.filePath().latin1() );
                 new QListBoxCheck(files_to_commit, QPixmap::fromMimeSource("FileModified16x16.xpm"), localPath + i->first, true);
-//                 qDebug("modified %s", it.current()->filePath().latin1());
                 break;
             case C_SvnFile::Delete:
                 new QListBoxCheck(files_to_commit, QPixmap::fromMimeSource("FileRemoved16x16.xpm"), localPath + i->first, true);

Reply via email to