summaryrefslogtreecommitdiffstats
path: root/kexi/main
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/main')
-rw-r--r--kexi/main/keximainwindowimpl.cpp2
-rw-r--r--kexi/main/printing/kexisimpleprintingpagesetup.cpp2
-rw-r--r--kexi/main/startup/KexiConnSelector.cpp2
-rw-r--r--kexi/main/startup/KexiNewProjectWizard.cpp2
-rw-r--r--kexi/main/startup/KexiProjectSelector.cpp2
-rw-r--r--kexi/main/startup/KexiStartupDialog.cpp8
-rw-r--r--kexi/main/startup/KexiStartupDialogTemplatesPage.cpp2
-rw-r--r--kexi/main/startup/KexiStartupDialogTemplatesPage.h2
-rw-r--r--kexi/main/startup/KexiStartupFileDialog_win.cpp12
9 files changed, 17 insertions, 17 deletions
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 2dd9ebe1..417efd05 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -3100,7 +3100,7 @@ tristate KexiMainWindowImpl::getNewObjectInfo(
d->nameDialog->widget()->setCaptionText(partItem->caption());
d->nameDialog->widget()->setNameText(partItem->name());
d->nameDialog->setCaption(i18n("Save Object As"));
- d->nameDialog->setDialogIcon( DesktopIcon( info->itemIcon(), KIcon::SizeMedium ) );
+ d->nameDialog->setDialogIcon( DesktopIcon( info->itemIcon(), TDEIcon::SizeMedium ) );
allowOverwriting = false;
bool found;
do {
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index 0388eebe..56675be8 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -335,7 +335,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
// setFocusPolicy(WheelFocus);
m_contents->setFocusProxy(m_contents->headerTitleLineEdit);
- m_contents->printButton->setIconSet( KStdGuiItem::print().iconSet(KIcon::Small) );
+ m_contents->printButton->setIconSet( KStdGuiItem::print().iconSet(TDEIcon::Small) );
m_contents->printButton->setText( KStdGuiItem::print().text() );
connect(m_contents->printButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(print()));
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index 2558b4e7..870d6f24 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -108,7 +108,7 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set,
d->conn_set = &conn_set;
d->startDirOrVariable = startDirOrVariable;
TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
- const TQPixmap &icon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
+ const TQPixmap &icon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
setIcon( icon );
TQVBoxLayout* globalLyr = new TQVBoxLayout( this );
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index e7f613e6..29b4c2ca 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -108,7 +108,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
d->lvi_file = new TDEListViewItem( m_prjtype_sel->lv_types, i18n("New Project Stored in File") );
d->lvi_file->setPixmap(0,
TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType(
- KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), KIcon::Desktop
+ KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), TDEIcon::Desktop
)
);
d->lvi_file->setMultiLinesEnabled( true );
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index eeb46da6..b3ee1ce7 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -105,7 +105,7 @@ KexiProjectSelectorWidget::KexiProjectSelectorWidget(
d->showProjectNameColumn = showProjectNameColumn;
d->showConnectionColumns = showConnectionColumns;
TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
- d->fileicon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
+ d->fileicon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
setIcon( d->fileicon );
d->dbicon = SmallIcon("database");
// list->setHScrollBarMode( TQScrollView::AlwaysOn );
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 21eb3edf..7d06dd2e 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -69,9 +69,9 @@ public:
result = 0;
TQString none, iconname;
iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
- kexi_sqlite_icon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
+ kexi_sqlite_icon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
iconname = KMimeType::mimeType("application/x-kexiproject-shortcut")->icon(none,0);
- kexi_shortcut_icon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
+ kexi_shortcut_icon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
prj_selector = 0;
chkDoNotShow = 0;
openExistingConnWidget = 0;
@@ -398,7 +398,7 @@ void KexiStartupDialog::setupPageTemplates()
void KexiStartupDialog::slotPageShown(TQWidget *page)
{
int idx = d->templatesWidget->pageIndex(page);
-// KIconView *templ = 0;
+// TDEIconView *templ = 0;
if (idx==d->templatesSectionID_blank) {//blank
// kdDebug() << "blank" << endl;
}
@@ -408,7 +408,7 @@ void KexiStartupDialog::slotPageShown(TQWidget *page)
else if (idx==d->templatesSectionID_templates) {
d->viewTemplates->populate();
}
-/*later? KIconView *templ = d->viewTemplates->templates;
+/*later? TDEIconView *templ = d->viewTemplates->templates;
if (templ->count()==0) {
//add items (on demand):
d->viewTemplates->addItem("cd_catalog", i18n("CD Catalog"),
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
index 5db58c82..d99ad4ae 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
@@ -98,7 +98,7 @@ void KexiStartupDialogTemplatesPage::populate()
if (firstChild())
setSelected(firstChild(), true);
-// templates = new KIconView(this, "templates");
+// templates = new TDEIconView(this, "templates");
// templates->setItemsMovable(false);
// templates->setShowToolTips(false);
// info = new KTextBrowser(this,"info");
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
index 74591986..58d12883 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
@@ -51,7 +51,7 @@ class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public TDEListView
private:
bool m_popuplated : 1;
-// KIconView *templates;
+// TDEIconView *templates;
// KTextBrowser *info;
};
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index ff2981f7..a37201b2 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -84,7 +84,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
//TODO d->keepLocation = false;
//TODO d->operationMode = Opening;
setMode(KFile::File | KFile::ExistingOnly); //(js) default: open action
- setIcon( TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::Desktop) );
+ setIcon( TDEGlobal::iconLoader()->loadIcon("fileopen", TDEIcon::Desktop) );
setDir(TQDir(startDir));
//TODO d->hasDefaultFilter = false;
//TODO d->hasView = false;
@@ -122,12 +122,12 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
u.setPath( TQDir::rootDirPath() );
TQString text = i18n("Root Directory: %1").arg( u.path() );
d->pathCombo->addDefaultURL( u,
- KMimeType::pixmapForURL( u, 0, KIcon::Small ),
+ KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
text );
u.setPath( TQDir::homeDirPath() );
text = i18n("Home Directory: %1").arg( u.path( +1 ) );
- d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ),
+ d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
text );
KURL docPath;
@@ -135,14 +135,14 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
if ( u.path(+1) != docPath.path(+1) ) {
text = i18n("Documents: %1").arg( docPath.path( +1 ) );
d->pathCombo->addDefaultURL( u,
- KMimeType::pixmapForURL( u, 0, KIcon::Small ),
+ KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
text );
}
u.setPath( TDEGlobalSettings::desktopPath() );
text = i18n("Desktop: %1").arg( u.path( +1 ) );
d->pathCombo->addDefaultURL( u,
- KMimeType::pixmapForURL( u, 0, KIcon::Small ),
+ KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
text );
u.setPath( "/tmp" );
@@ -387,7 +387,7 @@ void KexiStartupFileDialogBase::setOperationMode( KFileDialog::OperationMode mod
// d->keepLocation = (mode == Saving);
if (mode == KFileDialog::Saving) {
setMode( KFile::File );
- setIcon( TDEGlobal::iconLoader()->loadIcon("filesave", KIcon::Desktop) );
+ setIcon( TDEGlobal::iconLoader()->loadIcon("filesave", TDEIcon::Desktop) );
}
//(js) filterWidget->setEditable( !d->hasDefaultFilter || mode != Saving );
//(js) d->okButton->setGuiItem( (mode == Saving) ? KStdGuiItem::save() : KStdGuiItem::ok() );