valgrind-valkyrie-dev — Discussion list for developers of Valkyrie, a GUI for Valgrind

[Valgrind-valkyrie-dev] valkyrie: r521 - trunk/src/options

[<sv...@va...>]

Author: cerion
Date: 2010-10-18 22:33:15 +0100 (Mon, 18 Oct 2010)
New Revision: 521

Log:
Don't prevent options of type WDG_NONE from being saved to project config (QSettings).
 - Though it's not very useful to store these opts across runs, it is useful to cache at least the view-log option value within a run, giving consistency with the usage of the rest of option/config.




Modified:
   trunk/src/options/vk_option.cpp


Modified: trunk/src/options/vk_option.cpp
===================================================================
--- trunk/src/options/vk_option.cpp	2010-10-18 20:51:25 UTC (rev 520)
+++ trunk/src/options/vk_option.cpp	2010-10-18 21:33:15 UTC (rev 521)
@@ -329,14 +329,10 @@
    The following option types are NOT saved:
    ::argType == ARG_NONE  (e.g. --help)
     - They don't take args, so there's nothing to save
-   ::widgType == WDG_NONE (e.g. --project-file=<myfile>)
-    - These may or may not take an argument, but are only meant to drive
-      Valkyrie from the commandline. There nothing to save here either.
 */
 bool VkOption::isaConfigOpt()
 {
-   return ( argType != VkOPT::ARG_NONE &&    // ARG_NONE: takes no args
-            widgType != VkOPT::WDG_NONE );   // WDG_NONE: has no UI widget
+   return ( argType != VkOPT::ARG_NONE );   // ARG_NONE: takes no args
 }
 
 /*!
@@ -349,9 +345,13 @@
       QString key = configKey();
       if ( !vkCfgProj->contains( key ) || vkCfgProj->value( key ) != argVal ) {
          vkCfgProj->setValue( key, argVal );
+         vkCfgProj->sync();
          emit valueChanged();
       }
    }
+   else {
+      VK_DEBUG( "Warning: Not a config opt: '%s'.", qPrintable( configKey() ) );
+   }
 }
 
 

[Valgrind-valkyrie-dev] valkyrie: r520 - in trunk/src: . objects toolview

[<sv...@va...>]

Author: cerion
Date: 2010-10-18 21:51:25 +0100 (Mon, 18 Oct 2010)
New Revision: 520

Log:
actually start up a process (run valgrind / view-log / ...) from the command line, rather than just pretending to.





Modified:
   trunk/src/main.cpp
   trunk/src/mainwindow.cpp
   trunk/src/mainwindow.h
   trunk/src/objects/tool_object.cpp
   trunk/src/objects/tool_object.h
   trunk/src/objects/valkyrie_object.cpp
   trunk/src/objects/valkyrie_object.h
   trunk/src/toolview/toolview.h


Modified: trunk/src/main.cpp
===================================================================
--- trunk/src/main.cpp	2010-10-17 19:58:19 UTC (rev 519)
+++ trunk/src/main.cpp	2010-10-18 20:51:25 UTC (rev 520)
@@ -43,6 +43,7 @@
    int exit_status = EXIT_SUCCESS;
    QApplication* app  = 0;
    MainWindow* vkWin  = 0;
+   VGTOOL::ToolProcessId startProcess = VGTOOL::PROC_NONE;
 
    // ------------------------------------------------------------
    // Create all VkObjects: Vk[ Vg[ Tools[] ] ]
@@ -113,8 +114,13 @@
    
    vkWin->showToolView( VGTOOL::ID_MEMCHECK );
    vkWin->show();
+
+   // start up a process (run valgrind / view-log / ...) from the command line.
+   startProcess = valkyrie.getStartToolProcess();
+   if ( startProcess != VGTOOL::PROC_NONE ) {
+      vkWin->runTool( startProcess );
+   }
    
-   
    qApp->processEvents();
    
    // ------------------------------------------------------------

Modified: trunk/src/mainwindow.cpp
===================================================================
--- trunk/src/mainwindow.cpp	2010-10-17 19:58:19 UTC (rev 519)
+++ trunk/src/mainwindow.cpp	2010-10-18 20:51:25 UTC (rev 520)
@@ -527,8 +527,8 @@
       // + ToolObject::saveParsedOutput()...
       
       // view starts tool processes via this signal
-      connect( nextView, SIGNAL( run( int ) ),
-               this,       SLOT( runTool( int ) ) );
+      connect( nextView, SIGNAL( run( VGTOOL::ToolProcessId ) ),
+               this,       SLOT( runTool( VGTOOL::ToolProcessId ) ) );
                
       // add view to the stack
       toolViewStack->addView( nextView );
@@ -1005,13 +1005,13 @@
 /*!
     Run the valgrind tool process.
 */
