Diffstat (limited to 'noncore/applets/keyhelper/keyhelperapplet/applet') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp | 4 | ||||
-rw-r--r-- | noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.h | 2 |
2 files changed, 3 insertions, 3 deletions
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 @@ -1,35 +1,35 @@ #include "KeyHelperWidget.h" #include "QSafeDataStream.h" #include "KHUtil.h" 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; m_useFilter = false; m_pHelper = NULL; m_status = false; //unset(); initDebugLevel(); m_pHelper = new KeyHelper(); //qApp->installEventFilter(this); connect(qwsServer, SIGNAL(windowEvent(QWSWindow*, QWSServer::WindowEvent)), this, SLOT(windowEvent(QWSWindow*, QWSServer::WindowEvent))); m_pChannel = new QCopChannel("QPE/KeyHelper", this); connect(m_pChannel, SIGNAL(received(const QCString&, const QByteArray&)), @@ -273,49 +273,49 @@ void MsgHandler(QtMsgType type, const char* msg) syslog(LOG_LOCAL5|LOG_DEBUG, "<2>%s", msg); } break; case QtWarningMsg: if(g_level >= 1){ syslog(LOG_LOCAL5|LOG_DEBUG, "<1>%s", msg); } break; default: break; } } void KeyHelperWidget::initDebugLevel() { ConfigEx& cfg = ConfigEx::getInstance("keyhelper"); 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){ m_defHandler = qInstallMsgHandler(MsgHandler); noDebug = false; } } else { qInstallMsgHandler(m_defHandler); noDebug = true; } #endif } void KeyHelperWidget::enable() { m_enable = true; m_pHelper->enable(); //set(); QTimer::singleShot(0, this, SLOT(set())); } 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 @@ -1,39 +1,39 @@ #ifndef _KEY_HELPER_WIDGET_H_ #define _KEY_HELPER_WIDGET_H_ #include <qwidget.h> #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> Q_EXPORT void MsgHandler(QtMsgType type, const char* msg); class KeyHelperWidget : public QLabel { Q_OBJECT public: KeyHelperWidget(QWidget* parent = 0, const char* name=0); ~KeyHelperWidget(); static int position(); virtual bool eventFilter(QObject* o, QEvent* e); public slots: //void windowEvent(QWSWindow* w, QWSServer::WindowEvent e); protected: QCopChannel* m_pChannel; QCopChannel* m_pSysChannel; QPixmap disabled; |