Fixed my evil bug

diff --git a/hbs.kdevprj b/hbs.kdevprj
index ba88cfe5a93f39bc769062a352b9446b360c5687..e85f2dd6a171fd69f45ff2bbc51d0c6d5a4f3e57 100644 (file)
--- a/hbs.kdevprj
+++ b/hbs.kdevprj
@@ -87,7 +87,7 @@ install_location=
 type=DATA
 
 [bs/Makefile.am]
 type=DATA
 
 [bs/Makefile.am]

-files=bs/bs.cpp,bs/bs.h,bs/bsdoc.cpp,bs/bsdoc.h,bs/bsview.cpp,bs/bsview.h,bs/main.cpp,bs/battlesum.h,bs/battlesum.cpp,bs/scanview.cpp,bs/scanview.h,bs/tickview.cpp,bs/tickview.h,bs/fleet.cpp,bs/fleet.h,bs/unittype.cpp,bs/unittype.h
+files=bs/bs.cpp,bs/bs.h,bs/bsdoc.cpp,bs/bsdoc.h,bs/bsview.cpp,bs/bsview.h,bs/main.cpp,bs/battlesum.h,bs/battlesum.cpp,bs/scanview.cpp,bs/scanview.h,bs/tickview.cpp,bs/tickview.h,bs/fleet.cpp,bs/fleet.h,bs/unittype.cpp,bs/unittype.h,bs/bsconf.cpp,bs/bsconf.h,bs/fleetview.cpp,bs/fleetview.h

 sub_dirs=
 type=prog_main
 
 sub_dirs=
 type=prog_main
 


@@ -115,6 +115,18 @@ install=false
 install_location=
 type=HEADER
 
 install_location=
 type=HEADER
 

