From d4358a0517c9e15c93167bbf639251fba1a788d8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:02:45 -0600 Subject: [PATCH] Rename KIcon to enhance compatibility with KDE4 --- keep/app/addbackupwizard.cpp | 12 ++++++------ keep/app/backupconfigdialog.cpp | 2 +- keep/app/includeexcludedialog.cpp | 4 ++-- keep/app/keepmainwindow.cpp | 12 ++++++------ keep/app/restorebackupwizard.cpp | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/keep/app/addbackupwizard.cpp b/keep/app/addbackupwizard.cpp index 81a5f36..eb9593a 100644 --- a/keep/app/addbackupwizard.cpp +++ b/keep/app/addbackupwizard.cpp @@ -72,8 +72,8 @@ void AddBackupWizard::initView() advancedBackupConfigDialog = new AdvancedBackupConfigDialog(this); includeExcludeDialog = new IncludeExcludeDialog(this); - KIconLoader icons; - this->setIcon( icons.loadIcon( "wizard",KIcon::Small )); + TDEIconLoader icons; + this->setIcon( icons.loadIcon( "wizard",TDEIcon::Small )); setupPage1(); setupPage2(); @@ -97,8 +97,8 @@ void AddBackupWizard::setupPage1() addBackupWizard1View = new AddBackupWizard1View(page1,"addBackupWizard1View"); addBackupWizard1View->source->setMode(KFile::Directory); - KIconLoader *icons = TDEGlobal::iconLoader(); - addBackupWizard1View->includeExclude->setPixmap(icons->loadIcon("configure",KIcon::Toolbar,16)); + TDEIconLoader *icons = TDEGlobal::iconLoader(); + addBackupWizard1View->includeExclude->setPixmap(icons->loadIcon("configure",TDEIcon::Toolbar,16)); addPage( page1, "Directory to backup" ); } @@ -122,8 +122,8 @@ void AddBackupWizard::setupPage3() page3->setMargin(0); addBackupWizard3View = new AddBackupWizard3View(page3,"addBackupWizard3View"); - KIconLoader *icons = TDEGlobal::iconLoader(); - addBackupWizard3View->advancedConfig->setPixmap(icons->loadIcon("configure",KIcon::Toolbar,16)); + TDEIconLoader *icons = TDEGlobal::iconLoader(); + addBackupWizard3View->advancedConfig->setPixmap(icons->loadIcon("configure",TDEIcon::Toolbar,16)); addPage( page3, "Backup options" ); } diff --git a/keep/app/backupconfigdialog.cpp b/keep/app/backupconfigdialog.cpp index e4cf3cd..09e7373 100644 --- a/keep/app/backupconfigdialog.cpp +++ b/keep/app/backupconfigdialog.cpp @@ -43,7 +43,7 @@ BackupConfigDialog::BackupConfigDialog(TQWidget *parent):KDialogBase(Plain, i18n("Configure backups"), Help|Cancel|Ok, Cancel, parent, "configBackups", true, false) { - KIconLoader *icons = TDEGlobal::iconLoader(); + TDEIconLoader *icons = TDEGlobal::iconLoader(); TQFrame *page = plainPage(); diff --git a/keep/app/includeexcludedialog.cpp b/keep/app/includeexcludedialog.cpp index ad71414..f809128 100644 --- a/keep/app/includeexcludedialog.cpp +++ b/keep/app/includeexcludedialog.cpp @@ -44,8 +44,8 @@ IncludeExcludeDialog::IncludeExcludeDialog(TQWidget *parent):KDialogBase(Plain, topLayout->addWidget( m_view,0,0 ); - KIconLoader *icons = TDEGlobal::iconLoader(); - m_view->remove->setPixmap(icons->loadIcon("remove",KIcon::Toolbar,22)); + TDEIconLoader *icons = TDEGlobal::iconLoader(); + m_view->remove->setPixmap(icons->loadIcon("remove",TDEIcon::Toolbar,22)); m_view->includeExcludeList->setSorting(-1); diff --git a/keep/app/keepmainwindow.cpp b/keep/app/keepmainwindow.cpp index 0ed19bd..e135421 100644 --- a/keep/app/keepmainwindow.cpp +++ b/keep/app/keepmainwindow.cpp @@ -49,12 +49,12 @@ KeepMainWindow::KeepMainWindow(TQWidget *parent, const char *name): TDEMainWindo setCaption(i18n("Backup System")); m_actionView = new ActionView(this); - KIconLoader *icons = TDEGlobal::iconLoader(); - m_actionView->m_btnAddWizard->setPixmap(icons->loadIcon("add_backup",KIcon::Toolbar,32)); - m_actionView->m_btnRestoreWizard->setPixmap(icons->loadIcon("restore_dir",KIcon::Toolbar,32)); - m_actionView->m_btnForce->setPixmap(icons->loadIcon("force_backup",KIcon::Toolbar,32)); - m_actionView->m_btnBackupConfig->setPixmap(icons->loadIcon("configure",KIcon::Toolbar,32)); - m_actionView->m_btnLog->setPixmap(icons->loadIcon("log",KIcon::Toolbar,32)); + TDEIconLoader *icons = TDEGlobal::iconLoader(); + m_actionView->m_btnAddWizard->setPixmap(icons->loadIcon("add_backup",TDEIcon::Toolbar,32)); + m_actionView->m_btnRestoreWizard->setPixmap(icons->loadIcon("restore_dir",TDEIcon::Toolbar,32)); + m_actionView->m_btnForce->setPixmap(icons->loadIcon("force_backup",TDEIcon::Toolbar,32)); + m_actionView->m_btnBackupConfig->setPixmap(icons->loadIcon("configure",TDEIcon::Toolbar,32)); + m_actionView->m_btnLog->setPixmap(icons->loadIcon("log",TDEIcon::Toolbar,32)); slotRefreshGUI(); diff --git a/keep/app/restorebackupwizard.cpp b/keep/app/restorebackupwizard.cpp index 24ed330..d01f40d 100644 --- a/keep/app/restorebackupwizard.cpp +++ b/keep/app/restorebackupwizard.cpp @@ -42,8 +42,8 @@ RestoreBackupWizard::RestoreBackupWizard(TQWidget *parent,const char* name): KWi m_manager = new RDBManager(); connect( m_manager, TQT_SIGNAL(backupError(Backup,TQString)), this, TQT_SLOT(slotRestoreError(Backup,TQString)) ); - KIconLoader icons; - this->setIcon( icons.loadIcon( "wizard",KIcon::Small )); + TDEIconLoader icons; + this->setIcon( icons.loadIcon( "wizard",TDEIcon::Small )); this->setCaption("Restore a backup"); m_popup = new TDEPopupMenu(this);