CVS commit by amantia: 

As I said: minor fixes after merging.


  M +1 -9      configure.in.in   1.45.2.2
  M +1 -1      quanta/parts/kfilereplace/kfilereplacepart.cpp   1.17
  M +12 -15    quanta/plugins/csseditor/specialsb.cpp   1.3
  M +16 -16    quanta/plugins/csseditor/specialsb.h   1.3
  M +1 -1      quanta/treeviews/tagattributetree.h   1.17


--- quanta/configure.in.in  #1.45.2.1:1.45.2.2
@@ -1,19 +1,11 @@
 #MIN_CONFIG(3.1)
 dnl If the quanta executable name and the data dirs are changed from the default "quanta"
-
 dnl the following changes are needed
-
 dnl  - change the quanta_datadi
-
 dnl  - change the PACKAGE and VERSION
-
 dnl  - change the KDE_ICON in quanta/data/icons/Makefile.a
-
 dnl  - create a .desktop file and the corresponding icon
-
 dnl  - make sure the .desktop file is installed in the quanta/Makefile.a
-
 dnl  - change the bin_PROGRAMS and the _SOURCES, _LDADD, _METASOURCES, _LDFLAG
-
 dnl    below it in the quanta/Makefile.am, so it reflects the new executable nam
 
@@ -22,5 +14,5 @@
 AM_INIT_AUTOMAKE(quanta_be,3.3-BE,no)
 
-AC_DEFINE(PACKAGE, "quanta", "package name defined here")
+AC_DEFINE(PACKAGE, "quanta_be", "package name defined here")
 
 AC_DEFINE(VERSION, "3.3 Bleeding Edge (2004-01-18)", "version defined here")

--- quanta/quanta/plugins/csseditor/specialsb.cpp  #1.2:1.3
@@ -21,23 +21,25 @@
 
 specialSB::specialSB(QWidget *parent, const char *name ) : QHBox(parent,name) {
-  m_sb=new QSpinBox(this);
-  m_cb=new QComboBox(this);
-  connect(m_cb, SIGNAL(activated ( const QString & )), this, SLOT(cbValueSlot(const QString&)));
-  connect(m_sb, SIGNAL(valueChanged ( const QString & )), this, SLOT(sbValueSlot(const QString&)));
+  sb=new QSpinBox(this);
+  cb=new QComboBox(this);
+  connect(cb, SIGNAL(activated ( const QString & )), this, SLOT(cbValueSlot(const QString&)));
+  connect(sb, SIGNAL(valueChanged ( const QString & )), this, SLOT(sbValueSlot(const QString&)));
 
 }
 
 specialSB::~specialSB(){
-  delete m_cb;
-  delete m_sb;
+  if(cb) delete cb;
+  cb = 0;
+  if(sb) delete sb;
+  sb = 0;
 }
 
 void specialSB::cbValueSlot(const QString& s){
-  m_cbValue=s;
-  emit valueChanged( m_sbValue + m_cbValue );
+  cbValue=s;
+  emit valueChanged( sbValue + cbValue );
 }
 void specialSB::sbValueSlot(const QString& s){
-  m_sbValue=s;
-  emit valueChanged( m_sbValue + m_cbValue);
+  sbValue=s;
+  emit valueChanged( sbValue + cbValue);
 }
 
@@ -66,9 +68,4 @@ lengthEditor::lengthEditor(QWidget *pare
   getComboBox()->insertItem("em");
   getComboBox()->insertItem("ex");
-  getComboBox()->insertItem("in");
-  getComboBox()->insertItem("cm");
-  getComboBox()->insertItem("mm");
-  getComboBox()->insertItem("pt");
-  getComboBox()->insertItem("pc");
   getSpinBox()->setMaxValue(99999);
 }

--- quanta/quanta/plugins/csseditor/specialsb.h  #1.2:1.3
@@ -31,8 +31,8 @@ class specialSB : public QHBox {
 
    private:
-     QComboBox *m_cb;
-     QSpinBox  *m_sb;
-     QString m_cbValue,
-             m_sbValue;
+     QComboBox *cb;
+     QSpinBox  *sb;
+     QString cbValue,
+             sbValue;
 
    public:
@@ -43,6 +43,6 @@ class specialSB : public QHBox {
      void reset();
 
-     QComboBox* getComboBox() const { return m_cb; }
-     QSpinBox* getSpinBox() const { return m_sb; }
+     QComboBox* getComboBox() const { return cb; }
+     QSpinBox* getSpinBox() const { return sb; }
    public slots:
      void cbValueSlot(const QString&);

--- quanta/quanta/treeviews/tagattributetree.h  #1.16:1.17
@@ -104,5 +104,5 @@ signals:
 
 private:
-  Node* m_node;
+  Node *m_node;
   Node *m_newNode;
   bool rebuildEnabled;