diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/actioneditor/actioneditor.cpp | 2 | ||||
| -rw-r--r-- | src/modules/dialog/libkvidialog.cpp | 4 | ||||
| -rw-r--r-- | src/modules/notifier/notifierwindow.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_button.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_label.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_popupmenu.cpp | 4 | ||||
| -rw-r--r-- | src/modules/objects/class_radiobutton.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_tabwidget.cpp | 6 | ||||
| -rw-r--r-- | src/modules/objects/class_toolbutton.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_widget.cpp | 4 | ||||
| -rw-r--r-- | src/modules/popupeditor/popupeditor.cpp | 2 | ||||
| -rw-r--r-- | src/modules/toolbareditor/toolbareditor.cpp | 2 |
12 files changed, 17 insertions, 17 deletions
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 608a90e..04e5733 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -383,7 +383,7 @@ void KviSingleActionEditor::chooseSmallIcon() TQString s = d->selectedImage(); delete d; if(ret != TQDialog::Accepted)return; - TQPixmap * p = g_pIconManager->getImage(s.utf8().data()); + TQPixmap * p = g_pIconManager->getImage(s.local8Bit()); if(!p)return; m_pSmallIconEdit->setText(s); m_pSmallIconButton->setPixmap(*p); diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 1e06971..6b1a88f 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -70,7 +70,7 @@ KviKvsCallbackMessageBox::KviKvsCallbackMessageBox( g_pDialogModuleDialogList->append(this); setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC))); - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix)setIconPixmap(*pix); else { @@ -208,7 +208,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( TQGridLayout * g = new TQGridLayout(this,2,3,5,5); - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix) { diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 3e2f7d1..e81145f 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -210,7 +210,7 @@ void KviNotifierWindow::addMessage(KviWindow * pWnd,const TQString &szImageId,co TQString szMessage=szText; szMessage.replace( TQRegExp("\r([^\r])*\r([^\r])+\r"), "\\2" ); if(szImageId.isEmpty())pIcon = 0; - else pIcon = g_pIconManager->getImage(szImageId); + else pIcon = g_pIconManager->getImage(szImageId.local8Bit()); KviNotifierMessage * m = new KviNotifierMessage(this,pIcon ? new TQPixmap(*pIcon) : 0,szMessage); diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index db4ee3e..915b49d 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -145,7 +145,7 @@ bool KviKvsObject_button::functionSetImage(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("icon",KVS_PT_STRING,0,icon) KVSO_PARAMETERS_END(c) if (!widget()) return true; - TQPixmap * pix = g_pIconManager->getImage(icon); + TQPixmap * pix = g_pIconManager->getImage(icon.local8Bit()); if(pix){ ((TQPushButton *)widget())->setIconSet(TQIconSet(*pix,TQIconSet::Small)); } diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index c393943..85a757a 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -383,7 +383,7 @@ bool KviKvsObject_label::functionSetImage(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("icon",KVS_PT_STRING,0,icon) KVSO_PARAMETERS_END(c) if(!widget())return true; - TQPixmap * pix = g_pIconManager->getImage(icon); + TQPixmap * pix = g_pIconManager->getImage(icon.local8Bit()); if(pix) ((TQLabel *)widget())->setPixmap(*pix); return true; } diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index 3216300..1cc822e 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -202,7 +202,7 @@ bool KviKvsObject_popupmenu::functioninsertItem(KviKvsObjectFunctionCall *c) int id=0; if(!szIcon.isEmpty()) { - pix = g_pIconManager->getImage(szIcon); + pix = g_pIconManager->getImage(szIcon.local8Bit()); if (pix) id=((KviTalPopupMenu *)widget())->insertItem(*pix,szItem); else c->warning(__tr2qs("pix '%Q' doesn't exists"),&szIcon); @@ -259,7 +259,7 @@ bool KviKvsObject_popupmenu::functioninsertHandle(KviKvsObjectFunctionCall *c) int id=0; if(!szIcon.isEmpty()) { - pix = g_pIconManager->getImage(szIcon); + pix = g_pIconManager->getImage(szIcon.local8Bit()); if (pix) id=((KviTalPopupMenu *)widget())->insertItem(*pix,szLabel,((KviTalPopupMenu *)(ob->object()))); else c->warning(__tr2qs("pix '%Q' doesn't exists"),&szIcon); diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index b068b38..d7015af 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -118,7 +118,7 @@ bool KviKvsObject_radiobutton::functionSetImage(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("icon_id",KVS_PT_STRING,0,icon) KVSO_PARAMETERS_END(c) if (!widget()) return true; - TQPixmap * pix = g_pIconManager->getImage(icon); + TQPixmap * pix = g_pIconManager->getImage(icon.local8Bit()); if(pix)widget()->setIcon(*pix); return true; } diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 5196573..6c6b4fe 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -213,7 +213,7 @@ bool KviKvsObject_tabwidget::functionaddTab(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Can't add a non-widget object")); return true; } - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix){ ((TQTabWidget *)widget())->addTab(((TQWidget *)(ob->object())),TQIconSet(*pix,TQIconSet::Small),szLabel); @@ -251,7 +251,7 @@ bool KviKvsObject_tabwidget::functioninsertTab(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Can't add a non-widget object")); return true; } - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix){ ((TQTabWidget *)widget())->insertTab(((TQWidget *)(ob->object())),TQIconSet(*pix,TQIconSet::Small),szLabel,uIndex); } @@ -489,7 +489,7 @@ bool KviKvsObject_tabwidget::functionchangeTab(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Can't find the tab ")); return true; } - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix){ ((TQTabWidget *)widget())->changeTab(((TQWidget *)(ob->object())),TQIconSet(*pix,TQIconSet::Small),szLabel); } diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 8ff37ea..96ec49b 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -141,7 +141,7 @@ bool KviKvsObject_toolbutton::functionsetImage(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("icon_id",KVS_PT_STRING,0,icon) KVSO_PARAMETERS_END(c) if (!widget()) return true; - TQPixmap * pix = g_pIconManager->getImage(icon); + TQPixmap * pix = g_pIconManager->getImage(icon).local8Bit(); if(pix){ ((TQToolButton *)widget())->setIconSet(TQIconSet(*pix,TQIconSet::Small)); } diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index f3b11d2..005ecd8 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -1592,7 +1592,7 @@ bool KviKvsObject_widget::function_setIcon(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("icon",KVS_PT_STRING,0,icon) KVSO_PARAMETERS_END(c) if(!widget())return true; - TQPixmap * pix = g_pIconManager->getImage(icon); + TQPixmap * pix = g_pIconManager->getImage(icon.local8Bit()); if(pix)widget()->setIcon(*pix); return true; } @@ -1604,7 +1604,7 @@ bool KviKvsObject_widget::function_setBackgroundImage(KviKvsObjectFunctionCall * KVSO_PARAMETER("image",KVS_PT_STRING,0,image) KVSO_PARAMETERS_END(c) if(!widget())return true; - TQPixmap * pix = g_pIconManager->getImage(image); + TQPixmap * pix = g_pIconManager->getImage(image.local8Bit()); if(pix)widget()->setPaletteBackgroundPixmap(*pix); return true; } diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp index 1a5265c..e405756 100644 --- a/src/modules/popupeditor/popupeditor.cpp +++ b/src/modules/popupeditor/popupeditor.cpp @@ -163,7 +163,7 @@ void KviPopupListViewItem::setIcon(const TQString & szIcon) case ExtMenu: m_szIcon = szIcon; { - TQPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon.local8Bit()); if(pix)setPixmap(0,*pix); else setPixmap(0,TQPixmap()); } diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index e93bfe1..7867c1f 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.local8Bit()); if(p) { m_pIconButton->setPixmap(*p); |
