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

List:       kde-commits
Subject:    KDE/kdepim/kode
From:       Allen Winter <winter () kde ! org>
Date:       2006-10-03 14:55:05
Message-ID: 1159887305.568442.8591.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 591988 by winterz:

put ParserXsd into the RNG namespace, as is done for the ParserRelaxNg


 M  +12 -12    kxforms/mainwindow.cpp  
 M  +1 -1      kxml_compiler/kxml_compiler.cpp  
 M  +2 -0      kxml_compiler/parserxsd.cpp  
 M  +5 -1      kxml_compiler/parserxsd.h  


--- trunk/KDE/kdepim/kode/kxforms/mainwindow.cpp #591987:591988
@@ -99,7 +99,7 @@
 {
   if ( !url.isValid() ) {
     KMessageBox::sorry( this, i18n("Invalid URL '%1'.",
-        url.prettyUrl() ) );    
+        url.prettyUrl() ) );
     return false;
   }
 
@@ -112,10 +112,10 @@
 {
   if ( !url.isValid() ) {
     KMessageBox::sorry( this, i18n("Invalid URL '%1'.",
-        url.prettyUrl() ) );    
+        url.prettyUrl() ) );
     return false;
   }
-  
+
   mDataFile->setUrl( url );
 
   return save();
@@ -205,7 +205,7 @@
 
   if ( !url.isValid() ) {
     KMessageBox::sorry( this, i18n("Invalid URL '%1'.",
-        url.prettyUrl() ) );    
+        url.prettyUrl() ) );
     return;
   }
 
@@ -225,16 +225,16 @@
 
 void MainWindow::parseSchema()
 {
-  ParserXsd parser;
+  RNG::ParserXsd parser;
   Schema::Document schemaDocument = parser.parse( mSchemaFile->data() );
 
   KXForms::FormCreator creator;
 
   Hints schemaHints;
   schemaHints.extractHints( schemaDocument );
-  
+
 //  schemaHints.dump();
-  
+
   creator.setHints( schemaHints );
 
   if ( mHintsFile->isLoaded() ) {
@@ -243,10 +243,10 @@
 //    hints.dump();
     creator.mergeHints( hints );
   }
-  
+
   creator.hints().dump();
   QString form = creator.create( schemaDocument );
- 
+
   parseForm( form );
 }
 
@@ -256,7 +256,7 @@
 
   if ( !url.isValid() ) {
     KMessageBox::sorry( this, i18n("Invalid URL '%1'.",
-        url.prettyUrl() ) );    
+        url.prettyUrl() ) );
     return;
   }
 
@@ -278,7 +278,7 @@
 {
   if ( !url.isValid() ) {
     KMessageBox::sorry( this, i18n("Invalid URL '%1'.",
-        url.prettyUrl() ) );    
+        url.prettyUrl() ) );
     return;
   }
 
@@ -317,7 +317,7 @@
   KResult result = mFormsManager.loadData( mDataFile->data() );
   if ( result ) {
     setCaption( mDataFile->url().prettyUrl() );
-  } else {    
+  } else {
     KMessageBox::sorry( this, result.fullMessage(),
       i18n("Error loading data") );
   }
--- trunk/KDE/kdepim/kode/kxml_compiler/kxml_compiler.cpp #591987:591988
@@ -108,7 +108,7 @@
 
   QFileInfo fi( schemaFile );
   if ( args->isSet( "xsd" ) || fi.suffix() == "xsd" ) {
-    ParserXsd p;
+    RNG::ParserXsd p;
     p.setVerbose( verbose );
 
     schemaDocument = p.parse( schemaFile );
--- trunk/KDE/kdepim/kode/kxml_compiler/parserxsd.cpp #591987:591988
@@ -31,6 +31,8 @@
 
 #include <QDebug>
 
+using namespace RNG;
+
 ParserXsd::ParserXsd() : mVerbose ( false )
 {
 }
--- trunk/KDE/kdepim/kode/kxml_compiler/parserxsd.h #591987:591988
@@ -29,11 +29,13 @@
 
 #include <QFile>
 
+namespace RNG {
+
 class KSCHEMA_EXPORT ParserXsd
 {
   public:
     ParserXsd();
-    
+
     Schema::Document parse( QFile & );
     Schema::Document parse( const QString & );
     void setVerbose( bool verbose );
@@ -51,4 +53,6 @@
     bool mVerbose;
 };
 
+}
+
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]