-void MainWindow::runTool( int procId )
+void MainWindow::runTool( VGTOOL::ToolProcessId procId )
 {
    VGTOOL::ToolID tId = toolViewStack->currentToolId();   
    cerr << "MainWindow::runTool( tool: " << tId
          << ", proc: " << procId << " )" << endl;
    
-   vk_assert( procId >= 0 );
+   vk_assert( procId > VGTOOL::PROC_NONE );
    
    // don't come in here if there's no current view
    if ( !toolViewStack->isVisible() ) {
@@ -1020,6 +1020,21 @@
       return;
    }
    
+   if ( procId == VGTOOL::PROC_VALGRIND ) {
+      // Valkyrie may have been started with no executable
+      // specified. If so, show msgbox, then options dialog
+      if ( vkCfgProj->value( "valkyrie/binary" ).toString().isEmpty() ) {
+
+         vkInfo( this, "Run Valgrind: No program specified",
+                 "Please specify (via Options->Valkyrie->Binary)<br>"
+                 "the path to the program you wish to run, along<br>"
+                 "with any arguments required" );
+         openOptions();
+
+         return;
+      }
+   }
+
    // last process might not be done ...
    if ( !valkyrie->queryToolDone( tId ) ) {
       cerr << "Warning: Last process not finished" << endl;
@@ -1040,26 +1055,6 @@
 */
 void MainWindow::runValgrind()
 {
-   cerr << "MainWindow::runValgrind()" << endl;
-   
-   // don't come in here if there's no current view
-   if ( !toolViewStack->isVisible() ) {
-      return;
-   }
-   
-   // Valkyrie may have been started with no executable
-   // specified. If so, show msgbox, then options dialog
-   if ( vkCfgProj->value( "valkyrie/binary" ).toString().isEmpty() ) {
-   
-      vkInfo( this, "Run Valgrind: No program specified",
-              "Please specify (via Options->Valkyrie->Binary)<br>"
-              "the path to the program you wish to run, along<br>"
-              "with any arguments required" );
-      openOptions();
-      
-      return;
-   }
-   
    runTool( VGTOOL::PROC_VALGRIND );
 }
 

Modified: trunk/src/mainwindow.h
===================================================================
--- trunk/src/mainwindow.h	2010-10-17 19:58:19 UTC (rev 519)
+++ trunk/src/mainwindow.h	2010-10-18 20:51:25 UTC (rev 520)
@@ -56,8 +56,9 @@
 public slots:
    void setStatus( QString msg );
    void showToolView( VGTOOL::ToolID toolId );
+   void runTool( VGTOOL::ToolProcessId procId );
    void openOptions();
-   
+
 private:
    void setupLayout();
    void setupActions();
@@ -77,7 +78,6 @@
    void openRecentProject();
    void saveAsProject();
    void closeToolView();
-   void runTool( int procId );
    void runValgrind();
    void stopTool();
    void openHandBook();

Modified: trunk/src/objects/tool_object.cpp
===================================================================
--- trunk/src/objects/tool_object.cpp	2010-10-17 19:58:19 UTC (rev 519)
+++ trunk/src/objects/tool_object.cpp	2010-10-18 20:51:25 UTC (rev 520)
@@ -227,7 +227,8 @@
   Start a process
    - Slot, called from the ToolView
 */
-bool ToolObject::start( int procId, QStringList vgflags, QString logfile )
+bool ToolObject::start( VGTOOL::ToolProcessId procId,
+                        QStringList vgflags, QString logfile )
 {
    //cerr << "ToolObject::start(): "  << procId << endl;
    this->saveFname = logfile;

Modified: trunk/src/objects/tool_object.h
===================================================================
--- trunk/src/objects/tool_object.h	2010-10-17 19:58:19 UTC (rev 519)
+++ trunk/src/objects/tool_object.h	2010-10-18 20:51:25 UTC (rev 520)
@@ -60,7 +60,8 @@
    ToolView* createView( QWidget* parent );
    ToolView* view();
    
-   bool start( int procId, QStringList vgflags, QString logfile );
+   bool start( VGTOOL::ToolProcessId procId,
+               QStringList vgflags, QString logfile );
 //   void stop();
    bool queryDone();
    bool isRunning();

Modified: trunk/src/objects/valkyrie_object.cpp
===================================================================
--- trunk/src/objects/valkyrie_object.cpp	2010-10-17 19:58:19 UTC (rev 519)
+++ trunk/src/objects/valkyrie_object.cpp	2010-10-18 20:51:25 UTC (rev 520)
@@ -48,6 +48,7 @@
    
    // init valgrind
    m_valgrind = new Valgrind();
+   m_startToolProcess = VGTOOL::PROC_NONE;
 }
 
 
@@ -331,7 +332,7 @@
       VALKYRIE::VIEW_LOG,
       this->objectName(),
       "view-log",
-      'v',
+      'l',
       "<file>",
       "",
       "",
@@ -565,12 +566,14 @@
       if ( !argval.isEmpty() ) {
          // see if we have a logfile with at least R permissions:
          argval = fileCheck( &errval, argval, true );
+         m_startToolProcess = VGTOOL::PROC_PARSE_LOG;
       } break;
 
    case VALKYRIE::BINARY:
       if ( !argval.isEmpty() ) {
          // see if we have a binary with at least X permissions:
          argval = fileCheck( &errval, argval, false, false, true );
+         m_startToolProcess = VGTOOL::PROC_VALGRIND;
       } break;
 
    case VALKYRIE::BIN_FLAGS:
@@ -694,7 +697,7 @@
 /*!
   Run the tool with given process id.
 */
-bool Valkyrie::runTool( VGTOOL::ToolID tId, int procId )
+bool Valkyrie::runTool( VGTOOL::ToolID tId, VGTOOL::ToolProcessId procId )
 {
    cerr << "Valkyrie::runTool( "  << tId  << ", " << procId << ")" << endl;
    

Modified: trunk/src/objects/valkyrie_object.h
===================================================================
--- trunk/src/objects/valkyrie_object.h	2010-10-17 19:58:19 UTC (rev 519)
+++ trunk/src/objects/valkyrie_object.h	2010-10-18 20:51:25 UTC (rev 520)
@@ -78,7 +78,7 @@
    Valkyrie();
    ~Valkyrie();
    
-   bool runTool( VGTOOL::ToolID tId, int procId );
+   bool runTool( VGTOOL::ToolID tId, VGTOOL::ToolProcessId procId );
    void stopTool( VGTOOL::ToolID tId );
    bool queryToolDone( VGTOOL::ToolID tId );
    
@@ -98,6 +98,10 @@
    Valgrind* valgrind() {
       return m_valgrind;
    }
+
+   VGTOOL::ToolProcessId getStartToolProcess() {
+      return m_startToolProcess;
+   }
    
    VkOption* findOption( QString& optKey );
 //TODO: needed?
@@ -115,6 +119,7 @@
    
 private:
    Valgrind* m_valgrind;
+   VGTOOL::ToolProcessId m_startToolProcess;
 };
 
 #endif  // __VALKYRIE_OBJECT_H

Modified: trunk/src/toolview/toolview.h
===================================================================
--- trunk/src/toolview/toolview.h	2010-10-17 19:58:19 UTC (rev 519)
+++ trunk/src/toolview/toolview.h	2010-10-18 20:51:25 UTC (rev 520)
@@ -96,7 +96,7 @@
    
 signals:
    // start appropriate process for given runState
-   void run( int procId );
+   void run( VGTOOL::ToolProcessId procId );
    void logFileChosen( QString logFilename );
    
 protected:

[Valgrind-valkyrie-dev] valkyrie: r519 - trunk/src/utils

[<sv...@va...>]

Author: sewardj
Date: 2010-10-17 20:58:19 +0100 (Sun, 17 Oct 2010)
New Revision: 519

Log:
Include <stdio.h>.


Modified:
   trunk/src/utils/vk_messages.cpp


Modified: trunk/src/utils/vk_messages.cpp
===================================================================
--- trunk/src/utils/vk_messages.cpp	2010-09-16 21:21:43 UTC (rev 518)
+++ trunk/src/utils/vk_messages.cpp	2010-10-17 19:58:19 UTC (rev 519)
@@ -23,6 +23,7 @@
 
 #include <stdarg.h>           /* va_start, va_end */
 #include <stdlib.h>           /* exit errno */
+#include <stdio.h>            /* vsnprintf */
 
 #include <QApplication>
 #include <QHBoxLayout>

Re: [Valgrind-valkyrie-dev] suggestions/questions

[Cerion Armour-B. <ce...@ke...>]

  On 9/24/10 3:29 PM, adu wrote:
> *First of all - I should say superBIG thanks for your work ;)*
Glad to hear you like it - thanks for your input and patches!

> But if even you did not release yet final version of valkyrie - I 
> should ask you guys - do you think about fully standalone tool?
> I mean then you will release final tarball I think I will be the 
> correct if I will say that this archive will contain only SOURCES.
> That means that I should somehow to compile the content of this 
> tarball. But obviously that It would be much easy to release AND 
> standalone AND binary tarballs.
> Isn't it?
>
> P.S. I my case for ex. I 100% can't to install additional QT sources 
> (ver >4). I my company we even do not use qt at all.
> And on all machines simply there is no latest QT frameworks. Only some 
> comps have 3.1 ver on board.
> So I need standalone binary in order to work with valkyrie!
>
I don't see why not... can you add it as a 'wish' on the bugtracker 
please, so we don't forget.
http://bugs.kde.org, product Valkyrie.

> P.P.S. Do you have some milestones? When apox. valkyrie 2.0 will be 
> released?
>
We're trying to get it out in sync with the next Valgrind release, which 
is planned within the next month or so.

> Regards, Anton
Regards,
Cerion

[Valgrind-valkyrie-dev] suggestions/questions

[adu <ad...@na...>]

First of all - I should say superBIG thanks for your work ;) 
But if even you did not release yet final version of valkyrie - I should ask
you guys - do you think about fully standalone tool? 
I mean then you will release final tarball I think I will be the correct if
I will say that this archive will contain only SOURCES. 
That means that I should somehow to compile the content of this tarball. But
obviously that It would be much easy to release AND standalone AND binary
tarballs. 
Isn't it? 

