diff options
Diffstat (limited to 'juk')
48 files changed, 227 insertions, 227 deletions
diff --git a/juk/advancedsearchdialog.cpp b/juk/advancedsearchdialog.cpp index 5b9f3b86..711c1275 100644 --- a/juk/advancedsearchdialog.cpp +++ b/juk/advancedsearchdialog.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqhbox.h> #include <tqvbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqhbuttongroup.h> #include "collectionlist.h" diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp index eb1b5d42..2816f85e 100644 --- a/juk/collectionlist.cpp +++ b/juk/collectionlist.cpp @@ -162,7 +162,7 @@ void CollectionList::slotRefreshItems(const KFileItemList &items) // If the item is no longer on disk, remove it from the collection. if(item->file().fileInfo().exists()) - item->repaint(); + item->tqrepaint(); else clearItem(item); } @@ -392,13 +392,13 @@ void CollectionListItem::refresh() file().coverInfo()->setCover(); if(listView()->isVisible()) - repaint(); + tqrepaint(); - for(PlaylistItemList::Iterator it = m_children.begin(); it != m_children.end(); ++it) { + for(PlaylistItemList::Iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { (*it)->playlist()->update(); (*it)->playlist()->dataChanged(); if((*it)->listView()->isVisible()) - (*it)->repaint(); + (*it)->tqrepaint(); } CollectionList::instance()->dataChanged(); @@ -411,7 +411,7 @@ PlaylistItem *CollectionListItem::itemForPlaylist(const Playlist *playlist) return this; PlaylistItemList::ConstIterator it; - for(it = m_children.begin(); it != m_children.end(); ++it) + for(it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) if((*it)->playlist() == playlist) return *it; return 0; @@ -428,11 +428,11 @@ void CollectionListItem::updateCollectionDict(const TQString &oldPath, const TQS collection->addToDict(newPath, this); } -void CollectionListItem::repaint() const +void CollectionListItem::tqrepaint() const { - TQListViewItem::repaint(); - for(PlaylistItemList::ConstIterator it = m_children.begin(); it != m_children.end(); ++it) - (*it)->repaint(); + TQListViewItem::tqrepaint(); + for(PlaylistItemList::ConstIterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) + (*it)->tqrepaint(); } //////////////////////////////////////////////////////////////////////////////// @@ -468,8 +468,8 @@ CollectionListItem::~CollectionListItem() { m_shuttingDown = true; - for(PlaylistItemList::ConstIterator it = m_children.begin(); - it != m_children.end(); + for(PlaylistItemList::ConstIterator it = m_tqchildren.begin(); + it != m_tqchildren.end(); ++it) { (*it)->playlist()->clearItem(*it); @@ -486,13 +486,13 @@ CollectionListItem::~CollectionListItem() void CollectionListItem::addChildItem(PlaylistItem *child) { - m_children.append(child); + m_tqchildren.append(child); } void CollectionListItem::removeChildItem(PlaylistItem *child) { if(!m_shuttingDown) - m_children.remove(child); + m_tqchildren.remove(child); } bool CollectionListItem::checkCurrent() diff --git a/juk/collectionlist.h b/juk/collectionlist.h index 8ddab9a6..e26a8c3a 100644 --- a/juk/collectionlist.h +++ b/juk/collectionlist.h @@ -21,7 +21,7 @@ #include <kfileitem.h> #include <tqdict.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqvaluevector.h> #include "playlist.h" @@ -96,7 +96,7 @@ public: virtual bool canReload() const { return true; } public slots: - virtual void paste() { decode(kapp->clipboard()->data()); } + virtual void paste() { decode(kapp->tqclipboard()->data()); } virtual void clear(); void slotCheckCache(); @@ -172,8 +172,8 @@ public: virtual void refresh(); PlaylistItem *itemForPlaylist(const Playlist *playlist); void updateCollectionDict(const TQString &oldPath, const TQString &newPath); - void repaint() const; - PlaylistItemList children() const { return m_children; } + void tqrepaint() const; + PlaylistItemList tqchildren() const { return m_tqchildren; } protected: CollectionListItem(const FileHandle &file); @@ -192,7 +192,7 @@ protected: private: bool m_shuttingDown; - PlaylistItemList m_children; + PlaylistItemList m_tqchildren; }; #endif diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui index dbdcda9c..a94fac63 100644 --- a/juk/coverdialogbase.ui +++ b/juk/coverdialogbase.ui @@ -50,7 +50,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>164</width> <height>0</height> @@ -65,7 +65,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> @@ -73,7 +73,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> diff --git a/juk/covericonview.cpp b/juk/covericonview.cpp index fc400e78..58b5a2b9 100644 --- a/juk/covericonview.cpp +++ b/juk/covericonview.cpp @@ -22,7 +22,7 @@ CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *parent) : KIconViewItem(parent), m_id(id) { CoverDataPtr data = CoverManager::coverInfo(id); - setText(TQString("%1 - %2").arg(data->artist, data->album)); + setText(TQString("%1 - %2").tqarg(data->artist, data->album)); setPixmap(data->thumbnail()); } diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp index 52e0d4ae..2ae531bc 100644 --- a/juk/coverinfo.cpp +++ b/juk/coverinfo.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <tqregexp.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcursor.h> @@ -34,10 +34,10 @@ struct CoverPopup : public TQWidget CoverPopup(const TQPixmap &image, const TQPoint &p) : TQWidget(0, 0, WDestructiveClose | WX11BypassWM) { - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQLabel *label = new TQLabel(this); - layout->addWidget(label); + tqlayout->addWidget(label); label->setFrameStyle(TQFrame::Box | TQFrame::Raised); label->setLineWidth(1); label->setPixmap(image); diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp index 59c488d2..7cd3d014 100644 --- a/juk/covermanager.cpp +++ b/juk/covermanager.cpp @@ -269,7 +269,7 @@ const char *CoverDrag::format(int i) const return 0; } -TQByteArray CoverDrag::encodedData(const char *mimetype) const +TQByteArray CoverDrag::tqencodedData(const char *mimetype) const { if(qstrcmp(CoverDrag::mimetype, mimetype) == 0) { TQByteArray data; @@ -303,7 +303,7 @@ bool CoverDrag::decode(const TQMimeSource *e, coverKey &id) if(!canDecode(e)) return false; - TQByteArray data = e->encodedData(mimetype); + TQByteArray data = e->tqencodedData(mimetype); TQDataStream ds(data, IO_ReadOnly); TQ_UINT32 i; @@ -395,7 +395,7 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c // Save it to file first! - TQString ext = TQString("/coverdb/coverID-%1.png").arg(id); + TQString ext = TQString("/coverdb/coverID-%1.png").tqarg(id); coverData->path = KGlobal::dirs()->saveLocation("appdata") + ext; kdDebug() << "Saving pixmap to " << coverData->path << endl; @@ -413,8 +413,8 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c data()->covers[id] = coverData; // Make sure the new cover isn't inadvertently cached. - data()->pixmapCache.remove(TQString("f%1").arg(coverData->path)); - data()->pixmapCache.remove(TQString("t%1").arg(coverData->path)); + data()->pixmapCache.remove(TQString("f%1").tqarg(coverData->path)); + data()->pixmapCache.remove(TQString("t%1").tqarg(coverData->path)); return id; } @@ -436,8 +436,8 @@ bool CoverManager::removeCover(coverKey id) // Remove cover from cache. CoverDataPtr coverData = coverInfo(id); - data()->pixmapCache.remove(TQString("f%1").arg(coverData->path)); - data()->pixmapCache.remove(TQString("t%1").arg(coverData->path)); + data()->pixmapCache.remove(TQString("f%1").tqarg(coverData->path)); + data()->pixmapCache.remove(TQString("t%1").tqarg(coverData->path)); // Remove references to files that had that track ID. TQDictIterator<coverKey> it(data()->tracks); @@ -462,8 +462,8 @@ bool CoverManager::replaceCover(coverKey id, const TQPixmap &large) CoverDataPtr coverData = coverInfo(id); // Empty old pixmaps from cache. - data()->pixmapCache.remove(TQString("%1%2").arg("t", coverData->path)); - data()->pixmapCache.remove(TQString("%1%2").arg("f", coverData->path)); + data()->pixmapCache.remove(TQString("%1%2").tqarg("t", coverData->path)); + data()->pixmapCache.remove(TQString("%1%2").tqarg("f", coverData->path)); large.save(coverData->path, "PNG"); return true; diff --git a/juk/covermanager.h b/juk/covermanager.h index 61ecc567..b5c5d6e7 100644 --- a/juk/covermanager.h +++ b/juk/covermanager.h @@ -68,7 +68,7 @@ public: CoverDrag(coverKey id, TQWidget *src); virtual const char *format(int i) const; - virtual TQByteArray encodedData(const char *mimetype) const; + virtual TQByteArray tqencodedData(const char *mimetype) const; void setId(coverKey id) { m_id = id; } diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp index 61f21a80..e780eec0 100644 --- a/juk/deletedialog.cpp +++ b/juk/deletedialog.cpp @@ -22,7 +22,7 @@ #include <tqstringlist.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqvbox.h> #include <tqhbox.h> diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui index 2a7837af..50e13fe7 100644 --- a/juk/deletedialogbase.ui +++ b/juk/deletedialogbase.ui @@ -12,7 +12,7 @@ <height>374</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>420</width> <height>320</height> @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -48,7 +48,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> @@ -61,7 +61,7 @@ <property name="text"> <string>Are you sure that you want to remove these items?</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -72,7 +72,7 @@ <property name="text"> <string>Deletion method placeholder, never shown to user.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -101,7 +101,7 @@ <property name="text"> <string>Placeholder for number of files, not in GUI</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp index 43df3dda..ceb0d71d 100644 --- a/juk/directorylist.cpp +++ b/juk/directorylist.cpp @@ -50,9 +50,9 @@ DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylis m_base->importPlaylistsCheckBox->setChecked(importPlaylists); - TQSize sz = sizeHint(); + TQSize sz = tqsizeHint(); setMinimumSize(kMax(350, sz.width()), kMax(250, sz.height())); - resize(sizeHint()); + resize(tqsizeHint()); } DirectoryList::~DirectoryList() diff --git a/juk/directorylistbase.ui b/juk/directorylistbase.ui index 02aae023..64a23800 100644 --- a/juk/directorylistbase.ui +++ b/juk/directorylistbase.ui @@ -63,7 +63,7 @@ <property name="text"> <string>These folders will be scanned on startup for new files.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> diff --git a/juk/exampleoptions.cpp b/juk/exampleoptions.cpp index ab688793..e365546a 100644 --- a/juk/exampleoptions.cpp +++ b/juk/exampleoptions.cpp @@ -17,7 +17,7 @@ #include <klocale.h> #include <tqradiobutton.h> -#include <layout.h> +#include <tqlayout.h> #include "exampleoptions.h" diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp index e4ddee28..6f479313 100644 --- a/juk/filerenamer.cpp +++ b/juk/filerenamer.cpp @@ -44,7 +44,7 @@ #include <tqcheckbox.h> #include <tqdir.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqsignalmapper.h> #include <tqheader.h> @@ -232,7 +232,7 @@ FileRenamerWidget::FileRenamerWidget(TQWidget *parent) : m_exampleText->setPaletteBackgroundColor(temp->paletteBackgroundColor()); delete temp; - layout()->setMargin(0); // We'll be wrapped by KDialogBase + tqlayout()->setMargin(0); // We'll be wrapped by KDialogBase // This must be created before createTagRows() is called. @@ -352,10 +352,10 @@ unsigned FileRenamerWidget::addRowCategory(TagType category) downMapper->connect(row.downButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); downMapper->setMapping(TQT_TQOBJECT(row.downButton), id); - TQString labelText = TQString("<b>%1</b>").arg(TagRenamerOptions::tagTypeText(category)); + TQString labelText = TQString("<b>%1</b>").tqarg(TagRenamerOptions::tagTypeText(category)); TQLabel *label = new TQLabel(labelText, frame); frame->setStretchFactor(label, 1); - label->setAlignment(AlignCenter); + label->tqsetAlignment(AlignCenter); TQVBox *options = new TQVBox(frame); row.enableButton = new KPushButton(i18n("Remove"), options); @@ -410,7 +410,7 @@ bool FileRenamerWidget::removeRow(unsigned id) if(m_rows[id].position > 0) checkboxPosition = m_rows[id].position - 1; - // The checkbox is contained within a layout widget, so the layout + // The checkbox is contained within a tqlayout widget, so the tqlayout // widget is the one the needs to die. delete m_folderSwitches[checkboxPosition]->parent(); m_folderSwitches.erase(&m_folderSwitches[checkboxPosition]); @@ -675,17 +675,17 @@ void FileRenamerWidget::moveItem(unsigned id, MovementDirection direction) // Move the item two spaces above/below its previous position. It has to // be 2 spaces because of the checkbox. - TQBoxLayout *layout = dynamic_cast<TQBoxLayout *>(m_mainFrame->layout()); + TQBoxLayout *tqlayout = dynamic_cast<TQBoxLayout *>(m_mainFrame->tqlayout()); - layout->remove(l); - layout->insertWidget(2 * newPos, l); + tqlayout->remove(l); + tqlayout->insertWidget(2 * newPos, l); // Move the top item two spaces in the opposite direction, for a similar // reason. - layout->remove(w); - layout->insertWidget(2 * pos, w); - layout->invalidate(); + tqlayout->remove(w); + tqlayout->insertWidget(2 * pos, w); + tqlayout->tqinvalidate(); TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged())); } @@ -778,7 +778,7 @@ void FileRenamerWidget::insertCategory() // Set its down button to be disabled. m_rows[id].downButton->setEnabled(false); - m_mainFrame->layout()->invalidate(); + m_mainFrame->tqlayout()->tqinvalidate(); m_mainView->update(); // Now update according to the code in loadConfig(). @@ -875,7 +875,7 @@ void FileRenamer::rename(const PlaylistItemList &items) setFolderIcon(it.data(), itemMap[it.key()]); } else - errorFiles << i18n("%1 to %2").arg(it.key()).arg(it.data()); + errorFiles << i18n("%1 to %2").tqarg(it.key()).tqarg(it.data()); processEvents(); } @@ -952,7 +952,7 @@ void FileRenamer::setFolderIcon(const KURL &dst, const PlaylistItem *item) config.setGroup("Desktop Entry"); if(!config.hasKey("Icon")) { - config.writeEntry("Icon", TQString("%1/.juk-thumbnail.png").arg(path)); + config.writeEntry("Icon", TQString("%1/.juk-thumbnail.png").tqarg(path)); config.sync(); } diff --git a/juk/filerenamer.h b/juk/filerenamer.h index 46f17bf0..93f4e4cb 100644 --- a/juk/filerenamer.h +++ b/juk/filerenamer.h @@ -61,7 +61,7 @@ struct Row /** * A list of rows, each of which may have its own category options and other * associated data. There is no relation between the order of rows in the vector and their - * GUI layout. Instead, each Row has a position member which indicates what GUI position it + * GUI tqlayout. Instead, each Row has a position member which indicates what GUI position it * takes up. The index into the vector is known as the row identifier (which is unique but * not necessarily constant). */ @@ -186,7 +186,7 @@ private: /** * This function adds a "Insert Folder separator" checkbox to the end of - * the current layout. The setting defaults to being unchecked. + * the current tqlayout. The setting defaults to being unchecked. */ void addFolderSeparatorCheckbox(); @@ -336,7 +336,7 @@ private: /** * This moves the widget \p l in the direction given by \p direction, taking * care to make sure that the checkboxes are not moved, and that they are - * enabled or disabled as appropriate for the new layout, and that the up and + * enabled or disabled as appropriate for the new tqlayout, and that the up and * down buttons are also adjusted as necessary. * * @param id the identifier of the row to move @@ -427,14 +427,14 @@ private slots: virtual void slotRemoveRow(int id); /** - * This function moves \p category up in the layout. + * This function moves \p category up in the tqlayout. * * @param id the unique id of the widget to move up. */ virtual void moveItemUp(int id); /** - * This function moves \p category down in the layout. + * This function moves \p category down in the tqlayout. * * @param id the unique id of the widget to move down. */ diff --git a/juk/filerenamerbase.ui b/juk/filerenamerbase.ui index d7abb413..dfd5d0fd 100644 --- a/juk/filerenamerbase.ui +++ b/juk/filerenamerbase.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -68,7 +68,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -216,7 +216,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -232,7 +232,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -257,7 +257,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -295,7 +295,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> diff --git a/juk/filerenameroptions.cpp b/juk/filerenameroptions.cpp index 2db9e26d..d800d2e2 100644 --- a/juk/filerenameroptions.cpp +++ b/juk/filerenameroptions.cpp @@ -17,7 +17,7 @@ #include <kdebug.h> #include <knuminput.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqradiobutton.h> #include <tqlineedit.h> @@ -29,28 +29,28 @@ FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *parent, const TagRenamerOptions &options) : FileRenamerTagOptionsBase(parent), m_options(options) { - layout()->setSpacing(KDialog::spacingHint()); - layout()->setMargin(0); + tqlayout()->setSpacing(KDialog::spacingHint()); + tqlayout()->setMargin(0); - m_emptyTagGroup->layout()->setSpacing(KDialog::spacingHint()); - m_trackGroup->layout()->setSpacing(KDialog::spacingHint()); + m_emptyTagGroup->tqlayout()->setSpacing(KDialog::spacingHint()); + m_trackGroup->tqlayout()->setSpacing(KDialog::spacingHint()); m_emptyValueLayout->setSpacing(KDialog::spacingHint()); m_exampleLayout->setSpacing(KDialog::spacingHint()); m_spinLayout->setSpacing(KDialog::spacingHint()); m_widthLayout->setSpacing(KDialog::spacingHint()); m_tagLayout->setSpacing(KDialog::spacingHint()); - m_tagFormatGroup->layout()->setSpacing(KDialog::spacingHint()); + m_tagFormatGroup->tqlayout()->setSpacing(KDialog::spacingHint()); if(m_options.category() != Track) m_trackGroup->hide(); TQString tagText = m_options.tagTypeText(); - setCaption(caption().arg(tagText)); - m_tagFormatGroup->setTitle(m_tagFormatGroup->title().arg(tagText)); - m_emptyTagGroup->setTitle(m_emptyTagGroup->title().arg(tagText)); - m_description->setText(m_description->text().arg(tagText)); - m_tagLabel->setText(m_tagLabel->text().arg(tagText)); + setCaption(caption().tqarg(tagText)); + m_tagFormatGroup->setTitle(m_tagFormatGroup->title().tqarg(tagText)); + m_emptyTagGroup->setTitle(m_emptyTagGroup->title().tqarg(tagText)); + m_description->setText(m_description->text().tqarg(tagText)); + m_tagLabel->setText(m_tagLabel->text().tqarg(tagText)); m_prefixText->setText(options.prefix()); m_suffixText->setText(options.suffix()); diff --git a/juk/filerenameroptionsbase.ui b/juk/filerenameroptionsbase.ui index d90953c0..265685dc 100644 --- a/juk/filerenameroptionsbase.ui +++ b/juk/filerenameroptionsbase.ui @@ -40,7 +40,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -65,7 +65,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -76,7 +76,7 @@ <property name="name"> <cstring>m_prefixText</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignRight</set> </property> </widget> @@ -92,7 +92,7 @@ <property name="name"> <cstring>m_suffixText</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignLeft</set> </property> </widget> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -127,7 +127,7 @@ <property name="text"> <string>Substitution Example</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -218,7 +218,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -315,7 +315,7 @@ <property name="text"> <string>3 -></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -326,7 +326,7 @@ <property name="text"> <string>14 -></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -346,7 +346,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp index 204197c0..a9bded13 100644 --- a/juk/historyplaylist.cpp +++ b/juk/historyplaylist.cpp @@ -92,14 +92,14 @@ void HistoryPlaylist::slotCreateNewItem() HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) : PlaylistItem(item, parent, after), - m_dateTime(TQDateTime::currentDateTime()) + m_dateTime(TQDateTime::tqcurrentDateTime()) { setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); } HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent) : PlaylistItem(item, parent), - m_dateTime(TQDateTime::currentDateTime()) + m_dateTime(TQDateTime::tqcurrentDateTime()) { setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); } diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp index 09a77546..3838d8bc 100644 --- a/juk/ktrm.cpp +++ b/juk/ktrm.cpp @@ -43,7 +43,7 @@ class KTRMLookup; extern "C" { #if HAVE_MUSICBRAINZ >= 4 - static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status); + static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFiletqStatus status); #else static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId); #endif @@ -205,14 +205,14 @@ private: class KTRMEvent : public TQCustomEvent { public: - enum Status { + enum tqStatus { Recognized, Unrecognized, Collision, Error }; - KTRMEvent(int fileId, Status status) : + KTRMEvent(int fileId, tqStatus status) : TQCustomEvent(id), m_fileId(fileId), m_status(status) {} @@ -222,7 +222,7 @@ public: return m_fileId; } - Status status() const + tqStatus status() const { return m_status; } @@ -231,7 +231,7 @@ public: private: int m_fileId; - Status m_status; + tqStatus m_status; }; /** @@ -242,7 +242,7 @@ private: class KTRMEventHandler : public TQObject { public: - static void send(int fileId, KTRMEvent::Status status) + static void send(int fileId, KTRMEvent::tqStatus status) { KApplication::postEvent(instance(), new KTRMEvent(fileId, status)); } @@ -303,7 +303,7 @@ protected: * Callback fuction for TunePimp lookup events. */ #if HAVE_MUSICBRAINZ >= 4 -static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFileStatus status) +static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFiletqStatus status) #else static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId) #endif @@ -313,7 +313,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, #if HAVE_MUSICBRAINZ < 4 track_t track = tp_GetTrack(pimp, fileId); - TPFileStatus status = tr_GetStatus(track); + TPFiletqStatus status = tr_GettqStatus(track); #endif switch(status) { @@ -496,7 +496,7 @@ void KTRMLookup::unrecognized() tr_Lock(track); tr_GetTRM(track, trm, 255); if ( !trm[0] ) { - tr_SetStatus(track, ePending); + tr_SettqStatus(track, ePending); tp_Wake(KTRMRequestHandler::instance()->tunePimp(), track); } else diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp index c87a883c..6a6eb45e 100644 --- a/juk/musicbrainzquery.cpp +++ b/juk/musicbrainzquery.cpp @@ -68,7 +68,7 @@ void MusicBrainzLookup::error() void MusicBrainzLookup::message(const TQString &s) const { KMainWindow *w = static_cast<KMainWindow *>(kapp->mainWidget()); - w->statusBar()->message(TQString("%1 (%2)").arg(s).arg(m_file.fileInfo().fileName()), 3000); + w->statusBar()->message(TQString("%1 (%2)").tqarg(s).tqarg(m_file.fileInfo().fileName()), 3000); } void MusicBrainzLookup::confirmation() diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp index e553127e..8e14f1e9 100644 --- a/juk/nowplaying.cpp +++ b/juk/nowplaying.cpp @@ -20,7 +20,7 @@ #include <kio/netaccess.h> #include <tqimage.h> -#include <layout.h> +#include <tqlayout.h> #include <tqevent.h> #include <tqdragobject.h> #include <tqimage.h> @@ -58,9 +58,9 @@ NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const c CollectionList::instance()->addObserver(&m_observer); - layout()->setMargin(5); - layout()->setSpacing(3); - setFixedHeight(imageSize + 2 + layout()->margin() * 2); + tqlayout()->setMargin(5); + tqlayout()->setSpacing(3); + setFixedHeight(imageSize + 2 + tqlayout()->margin() * 2); setStretchFactor(new CoverItem(this), 0); setStretchFactor(new TrackItem(this), 2); @@ -109,7 +109,7 @@ CoverItem::CoverItem(NowPlaying *parent) : TQLabel(parent, "CoverItem"), NowPlayingItem(parent) { - setFixedHeight(parent->height() - parent->layout()->margin() * 2); + setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2); setFrameStyle(Box | Plain); setLineWidth(1); setMargin(1); @@ -218,17 +218,17 @@ TrackItem::TrackItem(NowPlaying *parent) : TQWidget(parent, "TrackItem"), NowPlayingItem(parent) { - setFixedHeight(parent->height() - parent->layout()->margin() * 2); - setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2); + tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); m_label = new LinkLabel(this); m_label->setLinkUnderline(false); - layout->addStretch(); - layout->addWidget(m_label); - layout->addStretch(); + tqlayout->addStretch(); + tqlayout->addWidget(m_label); + tqlayout->addStretch(); connect(m_label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(slotOpenLink(const TQString &))); @@ -270,13 +270,13 @@ void TrackItem::slotUpdate() "<font size=\"+%3\"><b><a href=\"artist\">%4</a>%5<a href=\"album\">%6</a></b>"; if(NowPlayingItem::parent()->collection()->showMoreActive()) - format.append(TQString(" (<a href=\"clear\">%1</a>)").arg(i18n("back to playlist"))); + format.append(TQString(" (<a href=\"clear\">%1</a>)").tqarg(i18n("back to playlist"))); format.append("</font>"); do { - m_label->setText(format.arg(size).arg(title).arg(size - 2) - .arg(artist).arg(separator).arg(album)); + m_label->setText(format.tqarg(size).tqarg(title).tqarg(size - 2) + .tqarg(artist).tqarg(separator).tqarg(album)); --size; } while(m_label->heightForWidth(m_label->width()) > imageSize && size >= 0); @@ -291,10 +291,10 @@ HistoryItem::HistoryItem(NowPlaying *parent) : LinkLabel(parent, "HistoryItem"), NowPlayingItem(parent) { - setFixedHeight(parent->height() - parent->layout()->margin() * 2); - setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2); + tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); setLinkUnderline(false); - setText(TQString("<b>%1</b>").arg(i18n("History"))); + setText(TQString("<b>%1</b>").tqarg(i18n("History"))); m_timer = new TQTimer(this); connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAddPlaying())); @@ -309,14 +309,14 @@ void HistoryItem::update(const FileHandle &file) m_history.remove(m_history.fromLast()); TQString format = "<br /><a href=\"%1\"><font size=\"-1\">%2</font></a>"; - TQString current = TQString("<b>%1</b>").arg(i18n("History")); + TQString current = TQString("<b>%1</b>").tqarg(i18n("History")); TQString previous; for(TQValueList<Item>::ConstIterator it = m_history.begin(); it != m_history.end(); ++it) { previous = current; - current.append(format.arg((*it).anchor).arg(TQStyleSheet::escape((*it).file.tag()->title()))); + current.append(format.tqarg((*it).anchor).tqarg(TQStyleSheet::escape((*it).file.tag()->title()))); setText(current); if(heightForWidth(width()) > imageSize) { setText(previous); diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp index 0ecc9e84..db01392c 100644 --- a/juk/playermanager.cpp +++ b/juk/playermanager.cpp @@ -46,7 +46,7 @@ using namespace ActionCollection; -enum PlayerManagerStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 }; +enum PlayerManagertqStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 }; //////////////////////////////////////////////////////////////////////////////// // helper functions diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 047bba00..41f18228 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -102,7 +102,7 @@ public: (column == m_playlist->columnOffset() + PlaylistItem::CoverColumn && item->file().coverInfo()->hasCover())) { - TQRect r = m_playlist->itemRect(item); + TQRect r = m_playlist->tqitemRect(item); int headerPosition = m_playlist->header()->sectionPos(column); r.setLeft(headerPosition); r.setRight(headerPosition + m_playlist->header()->sectionSize(column)); @@ -543,7 +543,7 @@ void Playlist::save() TQFile file(m_fileName); if(!file.open(IO_WriteOnly)) - return KMessageBox::error(this, i18n("Could not save to file %1.").arg(m_fileName)); + return KMessageBox::error(this, i18n("Could not save to file %1.").tqarg(m_fileName)); TQTextStream stream(&file); @@ -727,12 +727,12 @@ void Playlist::synchronizePlayingItems(const PlaylistList &sources, bool setMast void Playlist::copy() { - kapp->clipboard()->setData(dragObject(0), TQClipboard::Clipboard); + kapp->tqclipboard()->setData(dragObject(0), TQClipboard::Clipboard); } void Playlist::paste() { - decode(kapp->clipboard()->data(), static_cast<PlaylistItem *>(currentItem())); + decode(kapp->tqclipboard()->data(), static_cast<PlaylistItem *>(currentItem())); } void Playlist::clear() @@ -2127,7 +2127,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c if(showEdit) m_rmbMenu->changeItem(m_rmbEditID, - i18n("Edit '%1'").arg(columnText(column + columnOffset()))); + i18n("Edit '%1'").tqarg(columnText(column + columnOffset()))); m_rmbMenu->setItemVisible(m_rmbEditID, showEdit); diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index f3701edb..d0e82d27 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -208,7 +208,7 @@ void PlaylistBox::duplicate() void PlaylistBox::paste() { Item *i = static_cast<Item *>(currentItem()); - decode(kapp->clipboard()->data(), i); + decode(kapp->tqclipboard()->data(), i); } //////////////////////////////////////////////////////////////////////////////// @@ -445,7 +445,7 @@ void PlaylistBox::contentsDropEvent(TQDropEvent *e) if(m_dropItem) { Item *old = m_dropItem; m_dropItem = 0; - old->repaint(); + old->tqrepaint(); } } @@ -493,14 +493,14 @@ void PlaylistBox::contentsDragMoveEvent(TQDragMoveEvent *e) if(e->isAccepted()) { m_dropItem = target; - target->repaint(); + target->tqrepaint(); m_showTimer->start(1500, true); } else m_dropItem = 0; if(old) - old->repaint(); + old->tqrepaint(); } } else { @@ -517,7 +517,7 @@ void PlaylistBox::contentsDragLeaveEvent(TQDragLeaveEvent *e) if(m_dropItem) { Item *old = m_dropItem; m_dropItem = 0; - old->repaint(); + old->tqrepaint(); } KListView::contentsDragLeaveEvent(e); } @@ -722,10 +722,10 @@ int PlaylistBox::Item::compare(TQListViewItem *i, int col, bool) const return text(col).lower().localeAwareCompare(i->text(col).lower()); } -void PlaylistBox::Item::paintCell(TQPainter *painter, const TQColorGroup &colorGroup, int column, int width, int align) +void PlaylistBox::Item::paintCell(TQPainter *painter, const TQColorGroup &tqcolorGroup, int column, int width, int align) { PlaylistBox *playlistBox = static_cast<PlaylistBox *>(listView()); - playlistBox->viewMode()->paintCell(this, painter, colorGroup, column, width, align); + playlistBox->viewMode()->paintCell(this, painter, tqcolorGroup, column, width, align); } void PlaylistBox::Item::setText(int column, const TQString &text) diff --git a/juk/playlistbox.h b/juk/playlistbox.h index 42003634..793ae654 100644 --- a/juk/playlistbox.h +++ b/juk/playlistbox.h @@ -162,7 +162,7 @@ protected: void setSortedFirst(bool first = true) { m_sortedFirst = first; } virtual int compare(TQListViewItem *i, int col, bool) const; - virtual void paintCell(TQPainter *p, const TQColorGroup &colorGroup, int column, int width, int align); + virtual void paintCell(TQPainter *p, const TQColorGroup &tqcolorGroup, int column, int width, int align); virtual void paintFocus(TQPainter *, const TQColorGroup &, const TQRect &) {} virtual void setText(int column, const TQString &text); diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp index 0b0a5c50..95ac971a 100644 --- a/juk/playlistcollection.cpp +++ b/juk/playlistcollection.cpp @@ -747,11 +747,11 @@ TQString PlaylistCollection::uniquePlaylistName(const TQString &suggest) const base.remove(TQRegExp("\\s\\([0-9]+\\)$")); int count = 1; - TQString s = TQString("%1 (%2)").arg(base).arg(count); + TQString s = TQString("%1 (%2)").tqarg(base).tqarg(count); while(m_playlistNames.contains(s)) { count++; - s = TQString("%1 (%2)").arg(base).arg(count); + s = TQString("%1 (%2)").tqarg(base).tqarg(count); } return s; diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp index 2a9a2412..81aad977 100644 --- a/juk/playlistitem.cpp +++ b/juk/playlistitem.cpp @@ -272,10 +272,10 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i if(!m_playingItems.contains(this)) return KListViewItem::paintCell(p, cg, column, width, align); - TQColorGroup colorGroup = cg; + TQColorGroup tqcolorGroup = cg; - TQColor base = colorGroup.base(); - TQColor selection = colorGroup.highlight(); + TQColor base = tqcolorGroup.base(); + TQColor selection = tqcolorGroup.highlight(); int r = (base.red() + selection.red()) / 2; int b = (base.blue() + selection.blue()) / 2; @@ -283,8 +283,8 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i TQColor c(r, g, b); - colorGroup.setColor(TQColorGroup::Base, c); - TQListViewItem::paintCell(p, colorGroup, column, width, align); + tqcolorGroup.setColor(TQColorGroup::Base, c); + TQListViewItem::paintCell(p, tqcolorGroup, column, width, align); } int PlaylistItem::compare(TQListViewItem *item, int column, bool ascending) const diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp index 0d3ce710..caf2ce00 100644 --- a/juk/playlistsplitter.cpp +++ b/juk/playlistsplitter.cpp @@ -16,7 +16,7 @@ #include <kaction.h> #include <kdebug.h> -#include <layout.h> +#include <tqlayout.h> #include <tqevent.h> #include "playlistsplitter.h" @@ -94,7 +94,7 @@ void PlaylistSplitter::slotFocusCurrentPlaylist() if(!item) return; - // A little bit of a hack to make TQListView repaint things properly. Switch + // A little bit of a hack to make TQListView tqrepaint things properly. Switch // to single selection mode, set the selection and then switch back. playlist->setSelectionMode(TQListView::Single); diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h index 2162d9b8..b0ed1a75 100644 --- a/juk/playlistsplitter.h +++ b/juk/playlistsplitter.h @@ -30,7 +30,7 @@ class PlaylistInterface; class TagEditor; /** - * This is the main layout class of JuK. It should contain a PlaylistBox and + * This is the main tqlayout class of JuK. It should contain a PlaylistBox and * a TQWidgetStack of the Playlists. * * This class serves as a "mediator" (see "Design Patterns") between the JuK diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp index e95a570e..8201f931 100644 --- a/juk/searchwidget.cpp +++ b/juk/searchwidget.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kaction.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqpushbutton.h> @@ -163,7 +163,7 @@ void SearchLine::updateColumns() TQStringList columnHeaders; - columnHeaders.append(TQString("<%1>").arg(i18n("All Visible"))); + columnHeaders.append(TQString("<%1>").tqarg(i18n("All Visible"))); Playlist *playlist = CollectionList::instance(); diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp index 14919170..cf68043c 100644 --- a/juk/slideraction.cpp +++ b/juk/slideraction.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <tqtooltip.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqtimer.h> diff --git a/juk/splashscreen.cpp b/juk/splashscreen.cpp index d20e5896..21f037b0 100644 --- a/juk/splashscreen.cpp +++ b/juk/splashscreen.cpp @@ -77,7 +77,7 @@ SplashScreen::SplashScreen() : TQLabel(0 , "splashScreen", TQt::WStyle_Splash) setPaletteBackgroundPixmap(background); setMargin(7); - setAlignment(AlignLeft | AlignBottom); + tqsetAlignment(AlignLeft | AlignBottom); setPaletteForegroundColor(TQColor(107, 158, 194)); diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp index 268588aa..951604cd 100644 --- a/juk/statuslabel.cpp +++ b/juk/statuslabel.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <tqtooltip.h> -#include <layout.h> +#include <tqlayout.h> #include "statuslabel.h" #include "filehandle.h" @@ -42,7 +42,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch { TQFrame *trackAndPlaylist = new TQFrame(this); trackAndPlaylist->setFrameStyle(Box | Sunken); - trackAndPlaylist->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + trackAndPlaylist->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); // Make sure that we have enough of a margin to suffice for the borders, // hence the "lineWidth() * 2" @@ -53,23 +53,23 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch m_playlistLabel = new KSqueezedTextLabel(trackAndPlaylist, "playlistLabel"); trackAndPlaylistLayout->addWidget(m_playlistLabel); - m_playlistLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_playlistLabel->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_playlistLabel->setTextFormat(PlainText); - m_playlistLabel->setAlignment(AlignLeft | AlignVCenter); + m_playlistLabel->tqsetAlignment(AlignLeft | AlignVCenter); m_trackLabel = new KSqueezedTextLabel(trackAndPlaylist, "trackLabel"); trackAndPlaylistLayout->addWidget(m_trackLabel); - m_trackLabel->setAlignment(AlignRight | AlignVCenter); - m_trackLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_trackLabel->tqsetAlignment(AlignRight | AlignVCenter); + m_trackLabel->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_trackLabel->setTextFormat(PlainText); trackAndPlaylistLayout->addSpacing(5); m_itemTimeLabel = new TQLabel(this); TQFontMetrics fontMetrics(font()); - m_itemTimeLabel->setAlignment(AlignCenter); + m_itemTimeLabel->tqsetAlignment(AlignCenter); m_itemTimeLabel->setMinimumWidth(fontMetrics.boundingRect("000:00 / 000:00").width()); - m_itemTimeLabel->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + m_itemTimeLabel->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); m_itemTimeLabel->setFrameStyle(Box | Sunken); m_itemTimeLabel->installEventFilter(this); @@ -78,7 +78,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch TQHBox *jumpBox = new TQHBox(this); jumpBox->setFrameStyle(Box | Sunken); - jumpBox->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum); + jumpBox->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum); TQPushButton *jumpButton = new TQPushButton(jumpBox); jumpButton->setPixmap(SmallIcon("up")); diff --git a/juk/stringhash.h b/juk/stringhash.h index eaf5b6b9..bf866958 100644 --- a/juk/stringhash.h +++ b/juk/stringhash.h @@ -118,7 +118,7 @@ protected: inline char hashStringAccess(const TQString &in, int index) { - return in.unicode()[index].cell(); + return in.tqunicode()[index].cell(); } inline char hashStringAccess(const TQCString &in, int index) diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index 429ca388..ad1eb7c8 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -31,8 +31,8 @@ #include <tqtooltip.h> #include <tqpainter.h> #include <tqvaluevector.h> -#include <stylesheet.h> -#include <palette.h> +#include <tqstylesheet.h> +#include <tqpalette.h> #include <netwm.h> @@ -370,7 +370,7 @@ void SystemTray::createPopup() for(unsigned i = 0; i < m_labels.capacity(); ++i) { m_labels[i] = new FlickerFreeLabel(" ", infoBox); - m_labels[i]->setAlignment(AlignRight | AlignVCenter); + m_labels[i]->tqsetAlignment(AlignRight | AlignVCenter); } // We don't want an autodelete popup. There are times when it will need @@ -385,7 +385,7 @@ void SystemTray::createPopup() int labelCount = 0; TQString title = TQStyleSheet::escape(playingInfo->title()); - m_labels[labelCount++]->setText(TQString("<qt><nobr><h2>%1</h2></nobr><qt>").arg(title)); + m_labels[labelCount++]->setText(TQString("<qt><nobr><h2>%1</h2></nobr><qt>").tqarg(title)); if(!playingInfo->artist().isEmpty()) m_labels[labelCount++]->setText(playingInfo->artist()); @@ -393,8 +393,8 @@ void SystemTray::createPopup() if(!playingInfo->album().isEmpty()) { TQString album = TQStyleSheet::escape(playingInfo->album()); TQString s = playingInfo->year() > 0 - ? TQString("<qt><nobr>%1 (%2)</nobr></qt>").arg(album).arg(playingInfo->year()) - : TQString("<qt><nobr>%1</nobr></qt>").arg(album); + ? TQString("<qt><nobr>%1 (%2)</nobr></qt>").tqarg(album).tqarg(playingInfo->year()) + : TQString("<qt><nobr>%1</nobr></qt>").tqarg(album); m_labels[labelCount++]->setText(s); } @@ -531,8 +531,8 @@ void SystemTray::setToolTip(const TQString &tip, const TQPixmap &cover) TQString html = i18n("%1 is Cover Art, %2 is the playing track, %3 is the appname", "<center><table cellspacing=\"2\"><tr><td valign=\"middle\">%1</td>" "<td valign=\"middle\">%2</td></tr></table><em>%3</em></center>"); - html = html.arg("<img valign=\"middle\" src=\"tipCover\""); - html = html.arg(TQString("<nobr>%1</nobr>").arg(tip), i18n("JuK")); + html = html.tqarg("<img valign=\"middle\" src=\"tipCover\""); + html = html.tqarg(TQString("<nobr>%1</nobr>").tqarg(tip), i18n("JuK")); TQToolTip::add(this, html); } diff --git a/juk/systemtray.h b/juk/systemtray.h index 66f76111..fb6e91f9 100644 --- a/juk/systemtray.h +++ b/juk/systemtray.h @@ -90,7 +90,7 @@ private: void createButtonBox(TQWidget *parent); - // Creates the widget layout for the popup, returning the TQVBox that + // Creates the widget tqlayout for the popup, returning the TQVBox that // holds the text labels. Uses buttonsToLeft() to figure out which // order to create them in. @p file is used to grab the cover. TQVBox *createPopupLayout(TQWidget *parent, const FileHandle &file); diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index c7d0e06e..c9f866c4 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -33,7 +33,7 @@ #include <tqlabel.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqdir.h> #include <tqvalidator.h> #include <tqtooltip.h> @@ -90,11 +90,11 @@ public: m_width(-1) {} void setWidth(int w = -1) { - m_width = w == -1 ? TQHBoxLayout::minimumSize().width() : w; + m_width = w == -1 ? TQHBoxLayout::tqminimumSize().width() : w; } - virtual TQSize minimumSize() const + virtual TQSize tqminimumSize() const { - TQSize s = TQHBoxLayout::minimumSize(); + TQSize s = TQHBoxLayout::tqminimumSize(); s.setWidth(m_width); return s; } @@ -481,16 +481,16 @@ void TagEditor::setupLayout() static const int horizontalSpacing = 12; static const int verticalSpacing = 2; - TQHBoxLayout *layout = new TQHBoxLayout(this, 6, horizontalSpacing); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 6, horizontalSpacing); ////////////////////////////////////////////////////////////////////////////// - // define two columns of the bottem layout + // define two columns of the bottem tqlayout ////////////////////////////////////////////////////////////////////////////// - TQVBoxLayout *leftColumnLayout = new TQVBoxLayout(layout, verticalSpacing); - TQVBoxLayout *rightColumnLayout = new TQVBoxLayout(layout, verticalSpacing); + TQVBoxLayout *leftColumnLayout = new TQVBoxLayout(tqlayout, verticalSpacing); + TQVBoxLayout *rightColumnLayout = new TQVBoxLayout(tqlayout, verticalSpacing); - layout->setStretchFactor(leftColumnLayout, 2); - layout->setStretchFactor(rightColumnLayout, 3); + tqlayout->setStretchFactor(leftColumnLayout, 2); + tqlayout->setStretchFactor(rightColumnLayout, 3); ////////////////////////////////////////////////////////////////////////////// // put stuff in the left column -- all of the field names are class wide @@ -560,7 +560,7 @@ void TagEditor::setupLayout() // addItem(i18n("Length:"), m_lengthBox, trackRowLayout); m_lengthBox->setMinimumWidth(fontMetrics().width("00:00") + trackRowLayout->spacing()); m_lengthBox->setMaximumWidth(50); - m_lengthBox->setAlignment(TQt::AlignRight); + m_lengthBox->tqsetAlignment(TQt::AlignRight); m_lengthBox->setReadOnly(true); trackRowLayout->addWidget(addHidden(m_lengthBox)); @@ -572,7 +572,7 @@ void TagEditor::setupLayout() // addItem(i18n("Bitrate:"), m_bitrateBox, trackRowLayout); m_bitrateBox->setMinimumWidth(fontMetrics().width("000") + trackRowLayout->spacing()); m_bitrateBox->setMaximumWidth(50); - m_bitrateBox->setAlignment(TQt::AlignRight); + m_bitrateBox->tqsetAlignment(TQt::AlignRight); m_bitrateBox->setReadOnly(true); trackRowLayout->addWidget(addHidden(m_bitrateBox)); @@ -711,9 +711,9 @@ void TagEditor::saveChangesPrompt() } } -void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layout, const TQString &iconName) +void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *tqlayout, const TQString &iconName) { - if(!item || !layout) + if(!item || !tqlayout) return; TQLabel *label = new TQLabel(item, text, this); @@ -727,14 +727,14 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layou label->setMinimumHeight(enableBox->height()); - if(layout->direction() == TQBoxLayout::LeftToRight) { - layout->addWidget(iconLabel); - layout->addWidget(label); - layout->addWidget(item); - layout->addWidget(enableBox); + if(tqlayout->direction() == TQBoxLayout::LeftToRight) { + tqlayout->addWidget(iconLabel); + tqlayout->addWidget(label); + tqlayout->addWidget(item); + tqlayout->addWidget(enableBox); } else { - TQHBoxLayout *l = new TQHBoxLayout(layout); + TQHBoxLayout *l = new TQHBoxLayout(tqlayout); l->addWidget(iconLabel); l->addWidget(label); @@ -745,7 +745,7 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layou l->addWidget(enableBox); l->setStretchFactor(enableBox, 0); - layout->addWidget(item); + tqlayout->addWidget(item); } enableBox->hide(); diff --git a/juk/tageditor.h b/juk/tageditor.h index 10649494..35526380 100644 --- a/juk/tageditor.h +++ b/juk/tageditor.h @@ -67,10 +67,10 @@ private: void save(const PlaylistItemList &list); void saveChangesPrompt(); /** - * Adds an item to JuK's tagging layout. This handles the creation and + * Adds an item to JuK's tagging tqlayout. This handles the creation and * placement of the "enable" box as well. */ - void addItem(const TQString &text, TQWidget *item, TQBoxLayout *layout, const TQString &iconName = TQString()); + void addItem(const TQString &text, TQWidget *item, TQBoxLayout *tqlayout, const TQString &iconName = TQString()); /** * Adds a widget to m_hideList and returns that widget. diff --git a/juk/tagguesserconfigdlgwidget.ui b/juk/tagguesserconfigdlgwidget.ui index f3b3b2e5..08a03ed6 100644 --- a/juk/tagguesserconfigdlgwidget.ui +++ b/juk/tagguesserconfigdlgwidget.ui @@ -136,7 +136,7 @@ Note that the order in which the schemes appear in the list is relevant, since t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>130</height> diff --git a/juk/tagrenameroptions.cpp b/juk/tagrenameroptions.cpp index c25f3dd1..fc97ac8e 100644 --- a/juk/tagrenameroptions.cpp +++ b/juk/tagrenameroptions.cpp @@ -69,12 +69,12 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category) if(categoryNum > 0) typeKey.append(TQString::number(categoryNum)); - setSuffix(config.readEntry(TQString("%1Suffix").arg(typeKey))); - setPrefix(config.readEntry(TQString("%1Prefix").arg(typeKey))); + setSuffix(config.readEntry(TQString("%1Suffix").tqarg(typeKey))); + setPrefix(config.readEntry(TQString("%1Prefix").tqarg(typeKey))); // Default the emptyAction to ignoring the empty tag. - const TQString emptyAction = config.readEntry(TQString("%1EmptyAction").arg(typeKey)).lower(); + const TQString emptyAction = config.readEntry(TQString("%1EmptyAction").tqarg(typeKey)).lower(); setEmptyAction(IgnoreEmptyTag); if(emptyAction == "forceemptyinclude") @@ -82,9 +82,9 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category) else if(emptyAction == "usereplacementvalue") setEmptyAction(UseReplacementValue); - setEmptyText(config.readEntry(TQString("%1EmptyText").arg(typeKey))); - setTrackWidth(config.readUnsignedNumEntry(TQString("%1TrackWidth").arg(typeKey))); - setDisabled(config.readBoolEntry(TQString("%1Disabled").arg(typeKey), disabled)); + setEmptyText(config.readEntry(TQString("%1EmptyText").tqarg(typeKey))); + setTrackWidth(config.readUnsignedNumEntry(TQString("%1TrackWidth").tqarg(typeKey))); + setDisabled(config.readBoolEntry(TQString("%1Disabled").tqarg(typeKey), disabled)); } TQString TagRenamerOptions::tagTypeText(TagType type, bool translate) @@ -117,8 +117,8 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const KConfigGroup config(KGlobal::config(), "FileRenamer"); - config.writeEntry(TQString("%1Suffix").arg(typeKey), suffix()); - config.writeEntry(TQString("%1Prefix").arg(typeKey), prefix()); + config.writeEntry(TQString("%1Suffix").tqarg(typeKey), suffix()); + config.writeEntry(TQString("%1Prefix").tqarg(typeKey), prefix()); TQString emptyStr; @@ -136,12 +136,12 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const break; } - config.writeEntry(TQString("%1EmptyAction").arg(typeKey), emptyStr); - config.writeEntry(TQString("%1EmptyText").arg(typeKey), emptyText()); - config.writeEntry(TQString("%1Disabled").arg(typeKey), disabled()); + config.writeEntry(TQString("%1EmptyAction").tqarg(typeKey), emptyStr); + config.writeEntry(TQString("%1EmptyText").tqarg(typeKey), emptyText()); + config.writeEntry(TQString("%1Disabled").tqarg(typeKey), disabled()); if(category() == Track) - config.writeEntry(TQString("%1TrackWidth").arg(typeKey), trackWidth()); + config.writeEntry(TQString("%1TrackWidth").tqarg(typeKey), trackWidth()); config.sync(); } diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp index bf12bf98..97028983 100644 --- a/juk/tagtransactionmanager.cpp +++ b/juk/tagtransactionmanager.cpp @@ -176,7 +176,7 @@ bool TagTransactionManager::processChangeList(bool undo) item->file().setFile(tag->fileName()); item->refreshFromDisk(); - item->repaint(); + item->tqrepaint(); item->playlist()->dataChanged(); item->playlist()->update(); } diff --git a/juk/trackpickerdialogbase.ui b/juk/trackpickerdialogbase.ui index ddf72c2a..8f20c43d 100644 --- a/juk/trackpickerdialogbase.ui +++ b/juk/trackpickerdialogbase.ui @@ -31,7 +31,7 @@ <property name="title"> <string>File Name</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <hbox> @@ -50,7 +50,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="indent"> @@ -76,7 +76,7 @@ <property name="title"> <string>Select Best Possible Match</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <vbox> diff --git a/juk/treeviewitemplaylist.cpp b/juk/treeviewitemplaylist.cpp index 22872760..38f85f10 100644 --- a/juk/treeviewitemplaylist.cpp +++ b/juk/treeviewitemplaylist.cpp @@ -52,7 +52,7 @@ void TreeViewItemPlaylist::retag(const TQStringList &files, Playlist *) if(KMessageBox::warningContinueCancelList( this, - i18n("You are about to change the %1 on these files.").arg(changedTag), + i18n("You are about to change the %1 on these files.").tqarg(changedTag), files, i18n("Changing Track Tags"), KStdGuiItem::cont(), diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp index d1877730..b95d8cbc 100644 --- a/juk/viewmode.cpp +++ b/juk/viewmode.cpp @@ -49,7 +49,7 @@ ViewMode::~ViewMode() void ViewMode::paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &colorGroup, + const TQColorGroup &tqcolorGroup, int column, int width, int) { if(width < item->pixmap(column)->width()) @@ -79,8 +79,8 @@ void ViewMode::paintCell(PlaylistBox::Item *item, painter->setPen(oldPen); painter->fillRect(border, border, width - border * 2, item->height() - border * 2 + 1, - colorGroup.brush(TQColorGroup::Highlight)); - painter->setPen(colorGroup.highlightedText()); + tqcolorGroup.brush(TQColorGroup::Highlight)); + painter->setPen(tqcolorGroup.highlightedText()); } else painter->eraseRect(0, 0, width, item->height()); @@ -224,10 +224,10 @@ CompactViewMode::~CompactViewMode() void CompactViewMode::paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &colorGroup, + const TQColorGroup &tqcolorGroup, int column, int width, int align) { - item->KListViewItem::paintCell(painter, colorGroup, column, width, align); + item->KListViewItem::paintCell(painter, tqcolorGroup, column, width, align); if(item == item->listView()->dropItem()) paintDropIndicator(painter, width, item->height()); } diff --git a/juk/viewmode.h b/juk/viewmode.h index a2d30a9a..2ef4f007 100644 --- a/juk/viewmode.h +++ b/juk/viewmode.h @@ -40,7 +40,7 @@ public: virtual void paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &colorGroup, + const TQColorGroup &tqcolorGroup, int column, int width, int align); virtual bool eventFilter(TQObject *watched, TQEvent *e); @@ -106,7 +106,7 @@ public: virtual void paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &colorGroup, + const TQColorGroup &tqcolorGroup, int column, int width, int align); virtual void setupItem(PlaylistBox::Item *item) const { item->KListViewItem::setup(); } diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp index a34309d2..24670db7 100644 --- a/juk/webimagefetcher.cpp +++ b/juk/webimagefetcher.cpp @@ -37,7 +37,7 @@ WebImage::WebImage(const TQString &imageURL, const TQString &thumbURL, int width, int height) : m_imageURL(imageURL), m_thumbURL(thumbURL), - m_size(TQString("\n%1 x %2").arg(width).arg(height)) + m_size(TQString("\n%1 x %2").tqarg(width).tqarg(height)) { } diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp index cca6739b..eb2b1c2a 100644 --- a/juk/webimagefetcherdialog.cpp +++ b/juk/webimagefetcherdialog.cpp @@ -25,7 +25,7 @@ #include <kurllabel.h> #include <tqvbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqimage.h> #include <tqlabel.h> #include <tqpushbutton.h> @@ -86,15 +86,15 @@ void WebImageFetcherDialog::showCreditURL(const TQString &url) { // Don't use static member since I'm sure that someday knowing my luck // Yahoo will change their mimetype they serve. - (void) new KRun(KURL(url), topLevelWidget()); + (void) new KRun(KURL(url), tqtopLevelWidget()); } void WebImageFetcherDialog::setLayout() { setCaption(TQString("%1 - %2 (%3)") - .arg(m_file.tag()->artist()) - .arg(m_file.tag()->album()) - .arg(m_imageList.size())); + .tqarg(m_file.tag()->artist()) + .tqarg(m_file.tag()->album()) + .tqarg(m_imageList.size())); m_iconWidget->clear(); for(uint i = 0; i < m_imageList.size(); i++) @@ -218,7 +218,7 @@ CoverIconViewItem::~CoverIconViewItem() void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data) { int currentSize = m_buffer.size(); - m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim); + m_buffer.tqresize(currentSize + data.size(), TQGArray::SpeedOptim); memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size()); } |