File fuse_kio.diff of Package fuse_kio

--- fuse_kio/fuse_kio.cpp
+++ fuse_kio/fuse_kio.cpp
@@ -18,7 +18,9 @@
  ****************************************************************************/
 
 extern "C" {
+#define template fuse_opt_template
 #include <fuse.h>
+#undef template
 }
 
 #include <unistd.h>
@@ -36,14 +38,14 @@
 #include <kdebug.h>
 
 
-static const char *APPNAME = I18N_NOOP("Fuse.KIO");
-static const char *DESCRIPTION = I18N_NOOP("Allows to mount KURLs in a directory");
-static const char *VERSION = "0.1";
+static const char *appname = I18N_NOOP("Fuse.KIO");
+static const char *description = I18N_NOOP("Allows to mount KURLs in a directory");
+static const char *version = "0.1";
 
-static const KAboutData ABOUT_DATA("fuse_kio", APPNAME, VERSION, DESCRIPTION,
+static const KAboutData about_data("fuse_kio", appname, version, description,
                                    KAboutData::License_GPL_V2);
 
-static const KCmdLineOptions OPTIONS[] = {
+static const KCmdLineOptions options[] = {
    {"gateway", I18N_NOOP("Act as gateway"), 0},
    {"nice-mtab", I18N_NOOP("Insert a nice i.e. useful entry into /etc/mtab, requires at least fuse 1.1pre"), 0},
    {"+mount_point", I18N_NOOP("The mount point"), 0},
@@ -111,8 +113,8 @@
    ops.statfs=NULL;
    ops.release=fuse_kio_release;
 
-   KCmdLineArgs::init(argc, argv, &ABOUT_DATA);
-   KCmdLineArgs::addCmdLineOptions(OPTIONS);
+   KCmdLineArgs::init(argc, argv, &about_data);
+   KCmdLineArgs::addCmdLineOptions(options);
    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
    bool args_ok = false;
--- fuse_kio/fuse_kio_ops.h
+++ fuse_kio/fuse_kio_ops.h
@@ -20,7 +20,9 @@
 #ifndef FUSE_KIO_OPS_H
 #define FUSE_KIO_OPS_H
 
+#define template fuse_opt_template
 #include <fuse.h>
+#undef template
 
 int fuse_kio_getattr(const char *path, struct stat *stbuf);
 int fuse_kio_readlink(const char *path, char *buf, size_t size);
--- fusemount_konqplugin/fusemountplugin.cpp
+++ fusemount_konqplugin/fusemountplugin.cpp
@@ -101,7 +101,7 @@
 
    QString mountPath=buildMountPath(url);
    makeDirHier(mountPath);
-   QString mountCommand(QString("fuse_kio %1 %2 &").arg(url.url()).arg(mountPath));
+   QString mountCommand(QString("fuse_kio %2 %1 &").arg(url.url()).arg(mountPath));
    kdDebug()<<"kio_fuse mount command: -"<<mountCommand.latin1()<<"-"<<endl;
    system(mountCommand.latin1());
    KMessageBox::information(0,i18n("<qt>Mounting <b>%1</b><br> under %2.</qt>").arg(url.prettyURL()).arg(mountPath));