diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | kpilot/fileInstallWidget.cc | 8 | ||||
| -rw-r--r-- | kpilot/fileInstallWidget.h | 4 | ||||
| -rw-r--r-- | kpilot/kpilot.cc | 2 | ||||
| -rw-r--r-- | kpilot/pilotDaemon.cc | 2 | ||||
| -rw-r--r-- | lib/plugin.cc | 8 |
6 files changed, 13 insertions, 13 deletions
@@ -3723,7 +3723,7 @@ Todo: #5 0x40838dd9 in QImageIO::read () from /usr/kde2/source/qt-copy/lib/libqt.so.2 #6 0x40836cf1 in QImage::load () from /usr/kde2/source/qt-copy/lib/libqt.so.2 #7 0x408305b2 in QImage::QImage () from /usr/kde2/source/qt-copy/lib/libqt.so.2 -#8 0x40483fcf in KIconLoader::loadIcon () from /usr/kde2/lib/libtdecore.so.3 +#8 0x40483fcf in TDEIconLoader::loadIcon () from /usr/kde2/lib/libtdecore.so.3 #9 0x805a166 in KPilotInstaller::initIcons () which is weird since the only possible png image being read is the diff --git a/kpilot/fileInstallWidget.cc b/kpilot/fileInstallWidget.cc index 7cf4133..8ac31fe 100644 --- a/kpilot/fileInstallWidget.cc +++ b/kpilot/fileInstallWidget.cc @@ -86,7 +86,7 @@ FileInstallWidget::FileInstallWidget(TQWidget * parent, TQWhatsThis::add(abutton, i18n("<qt>Clear the list of files to install. No files will be installed.</qt>")); - fIconView = new KIconView(this); + fIconView = new TDEIconView(this); connect(fIconView, TQT_SIGNAL(dropped(TQDropEvent *, const TQValueList<TQIconDragItem> &)), this, TQT_SLOT(slotDropEvent(TQDropEvent *, const TQValueList<TQIconDragItem> &))); grid->addMultiCellWidget(fIconView, 1, 4, 2, 3); @@ -251,7 +251,7 @@ void FileInstallWidget::refreshFileInstallList() FUNCTIONSETUP; TQStringList fileNames = fInstaller->fileNames(); - TQPixmap kpilotIcon = TDEGlobal::iconLoader()->loadIcon(CSL1("kpilot"), KIcon::Desktop); + TQPixmap kpilotIcon = TDEGlobal::iconLoader()->loadIcon(CSL1("kpilot"), TDEIcon::Desktop); fIconView->clear(); @@ -259,11 +259,11 @@ void FileInstallWidget::refreshFileInstallList() { if(pdbOrPrc(*fileName)) { - new KIconViewItem(fIconView, *fileName, kpilotIcon); + new TDEIconViewItem(fIconView, *fileName, kpilotIcon); } else { - new KIconViewItem(fIconView, *fileName); + new TDEIconViewItem(fIconView, *fileName); } } } diff --git a/kpilot/fileInstallWidget.h b/kpilot/fileInstallWidget.h index 78ad385..e61880d 100644 --- a/kpilot/fileInstallWidget.h +++ b/kpilot/fileInstallWidget.h @@ -38,7 +38,7 @@ class TQMultiLineEdit; class TQPushButton; class TQIconDragItem; -class KIconView; +class TDEIconView; class KPilotInstaller; class FileInstaller; @@ -73,7 +73,7 @@ protected: KPilotInstaller* getPilotInstallerApp() { return fKPilotInstaller; } private: - KIconView *fIconView; + TDEIconView *fIconView; bool fSaveFileList; KPilotInstaller* fKPilotInstaller; diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc index 2e21851..57b597a 100644 --- a/kpilot/kpilot.cc +++ b/kpilot/kpilot.cc @@ -255,7 +255,7 @@ void KPilotInstaller::initComponents() TQWidget *w; #define ADDICONPAGE(a,b) \ - pixmap = TDEGlobal::iconLoader()->loadIcon(b, KIcon::Desktop, 64); \ + pixmap = TDEGlobal::iconLoader()->loadIcon(b, TDEIcon::Desktop, 64); \ w = getManagingWidget()->addVBoxPage(a,TQString(), pixmap) ; ADDICONPAGE(i18n("HotSync"),CSL1("kpilotbhotsync")); diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc index 03ce904..828fd96 100644 --- a/kpilot/pilotDaemon.cc +++ b/kpilot/pilotDaemon.cc @@ -186,7 +186,7 @@ void PilotDaemonTray::setupWidget() KHelpMenu *help = new KHelpMenu(menu,aboutData); menu->insertItem( - TDEGlobal::iconLoader()->loadIconSet(CSL1("help"),KIcon::Small,0,true), + TDEGlobal::iconLoader()->loadIconSet(CSL1("help"),TDEIcon::Small,0,true), i18n("&Help"),help->menu(),false /* no whatsthis */); diff --git a/lib/plugin.cc b/lib/plugin.cc index 715d29e..c2d00b2 100644 --- a/lib/plugin.cc +++ b/lib/plugin.cc @@ -116,7 +116,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, TDEAboutData *ad) TQString s; TQLabel *text; - KIconLoader *l = TDEGlobal::iconLoader(); + TDEIconLoader *l = TDEGlobal::iconLoader(); const TDEAboutData *p = ad ? ad : TDEGlobal::instance()->aboutData(); TQGridLayout *grid = new TQGridLayout(w, 5, 4, SPACING); @@ -127,14 +127,14 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, TDEAboutData *ad) TQPixmap applicationIcon = l->loadIcon(TQString::fromLatin1(p->appName()), - KIcon::Desktop, - 64, KIcon::DefaultState, 0L, + TDEIcon::Desktop, + 64, TDEIcon::DefaultState, 0L, true); if (applicationIcon.isNull()) { applicationIcon = l->loadIcon(TQString::fromLatin1("kpilot"), - KIcon::Desktop); + TDEIcon::Desktop); } text = new TQLabel(w); |