author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /kabc/picture.h | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-p1.zip kdepimpi-p1.tar.gz kdepimpi-p1.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | kabc/picture.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kabc/picture.h b/kabc/picture.h index 714d1e2..1b63610 100644 --- a/kabc/picture.h +++ b/kabc/picture.h | |||
@@ -8,48 +8,50 @@ | |||
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #ifndef KABC_PICTURE_H | 28 | #ifndef KABC_PICTURE_H |
29 | #define KABC_PICTURE_H | 29 | #define KABC_PICTURE_H |
30 | 30 | ||
31 | #include <qimage.h> | 31 | #include <qimage.h> |
32 | //Added by qt3to4: | ||
33 | #include <QPixmap> | ||
32 | 34 | ||
33 | namespace KABC { | 35 | namespace KABC { |
34 | 36 | ||
35 | class Picture | 37 | class Picture |
36 | { | 38 | { |
37 | friend QDataStream &operator<<( QDataStream &, const Picture & ); | 39 | friend QDataStream &operator<<( QDataStream &, const Picture & ); |
38 | friend QDataStream &operator>>( QDataStream &, Picture & ); | 40 | friend QDataStream &operator>>( QDataStream &, Picture & ); |
39 | 41 | ||
40 | public: | 42 | public: |
41 | 43 | ||
42 | /** | 44 | /** |
43 | * Consturctor. Creates an empty object. | 45 | * Consturctor. Creates an empty object. |
44 | */ | 46 | */ |
45 | Picture(); | 47 | Picture(); |
46 | 48 | ||
47 | /** | 49 | /** |
48 | * Consturctor. | 50 | * Consturctor. |
49 | * | 51 | * |
50 | * @param url A URL that describes the position of the picture file. | 52 | * @param url A URL that describes the position of the picture file. |
51 | */ | 53 | */ |
52 | Picture( const QString &url ); | 54 | Picture( const QString &url ); |
53 | 55 | ||
54 | /** | 56 | /** |
55 | * Consturctor. | 57 | * Consturctor. |