P.S. I my case for ex. I 100% can't to install additional QT sources (ver
>4). I my company we even do not use qt at all. 
And on all machines simply there is no latest QT frameworks. Only some comps
have 3.1 ver on board. 
So I need standalone binary in order to work with valkyrie! 

P.P.S. Do you have some milestones? When apox. valkyrie 2.0 will be
released?

Regards, Anton

 

[Valgrind-valkyrie-dev] valkyrie: r518 - trunk

[<sv...@va...>]

Author: cerion
Date: 2010-09-16 22:21:43 +0100 (Thu, 16 Sep 2010)
New Revision: 518

Log:
update and add README

Added:
   trunk/README


Added: trunk/README
===================================================================
--- trunk/README	                        (rev 0)
+++ trunk/README	2010-09-16 21:21:43 UTC (rev 518)
@@ -0,0 +1,54 @@
+
+Release Notes for Valkyrie
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Valkyrie version 2.0.0.SVN supports Valgrind 3.6.x.
+Valkyrie supports the Valgrind tools Memcheck and Helgrind.
+
+Valkyrie is licensed under the GNU General Public License, version 2. 
+Read the file COPYING in the source distribution for details.
+
+For instructions on how to build/install, see the INSTALL file.
+
+
+Support for other versions of Valgrind
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Valkyrie is generally _not_ backwards compatible with other versions
+of Valgrind.  In particular, a particular Valkyrie release is tuned
+to a particular Valgrind XML interface definition.
+
+
+How to get Valkyrie
+~~~~~~~~~~~~~~~~~~~
+To check out Valkyrie via anonymous, read-only svn access:
+  svn co svn://svn.valgrind.org/valkyrie/trunk valkyrie
+
+
+Requirements
+~~~~~~~~~~~~
+Qt (>= not_sure, perhaps 4.6) <http://www.trolltech.com>
+Valgrind (>=v3.6.0) <http://www.valgrind.org>
+
+
+Executive Summary
+~~~~~~~~~~~~~~~~~
+Valkyrie is a GPL'd graphical front-end to the Valgrind suite
+of tools for debugging and profiling programs.
+
+Valkyrie uses the Qt widget library, and (should) run on any platform
+that both Qt and Valgrind run on.
+
+To get the most out of Valkyrie, you must read the Valgrind
+documentation: <http://www.valgrind.org/docs/>
+
+To get started, simply invoke valkyrie thusly:
+  valkyrie ./myprog
+
+This will transparently call Valgrind and display it's output.
+For more help on Valkyrie, use the built-in Help->Handbook.
+
+
+---
+The Valkyrie Developers
+Please report any problems encountered with valkyrie to
+<in...@op...>
+

[Valgrind-valkyrie-dev] valkyrie: r517 - trunk/src/objects

[<sv...@va...>]

Author: cerion
Date: 2010-09-16 20:41:47 +0100 (Thu, 16 Sep 2010)
New Revision: 517

Log:
Just for Zaar Hai: Try to use an already running kate.




Modified:
   trunk/src/objects/valkyrie_object.cpp


Modified: trunk/src/objects/valkyrie_object.cpp
===================================================================
--- trunk/src/objects/valkyrie_object.cpp	2010-09-16 19:33:19 UTC (rev 516)
+++ trunk/src/objects/valkyrie_object.cpp	2010-09-16 19:41:47 UTC (rev 517)
@@ -490,7 +490,7 @@
                   argval += " +%n";
                }
                else if ( fname.contains( QRegExp( "^kate[\\W]*" ) ) ) {
-                  argval += " --line %n";
+                  argval += " --line %n -use";
                }
                else {
                   // TODO: Warning msg: Unknown editor: use flag to have editor take us to the right line: %n is replaced by the line number

[Valgrind-valkyrie-dev] valkyrie: r516 - in trunk/doc: . internals

[<sv...@va...>]

Author: cerion
Date: 2010-09-16 20:33:19 +0100 (Thu, 16 Sep 2010)
New Revision: 516

Log:
Mercilessly ripped off the Valgrind release-HOWTO.txt :-)




Added:
   trunk/doc/internals/
   trunk/doc/internals/release-HOWTO.txt


Added: trunk/doc/internals/release-HOWTO.txt
===================================================================
--- trunk/doc/internals/release-HOWTO.txt	                        (rev 0)
+++ trunk/doc/internals/release-HOWTO.txt	2010-09-16 19:33:19 UTC (rev 516)
@@ -0,0 +1,114 @@
+-----------------------------------------------------------------------------
+TODO list when doing a Valkyrie release (with release number "X.Y.Z")
+-----------------------------------------------------------------------------
+
+There are two kinds of releases:
+
+- Feature releases:  X.Y.0, which can include new features.
+
+- Bug-fix releases:  X.Y.[12...], which only include bug fixes.
+
+
+First of all:
+
+- Tell valkyrie-developers you want to do a release.  Give a timeframe for
+  everyone to check in any final features/bug-fixes they want in the
+  release.
+
+- Go over the docs, make sure they're up to date.
+
+- Update version number vk_config.pri.
+
+- Write release notes, add to NEWS.  Include a list of fixed bugs from
+  Bugzilla.
+
+- Other files that might need updating:  README.
+
+- Add X.Y.Z and X.Y+1.Z.SVN versions to Bugzilla.
+
+? - Add "wantedX.Y.Z+1" and "wantedX.Y+1.Z" milestones to Bugzilla.
+
+
+For each release candidate (should do release candidates for feature
+releases, bug-fix-only releases might not need one):
+
+- Build.
+
+- Do pre-release testing:
+
+  * Check it builds and regtests on a vanilla gcc-2.96 / RedHat 7.3 distro.
+
+  * Check XML output from the latest Valgrind release is readable
+
+  * Test with large applications (firefox and OOo 2.0) on all platforms.
+
+- Change VERSION number in vk_config.pri to "X.Y.Z-rcN", where
+  'N' is the release candidate number.
+
+- Make a distribution tarball and put it on the web
+  TODO: HOW WITH QMAKE ?
+
+- Ensure the tarball builds, runs, regtests on the platforms of interest.
+  However redundant this seems, sometimes it can be that a from-the-repo
+  build works whereas a from-the-tarball one doesn't, usually due to some
+  trivial installation problem.
+
+- Also check the HTML and print docs look sane (eg. links work).  And the
+  man pages, esp. that there are no broken references (look for "???").
+
+- Announce the release:
+  - Email valkyrie-users and valkyrie-developers.
+  - Make clear it's a release candidate.
+  - Make sure you tell everyone where to download from.
+  - Include the release notes in the email (maybe not necessary for release
+    candidates 2+).
+
+- Wait 2--3 days for feedback.  If bugs appear:
+  - Fix them.
+  - Update the bug-fix list in NEWS if necessary.
+  - Do another release candidate.
+
+
+For the official release:
+
+- Do pre-release testing:
+  - Make sure regtests run ok.
+  - Make sure Mozilla and OpenOffice run ok.
+
+- Change VERSION number in vk_config.pri to "X.Y.Z".
+
+- Make the tarball ("make dist").
+  TODO: HOW WITH QMAKE ?
+
+- Check tarball builds, installs, regtests on platforms of interest.
+  If not, fix and repeat until success.
+
+- Tag the repositorie: "VALKYRIE_X_Y_Z"
+
+  If it's a X.Y.0 release, make "VALKYRIE_X_Y_BRANCH" branch too.
+  Useful examples:
+
+    cd valkyrie
+    svn copy trunk tags/VALKYRIE
+    svn copy trunk branches/VALKYRIE_3_3_BRANCH
+
+- Update website: 
+  - Put the tarball up.
+  - Update the docs -- both the tarball'd docs, and the online-readable docs.
+  - Update www.valgrind.org/downloads/guis.html.  
+  - Update www.valgrind.org/downloads/current.html.
+  - Update www.open-works.net/projects/valkyrie.html
+    TODO: have a "Valkyrie Status' page on open-works.net, and update that!
+
+- Change VERSION number in vk_config.pri to "X.Y.Z.SVN", where
+  X.Y.Z is one more than the release just done.
+
+- Make sure the release notes are present in the NEWS file on the trunk and
+  the branch.
+
+- Announce the release:
+  - Email valkyrie-users, valkyrie-developers.
+?  - Email Linux Weekly News.
+  - Include the release notes in the email.
+
+- Go on holiday.

