9 files changed, 28 insertions, 118 deletions

diff --git a/libopie2/README b/libopie2/README
index daf6b27..5643d25 100644
--- a/libopie2/README
+++ b/libopie2/README
@@ -10,4 +10,5 @@
           * reduce memory footprint through sharing code
           * reduce possible bugs through reusing tested code
+          * improve the architecture of applications with design patterns
 
 --------------------------------------------------------
@@ -45,4 +46,7 @@ libopie is functionally seperated into the following libraries:
 --------------------------------------------------------
 
+ - oapplication
+ - ostorage
+
  - odbgstream
  - ondbgstream
@@ -56,26 +60,13 @@ libopie is functionally seperated into the following libraries:
  - oconfiggroupsaver
 
- - ocompletionbase
- - ocompletion
- - ocomptreenodelist
- - ocomptreenode
- - ocompletionwrapper
-
  - oglobal
  - oglobalsettings
 
- - osortableitem
- - osortablevaluelist
-
 1.2 Contents of libopieui [ opieui ]
 --------------------------------------------------------
 
- - oapplication
-
  - ofiledialog
- - colordialog
  - oclickablelabel
  - ocolorbutton
- - colorpopupmenu
  - otabinfo
  - otabbar
@@ -90,39 +81,21 @@ libopie is functionally seperated into the following libraries:
  - oversatileview
  - oversatileviewitem
- - ocompletionbox
- - olineedit
- - ocombobox
- - ohistorycombo
 
  - omessagebox
  - odialogbase
 
- - todayconfigwidget  (rather into opiepim?)
- - orecurrancewidget  (rather into opiepim?)
- - otimepicker        (rather into opiepim?)
+ - okeyconfigwidget
+ - otaskbarapplet
+ - otimepicker
 
 1.3 Contents of libopiepim [ opiepim ]
 --------------------------------------------------------
 
- - ocheckitem
- - todayplugininterface
-
-THIS STUFF IS OUTDATED/DEPRICATED AND SCHOULD NOT
-BE MOVED IN THE NEW LIBRARY !! 
-USE THE CLASSES IN libopie/pim INSTEAD !(eilers)
-
- - todoresource
- - todoevent
- - todovcalresource
+...
 
 1.4 Contents of libopiedb [ opiedb ]
 --------------------------------------------------------
 
- - xmltree
-
-THIS STUFF IS OUTDATED/DEPRICATED AND SCHOULD NOT
-BE MOVED IN THE NEW LIBRARY !! 
-USE THE CLASSES IN libopie/pim INSTEAD !(eilers)
- - tododb
+...
 
 1.5 Contents of libopienet [ opienet ]
@@ -149,8 +122,4 @@ USE THE CLASSES IN libopie/pim INSTEAD !(eilers)
  - otcppacket
 
- <libmail stuff>
- <libbend stuff>
- <libftp stuff>
-
 1.6 Contents of libopiemm [ opiemm ]
 --------------------------------------------------------
@@ -187,2 +156,10 @@ USE THE CLASSES IN libopie/pim INSTEAD !(eilers)
 
 ...
+
+--------------------------------------------------------
+3.0 Usage
+--------------------------------------------------------
+
+3.1 Namespaces
+
+
diff --git a/libopie2/ROADMAP b/libopie2/ROADMAP
index 966b67d..1685ba2 100644
--- a/libopie2/ROADMAP
+++ b/libopie2/ROADMAP
@@ -1,6 +1,7 @@
  [done] * import current status of opiecore, opienet and opieui
-        * add contents of libopie1 to libopie2 and functionally split it
-        * make libopie2 a drop-in-replacement for libopie1
+ [done] * add contents of libopie1 to libopie2 and functionally split it
+ [done] * make libopie2 a drop-in-replacement for libopie1
         * add doxygen documentation to all classes
-        * backport qt3-only stuff (?)
+        * add functionality from libqpe to libopie2
+        * make libopie2 a drop-in-replacement for libqpe1
 
