From 799fae5feea55e95876c3722c79fd7dabadd2cd6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:19:44 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- buildtools/autotools/addapplicationdlg.cpp | 6 +++--- buildtools/autotools/addexistingdirectoriesdlg.cpp | 2 +- buildtools/autotools/addexistingfilesdlg.cpp | 2 +- buildtools/autotools/addicondlg.cpp | 2 +- buildtools/autotools/addservicedlg.cpp | 6 +++--- buildtools/custommakefiles/customprojectpart.cpp | 6 +++--- buildtools/pascal/pascalproject_part.cpp | 2 +- buildtools/qmake/trollprojectpart.cpp | 6 +++--- buildtools/script/scriptprojectpart.cpp | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'buildtools') diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp index e6bdc20d..d7c6e3e6 100644 --- a/buildtools/autotools/addapplicationdlg.cpp +++ b/buildtools/autotools/addapplicationdlg.cpp @@ -73,11 +73,11 @@ AddApplicationDialog::~AddApplicationDialog() void AddApplicationDialog::iconClicked() { - KIconLoader *loader = AutoProjectFactory::instance()->iconLoader(); - TQString name = KIconDialog::getIcon(KIcon::Desktop); + TDEIconLoader *loader = AutoProjectFactory::instance()->iconLoader(); + TQString name = TDEIconDialog::getIcon(TDEIcon::Desktop); if (!name.isNull()) { iconName = name; - icon_button->setPixmap(loader->loadIcon(name, KIcon::Desktop)); + icon_button->setPixmap(loader->loadIcon(name, TDEIcon::Desktop)); } } diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index d9168924..1fe346aa 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -84,7 +84,7 @@ void AddExistingDirectoriesDialog::init() { progressBar->hide(); - importView->setMode ( KIconView::Select ); + importView->setMode ( TDEIconView::Select ); importView->setItemsMovable ( false ); connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) ); diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index 0c3796d9..5e6be576 100644 --- a/buildtools/autotools/addexistingfilesdlg.cpp +++ b/buildtools/autotools/addexistingfilesdlg.cpp @@ -125,7 +125,7 @@ void AddExistingFilesDialog::init() { progressBar->hide(); - importView->setMode ( KIconView::Select ); + importView->setMode ( TDEIconView::Select ); importView->setItemsMovable ( false ); connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) ); diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp index 2f1ab292..965d3b4e 100644 --- a/buildtools/autotools/addicondlg.cpp +++ b/buildtools/autotools/addicondlg.cpp @@ -88,7 +88,7 @@ void AddIconDialog::accept() TQString destpath = destdir + "/" + name; TQString size = size_combo->currentText(); - TQString unknown = KIconTheme::defaultThemeName()+ "/" + size + "x" + size + "/mimetypes/unknown.png"; + TQString unknown = TDEIconTheme::defaultThemeName()+ "/" + size + "x" + size + "/mimetypes/unknown.png"; TQString templateFileName = locate("icon", unknown); kdDebug(9020) << "Unknown: " << unknown << ", template: " << templateFileName << endl; diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp index 7576741e..e8e47c98 100644 --- a/buildtools/autotools/addservicedlg.cpp +++ b/buildtools/autotools/addservicedlg.cpp @@ -93,11 +93,11 @@ void AddServiceDialog::updateProperties() void AddServiceDialog::iconClicked() { - KIconLoader *loader = AutoProjectFactory::instance()->iconLoader(); - TQString name = KIconDialog::getIcon(KIcon::Desktop); + TDEIconLoader *loader = AutoProjectFactory::instance()->iconLoader(); + TQString name = TDEIconDialog::getIcon(TDEIcon::Desktop); if (!name.isNull()) { iconName = name; - icon_button->setPixmap(loader->loadIcon(name, KIcon::Desktop)); + icon_button->setPixmap(loader->loadIcon(name, TDEIcon::Desktop)); } } diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index 39f2fde6..1f63b870 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -193,14 +193,14 @@ CustomProjectPart::~CustomProjectPart() void CustomProjectPart::projectConfigWidget( KDialogBase *dlg ) { TQVBox *vbox; - vbox = dlg->addVBoxPage( i18n( "Custom Manager" ), i18n( "Custom Manager" ), BarIcon( "make", KIcon::SizeMedium ) ); + vbox = dlg->addVBoxPage( i18n( "Custom Manager" ), i18n( "Custom Manager" ), BarIcon( "make", TDEIcon::SizeMedium ) ); CustomManagerWidget *w0 = new CustomManagerWidget( this, vbox ); connect( dlg, TQT_SIGNAL( okClicked() ), w0, TQT_SLOT( accept() ) ); - vbox = dlg->addVBoxPage( i18n( "Run Options" ), i18n( "Run Options" ), BarIcon( "make", KIcon::SizeMedium ) ); + vbox = dlg->addVBoxPage( i18n( "Run Options" ), i18n( "Run Options" ), BarIcon( "make", TDEIcon::SizeMedium ) ); RunOptionsWidget *w1 = new RunOptionsWidget( *projectDom(), "/kdevcustomproject", buildDirectory(), vbox ); connect( dlg, TQT_SIGNAL( okClicked() ), w1, TQT_SLOT( accept() ) ); - vbox = dlg->addVBoxPage( i18n( "Build Options" ), i18n( "Build Options" ), BarIcon( "make", KIcon::SizeMedium ) ); + vbox = dlg->addVBoxPage( i18n( "Build Options" ), i18n( "Build Options" ), BarIcon( "make", TDEIcon::SizeMedium ) ); TQTabWidget *buildtab = new TQTabWidget( vbox ); CustomBuildOptionsWidget *w2 = new CustomBuildOptionsWidget( *projectDom(), buildtab ); diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index f1ee2758..3c5cddcd 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -400,7 +400,7 @@ void PascalProjectPart::projectConfigWidget( KDialogBase * dlg ) connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) ); - vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", KIcon::SizeMedium )); + vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", TDEIcon::SizeMedium )); RunOptionsWidget *w3 = new RunOptionsWidget(*projectDom(), "/kdevpascalproject", buildDirectory(), vbox); connect( dlg, TQT_SIGNAL(okClicked()), w3, TQT_SLOT(accept()) ); diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 4f125d68..6a84b9fc 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -270,13 +270,13 @@ TQString TrollProjectPart::makeEnvironment() void TrollProjectPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox; - vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", KIcon::SizeMedium )); + vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", TDEIcon::SizeMedium )); RunOptionsWidget *optdlg = new RunOptionsWidget(*projectDom(), "/kdevtrollproject", buildDirectory(), vbox); - vbox = dlg->addVBoxPage(i18n("Make Options"), i18n("Make Options"), BarIcon( "make", KIcon::SizeMedium )); + vbox = dlg->addVBoxPage(i18n("Make Options"), i18n("Make Options"), BarIcon( "make", TDEIcon::SizeMedium )); MakeOptionsWidget *w4 = new MakeOptionsWidget(*projectDom(), "/kdevtrollproject", vbox); - vbox = dlg->addVBoxPage(i18n("TQMake Manager"), i18n("TQMake Manager"), BarIcon( "make", KIcon::SizeMedium )); + vbox = dlg->addVBoxPage(i18n("TQMake Manager"), i18n("TQMake Manager"), BarIcon( "make", TDEIcon::SizeMedium )); QMakeOptionsWidget *qm = new QMakeOptionsWidget( projectDirectory(), *projectDom(), "/kdevtrollproject", vbox); diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index bd9c0747..89c38abb 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -72,7 +72,7 @@ ScriptProjectPart::~ScriptProjectPart() void ScriptProjectPart::projectConfigWidget(KDialogBase *dlg) { TQVBox *vbox; - vbox = dlg->addVBoxPage(i18n("Script Project Options"), i18n("Script Project Options"), BarIcon("tdevelop", KIcon::SizeMedium)); + vbox = dlg->addVBoxPage(i18n("Script Project Options"), i18n("Script Project Options"), BarIcon("tdevelop", TDEIcon::SizeMedium)); ScriptOptionsWidget *w = new ScriptOptionsWidget(this, vbox); connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } -- cgit v1.2.1