[Valgrind-valkyrie-dev] valkyrie: r515 - trunk/src/objects

[<sv...@va...>]

Author: cerion
Date: 2010-09-16 20:06:52 +0100 (Thu, 16 Sep 2010)
New Revision: 515

Log:
add kate to list of recognised editors

Modified:
   trunk/src/objects/valkyrie_object.cpp


Modified: trunk/src/objects/valkyrie_object.cpp
===================================================================
--- trunk/src/objects/valkyrie_object.cpp	2010-09-16 05:57:52 UTC (rev 514)
+++ trunk/src/objects/valkyrie_object.cpp	2010-09-16 19:06:52 UTC (rev 515)
@@ -489,6 +489,12 @@
                if ( fname.contains( QRegExp( "^(emacs|gedit|gvim|nano|nedit)[\\W]*" ) ) ) {
                   argval += " +%n";
                }
+               else if ( fname.contains( QRegExp( "^kate[\\W]*" ) ) ) {
+                  argval += " --line %n";
+               }
+               else {
+                  // TODO: Warning msg: Unknown editor: use flag to have editor take us to the right line: %n is replaced by the line number
+               }
             }
          }
       } break;

[Valgrind-valkyrie-dev] valkyrie: r514 - trunk

[<sv...@va...>]

Author: cerion
Date: 2010-09-16 06:57:52 +0100 (Thu, 16 Sep 2010)
New Revision: 514

Log:
Added INSTALL file, with brief instructions




Added:
   trunk/INSTALL


Added: trunk/INSTALL
===================================================================
--- trunk/INSTALL	                        (rev 0)
+++ trunk/INSTALL	2010-09-16 05:57:52 UTC (rev 514)
@@ -0,0 +1,48 @@
+Introduction
+============
+
+Valkyrie uses qmake to be built.
+qmake is part of a Qt distribution. 
+
+If you want to play around with the build config, check out:
+valyrie.pro    - main qmake project file
+src/src.pro    - the meat of the project
+vk_config.pri  - project include file: included everywere
+
+In particular, you may want to edit the following:
+- src/src.pro:
+  SOURCES += /usr/share/qtcreator/gdbmacros/gdbmacros.cpp
+Note: Qt want this in order to create lots of debug info. If you're not debugging, then you probably don't want this. Is also rather nasty to hardcode the path in like this, but I don't know of a good workaround...
+
+- vk_config.pri:
+  CONFIG           += silent      # make --quiet
+  CONFIG           += debug       # release/debug
+
+
+
+*) Build and run without "installing"
+=====================================
+
+ qmake
+ make
+
+
+The valkyrie binary is put here: ./bin/valkyrie
+make clean to clean up and start again
+make distclean to _really_ clean up and start again.
+
+
+
+*) Build and install
+=====================
+
+ qmake PREFIX=<your_dir>
+ make
+ make install
+
+
+That's it!
+
+Note: you may come across INSTALL_ROOT in src.pro
+ - it seems to be a qt special which can't easily(?) be set, hence the PREFIX solution.
+

[Valgrind-valkyrie-dev] valkyrie: r513 - trunk

[<sv...@va...>]

Author: cerion
Date: 2010-09-16 06:40:03 +0100 (Thu, 16 Sep 2010)
New Revision: 513

Log:
wrong include in .pro file! i guess it wasn't that crucial...

Modified:
   trunk/valkyrie.pro


Modified: trunk/valkyrie.pro
===================================================================
--- trunk/valkyrie.pro	2010-09-14 20:48:11 UTC (rev 512)
+++ trunk/valkyrie.pro	2010-09-16 05:40:03 UTC (rev 513)
@@ -5,7 +5,7 @@
 # qmake "PREFIX=<your_dir>" && make && make install
 ######################################################################
 
-include( qwtconfig.pri )
+include( vk_config.pri )
 
 TEMPLATE = subdirs
 SUBDIRS  = src

[Valgrind-valkyrie-dev] valkyrie: r512 - in trunk: . src src/help src/objects src/options src/options/widgets src/toolview src/utils

[<sv...@va...>]

Author: cerion
Date: 2010-09-14 21:48:11 +0100 (Tue, 14 Sep 2010)
New Revision: 512

Log:
Finished off the VkConfig refactoring, providing a more reasonable interface to config-related stuff:
 - VkCfg     : namespace for general static data/functions
 - VkCfgProj : project settings
 - VkCfgGlbl : non-project settings (help_bookmarks, etc)

The 'project' concept of working is finished off with this too. Still a bit more complex than I'd like, but the best I could come up with  -  If anyone can come up with something better, that still allows command-line use of Vk without needing to setup a project, let me know!

Further:
 - Help history & bookmarks now saved correctly via vkcfg, not misc files.
 - Removed the pseudo-options from valkyrie_object, and put them into VkCfgGlbl, where they belong.
 - Moved general utils functions from vk_config to... (wait for it)... utils!




