diff options
28 files changed, 89 insertions, 89 deletions
diff --git a/src/cite/clipboard.cpp b/src/cite/clipboard.cpp index 8c91162..14cac58 100644 --- a/src/cite/clipboard.cpp +++ b/src/cite/clipboard.cpp @@ -44,7 +44,7 @@ bool Clipboard::cite(Data::EntryVec entries_) { } s += '}'; - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText(s, TQClipboard::Clipboard); return true; } diff --git a/src/cite/ooo/ooohandler.cpp b/src/cite/ooo/ooohandler.cpp index d36b3e4..6af495c 100644 --- a/src/cite/ooo/ooohandler.cpp +++ b/src/cite/ooo/ooohandler.cpp @@ -50,12 +50,12 @@ rtl::OUString OOOHandler::TQString2OU(const TQString& str) { const uint len = str.length(); sal_Unicode* uni = new sal_Unicode[len + 1]; - const TQChar* qPtr = str.tqunicode(); + const TQChar* qPtr = str.unicode(); const TQChar* qEnd = qPtr + len; sal_Unicode* uPtr = uni; while (qPtr != qEnd) { - *(uPtr++) = (*(qPtr++)).tqunicode(); + *(uPtr++) = (*(qPtr++)).unicode(); } *uPtr = 0; diff --git a/src/collectionfieldsdialog.cpp b/src/collectionfieldsdialog.cpp index 68e958f..d2f8982 100644 --- a/src/collectionfieldsdialog.cpp +++ b/src/collectionfieldsdialog.cpp @@ -96,11 +96,11 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa m_btnUp = new KPushButton(hb2); 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 " - "for the tqlayout of the entry editor.")); + "for the layout of the entry editor.")); m_btnDown = new KPushButton(hb2); 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 " - "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_btnDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); @@ -113,13 +113,13 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa TQWidget* grid = new TQWidget(propGroup); // (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; TQLabel* label = new TQLabel(i18n("&Title:"), grid); - tqlayout->addWidget(label, ++row, 0); + layout->addWidget(label, ++row, 0); m_titleEdit = new KLineEdit(grid); - tqlayout->addWidget(m_titleEdit, row, 1); + layout->addWidget(m_titleEdit, row, 1); label->setBuddy(m_titleEdit); TQString whats = i18n("The title of the field"); 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())); label = new TQLabel(i18n("T&ype:"), grid); - tqlayout->addWidget(label, row, 2); + layout->addWidget(label, row, 2); m_typeCombo = new KComboBox(grid); - tqlayout->addWidget(m_typeCombo, row, 3); + layout->addWidget(m_typeCombo, row, 3); label->setBuddy(m_typeCombo); whats = TQString::fromLatin1("<qt>"); 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&))); label = new TQLabel(i18n("Cate&gory:"), grid); - tqlayout->addWidget(label, ++row, 0); + layout->addWidget(label, ++row, 0); m_catCombo = new KComboBox(true, grid); - tqlayout->addWidget(m_catCombo, row, 1); + layout->addWidget(m_catCombo, row, 1); label->setBuddy(m_catCombo); whats = i18n("The field category determines where the field is placed in the editor."); 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())); label = new TQLabel(i18n("Descr&iption:"), grid); - tqlayout->addWidget(label, ++row, 0); + layout->addWidget(label, ++row, 0); m_descEdit = new KLineEdit(grid); m_descEdit->setMinimumWidth(150); - tqlayout->addMultiCellWidget(m_descEdit, row, row, 1, 3); + layout->addMultiCellWidget(m_descEdit, row, row, 1, 3); label->setBuddy(m_descEdit); /* TRANSLATORS: Do not translate %{year} and %{title}. */ 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())); label = new TQLabel(i18n("&Default value:"), grid); - tqlayout->addWidget(label, ++row, 0); + layout->addWidget(label, ++row, 0); 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); whats = i18n("<qt>A default value can be set for new entries.</qt>"); 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())); label = new TQLabel(i18n("A&llowed values:"), grid); - tqlayout->addWidget(label, ++row, 0); + layout->addWidget(label, ++row, 0); 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); 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, " @@ -213,10 +213,10 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa connect(m_allowEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); 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->setIconSet(BarIcon(TQString::fromLatin1("bookmark"), KIcon::SizeSmall)); - tqlayout->addWidget(m_btnExtended, row, 1); + 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."); TQWhatsThis::add(label, whats); diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 9aee54a..993fd80 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -399,7 +399,7 @@ void ConfigDialog::setupTemplatePage() { l->addWidget(fontGroup); row = -1; - TQGridLayout* fontLayout = new TQGridLayout(fontGroup->tqlayout()); + TQGridLayout* fontLayout = new TQGridLayout(fontGroup->layout()); fontLayout->setSpacing(KDialogBase::spacingHint()); lab = new TQLabel(i18n("Font:"), fontGroup); @@ -426,7 +426,7 @@ void ConfigDialog::setupTemplatePage() { l->addWidget(colGroup); row = -1; - TQGridLayout* colLayout = new TQGridLayout(colGroup->tqlayout()); + TQGridLayout* colLayout = new TQGridLayout(colGroup->layout()); colLayout->setSpacing(KDialogBase::spacingHint()); lab = new TQLabel(i18n("Background color:"), colGroup); @@ -633,7 +633,7 @@ void ConfigDialog::readFetchConfig() { Fetch::ConfigWidget* cw = it->configWidget(this); if(cw) { // might return 0 when no widget available for fetcher type 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(); } kapp->processEvents(); diff --git a/src/detailedlistview.cpp b/src/detailedlistview.cpp index 6182d94..716f5df 100644 --- a/src/detailedlistview.cpp +++ b/src/detailedlistview.cpp @@ -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 - // 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); if(colWidths.empty()) { colWidths.insert(colWidths.begin(), colNames.count(), -1); // automatic width diff --git a/src/entryeditdialog.cpp b/src/entryeditdialog.cpp index 91096d9..a6d5dd5 100644 --- a/src/entryeditdialog.cpp +++ b/src/entryeditdialog.cpp @@ -153,7 +153,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) { 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); // (parent, margin, spacing) TQVBoxLayout* boxLayout = new TQVBoxLayout(page, 0, 0); @@ -163,10 +163,10 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) { // (parent, nrows, ncols, margin, spacing) // spacing gets a bit weird, if there are absolutely no Choice fields, // 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 - if(TQCString(tqstyle().name()).lower().find("keramik", 0, false) > -1) { - tqlayout->setSpacing(0); + if(TQCString(style().name()).lower().find("keramik", 0, false) > -1) { + layout->setSpacing(0); } boxLayout->addWidget(grid, 0); @@ -202,8 +202,8 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) { int r = count/NCOLS; int c = count%NCOLS; - tqlayout->addWidget(widget, r, c); - tqlayout->setRowStretch(r, 1); + layout->addWidget(widget, r, c); + layout->setRowStretch(r, 1); 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 for(int col = 0; col < NCOLS; ++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 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) { 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 it.current()->setMinimumHeight(it.current()->sizeHint().height()); // 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()); } @@ -258,7 +258,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) { // this doesn't seem to work // setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); // 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->setMinimumWidth(m_tabs->sizeHint().width()); @@ -566,8 +566,8 @@ void EntryEditDialog::removeField(Data::CollPtr, Data::FieldPtr field_) { delete w; // automatically deletes child widget } else { // much of this replicates code in setLayout() - TQGridLayout* tqlayout = static_cast<TQGridLayout*>(widget->parentWidget()->tqlayout()); - delete widget; // automatically removes from tqlayout + TQGridLayout* layout = static_cast<TQGridLayout*>(widget->parentWidget()->layout()); + delete widget; // automatically removes from layout TQValueVector<bool> expands(NCOLS, false); 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) { GUI::FieldWidget* widget = m_widgetDict.find(TQString::number(m_currColl->id()) + it->name()); if(widget) { - tqlayout->remove(widget); - tqlayout->addWidget(widget, count/NCOLS, count%NCOLS); + layout->remove(widget); + layout->addWidget(widget, count/NCOLS, count%NCOLS); maxWidth[count%NCOLS] = TQMAX(maxWidth[count%NCOLS], widget->labelWidth()); if(widget->expands()) { @@ -602,7 +602,7 @@ void EntryEditDialog::removeField(Data::CollPtr, Data::FieldPtr field_) { // update stretch factors for columns with a line edit for(int col = 0; col < NCOLS; ++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_; } - // 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 if(oldField_->type() != newField_->type() || (oldField_->category() != newField_->category() && !newField_->isSingleCategory())) { diff --git a/src/entryeditdialog.h b/src/entryeditdialog.h index e645b81..20731f6 100644 --- a/src/entryeditdialog.h +++ b/src/entryeditdialog.h @@ -49,9 +49,9 @@ public: */ 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); /** diff --git a/src/entryview.cpp b/src/entryview.cpp index 2965405..3499adc 100644 --- a/src/entryview.cpp +++ b/src/entryview.cpp @@ -46,7 +46,7 @@ EntryView::EntryView(TQWidget* parent_, const char* name_) : KHTMLPart(parent_, setJavaEnabled(false); setMetaRefreshEnabled(false); setPluginsEnabled(false); - clear(); // needed for initial tqlayout + clear(); // needed for initial layout view()->setAcceptDrops(true); DropHandler* drophandler = new DropHandler(this); @@ -76,7 +76,7 @@ void EntryView::clear() { write(m_textToShow); } 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_) { @@ -158,7 +158,7 @@ void EntryView::showEntry(Data::EntryPtr entry_) { write(html); end(); // 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_) { diff --git a/src/fetch/configwidget.cpp b/src/fetch/configwidget.cpp index 58a079a..e268bb3 100644 --- a/src/fetch/configwidget.cpp +++ b/src/fetch/configwidget.cpp @@ -38,7 +38,7 @@ void ConfigWidget::addFieldsWidget(const StringMap& customFields_, const TQStrin } 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) { TQCheckBox* cb = new TQCheckBox(it.data(), box); m_fields.insert(it.key(), cb); diff --git a/src/fetch/scripts/dark_horse_comics.py b/src/fetch/scripts/dark_horse_comics.py index 513127c..4f3b651 100644 --- a/src/fetch/scripts/dark_horse_comics.py +++ b/src/fetch/scripts/dark_horse_comics.py @@ -86,7 +86,7 @@ class BasicTellicoDOM: entryNode.setAttribute('id', str(self.__currentId)) 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.appendChild(self.__doc.createTextNode(d['pub_year'])) @@ -101,25 +101,25 @@ class BasicTellicoDOM: writersNode = self.__doc.createElement('writers') for g in d['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) genresNode = self.__doc.createElement('genres') for g in d['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) commentsNode = self.__doc.createElement('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') - 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') for k, v in d['artist'].iteritems(): 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) pagesNode = self.__doc.createElement('pages') @@ -132,7 +132,7 @@ class BasicTellicoDOM: imageNode = self.__doc.createElement('image') imageNode.setAttribute('format', 'JPEG') 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.appendChild(self.__doc.createTextNode(d['image'][0])) diff --git a/src/fetch/scripts/fr.allocine.py b/src/fetch/scripts/fr.allocine.py index 6412ecf..97a2247 100755 --- a/src/fetch/scripts/fr.allocine.py +++ b/src/fetch/scripts/fr.allocine.py @@ -90,23 +90,23 @@ class BasicTellicoDOM: entryNode.setAttribute('id', str(self.__currentId)) 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.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.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') for g in d['genres']: 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) natsNode = self.__doc.createElement('nationalitys') 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) castsNode = self.__doc.createElement('casts') @@ -114,7 +114,7 @@ class BasicTellicoDOM: castNode = self.__doc.createElement('cast') col1Node = 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(col2Node) castsNode.appendChild(castNode) @@ -122,17 +122,17 @@ class BasicTellicoDOM: dirsNode = self.__doc.createElement('directors') for g in d['dirs']: 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) 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.appendChild(self.__doc.createTextNode(tqunicode(d['allocine'], 'latin-1').encode('utf-8'))) + allocineNode = self.__doc.createElement(unicode('allocin�-link', 'latin-1').encode('utf-8')) + allocineNode.appendChild(self.__doc.createTextNode(unicode(d['allocine'], 'latin-1').encode('utf-8'))) 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']: imageNode = self.__doc.createElement('image') @@ -140,7 +140,7 @@ class BasicTellicoDOM: imageNode.setAttribute('id', d['image'][0]) imageNode.setAttribute('width', '120') 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.appendChild(self.__doc.createTextNode(d['image'][0])) diff --git a/src/fetch/scripts/ministerio_de_cultura.py b/src/fetch/scripts/ministerio_de_cultura.py index 7f949ba..8a768f9 100644 --- a/src/fetch/scripts/ministerio_de_cultura.py +++ b/src/fetch/scripts/ministerio_de_cultura.py @@ -155,9 +155,9 @@ class BasicTellicoDOM: # Convert all strings to UTF-8 for i in d.keys(): 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: - 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.setAttribute('id', str(self.__currentId)) diff --git a/src/fetch/yahoofetcher.cpp b/src/fetch/yahoofetcher.cpp index 4637b26..2746f90 100644 --- a/src/fetch/yahoofetcher.cpp +++ b/src/fetch/yahoofetcher.cpp @@ -236,7 +236,7 @@ Tellico::Data::EntryPtr YahooFetcher::fetchEntry(uint uid_) { if(!imageURL.isEmpty()) { TQString id = ImageFactory::addImage(imageURL, true); 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( // entry->field(TQString::fromLatin1("title")))); message(i18n("The cover image could not be loaded."), MessageHandler::Warning); diff --git a/src/gui/fieldwidget.cpp b/src/gui/fieldwidget.cpp index 82ad186..4ac43df 100644 --- a/src/gui/fieldwidget.cpp +++ b/src/gui/fieldwidget.cpp @@ -93,7 +93,7 @@ FieldWidget::FieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* n : TQWidget(parent_, name_), m_field(field_) { TQHBoxLayout* l = new TQHBoxLayout(this, 2, 2); // parent, margin, spacing 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); } @@ -182,7 +182,7 @@ void FieldWidget::registerWidget() { 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*/); if(!m_expands) { l->insertStretch(FIELD_EDIT_WIDGET_INDEX+1, 1 /*stretch*/); diff --git a/src/gui/imagewidget.cpp b/src/gui/imagewidget.cpp index 06e5fbf..ada1ad2 100644 --- a/src/gui/imagewidget.cpp +++ b/src/gui/imagewidget.cpp @@ -56,7 +56,7 @@ ImageWidget::ImageWidget(TQWidget* parent_, const char* name_) : TQWidget(parent KButtonBox* box = new KButtonBox(this,Qt::Vertical); box->addButton(i18n("Select Image..."), TQT_TQOBJECT(this), TQT_SLOT(slotGetImage())); box->addButton(i18n("Clear"), TQT_TQOBJECT(this), TQT_SLOT(slotClear())); - box->tqlayout(); + box->layout(); boxLayout->addWidget(box); boxLayout->addSpacing(8); diff --git a/src/gui/kwidgetlister.cpp b/src/gui/kwidgetlister.cpp index 0d0d47d..9611152 100644 --- a/src/gui/kwidgetlister.cpp +++ b/src/gui/kwidgetlister.cpp @@ -135,7 +135,7 @@ void KWidgetLister::addWidgetAtEnd(TQWidget *w) void KWidgetLister::removeLastWidget() { - // The tqlayout will take care that the + // The layout will take care that the // widget is removed from screen, too. mWidgetList.removeLast(); enableControls(); diff --git a/src/gui/kwidgetlister.h b/src/gui/kwidgetlister.h index 0124b65..262500c 100644 --- a/src/gui/kwidgetlister.h +++ b/src/gui/kwidgetlister.h @@ -71,19 +71,19 @@ protected slots: /** Called whenever the user clicks on the 'more' button. Reimplementations should call this method, because this 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. */ virtual void slotMore(); /** Called whenever the user clicks on the 'fewer' button. Reimplementations should call this method, because this 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. */ virtual void slotFewer(); /** Called whenever the user clicks on the 'clear' button. Reimplementations should call this method, because this 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. */ virtual void slotClear(); diff --git a/src/gui/numberfieldwidget.cpp b/src/gui/numberfieldwidget.cpp index 19147b4..0284e84 100644 --- a/src/gui/numberfieldwidget.cpp +++ b/src/gui/numberfieldwidget.cpp @@ -116,19 +116,19 @@ void NumberFieldWidget::updateFieldHook(Data::FieldPtr, Data::FieldPtr newField_ TQString value = text(); if(wasLineEdit && !nowLineEdit) { - tqlayout()->remove(m_lineEdit); + layout()->remove(m_lineEdit); delete m_lineEdit; m_lineEdit = 0; initSpinBox(); } else if(!wasLineEdit && nowLineEdit) { - tqlayout()->remove(m_spinBox); + layout()->remove(m_spinBox); delete m_spinBox; m_spinBox = 0; initLineEdit(); } // 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(); setText(value); } diff --git a/src/gui/overlaywidget.cpp b/src/gui/overlaywidget.cpp index 3bea8db..3977ce1 100644 --- a/src/gui/overlaywidget.cpp +++ b/src/gui/overlaywidget.cpp @@ -34,7 +34,7 @@ void OverlayWidget::setCorner(Corner corner_) { } void OverlayWidget::addWidget(TQWidget* widget_) { - tqlayout()->add(widget_); + layout()->add(widget_); adjustSize(); } diff --git a/src/gui/ratingwidget.cpp b/src/gui/ratingwidget.cpp index ae30dcd..eda5cf7 100644 --- a/src/gui/ratingwidget.cpp +++ b/src/gui/ratingwidget.cpp @@ -65,7 +65,7 @@ RatingWidget::RatingWidget(Data::FieldPtr field_, TQWidget* parent_, const char* } init(); - TQBoxLayout* l = dynamic_cast<TQBoxLayout*>(tqlayout()); + TQBoxLayout* l = dynamic_cast<TQBoxLayout*>(layout()); if(l) { l->addStretch(1); } diff --git a/src/importdialog.cpp b/src/importdialog.cpp index 5aff382..09e3a58 100644 --- a/src/importdialog.cpp +++ b/src/importdialog.cpp @@ -96,7 +96,7 @@ ImportDialog::ImportDialog(Import::Format format_, const KURL::List& urls_, TQWi setButtonOK(ok); // 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())); } diff --git a/src/latin1literal.h b/src/latin1literal.h index 72bc880..1cebfe7 100644 --- a/src/latin1literal.h +++ b/src/latin1literal.h @@ -53,7 +53,7 @@ public: inline bool operator==(const TQString& s1, const Tellico::Latin1LiteralInternal& s2) { - const TQChar* uc = s1.tqunicode(); + const TQChar* uc = s1.unicode(); const char* c = s2.str; if(!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) { - if(uc->tqunicode() != static_cast<uchar>(*c)) { + if(uc->unicode() != static_cast<uchar>(*c)) { return false; } } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index fde1f60..6cd1df5 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1703,7 +1703,7 @@ void MainWindow::doPrint(const TQString& html_) { w.write(html_); 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. // 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. diff --git a/src/reportdialog.cpp b/src/reportdialog.cpp index 088a16d..3267a39 100644 --- a/src/reportdialog.cpp +++ b/src/reportdialog.cpp @@ -183,7 +183,7 @@ void ReportDialog::slotRefresh() { #endif m_HTMLPart->end(); // is this needed? -// view()->tqlayout(); +// view()->layout(); } // actually the print button diff --git a/src/tellico_utils.cpp b/src/tellico_utils.cpp index 36986a3..275c096 100644 --- a/src/tellico_utils.cpp +++ b/src/tellico_utils.cpp @@ -118,7 +118,7 @@ int Tellico::stringHash(const TQString& str) { uint h = 0; uint g = 0; 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)) { h ^= g >> 24; } diff --git a/src/translators/csvexporter.cpp b/src/translators/csvexporter.cpp index 64c0c1f..7d94271 100644 --- a/src/translators/csvexporter.cpp +++ b/src/translators/csvexporter.cpp @@ -115,7 +115,7 @@ TQWidget* CSVExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { "field titles.")); 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); TQWhatsThis::add(delimiterGroup, i18n("In addition to a comma, other characters may be used as " "a delimiter, separating each value in the file.")); diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp index 234d76b..68e4789 100644 --- a/src/translators/csvimporter.cpp +++ b/src/translators/csvimporter.cpp @@ -238,7 +238,7 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) { TQHBox* hbox2 = new TQHBox(group); 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); TQWhatsThis::add(m_delimiterGroup, i18n("In addition to a comma, other characters may be used as " "a delimiter, separating each value in the file.")); diff --git a/src/translators/tellico_xml.cpp b/src/translators/tellico_xml.cpp index e82f134..bcfb412 100644 --- a/src/translators/tellico_xml.cpp +++ b/src/translators/tellico_xml.cpp @@ -77,7 +77,7 @@ TQString Tellico::XML::elementName(const TQString& name_) { } // 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); } if(name.isEmpty() || XML::validXMLElementName(name)) { |