summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/collectionfieldsdialog.cpp10
-rw-r--r--src/configdialog.cpp18
-rw-r--r--src/entryiconview.cpp26
-rw-r--r--src/entryiconview.h8
-rw-r--r--src/entryupdater.cpp2
-rw-r--r--src/fetch/fetchmanager.cpp2
-rw-r--r--src/fetchdialog.cpp4
-rw-r--r--src/fetcherconfigdialog.cpp6
-rw-r--r--src/gui/stringmapdialog.cpp4
-rw-r--r--src/newstuff/dialog.cpp4
10 files changed, 42 insertions, 42 deletions
diff --git a/src/collectionfieldsdialog.cpp b/src/collectionfieldsdialog.cpp
index fbbe1c9..3c1b6d5 100644
--- a/src/collectionfieldsdialog.cpp
+++ b/src/collectionfieldsdialog.cpp
@@ -82,10 +82,10 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
TQHBox* hb1 = new TQHBox(fieldsGroup);
hb1->setSpacing(KDialog::spacingHint());
m_btnNew = new KPushButton(i18n("New Field", "&New"), hb1);
- m_btnNew->setIconSet(BarIcon(TQString::fromLatin1("filenew"), KIcon::SizeSmall));
+ m_btnNew->setIconSet(BarIcon(TQString::fromLatin1("filenew"), TDEIcon::SizeSmall));
TQWhatsThis::add(m_btnNew, i18n("Add a new field to the collection"));
m_btnDelete = new KPushButton(i18n("Delete Field", "&Delete"), hb1);
- m_btnDelete->setIconSet(BarIconSet(TQString::fromLatin1("editdelete"), KIcon::SizeSmall));
+ m_btnDelete->setIconSet(BarIconSet(TQString::fromLatin1("editdelete"), TDEIcon::SizeSmall));
TQWhatsThis::add(m_btnDelete, i18n("Remove a field from the collection"));
connect(m_btnNew, TQT_SIGNAL(clicked()), TQT_SLOT(slotNew()) );
@@ -94,11 +94,11 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
TQHBox* hb2 = new TQHBox(fieldsGroup);
hb2->setSpacing(KDialog::spacingHint());
m_btnUp = new KPushButton(hb2);
- m_btnUp->setPixmap(BarIcon(TQString::fromLatin1("up"), KIcon::SizeSmall));
+ m_btnUp->setPixmap(BarIcon(TQString::fromLatin1("up"), TDEIcon::SizeSmall));
TQWhatsThis::add(m_btnUp, i18n("Move this field up in the list. The list order is important "
"for the layout of the entry editor."));
m_btnDown = new KPushButton(hb2);
- m_btnDown->setPixmap(BarIcon(TQString::fromLatin1("down"), KIcon::SizeSmall));
+ m_btnDown->setPixmap(BarIcon(TQString::fromLatin1("down"), TDEIcon::SizeSmall));
TQWhatsThis::add(m_btnDown, i18n("Move this field down in the list. The list order is important "
"for the layout of the entry editor."));
@@ -215,7 +215,7 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
label = new TQLabel(i18n("Extended &properties:"), grid);
layout->addWidget(label, ++row, 0);
m_btnExtended = new KPushButton(i18n("&Set..."), grid);
- m_btnExtended->setIconSet(BarIcon(TQString::fromLatin1("bookmark"), KIcon::SizeSmall));
+ m_btnExtended->setIconSet(BarIcon(TQString::fromLatin1("bookmark"), TDEIcon::SizeSmall));
layout->addWidget(m_btnExtended, row, 1);
label->setBuddy(m_btnExtended);
whats = i18n("Extended field properties are used to specify things such as the corresponding bibtex field.");
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 9d82463..119ec74 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -194,7 +194,7 @@ void ConfigDialog::slotDefault() {
}
void ConfigDialog::setupGeneralPage() {
- TQPixmap pix = DesktopIcon(TQString::fromLatin1("tellico"), KIcon::SizeMedium);
+ TQPixmap pix = DesktopIcon(TQString::fromLatin1("tellico"), TDEIcon::SizeMedium);
TQFrame* frame = addPage(i18n("General"), i18n("General Options"), pix);
TQVBoxLayout* l = new TQVBoxLayout(frame, KDialog::marginHint(), KDialog::spacingHint());
@@ -281,16 +281,16 @@ void ConfigDialog::setupGeneralPage() {
void ConfigDialog::setupPrintingPage() {
// SuSE changed the icon name on me
TQPixmap pix;
- KIconLoader* loader = TDEGlobal::iconLoader();
+ TDEIconLoader* loader = TDEGlobal::iconLoader();
if(loader) {
- pix = loader->loadIcon(TQString::fromLatin1("printer1"), KIcon::Desktop, KIcon::SizeMedium,
- KIcon::DefaultState, 0, true /*canReturnNull */);
+ pix = loader->loadIcon(TQString::fromLatin1("printer1"), TDEIcon::Desktop, TDEIcon::SizeMedium,
+ TDEIcon::DefaultState, 0, true /*canReturnNull */);
if(pix.isNull()) {
- pix = loader->loadIcon(TQString::fromLatin1("printer2"), KIcon::Desktop, KIcon::SizeMedium,
- KIcon::DefaultState, 0, true /*canReturnNull */);
+ pix = loader->loadIcon(TQString::fromLatin1("printer2"), TDEIcon::Desktop, TDEIcon::SizeMedium,
+ TDEIcon::DefaultState, 0, true /*canReturnNull */);
}
if(pix.isNull()) {
- pix = loader->loadIcon(TQString::fromLatin1("print_printer"), KIcon::Desktop, KIcon::SizeMedium);
+ pix = loader->loadIcon(TQString::fromLatin1("print_printer"), TDEIcon::Desktop, TDEIcon::SizeMedium);
}
}
TQFrame* frame = addPage(i18n("Printing"), i18n("Printing Options"), pix);
@@ -351,7 +351,7 @@ void ConfigDialog::setupPrintingPage() {
}
void ConfigDialog::setupTemplatePage() {
- TQPixmap pix = DesktopIcon(TQString::fromLatin1("looknfeel"), KIcon::SizeMedium);
+ TQPixmap pix = DesktopIcon(TQString::fromLatin1("looknfeel"), TDEIcon::SizeMedium);
TQFrame* frame = addPage(i18n("Templates"), i18n("Template Options"), pix);
TQVBoxLayout* l = new TQVBoxLayout(frame, KDialog::marginHint(), KDialog::spacingHint());
@@ -497,7 +497,7 @@ void ConfigDialog::setupTemplatePage() {
}
void ConfigDialog::setupFetchPage() {
- TQPixmap pix = DesktopIcon(TQString::fromLatin1("network"), KIcon::SizeMedium);
+ TQPixmap pix = DesktopIcon(TQString::fromLatin1("network"), TDEIcon::SizeMedium);
TQFrame* frame = addPage(i18n("Data Sources"), i18n("Data Source Options"), pix);
TQHBoxLayout* l = new TQHBoxLayout(frame, KDialog::marginHint(), KDialog::spacingHint());
diff --git a/src/entryiconview.cpp b/src/entryiconview.cpp
index 9bec26a..64b49e1 100644
--- a/src/entryiconview.cpp
+++ b/src/entryiconview.cpp
@@ -43,7 +43,7 @@ using Tellico::EntryIconView;
using Tellico::EntryIconViewItem;
EntryIconView::EntryIconView(TQWidget* parent_, const char* name_/*=0*/)
- : KIconView(parent_, name_), m_coll(0), m_maxAllowedIconWidth(MAX_ENTRY_ICON_SIZE),
+ : TDEIconView(parent_, name_), m_coll(0), m_maxAllowedIconWidth(MAX_ENTRY_ICON_SIZE),
m_maxIconWidth(MIN_ENTRY_ICON_SIZE), m_maxIconHeight(MIN_ENTRY_ICON_SIZE),
m_comparison(0) {
setAutoArrange(true);
@@ -51,7 +51,7 @@ EntryIconView::EntryIconView(TQWidget* parent_, const char* name_/*=0*/)
setItemsMovable(false);
setSelectionMode(TQIconView::Extended);
setResizeMode(TQIconView::Adjust);
- setMode(KIconView::Select);
+ setMode(TDEIconView::Select);
setSpacing(4);
// setWordWrapIconText(false);
@@ -69,7 +69,7 @@ EntryIconView::~EntryIconView() {
}
EntryIconViewItem* EntryIconView::firstItem() const {
- return static_cast<EntryIconViewItem*>(KIconView::firstItem());
+ return static_cast<EntryIconViewItem*>(TDEIconView::firstItem());
}
void EntryIconView::findImageField() {
@@ -97,9 +97,9 @@ const TQPixmap& EntryIconView::defaultPixmap() {
if(pix) {
return *pix;
}
- KIconLoader* loader = TDEGlobal::instance()->iconLoader();
+ TDEIconLoader* loader = TDEGlobal::instance()->iconLoader();
TQPixmap tmp = loader->loadIcon(TQString::fromLatin1("nocover_") + CollectionFactory::typeName(m_coll->type()),
- KIcon::User, 0, KIcon::DefaultState, 0, true /*canReturnNull */);
+ TDEIcon::User, 0, TDEIcon::DefaultState, 0, true /*canReturnNull */);
if(tmp.isNull()) {
myLog() << "EntryIconView::defaultPixmap() - null nocover image, loading tellico.png" << endl;
tmp = UserIcon(TQString::fromLatin1("tellico"));
@@ -163,7 +163,7 @@ void EntryIconView::refresh() {
}
void EntryIconView::clear() {
- KIconView::clear();
+ TDEIconView::clear();
m_coll = 0;
m_entries.clear();
m_imageField.truncate(0);
@@ -171,7 +171,7 @@ void EntryIconView::clear() {
void EntryIconView::showEntries(const Data::EntryVec& entries_) {
setUpdatesEnabled(false);
- KIconView::clear(); // don't call EntryIconView::clear() since that clears the entries_ ref
+ TDEIconView::clear(); // don't call EntryIconView::clear() since that clears the entries_ ref
if(entries_.isEmpty()) {
return;
}
@@ -311,7 +311,7 @@ int EntryIconView::compare(const EntryIconViewItem* item1, EntryIconViewItem* it
/* *********************************************************** */
EntryIconViewItem::EntryIconViewItem(EntryIconView* parent_, Data::EntryPtr entry_)
- : KIconViewItem(parent_, entry_->title()), m_entry(entry_), m_usesImage(false) {
+ : TDEIconViewItem(parent_, entry_->title()), m_entry(entry_), m_usesImage(false) {
setDragEnabled(false);
const TQString& imageField = parent_->imageField();
if(!imageField.isEmpty()) {
@@ -344,7 +344,7 @@ void EntryIconViewItem::setSelected(bool s_, bool cb_) {
}
if(s_ != isSelected()) {
view->updateSelected(this, s_);
- KIconViewItem::setSelected(s_, cb_);
+ TDEIconViewItem::setSelected(s_, cb_);
}
}
@@ -375,7 +375,7 @@ void EntryIconViewItem::update() {
}
void EntryIconViewItem::calcRect(const TQString& text_) {
- KIconViewItem::calcRect(text_);
+ TDEIconViewItem::calcRect(text_);
TQRect r = pixmapRect();
r.rRight() += ENTRY_ICON_SHADOW_RIGHT;
r.rBottom() += ENTRY_ICON_SHADOW_BOTTOM;
@@ -404,7 +404,7 @@ void EntryIconViewItem::paintPixmap(TQPainter* p_, const TQColorGroup& cg_) {
TQColor c = Tellico::blendColors(iconView()->backgroundColor(), TQt::black, 10);
p_->fillRect(r, c);
}
- KIconViewItem::paintPixmap(p_, cg_);
+ TDEIconViewItem::paintPixmap(p_, cg_);
}
void EntryIconViewItem::paintText(TQPainter* p_, const TQColorGroup &cg_) {
@@ -431,14 +431,14 @@ void EntryIconViewItem::paintText(TQPainter* p_, const TQColorGroup &cg_) {
TQString EntryIconViewItem::key() const {
const TQString& sortField = iconView()->sortField();
if(sortField.isEmpty()) {
- return KIconViewItem::key();
+ return TDEIconViewItem::key();
}
return m_entry->field(sortField);
}
int EntryIconViewItem::compare(TQIconViewItem* item_) const {
int res = iconView()->compare(this, static_cast<EntryIconViewItem*>(item_));
- return res == 0 ? KIconViewItem::compare(item_) : res;
+ return res == 0 ? TDEIconViewItem::compare(item_) : res;
}
#include "entryiconview.moc"
diff --git a/src/entryiconview.h b/src/entryiconview.h
index 60de852..13e4105 100644
--- a/src/entryiconview.h
+++ b/src/entryiconview.h
@@ -31,7 +31,7 @@ namespace Tellico {
/**
* @author Robby Stephenson
*/
-class EntryIconView : public KIconView, public Observer {
+class EntryIconView : public TDEIconView, public Observer {
Q_OBJECT
@@ -99,13 +99,13 @@ private:
ListViewComparison* m_comparison;
};
-class EntryIconViewItem : public KIconViewItem {
+class EntryIconViewItem : public TDEIconViewItem {
public:
EntryIconViewItem(EntryIconView* parent, Data::EntryPtr entry);
~EntryIconViewItem();
- EntryIconView* iconView() const { return static_cast<EntryIconView*>(KIconViewItem::iconView()); }
- EntryIconViewItem* nextItem() const { return static_cast<EntryIconViewItem*>(KIconViewItem::nextItem()); }
+ EntryIconView* iconView() const { return static_cast<EntryIconView*>(TDEIconViewItem::iconView()); }
+ EntryIconViewItem* nextItem() const { return static_cast<EntryIconViewItem*>(TDEIconViewItem::nextItem()); }
Data::EntryPtr entry() const { return m_entry; }
virtual void setSelected(bool s, bool cb);
diff --git a/src/entryupdater.cpp b/src/entryupdater.cpp
index 02213a7..afae780 100644
--- a/src/entryupdater.cpp
+++ b/src/entryupdater.cpp
@@ -213,7 +213,7 @@ Tellico::EntryUpdater::UpdateResult EntryUpdater::askUser(ResultList results) {
TQHBox* hbox = new TQHBox(box);
hbox->setSpacing(10);
TQLabel* icon = new TQLabel(hbox);
- icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(TQString::fromLatin1("network"), KIcon::Panel, 64));
+ icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(TQString::fromLatin1("network"), TDEIcon::Panel, 64));
TQString s = i18n("<qt><b>%1</b> returned multiple results which could match <b>%2</b>, "
"the entry currently in the collection. Please select the correct match.</qt>")
.arg(m_fetchers[m_fetchIndex]->source())
diff --git a/src/fetch/fetchmanager.cpp b/src/fetch/fetchmanager.cpp
index 5bc1946..56bea0a 100644
--- a/src/fetch/fetchmanager.cpp
+++ b/src/fetch/fetchmanager.cpp
@@ -60,7 +60,7 @@
#include <tqdir.h>
#define LOAD_ICON(name, group, size) \
- TDEGlobal::iconLoader()->loadIcon(name, static_cast<KIcon::Group>(group), size_)
+ TDEGlobal::iconLoader()->loadIcon(name, static_cast<TDEIcon::Group>(group), size_)
using Tellico::Fetch::Manager;
Manager* Manager::s_self = 0;
diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp
index 996fb83..77a1020 100644
--- a/src/fetchdialog.cpp
+++ b/src/fetchdialog.cpp
@@ -408,8 +408,8 @@ void FetchDialog::slotFetchDone(bool checkISBN /* = true */) {
TQHBoxLayout* lay2 = new TQHBoxLayout(lay);
TQLabel* lab = new TQLabel(box);
lab->setPixmap(TDEGlobal::iconLoader()->loadIcon(TQString::fromLatin1("messagebox_info"),
- KIcon::NoGroup,
- KIcon::SizeMedium));
+ TDEIcon::NoGroup,
+ TDEIcon::SizeMedium));
lay2->addWidget(lab);
TQString s = i18n("No results were found for the following ISBN values:");
lay2->addWidget(new TQLabel(s, box), 10);
diff --git a/src/fetcherconfigdialog.cpp b/src/fetcherconfigdialog.cpp
index b92ff15..69697e1 100644
--- a/src/fetcherconfigdialog.cpp
+++ b/src/fetcherconfigdialog.cpp
@@ -66,9 +66,9 @@ void FetcherConfigDialog::init(Fetch::Type type_) {
TQBoxLayout* vlay1 = new TQVBoxLayout(topLayout, KDialog::spacingHint());
m_iconLabel = new TQLabel(widget);
if(type_ == Fetch::Unknown) {
- m_iconLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon(TQString::fromLatin1("network"), KIcon::Panel, 64));
+ m_iconLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon(TQString::fromLatin1("network"), TDEIcon::Panel, 64));
} else {
- m_iconLabel->setPixmap(Fetch::Manager::self()->fetcherIcon(type_, KIcon::Panel, 64));
+ m_iconLabel->setPixmap(Fetch::Manager::self()->fetcherIcon(type_, TDEIcon::Panel, 64));
}
vlay1->addWidget(m_iconLabel);
vlay1->addStretch(1);
@@ -191,7 +191,7 @@ void FetcherConfigDialog::slotNewSourceSelected(int idx_) {
kdWarning() << "FetcherConfigDialog::slotNewSourceSelected() - unknown source type" << endl;
return;
}
- m_iconLabel->setPixmap(Fetch::Manager::self()->fetcherIcon(type, KIcon::Panel, 64));
+ m_iconLabel->setPixmap(Fetch::Manager::self()->fetcherIcon(type, TDEIcon::Panel, 64));
cw = Fetch::Manager::self()->configWidget(m_stack, type, m_typeCombo->currentText());
if(!cw) {
// bad bad bad!
diff --git a/src/gui/stringmapdialog.cpp b/src/gui/stringmapdialog.cpp
index 7425e3b..ba9fb18 100644
--- a/src/gui/stringmapdialog.cpp
+++ b/src/gui/stringmapdialog.cpp
@@ -55,9 +55,9 @@ StringMapDialog::StringMapDialog(const TQMap<TQString, TQString>& map_, TQWidget
KButtonBox* bb = new KButtonBox(box);
bb->addStretch();
TQPushButton* btn = bb->addButton(i18n("&Set"), TQT_TQOBJECT(this), TQT_SLOT(slotAdd()));
- btn->setIconSet(BarIcon(TQString::fromLatin1("filenew"), KIcon::SizeSmall));
+ btn->setIconSet(BarIcon(TQString::fromLatin1("filenew"), TDEIcon::SizeSmall));
btn = bb->addButton(i18n("&Delete"), TQT_TQOBJECT(this), TQT_SLOT(slotDelete()));
- btn->setIconSet(BarIcon(TQString::fromLatin1("editdelete"), KIcon::SizeSmall));
+ btn->setIconSet(BarIcon(TQString::fromLatin1("editdelete"), TDEIcon::SizeSmall));
l->addWidget(box);
l->addStretch(1);
diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp
index 5fd7ff0..7b32f38 100644
--- a/src/newstuff/dialog.cpp
+++ b/src/newstuff/dialog.cpp
@@ -157,7 +157,7 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_)
TQPixmap pix;
if(m_type == EntryTemplate) {
- pix = DesktopIcon(TQString::fromLatin1("looknfeel"), KIcon::SizeLarge);
+ pix = DesktopIcon(TQString::fromLatin1("looknfeel"), TDEIcon::SizeLarge);
TQWhatsThis::add(m_install, i18n("Download and install the selected template."));
} else {
pix = UserIcon(TQString::fromLatin1("script"));
@@ -371,7 +371,7 @@ void Dialog::slotSelected(TQListViewItem* item_) {
m_lastPreviewItem = item_;
}
TQPixmap pix = m_type == EntryTemplate
- ? DesktopIcon(TQString::fromLatin1("looknfeel"), KIcon::SizeLarge)
+ ? DesktopIcon(TQString::fromLatin1("looknfeel"), TDEIcon::SizeLarge)
: UserIcon(TQString::fromLatin1("script"));
m_iconLabel->setPixmap(pix);