Modified:
   trunk/
   trunk/src/help/help_about.cpp
   trunk/src/help/help_handbook.cpp
   trunk/src/main.cpp
   trunk/src/mainwindow.cpp
   trunk/src/mainwindow.h
   trunk/src/objects/tool_object.cpp
   trunk/src/objects/valgrind_object.cpp
   trunk/src/objects/valkyrie_object.cpp
   trunk/src/objects/valkyrie_object.h
   trunk/src/objects/vk_objects.cpp
   trunk/src/objects/vk_objects.h
   trunk/src/options/valkyrie_options_page.cpp
   trunk/src/options/vk_option.cpp
   trunk/src/options/vk_option.h
   trunk/src/options/vk_options_dialog.cpp
   trunk/src/options/vk_options_dialog.h
   trunk/src/options/vk_options_page.cpp
   trunk/src/options/vk_parse_cmdline.cpp
   trunk/src/options/vk_parse_cmdline.h
   trunk/src/options/widgets/opt_base_widget.cpp
   trunk/src/options/widgets/opt_ck_widget.cpp
   trunk/src/options/widgets/opt_lb_widget.cpp
   trunk/src/src.pro
   trunk/src/toolview/helgrindview.cpp
   trunk/src/toolview/memcheckview.cpp
   trunk/src/toolview/vglogview.cpp
   trunk/src/utils/
   trunk/src/utils/vk_config.cpp
   trunk/src/utils/vk_config.h
   trunk/src/utils/vk_logpoller.cpp
   trunk/src/utils/vk_utils.cpp
   trunk/src/utils/vk_utils.h
   trunk/valkyrie.pro
   trunk/vk_config.pri


[... diff too large to include ...]

[Valgrind-valkyrie-dev] valkyrie: r511 - branches

[<sv...@va...>]

Author: cerion
Date: 2010-09-05 21:06:52 +0100 (Sun, 05 Sep 2010)
New Revision: 511

Log:
Remove branches/valkyrie_qt4port

Removed:
   branches/valkyrie_qt4port/

[Valgrind-valkyrie-dev] valkyrie: r510 - in trunk: . doc doc/images doc/xml src src/help src/objects src/options src/toolview src/utils

[<sv...@va...>]

Author: cerion
Date: 2010-09-05 21:03:44 +0100 (Sun, 05 Sep 2010)
New Revision: 510

Log:
Merged branches/valkyrie_qt4port to trunk.




Added:
   trunk/COPYING
   trunk/dev/
   trunk/icons.qrc
   trunk/icons/
   trunk/src/
   trunk/valkyrie.pro
   trunk/vk_config.pri
Removed:
   trunk/AUTHORS
   trunk/COPYING
   trunk/COPYING.DOCS
   trunk/INSTALL
   trunk/Makefile.am
   trunk/NEWS
   trunk/README
   trunk/README_DEVELOPERS
   trunk/autogen.sh
   trunk/config.tests/
   trunk/configure.in
   trunk/doc/Makefile.am
   trunk/doc/about_qt.html
   trunk/doc/images/Makefile.am
   trunk/doc/xml/about_qt.xml
   trunk/icons/
   trunk/m4/
   trunk/nightly/
   trunk/tests/
   trunk/utils/
   trunk/valkyrie/
   trunk/vk_logmerge/
Modified:
   trunk/
   trunk/doc/about_vk.html
   trunk/doc/options_dialog.html
   trunk/doc/xml/about_vk.xml
   trunk/src/help/
   trunk/src/objects/
   trunk/src/options/
   trunk/src/toolview/
   trunk/src/utils/



Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - aclocal.m4
autom4te.cache
configure
config.h
config.h.in
config.log
config.status
depcomp
install-sh
missing
stamp-h1
Makefile
Makefile.in

   + bin
Makefile



Deleted: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2010-09-05 17:18:56 UTC (rev 509)
+++ trunk/AUTHORS	2010-09-05 20:03:44 UTC (rev 510)
@@ -1,7 +0,0 @@
-Donna Robinson was the original founder, designer and author.
-
-Cerion Armour-Brown designed/wrote the XML gathering/processing/display,
-vk_logmerge, and generally abstracted and solidified the code.
-
-And lots and lots of other people sent bug reports, patches, and very 
-helpful feedback.  Thank you all.

Deleted: trunk/COPYING
===================================================================
--- trunk/COPYING	2010-09-05 17:18:56 UTC (rev 509)
+++ trunk/COPYING	2010-09-05 20:03:44 UTC (rev 510)
@@ -1,340 +0,0 @@
-        GNU GENERAL PUBLIC LICENSE
-           Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-          Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-        GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-          NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-         END OF TERMS AND CONDITIONS
-
-      How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

Copied: trunk/COPYING (from rev 509, branches/valkyrie_qt4port/COPYING)
===================================================================
--- trunk/COPYING	                        (rev 0)
+++ trunk/COPYING	2010-09-05 20:03:44 UTC (rev 510)
@@ -0,0 +1,340 @@
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+         END OF TERMS AND CONDITIONS
+
+      How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

Deleted: trunk/COPYING.DOCS
===================================================================
--- trunk/COPYING.DOCS	2010-09-05 17:18:56 UTC (rev 509)
+++ trunk/COPYING.DOCS	2010-09-05 20:03:44 UTC (rev 510)
@@ -1,398 +0,0 @@
-        GNU Free Documentation License
-          Version 1.2, November 2002
-
-
- Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document "free" in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License.  Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The "Document", below,
-refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as "you".  You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (Thus, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.  If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant.  The Document may contain zero
-Invariant Sections.  If the Document does not identify any Invariant
-Sections then there are none.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.  A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text.  A copy that is not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML, PostScript or PDF designed for human modification.  Examples of
-transparent image formats include PNG, XCF and JPG.  Opaque formats
-include proprietary formats that can be read and edited only by
-proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML, PostScript or PDF produced by some word
-processors for output purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-A section "Entitled XYZ" means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as "Acknowledgements",
-"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
-of such a section when you modify the Document means that it remains a
-section "Entitled XYZ" according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document.  These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has fewer than five),
-   unless they release you from this requirement.
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section Entitled "History", Preserve its Title, and add
-   to it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section Entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. For any section Entitled "Acknowledgements" or "Dedications",
-   Preserve the Title of the section, and preserve in the section all
-   the substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section Entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section to be Entitled "Endorsements"
-   or to conflict in title with any Invariant Section.
-O. Preserve any Warranty Disclaimers.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled "History"
-in the various original documents, forming one section Entitled
-"History"; likewise combine any sections Entitled "Acknowledgements",
-and any sections Entitled "Dedications".  You must delete all sections
-Entitled "Endorsements".
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an "aggregate" if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included in an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers.  In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled "Acknowledgements",
-"Dedications", or "History", the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-    Copyright (c)  YEAR  YOUR NAME.
-    Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.2
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the section entitled "GNU
-    Free Documentation License".
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the "with...Texts." line with this:
-
-    with the Invariant Sections being LIST THEIR TITLES, with the
-    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
-

Deleted: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2010-09-05 17:18:56 UTC (rev 509)
+++ trunk/INSTALL	2010-09-05 20:03:44 UTC (rev 510)
@@ -1,229 +0,0 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
-
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more ...
 
