diff options
Diffstat (limited to 'src/modules/toolbareditor')
| -rw-r--r-- | src/modules/toolbareditor/Makefile.am | 2 | ||||
| -rw-r--r-- | src/modules/toolbareditor/toolbareditor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/toolbareditor/Makefile.am b/src/modules/toolbareditor/Makefile.am index a578e10c..9b05887a 100644 --- a/src/modules/toolbareditor/Makefile.am +++ b/src/modules/toolbareditor/Makefile.am @@ -14,7 +14,7 @@ libkvitoolbareditor_la_SOURCES = libkvitoolbareditor.cpp toolbareditor.cpp nodist_libkvitoolbareditor_la_SOURCES = moc_toolbareditor.cpp noinst_HEADERS = toolbareditor.h -libkvitoolbareditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitoolbareditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la moc_toolbareditor.cpp: toolbareditor.h $(SS_QT_MOC) $< -o $@ diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index e93bfe1f..c33ba952 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -199,7 +199,7 @@ KviCustomToolBarPropertiesDialog::~KviCustomToolBarPropertiesDialog() void KviCustomToolBarPropertiesDialog::iconSelected(const TQString &szIconId) { - TQPixmap * p = g_pIconManager->getImage(szIconId.utf8().data()); + TQPixmap * p = g_pIconManager->getImage(szIconId); if(p) { m_pIconButton->setPixmap(*p); |