7 files changed, 16 insertions, 8 deletions
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp b/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp index 4eaf3a9..a75f9dc 100644 --- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp +++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp @@ -1,26 +1,23 @@ #include <qstring.h> #include <qlabel.h> #include <qheader.h> #include <qlayout.h> #include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> - -#include "../osplitter.h" +#include <opie2/oapplicationfactory.h> #include "osplitter_mail.h" - OPIE_EXPORT_APP( OApplicationFactory<ListViews> ) class Folder { int dummy; }; // ----------------------------------------------------------------- ListViews::ListViews( QWidget* p, const char* name, WFlags fl ) : QWidget( p, name, fl ) { qApp->installEventFilter( this ); m_lstFolders.setAutoDelete( true ); diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.h b/libopie2/examples/opieui/osplitter_example/osplitter_mail.h index b7e7efe..1447a92 100644 --- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.h +++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.h @@ -5,24 +5,28 @@ /* * Header file for a more complete email client like * layout */ #ifndef OPIE_SPLITTER_MAIL_EXAMPLE_H #define OPIE_SPLITTER_MAIL_EXAMPLE_H #include <qwidget.h> #include <qlist.h> #include <qlistview.h> +#include <opie2/osplitter.h> + +using Opie::OSplitter; + class Folder; class QLabel; class OSplitter; class ListViews : public QWidget { Q_OBJECT public: static QString appName() { return QString::fromLatin1("osplitter-mail"); } ListViews( QWidget* parent, const char * name, WFlags fl ); ~ListViews(); bool eventFilter( QObject* , QEvent* ); diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro b/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro index ec6e626..dd1bef2 100644 --- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro +++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro @@ -1,12 +1,12 @@ CONFIG += qt warn_on TEMPLATE = app TARGET = osplitter-mail INCLUDEPATH += $(OPIEDIR)/include DEPENDSPATH += $(OPIEDIR)/include HEADERS = osplitter_mail.h SOURCES = osplitter_mail.cpp -LIBS += -lqpe -lopie +LIBS += -lqpe -lopieui2 include ( $(OPIEDIR)/include.pro ) diff --git a/libopie2/examples/opieui/oversatileviewdemo/.cvsignore b/libopie2/examples/opieui/oversatileviewdemo/.cvsignore new file mode 100644 index 0000000..8f7300c --- a/dev/null +++ b/libopie2/examples/opieui/oversatileviewdemo/.cvsignore @@ -0,0 +1,6 @@ +Makefile* +moc* +*moc +*.o +~* + diff --git a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp index 197669c..f62729c 100644 --- a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp +++ b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp @@ -24,25 +24,25 @@ #include <qstringlist.h> // Qtopia #ifdef QWS #include <qpe/qpeapplication.h> #include <qpe/global.h> #endif // Opie #ifdef QWS -#include <opie/odevice.h> +#include <opie2/odevice.h> using namespace Opie; #endif #include <opie2/ocompletionbox.h> #include <opie2/olineedit.h> #include <opie2/ocombobox.h> #include <opie2/oeditlistbox.h> #include <opie2/oselector.h> #include <opie2/opopupmenu.h> #include <qtabwidget.h> #include "oversatileviewdemo.h" diff --git a/libopie2/opiecore/xmltree.cc b/libopie2/opiecore/xmltree.cc index 27db5b3..059791b 100644 --- a/libopie2/opiecore/xmltree.cc +++ b/libopie2/opiecore/xmltree.cc @@ -8,26 +8,27 @@ This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <opie2/xmltree.h> + #include <qpe/stringutil.h> -#include <opie/xmltree.h> #include <qxml.h> #include <assert.h> using namespace Opie; XMLElement::XMLElement() : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 ) { } diff --git a/libopie2/templates/cpp.cpp b/libopie2/templates/cpp.cpp index da5bcf0..cb1642f 100644 --- a/libopie2/templates/cpp.cpp +++ b/libopie2/templates/cpp.cpp @@ -18,25 +18,25 @@ _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <opie/h.h> +#include <opie2/h.h> /* OPIE */ opie (and for now, qpe) includes here /* QT */ qte includes here /* STD */ standard includes here using namespace Opie; |