From 88987ed3058eed1c8fc57ed619375bb9a8838c59 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Wed, 27 Dec 2000 21:23:32 +0000 Subject: [PATCH] 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 =( --- eonsl/widgets/attack.h | 14 ++++++------- eonsl/widgets/attack.ui | 6 +++--- eonsl/widgets/closeweapon.h | 10 ++++----- eonsl/widgets/closeweapon.ui | 38 +++++------------------------------ eonsl/widgets/coin.h | 14 ++++++------- eonsl/widgets/coin.ui | 10 ++++++--- eonsl/widgets/creatureedit.ui | 4 ++-- eonsl/widgets/equipment.ui | 34 +++---------------------------- eonsl/widgets/item.ui | 6 +++--- eonsl/widgets/rangeweapon.ui | 6 +++--- eonsl/widgets/shield.ui | 6 +++--- eonsl/widgets/war.ui | 10 ++++++--- 12 files changed, 55 insertions(+), 103 deletions(-) diff --git a/eonsl/widgets/attack.h b/eonsl/widgets/attack.h index 2bdb03c..61bd8aa 100644 --- 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 #include @@ -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 3cf8538..8b14adc 100644 --- a/eonsl/widgets/attack.ui +++ b/eonsl/widgets/attack.ui @@ -1,17 +1,17 @@ -NoName +CAttackBase QDialog name - NoName + AttackBase geometry 0 0 - 406 + 402 440 diff --git a/eonsl/widgets/closeweapon.h b/eonsl/widgets/closeweapon.h index a6b0e81..53d81d7 100644 --- 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 #include @@ -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 b3441c0..da6ca7a 100644 --- a/eonsl/widgets/closeweapon.ui +++ b/eonsl/widgets/closeweapon.ui @@ -6,7 +6,7 @@ QDialog name - CloseWeaponDialog + CloseWeaponEdit geometry @@ -91,13 +91,6 @@ 20 - - sizeHint - - 20 - 20 - - QPushButton @@ -513,13 +506,6 @@ 20 - - sizeHint - - 20 - 20 - - QGroupBox @@ -808,13 +794,6 @@ 20 - - sizeHint - - 20 - 20 - - QLayoutWidget @@ -931,13 +910,6 @@ 20 - - sizeHint - - 20 - 20 - - QLayoutWidget @@ -1042,25 +1014,25 @@ buttonCancel clicked() - CloseWeaponDialog + CloseWeaponEdit reject() buttonApply clicked() - CloseWeaponDialog + CloseWeaponEdit slotApply() buttonOk clicked() - CloseWeaponDialog + CloseWeaponEdit slotOK() buttonHelp clicked() - CloseWeaponDialog + CloseWeaponEdit slotHelp() slotHelp() diff --git a/eonsl/widgets/coin.h b/eonsl/widgets/coin.h index 6a13803..083a994 100644 --- 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 #include @@ -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 1e1066b..652ccfc 100644 --- a/eonsl/widgets/coin.ui +++ b/eonsl/widgets/coin.ui @@ -1,17 +1,17 @@ -NoName +CCoinEditBase QDialog name - NoName + CoinEdit geometry 0 0 - 336 + 332 300 @@ -154,6 +154,10 @@ text Antal + + buddy + + QLineEdit diff --git a/eonsl/widgets/creatureedit.ui b/eonsl/widgets/creatureedit.ui index 6a85513..52a8347 100644 --- a/eonsl/widgets/creatureedit.ui +++ b/eonsl/widgets/creatureedit.ui @@ -1,10 +1,10 @@ -NoName +CCreatureEditBase QDialog name - NoName + CreatureEdit geometry diff --git a/eonsl/widgets/equipment.ui b/eonsl/widgets/equipment.ui index 828861f..e0ef07f 100644 --- a/eonsl/widgets/equipment.ui +++ b/eonsl/widgets/equipment.ui @@ -1,17 +1,17 @@ -Form1 +CEquipmentEditBase QWidget name - Form1 + EquipmentEdit geometry 0 0 - 524 + 516 399 @@ -278,13 +278,6 @@ 20 - - sizeHint - - 20 - 20 - - QPushButton @@ -328,13 +321,6 @@ 20 - - sizeHint - - 20 - 20 - - @@ -358,13 +344,6 @@ 20 - - sizeHint - - 20 - 20 - - @@ -386,13 +365,6 @@ 20 - - sizeHint - - 20 - 20 - - QGroupBox diff --git a/eonsl/widgets/item.ui b/eonsl/widgets/item.ui index f5f686e..746c963 100644 --- a/eonsl/widgets/item.ui +++ b/eonsl/widgets/item.ui @@ -1,17 +1,17 @@ -NoName +CItemEditBase QDialog name - NoName + ItemEdit geometry 0 0 - 246 + 238 220 diff --git a/eonsl/widgets/rangeweapon.ui b/eonsl/widgets/rangeweapon.ui index 067c08b..fe421af 100644 --- a/eonsl/widgets/rangeweapon.ui +++ b/eonsl/widgets/rangeweapon.ui @@ -1,17 +1,17 @@ -NoName +CRangeWeaponEditBase QDialog name - NoName + RangeWeaponEdit geometry 0 0 - 444 + 440 479 diff --git a/eonsl/widgets/shield.ui b/eonsl/widgets/shield.ui index fb97b34..48c0973 100644 --- a/eonsl/widgets/shield.ui +++ b/eonsl/widgets/shield.ui @@ -1,17 +1,17 @@ -NoName +CShieldEditBase QDialog name - NoName + ShieldEdit geometry 0 0 - 407 + 403 291 diff --git a/eonsl/widgets/war.ui b/eonsl/widgets/war.ui index 7452a55..46e5e31 100644 --- a/eonsl/widgets/war.ui +++ b/eonsl/widgets/war.ui @@ -1,17 +1,17 @@ -NoName +CWarBase QDialog name - NoName + War geometry 0 0 - 406 + 402 470 @@ -54,6 +54,10 @@ text Involverad med: + + buddy + + QLabel -- 2.39.2