author | zecke <zecke> | 2002-09-10 12:31:45 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:31:45 (UTC) |
commit | f244f5ec5351693d366739cfb7bf509d10601cdf (patch) (unidiff) | |
tree | 93610410c6a6a8d34c8a465e2b55e13c2b6acc9a | |
parent | df13a75ca2c9014c78cb9a6458ceb734e2e0af65 (diff) | |
download | opie-f244f5ec5351693d366739cfb7bf509d10601cdf.zip opie-f244f5ec5351693d366739cfb7bf509d10601cdf.tar.gz opie-f244f5ec5351693d366739cfb7bf509d10601cdf.tar.bz2 |
Fix for QTopia1.6
-rw-r--r-- | libopie/libopie.pro | 19 | ||||
-rw-r--r-- | libopie/odevice.h | 2 | ||||
-rw-r--r-- | libopie/ofileselector.cc | 13 | ||||
-rw-r--r-- | libopie/ofileview.h | 28 | ||||
-rw-r--r-- | libopie/ofontmenu.h | 2 |
5 files changed, 39 insertions, 25 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro index 891c03e..6c47e86 100644 --- a/libopie/libopie.pro +++ b/libopie/libopie.pro | |||
@@ -2,4 +2,19 @@ TEMPLATE = lib | |||
2 | CONFIG += qte warn_on release | 2 | CONFIG += qte warn_on release |
3 | HEADERS = ofontmenu.h ofileselector.h ofiledialog.h ofileview.h tododb.h todoevent.h todoresource.h todovcalresource.h xmltree.h colordialog.h colorpopupmenu.h oclickablelabel.h oprocctrl.h oprocess.h odevice.h otimepicker.h otabwidget.h otabbar.h otabinfo.h | 3 | HEADERS = ofontmenu.h ofileselector.h \ |
4 | SOURCES = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp colordialog.cpp colorpopupmenu.cpp oclickablelabel.cpp oprocctrl.cpp oprocess.cpp odevice.cpp otimepicker.cpp otabwidget.cpp otabbar.cpp | 4 | ofiledialog.h tododb.h \ |
5 | todoevent.h todoresource.h \ | ||
6 | todovcalresource.h xmltree.h \ | ||
7 | colordialog.h colorpopupmenu.h \ | ||
8 | oclickablelabel.h oprocctrl.h \ | ||
9 | oprocess.h odevice.h \ | ||
10 | otimepicker.h otabwidget.h \ | ||
11 | otabbar.h otabinfo.h | ||
12 | SOURCES = ofontmenu.cc ofileselector.cc \ | ||
13 | ofiledialog.cc xmltree.cc \ | ||
14 | tododb.cpp todoevent.cpp \ | ||
15 | todovcalresource.cpp colordialog.cpp \ | ||
16 | colorpopupmenu.cpp oclickablelabel.cpp \ | ||
17 | oprocctrl.cpp oprocess.cpp \ | ||
18 | odevice.cpp otimepicker.cpp \ | ||
19 | otabwidget.cpp otabbar.cpp | ||
5 | TARGET = opie | 20 | TARGET = opie |
diff --git a/libopie/odevice.h b/libopie/odevice.h index 9dda68e..2f676ff 100644 --- a/libopie/odevice.h +++ b/libopie/odevice.h | |||
@@ -64,4 +64,2 @@ class ODevice | |||
64 | public: | 64 | public: |
65 | |||
66 | public: | ||
67 | static ODevice *inst ( ); | 65 | static ODevice *inst ( ); |
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc index 3c3a6c4..b3aacd6 100644 --- a/libopie/ofileselector.cc +++ b/libopie/ofileselector.cc | |||
@@ -187,8 +187,4 @@ const DocLnk *OFileSelector::selected() | |||
187 | { | 187 | { |
188 | if( m_selector == NORMAL ){ | ||
189 | return m_select->selected(); | ||
190 | }else{ | ||
191 | DocLnk *lnk = new DocLnk(selectedDocument() ); | 188 | DocLnk *lnk = new DocLnk(selectedDocument() ); |
192 | return lnk; | 189 | return lnk; |
193 | } | ||
194 | } | 190 | } |
@@ -328,5 +324,4 @@ QString OFileSelector::selectedName() const | |||
328 | if( m_selector == NORMAL ){ | 324 | if( m_selector == NORMAL ){ |
329 | const DocLnk *lnk = m_select->selected(); | 325 | DocLnk lnk = m_select->selectedDocument(); |
330 | name = lnk->file(); | 326 | name = lnk.file(); |
331 | delete lnk; | ||
332 | }else if( m_selector == EXTENDED || m_selector == EXTENDED_ALL ){ | 327 | }else if( m_selector == EXTENDED || m_selector == EXTENDED_ALL ){ |
@@ -403,5 +398,3 @@ DocLnk OFileSelector::selectedDocument() const | |||
403 | case NORMAL:{ | 398 | case NORMAL:{ |
404 | const DocLnk *lnk2 = m_select->selected(); | 399 | lnk = m_select->selectedDocument(); |
405 | lnk = DocLnk(*lnk2 ); // copy | ||
406 | delete lnk2; | ||
407 | break; | 400 | break; |
diff --git a/libopie/ofileview.h b/libopie/ofileview.h index ed256f1..e072477 100644 --- a/libopie/ofileview.h +++ b/libopie/ofileview.h | |||
@@ -4,3 +4,3 @@ | |||
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This library is free software; you can | 5 | _;:, .> :=|. This library is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
@@ -10,4 +10,4 @@ | |||
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This library is distributed in the hope that | 12 | .i_,=:_. -<s. This library is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
@@ -18,6 +18,6 @@ | |||
18 | ++= -. .` .: details. | 18 | ++= -. .` .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
21 | -_. . . )=. = Library General Public License along with | 21 | -_. . . )=. = Library General Public License along with |
22 | -- :-=` this library; see the file COPYING.LIB. | 22 | -- :-=` this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
@@ -37,9 +37,17 @@ class QDir; | |||
37 | class DocLnk; | 37 | class DocLnk; |
38 | class OFileSelectorView : public QWidget { | 38 | |
39 | /** | ||
40 | * A OFileView is a specialised View for the | ||
41 | * OFileSelector | ||
42 | * With a View you can chage the user visible | ||
43 | * representation of a OFileLister | ||
44 | * OFileView is just a basic interface which helps you to | ||
45 | * write new views | ||
46 | */ | ||
47 | class OFileView { | ||
39 | Q_OBJECT | 48 | Q_OBJECT |
40 | public: | 49 | public: |
41 | OFileSelectorView(QWidget *widget, | 50 | OFileView(QWidget *widget, |
42 | const char *name ) | 51 | const char *name ); |
43 | : QWidget(widget, name ) | 52 | virtual OFileView(); |
44 | { }; | ||
45 | virtual ~OFileSelectorView() = 0; | 53 | virtual ~OFileSelectorView() = 0; |
diff --git a/libopie/ofontmenu.h b/libopie/ofontmenu.h index 609f240..5fd515f 100644 --- a/libopie/ofontmenu.h +++ b/libopie/ofontmenu.h | |||
@@ -4,3 +4,3 @@ | |||
4 | =. This file is part of the OPIE Project | 4 | =. This file is part of the OPIE Project |
5 | .=l. Copyright (c) 2002 zekce <zecke@handhelds.org> | 5 | .=l. Copyright (c) 2002 zecke <zecke@handhelds.org> |
6 | .>+-= | 6 | .>+-= |