Use more informative descriptions fro Springer layouts

[lyx.git] / src / support / FileName.cpp

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index 9005558807d1e3be6a1d6a2f5cb70e8f305d506e..1e3cacf172bb6408373b03e0a283f8fa3d116028 100644 (file)
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -95,7 +95,7 @@ struct FileName::Private
                fi.setCaching(fi.exists() ? true : false);
        }
        ///
-       inline void refresh() 
+       inline void refresh()
        {
                fi.refresh();
        }
@@ -283,6 +283,9 @@ bool FileName::changePermission(unsigned long int mode) const
                        << mode << ".");
                return false;
        }
+#else
+       // squash warning
+       (void) mode;
 #endif
        return true;
 }
@@ -545,7 +548,7 @@ unsigned long FileName::checksum() const
        // FIXME: This code is not ready with Qt4.4.2,
        // see http://www.lyx.org/trac/ticket/5293
        // FIXME: should we check if the MapExtension extension is supported?
-       // see QAbstractFileEngine::supportsExtension() and 
+       // see QAbstractFileEngine::supportsExtension() and
        // QAbstractFileEngine::MapExtension)
        QFile qf(fi.filePath());
        if (!qf.open(QIODevice::ReadOnly))
@@ -629,12 +632,12 @@ static bool rmdir(QFileInfo const & fi)
                        continue;
                bool removed;
                if (list.at(i).isDir()) {
-                       LYXERR(Debug::FILES, "Removing dir " 
+                       LYXERR(Debug::FILES, "Removing dir "
                                << fromqstr(list.at(i).absoluteFilePath()));
                        removed = rmdir(list.at(i));
                }
                else {
-                       LYXERR(Debug::FILES, "Removing file " 
+                       LYXERR(Debug::FILES, "Removing file "
                                << fromqstr(list.at(i).absoluteFilePath()));
                        removed = dir.remove(list.at(i).fileName());
                }
@@ -643,7 +646,7 @@ static bool rmdir(QFileInfo const & fi)
                        LYXERR0("Could not delete "
                                << fromqstr(list.at(i).absoluteFilePath()));
                }
-       } 
+       }
        QDir parent = fi.absolutePath();
        success &= parent.rmdir(fi.fileName());
        return success;
@@ -661,30 +664,31 @@ bool FileName::destroyDirectory() const
 
 
 // Only used in non Win32 platforms
+#ifndef Q_OS_WIN32
 static int mymkdir(char const * pathname, unsigned long int mode)
 {
        // FIXME: why don't we have mode_t in lyx::mkdir prototype ??
-#if HAVE_MKDIR
-# if MKDIR_TAKES_ONE_ARG
+# if HAVE_MKDIR
+#  if MKDIR_TAKES_ONE_ARG
        // MinGW32
        return ::mkdir(pathname);
        // FIXME: "Permissions of created directories are ignored on this system."
-# else
+#  else
        // POSIX
        return ::mkdir(pathname, mode_t(mode));
-# endif
-#elif defined(_WIN32)
+#  endif
+# elif defined(_WIN32)
        // plain Windows 32
        return CreateDirectory(pathname, 0) != 0 ? 0 : -1;
        // FIXME: "Permissions of created directories are ignored on this system."
-#elif HAVE__MKDIR
+# elif HAVE__MKDIR
        return ::_mkdir(pathname);
        // FIXME: "Permissions of created directories are ignored on this system."
-#else
+# else
 #   error "Don't know how to create a directory on this system."
-#endif
-
+# endif
 }
+#endif
 
 
 bool FileName::createDirectory(int permission) const
@@ -692,6 +696,7 @@ bool FileName::createDirectory(int permission) const
        LASSERT(!empty(), return false);
 #ifdef Q_OS_WIN32
        // FIXME: "Permissions of created directories are ignored on this system."
+       (void) permission;
        return createPath();
 #else
        return mymkdir(toFilesystemEncoding().c_str(), permission) == 0;
@@ -932,7 +937,7 @@ string DocFileName::mangledFileName(string const & dir) const
        typedef map<string, string> MangledMap;
        static MangledMap mangledNames;
        static Mutex mangledMutex;
-       // this locks both access to mangledNames and counter below 
+       // this locks both access to mangledNames and counter below
        Mutex::Locker lock(&mangledMutex);
        MangledMap::const_iterator const it = mangledNames.find(absFileName());
        if (it != mangledNames.end())