summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/keyhelper/.cvsignore5
-rw-r--r--noncore/applets/keyhelper/keyhelperapplet/.cvsignore5
-rw-r--r--noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.cpp8
-rw-r--r--noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.h3
-rw-r--r--noncore/applets/keyhelper/keyhelperapplet/anylnk/AppLnkWrapper.cpp2
-rw-r--r--noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp4
-rw-r--r--noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.h2
-rw-r--r--noncore/applets/keyhelper/keyhelperconf/.cvsignore7
8 files changed, 24 insertions, 12 deletions
diff --git a/noncore/applets/keyhelper/.cvsignore b/noncore/applets/keyhelper/.cvsignore
new file mode 100644
index 0000000..9f2b524
--- a/dev/null
+++ b/noncore/applets/keyhelper/.cvsignore
@@ -0,0 +1,5 @@
+Makefile*
+moc*
+.moc*
+.obj
+.moc
diff --git a/noncore/applets/keyhelper/keyhelperapplet/.cvsignore b/noncore/applets/keyhelper/keyhelperapplet/.cvsignore
new file mode 100644
index 0000000..9f2b524
--- a/dev/null
+++ b/noncore/applets/keyhelper/keyhelperapplet/.cvsignore
@@ -0,0 +1,5 @@
+Makefile*
+moc*
+.moc*
+.obj
+.moc
diff --git a/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.cpp b/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.cpp
index 3c2298e..fc02862 100644
--- a/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.cpp
+++ b/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.cpp
@@ -1,19 +1,13 @@
#include "AnyLnk.h"
#include "KHUtil.h"
void AnyLnk::loadPixmap()
{
if(m_params.count() >= 3){
- QString& str = m_params[2];
- QImage image = Resource::loadImage(str);
- if(image.isNull() == false){
- const QSize& size = AppLnkManager::getIconSize();
- m_pixmap.convertFromImage(
- image.smoothScale(size.width(), size.height()) );
- }
+ m_pixmap = Opie::Core::OResource::loadPixmap( m_params[2], Opie::Core::OResource::SmallIcon );
}
}
void AnyLnk::parseText()
{
if(m_params.count() >= 2){
diff --git a/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.h b/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.h
index 9853942..d170e6d 100644
--- a/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.h
+++ b/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.h
@@ -8,13 +8,14 @@
#include <qpixmap.h>
#include <qimage.h>
#include <qclipboard.h>
#include <qtextcodec.h>
#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
+
+#include <opie2/oresource.h>
#include "AppLnkManager.h"
#include "ConfigEx.h"
class AnyLnk
{
diff --git a/noncore/applets/keyhelper/keyhelperapplet/anylnk/AppLnkWrapper.cpp b/noncore/applets/keyhelper/keyhelperapplet/anylnk/AppLnkWrapper.cpp
index 1c3dbfe..dc6dd77 100644
--- a/noncore/applets/keyhelper/keyhelperapplet/anylnk/AppLnkWrapper.cpp
+++ b/noncore/applets/keyhelper/keyhelperapplet/anylnk/AppLnkWrapper.cpp
@@ -37,7 +37,7 @@ public:
}
}
protected:
AppLnk* m_pLnk;
};
-#endif /* _APPLNK_WRAPPER_H_ */ \ No newline at end of file
+#endif /* _APPLNK_WRAPPER_H_ */
diff --git a/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp b/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp
index 7beb511..9fac51b 100644
--- a/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp
+++ b/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp
@@ -5,13 +5,13 @@
QWidget* g_Widget = NULL;
int g_level = 0;
static const char* _version_ = "1.2.2";
KeyHelperWidget::KeyHelperWidget(QWidget* parent, const char* name)
- : QLabel(parent, name),disabled(Resource::loadPixmap("zkb-disabled"))
+ : QLabel(parent, name),disabled(Opie::Core::OResource::loadPixmap("zkb-disabled"))
{
qDebug("KeyHelperWidget::KeyHelperWidget()");
g_Widget = this;
m_defHandler = NULL;
//m_reset = false;
m_reset = true;
@@ -291,13 +291,13 @@ void KeyHelperWidget::initDebugLevel()
cfg.setGroup("Global");
int level = cfg.readNumEntry("DebugLevel", 0);
setDebugLevel(level);
}
-void KeyHelperWidget::setDebugLevel(int level)
+void KeyHelperWidget::setDebugLevel(int /*level*/)
{
#ifdef QT_QWS_EBX
static bool noDebug = true;
g_level = level;
if(g_level > 0){
if(noDebug){
diff --git a/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.h b/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.h
index 4798c5c..0901081 100644
--- a/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.h
+++ b/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.h
@@ -5,17 +5,17 @@
#include <qlabel.h>
#include <qpixmap.h>
#include <qtimer.h>
#include <qaccel.h>
#include <opie2/otaskbarapplet.h>
#include <opie2/okeyfilter.h>
+#include <opie2/oresource.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qpeapplication.h>
#include <qpe/global.h>
-#include <qpe/resource.h>
#include "KeyHelper.h"
#include "AppLnkManager.h"
#include "ConfigEx.h"
#include <syslog.h>
diff --git a/noncore/applets/keyhelper/keyhelperconf/.cvsignore b/noncore/applets/keyhelper/keyhelperconf/.cvsignore
new file mode 100644
index 0000000..f4d9255
--- a/dev/null
+++ b/noncore/applets/keyhelper/keyhelperconf/.cvsignore
@@ -0,0 +1,7 @@
+Makefile*
+moc*
+.moc*
+.obj
+.moc
+KHCWidgetBase.cpp
+KHCWidgetBase.h \ No newline at end of file