Revision: 6931
Author: nogu.dev
Date: Fri Feb 4 07:38:28 2011
Log: * qt4/toolbar/common-quimhelpertoolbar.cpp
- Avoid global static objects.
http://code.google.com/p/uim/source/detail?r=6931
Modified:
/trunk/qt4/toolbar/common-quimhelpertoolbar.cpp
=======================================
--- /trunk/qt4/toolbar/common-quimhelpertoolbar.cpp Thu Jan 6 18:09:56 2011
+++ /trunk/qt4/toolbar/common-quimhelpertoolbar.cpp Fri Feb 4 07:38:28 2011
@@ -45,9 +45,6 @@
#include "uim/uim-scm.h"
#include "qtgettext.h"
-static const QString ICONDIR = UIM_PIXMAPSDIR;
-static const QString ACTION_ICONDIR = KDE4_ICONDIR "/oxygen/16x16/actions";
-
static void launchHelperApplication( const QString &command )
{
if ( !command.isEmpty() && !QProcess::startDetached( command ) ) {
@@ -71,6 +68,8 @@
connect( m_indicator, SIGNAL( menuRequested( QMenu* ) ),
this, SIGNAL( menuRequested( QMenu* ) ) );
+ const QString ICONDIR = UIM_PIXMAPSDIR;
+ const QString ACTION_ICONDIR = KDE4_ICONDIR "/oxygen/16x16/actions";
const QSize size( ICON_SIZE, ICON_SIZE );
m_swicon = QPixmap( ICONDIR + "/im_switcher.png" ).scaled(
size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
