[Piklab-svn] SF.net SVN: piklab:[2913] trunk/piklab_kde4/src/common

[<az...@us...>]

Revision: 2913
          http://piklab.svn.sourceforge.net/piklab/?rev=2913&view=rev
Author:   azhyd
Date:     2012-06-10 18:27:31 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
fix for qt-only

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/global/pfile.cpp
    trunk/piklab_kde4/src/common/kde/kde_pfile.cpp
    trunk/piklab_kde4/src/common/kde/kde_purl.cpp
    trunk/piklab_kde4/src/common/nokde/nokde_pfile.cpp
    trunk/piklab_kde4/src/common/nokde/nokde_purl.cpp

Modified: trunk/piklab_kde4/src/common/global/pfile.cpp
===================================================================
--- trunk/piklab_kde4/src/common/global/pfile.cpp	2012-06-10 00:58:40 UTC (rev 2912)
+++ trunk/piklab_kde4/src/common/global/pfile.cpp	2012-06-10 18:27:31 UTC (rev 2913)
@@ -94,3 +94,42 @@
   close();
   _url = url;
 }
+
+//-----------------------------------------------------------------------------
+PURL::TempFile::TempFile(Log::Generic &log, const QString &extension)
+: FileBase(log, extension)
+{}
+
+PURL::Url PURL::TempFile::url() const
+{
+  return (_tmp.get() != NULL ? fromPathOrUrl(_tmp->name(), false) : Url());
+}
+
+bool PURL::TempFile::close()
+{
+  _stream.reset(NULL);
+  if (_tmp.get() != NULL) {
+    _tmp->close();
+  }
+  return true;
+}
+
+bool PURL::TempFile::openForWrite()
+{
+  close();
+  _tmp.reset(new KTemporaryFile);
+#if defined(NO_KDE)
+  _tmp->setFileTemplate(QLatin1String("XXXXXX") + _extension);
+  _tmp->setAutoRemove(true);
+#else
+  if (!_extension.isEmpty()) {
+    _tmp->setSuffix("." + _extension);
+  }
+#endif
+  if (!_tmp->open()) {
+    _error = i18n("Could not create temporary file.");
+    _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
+    return false;
+  }
+  return true;
+}

Modified: trunk/piklab_kde4/src/common/kde/kde_pfile.cpp
===================================================================
--- trunk/piklab_kde4/src/common/kde/kde_pfile.cpp	2012-06-10 00:58:40 UTC (rev 2912)
+++ trunk/piklab_kde4/src/common/kde/kde_pfile.cpp	2012-06-10 18:27:31 UTC (rev 2913)
@@ -74,37 +74,3 @@
   if ( !_url.isEmpty() ) return _url.del(_log);
   return false;
 }
-
-//-----------------------------------------------------------------------------
-PURL::TempFile::TempFile(Log::Generic &log, const QString &extension)
-  : FileBase(log, extension)
-{}
-
-PURL::Url PURL::TempFile::url() const
-{
-  return (_tmp.get() != NULL ? fromPathOrUrl(_tmp->name(), false) : Url());
-}
-
-bool PURL::TempFile::close()
-{
-  _stream.reset(NULL);
-  if (_tmp.get() != NULL) {
-    _tmp->close();
-  }
-  return true;
-}
-
-bool PURL::TempFile::openForWrite()
-{
-  close();
-  _tmp.reset(new KTemporaryFile);
-  if (!_extension.isEmpty()) {
-    _tmp->setSuffix("." + _extension);
-  }
-  if (!_tmp->open()) {
-    _error = i18n("Could not create temporary file.");
-    _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
-    return false;
-  }
-  return true;
-}

Modified: trunk/piklab_kde4/src/common/kde/kde_purl.cpp
===================================================================
--- trunk/piklab_kde4/src/common/kde/kde_purl.cpp	2012-06-10 00:58:40 UTC (rev 2912)
+++ trunk/piklab_kde4/src/common/kde/kde_purl.cpp	2012-06-10 18:27:31 UTC (rev 2913)
@@ -25,7 +25,7 @@
 
 bool PURL::Url::create(Log::Generic &log) const
 {
-  // assume file do no exist if ioslave cannot tell...
+  // assume file does not exist if ioslave cannot tell...
   if ( KIO::NetAccess::exists(_url, KIO::NetAccess::DestinationSide, qApp->mainWidget()) ) return false;
   KTemporaryFile tmp;
   if (!tmp.open()) return false;

Modified: trunk/piklab_kde4/src/common/nokde/nokde_pfile.cpp
===================================================================
--- trunk/piklab_kde4/src/common/nokde/nokde_pfile.cpp	2012-06-10 00:58:40 UTC (rev 2912)
+++ trunk/piklab_kde4/src/common/nokde/nokde_pfile.cpp	2012-06-10 18:27:31 UTC (rev 2913)
@@ -45,41 +45,3 @@
 {
   return _file->remove();
 }
-
-//-----------------------------------------------------------------------------
-PURL::TempFile::TempFile(Log::Generic &log, const QString &extension)
-  : FileBase(log, extension)
-{}
-
-PURL::Url PURL::TempFile::url() const
-{
-  return (_tmp.get() != NULL ? fromPathOrUrl(_tmp->name(), false) : Url());
-}
-
-bool PURL::TempFile::close()
-{
-  _stream.reset(NULL);
-  if (_tmp.get() != NULL) {
-    _tmp->close();
-    if ( _tmp->status()!=IO_Ok ) {
-      _error = i18n("Could not write to temporary file.");
-      _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
-      return false;
-    }
-  }
-  return true;
-}
-
-bool PURL::TempFile::openForWrite()
-{
-  close();
-  _tmp.reset(new QTemporaryFile);
-   _tmp->setFileTemplate(QLatin1String("XXXXXX") + _extension);
-  _tmp->setAutoRemove(true);
-  if ( _tmp->status()!=0 ) {
-    _error = i18n("Could not create temporary file.");
-    _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
-    return false;
-  }
-  return true;
-}

Modified: trunk/piklab_kde4/src/common/nokde/nokde_purl.cpp
===================================================================
--- trunk/piklab_kde4/src/common/nokde/nokde_purl.cpp	2012-06-10 00:58:40 UTC (rev 2912)
+++ trunk/piklab_kde4/src/common/nokde/nokde_purl.cpp	2012-06-10 18:27:31 UTC (rev 2913)
@@ -35,7 +35,7 @@
   // do not overwrite
   QFile file(filepath());
   if (file.exists()) {
-    return true;
+    return false;
   }
   bool ok = file.open(QIODevice::WriteOnly);
   if (!ok) log.sorry(i18n("Could not create file"), pretty());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.