[truncated message content]

[Valgrind-valkyrie-dev] valkyrie: r509 - branches/VALKYRIE_1_4_BRANCH

[<sv...@va...>]

Author: cerion
Date: 2010-09-05 18:18:56 +0100 (Sun, 05 Sep 2010)
New Revision: 509

Log:
Updated NEWS for branch 1.4: was missed back then.
Release 1.4.0 was tagged & branched @ svn r455



Modified:
   branches/VALKYRIE_1_4_BRANCH/NEWS


Modified: branches/VALKYRIE_1_4_BRANCH/NEWS
===================================================================
--- branches/VALKYRIE_1_4_BRANCH/NEWS	2010-09-05 17:18:19 UTC (rev 508)
+++ branches/VALKYRIE_1_4_BRANCH/NEWS	2010-09-05 17:18:56 UTC (rev 509)
@@ -1,4 +1,28 @@
 
+Release 1.4.0 (21 Feb 2009, svn r455)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+1.4.0 adds support for Valgrind versions 3.4.x, and fixes a
+number of bugs reported in 1.3.0.
+
+NEW FUNCTIONALITY:
+
+- Support for Valgrind 3.4.x XML format
+
+BUGS and PROBLEMS FIXED:
+
+- Require Valgrind version 3.4.x, and fix a couple of quoting problems.
+
+- Per-user temp directory, rather than one for all users.
+
+- Make the detection of Valgrind more strict.  If no Valgrind is
+  detected, or the version number is wrong, just stop.
+
+- Save log: Don't use QDir::rename, since that fails when src and dst
+  are not in the same partition. Copy and delete the original instead.
+
+- Other small bug fixes.
+
+
 Release 1.3.0 (30 June 2008)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1.3.0 adds support for Valgrind versions 3.3.0 and 3.3.1, and fixes a

[Valgrind-valkyrie-dev] valkyrie: r508 - tags/VALKYRIE_1_4_0

[<sv...@va...>]

Author: cerion
Date: 2010-09-05 18:18:19 +0100 (Sun, 05 Sep 2010)
New Revision: 508

Log:
Updated NEWS for tagged release 1.4.0: was missed back then.
Release 1.4.0 was tagged & branched @ svn r455



Modified:
   tags/VALKYRIE_1_4_0/NEWS


Modified: tags/VALKYRIE_1_4_0/NEWS
===================================================================
--- tags/VALKYRIE_1_4_0/NEWS	2010-09-05 17:11:53 UTC (rev 507)
+++ tags/VALKYRIE_1_4_0/NEWS	2010-09-05 17:18:19 UTC (rev 508)
@@ -1,4 +1,28 @@
 
+Release 1.4.0 (21 Feb 2009, svn r455)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+1.4.0 adds support for Valgrind versions 3.4.x, and fixes a
+number of bugs reported in 1.3.0.
+
+NEW FUNCTIONALITY:
+
+- Support for Valgrind 3.4.x XML format
+
+BUGS and PROBLEMS FIXED:
+
+- Require Valgrind version 3.4.x, and fix a couple of quoting problems.
+
+- Per-user temp directory, rather than one for all users.
+
+- Make the detection of Valgrind more strict.  If no Valgrind is
+  detected, or the version number is wrong, just stop.
+
+- Save log: Don't use QDir::rename, since that fails when src and dst
+  are not in the same partition. Copy and delete the original instead.
+
+- Other small bug fixes.
+
+
 Release 1.3.0 (30 June 2008)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1.3.0 adds support for Valgrind versions 3.3.0 and 3.3.1, and fixes a

[Valgrind-valkyrie-dev] valkyrie: r507 - trunk

[<sv...@va...>]

Author: cerion
Date: 2010-09-05 18:11:53 +0100 (Sun, 05 Sep 2010)
New Revision: 507

Log:
Updated NEWS for release 1.4.0: was missed back then.
Release 1.4.0 was tagged & branched @ svn r455




Modified:
   trunk/NEWS


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2010-09-05 13:06:31 UTC (rev 506)
+++ trunk/NEWS	2010-09-05 17:11:53 UTC (rev 507)
@@ -1,4 +1,28 @@
 
+Release 1.4.0 (21 Feb 2009, svn r455)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+1.4.0 adds support for Valgrind versions 3.4.x, and fixes a
+number of bugs reported in 1.3.0.
+
+NEW FUNCTIONALITY:
+
+- Support for Valgrind 3.4.x XML format
+
+BUGS and PROBLEMS FIXED:
+
+- Require Valgrind version 3.4.x, and fix a couple of quoting problems.
+
+- Per-user temp directory, rather than one for all users.
+
+- Make the detection of Valgrind more strict.  If no Valgrind is
+  detected, or the version number is wrong, just stop.
+
+- Save log: Don't use QDir::rename, since that fails when src and dst
+  are not in the same partition. Copy and delete the original instead.
+
+- Other small bug fixes.
+
+
 Release 1.3.0 (30 June 2008)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1.3.0 adds support for Valgrind versions 3.3.0 and 3.3.1, and fixes a

[Valgrind-valkyrie-dev] valkyrie: r506 - branches

[<sv...@va...>]

Author: cerion
Date: 2010-09-05 14:06:31 +0100 (Sun, 05 Sep 2010)
New Revision: 506

Log:
v1.3 (r449) was never branched: is now

Added:
   branches/VALKYRIE_1_3_BRANCH/


Copied: branches/VALKYRIE_1_3_BRANCH (from rev 449, trunk)

[Valgrind-valkyrie-dev] valkyrie: r505 - tags

[<sv...@va...>]

Author: cerion
Date: 2010-09-05 14:06:12 +0100 (Sun, 05 Sep 2010)
New Revision: 505

Log:
v1.3 (r449) was never tagged: is now

Added:
   tags/VALKYRIE_1_3_0/


Copied: tags/VALKYRIE_1_3_0 (from rev 449, trunk)

[Valgrind-valkyrie-dev] valkyrie: r504 - in branches/valkyrie_qt4port: . src

[<sv...@va...>]

Author: cerion
Date: 2010-09-05 05:20:42 +0100 (Sun, 05 Sep 2010)
New Revision: 504

Log:
update svn:ignore's

Modified:
   branches/valkyrie_qt4port/
   branches/valkyrie_qt4port/src/



Property changes on: branches/valkyrie_qt4port
___________________________________________________________________
Name: svn:ignore
   + bin
Makefile




Property changes on: branches/valkyrie_qt4port/src
___________________________________________________________________
Name: svn:ignore
   + obj
moc
qrc_icons.cpp
vk_defines.h
Makefile

[Valgrind-valkyrie-dev] valkyrie: r503 - in branches/valkyrie_qt4port: . doc doc/images src src/help src/options src/toolview src/utils

[<sv...@va...>]

Author: cerion
Date: 2010-09-05 05:08:09 +0100 (Sun, 05 Sep 2010)
New Revision: 503

Log:
1) Fixed up the build system so we can now do make install
2) Hacked a way to have qmake-time variables (e.g. install-dir) dumped to a vk_defines.h for inclusion in the code.
3) Rearranged / cleaned up the source tree.




