[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2004-11-30 21:36:33
Message-ID: 20041130213633.B5B3D1B9DB () office ! kde ! org
[Download RAW message or body]

CVS commit by amantia: 

Backport upload status detection fixes (#94167) and bump version number.


  M +4 -0      ChangeLog   1.295.2.23
  M +2 -2      quanta.kdevelop   1.237.2.3
  M +6 -1      project/project.cpp   1.204.2.5
  M +1 -1      project/project.h   1.78.2.2
  M +7 -0      src/document.cpp   1.313.2.4
  M +1 -1      src/quanta.cpp   1.619.2.13
  M +1 -1      src/quanta.h   1.262.2.10


--- kdewebdev/quanta/ChangeLog  #1.295.2.22:1.295.2.23
@@ -1,4 +1,8 @@
 This files contains the changes since Quanta 2.0 until the current 3.3.x series.
 
+Version 3.3.3 (Release date: xx-xx-2005; Started 30-11-2004):
+ - bugfixes:
+        - correctly select modified files for upload [#94167]
+
 Version 3.3.2 (Release date: 06-12-2004; Started 07-10-2004):
   - bugfixes:

--- kdewebdev/quanta/quanta.kdevelop  #1.237.2.2:1.237.2.3
@@ -244,8 +244,8 @@
   <kdevfilecreate>
     <filetypes>
-      <type icon="" ext="h" create="template" name="C++ header" >
+      <type icon="" ext="h" name="C++ header" create="template" >
         <descr>Quanta speicfic header</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" create="template" name="C++ source" >
+      <type icon="source_cpp" ext="cpp" name="C++ source" create="template" >
         <descr>A new empty C++ file.</descr>
       </type>

--- kdewebdev/quanta/project/project.cpp  #1.204.2.4:1.204.2.5
@@ -2231,5 +2231,5 @@ bool Project::contains(const KURL& url)
 }
 
-void Project::updateTimeStamp(const KURL& url, int modifiedTime)
+void Project::updateTimeStamp(const KURL& url, int modifiedTime, bool modifiedTimeOnly)
 {
   ProjectURL *proUrl = d->m_projectFiles.find(url);
@@ -2238,4 +2238,9 @@ void Project::updateTimeStamp(const KURL
 
   QDomElement itemEl = proUrl->domElement;
+  if (modifiedTimeOnly)
+  {
+    itemEl.setAttribute("modified_time", modifiedTime);
+    return;
+  }
   int origModifTime = itemEl.attribute("modified_time","1").toInt();
   QString qurl = QuantaCommon::qUrl(d->m_projectFiles.toRelative(*proUrl));

--- kdewebdev/quanta/project/project.h  #1.78.2.1:1.78.2.2
@@ -98,5 +98,5 @@ public:
   QString password(const QString &entry);
   bool passwordSaved(const QString &entry);
-  void updateTimeStamp(const KURL& url, int modifiedTime);
+  void updateTimeStamp(const KURL& url, int modifiedTime, bool modifiedTimeOnly);
   QDomDocument *dom();
   QString debuggerClient();

--- kdewebdev/quanta/src/document.cpp  #1.313.2.3:1.313.2.4
@@ -590,4 +590,11 @@ int Document::createTempFile(bool dump)
     QExtFileInfo::copy(url(), KURL::fromPathOrURL(m_tempFileName));
  }
+  KIO::UDSEntry entry;
+  if (KIO::NetAccess::stat(url(), entry, this))
+  {
+    KFileItem item(entry, url(), true);
+    int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME);
+    Project::ref()->updateTimeStamp(url(), modifiedTime, true);
+  }
 // kdDebug(24000) << "Creating tempfile " << m_tempFileName << " for " << url() << endl;
 return 1;

--- kdewebdev/quanta/src/quanta.cpp  #1.619.2.12:1.619.2.13
@@ -1469,5 +1469,5 @@ void QuantaApp::restoreFromTempfile(Docu
     KFileItem item(entry, origUrl, true);
     int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME);
-    Project::ref()->updateTimeStamp(origUrl, modifiedTime);
+    Project::ref()->updateTimeStamp(origUrl, modifiedTime, false);
   }
   if (origUrl.isLocalFile())

--- kdewebdev/quanta/src/quanta.h  #1.262.2.9:1.262.2.10
@@ -20,5 +20,5 @@
 
 #define QUANTA_PACKAGE "quanta"
-#define QUANTA_VERSION "3.3.2"
+#define QUANTA_VERSION "post-3.3.2"
 
 #define IDS_STATUS      1


[prev in list] [next in list] [prev in thread] [next in thread]