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 /microkde/kio/kfile | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | microkde/kio/kfile/kurlrequester.cpp | 10 | ||||
-rw-r--r-- | microkde/kio/kfile/kurlrequester.h | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/microkde/kio/kfile/kurlrequester.cpp b/microkde/kio/kfile/kurlrequester.cpp index ca94570..ce62da7 100644 --- a/microkde/kio/kfile/kurlrequester.cpp +++ b/microkde/kio/kfile/kurlrequester.cpp | |||
@@ -26,8 +26,10 @@ | |||
26 | #include <qstring.h> | 26 | #include <qstring.h> |
27 | //US #include <qtooltip.h> | 27 | //US #include <qtooltip.h> |
28 | 28 | ||
29 | #include <qpushbutton.h> | 29 | #include <qpushbutton.h> |
30 | //Added by qt3to4: | ||
31 | #include <QPixmap> | ||
30 | 32 | ||
31 | //US #include <kaccel.h> | 33 | //US #include <kaccel.h> |
32 | //US #include <kcombobox.h> | 34 | //US #include <kcombobox.h> |
33 | #include <kdebug.h> | 35 | #include <kdebug.h> |
@@ -181,18 +183,18 @@ KURLRequester::KURLRequester( QWidget *editWidget, QWidget *parent, | |||
181 | } | 183 | } |
182 | */ | 184 | */ |
183 | 185 | ||
184 | KURLRequester::KURLRequester( QWidget *parent, const char *name ) | 186 | KURLRequester::KURLRequester( QWidget *parent, const char *name ) |
185 | : QHBox( parent, name ) | 187 | : Q3HBox( parent, name ) |
186 | { | 188 | { |
187 | d = new KURLRequesterPrivate; | 189 | d = new KURLRequesterPrivate; |
188 | init(); | 190 | init(); |
189 | } | 191 | } |
190 | 192 | ||
191 | 193 | ||
192 | KURLRequester::KURLRequester( const QString& url, QWidget *parent, | 194 | KURLRequester::KURLRequester( const QString& url, QWidget *parent, |
193 | const char *name ) | 195 | const char *name ) |
194 | : QHBox( parent, name ) | 196 | : Q3HBox( parent, name ) |
195 | { | 197 | { |
196 | d = new KURLRequesterPrivate; | 198 | d = new KURLRequesterPrivate; |
197 | init(); | 199 | init(); |
198 | setURL( url ); | 200 | setURL( url ); |
@@ -215,10 +217,10 @@ void KURLRequester::init() | |||
215 | if (/*US !d->combo && */ !d->edit ) | 217 | if (/*US !d->combo && */ !d->edit ) |
216 | d->edit = new KLineEdit( this, "KURLRequester::KLineEdit" ); | 218 | d->edit = new KLineEdit( this, "KURLRequester::KLineEdit" ); |
217 | 219 | ||
218 | myButton = new KURLDragPushButton( this, "kfile button"); | 220 | myButton = new KURLDragPushButton( this, "kfile button"); |
219 | QIconSet iconSet = SmallIconSet("fileopen"); | 221 | QIcon iconSet = SmallIconSet("fileopen"); |
220 | QPixmap pixMap = iconSet.pixmap( QIconSet::Small, QIconSet::Normal ); | 222 | QPixmap pixMap = iconSet.pixmap( QIcon::Small, QIcon::Normal ); |
221 | myButton->setIconSet( iconSet ); | 223 | myButton->setIconSet( iconSet ); |
222 | myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); | 224 | myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); |
223 | //US QToolTip::add(myButton, i18n("Open file dialog")); | 225 | //US QToolTip::add(myButton, i18n("Open file dialog")); |
224 | 226 | ||
diff --git a/microkde/kio/kfile/kurlrequester.h b/microkde/kio/kfile/kurlrequester.h index faa3326..5d4fa11 100644 --- a/microkde/kio/kfile/kurlrequester.h +++ b/microkde/kio/kfile/kurlrequester.h | |||
@@ -19,9 +19,9 @@ | |||
19 | 19 | ||
20 | #ifndef KURLREQUESTER_H | 20 | #ifndef KURLREQUESTER_H |
21 | #define KURLREQUESTER_H | 21 | #define KURLREQUESTER_H |
22 | 22 | ||
23 | #include <qhbox.h> | 23 | #include <q3hbox.h> |
24 | 24 | ||
25 | #include <keditlistbox.h> | 25 | #include <keditlistbox.h> |
26 | //US #include <kfile.h> | 26 | //US #include <kfile.h> |
27 | //US #include <kpushbutton.h> | 27 | //US #include <kpushbutton.h> |
@@ -52,9 +52,9 @@ class QTimer; | |||
52 | * | 52 | * |
53 | * @short A widget to request a filename/url from the user | 53 | * @short A widget to request a filename/url from the user |
54 | * @author Carsten Pfeiffer <pfeiffer@kde.org> | 54 | * @author Carsten Pfeiffer <pfeiffer@kde.org> |
55 | */ | 55 | */ |
56 | class KURLRequester : public QHBox | 56 | class KURLRequester : public Q3HBox |
57 | { | 57 | { |
58 | Q_OBJECT | 58 | Q_OBJECT |
59 | Q_PROPERTY( QString url READ url WRITE setURL ) | 59 | Q_PROPERTY( QString url READ url WRITE setURL ) |
60 | 60 | ||