Added:
   branches/valkyrie_qt4port/src/
   branches/valkyrie_qt4port/src/help/
   branches/valkyrie_qt4port/src/main.cpp
   branches/valkyrie_qt4port/src/mainwindow.cpp
   branches/valkyrie_qt4port/src/mainwindow.h
   branches/valkyrie_qt4port/src/objects/
   branches/valkyrie_qt4port/src/options/
   branches/valkyrie_qt4port/src/src.pro
   branches/valkyrie_qt4port/src/toolview/
   branches/valkyrie_qt4port/src/toolview/vglogview.cpp
   branches/valkyrie_qt4port/src/toolview/vglogview.h
   branches/valkyrie_qt4port/src/utils/
   branches/valkyrie_qt4port/vk_config.pri
Removed:
   branches/valkyrie_qt4port/doc/Makefile.am
   branches/valkyrie_qt4port/doc/images/Makefile.am
   branches/valkyrie_qt4port/help/
   branches/valkyrie_qt4port/main.cpp
   branches/valkyrie_qt4port/mainwindow.cpp
   branches/valkyrie_qt4port/mainwindow.h
   branches/valkyrie_qt4port/objects/
   branches/valkyrie_qt4port/options/
   branches/valkyrie_qt4port/src/toolview/vglogview.cpp
   branches/valkyrie_qt4port/src/toolview/vglogview.h
   branches/valkyrie_qt4port/toolview/
   branches/valkyrie_qt4port/utils/
Modified:
   branches/valkyrie_qt4port/src/utils/vk_config.cpp
   branches/valkyrie_qt4port/src/utils/vk_config.h
   branches/valkyrie_qt4port/valkyrie.pro


[... diff too large to include ...]

[Valgrind-valkyrie-dev] valkyrie: r502 - branches/valkyrie_qt4port/toolview

[<sv...@va...>]

Author: cerion
Date: 2010-09-04 13:52:39 +0100 (Sat, 04 Sep 2010)
New Revision: 502

Log:
Update the XML element map for valgrind, as described in:
valgrind/docs/internals/xml-output-protocol4.txt

Clears up an error (undefined TEXT element), and fills in the remaining blanks for future use.




Modified:
   branches/valkyrie_qt4port/toolview/vglogview.cpp
   branches/valkyrie_qt4port/toolview/vglogview.h


Modified: branches/valkyrie_qt4port/toolview/vglogview.cpp
===================================================================
--- branches/valkyrie_qt4port/toolview/vglogview.cpp	2010-09-03 03:34:59 UTC (rev 501)
+++ branches/valkyrie_qt4port/toolview/vglogview.cpp	2010-09-04 12:52:39 UTC (rev 502)
@@ -60,6 +60,7 @@
    etmap["kind"]             = VG_ELEM::KIND;
    etmap["what"]             = VG_ELEM::WHAT;
    etmap["xwhat"]            = VG_ELEM::XWHAT;
+   etmap["text"]             = VG_ELEM::TEXT;
    etmap["stack"]            = VG_ELEM::STACK;
    etmap["frame"]            = VG_ELEM::FRAME;
    etmap["ip"]               = VG_ELEM::IP;
@@ -71,6 +72,7 @@
    etmap["auxwhat"]          = VG_ELEM::AUXWHAT;
    etmap["xauxwhat"]         = VG_ELEM::XAUXWHAT;
    etmap["announcethread"]   = VG_ELEM::ANNOUNCETHREAD;
+   etmap["hthreadid"]        = VG_ELEM::HTHREADID;
    etmap["errorcounts"]      = VG_ELEM::ERRORCOUNTS;
    etmap["pair"]             = VG_ELEM::PAIR;
    etmap["count"]            = VG_ELEM::COUNT;
@@ -79,6 +81,11 @@
    etmap["leakedbytes"]      = VG_ELEM::LEAKEDBYTES;
    etmap["leakedblocks"]     = VG_ELEM::LEAKEDBLOCKS;
    etmap["suppression"]      = VG_ELEM::SUPPRESSION;
+   etmap["sname"]            = VG_ELEM::SNAME;
+   etmap["skind"]            = VG_ELEM::SKIND;
+   etmap["skaux"]            = VG_ELEM::SKAUX;
+   etmap["sframe"]           = VG_ELEM::SFRAME;
+   etmap["rawtext"]          = VG_ELEM::RAWTEXT;
    return etmap;
 }
 

Modified: branches/valkyrie_qt4port/toolview/vglogview.h
===================================================================
--- branches/valkyrie_qt4port/toolview/vglogview.h	2010-09-03 03:34:59 UTC (rev 501)
+++ branches/valkyrie_qt4port/toolview/vglogview.h	2010-09-04 12:52:39 UTC (rev 502)
@@ -107,11 +107,11 @@
       LOGQUAL, VAR, VALUE, COMMENT,
       ARGS, VARGV, ARGV, EXE, ARG,
       STATUS, STATE, TIME,
-      ERROR, UNIQUE, TID, KIND, WHAT, XWHAT, STACK,
+      ERROR, UNIQUE, TID, KIND, WHAT, XWHAT, TEXT, STACK,
       FRAME, IP, OBJ, FN, SRCDIR, SRCFILE, LINE, AUXWHAT, XAUXWHAT,
-      ERRORCOUNTS, ANNOUNCETHREAD, PAIR, COUNT,
+      ERRORCOUNTS, ANNOUNCETHREAD, HTHREADID, PAIR, COUNT,
       SUPPCOUNTS, NAME, LEAKEDBYTES, LEAKEDBLOCKS,
-      SUPPRESSION,
+      SUPPRESSION, SNAME, SKIND, SKAUX, SFRAME, RAWTEXT,
       NUM_ELEMS
    };
 }

[Valgrind-valkyrie-dev] valkyrie: r501 - in branches/valkyrie_qt4port: . help

[<sv...@va...>]

Author: cerion
Date: 2010-09-03 04:34:59 +0100 (Fri, 03 Sep 2010)
New Revision: 501

Log:
minor tweaks

Modified:
   branches/valkyrie_qt4port/help/help_handbook.cpp
   branches/valkyrie_qt4port/mainwindow.cpp


Modified: branches/valkyrie_qt4port/help/help_handbook.cpp
===================================================================
--- branches/valkyrie_qt4port/help/help_handbook.cpp	2010-09-03 03:34:26 UTC (rev 500)
+++ branches/valkyrie_qt4port/help/help_handbook.cpp	2010-09-03 03:34:59 UTC (rev 501)
@@ -157,7 +157,7 @@
    //  - count how many actions from there
    //  - remove that first action if necessary
    int nActsBefore = 0;
