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

List:       kde-commits
Subject:    kdeextragear-1
From:       Dirk Mueller <mueller () kde ! org>
Date:       2004-12-29 3:40:22
Message-ID: 20041229034022.2EFC01B4A5 () office ! kde ! org
[Download RAW message or body]

CVS commit by mueller: 

fix compilation (gcc 4.0)


  M +3 -1      cdbakeoven/cdbowidgets/Makefile.am   1.10
  M +2 -2      k3b/libk3b/projects/audiocd/k3baudiodoc.h   1.4
  M +3 -4      k3b/libk3b/projects/audiocd/k3baudioimager.cpp   1.2
  M +1 -0      k3b/libk3b/projects/mixedcd/Makefile.am   1.3
  M +2 -2      k3b/libk3b/projects/videocd/k3bvcdjob.h   1.4
  M +2 -2      k3b/src/rip/k3bdvdripperwidget.h   1.13


--- kdeextragear-1/cdbakeoven/cdbowidgets/Makefile.am  #1.9:1.10
@@ -1,3 +1,5 @@
-INCLUDES = -I$(srcdir)/../cdboshared -I$(kde_includes)/arts $(all_includes)
+AM_CPPFLAGS = -I$(srcdir)/../cdboshared -I$(kde_includes)/arts $(all_includes) 
+
+KDE_CXXFLAGS = $(ENABLE_PERMISSIVE_FLAG)
 
 METASOURCES = AUTO

--- kdeextragear-1/k3b/libk3b/projects/audiocd/k3baudiodoc.h  #1.3:1.4
@@ -102,5 +102,5 @@ class K3bAudioDoc : public K3bDoc  
    * Represent the structure of the doc as CD Table of Contents.
    */
-  K3bDevice::Toc K3bAudioDoc::toToc() const;
+  K3bDevice::Toc toToc() const;
 
   K3bBurnJob* newBurnJob( K3bJobHandler*, QObject* parent = 0 );

--- kdeextragear-1/k3b/libk3b/projects/audiocd/k3baudioimager.cpp  #1.1:1.2
@@ -56,6 +56,5 @@ public:
     unsigned long long totalSize = m_doc->length().audioBytes();
     unsigned long long totalRead = 0;
-    int bufferSize = 2352*10;
-    char buffer[bufferSize];
+    char buffer[2352 * 10];
 
     while( track ) {
@@ -92,5 +91,5 @@ public:
       // Read data from the track
       //
-      while( (read = track->read( buffer, bufferSize )) > 0 ) {
+      while( (read = track->read( buffer, sizeof(buffer) )) > 0 ) {
         if( m_fd == -1 ) {
           waveFileWriter.write( buffer, read, K3bWaveFileWriter::BigEndian );

--- kdeextragear-1/k3b/libk3b/projects/mixedcd/Makefile.am  #1.2:1.3
@@ -1,4 +1,5 @@
 # we need the ../datacd and ../audiocd for the uic generated header files
 AM_CPPFLAGS=    -I$(srcdir)/../../core \
+                -I$(srcdir)/../../plugin \
                 -I$(srcdir)/../../../libk3bdevice \
                 -I$(srcdir)/../../tools \

--- kdeextragear-1/k3b/libk3b/projects/videocd/k3bvcdjob.h  #1.3:1.4
@@ -70,5 +70,5 @@ class K3bVcdJob : public K3bBurnJob
         void vcdxBuild();
         void parseInformation( QString );
-        void K3bVcdJob::startWriterjob();
+        void startWriterjob();
 
         int m_copies;

--- kdeextragear-1/k3b/src/rip/k3bdvdripperwidget.h  #1.12:1.13
@@ -42,5 +42,5 @@ class K3bDvdExtraRipStatus;
 class K3bDvdRipperWidget : public K3bInteractionDialog
 {
-  Q_OBJECT;
+  Q_OBJECT
 
  public: 


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