author | drw <drw> | 2005-06-15 19:04:33 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-15 19:04:33 (UTC) |
commit | b86723182311fa621451c2641acf62b3b89dceeb (patch) (unidiff) | |
tree | f630932a4174f8c8ec030b19262a02a2adb4e27b /noncore/settings/networksettings/ppp | |
parent | c93c8f75bb082c0257ce80f9e8a1eb470bdce397 (diff) | |
download | opie-b86723182311fa621451c2641acf62b3b89dceeb.zip opie-b86723182311fa621451c2641acf62b3b89dceeb.tar.gz opie-b86723182311fa621451c2641acf62b3b89dceeb.tar.bz2 |
Resource -> OResource and fix compiler warning
Diffstat (limited to 'noncore/settings/networksettings/ppp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/edit.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp index 6c9735c..0abf161 100644 --- a/noncore/settings/networksettings/ppp/edit.cpp +++ b/noncore/settings/networksettings/ppp/edit.cpp | |||
@@ -20,25 +20,27 @@ | |||
20 | * | 20 | * |
21 | * You should have received a copy of the GNU Library General Public | 21 | * You should have received a copy of the GNU Library General Public |
22 | * License along with this program; if not, write to the Free | 22 | * License along with this program; if not, write to the Free |
23 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 23 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "edit.h" | 26 | #include "edit.h" |
27 | #include "pppdata.h" | 27 | #include "pppdata.h" |
28 | #include "iplined.h" | 28 | #include "iplined.h" |
29 | #include "auth.h" | 29 | #include "auth.h" |
30 | 30 | ||
31 | /* OPIE */ | 31 | /* OPIE */ |
32 | #include <qpe/resource.h> | 32 | #include <opie2/oresource.h> |
33 | |||
34 | #include <qpe/applnk.h> | ||
33 | #include <qpe/qpeapplication.h> | 35 | #include <qpe/qpeapplication.h> |
34 | 36 | ||
35 | /* QT */ | 37 | /* QT */ |
36 | #include <qlayout.h> | 38 | #include <qlayout.h> |
37 | #include <qmessagebox.h> | 39 | #include <qmessagebox.h> |
38 | #include <qwhatsthis.h> | 40 | #include <qwhatsthis.h> |
39 | #include <qregexp.h> | 41 | #include <qregexp.h> |
40 | #include <qapplication.h> | 42 | #include <qapplication.h> |
41 | #include <qbuttongroup.h> | 43 | #include <qbuttongroup.h> |
42 | #include <qvgroupbox.h> | 44 | #include <qvgroupbox.h> |
43 | #include <qhbox.h> | 45 | #include <qhbox.h> |
44 | #include <qdialog.h> | 46 | #include <qdialog.h> |
@@ -74,27 +76,29 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount | |||
74 | 76 | ||
75 | QHBoxLayout *lpn = new QHBoxLayout(5); | 77 | QHBoxLayout *lpn = new QHBoxLayout(5); |
76 | tl->addLayout(lpn, 1, 1); | 78 | tl->addLayout(lpn, 1, 1); |
77 | numbers = new QListBox(this); | 79 | numbers = new QListBox(this); |
78 | // numbers->setMinimumSize(120, 70); | 80 | // numbers->setMinimumSize(120, 70); |
79 | lpn->addWidget(numbers); | 81 | lpn->addWidget(numbers); |
80 | QVBoxLayout *lpn1 = new QVBoxLayout; | 82 | QVBoxLayout *lpn1 = new QVBoxLayout; |
81 | lpn->addLayout(lpn1); | 83 | lpn->addLayout(lpn1); |
82 | add = new QPushButton(tr("&Add..."), this); | 84 | add = new QPushButton(tr("&Add..."), this); |
83 | del = new QPushButton(tr("&Remove"), this); | 85 | del = new QPushButton(tr("&Remove"), this); |
84 | 86 | ||
85 | up = new QPushButton(this); | 87 | up = new QPushButton(this); |
86 | up->setPixmap( Resource::loadPixmap("up") ); | 88 | up->setPixmap( Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon) ); |
89 | up->setMinimumHeight( AppLnk::smallIconSize()+4 ); | ||
87 | down = new QPushButton(this); | 90 | down = new QPushButton(this); |
88 | down->setPixmap( Resource::loadPixmap("down") ); | 91 | down->setPixmap( Opie::Core::OResource::loadPixmap("down", Opie::Core::OResource::SmallIcon) ); |
92 | down->setMinimumHeight( AppLnk::smallIconSize()+4 ); | ||
89 | lpn1->addWidget(add); | 93 | lpn1->addWidget(add); |
90 | lpn1->addWidget(del); | 94 | lpn1->addWidget(del); |
91 | lpn1->addStretch(1); | 95 | lpn1->addStretch(1); |
92 | lpn1->addWidget(up); | 96 | lpn1->addWidget(up); |
93 | lpn1->addWidget(down); | 97 | lpn1->addWidget(down); |
94 | connect(add, SIGNAL(clicked()), | 98 | connect(add, SIGNAL(clicked()), |
95 | this, SLOT(addNumber())); | 99 | this, SLOT(addNumber())); |
96 | connect(del, SIGNAL(clicked()), | 100 | connect(del, SIGNAL(clicked()), |
97 | this, SLOT(delNumber())); | 101 | this, SLOT(delNumber())); |
98 | connect(up, SIGNAL(clicked()), | 102 | connect(up, SIGNAL(clicked()), |
99 | this, SLOT(upNumber())); | 103 | this, SLOT(upNumber())); |
100 | connect(down, SIGNAL(clicked()), | 104 | connect(down, SIGNAL(clicked()), |