-   QAction* actFirst;
+   QAction* actFirst = 0;
    foreach( actFirst, bookmarkMenu->actions() ) {
       // skip non-bookmark actions
       if ( actFirst->objectName() == QString::fromUtf8( "handbook_actBookmark" ) ) {
@@ -168,6 +168,7 @@
    }
    
    if (( bookmarkMenu->actions().count() - nActsBefore ) > max_bookmarks ) {
+      vk_assert( actFirst );
       bookmarkMenu->removeAction( actFirst );
       delete actFirst;
    }

Modified: branches/valkyrie_qt4port/mainwindow.cpp
===================================================================
--- branches/valkyrie_qt4port/mainwindow.cpp	2010-09-03 03:34:26 UTC (rev 500)
+++ branches/valkyrie_qt4port/mainwindow.cpp	2010-09-03 03:34:59 UTC (rev 501)
@@ -369,6 +369,7 @@
    menuFile->addAction( actFile_OpenProj );
    menuFile->addSeparator();
    menuFile->addAction( actFile_Close );
+   menuFile->addSeparator();
    menuFile->addAction( actFile_Exit );
    
    menuEdit->addAction( actEdit_Options );

[Valgrind-valkyrie-dev] valkyrie: r500 - branches/valkyrie_qt4port/toolview

[<sv...@va...>]

Author: cerion
Date: 2010-09-03 04:34:26 +0100 (Fri, 03 Sep 2010)
New Revision: 500

Log:
Fix treeitem child setup & expand.
Now src items are not opened by default: gives clearer overview.




Modified:
   branches/valkyrie_qt4port/toolview/helgrind_logview.cpp
   branches/valkyrie_qt4port/toolview/vglogview.cpp
   branches/valkyrie_qt4port/toolview/vglogview.h


Modified: branches/valkyrie_qt4port/toolview/helgrind_logview.cpp
===================================================================
--- branches/valkyrie_qt4port/toolview/helgrind_logview.cpp	2010-04-07 23:20:12 UTC (rev 499)
+++ branches/valkyrie_qt4port/toolview/helgrind_logview.cpp	2010-09-03 03:34:26 UTC (rev 500)
@@ -94,7 +94,7 @@
    QDomElement hthreadid = elem.firstChildElement();
 #ifdef DEBUG_ON
    if ( hthreadid.tagName() != "hthreadid" ) {
-      vkPrintErr( "AnnounceThreadItem::setupChildren(): unexpected tagName: %s",
+      vkPrintErr( "AnnounceThreadItem::AnnounceThreadItem(): unexpected tagName: %s",
                   qPrintable( hthreadid.tagName() ) );
    }
 #endif

Modified: branches/valkyrie_qt4port/toolview/vglogview.cpp
===================================================================
--- branches/valkyrie_qt4port/toolview/vglogview.cpp	2010-04-07 23:20:12 UTC (rev 499)
+++ branches/valkyrie_qt4port/toolview/vglogview.cpp	2010-09-03 03:34:26 UTC (rev 500)
@@ -173,13 +173,8 @@
    setupChildren();
 
    // now we've loaded any child items from the model,
-   // we can open up any child items that themselves have children
-   for ( int i=0; i<this->childCount(); ++i ) {
-      QTreeWidgetItem* chld = this->child( i );
-      if ( chld->childCount() > 0 ) {
-         chld->setExpanded( true );
-      }
-   }
+   // we can open the item without jitter.
+   this->setExpanded( true );
 }
 
 
@@ -694,7 +689,8 @@
          }
 #endif
          last_item = new FrameItem( this, last_item, e );
-         last_item->openChildren();
+         // don't open children: just set them up.
+         last_item->setupChildren();
       }
    }
 }

Modified: branches/valkyrie_qt4port/toolview/vglogview.h
===================================================================
--- branches/valkyrie_qt4port/toolview/vglogview.h	2010-04-07 23:20:12 UTC (rev 499)
+++ branches/valkyrie_qt4port/toolview/vglogview.h	2010-09-03 03:34:26 UTC (rev 500)
@@ -95,7 +95,6 @@
 private:
    QDomDocument vglog;
    QTreeWidget* view;    // we don't own this: don't cleanup
-
 };
 
 
@@ -148,6 +147,8 @@
    VgOutputItem* parent();
 
    void openChildren();
+   // all (non-root) items with children must reimplement this:
+   virtual void setupChildren() {}
 
    // useful static data + functions for mapping tagname -> enum
    static ElemTypeMap elemtypeMap;
@@ -167,8 +168,6 @@
 
 private:
    void initialise();
-   // all (non-root) items with children must reimplement this:
-   virtual void setupChildren() {}
 };
 
 
@@ -207,7 +206,7 @@
 {
 public:
    InfoItem( VgOutputItem* parent, QDomElement root );
-private:
+
    void setupChildren();
 };
 
@@ -217,7 +216,7 @@
 {
 public:
    LogQualItem( VgOutputItem* parent, QDomElement logqual );
-private:
+
    void setupChildren();
 };
 
@@ -228,7 +227,7 @@
 public:
    ArgsItem( VgOutputItem* parent, QTreeWidgetItem* after,
              QDomElement vgargs );
-private:
+
    void setupChildren();
 };
 
@@ -239,7 +238,7 @@
 public:
    PreambleItem( VgOutputItem* parent, QTreeWidgetItem* after,
                  QDomElement preamble );
-private:
+
    void setupChildren();
 };
 
@@ -260,13 +259,12 @@
    void showFullSrcPath( bool show );
    bool isFullSrcPathShown();
 
+   void setupChildren();
+
 protected:
    QString getErrorAcronym( ErrorItem::AcronymMap map, QString kind );
 
 private:
-   void setupChildren();
-
-private:
    QString err_tmplt;
    bool fullSrcPathShown;
 };
@@ -279,7 +277,7 @@
 public:
    StackItem( VgOutputItem* parent, QTreeWidgetItem* after,
               QDomElement stck );
-private:
+
    void setupChildren();
 };
 
@@ -293,7 +291,6 @@
 
    QString describe_IP( bool withPath = false );
 
-private:
    void setupChildren();
 };
 
@@ -313,7 +310,7 @@
 public:
    SuppCountsItem( VgOutputItem* parent, QTreeWidgetItem* after,
                    QDomElement sc );
-private:
+
    void setupChildren();
 };
 

Re: [Valgrind-valkyrie-dev] Timetable for new release?

[Cerion Armour-B. <ce...@ke...>]

Hi Harry,

Yeah, missed the Ubuntu release, unfortunately: too much going on in my 
private life.
However, development is pretty far along: the svn trunk has a working 
Qt4 port that works with the (soon to be released) Valgrind 3.6, but 
it's in need of some serious testing.

You can access the latest Valkyrie via:
svn co svn://svn.valgrind.org/valkyrie/branches/valkyrie_qt4port

And Valgrind 3.6 via:
http://www.valgrind.org/downloads/repository.html

If you care to try it out, I'd appreciate any feedback you may have!

Regards,
Cerion




On 9/1/10 8:08 PM, Harry Dellicker wrote:
> Cerion,
>
> I have recently installed ubuntu 10.04 which includes packages for
> valgrind 3.5.0 and valkyrie 1.4, which don't work together.
>
> Do you have a timetable in mind for the release of a new version of
> valkyrie which will work with valgrind 3.5?
>
> I have tried building valgrind 3.4.1 on this platform, as an interim
> solution, but have had no luck getting it to build.
>
> Thanks,
> Harry Dellicker
>