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

List:       kde-commits
Subject:    KDE/kdeutils/ark
From:       Laurent Montel <montel () kde ! org>
Date:       2005-09-18 9:32:54
Message-ID: 1127035974.348694.10450.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 461611 by mlaurent:

Remove some Q3CString
All can't convert because we must use kdelibs from trunk


 M  +2 -2      ar.h  
 M  +2 -2      arch.cpp  
 M  +4 -4      arch.h  
 M  +3 -3      arkfactory.cpp  
 M  +2 -2      compressedfile.h  
 M  +2 -2      lha.cpp  
 M  +3 -3      lha.h  
 M  +2 -2      rar.cpp  
 M  +3 -3      rar.h  
 M  +1 -1      tar.cpp  
 M  +2 -2      zoo.cpp  
 M  +3 -3      zoo.h  


--- trunk/KDE/kdeutils/ark/ar.h #461610:461611
@@ -1,5 +1,5 @@
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 //  -*-C++-*-           emacs magic for .h files
 /*
 
@@ -33,7 +33,7 @@
 #define ARARCH_H
 
 class QString;
-class Q3CString;
+class QByteArray;
 class QStringList;
 
 class Arch;
--- trunk/KDE/kdeutils/ark/arch.cpp #461610:461611
@@ -34,7 +34,7 @@
 #include <qapplication.h>
 #include <qfile.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 // KDE includes
 #include <kdebug.h>
@@ -299,7 +299,7 @@
   data[ length ] = c;
 }
 
-bool Arch::processLine( const Q3CString &line )
+bool Arch::processLine( const QByteArray &line )
 {
   QString columns[ 11 ];
   unsigned int pos = 0;
--- trunk/KDE/kdeutils/ark/arch.h #461610:461611
@@ -59,7 +59,7 @@
 #include <kurl.h>
 #include <qpair.h>
 
-class Q3CString;
+class QByteArray;
 class QStringList;
 class KProcess;
 
@@ -153,7 +153,7 @@
 
     void slotReceivedOutput( KProcess *, char*, int );
 
-    virtual bool processLine( const Q3CString &line );
+    virtual bool processLine( const QByteArray &line );
     virtual void slotReceivedTOC( KProcess *, char *, int );
 
   signals:
@@ -167,7 +167,7 @@
   protected:  // data
     QString m_filename;
     QString m_lastShellOutput;
-    Q3CString m_buffer;
+    QByteArray m_buffer;
     ArkWidget *m_gui;
     bool m_bReadOnly; // for readonly archives
     bool m_error;
@@ -182,7 +182,7 @@
     QString m_unarchiver_program;
 
     // Archive parsing information
-    Q3CString m_headerString;
+    QByteArray m_headerString;
     bool m_header_removed, m_finished;
     Q3PtrList<ArchColumns> m_archCols;
     int m_numCols, m_dateCol, m_fixYear, m_fixMonth, m_fixDay, m_fixTime;
--- trunk/KDE/kdeutils/ark/arkfactory.cpp #461610:461611
@@ -25,7 +25,7 @@
 #include "ark_part.h"
 #include "arkfactory.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 KInstance* ArkFactory::s_instance = 0L;
 KAboutData* ArkFactory::s_about = 0L;
@@ -46,8 +46,8 @@
                   const QStringList &args )
 {
     bool readWrite = false; // for e.g. Browser/View or KParts::ReadOnlyPart
-    if ( Q3CString( classname ) == "KParts::ReadWritePart" 
-         || Q3CString( classname ) == "ArkPart" )
+    if ( QByteArray( classname ) == "KParts::ReadWritePart" 
+         || QByteArray( classname ) == "ArkPart" )
     {
             readWrite = true;
     }
--- trunk/KDE/kdeutils/ark/compressedfile.h #461610:461611
@@ -1,5 +1,5 @@
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 /*
 
     ark: A program for modifying archives via a GUI.
@@ -28,7 +28,7 @@
 #define COMPRESSED_FILE_H
 
 class QString;
-class Q3CString;
+class QByteArray;
 class QStringList;
 class KProcess;
 class KTempDir;
--- trunk/KDE/kdeutils/ark/lha.cpp #461610:461611
@@ -38,7 +38,7 @@
 #include <qfile.h>
 #include <qdir.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 // KDE includes
 #include <kdebug.h>
@@ -64,7 +64,7 @@
   m_headerString = "----";
 }
 
-bool LhaArch::processLine( const Q3CString &line )
+bool LhaArch::processLine( const QByteArray &line )
 {
   const char *_line = ( const char * ) line;
   char columns[13][80];
--- trunk/KDE/kdeutils/ark/lha.h #461610:461611
@@ -29,10 +29,10 @@
 
 #include "arch.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 class QString;
-class Q3CString;
+class QByteArray;
 class QStringList;
 
 class ArkWidget;
@@ -54,7 +54,7 @@
     virtual void unarchFileInternal();
 
   protected slots:
-    virtual bool processLine( const Q3CString &line );
+    virtual bool processLine( const QByteArray &line );
 
   private:
     void setHeaders();
--- trunk/KDE/kdeutils/ark/rar.cpp #461610:461611
@@ -33,7 +33,7 @@
 #include <qfile.h>
 #include <qdir.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 // KDE includes
 #include <kdebug.h>
@@ -77,7 +77,7 @@
   m_isFirstLine = true;
 }
 
-bool RarArch::processLine( const Q3CString &line )
+bool RarArch::processLine( const QByteArray &line )
 {
   if ( m_isFirstLine )
   {
--- trunk/KDE/kdeutils/ark/rar.h #461610:461611
@@ -26,10 +26,10 @@
 
 #include "arch.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 class QString;
-class Q3CString;
+class QByteArray;
 class QStringList;
 
 class ArkWidget;
@@ -52,7 +52,7 @@
     virtual bool passwordRequired();
 
   protected slots:
-    virtual bool processLine( const Q3CString & );
+    virtual bool processLine( const QByteArray & );
 
   private:
     void setHeaders();
--- trunk/KDE/kdeutils/ark/tar.cpp #461610:461611
@@ -52,7 +52,7 @@
 #include <qregexp.h>
 //Added by qt3to4:
 #include <Q3ValueList>
-#include <Q3CString>
+#include <QByteArray>
 
 // KDE includes
 #include <kapplication.h>
--- trunk/KDE/kdeutils/ark/zoo.cpp #461610:461611
@@ -35,7 +35,7 @@
 #include <qfile.h>
 #include <qdir.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 // KDE includes
 #include <kdebug.h>
@@ -63,7 +63,7 @@
   m_headerString = "----";
 }
 
-bool ZooArch::processLine( const Q3CString &line )
+bool ZooArch::processLine( const QByteArray &line )
 {
   const char *_line = ( const char * )line;
   char columns[11][80];
--- trunk/KDE/kdeutils/ark/zoo.h #461610:461611
@@ -27,10 +27,10 @@
 
 #include "arch.h"
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 
 class QString;
-class Q3CString;
+class QByteArray;
 class QStringList;
 
 class ArkWidget;
@@ -52,7 +52,7 @@
     virtual void unarchFileInternal();
 
   protected slots:
-    virtual bool processLine( const Q3CString &line );
+    virtual bool processLine( const QByteArray &line );
 
   private:
     void setHeaders();
[prev in list] [next in list] [prev in thread] [next in thread]