diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | krusader.kdevprj | 4 | ||||
| -rw-r--r-- | krusader/MountMan/kmountman.cpp | 8 | ||||
| -rw-r--r-- | krusader/Panel/krdetailedview.h | 2 | ||||
| -rw-r--r-- | krusader/Panel/listpanel.cpp | 3 |
7 files changed, 13 insertions, 12 deletions
@@ -5,6 +5,7 @@ ADDED: move to next-gen view (at last) TODO: dragn'drop quirky. TODO: add progressbar to totals (?) + TODO: COMPAREMODE FIXED: popup-menu poping out of place. FIXED: Panel & PanelFunc permission clean up. @@ -13,6 +14,7 @@ FIXED: integrated the openUrl() API. FIXED: minor bug in mountman FIXED: bug in arc_vfs, concerning full-paths in tars (thanks Heiner) + FIXED: right align size column REMOVED: Tree & Quickview panels. diff --git a/aclocal.m4 b/aclocal.m4 index 25a33d4a2..5752151ef 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -10632,8 +10632,8 @@ AC_OUTPUT_COMMANDS([ test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do case "$mf" in - Makefile) dirpart=.;; - */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; + Makefile|GNUmakefile) dirpart=.;; + */Makefile|*/GNUmakefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; *) continue;; esac grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue diff --git a/configure.in b/configure.in index 77d17b038..1d74b8b2a 100644 --- a/configure.in +++ b/configure.in @@ -75,8 +75,8 @@ AC_CONFIG_FILES([ krusader/Makefile ]) AC_CONFIG_FILES([ krusader/BookMan/Makefile ]) AC_CONFIG_FILES([ krusader/Dialogs/Makefile ]) AC_CONFIG_FILES([ krusader/GUI/Makefile ]) -AC_CONFIG_FILES([ krusader/Konfigurator/Makefile ]) AC_CONFIG_FILES([ krusader/KViewer/Makefile ]) +AC_CONFIG_FILES([ krusader/Konfigurator/Makefile ]) AC_CONFIG_FILES([ krusader/MountMan/Makefile ]) AC_CONFIG_FILES([ krusader/Panel/Makefile ]) AC_CONFIG_FILES([ krusader/RemoteMan/Makefile ]) diff --git a/krusader.kdevprj b/krusader.kdevprj index 7b727b14f..bcccad611 100644 --- a/krusader.kdevprj +++ b/krusader.kdevprj @@ -21,9 +21,9 @@ addcxxflags=-DKDE_NO_COMPAT -DQT_NO_ASCII_CAST bin_program=krusader cflags=-DKDE_NO_COMPAT cppflags=-DKDE_NO_COMPAT -cxxflags=\s-O0 -g3 -Wall +cxxflags=\s-O0 -g3 -Wall -Werror ldadd=VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a -lm $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -ldflags=\s \s +ldflags=\s \s [General] AMChanged=false diff --git a/krusader/MountMan/kmountman.cpp b/krusader/MountMan/kmountman.cpp index c258ef49e..8a7db678a 100644 --- a/krusader/MountMan/kmountman.cpp +++ b/krusader/MountMan/kmountman.cpp @@ -102,6 +102,7 @@ QString KMountMan::nextWord(QString &s) { } QString temp=s.left(j); // find the leftmost word. s.remove(0,j); + return temp; } @@ -418,7 +419,7 @@ void KMountMan::parseDfData(QString filename) { "] has a different type from what's stated in /etc/fstab." << endl; loc->setType(temp); // DF knows best } -#endif +#endif temp=nextWord(s,' '); loc->setTotalBlks(temp.toLong()); temp=nextWord(s,' '); @@ -595,7 +596,7 @@ bool KMountMan::ejectable(QString path) { if (it->mntPoint()==path && (it->type()=="iso9660" || followLink(it->name()).left(2)=="cd")) return true; -#endif +#endif return false; } @@ -645,7 +646,7 @@ void statsCollector::parseDf(QString filename, fsData *data) { s = t.readLine(); // this is the important one! #ifndef BSD data->setName(KMountMan::nextWord(s,' ')); -#endif +#endif data->setType(KMountMan::nextWord(s,' ')); data->setTotalBlks( KMountMan::nextWord(s,' ').toLong() ); data->setUsedBlks( KMountMan::nextWord(s,' ').toLong() ); @@ -710,4 +711,3 @@ QString KMountMan::convertSize( unsigned long size ) } #include "kmountman.moc" - diff --git a/krusader/Panel/krdetailedview.h b/krusader/Panel/krdetailedview.h index 91d327f8c..86ff1eff8 100644 --- a/krusader/Panel/krdetailedview.h +++ b/krusader/Panel/krdetailedview.h @@ -78,7 +78,7 @@ public: QString itemToFilename(QListViewItem *it) { return dynamic_cast<KrViewItem*>(it)->name(); }//remove ///////////////////////// todo /////////////////////////////////// - virtual void setFilter(FilterSpec filter) {} +// virtual void setFilter(FilterSpec filter) {} signals: void executed(QString &name); diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp index eb38b0f6b..dd6e7bb8b 100644 --- a/krusader/Panel/listpanel.cpp +++ b/krusader/Panel/listpanel.cpp @@ -79,7 +79,7 @@ typedef QValueList<KServiceOffer> OfferList; // The list panel constructor // ///////////////////////////////////////////////////// ListPanel::ListPanel(QWidget *parent, const char *name ) : - QWidget(parent, name), colorMask(255), currDragItem(0), compareMode(false), statsAgent(0) { + QWidget(parent, name), colorMask(255), compareMode(false), currDragItem(0), statsAgent(0) { func = new ListPanelFunc(this); setAcceptDrops(true); @@ -460,7 +460,6 @@ void ListPanel::popRightClickMenu(const QPoint &loc) { #define SERVICE_LIST_ID 200 ////////////////////////////////////////////////////////// bool multipleSelections=false; - QListViewItem *iterator; // a quick hack to check if we've got more that one file selected KrViewItemList items; view->getSelectedKrViewItems(&items); |