Fix build on 4.x

Reported by:	kris

10 files changed, 114 insertions, 0 deletions

diff --git a/devel/kdesvn-kde4/files/patch-src-commandline_part.cpp b/devel/kdesvn-kde4/files/patch-src-commandline_part.cpp
new file mode 100644
index 000000000000..6efe57ed3d8f
--- /dev/null
+++ b/devel/kdesvn-kde4/files/patch-src-commandline_part.cpp
@@ -0,0 +1,11 @@
+--- src/commandline_part.cpp.orig	Sat Apr 29 01:22:18 2006
++++ src/commandline_part.cpp	Sat Apr 29 01:22:57 2006
+@@ -33,7 +33,7 @@
+         KStandardDirs::kde_default("data")+ QString::fromLatin1( inst->instanceName() ) + '/' );
+ 
+ 
+-    m_pCPart = new CommandExec(this,name?QString(name)+QString("_exec"):"command_executer",args);
++    m_pCPart = new CommandExec(this,name?QString(name)+QString("_exec"):QString::fromLatin1("command_executer"),args);
+ }
+ 
+ commandline_part::~commandline_part()
diff --git a/devel/kdesvn-kde4/files/patch-src-svnfrontend-importdir_logmsg.cpp b/devel/kdesvn-kde4/files/patch-src-svnfrontend-importdir_logmsg.cpp
new file mode 100644
index 000000000000..7310b88a3753
--- /dev/null
+++ b/devel/kdesvn-kde4/files/patch-src-svnfrontend-importdir_logmsg.cpp
@@ -0,0 +1,11 @@
+--- src/svnfrontend/importdir_logmsg.cpp.orig	Fri Apr 28 15:15:33 2006
++++ src/svnfrontend/importdir_logmsg.cpp	Fri Apr 28 15:16:21 2006
+@@ -43,7 +43,7 @@
+ 
+ void Importdir_logmsg::createDirboxDir(const QString & which)
+ {
+-    m_createDirBox->setText(i18n("Create subdir %1 on import").arg(which.isEmpty()?"(Last part)":which));
++    m_createDirBox->setText(i18n("Create subdir %1 on import").arg(which.isEmpty()?i18n("(Last part)"):which));
+ }
+ 
+ #include "importdir_logmsg.moc"
diff --git a/devel/kdesvn-kde4/files/patch-src-svnqt-dirent.cpp b/devel/kdesvn-kde4/files/patch-src-svnqt-dirent.cpp
new file mode 100644
index 000000000000..d114b8547847
--- /dev/null
+++ b/devel/kdesvn-kde4/files/patch-src-svnqt-dirent.cpp
@@ -0,0 +1,11 @@
+--- src/svnqt/dirent.cpp.orig	Fri Apr 28 16:50:10 2006
++++ src/svnqt/dirent.cpp	Fri Apr 28 16:50:28 2006
+@@ -54,7 +54,7 @@
+         hasProps (dirEntry->has_props != 0),
+         createdRev (dirEntry->created_rev), time (dirEntry->time), m_Lock()
+     {
+-      lastAuthor = dirEntry->last_author == 0 ? "" : QString::fromUtf8(dirEntry->last_author);
++      lastAuthor = dirEntry->last_author == 0 ? QString::fromLatin1("") : QString::fromUtf8(dirEntry->last_author);
+     }
+ 
+     Data (const DirEntry & src)
diff --git a/devel/kdesvn-kde4/files/patch-src-svnqt-log_entry.cpp b/devel/kdesvn-kde4/files/patch-src-svnqt-log_entry.cpp
new file mode 100644
index 000000000000..897ebbb1fc96
--- /dev/null
+++ b/devel/kdesvn-kde4/files/patch-src-svnqt-log_entry.cpp
@@ -0,0 +1,13 @@
+--- src/svnqt/log_entry.cpp.orig	Sat Apr 29 00:36:34 2006
++++ src/svnqt/log_entry.cpp	Sat Apr 29 00:37:18 2006
+@@ -93,8 +93,8 @@
+     }
+ 
+     revision = revision_;
+-    author = author_ == 0 ? "" : QString::fromUtf8(author_);
+-    message = message_ == 0 ? "" : QString::fromUtf8(message_);
++    author = author_ == 0 ? QString::fromLatin1("") : QString::fromUtf8(author_);
++    message = message_ == 0 ? QString::fromLatin1("") : QString::fromUtf8(message_);
+   }
+ }
+ 
diff --git a/devel/kdesvn-kde4/files/patch-src-svnqt-wc.cpp b/devel/kdesvn-kde4/files/patch-src-svnqt-wc.cpp
new file mode 100644
index 000000000000..366cc796a2cb
--- /dev/null
+++ b/devel/kdesvn-kde4/files/patch-src-svnqt-wc.cpp
@@ -0,0 +1,11 @@
+--- src/svnqt/wc.cpp.orig	Sat Apr 29 00:58:38 2006
++++ src/svnqt/wc.cpp	Sat Apr 29 00:59:21 2006
+@@ -96,7 +96,7 @@
+     if (error!=0) {
+         throw ClientException(error);
+     }
+-    result = entry?QString::fromUtf8(entry->url):"";
++    result = entry ? QString::fromUtf8(entry->url) : QString::fromLatin1("");
+ 
+     return result;
+   }
diff --git a/devel/kdesvn/files/patch-src-commandline_part.cpp b/devel/kdesvn/files/patch-src-commandline_part.cpp
new file mode 100644
index 000000000000..6efe57ed3d8f
--- /dev/null
+++ b/devel/kdesvn/files/patch-src-commandline_part.cpp
@@ -0,0 +1,11 @@
+--- src/commandline_part.cpp.orig	Sat Apr 29 01:22:18 2006
++++ src/commandline_part.cpp	Sat Apr 29 01:22:57 2006
+@@ -33,7 +33,7 @@
+         KStandardDirs::kde_default("data")+ QString::fromLatin1( inst->instanceName() ) + '/' );
+ 
+ 
+-    m_pCPart = new CommandExec(this,name?QString(name)+QString("_exec"):"command_executer",args);
++    m_pCPart = new CommandExec(this,name?QString(name)+QString("_exec"):QString::fromLatin1("command_executer"),args);
+ }
+ 
+ commandline_part::~commandline_part()
diff --git a/devel/kdesvn/files/patch-src-svnfrontend-importdir_logmsg.cpp b/devel/kdesvn/files/patch-src-svnfrontend-importdir_logmsg.cpp
new file mode 100644
index 000000000000..7310b88a3753
--- /dev/null
+++ b/devel/kdesvn/files/patch-src-svnfrontend-importdir_logmsg.cpp
@@ -0,0 +1,11 @@
+--- src/svnfrontend/importdir_logmsg.cpp.orig	Fri Apr 28 15:15:33 2006
++++ src/svnfrontend/importdir_logmsg.cpp	Fri Apr 28 15:16:21 2006
+@@ -43,7 +43,7 @@
+ 
+ void Importdir_logmsg::createDirboxDir(const QString & which)
+ {
+-    m_createDirBox->setText(i18n("Create subdir %1 on import").arg(which.isEmpty()?"(Last part)":which));
++    m_createDirBox->setText(i18n("Create subdir %1 on import").arg(which.isEmpty()?i18n("(Last part)"):which));
+ }
+ 
+ #include "importdir_logmsg.moc"
diff --git a/devel/kdesvn/files/patch-src-svnqt-dirent.cpp b/devel/kdesvn/files/patch-src-svnqt-dirent.cpp
new file mode 100644
index 000000000000..d114b8547847
--- /dev/null
+++ b/devel/kdesvn/files/patch-src-svnqt-dirent.cpp
@@ -0,0 +1,11 @@
+--- src/svnqt/dirent.cpp.orig	Fri Apr 28 16:50:10 2006
++++ src/svnqt/dirent.cpp	Fri Apr 28 16:50:28 2006
+@@ -54,7 +54,7 @@
+         hasProps (dirEntry->has_props != 0),
+         createdRev (dirEntry->created_rev), time (dirEntry->time), m_Lock()
+     {
+-      lastAuthor = dirEntry->last_author == 0 ? "" : QString::fromUtf8(dirEntry->last_author);
++      lastAuthor = dirEntry->last_author == 0 ? QString::fromLatin1("") : QString::fromUtf8(dirEntry->last_author);
+     }
+ 
+     Data (const DirEntry & src)
diff --git a/devel/kdesvn/files/patch-src-svnqt-log_entry.cpp b/devel/kdesvn/files/patch-src-svnqt-log_entry.cpp
new file mode 100644
index 000000000000..897ebbb1fc96
--- /dev/null
+++ b/devel/kdesvn/files/patch-src-svnqt-log_entry.cpp
@@ -0,0 +1,13 @@
+--- src/svnqt/log_entry.cpp.orig	Sat Apr 29 00:36:34 2006
++++ src/svnqt/log_entry.cpp	Sat Apr 29 00:37:18 2006
+@@ -93,8 +93,8 @@
+     }
+ 
+     revision = revision_;
+-    author = author_ == 0 ? "" : QString::fromUtf8(author_);
+-    message = message_ == 0 ? "" : QString::fromUtf8(message_);
++    author = author_ == 0 ? QString::fromLatin1("") : QString::fromUtf8(author_);
++    message = message_ == 0 ? QString::fromLatin1("") : QString::fromUtf8(message_);
+   }
+ }
+ 
diff --git a/devel/kdesvn/files/patch-src-svnqt-wc.cpp b/devel/kdesvn/files/patch-src-svnqt-wc.cpp
new file mode 100644
index 000000000000..366cc796a2cb
--- /dev/null
+++ b/devel/kdesvn/files/patch-src-svnqt-wc.cpp
@@ -0,0 +1,11 @@
+--- src/svnqt/wc.cpp.orig	Sat Apr 29 00:58:38 2006
++++ src/svnqt/wc.cpp	Sat Apr 29 00:59:21 2006
+@@ -96,7 +96,7 @@
+     if (error!=0) {
+         throw ClientException(error);
+     }
+-    result = entry?QString::fromUtf8(entry->url):"";
++    result = entry ? QString::fromUtf8(entry->url) : QString::fromLatin1("");
+ 
+     return result;
+   }