The makefile linked wrong, just some cleanup..

The linking again, before i did find it..
The api documentation now include the widget baseclasses
Just some cleanup in the namespace, I still have to change all variablenames =(

diff --git a/eonsl/widgets/attack.h b/eonsl/widgets/attack.h
index 2bdb03c3e5e3736837224dbb384b364566912658..61bd8aa7fc91051f892d7051b0b53641f3d83635 100644 (file)
--- a/eonsl/widgets/attack.h
+++ b/eonsl/widgets/attack.h
@@ -1,13 +1,13 @@
 /****************************************************************************
 ** Form interface generated from reading ui file 'eonsl/widgets/attack.ui'
 **
-** Created: Wed Dec 27 19:32:26 2000
+** Created: Wed Dec 27 22:04:13 2000
 **      by:  The User Interface Compiler (uic)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
-#ifndef NONAME_H
-#define NONAME_H
+#ifndef ATTACKBASE_H
+#define ATTACKBASE_H
 
 #include <qvariant.h>
 #include <qdialog.h>
@@ -20,13 +20,13 @@ class QLabel;
 class QPushButton;
 class QRadioButton;
 
-class NoName : public QDialog
+class CAttackBase : public QDialog
 { 
     Q_OBJECT
 
 public:
-    NoName( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
-    ~NoName();
+    CAttackBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    ~CAttackBase();
 
     QPushButton* QPushButton_1;
     QComboBox* QComboBox_3;
@@ -51,4 +51,4 @@ protected:
     QVBoxLayout* Layout44;
 };
 
-#endif // NONAME_H
+#endif // ATTACKBASE_H

diff --git a/eonsl/widgets/attack.ui b/eonsl/widgets/attack.ui
index 3cf85389cec27a5d01c35b72eb36d885f7417689..8b14adccd2601246169e42447554a7d145c928ea 100644 (file)
--- a/eonsl/widgets/attack.ui
+++ b/eonsl/widgets/attack.ui
@@ -1,17 +1,17 @@
 <!DOCTYPE UI><UI>
-<class>NoName</class>
+<class>CAttackBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
-        <cstring>NoName</cstring>
+        <cstring>AttackBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>406</width>
+            <width>402</width>
             <height>440</height>
         </rect>
     </property>

diff --git a/eonsl/widgets/closeweapon.h b/eonsl/widgets/closeweapon.h
index a6b0e816c26580d612a487e52eb0a87d3f74ff8d..53d81d71b3cb4835813518adec331575d63e3e50 100644 (file)
--- a/eonsl/widgets/closeweapon.h
+++ b/eonsl/widgets/closeweapon.h
@@ -1,13 +1,13 @@
 /****************************************************************************
 ** Form interface generated from reading ui file 'eonsl/widgets/closeweapon.ui'
 **
-** Created: Wed Dec 27 19:32:28 2000
+** Created: Wed Dec 27 22:04:15 2000
 **      by:  The User Interface Compiler (uic)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
-#ifndef CLOSEWEAPONDIALOG_H
-#define CLOSEWEAPONDIALOG_H
+#ifndef CLOSEWEAPONEDIT_H
+#define CLOSEWEAPONEDIT_H
 
 #include <qvariant.h>
 #include <qdialog.h>
@@ -79,7 +79,7 @@ public slots:
     virtual void slotOK();
 
 protected:
-    QGridLayout* CloseWeaponDialogLayout;
+    QGridLayout* CloseWeaponEditLayout;
     QHBoxLayout* Layout1;
     QGridLayout* GroupBox3_2Layout;
     QVBoxLayout* Layout27;
@@ -104,4 +104,4 @@ protected:
     QVBoxLayout* Layout5;
 };
 
-#endif // CLOSEWEAPONDIALOG_H
+#endif // CLOSEWEAPONEDIT_H

diff --git a/eonsl/widgets/closeweapon.ui b/eonsl/widgets/closeweapon.ui
index b3441c031fba76fee49f907536f1b7aa803030f0..da6ca7a6b6de33a88beb4c275ddf61b2e6475bb7 100644 (file)
--- a/eonsl/widgets/closeweapon.ui
+++ b/eonsl/widgets/closeweapon.ui
@@ -6,7 +6,7 @@
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
-        <cstring>CloseWeaponDialog</cstring>
+        <cstring>CloseWeaponEdit</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
@@ -91,13 +91,6 @@
                             <height>20</height>
                         </size>
                     </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
                 </spacer>
                 <widget>
                     <class>QPushButton</class>
@@ -513,13 +506,6 @@
                             <height>20</height>
                         </size>
                     </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
                 </spacer>
                 <widget>
                     <class>QGroupBox</class>
@@ -808,13 +794,6 @@
                             <height>20</height>
                         </size>
                     </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
                 </spacer>
                 <widget>
                     <class>QLayoutWidget</class>
@@ -931,13 +910,6 @@
                             <height>20</height>
                         </size>
                     </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
                 </spacer>
                 <widget>
                     <class>QLayoutWidget</class>
@@ -1042,25 +1014,25 @@
     <connection>
         <sender>buttonCancel</sender>
         <signal>clicked()</signal>
-        <receiver>CloseWeaponDialog</receiver>
+        <receiver>CloseWeaponEdit</receiver>
         <slot>reject()</slot>
     </connection>
     <connection>
         <sender>buttonApply</sender>
         <signal>clicked()</signal>
-        <receiver>CloseWeaponDialog</receiver>
+        <receiver>CloseWeaponEdit</receiver>
         <slot>slotApply()</slot>
     </connection>
     <connection>
         <sender>buttonOk</sender>
         <signal>clicked()</signal>
-        <receiver>CloseWeaponDialog</receiver>
+        <receiver>CloseWeaponEdit</receiver>
         <slot>slotOK()</slot>
     </connection>
     <connection>
         <sender>buttonHelp</sender>
         <signal>clicked()</signal>
-        <receiver>CloseWeaponDialog</receiver>
+        <receiver>CloseWeaponEdit</receiver>
         <slot>slotHelp()</slot>
     </connection>
     <slot access="public">slotHelp()</slot>

diff --git a/eonsl/widgets/coin.h b/eonsl/widgets/coin.h
index 6a13803a261707e54185930b2be3f4969d751d8a..083a994566cf83a512b2e1b6ccb42a7654c70ae7 100644 (file)
--- a/eonsl/widgets/coin.h
+++ b/eonsl/widgets/coin.h
@@ -1,13 +1,13 @@
 /****************************************************************************
 ** Form interface generated from reading ui file 'eonsl/widgets/coin.ui'
 **
-** Created: Wed Dec 27 19:32:30 2000
+** Created: Wed Dec 27 22:04:17 2000
 **      by:  The User Interface Compiler (uic)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
-#ifndef NONAME_H
-#define NONAME_H
+#ifndef COINEDIT_H
+#define COINEDIT_H
 
 #include <qvariant.h>
 #include <qdialog.h>
@@ -20,13 +20,13 @@ class QLineEdit;
 class QPushButton;
 class QSpinBox;
 
-class NoName : public QDialog
+class CCoinEditBase : public QDialog
 { 
     Q_OBJECT
 
 public:
-    NoName( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
-    ~NoName();
+    CCoinEditBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    ~CCoinEditBase();
 
     QPushButton* OKButton;
     QPushButton* AvslutaButton;
@@ -41,4 +41,4 @@ public:
 
 };
 
-#endif // NONAME_H
+#endif // COINEDIT_H

diff --git a/eonsl/widgets/coin.ui b/eonsl/widgets/coin.ui
index 1e1066bfdff0cce4bf2603953cbd7fc68113453b..652ccfcd3f7b0b85061f3749f8606043d6623147 100644 (file)
--- a/eonsl/widgets/coin.ui
+++ b/eonsl/widgets/coin.ui
@@ -1,17 +1,17 @@
 <!DOCTYPE UI><UI>
-<class>NoName</class>
+<class>CCoinEditBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
-        <cstring>NoName</cstring>
+        <cstring>CoinEdit</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>336</width>
+            <width>332</width>
             <height>300</height>
         </rect>
     </property>
@@ -154,6 +154,10 @@
             <name>text</name>
             <string>Antal</string>
         </property>
+        <property>
+            <name>buddy</name>
+            <cstring></cstring>
+        </property>
     </widget>
     <widget>
         <class>QLineEdit</class>

diff --git a/eonsl/widgets/creatureedit.ui b/eonsl/widgets/creatureedit.ui
index 6a8551397cd80599561f36dd05f0afc4fd2ca625..52a83479ad8de771ad059640511ea69e1e2e05ab 100644 (file)
--- a/eonsl/widgets/creatureedit.ui
+++ b/eonsl/widgets/creatureedit.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI>
-<class>NoName</class>
+<class>CCreatureEditBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
-        <cstring>NoName</cstring>
+        <cstring>CreatureEdit</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>

diff --git a/eonsl/widgets/equipment.ui b/eonsl/widgets/equipment.ui
index 828861f693edc9582996c973a4d16c1b6b3cdc6d..e0ef07f9f9831dbb34a5d4a4bdc37f48dc9172e5 100644 (file)
--- a/eonsl/widgets/equipment.ui
+++ b/eonsl/widgets/equipment.ui
@@ -1,17 +1,17 @@
 <!DOCTYPE UI><UI>
-<class>Form1</class>
+<class>CEquipmentEditBase</class>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
-        <cstring>Form1</cstring>
+        <cstring>EquipmentEdit</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>524</width>
+            <width>516</width>
             <height>399</height>
         </rect>
     </property>
@@ -278,13 +278,6 @@
                             <height>20</height>
                         </size>
                     </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
                 </spacer>
                 <widget>
                     <class>QPushButton</class>
@@ -328,13 +321,6 @@
                             <height>20</height>
                         </size>
                     </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
                 </spacer>
             </vbox>
         </widget>
@@ -358,13 +344,6 @@
                     <height>20</height>
                 </size>
             </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
         </spacer>
         <spacer row="0"  column="1" >
             <property>
@@ -386,13 +365,6 @@
                     <height>20</height>
                 </size>
             </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
         </spacer>
         <widget row="0"  column="4" >
             <class>QGroupBox</class>

diff --git a/eonsl/widgets/item.ui b/eonsl/widgets/item.ui
index f5f686ebd3fb1287e5fcfe3abe1e1c31837a0013..746c9633bb575a12e1d5c13cac4c5674483b06f7 100644 (file)
--- a/eonsl/widgets/item.ui
+++ b/eonsl/widgets/item.ui
@@ -1,17 +1,17 @@
 <!DOCTYPE UI><UI>
-<class>NoName</class>
+<class>CItemEditBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
-        <cstring>NoName</cstring>
+        <cstring>ItemEdit</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>246</width>
+            <width>238</width>
             <height>220</height>
         </rect>
     </property>

diff --git a/eonsl/widgets/rangeweapon.ui b/eonsl/widgets/rangeweapon.ui
index 067c08b21c95879cb2811d282b6d32e83d421260..fe421afd5a5fa9997834ea66900130b33dc56ed0 100644 (file)
--- a/eonsl/widgets/rangeweapon.ui
+++ b/eonsl/widgets/rangeweapon.ui
@@ -1,17 +1,17 @@
 <!DOCTYPE UI><UI>
-<class>NoName</class>
+<class>CRangeWeaponEditBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
-        <cstring>NoName</cstring>
+        <cstring>RangeWeaponEdit</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>444</width>
+            <width>440</width>
             <height>479</height>
         </rect>
     </property>

diff --git a/eonsl/widgets/shield.ui b/eonsl/widgets/shield.ui
index fb97b34d60f504d0c008755312179f12c2bfeac0..48c097386400ab8dca71f6fcaa7ef72da733017a 100644 (file)
--- a/eonsl/widgets/shield.ui
+++ b/eonsl/widgets/shield.ui
@@ -1,17 +1,17 @@
 <!DOCTYPE UI><UI>
-<class>NoName</class>
+<class>CShieldEditBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
-        <cstring>NoName</cstring>
+        <cstring>ShieldEdit</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>407</width>
+            <width>403</width>
             <height>291</height>
         </rect>
     </property>

diff --git a/eonsl/widgets/war.ui b/eonsl/widgets/war.ui
index 7452a55e50f9ae5d6258a62f8708da001921082a..46e5e31c63905338f6a222b1cbbe9816dd61d292 100644 (file)
--- a/eonsl/widgets/war.ui
+++ b/eonsl/widgets/war.ui
@@ -1,17 +1,17 @@
 <!DOCTYPE UI><UI>
-<class>NoName</class>
+<class>CWarBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
-        <cstring>NoName</cstring>
+        <cstring>War</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>406</width>
+            <width>402</width>
             <height>470</height>
         </rect>
     </property>
@@ -54,6 +54,10 @@
             <name>text</name>
             <string>Involverad med:</string>
         </property>
+        <property>
+            <name>buddy</name>
+            <cstring></cstring>
+        </property>
     </widget>
     <widget>
         <class>QLabel</class>