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

List:       kde-commits
Subject:    QUANTA_3_1_BRANCH: quanta
From:       Andras Mantia <amantia () freemail ! hu>
Date:       2003-07-16 7:46:25
[Download RAW message or body]

CVS commit by amantia: 

Resolve symlinks before opening a file. This prevents Quanta to open the same file \
from two different (symlinked) place. And it should really fix #60860. (backport)


  M +1 -0      ChangeLog   1.90.2.84
  M +12 -0     quanta.kdevelop   1.32.2.6
  M +3 -3      quanta/parser/parser.cpp   1.33.2.2
  M +9 -1      quanta/quantadoc.cpp   1.79.2.9


--- quanta/ChangeLog  #1.90.2.83:1.90.2.84
@@ -17,4 +17,5 @@
     - shortcut to Misc. Tag changed to Ctrl-Shift-T [#60616]
     - execute script actions even if they start with ~
+    - resolve symlinks before opening a file [#60860]
 
   - usability enhancements:

--- quanta/quanta.kdevelop  #1.32.2.5:1.32.2.6
@@ -179,3 +179,15 @@
     <useglobaltypes/>
   </kdevfilecreate>
+  <kdevcppsupport>
+    <codecompletion>
+      <includeGlobalFunctions>true</includeGlobalFunctions>
+      <includeTypes>true</includeTypes>
+      <includeEnums>true</includeEnums>
+      <includeTypedefs>false</includeTypedefs>
+      <automaticCodeCompletion>true</automaticCodeCompletion>
+      <automaticArgumentsHint>true</automaticArgumentsHint>
+      <codeCompletionDelay>250</codeCompletionDelay>
+      <argumentsHintDelay>400</argumentsHintDelay>
+    </codecompletion>
+  </kdevcppsupport>
 </kdevelop>

--- quanta/quanta/quantadoc.cpp  #1.79.2.8:1.79.2.9
@@ -147,6 +147,14 @@ bool QuantaDoc::newDocument( const KURL&
 }
 
-void QuantaDoc::openDocument(const KURL& url, QString encoding)
+void QuantaDoc::openDocument(const KURL& urlToOpen, QString encoding)
 {
+  KURL url = urlToOpen;
+  if (url.isLocalFile())
+  {
+    QString path = QDir(url.path()).canonicalPath();
+    if (!path.isEmpty())
+        url.setPath(path);
+  }
+
 //  Document *ww = write();
   //kdDebug() << k_funcinfo << "Encoding is: " << encoding << endl;


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