+[bs/bsconf.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[bs/bsconf.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+

 [bs/bsdoc.cpp]
 dist=true
 install=false
 [bs/bsdoc.cpp]
 dist=true
 install=false


@@ -159,6 +171,18 @@ install=false
 install_location=
 type=HEADER
 
 install_location=
 type=HEADER
 

+[bs/fleetview.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[bs/fleetview.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+

 [bs/main.cpp]
 dist=true
 install=false
 [bs/main.cpp]
 dist=true
 install=false

diff --git a/hbs.kdevses b/hbs.kdevses
index d2a040354df82b1799954475604a4b5ce84e5485..2ff67b18881eb6b24d0dda2a2e1f85f56209d167 100644 (file)
--- a/hbs.kdevses
+++ b/hbs.kdevses
@@ -1,8 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE KDevPrjSession ><KDevPrjSession>
  <Mainframe MaximizeMode="0" />
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE KDevPrjSession ><KDevPrjSession>
  <Mainframe MaximizeMode="0" />

- <DocsAndViews NumberOfDocuments="1" >
-  <Doc0 Type="CDocBrowser" NumberOfViews="1" FileName="file:/home/src/qt-3/doc/html/index.html" >
-   <View Top="0" Width="957" Attach="0" Height="523" Left="0" Focus="0" Type="KHTMLView" MinMaxMode="0" />
+ <DocsAndViews NumberOfDocuments="9" >
+  <Doc0 CursorPosLine="66" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/whale/src/hbs/bs/bsview.cpp" >
+   <View0 Top="0" Width="951" Attach="0" Height="490" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" />

   </Doc0>
   </Doc0>

+  <Doc1 CursorPosLine="59" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/whale/src/hbs/bs/ui/bsappbase.ui.h" >
+   <View0 Top="0" Width="951" Attach="0" Height="490" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" />
+  </Doc1>
+  <Doc2 CursorPosLine="22" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/whale/src/hbs/bs/bsdoc.cpp" >
+   <View0 Top="0" Width="951" Attach="0" Height="490" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" />
+  </Doc2>
+  <Doc3 CursorPosLine="30" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/whale/src/hbs/bs/fleet.cpp" >
+   <View0 Top="0" Width="951" Attach="0" Height="490" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" />
+  </Doc3>
+  <Doc4 CursorPosLine="35" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/whale/src/hbs/bs/fleet.h" >
+   <View0 Top="0" Width="951" Attach="0" Height="490" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" />
+  </Doc4>
+  <Doc5 CursorPosLine="859" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/usr/include/g++-v3/bits/basic_string.h" >
+   <View0 Top="0" Width="951" Attach="0" Height="490" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" />
+  </Doc5>
+  <Doc6 CursorPosLine="89" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/whale/src/hbs/bs/fleetview.cpp" >
+   <View0 Top="0" Width="657" Attach="0" Height="490" Left="0" Focus="1" Type="KWriteView" MinMaxMode="0" />
+  </Doc6>
+  <Doc7 CursorPosLine="0" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/whale/src/hbs/bs/fleetview.h" >
+   <View0 Top="0" Width="657" Attach="0" Height="490" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" />
+  </Doc7>
+  <Doc8 Type="CDocBrowser" NumberOfViews="1" FileName="ftp://ftp.trolltech.com/qt/pdf/3.0/" >
+   <View Top="0" Width="951" Attach="0" Height="490" Left="0" Focus="0" Type="KHTMLView" MinMaxMode="0" />
+  </Doc8>

  </DocsAndViews>
 </KDevPrjSession>
  </DocsAndViews>
 </KDevPrjSession>

diff --git a/hbs.pro b/hbs.pro
index 103d5b3658ba290b2cebc492e63eeef214c95a4e..e1627a010dc8c7058053d4e7ca9f7d9ff52276dd 100644 (file)
--- a/hbs.pro
+++ b/hbs.pro
@@ -1,11 +1,11 @@
-SOURCES        += bs/bs.cpp bs/bsdoc.cpp bs/bsview.cpp bs/main.cpp bs/battlesum.cpp bs/scanview.cpp bs/tickview.cpp bs/fleet.cpp bs/unittype.cpp 
-HEADERS        += bs/bs.h bs/bsdoc.h bs/bsview.h bs/battlesum.h config.h bs/scanview.h bs/tickview.h bs/fleet.h bs/unittype.h 
+SOURCES        += bs/bs.cpp bs/bsdoc.cpp bs/bsview.cpp bs/main.cpp bs/battlesum.cpp bs/scanview.cpp bs/tickview.cpp bs/fleet.cpp bs/unittype.cpp bs/bsconf.cpp bs/fleetview.cpp 
+HEADERS        += bs/bs.h bs/bsdoc.h bs/bsview.h bs/battlesum.h config.h bs/scanview.h bs/tickview.h bs/fleet.h bs/unittype.h bs/bsconf.h bs/fleetview.h 

 
 TARGET = bs/bs
 IMAGEFILE      = images.cpp
 PROJECTNAME    = BS
 TRANSLATIONS = sv_SE.ts
 
 TARGET = bs/bs
 IMAGEFILE      = images.cpp
 PROJECTNAME    = BS
 TRANSLATIONS = sv_SE.ts

-FORMS  = bs/ui/battlesumbase.ui bs/ui/scanviewbase.ui bs/ui/infoview.ui bs/ui/tickviewbase.ui bs/ui/bsappbase.ui bs/ui/fleetviewbase.ui 
+FORMS  = bs/ui/battlesumbase.ui bs/ui/scanviewbase.ui bs/ui/infoview.ui bs/ui/tickviewbase.ui bs/ui/bsappbase.ui bs/ui/fleetviewbase.ui bs/ui/uniteditview.ui bs/ui/roidseditview.ui bs/ui/resourceview.ui 

 TEMPLATE       =app
 CONFIG += qt warn_on debug thread
 DBFILE = hbs.db
 TEMPLATE       =app
 CONFIG += qt warn_on debug thread
 DBFILE = hbs.db