summaryrefslogtreecommitdiff
path: root/noncore/apps/opie-console/function_keyboard.cpp
Unidiff
Diffstat (limited to 'noncore/apps/opie-console/function_keyboard.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index 0abe0d9..389618c 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -83,7 +83,7 @@ void FunctionKeyboard::load (const Profile& prof) {
83 // load pixmap if used 83 // load pixmap if used
84 if (!l[1].isEmpty()) { 84 if (!l[1].isEmpty()) {
85 85
86 keys[h].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + l[1] ) ); 86 keys[h].pix = new QPixmap( Opie::Core::OResource::loadPixmap( "console/keys/" + l[1] ) );
87 } 87 }
88 } 88 }
89 } 89 }
@@ -277,8 +277,7 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
277 QStringList files = QDir( QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList(); 277 QStringList files = QDir( QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList();
278 278
279 for (uint i = 0; i < files.count(); i++) { 279 for (uint i = 0; i < files.count(); i++) {
280 280 m_labels->insertItem( Opie::Core::OResource::loadPixmap("console/keys/" + files[i]), files[i]);
281 m_labels->insertItem( Resource::loadPixmap("console/keys/" + files[i]), files[i]);
282 } 281 }
283 connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int))); 282 connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int)));
284 connect (m_labels, SIGNAL(textChanged(const QString&)), this, SLOT(slotChangeLabelText(const QString&))); 283 connect (m_labels, SIGNAL(textChanged(const QString&)), this, SLOT(slotChangeLabelText(const QString&)));
@@ -328,7 +327,7 @@ void FunctionKeyboardConfig::load (const Profile& prof) {
328 // load pixmap if used 327 // load pixmap if used
329 if (!l[1].isEmpty()) { 328 if (!l[1].isEmpty()) {
330 329
331 kb->keys[h].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + l[1] ) ); 330 kb->keys[h].pix = new QPixmap( Opie::Core::OResource::loadPixmap( "console/keys/" + l[1] ) );
332 } 331 }
333 } 332 }
334 } 333 }
@@ -403,7 +402,7 @@ void FunctionKeyboardConfig::slotChangeIcon(int index) {
403 // is a pixmap 402 // is a pixmap
404 m_labels->setEditable(false); 403 m_labels->setEditable(false);
405 kb->keys[selectedHandle].pixFile = m_labels->currentText(); 404 kb->keys[selectedHandle].pixFile = m_labels->currentText();
406 kb->keys[selectedHandle].pix = new QPixmap( Resource::loadPixmap( "console/keys/" + m_labels->currentText() ) ); 405 kb->keys[selectedHandle].pix = new QPixmap( Opie::Core::OResource::loadPixmap( "console/keys/" + m_labels->currentText() ) );
407 } 406 }
408 kb->paintKey(selectedRow, selectedCol); 407 kb->paintKey(selectedRow, selectedCol);
409} 408}