diff --git a/libopie2/STATUS b/libopie2/STATUS
deleted file mode 100644
index eb3442c..0000000
--- a/libopie2/STATUS
+++ b/dev/null
@@ -1,68 +0,0 @@
-
-==================================================================
-March 2003 - Initial checkin into the Opie CVS:
-==================================================================
-
-So, this is what I have been working on over the last months.
-It's a part of what I think could migrate into our next generation
-opielibs.
-Of course this won't happen after we released Opie 1.0 and switched
-to Qt3-Embedded and gcc 3.
-
-Right now, there is content only in opiecore, opienet and opieui.
-A good part of code has been adapted from the kdelibs, which overall
-are pretty good however in details of heterogenous quality. I'm also
-not sure if all I ported should be kept, e.g. the pixmapeffect stuff
-seems unnecesary to me. However, we should not forget that Opie will
-make its debut on more powerful devices with greater display
-resolution, e.g. the Sharp C700, so we shouldn't limit ourselves in
-what should go into the libraries.
-
-Generally spoken, a lot of things are still very rough and messy,
-but I will keep improving this. Some details about what is usable
-and what is not follows:
-(everything compiles of course, otherwise I wouldn't have checked in :-)
-
-[-----------]
-[ opiecore ]
-[-----------]
-oapplication, oconfig, oglobal seem to be usable yet, oglobalsettings
-is still very messy and should be revised. A lot more thinking about how
-we should keep opie preferences, especially when moving to multi-user, has to be made.
-This will affect what goes into oglobalsettings and what configuration data
-format we will use. If we switch to Qt3 we will have to decide if we stay
-with OConfig deriving from Config or rewrite it using QSettings.
-
-[-----------]
-[  opiedb  ]
-[-----------]
-There is nothing here yet. The sqlite stuff should be here.
-
-[-----------]
-[ opienet ]
-[-----------]
-onetwork*, omonitoring* and the opacket stuff are pretty usable and not
-very far from being complete. documentation for these will come...
-Over the next days, opie-wellenreiter, opie-wirelessapplet and the
-forthcoming new opie-networkapplet will be using the
-new network classes.
-I think all the other network libraries spread throught opie, e.g.
-libbend, libmail, ftplib should be revised and become part of
-opienet eventually.
-
-[-----------]
-[ opiepim ]
-[-----------]
-Nothing here yet. The stuff currently in libopie/pim should be here.
-
-[-----------]
-[ opieui ]
-[-----------]
-Pretty messy yet, but some things are usable. Unfortunately, the UI
-stuff is very hard to backport to Qt2, so some things only work
-if compiled against Qt3, especially all the popupcompletion stuff.
-OListView however works nice and is currently used in opie-wellenreiter.
-
-==================================================================
-October 2002 - Started work on cornucopia aka opielib2
-==================================================================
\ No newline at end of file
diff --git a/libopie2/opiecore/config.in b/libopie2/opiecore/config.in
index f4483a2..0acde26 100644
--- a/libopie2/opiecore/config.in
+++ b/libopie2/opiecore/config.in
@@ -1,5 +1,5 @@
   config LIBOPIE2CORE
     boolean "libopie2core (application, configuration and debug related classes)"
-    default "n"
+    default "y"
     depends ( LIBQPE || LIBQPE-X11 )
     comment "libopie2core needs a libqpe (yet)"
diff --git a/libopie2/opiedb/config.in b/libopie2/opiedb/config.in
index 0205a83..8039f9c 100644
--- a/libopie2/opiedb/config.in
+++ b/libopie2/opiedb/config.in
@@ -1,5 +1,5 @@
   config LIBOPIE2DB
     boolean "libopie2db (database related classes)"
-    default "n"
+    default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
     comment "libopie2db needs a libqpe and libopie2core"
diff --git a/libopie2/opiemm/config.in b/libopie2/opiemm/config.in
index c95d14b..c32e06c 100644
--- a/libopie2/opiemm/config.in
+++ b/libopie2/opiemm/config.in
@@ -1,5 +1,5 @@
   config LIBOPIE2MM
     boolean "libopie2mm (audio and video related classes)"
-    default "n"
+    default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
     comment "libopie2mm needs a libqpe and libopie2core"
diff --git a/libopie2/opiepim/config.in b/libopie2/opiepim/config.in
index 2c920bb..33ef9b2 100644
--- a/libopie2/opiepim/config.in
+++ b/libopie2/opiepim/config.in
@@ -1,5 +1,5 @@
   config LIBOPIE2PIM
     boolean "libopie2pim (pim related classes)"
-    default "n"
+    default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
     comment "libopie2pim needs a libqpe and libopie2core"
diff --git a/libopie2/opieui/config.in b/libopie2/opieui/config.in
index d40b5d9..9d157a5 100644
--- a/libopie2/opieui/config.in
+++ b/libopie2/opieui/config.in
@@ -1,5 +1,5 @@
   config LIBOPIE2UI
     boolean "libopie2ui (user interface related classes)"
-    default "n"
+    default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
     comment "libopie2ui needs a libqpe and libopie2core"
diff --git a/libopie2/opieui/otimepicker.h b/libopie2/opieui/otimepicker.h
index fb20781..894fbef 100644
--- a/libopie2/opieui/otimepicker.h
+++ b/libopie2/opieui/otimepicker.h
@@ -32,6 +32,6 @@
 
 /* OPIE */
-#include <opie2/oclickablelabel.h>
-#include <opie2/otimepickerbase.h>
+#include "oclickablelabel.h"
+#include "otimepickerbase.h"
 
 /* QT */