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

List:       kde-commits
Subject:    KDE/kdegraphics/kviewshell/plugins/dvi
From:       Wilfried Huss <Wilfried.Huss () gmx ! at>
Date:       2006-07-01 14:24:21
Message-ID: 1151763861.305868.25613.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 556758 by whuss:

Q3ValueVector -> QVector
Q3ValueStack -> QStack

 M  +3 -3      dviRenderer.cpp  
 M  +6 -6      dviRenderer.h  
 M  +1 -1      special.cpp  


--- trunk/KDE/kdegraphics/kviewshell/plugins/dvi/dviRenderer.cpp #556757:556758
@@ -582,7 +582,7 @@
   bookmarks.clear();
   Q3PtrStack<Bookmark> stack;
   stack.setAutoDelete (false);
-  Q3ValueVector<PreBookmark>::iterator it;
+  QVector<PreBookmark>::iterator it;
   for( it = prebookmarks.begin(); it != prebookmarks.end(); ++it ) {
     Bookmark *bmk = new Bookmark((*it).title, findAnchor((*it).anchorName));
     if (stack.isEmpty())
@@ -675,8 +675,8 @@
     // document.
     bool anchorForRefFileFound = false; // Flag that is set if source file anchors \
for the refFileName could be found at all  
-    Q3ValueVector<DVI_SourceFileAnchor>::iterator bestMatch = \
                sourceHyperLinkAnchors.end();
-    Q3ValueVector<DVI_SourceFileAnchor>::iterator it;
+    QVector<DVI_SourceFileAnchor>::iterator bestMatch = \
sourceHyperLinkAnchors.end(); +    QVector<DVI_SourceFileAnchor>::iterator it;
     for( it = sourceHyperLinkAnchors.begin(); it != sourceHyperLinkAnchors.end(); \
++it )  if (refFileName.trimmed() == it->fileName.trimmed()
       || refFileName.trimmed() == it->fileName.trimmed() + ".tex"
--- trunk/KDE/kdegraphics/kviewshell/plugins/dvi/dviRenderer.h #556757:556758
@@ -21,8 +21,8 @@
 #include <kprogressdialog.h>
 #include <Q3IntDict>
 #include <Q3PointArray>
-#include <Q3ValueStack>
-#include <Q3ValueVector>
+#include <QStack>
+#include <QVector>
 #include <QTimer>
 
 class Anchor;
@@ -205,7 +205,7 @@
   void          prescan_setChar(unsigned int ch);
 
   /* */
-  Q3ValueVector<PreBookmark> prebookmarks;
+  QVector<PreBookmark> prebookmarks;
 
 
 
@@ -237,7 +237,7 @@
   // List of source-hyperlinks on all pages. This vector is generated
   // when the DVI-file is first loaded, i.e. when draw_part is called
   // with PostScriptOutPutString != NULL
-  Q3ValueVector<DVI_SourceFileAnchor>  sourceHyperLinkAnchors;
+  QVector<DVI_SourceFileAnchor>  sourceHyperLinkAnchors;
 
   // If not NULL, the text currently drawn represents a source
   // hyperlink to the (relative) URL given in the string;
@@ -252,11 +252,11 @@
   /** Stack for register compounds, used for the DVI-commands PUSH/POP
       as explained in section 2.5 and 2.6.2 of the DVI driver standard,
       Level 0, published by the TUG DVI driver standards committee. */
-  Q3ValueStack<struct framedata> stack;
+  QStack<framedata> stack;
 
   /** A stack where color are stored, according to the documentation of
       DVIPS */
-  Q3ValueStack<QColor> colorStack;
+  QStack<QColor> colorStack;
 
   /** The global color is to be used when the color stack is empty */
   QColor              globalColor;
--- trunk/KDE/kdegraphics/kviewshell/plugins/dvi/special.cpp #556757:556758
@@ -646,7 +646,7 @@
     if (special_command.startsWith("ps:SDict begin [") && special_command.endsWith(" \
pdfmark end")) {  if (!currentlyDrawnPage->hyperLinkList.isEmpty()) {
         QString targetName = special_command.section('(', 1, 1).section(')', 0, 0);
-        Q3ValueVector<Hyperlink>::iterator it;
+        QVector<Hyperlink>::iterator it;
         for( it = currentlyDrawnPage->hyperLinkList.begin(); it != \
currentlyDrawnPage->hyperLinkList.end(); ++it )  if (it->linkText == "glopglyph")
             it->linkText = targetName;


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