Rename obsolete tq methods to standard names

(cherry picked from commit 68b0d93f00)
v3.5.13-sru
Timothy Pearson 14 years ago committed by Slávek Banko
parent 90f5eeb387
commit 8122cd571d

@ -44,7 +44,7 @@ bool Clipboard::cite(Data::EntryVec entries_) {
} }
s += '}'; s += '}';
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
cb->setText(s, TQClipboard::Clipboard); cb->setText(s, TQClipboard::Clipboard);
return true; return true;
} }

@ -50,12 +50,12 @@ rtl::OUString OOOHandler::TQString2OU(const TQString& str) {
const uint len = str.length(); const uint len = str.length();
sal_Unicode* uni = new sal_Unicode[len + 1]; sal_Unicode* uni = new sal_Unicode[len + 1];
const TQChar* qPtr = str.tqunicode(); const TQChar* qPtr = str.unicode();
const TQChar* qEnd = qPtr + len; const TQChar* qEnd = qPtr + len;
sal_Unicode* uPtr = uni; sal_Unicode* uPtr = uni;
while (qPtr != qEnd) { while (qPtr != qEnd) {
*(uPtr++) = (*(qPtr++)).tqunicode(); *(uPtr++) = (*(qPtr++)).unicode();
} }
*uPtr = 0; *uPtr = 0;

@ -96,11 +96,11 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
m_btnUp = new KPushButton(hb2); m_btnUp = new KPushButton(hb2);
m_btnUp->setPixmap(BarIcon(TQString::fromLatin1("up"), KIcon::SizeSmall)); m_btnUp->setPixmap(BarIcon(TQString::fromLatin1("up"), KIcon::SizeSmall));
TQWhatsThis::add(m_btnUp, i18n("Move this field up in the list. The list order is important " TQWhatsThis::add(m_btnUp, i18n("Move this field up in the list. The list order is important "
"for the tqlayout of the entry editor.")); "for the layout of the entry editor."));
m_btnDown = new KPushButton(hb2); m_btnDown = new KPushButton(hb2);
m_btnDown->setPixmap(BarIcon(TQString::fromLatin1("down"), KIcon::SizeSmall)); m_btnDown->setPixmap(BarIcon(TQString::fromLatin1("down"), KIcon::SizeSmall));
TQWhatsThis::add(m_btnDown, i18n("Move this field down in the list. The list order is important " TQWhatsThis::add(m_btnDown, i18n("Move this field down in the list. The list order is important "
"for the tqlayout of the entry editor.")); "for the layout of the entry editor."));
connect(m_btnUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp()) ); connect(m_btnUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp()) );
connect(m_btnDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); connect(m_btnDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown()));
@ -113,13 +113,13 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
TQWidget* grid = new TQWidget(propGroup); TQWidget* grid = new TQWidget(propGroup);
// (parent, nrows, ncols, margin, spacing) // (parent, nrows, ncols, margin, spacing)
TQGridLayout* tqlayout = new TQGridLayout(grid, 4, 4, 0, KDialog::spacingHint()); TQGridLayout* layout = new TQGridLayout(grid, 4, 4, 0, KDialog::spacingHint());
int row = -1; int row = -1;
TQLabel* label = new TQLabel(i18n("&Title:"), grid); TQLabel* label = new TQLabel(i18n("&Title:"), grid);
tqlayout->addWidget(label, ++row, 0); layout->addWidget(label, ++row, 0);
m_titleEdit = new KLineEdit(grid); m_titleEdit = new KLineEdit(grid);
tqlayout->addWidget(m_titleEdit, row, 1); layout->addWidget(m_titleEdit, row, 1);
label->setBuddy(m_titleEdit); label->setBuddy(m_titleEdit);
TQString whats = i18n("The title of the field"); TQString whats = i18n("The title of the field");
TQWhatsThis::add(label, whats); TQWhatsThis::add(label, whats);
@ -127,9 +127,9 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
connect(m_titleEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); connect(m_titleEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified()));
label = new TQLabel(i18n("T&ype:"), grid); label = new TQLabel(i18n("T&ype:"), grid);
tqlayout->addWidget(label, row, 2); layout->addWidget(label, row, 2);
m_typeCombo = new KComboBox(grid); m_typeCombo = new KComboBox(grid);
tqlayout->addWidget(m_typeCombo, row, 3); layout->addWidget(m_typeCombo, row, 3);
label->setBuddy(m_typeCombo); label->setBuddy(m_typeCombo);
whats = TQString::fromLatin1("<qt>"); whats = TQString::fromLatin1("<qt>");
whats += i18n("The type of the field determines what values may be used. "); whats += i18n("The type of the field determines what values may be used. ");
@ -155,9 +155,9 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
connect(m_typeCombo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotTypeChanged(const TQString&))); connect(m_typeCombo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotTypeChanged(const TQString&)));
label = new TQLabel(i18n("Cate&gory:"), grid); label = new TQLabel(i18n("Cate&gory:"), grid);
tqlayout->addWidget(label, ++row, 0); layout->addWidget(label, ++row, 0);
m_catCombo = new KComboBox(true, grid); m_catCombo = new KComboBox(true, grid);
tqlayout->addWidget(m_catCombo, row, 1); layout->addWidget(m_catCombo, row, 1);
label->setBuddy(m_catCombo); label->setBuddy(m_catCombo);
whats = i18n("The field category determines where the field is placed in the editor."); whats = i18n("The field category determines where the field is placed in the editor.");
TQWhatsThis::add(label, whats); TQWhatsThis::add(label, whats);
@ -177,10 +177,10 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
connect(m_catCombo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); connect(m_catCombo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified()));
label = new TQLabel(i18n("Descr&iption:"), grid); label = new TQLabel(i18n("Descr&iption:"), grid);
tqlayout->addWidget(label, ++row, 0); layout->addWidget(label, ++row, 0);
m_descEdit = new KLineEdit(grid); m_descEdit = new KLineEdit(grid);
m_descEdit->setMinimumWidth(150); m_descEdit->setMinimumWidth(150);
tqlayout->addMultiCellWidget(m_descEdit, row, row, 1, 3); layout->addMultiCellWidget(m_descEdit, row, row, 1, 3);
label->setBuddy(m_descEdit); label->setBuddy(m_descEdit);
/* TRANSLATORS: Do not translate %{year} and %{title}. */ /* TRANSLATORS: Do not translate %{year} and %{title}. */
whats = i18n("The description is a useful reminder of what information is contained in the " whats = i18n("The description is a useful reminder of what information is contained in the "
@ -191,9 +191,9 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
connect(m_descEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); connect(m_descEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified()));
label = new TQLabel(i18n("&Default value:"), grid); label = new TQLabel(i18n("&Default value:"), grid);
tqlayout->addWidget(label, ++row, 0); layout->addWidget(label, ++row, 0);
m_defaultEdit = new KLineEdit(grid); m_defaultEdit = new KLineEdit(grid);
tqlayout->addMultiCellWidget(m_defaultEdit, row, row, 1, 3); layout->addMultiCellWidget(m_defaultEdit, row, row, 1, 3);
label->setBuddy(m_defaultEdit); label->setBuddy(m_defaultEdit);
whats = i18n("<qt>A default value can be set for new entries.</qt>"); whats = i18n("<qt>A default value can be set for new entries.</qt>");
TQWhatsThis::add(label, whats); TQWhatsThis::add(label, whats);
@ -201,9 +201,9 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
connect(m_defaultEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); connect(m_defaultEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified()));
label = new TQLabel(i18n("A&llowed values:"), grid); label = new TQLabel(i18n("A&llowed values:"), grid);
tqlayout->addWidget(label, ++row, 0); layout->addWidget(label, ++row, 0);
m_allowEdit = new KLineEdit(grid); m_allowEdit = new KLineEdit(grid);
tqlayout->addMultiCellWidget(m_allowEdit, row, row, 1, 3); layout->addMultiCellWidget(m_allowEdit, row, row, 1, 3);
label->setBuddy(m_allowEdit); label->setBuddy(m_allowEdit);
whats = i18n("<qt>For <i>Choice</i>-type fields, these are the only values allowed. They are " whats = i18n("<qt>For <i>Choice</i>-type fields, these are the only values allowed. They are "
"placed in a combo box. The possible values have to be separated by a semi-colon, " "placed in a combo box. The possible values have to be separated by a semi-colon, "
@ -213,10 +213,10 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
connect(m_allowEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); connect(m_allowEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified()));
label = new TQLabel(i18n("Extended &properties:"), grid); label = new TQLabel(i18n("Extended &properties:"), grid);
tqlayout->addWidget(label, ++row, 0); layout->addWidget(label, ++row, 0);
m_btnExtended = new KPushButton(i18n("&Set..."), grid); m_btnExtended = new KPushButton(i18n("&Set..."), grid);
m_btnExtended->setIconSet(BarIcon(TQString::fromLatin1("bookmark"), KIcon::SizeSmall)); m_btnExtended->setIconSet(BarIcon(TQString::fromLatin1("bookmark"), KIcon::SizeSmall));
tqlayout->addWidget(m_btnExtended, row, 1); layout->addWidget(m_btnExtended, row, 1);
label->setBuddy(m_btnExtended); label->setBuddy(m_btnExtended);
whats = i18n("Extended field properties are used to specify things such as the corresponding bibtex field."); whats = i18n("Extended field properties are used to specify things such as the corresponding bibtex field.");
TQWhatsThis::add(label, whats); TQWhatsThis::add(label, whats);

@ -399,7 +399,7 @@ void ConfigDialog::setupTemplatePage() {
l->addWidget(fontGroup); l->addWidget(fontGroup);
row = -1; row = -1;
TQGridLayout* fontLayout = new TQGridLayout(fontGroup->tqlayout()); TQGridLayout* fontLayout = new TQGridLayout(fontGroup->layout());
fontLayout->setSpacing(KDialogBase::spacingHint()); fontLayout->setSpacing(KDialogBase::spacingHint());
lab = new TQLabel(i18n("Font:"), fontGroup); lab = new TQLabel(i18n("Font:"), fontGroup);
@ -426,7 +426,7 @@ void ConfigDialog::setupTemplatePage() {
l->addWidget(colGroup); l->addWidget(colGroup);
row = -1; row = -1;
TQGridLayout* colLayout = new TQGridLayout(colGroup->tqlayout()); TQGridLayout* colLayout = new TQGridLayout(colGroup->layout());
colLayout->setSpacing(KDialogBase::spacingHint()); colLayout->setSpacing(KDialogBase::spacingHint());
lab = new TQLabel(i18n("Background color:"), colGroup); lab = new TQLabel(i18n("Background color:"), colGroup);
@ -633,7 +633,7 @@ void ConfigDialog::readFetchConfig() {
Fetch::ConfigWidget* cw = it->configWidget(this); Fetch::ConfigWidget* cw = it->configWidget(this);
if(cw) { // might return 0 when no widget available for fetcher type if(cw) { // might return 0 when no widget available for fetcher type
m_configWidgets.insert(item, cw); m_configWidgets.insert(item, cw);
// there's weird tqlayout bug if it's not hidden // there's weird layout bug if it's not hidden
cw->hide(); cw->hide();
} }
kapp->processEvents(); kapp->processEvents();

@ -102,7 +102,7 @@ void DetailedListView::addCollection(Data::CollPtr coll_) {
} }
// this block compensates for the chance that the user added a field and it wasn't // this block compensates for the chance that the user added a field and it wasn't
// written to the widths. Also compensates for 0.5.x to 0.6.x column tqlayout changes // written to the widths. Also compensates for 0.5.x to 0.6.x column layout changes
TQValueList<int> colWidths = config.readIntListEntry("ColumnWidths" + configN); TQValueList<int> colWidths = config.readIntListEntry("ColumnWidths" + configN);
if(colWidths.empty()) { if(colWidths.empty()) {
colWidths.insert(colWidths.begin(), colNames.count(), -1); // automatic width colWidths.insert(colWidths.begin(), colNames.count(), -1); // automatic width

@ -153,7 +153,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
continue; continue;
} }
// if this tqlayout model is changed, be sure to check slotUpdateField() // if this layout model is changed, be sure to check slotUpdateField()
TQWidget* page = new TQWidget(m_tabs); TQWidget* page = new TQWidget(m_tabs);
// (parent, margin, spacing) // (parent, margin, spacing)
TQVBoxLayout* boxLayout = new TQVBoxLayout(page, 0, 0); TQVBoxLayout* boxLayout = new TQVBoxLayout(page, 0, 0);
@ -163,10 +163,10 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
// (parent, nrows, ncols, margin, spacing) // (parent, nrows, ncols, margin, spacing)
// spacing gets a bit weird, if there are absolutely no Choice fields, // spacing gets a bit weird, if there are absolutely no Choice fields,
// then spacing should be 5, which is set later // then spacing should be 5, which is set later
TQGridLayout* tqlayout = new TQGridLayout(grid, 0, NCOLS, 8, 2); TQGridLayout* layout = new TQGridLayout(grid, 0, NCOLS, 8, 2);
// keramik styles make big widget, cut down the spacing a bit // keramik styles make big widget, cut down the spacing a bit
if(TQCString(tqstyle().name()).lower().find("keramik", 0, false) > -1) { if(TQCString(style().name()).lower().find("keramik", 0, false) > -1) {
tqlayout->setSpacing(0); layout->setSpacing(0);
} }
boxLayout->addWidget(grid, 0); boxLayout->addWidget(grid, 0);
@ -202,8 +202,8 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
int r = count/NCOLS; int r = count/NCOLS;
int c = count%NCOLS; int c = count%NCOLS;
tqlayout->addWidget(widget, r, c); layout->addWidget(widget, r, c);
tqlayout->setRowStretch(r, 1); layout->setRowStretch(r, 1);
m_widgetDict.insert(TQString::number(m_currColl->id()) + field->name(), widget); m_widgetDict.insert(TQString::number(m_currColl->id()) + field->name(), widget);
@ -231,7 +231,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
// update stretch factors for columns with a line edit // update stretch factors for columns with a line edit
for(int col = 0; col < NCOLS; ++col) { for(int col = 0; col < NCOLS; ++col) {
if(expands[col]) { if(expands[col]) {
tqlayout->setColStretch(col, 1); layout->setColStretch(col, 1);
} }
} }
@ -240,7 +240,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
// Now, go through and set all the field widgets to the same height // Now, go through and set all the field widgets to the same height
for(TQPtrListIterator<TQWidget> it(gridList); it.current(); ++it) { for(TQPtrListIterator<TQWidget> it(gridList); it.current(); ++it) {
TQGridLayout* l = static_cast<TQGridLayout*>(it.current()->tqlayout()); TQGridLayout* l = static_cast<TQGridLayout*>(it.current()->layout());
if(noChoices) { if(noChoices) {
l->setSpacing(5); l->setSpacing(5);
} }
@ -250,7 +250,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
// I don't want anything to be hidden, Keramik has a bug if I don't do this // I don't want anything to be hidden, Keramik has a bug if I don't do this
it.current()->setMinimumHeight(it.current()->sizeHint().height()); it.current()->setMinimumHeight(it.current()->sizeHint().height());
// the parent of the grid is the page that got added to the tabs // the parent of the grid is the page that got added to the tabs
it.current()->parentWidget()->tqlayout()->invalidate(); it.current()->parentWidget()->layout()->invalidate();
it.current()->parentWidget()->setMinimumHeight(it.current()->parentWidget()->sizeHint().height()); it.current()->parentWidget()->setMinimumHeight(it.current()->parentWidget()->sizeHint().height());
} }
@ -258,7 +258,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) {
// this doesn't seem to work // this doesn't seem to work
// setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); // setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
// so do this instead // so do this instead
tqlayout()->invalidate(); // needed so the sizeHint() gets recalculated layout()->invalidate(); // needed so the sizeHint() gets recalculated
m_tabs->setMinimumHeight(m_tabs->minimumSizeHint().height()); m_tabs->setMinimumHeight(m_tabs->minimumSizeHint().height());
m_tabs->setMinimumWidth(m_tabs->sizeHint().width()); m_tabs->setMinimumWidth(m_tabs->sizeHint().width());
@ -566,8 +566,8 @@ void EntryEditDialog::removeField(Data::CollPtr, Data::FieldPtr field_) {
delete w; // automatically deletes child widget delete w; // automatically deletes child widget
} else { } else {
// much of this replicates code in setLayout() // much of this replicates code in setLayout()
TQGridLayout* tqlayout = static_cast<TQGridLayout*>(widget->parentWidget()->tqlayout()); TQGridLayout* layout = static_cast<TQGridLayout*>(widget->parentWidget()->layout());
delete widget; // automatically removes from tqlayout delete widget; // automatically removes from layout
TQValueVector<bool> expands(NCOLS, false); TQValueVector<bool> expands(NCOLS, false);
TQValueVector<int> maxWidth(NCOLS, 0); TQValueVector<int> maxWidth(NCOLS, 0);
@ -577,8 +577,8 @@ void EntryEditDialog::removeField(Data::CollPtr, Data::FieldPtr field_) {
for(int count = 0; it != vec.end(); ++it) { for(int count = 0; it != vec.end(); ++it) {
GUI::FieldWidget* widget = m_widgetDict.find(TQString::number(m_currColl->id()) + it->name()); GUI::FieldWidget* widget = m_widgetDict.find(TQString::number(m_currColl->id()) + it->name());
if(widget) { if(widget) {
tqlayout->remove(widget); layout->remove(widget);
tqlayout->addWidget(widget, count/NCOLS, count%NCOLS); layout->addWidget(widget, count/NCOLS, count%NCOLS);
maxWidth[count%NCOLS] = TQMAX(maxWidth[count%NCOLS], widget->labelWidth()); maxWidth[count%NCOLS] = TQMAX(maxWidth[count%NCOLS], widget->labelWidth());
if(widget->expands()) { if(widget->expands()) {
@ -602,7 +602,7 @@ void EntryEditDialog::removeField(Data::CollPtr, Data::FieldPtr field_) {
// update stretch factors for columns with a line edit // update stretch factors for columns with a line edit
for(int col = 0; col < NCOLS; ++col) { for(int col = 0; col < NCOLS; ++col) {
if(expands[col]) { if(expands[col]) {
tqlayout->setColStretch(col, 1); layout->setColStretch(col, 1);
} }
} }
} }
@ -687,7 +687,7 @@ void EntryEditDialog::modifyField(Data::CollPtr coll_, Data::FieldPtr oldField_,
m_currColl = coll_; m_currColl = coll_;
} }
// if the field type changed, go ahead and redo the whole tqlayout // if the field type changed, go ahead and redo the whole layout
// also if the category changed for a non-single field, since a new tab must be created // also if the category changed for a non-single field, since a new tab must be created
if(oldField_->type() != newField_->type() if(oldField_->type() != newField_->type()
|| (oldField_->category() != newField_->category() && !newField_->isSingleCategory())) { || (oldField_->category() != newField_->category() && !newField_->isSingleCategory())) {

@ -49,9 +49,9 @@ public:
*/ */
bool queryModified(); bool queryModified();
/** /**
* Deletes and resets the tqlayout of the tabs. * Deletes and resets the layout of the tabs.
* *
* @param coll A pointer to the collection whose fields should be used for setting up the tqlayout * @param coll A pointer to the collection whose fields should be used for setting up the layout
*/ */
void setLayout(Data::CollPtr coll); void setLayout(Data::CollPtr coll);
/** /**

@ -46,7 +46,7 @@ EntryView::EntryView(TQWidget* parent_, const char* name_) : KHTMLPart(parent_,
setJavaEnabled(false); setJavaEnabled(false);
setMetaRefreshEnabled(false); setMetaRefreshEnabled(false);
setPluginsEnabled(false); setPluginsEnabled(false);
clear(); // needed for initial tqlayout clear(); // needed for initial layout
view()->setAcceptDrops(true); view()->setAcceptDrops(true);
DropHandler* drophandler = new DropHandler(this); DropHandler* drophandler = new DropHandler(this);
@ -76,7 +76,7 @@ void EntryView::clear() {
write(m_textToShow); write(m_textToShow);
} }
end(); end();
view()->tqlayout(); // I need this because some of the margins and widths may get messed up view()->layout(); // I need this because some of the margins and widths may get messed up
} }
void EntryView::showEntry(Data::EntryPtr entry_) { void EntryView::showEntry(Data::EntryPtr entry_) {
@ -158,7 +158,7 @@ void EntryView::showEntry(Data::EntryPtr entry_) {
write(html); write(html);
end(); end();
// not need anymore? // not need anymore?
view()->tqlayout(); // I need this because some of the margins and widths may get messed up view()->layout(); // I need this because some of the margins and widths may get messed up
} }
void EntryView::showText(const TQString& text_) { void EntryView::showText(const TQString& text_) {

@ -38,7 +38,7 @@ void ConfigWidget::addFieldsWidget(const StringMap& customFields_, const TQStrin
} }
TQVGroupBox* box = new TQVGroupBox(i18n("Available Fields"), this); TQVGroupBox* box = new TQVGroupBox(i18n("Available Fields"), this);
static_cast<TQBoxLayout*>(tqlayout())->addWidget(box); static_cast<TQBoxLayout*>(layout())->addWidget(box);
for(StringMap::ConstIterator it = customFields_.begin(); it != customFields_.end(); ++it) { for(StringMap::ConstIterator it = customFields_.begin(); it != customFields_.end(); ++it) {
TQCheckBox* cb = new TQCheckBox(it.data(), box); TQCheckBox* cb = new TQCheckBox(it.data(), box);
m_fields.insert(it.key(), cb); m_fields.insert(it.key(), cb);

@ -86,7 +86,7 @@ class BasicTellicoDOM:
entryNode.setAttribute('id', str(self.__currentId)) entryNode.setAttribute('id', str(self.__currentId))
titleNode = self.__doc.createElement('title') titleNode = self.__doc.createElement('title')
titleNode.appendChild(self.__doc.createTextNode(tqunicode(d['title'], 'latin-1').encode('utf-8'))) titleNode.appendChild(self.__doc.createTextNode(unicode(d['title'], 'latin-1').encode('utf-8')))
yearNode = self.__doc.createElement('pub_year') yearNode = self.__doc.createElement('pub_year')
yearNode.appendChild(self.__doc.createTextNode(d['pub_year'])) yearNode.appendChild(self.__doc.createTextNode(d['pub_year']))
@ -101,25 +101,25 @@ class BasicTellicoDOM:
writersNode = self.__doc.createElement('writers') writersNode = self.__doc.createElement('writers')
for g in d['writer']: for g in d['writer']:
writerNode = self.__doc.createElement('writer') writerNode = self.__doc.createElement('writer')
writerNode.appendChild(self.__doc.createTextNode(tqunicode(g, 'latin-1').encode('utf-8'))) writerNode.appendChild(self.__doc.createTextNode(unicode(g, 'latin-1').encode('utf-8')))
writersNode.appendChild(writerNode) writersNode.appendChild(writerNode)
genresNode = self.__doc.createElement('genres') genresNode = self.__doc.createElement('genres')
for g in d['genre']: for g in d['genre']:
genreNode = self.__doc.createElement('genre') genreNode = self.__doc.createElement('genre')
genreNode.appendChild(self.__doc.createTextNode(tqunicode(g, 'latin-1').encode('utf-8'))) genreNode.appendChild(self.__doc.createTextNode(unicode(g, 'latin-1').encode('utf-8')))
genresNode.appendChild(genreNode) genresNode.appendChild(genreNode)
commentsNode = self.__doc.createElement('comments') commentsNode = self.__doc.createElement('comments')
#for g in d['comments']: #for g in d['comments']:
# commentsNode.appendChild(self.__doc.createTextNode(tqunicode("%s\n\n" % g, 'latin-1').encode('utf-8'))) # commentsNode.appendChild(self.__doc.createTextNode(unicode("%s\n\n" % g, 'latin-1').encode('utf-8')))
commentsData = string.join(d['comments'], '\n\n') commentsData = string.join(d['comments'], '\n\n')
commentsNode.appendChild(self.__doc.createTextNode(tqunicode(commentsData, 'latin-1').encode('utf-8'))) commentsNode.appendChild(self.__doc.createTextNode(unicode(commentsData, 'latin-1').encode('utf-8')))
artistsNode = self.__doc.createElement('artists') artistsNode = self.__doc.createElement('artists')
for k, v in d['artist'].iteritems(): for k, v in d['artist'].iteritems():
artistNode = self.__doc.createElement('artist') artistNode = self.__doc.createElement('artist')
artistNode.appendChild(self.__doc.createTextNode(tqunicode(v, 'latin-1').encode('utf-8'))) artistNode.appendChild(self.__doc.createTextNode(unicode(v, 'latin-1').encode('utf-8')))
artistsNode.appendChild(artistNode) artistsNode.appendChild(artistNode)
pagesNode = self.__doc.createElement('pages') pagesNode = self.__doc.createElement('pages')
@ -132,7 +132,7 @@ class BasicTellicoDOM:
imageNode = self.__doc.createElement('image') imageNode = self.__doc.createElement('image')
imageNode.setAttribute('format', 'JPEG') imageNode.setAttribute('format', 'JPEG')
imageNode.setAttribute('id', d['image'][0]) imageNode.setAttribute('id', d['image'][0])
imageNode.appendChild(self.__doc.createTextNode(tqunicode(d['image'][1], 'latin-1').encode('utf-8'))) imageNode.appendChild(self.__doc.createTextNode(unicode(d['image'][1], 'latin-1').encode('utf-8')))
coverNode = self.__doc.createElement('cover') coverNode = self.__doc.createElement('cover')
coverNode.appendChild(self.__doc.createTextNode(d['image'][0])) coverNode.appendChild(self.__doc.createTextNode(d['image'][0]))

@ -90,23 +90,23 @@ class BasicTellicoDOM:
entryNode.setAttribute('id', str(self.__currentId)) entryNode.setAttribute('id', str(self.__currentId))
titleNode = self.__doc.createElement('title') titleNode = self.__doc.createElement('title')
titleNode.appendChild(self.__doc.createTextNode(tqunicode(d['title'], 'latin-1').encode('utf-8'))) titleNode.appendChild(self.__doc.createTextNode(unicode(d['title'], 'latin-1').encode('utf-8')))
otitleNode = self.__doc.createElement('titre-original') otitleNode = self.__doc.createElement('titre-original')
otitleNode.appendChild(self.__doc.createTextNode(tqunicode(d['otitle'], 'latin-1').encode('utf-8'))) otitleNode.appendChild(self.__doc.createTextNode(unicode(d['otitle'], 'latin-1').encode('utf-8')))
yearNode = self.__doc.createElement('year') yearNode = self.__doc.createElement('year')
yearNode.appendChild(self.__doc.createTextNode(tqunicode(d['year'], 'latin-1').encode('utf-8'))) yearNode.appendChild(self.__doc.createTextNode(unicode(d['year'], 'latin-1').encode('utf-8')))
genresNode = self.__doc.createElement('genres') genresNode = self.__doc.createElement('genres')
for g in d['genres']: for g in d['genres']:
genreNode = self.__doc.createElement('genre') genreNode = self.__doc.createElement('genre')
genreNode.appendChild(self.__doc.createTextNode(tqunicode(g, 'latin-1').encode('utf-8'))) genreNode.appendChild(self.__doc.createTextNode(unicode(g, 'latin-1').encode('utf-8')))
genresNode.appendChild(genreNode) genresNode.appendChild(genreNode)
natsNode = self.__doc.createElement('nationalitys') natsNode = self.__doc.createElement('nationalitys')
natNode = self.__doc.createElement('nat') natNode = self.__doc.createElement('nat')
natNode.appendChild(self.__doc.createTextNode(tqunicode(d['nat'], 'latin-1').encode('utf-8'))) natNode.appendChild(self.__doc.createTextNode(unicode(d['nat'], 'latin-1').encode('utf-8')))
natsNode.appendChild(natNode) natsNode.appendChild(natNode)
castsNode = self.__doc.createElement('casts') castsNode = self.__doc.createElement('casts')
@ -114,7 +114,7 @@ class BasicTellicoDOM:
castNode = self.__doc.createElement('cast') castNode = self.__doc.createElement('cast')
col1Node = self.__doc.createElement('column') col1Node = self.__doc.createElement('column')
col2Node = self.__doc.createElement('column') col2Node = self.__doc.createElement('column')
col1Node.appendChild(self.__doc.createTextNode(tqunicode(g, 'latin-1').encode('utf-8'))) col1Node.appendChild(self.__doc.createTextNode(unicode(g, 'latin-1').encode('utf-8')))
castNode.appendChild(col1Node) castNode.appendChild(col1Node)
castNode.appendChild(col2Node) castNode.appendChild(col2Node)
castsNode.appendChild(castNode) castsNode.appendChild(castNode)
@ -122,17 +122,17 @@ class BasicTellicoDOM:
dirsNode = self.__doc.createElement('directors') dirsNode = self.__doc.createElement('directors')
for g in d['dirs']: for g in d['dirs']:
dirNode = self.__doc.createElement('director') dirNode = self.__doc.createElement('director')
dirNode.appendChild(self.__doc.createTextNode(tqunicode(g, 'latin-1').encode('utf-8'))) dirNode.appendChild(self.__doc.createTextNode(unicode(g, 'latin-1').encode('utf-8')))
dirsNode.appendChild(dirNode) dirsNode.appendChild(dirNode)
timeNode = self.__doc.createElement('running-time') timeNode = self.__doc.createElement('running-time')
timeNode.appendChild(self.__doc.createTextNode(tqunicode(d['time'], 'latin-1').encode('utf-8'))) timeNode.appendChild(self.__doc.createTextNode(unicode(d['time'], 'latin-1').encode('utf-8')))
allocineNode = self.__doc.createElement(tqunicode('allociné-link', 'latin-1').encode('utf-8')) allocineNode = self.__doc.createElement(unicode('allociné-link', 'latin-1').encode('utf-8'))
allocineNode.appendChild(self.__doc.createTextNode(tqunicode(d['allocine'], 'latin-1').encode('utf-8'))) allocineNode.appendChild(self.__doc.createTextNode(unicode(d['allocine'], 'latin-1').encode('utf-8')))
plotNode = self.__doc.createElement('plot') plotNode = self.__doc.createElement('plot')
plotNode.appendChild(self.__doc.createTextNode(tqunicode(d['plot'], 'latin-1').encode('utf-8'))) plotNode.appendChild(self.__doc.createTextNode(unicode(d['plot'], 'latin-1').encode('utf-8')))
if d['image']: if d['image']:
imageNode = self.__doc.createElement('image') imageNode = self.__doc.createElement('image')
@ -140,7 +140,7 @@ class BasicTellicoDOM:
imageNode.setAttribute('id', d['image'][0]) imageNode.setAttribute('id', d['image'][0])
imageNode.setAttribute('width', '120') imageNode.setAttribute('width', '120')
imageNode.setAttribute('height', '160') imageNode.setAttribute('height', '160')
imageNode.appendChild(self.__doc.createTextNode(tqunicode(d['image'][1], 'latin-1').encode('utf-8'))) imageNode.appendChild(self.__doc.createTextNode(unicode(d['image'][1], 'latin-1').encode('utf-8')))
coverNode = self.__doc.createElement('cover') coverNode = self.__doc.createElement('cover')
coverNode.appendChild(self.__doc.createTextNode(d['image'][0])) coverNode.appendChild(self.__doc.createTextNode(d['image'][0]))

@ -155,9 +155,9 @@ class BasicTellicoDOM:
# Convert all strings to UTF-8 # Convert all strings to UTF-8
for i in d.keys(): for i in d.keys():
if type(d[i]) == types.ListType: if type(d[i]) == types.ListType:
d[i] = [tqunicode(d[i][j], 'latin-1').encode('utf-8') for j in range(len(d[i]))] d[i] = [unicode(d[i][j], 'latin-1').encode('utf-8') for j in range(len(d[i]))]
elif type(d[i]) == types.StringType: elif type(d[i]) == types.StringType:
d[i] = tqunicode(d[i], 'latin-1').encode('utf-8') d[i] = unicode(d[i], 'latin-1').encode('utf-8')
entryNode = self.__doc.createElement('entry') entryNode = self.__doc.createElement('entry')
entryNode.setAttribute('id', str(self.__currentId)) entryNode.setAttribute('id', str(self.__currentId))

@ -236,7 +236,7 @@ Tellico::Data::EntryPtr YahooFetcher::fetchEntry(uint uid_) {
if(!imageURL.isEmpty()) { if(!imageURL.isEmpty()) {
TQString id = ImageFactory::addImage(imageURL, true); TQString id = ImageFactory::addImage(imageURL, true);
if(id.isEmpty()) { if(id.isEmpty()) {
// rich text causes tqlayout issues // rich text causes layout issues
// emit signalStatus(i18n("<qt>The cover image for <i>%1</i> could not be loaded.</qt>").arg( // emit signalStatus(i18n("<qt>The cover image for <i>%1</i> could not be loaded.</qt>").arg(
// entry->field(TQString::fromLatin1("title")))); // entry->field(TQString::fromLatin1("title"))));
message(i18n("The cover image could not be loaded."), MessageHandler::Warning); message(i18n("The cover image could not be loaded."), MessageHandler::Warning);

@ -93,7 +93,7 @@ FieldWidget::FieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* n
: TQWidget(parent_, name_), m_field(field_) { : TQWidget(parent_, name_), m_field(field_) {
TQHBoxLayout* l = new TQHBoxLayout(this, 2, 2); // parent, margin, spacing TQHBoxLayout* l = new TQHBoxLayout(this, 2, 2); // parent, margin, spacing
l->addSpacing(4); // add some more space in the columns between widgets l->addSpacing(4); // add some more space in the columns between widgets
if(TQCString(tqstyle().name()).lower().find("keramik", 0, false) > -1) { if(TQCString(style().name()).lower().find("keramik", 0, false) > -1) {
l->setMargin(1); l->setMargin(1);
} }
@ -182,7 +182,7 @@ void FieldWidget::registerWidget() {
setFocusProxy(w); setFocusProxy(w);
} }
TQHBoxLayout* l = static_cast<TQHBoxLayout*>(tqlayout()); TQHBoxLayout* l = static_cast<TQHBoxLayout*>(layout());
l->insertWidget(FIELD_EDIT_WIDGET_INDEX, w, m_expands ? 1 : 0 /*stretch*/); l->insertWidget(FIELD_EDIT_WIDGET_INDEX, w, m_expands ? 1 : 0 /*stretch*/);
if(!m_expands) { if(!m_expands) {
l->insertStretch(FIELD_EDIT_WIDGET_INDEX+1, 1 /*stretch*/); l->insertStretch(FIELD_EDIT_WIDGET_INDEX+1, 1 /*stretch*/);

@ -56,7 +56,7 @@ ImageWidget::ImageWidget(TQWidget* parent_, const char* name_) : TQWidget(parent
KButtonBox* box = new KButtonBox(this,Qt::Vertical); KButtonBox* box = new KButtonBox(this,Qt::Vertical);
box->addButton(i18n("Select Image..."), TQT_TQOBJECT(this), TQT_SLOT(slotGetImage())); box->addButton(i18n("Select Image..."), TQT_TQOBJECT(this), TQT_SLOT(slotGetImage()));
box->addButton(i18n("Clear"), TQT_TQOBJECT(this), TQT_SLOT(slotClear())); box->addButton(i18n("Clear"), TQT_TQOBJECT(this), TQT_SLOT(slotClear()));
box->tqlayout(); box->layout();
boxLayout->addWidget(box); boxLayout->addWidget(box);
boxLayout->addSpacing(8); boxLayout->addSpacing(8);

@ -135,7 +135,7 @@ void KWidgetLister::addWidgetAtEnd(TQWidget *w)
void KWidgetLister::removeLastWidget() void KWidgetLister::removeLastWidget()
{ {
// The tqlayout will take care that the // The layout will take care that the
// widget is removed from screen, too. // widget is removed from screen, too.
mWidgetList.removeLast(); mWidgetList.removeLast();
enableControls(); enableControls();

@ -71,19 +71,19 @@ protected slots:
/** Called whenever the user clicks on the 'more' button. /** Called whenever the user clicks on the 'more' button.
Reimplementations should call this method, because this Reimplementations should call this method, because this
implementation does all the dirty work with adding the widgets implementation does all the dirty work with adding the widgets
to the tqlayout (through @ref addWidgetAtEnd) and enabling/disabling to the layout (through @ref addWidgetAtEnd) and enabling/disabling
the control buttons. */ the control buttons. */
virtual void slotMore(); virtual void slotMore();
/** Called whenever the user clicks on the 'fewer' button. /** Called whenever the user clicks on the 'fewer' button.
Reimplementations should call this method, because this Reimplementations should call this method, because this
implementation does all the dirty work with removing the widgets implementation does all the dirty work with removing the widgets
from the tqlayout (through @ref removelastWidget) and from the layout (through @ref removelastWidget) and
enabling/disabling the control buttons. */ enabling/disabling the control buttons. */
virtual void slotFewer(); virtual void slotFewer();
/** Called whenever the user clicks on the 'clear' button. /** Called whenever the user clicks on the 'clear' button.
Reimplementations should call this method, because this Reimplementations should call this method, because this
implementation does all the dirty work with removing all but implementation does all the dirty work with removing all but
@ref mMinWidets widgets from the tqlayout and enabling/disabling @ref mMinWidets widgets from the layout and enabling/disabling
the control buttons. */ the control buttons. */
virtual void slotClear(); virtual void slotClear();

@ -116,19 +116,19 @@ void NumberFieldWidget::updateFieldHook(Data::FieldPtr, Data::FieldPtr newField_
TQString value = text(); TQString value = text();
if(wasLineEdit && !nowLineEdit) { if(wasLineEdit && !nowLineEdit) {
tqlayout()->remove(m_lineEdit); layout()->remove(m_lineEdit);
delete m_lineEdit; delete m_lineEdit;
m_lineEdit = 0; m_lineEdit = 0;
initSpinBox(); initSpinBox();
} else if(!wasLineEdit && nowLineEdit) { } else if(!wasLineEdit && nowLineEdit) {
tqlayout()->remove(m_spinBox); layout()->remove(m_spinBox);
delete m_spinBox; delete m_spinBox;
m_spinBox = 0; m_spinBox = 0;
initLineEdit(); initLineEdit();
} }
// should really be FIELD_EDIT_WIDGET_INDEX from fieldwidget.cpp // should really be FIELD_EDIT_WIDGET_INDEX from fieldwidget.cpp
static_cast<TQBoxLayout*>(tqlayout())->insertWidget(2, widget(), 1 /*stretch*/); static_cast<TQBoxLayout*>(layout())->insertWidget(2, widget(), 1 /*stretch*/);
widget()->show(); widget()->show();
setText(value); setText(value);
} }

@ -34,7 +34,7 @@ void OverlayWidget::setCorner(Corner corner_) {
} }
void OverlayWidget::addWidget(TQWidget* widget_) { void OverlayWidget::addWidget(TQWidget* widget_) {
tqlayout()->add(widget_); layout()->add(widget_);
adjustSize(); adjustSize();
} }

@ -65,7 +65,7 @@ RatingWidget::RatingWidget(Data::FieldPtr field_, TQWidget* parent_, const char*
} }
init(); init();
TQBoxLayout* l = dynamic_cast<TQBoxLayout*>(tqlayout()); TQBoxLayout* l = dynamic_cast<TQBoxLayout*>(layout());
if(l) { if(l) {
l->addStretch(1); l->addStretch(1);
} }

@ -96,7 +96,7 @@ ImportDialog::ImportDialog(Import::Format format_, const KURL::List& urls_, TQWi
setButtonOK(ok); setButtonOK(ok);
// want to grab default button action, too // want to grab default button action, too
// since the importer might do something with widgets, don't just call it, do it after tqlayout is done // since the importer might do something with widgets, don't just call it, do it after layout is done
TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateAction())); TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateAction()));
} }

@ -53,7 +53,7 @@ public:
inline inline
bool operator==(const TQString& s1, const Tellico::Latin1LiteralInternal& s2) { bool operator==(const TQString& s1, const Tellico::Latin1LiteralInternal& s2) {
const TQChar* uc = s1.tqunicode(); const TQChar* uc = s1.unicode();
const char* c = s2.str; const char* c = s2.str;
if(!c || !uc) { if(!c || !uc) {
return (!c && !uc); return (!c && !uc);
@ -65,7 +65,7 @@ bool operator==(const TQString& s1, const Tellico::Latin1LiteralInternal& s2) {
} }
for(size_t i = 0; i < l; ++i, ++uc, ++c) { for(size_t i = 0; i < l; ++i, ++uc, ++c) {
if(uc->tqunicode() != static_cast<uchar>(*c)) { if(uc->unicode() != static_cast<uchar>(*c)) {
return false; return false;
} }
} }

@ -1703,7 +1703,7 @@ void MainWindow::doPrint(const TQString& html_) {
w.write(html_); w.write(html_);
w.end(); w.end();
// the problem with doing my own tqlayout is that the text gets truncated, both at the // the problem with doing my own layout is that the text gets truncated, both at the
// top and at the bottom. Even adding the overlap parameter, there were problems. // top and at the bottom. Even adding the overlap parameter, there were problems.
// KHTMLView takes care of that with a truncatedAt() parameter, but that's hidden in // KHTMLView takes care of that with a truncatedAt() parameter, but that's hidden in
// the khtml::render_root class. So for now, just use the KHTMLView::print() method. // the khtml::render_root class. So for now, just use the KHTMLView::print() method.

@ -183,7 +183,7 @@ void ReportDialog::slotRefresh() {
#endif #endif
m_HTMLPart->end(); m_HTMLPart->end();
// is this needed? // is this needed?
// view()->tqlayout(); // view()->layout();
} }
// actually the print button // actually the print button

@ -118,7 +118,7 @@ int Tellico::stringHash(const TQString& str) {
uint h = 0; uint h = 0;
uint g = 0; uint g = 0;
for(uint i = 0; i < str.length(); ++i) { for(uint i = 0; i < str.length(); ++i) {
h = (h << 4) + str.tqunicode()[i].cell(); h = (h << 4) + str.unicode()[i].cell();
if((g = h & 0xf0000000)) { if((g = h & 0xf0000000)) {
h ^= g >> 24; h ^= g >> 24;
} }

@ -115,7 +115,7 @@ TQWidget* CSVExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
"field titles.")); "field titles."));
TQButtonGroup* delimiterGroup = new TQButtonGroup(0, Qt::Vertical, i18n("Delimiter"), box); TQButtonGroup* delimiterGroup = new TQButtonGroup(0, Qt::Vertical, i18n("Delimiter"), box);
TQGridLayout* m_delimiterGroupLayout = new TQGridLayout(delimiterGroup->tqlayout()); TQGridLayout* m_delimiterGroupLayout = new TQGridLayout(delimiterGroup->layout());
m_delimiterGroupLayout->setAlignment(TQt::AlignTop); m_delimiterGroupLayout->setAlignment(TQt::AlignTop);
TQWhatsThis::add(delimiterGroup, i18n("In addition to a comma, other characters may be used as " TQWhatsThis::add(delimiterGroup, i18n("In addition to a comma, other characters may be used as "
"a delimiter, separating each value in the file.")); "a delimiter, separating each value in the file."));

@ -238,7 +238,7 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) {
TQHBox* hbox2 = new TQHBox(group); TQHBox* hbox2 = new TQHBox(group);
m_delimiterGroup = new TQButtonGroup(0, Qt::Vertical, i18n("Delimiter"), hbox2); m_delimiterGroup = new TQButtonGroup(0, Qt::Vertical, i18n("Delimiter"), hbox2);
TQGridLayout* m_delimiterGroupLayout = new TQGridLayout(m_delimiterGroup->tqlayout(), 3, 3); TQGridLayout* m_delimiterGroupLayout = new TQGridLayout(m_delimiterGroup->layout(), 3, 3);
m_delimiterGroupLayout->setAlignment(TQt::AlignTop); m_delimiterGroupLayout->setAlignment(TQt::AlignTop);
TQWhatsThis::add(m_delimiterGroup, i18n("In addition to a comma, other characters may be used as " TQWhatsThis::add(m_delimiterGroup, i18n("In addition to a comma, other characters may be used as "
"a delimiter, separating each value in the file.")); "a delimiter, separating each value in the file."));

@ -77,7 +77,7 @@ TQString Tellico::XML::elementName(const TQString& name_) {
} }
// next check first characters IS_DIGIT is defined in libxml/vali.d // next check first characters IS_DIGIT is defined in libxml/vali.d
for(uint i = 0; i < name.length() && (!IS_LETTER(name[i].tqunicode()) || name[i] == '_'); ++i) { for(uint i = 0; i < name.length() && (!IS_LETTER(name[i].unicode()) || name[i] == '_'); ++i) {
name = name.mid(1); name = name.mid(1);
} }
if(name.isEmpty() || XML::validXMLElementName(name)) { if(name.isEmpty() || XML::validXMLElementName(name)) {

Loading…
Cancel
Save