Fix template look up. Fix function pointer declaration. Don't compare
enums and strings. Bump revision.


(joerg)

$NetBSD: patch-krusader_Dialogs_checksumdlg.cpp,v 1.1 2012/12/22 02:31:33 joerg Exp $

--- krusader/Dialogs/checksumdlg.cpp.orig	2012-12-22 01:03:14.000000000 +0000
+++ krusader/Dialogs/checksumdlg.cpp
@@ -26,7 +26,7 @@
 class CS_Tool; // forward
 typedef void PREPARE_PROC_FUNC(KProcess& proc, CS_Tool *self, const QStringList& files, 
 	const QString checksumFile, bool recursive, const QString& stdoutFileName, 
-	const QString& stderrFileName,	const QString& type=QString::null);
+	const QString& stderrFileName,	const QString& type);
 typedef QStringList GET_FAILED_FUNC(const QStringList& stdOut, const QStringList& stdErr);
 
 class CS_Tool {

$NetBSD: patch-krusader_Konfigurator_kgstartup.cpp,v 1.1 2012/12/22 02:31:33 joerg Exp $

--- krusader/Konfigurator/kgstartup.cpp.orig	2012-12-22 01:06:09.000000000 +0000
+++ krusader/Konfigurator/kgstartup.cpp
@@ -55,12 +55,14 @@ KgStartup::KgStartup( bool first, QWidge
   QStringList profileList = ProfileManager::availableProfiles( "Panel" );
   profileList.push_front( "<" + i18n( "Last session" ) + ">" );
 
-  KONFIGURATOR_NAME_VALUE_PAIR comboItems[ profileList.count() ];
+  KONFIGURATOR_NAME_VALUE_PAIR *comboItems = new KONFIGURATOR_NAME_VALUE_PAIR[ profileList.count() ];
   for(unsigned int i=0; i != profileList.count(); i++ )
     comboItems[ i ].text = comboItems[ i ].value = profileList [ i ];    
   comboItems[ 0 ].value = "";
 
   profileCombo = createComboBox( "Startup", "Starter Profile Name", comboItems[ 0 ].value, comboItems, profileList.count(), panelsGrp, false, false );
+  delete[] comboItems;
+
   profileCombo->setSizePolicy(  QSizePolicy::Expanding, QSizePolicy::Fixed);
   panelsGrid->addWidget( profileCombo, 0, 1 );
 

$NetBSD: patch-krusader_Panel_krview.h,v 1.1 2012/12/22 02:31:33 joerg Exp $

--- krusader/Panel/krview.h.orig	2012-12-22 01:12:56.000000000 +0000
+++ krusader/Panel/krview.h
@@ -133,6 +133,8 @@ protected:
  */ 
 class KrView {
 friend class KrViewItem;
+friend class KrDetailedViewItem;
+friend class KrBriefViewItem;
 public:
   // instantiating a new view
   // 1. new KrView

$NetBSD: patch-krusader_UserAction_tstring.h,v 1.1 2012/12/22 02:31:33 joerg Exp $

--- krusader/UserAction/tstring.h.orig	2012-12-22 01:27:56.000000000 +0000
+++ krusader/UserAction/tstring.h
@@ -98,7 +98,7 @@ TagString_t<T>& TagString_t<T>::operator
 	str+=s.str;
 	const unsigned disp=length();
 	for(typename taglist::const_iterator it=s.tags.begin(),end=s.tags.end();it!=end;++it) {
-		tags.push_back(make_pair((*it).first+disp,(*it).second));
+		tags.push_back(std::make_pair((*it).first+disp,(*it).second));
 	}
 	return *this;
 }
@@ -107,7 +107,7 @@ template <class T>
 void TagString_t<T>::insertTag(uint pos,const T& t)
 {
 	assert(pos<=length());
-	tags.push_back(make_pair(pos,t));
+	tags.push_back(std::make_pair(pos,t));
 }
 
 #endif

$NetBSD: patch-krusader_VFS_temp__vfs.cpp,v 1.1 2012/12/22 02:31:33 joerg Exp $

--- krusader/VFS/temp_vfs.cpp.orig	2012-12-22 01:32:42.000000000 +0000
+++ krusader/VFS/temp_vfs.cpp
@@ -40,8 +40,8 @@
 #include "../resources.h"
 #include "../krservices.h"
 
-temp_vfs::temp_vfs( QString origin, QString type, QWidget* panel, bool ):
-          normal_vfs(panel){
+temp_vfs::temp_vfs( QString origin, QString type_, QWidget* panel, bool ):
+          normal_vfs(panel), type(type_){
   vfs_type=TEMP;
    // first we need to create a temp diretory
   tmpDir = krApp->getTempDir();
@@ -56,7 +56,7 @@ temp_vfs::temp_vfs( QString origin, QStr
 }
 
 temp_vfs::~temp_vfs(){
-	if( vfs_type == "-iso" ){
+	if( type == "-iso" ){
 		// unmount the ISO image
     KShellProcess umount;
 		umount << "umount -f" << tmpDir;

$NetBSD: patch-krusader_VFS_temp__vfs.h,v 1.1 2012/12/22 02:31:33 joerg Exp $

--- krusader/VFS/temp_vfs.h.orig	2012-12-22 01:45:21.000000000 +0000
+++ krusader/VFS/temp_vfs.h
@@ -52,6 +52,8 @@ protected:
 	void handleIso(QString origin);
   QString tmpDir;
 
+private:
+	QString type;
 };
 
 #endif