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

List:       kde-commits
Subject:    KDE/kdepim/kode
From:       Michaël Larouche <michael.larouche () kdemail ! net>
Date:       2006-06-29 0:37:37
Message-ID: 1151541457.132234.20447.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 556035 by mlarouche:

Use generated header for kwsdl_compiler and don't print license when using \
creationWarning in KODE::Printer

 M  +5 -2      kwsdl/creator.cpp  
 M  +5 -0      kwsdl/settings.cpp  
 M  +1 -0      kwsdl/settings.h  
 M  +4 -4      libkode/printer.cpp  


--- trunk/KDE/kdepim/kode/kwsdl/creator.cpp #556034:556035
@@ -79,13 +79,16 @@
   KODE::Printer printer;
   printer.setOutputDirectory( Settings::self()->outputDirectory() );
 
+  // Set generated header details.
+  printer.setCreationWarning(true);
+  printer.setGenerator( QLatin1String("kwsdl_compiler") );
+  printer.setSourceFile( Settings::self()->wsdlFileName() );
+
   KODE::Class::List classes = sortByBaseClass( list );
 
   KODE::File file;
 
   file.setFilename( Settings::self()->outputFileName() );
-  file.addCopyright( 2005, "Tobias Koenig", "tokoe@kde.org" );
-  file.setLicense( KODE::License( KODE::License::GPL ) );
 
   KODE::Class::List::ConstIterator it;
   for ( it = classes.begin(); it != classes.end(); ++it ) {
--- trunk/KDE/kdepim/kode/kwsdl/settings.cpp #556034:556035
@@ -124,6 +124,11 @@
   return mWsdlUrl.left( mWsdlUrl.lastIndexOf( '/' ) );
 }
 
+QString Settings::wsdlFileName() const
+{
+  return mWsdlUrl.mid( mWsdlUrl.lastIndexOf( '/' )+1 );
+}
+
 void Settings::setOutputFileName( const QString &outputFileName )
 {
   mOutputFileName = outputFileName;
--- trunk/KDE/kdepim/kode/kwsdl/settings.h #556034:556035
@@ -46,6 +46,7 @@
     void setWsdlUrl( const QString &wsdlUrl );
     QString wsdlUrl() const;
     QString wsdlBaseUrl() const;
+    QString wsdlFileName() const;
 
     void setOutputFileName( const QString &outputFileName );
     QString outputFileName() const;
--- trunk/KDE/kdepim/kode/libkode/printer.cpp #556034:556035
@@ -480,9 +480,9 @@
 
   if ( d->mCreationWarning )
     out += creationWarning();
+  else
+    out.addBlock( licenseHeader( file ) );
 
-  out.addBlock( licenseHeader( file ) );
-
   // Create include guard
   QString className = file.filename();
   className.replace( "-", "_" );
@@ -588,9 +588,9 @@
 
   if ( d->mCreationWarning )
     out += creationWarning();
+  else
+    out.addBlock( licenseHeader( file ) );
 
-  out.addBlock( licenseHeader( file ) );
-
   out.newLine();
 
   // Create includes


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