diff options
Diffstat (limited to 'juk')
100 files changed, 475 insertions, 564 deletions
diff --git a/juk/CMakeLists.txt b/juk/CMakeLists.txt index 29325191..10ade86b 100644 --- a/juk/CMakeLists.txt +++ b/juk/CMakeLists.txt @@ -129,7 +129,7 @@ tde_add_check_executable( tagguessertest AUTOMOC tde_create_translated_desktop( SOURCE juk.desktop - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/juk-desktops + PO_DIR juk-desktops ) install( FILES jukui.rc jukui-rtl.rc DESTINATION ${DATA_INSTALL_DIR}/juk ) @@ -137,5 +137,5 @@ install( FILES jukui.rc jukui-rtl.rc DESTINATION ${DATA_INSTALL_DIR}/juk ) tde_create_translated_desktop( SOURCE jukservicemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/juk-desktops + PO_DIR juk-desktops ) diff --git a/juk/HACKING b/juk/HACKING index 4d9f7781..2fb4d392 100644 --- a/juk/HACKING +++ b/juk/HACKING @@ -103,15 +103,15 @@ be inline in the headers. The organization of the members in a class should be roughly as follows: public: -public Q_SLOTS: +public slots: protected: -protected Q_SLOTS: -Q_SIGNALS: +protected slots: +signals: private: // member funtions -private Q_SLOTS: +private slots: private: // member variables -If there are no private Q_SLOTS there is no need for two private sections, however +If there are no private slots there is no need for two private sections, however private functions and private variables should be clearly separated. The implementations files -- .cpp files -- should follow (when possible) the diff --git a/juk/advancedsearchdialog.cpp b/juk/advancedsearchdialog.cpp index 8fc4c037..386e12e3 100644 --- a/juk/advancedsearchdialog.cpp +++ b/juk/advancedsearchdialog.cpp @@ -82,17 +82,17 @@ AdvancedSearchDialog::AdvancedSearchDialog(const TQString &defaultName, TQBoxLayout *l = new TQHBoxLayout(buttons, 0, 5); KPushButton *clearButton = new KPushButton(KStdGuiItem::clear(), buttons); - connect(clearButton, TQT_SIGNAL(clicked()), TQT_SLOT(clear())); + connect(clearButton, TQ_SIGNAL(clicked()), TQ_SLOT(clear())); l->addWidget(clearButton); l->addStretch(1); m_moreButton = new KPushButton(i18n("More"), buttons); - connect(m_moreButton, TQT_SIGNAL(clicked()), TQT_SLOT(more())); + connect(m_moreButton, TQ_SIGNAL(clicked()), TQ_SLOT(more())); l->addWidget(m_moreButton); m_fewerButton = new KPushButton(i18n("Fewer"), buttons); - connect(m_fewerButton, TQT_SIGNAL(clicked()), TQT_SLOT(fewer())); + connect(m_fewerButton, TQ_SIGNAL(clicked()), TQ_SLOT(fewer())); l->addWidget(m_fewerButton); m_playlistNameLineEdit->setFocus(); diff --git a/juk/advancedsearchdialog.h b/juk/advancedsearchdialog.h index 76c6f7be..11069273 100644 --- a/juk/advancedsearchdialog.h +++ b/juk/advancedsearchdialog.h @@ -26,7 +26,7 @@ class SearchLine; class AdvancedSearchDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/akodeplayer.h b/juk/akodeplayer.h index 5e55c906..ebeeba94 100644 --- a/juk/akodeplayer.h +++ b/juk/akodeplayer.h @@ -34,9 +34,9 @@ namespace aKode { class Player; } -class KDE_EXPORT aKodePlayer : public Player +class TDE_EXPORT aKodePlayer : public Player { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/artsplayer.cpp b/juk/artsplayer.cpp index fc8269dd..f3b27616 100644 --- a/juk/artsplayer.cpp +++ b/juk/artsplayer.cpp @@ -84,7 +84,7 @@ void ArtsPlayer::play(const FileHandle &file) m_playobject = m_factory->createPlayObject(m_currentURL, false); if(m_playobject->object().isNull()) - connect(m_playobject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(playObjectCreated())); + connect(m_playobject, TQ_SIGNAL(playObjectCreated()), TQ_SLOT(playObjectCreated())); else playObjectCreated(); } @@ -251,7 +251,7 @@ void ArtsPlayer::setupPlayer() m_dispatcher = new KArtsDispatcher; m_server = new KArtsServer; setupArtsObjects(); - connect(m_server, TQT_SIGNAL(restartedServer()), TQT_SLOT(setupArtsObjects())); + connect(m_server, TQ_SIGNAL(restartedServer()), TQ_SLOT(setupArtsObjects())); } void ArtsPlayer::setupVolumeControl() @@ -291,5 +291,3 @@ bool ArtsPlayer::serverRunning() const #include "artsplayer.moc" #endif - -// vim: sw=4 ts=8 et diff --git a/juk/artsplayer.h b/juk/artsplayer.h index c022dbdb..02b5edf6 100644 --- a/juk/artsplayer.h +++ b/juk/artsplayer.h @@ -46,7 +46,7 @@ namespace KDE { class ArtsPlayer : public Player { - Q_OBJECT + TQ_OBJECT public: @@ -96,5 +96,3 @@ private: #endif #endif - -// vim: sw=4 ts=8 et diff --git a/juk/cache.cpp b/juk/cache.cpp index 58062036..5de4b40e 100644 --- a/juk/cache.cpp +++ b/juk/cache.cpp @@ -275,7 +275,7 @@ void Cache::load() if(!f.open(IO_ReadOnly)) return; - CacheDataStream s(TQT_TQIODEVICE(&f)); + CacheDataStream s(&f); TQ_INT32 version; s >> version; diff --git a/juk/categoryreaderinterface.cpp b/juk/categoryreaderinterface.cpp index 103329b3..23ea3d7b 100644 --- a/juk/categoryreaderinterface.cpp +++ b/juk/categoryreaderinterface.cpp @@ -63,5 +63,3 @@ TQString CategoryReaderInterface::fixupTrack(const TQString &track, unsigned cat return str; } - -// vim: set et sw=4 ts=4: diff --git a/juk/categoryreaderinterface.h b/juk/categoryreaderinterface.h index a7324ae5..91f367cc 100644 --- a/juk/categoryreaderinterface.h +++ b/juk/categoryreaderinterface.h @@ -118,5 +118,3 @@ public: }; #endif /* JUK_CATEGORYREADERINTERFACE_H */ - -// vim: set et sw=4 ts=4: diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp index 770ed92f..3cc0eb6a 100644 --- a/juk/collectionlist.cpp +++ b/juk/collectionlist.cpp @@ -230,12 +230,12 @@ CollectionList::CollectionList(PlaylistCollection *collection) : { new TDEAction(i18n("Show Playing"), TDEShortcut(), ActionCollection::actions(), "showPlaying"); - connect(action("showPlaying"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowPlaying())); + connect(action("showPlaying"), TQ_SIGNAL(activated()), this, TQ_SLOT(slotShowPlaying())); - connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotPopulateBackMenu())); - connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPlayFromBackMenu(int))); + connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotPopulateBackMenu())); + connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPlayFromBackMenu(int))); setSorting(-1); // Temporarily disable sorting to add items faster. m_columnTags[PlaylistItem::ArtistColumn] = new TagCountDict(5001, false); diff --git a/juk/collectionlist.h b/juk/collectionlist.h index 2a835c10..d01463ac 100644 --- a/juk/collectionlist.h +++ b/juk/collectionlist.h @@ -63,7 +63,7 @@ class CollectionList : public Playlist { friend class CollectionListItem; - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp index 00fd26b1..fc4fa7ed 100644 --- a/juk/coverdialog.cpp +++ b/juk/coverdialog.cpp @@ -89,7 +89,7 @@ void CoverDialog::show() m_artists->setSorting(0); - TQTimer::singleShot(0, this, TQT_SLOT(loadCovers())); + TQTimer::singleShot(0, this, TQ_SLOT(loadCovers())); CoverDialogBase::show(); } @@ -142,7 +142,7 @@ void CoverDialog::slotContextRequested(TQIconViewItem *item, const TQPoint &pt) if(!menu) { menu = new TDEPopupMenu(this); - menu->insertItem(i18n("Remove Cover"), this, TQT_SLOT(removeSelectedCover())); + menu->insertItem(i18n("Remove Cover"), this, TQ_SLOT(removeSelectedCover())); } menu->popup(pt); @@ -164,5 +164,3 @@ void CoverDialog::removeSelectedCover() } #include "coverdialog.moc" - -// vim: set et ts=4 sw=4: diff --git a/juk/coverdialog.h b/juk/coverdialog.h index 127057d3..00df8d64 100644 --- a/juk/coverdialog.h +++ b/juk/coverdialog.h @@ -20,7 +20,7 @@ class CoverDialog : public CoverDialogBase { - Q_OBJECT + TQ_OBJECT public: CoverDialog(TQWidget *parent); @@ -38,5 +38,3 @@ private slots: }; #endif /* JUK_COVERDIALOG_H */ - -// vim: set et ts=4 sw=4: diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui index 5b862753..ed8ed1f1 100644 --- a/juk/coverdialogbase.ui +++ b/juk/coverdialogbase.ui @@ -194,20 +194,18 @@ <slot>slotContextRequested(TQIconViewItem*,const TQPoint&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotArtistClicked(TQListViewItem *item)</slot> <slot>slotContextRequested(TQIconViewItem *, const TQPoint &pt)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <forwards> <forward>class TQIconViewItem;</forward> <forward>class TQListViewItem;</forward> </forwards> <includes> + <include location="global" impldecl="in implementation">covericonview.h</include> + <include location="global" impldecl="in implementation">kiconviewsearchline.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<includehints> - <includehint>kiconviewsearchline.h</includehint> - <includehint>covericonview.h</includehint> -</includehints> </UI> diff --git a/juk/covericonview.cpp b/juk/covericonview.cpp index d73a5739..d8896fd8 100644 --- a/juk/covericonview.cpp +++ b/juk/covericonview.cpp @@ -44,5 +44,3 @@ TQDragObject *CoverIconView::dragObject() return 0; } - -// vim: set et ts=4 sw=4: diff --git a/juk/covericonview.h b/juk/covericonview.h index 4fab390b..87b90d83 100644 --- a/juk/covericonview.h +++ b/juk/covericonview.h @@ -58,5 +58,3 @@ protected: }; #endif /* JUK_COVERICONVIEW_H */ - -// vim: set et ts=4 sw=4: diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp index dca657d8..42f57674 100644 --- a/juk/coverinfo.cpp +++ b/juk/coverinfo.cpp @@ -279,5 +279,3 @@ bool CoverInfo::convertOldStyleCover() const return false; } } - -// vim: set et sw=4 ts=8: diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp index 77719767..95af83e5 100644 --- a/juk/covermanager.cpp +++ b/juk/covermanager.cpp @@ -371,7 +371,7 @@ TQPixmap CoverManager::coverFromData(const CoverData &coverData, Size size) if(size == Thumbnail) { // Convert to image for smoothScale() TQImage image = pix->convertToImage(); - pix->convertFromImage(image.smoothScale(80, 80, TQ_ScaleMin)); + pix->convertFromImage(image.smoothScale(80, 80, TQImage::ScaleMin)); } TQPixmap returnValue = *pix; // Save it early. @@ -573,5 +573,3 @@ TQDataStream &operator>>(TQDataStream &in, CoverData &data) return in; } - -// vim: set et sw=4 ts=4: diff --git a/juk/covermanager.h b/juk/covermanager.h index e1bcbd67..01e838d8 100644 --- a/juk/covermanager.h +++ b/juk/covermanager.h @@ -258,5 +258,3 @@ public: }; #endif /* JUK_COVERMANAGER_H */ - -// vim: set et sw=4 ts=4: diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp index 1afc9261..daed8164 100644 --- a/juk/deletedialog.cpp +++ b/juk/deletedialog.cpp @@ -84,7 +84,7 @@ DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) : slotShouldDelete(shouldDelete()); - connect(m_widget->ddShouldDelete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShouldDelete(bool))); + connect(m_widget->ddShouldDelete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotShouldDelete(bool))); } bool DeleteDialog::confirmDeleteList(const TQStringList &condemnedFiles) @@ -117,5 +117,3 @@ void DeleteDialog::slotShouldDelete(bool shouldDelete) } #include "deletedialog.moc" - -// vim: set et ts=4 sw=4: diff --git a/juk/deletedialog.h b/juk/deletedialog.h index 61e6255f..a5e1fbd3 100644 --- a/juk/deletedialog.h +++ b/juk/deletedialog.h @@ -28,7 +28,7 @@ class TQWidgetStack; class DeleteWidget : public DeleteDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -42,7 +42,7 @@ protected slots: class DeleteDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -62,5 +62,3 @@ private: }; #endif - -// vim: set et ts=4 sw=4: diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui index 24480087..56866bde 100644 --- a/juk/deletedialogbase.ui +++ b/juk/deletedialogbase.ui @@ -133,9 +133,9 @@ <slot>slotShouldDelete(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotShouldDelete(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistbox.h</include> diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp index cc1f2031..f8af3b85 100644 --- a/juk/directorylist.cpp +++ b/juk/directorylist.cpp @@ -39,10 +39,10 @@ DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylis m_base->directoryListView->setFullWidth(true); - connect(m_base->addDirectoryButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAddDirectory())); - connect(m_base->removeDirectoryButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRemoveDirectory())); + connect(m_base->addDirectoryButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAddDirectory())); + connect(m_base->removeDirectoryButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRemoveDirectory())); TQStringList::ConstIterator it = directories.begin(); for(; it != directories.end(); ++it) @@ -97,5 +97,3 @@ void DirectoryList::slotRemoveDirectory() } #include "directorylist.moc" - -// vim: ts=8 diff --git a/juk/directorylist.h b/juk/directorylist.h index 8a973dfc..c780b59b 100644 --- a/juk/directorylist.h +++ b/juk/directorylist.h @@ -21,7 +21,7 @@ class DirectoryListBase; class DirectoryList : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -56,5 +56,3 @@ private: }; #endif - -// vim:ts=8 diff --git a/juk/dynamicplaylist.cpp b/juk/dynamicplaylist.cpp index 336d1e3e..c6f155da 100644 --- a/juk/dynamicplaylist.cpp +++ b/juk/dynamicplaylist.cpp @@ -60,7 +60,7 @@ DynamicPlaylist::DynamicPlaylist(const PlaylistList &playlists, for(PlaylistList::ConstIterator it = playlists.begin(); it != playlists.end(); ++it) m_observers.append(new PlaylistDirtyObserver(this, *it)); - connect(CollectionList::instance(), TQT_SIGNAL(signalCollectionChanged()), this, TQT_SLOT(slotSetDirty())); + connect(CollectionList::instance(), TQ_SIGNAL(signalCollectionChanged()), this, TQ_SLOT(slotSetDirty())); } DynamicPlaylist::~DynamicPlaylist() @@ -153,7 +153,7 @@ void DynamicPlaylist::updateItems() PlaylistItemList newSiblings = siblings; if(m_siblings != newSiblings) { m_siblings = newSiblings; - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateItems())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateItems())); } } diff --git a/juk/dynamicplaylist.h b/juk/dynamicplaylist.h index 3f03d365..ead7851c 100644 --- a/juk/dynamicplaylist.h +++ b/juk/dynamicplaylist.h @@ -24,7 +24,7 @@ class DynamicPlaylist : public Playlist { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/juk/exampleoptions.cpp b/juk/exampleoptions.cpp index 2763da9b..bc2b4f01 100644 --- a/juk/exampleoptions.cpp +++ b/juk/exampleoptions.cpp @@ -55,12 +55,12 @@ ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *parent) : // Forward signals - connect(m_options, TQT_SIGNAL(fileChanged()), TQT_SLOT(fileModeSelected())); - connect(m_options, TQT_SIGNAL(dataChanged()), TQT_SIGNAL(dataChanged())); - connect(m_options->m_exampleFile, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SIGNAL(fileChanged(const TQString &))); - connect(m_options->m_exampleFile, TQT_SIGNAL(returnPressed(const TQString &)), - this, TQT_SIGNAL(fileChanged(const TQString &))); + connect(m_options, TQ_SIGNAL(fileChanged()), TQ_SLOT(fileModeSelected())); + connect(m_options, TQ_SIGNAL(dataChanged()), TQ_SIGNAL(dataChanged())); + connect(m_options->m_exampleFile, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SIGNAL(fileChanged(const TQString &))); + connect(m_options->m_exampleFile, TQ_SIGNAL(returnPressed(const TQString &)), + this, TQ_SIGNAL(fileChanged(const TQString &))); } void ExampleOptionsDialog::hideEvent(TQHideEvent *) @@ -79,5 +79,3 @@ void ExampleOptionsDialog::fileModeSelected() } #include "exampleoptions.moc" - -// vim: set et sw=4 ts=4: diff --git a/juk/exampleoptions.h b/juk/exampleoptions.h index 1d2097f5..8228c9e2 100644 --- a/juk/exampleoptions.h +++ b/juk/exampleoptions.h @@ -21,7 +21,7 @@ class ExampleOptions : public ExampleOptionsBase { - Q_OBJECT + TQ_OBJECT public: ExampleOptions(TQWidget *parent); @@ -36,7 +36,7 @@ class ExampleOptions : public ExampleOptionsBase // buttons to close it. It's just a little floating dialog. class ExampleOptionsDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: ExampleOptionsDialog(TQWidget *parent); @@ -61,5 +61,3 @@ class ExampleOptionsDialog : public TQDialog }; #endif /* JUK_EXAMPLEOPTIONS_H */ - -// vim: set et sw=4 ts=4: diff --git a/juk/exampleoptionsbase.ui b/juk/exampleoptionsbase.ui index aeaf2cee..c5a09acf 100644 --- a/juk/exampleoptionsbase.ui +++ b/juk/exampleoptionsbase.ui @@ -267,21 +267,19 @@ <tabstop>m_exampleTrack</tabstop> <tabstop>m_exampleYear</tabstop> </tabstops> -<Q_SIGNALS> +<signals> <signal>dataChanged()</signal> <signal>fileChanged()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="protected">exampleSelectionChanged()</slot> <slot access="protected">exampleDataChanged()</slot> <slot access="protected">exampleFileChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp index ffe5b179..e5398fdf 100644 --- a/juk/filerenamer.cpp +++ b/juk/filerenamer.cpp @@ -248,11 +248,11 @@ FileRenamerWidget::FileRenamerWidget(TQWidget *parent) : m_category->insertItem(category); } - connect(m_exampleDialog, TQT_SIGNAL(signalShown()), TQT_SLOT(exampleDialogShown())); - connect(m_exampleDialog, TQT_SIGNAL(signalHidden()), TQT_SLOT(exampleDialogHidden())); - connect(m_exampleDialog, TQT_SIGNAL(dataChanged()), TQT_SLOT(dataSelected())); - connect(m_exampleDialog, TQT_SIGNAL(fileChanged(const TQString &)), - this, TQT_SLOT(fileSelected(const TQString &))); + connect(m_exampleDialog, TQ_SIGNAL(signalShown()), TQ_SLOT(exampleDialogShown())); + connect(m_exampleDialog, TQ_SIGNAL(signalHidden()), TQ_SLOT(exampleDialogHidden())); + connect(m_exampleDialog, TQ_SIGNAL(dataChanged()), TQ_SLOT(dataSelected())); + connect(m_exampleDialog, TQ_SIGNAL(fileChanged(const TQString &)), + this, TQ_SLOT(fileSelected(const TQString &))); exampleTextChanged(); } @@ -347,10 +347,10 @@ unsigned FileRenamerWidget::addRowCategory(TagType category) row.upButton->setFlat(true); row.downButton->setFlat(true); - upMapper->connect(row.upButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); - upMapper->setMapping(TQT_TQOBJECT(row.upButton), id); - downMapper->connect(row.downButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); - downMapper->setMapping(TQT_TQOBJECT(row.downButton), id); + upMapper->connect(row.upButton, TQ_SIGNAL(clicked()), TQ_SLOT(map())); + upMapper->setMapping(row.upButton, id); + downMapper->connect(row.downButton, TQ_SIGNAL(clicked()), TQ_SLOT(map())); + downMapper->setMapping(row.downButton, id); TQString labelText = TQString("<b>%1</b>").arg(TagRenamerOptions::tagTypeText(category)); TQLabel *label = new TQLabel(labelText, frame); @@ -359,12 +359,12 @@ unsigned FileRenamerWidget::addRowCategory(TagType category) TQVBox *options = new TQVBox(frame); row.enableButton = new KPushButton(i18n("Remove"), options); - toggleMapper->connect(row.enableButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); - toggleMapper->setMapping(TQT_TQOBJECT(row.enableButton), id); + toggleMapper->connect(row.enableButton, TQ_SIGNAL(clicked()), TQ_SLOT(map())); + toggleMapper->setMapping(row.enableButton, id); row.optionsButton = new KPushButton(i18n("Options"), options); - mapper->connect(row.optionsButton, TQT_SIGNAL(clicked()), TQT_SLOT(map())); - mapper->setMapping(TQT_TQOBJECT(row.optionsButton), id); + mapper->connect(row.optionsButton, TQ_SIGNAL(clicked()), TQ_SLOT(map())); + mapper->setMapping(row.optionsButton, id); row.widget->show(); m_rows.append(row); @@ -378,10 +378,10 @@ unsigned FileRenamerWidget::addRowCategory(TagType category) void FileRenamerWidget::moveSignalMappings(unsigned oldId, unsigned newId) { - mapper->setMapping(TQT_TQOBJECT(m_rows[oldId].optionsButton), newId); - downMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].downButton), newId); - upMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].upButton), newId); - toggleMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].enableButton), newId); + mapper->setMapping(m_rows[oldId].optionsButton, newId); + downMapper->setMapping(m_rows[oldId].downButton, newId); + upMapper->setMapping(m_rows[oldId].upButton, newId); + toggleMapper->setMapping(m_rows[oldId].enableButton, newId); } bool FileRenamerWidget::removeRow(unsigned id) @@ -448,7 +448,7 @@ bool FileRenamerWidget::removeRow(unsigned id) // We can insert another row now, make sure GUI is updated to match. m_insertCategory->setEnabled(true); - TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(exampleTextChanged())); return true; } @@ -462,8 +462,8 @@ void FileRenamerWidget::addFolderSeparatorCheckbox() l->addWidget(cb, 0, AlignCenter); cb->setChecked(false); - connect(cb, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(exampleTextChanged())); + connect(cb, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(exampleTextChanged())); temp->show(); } @@ -480,15 +480,15 @@ void FileRenamerWidget::createTagRows() m_rows.reserve(categoryOrder.count()); m_folderSwitches.reserve(categoryOrder.count() - 1); - mapper = new TQSignalMapper(TQT_TQOBJECT(this), "signal mapper"); - toggleMapper = new TQSignalMapper(TQT_TQOBJECT(this), "toggle mapper"); - upMapper = new TQSignalMapper(TQT_TQOBJECT(this), "up button mapper"); - downMapper = new TQSignalMapper(TQT_TQOBJECT(this), "down button mapper"); + mapper = new TQSignalMapper(this, "signal mapper"); + toggleMapper = new TQSignalMapper(this, "toggle mapper"); + upMapper = new TQSignalMapper(this, "up button mapper"); + downMapper = new TQSignalMapper(this, "down button mapper"); - connect(mapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(showCategoryOption(int))); - connect(toggleMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(slotRemoveRow(int))); - connect(upMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(moveItemUp(int))); - connect(downMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(moveItemDown(int))); + connect(mapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(showCategoryOption(int))); + connect(toggleMapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(slotRemoveRow(int))); + connect(upMapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(moveItemUp(int))); + connect(downMapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(moveItemDown(int))); m_mainFrame = new TQVBox(m_mainView->viewport()); m_mainFrame->setMargin(10); @@ -687,7 +687,7 @@ void FileRenamerWidget::moveItem(unsigned id, MovementDirection direction) layout->insertWidget(2 * pos, w); layout->invalidate(); - TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(exampleTextChanged())); } unsigned FileRenamerWidget::idOfPosition(unsigned position) const @@ -1043,5 +1043,3 @@ TQString FileRenamer::fileName(const CategoryReaderInterface &interface) } #include "filerenamer.moc" - -// vim: set et sw=4 ts=8: diff --git a/juk/filerenamer.h b/juk/filerenamer.h index c3858d76..77275c53 100644 --- a/juk/filerenamer.h +++ b/juk/filerenamer.h @@ -139,7 +139,7 @@ private: */ class FileRenamerWidget : public FileRenamerBase, public CategoryReaderInterface { - Q_OBJECT + TQ_OBJECT public: @@ -540,5 +540,3 @@ private: }; #endif /* JUK_FILERENAMER_H */ - -// vim: set et sw=4 ts=8: diff --git a/juk/filerenamerbase.ui b/juk/filerenamerbase.ui index a05d5801..01649070 100644 --- a/juk/filerenamerbase.ui +++ b/juk/filerenamerbase.ui @@ -360,19 +360,17 @@ <tabstop>m_insertCategory</tabstop> <tabstop>m_showExample</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">exampleTextChanged()</slot> <slot access="protected">toggleExampleDialog()</slot> <slot access="protected">insertCategory()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tqscrollview.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tqscrollview.h</includehint> -</includehints> </UI> diff --git a/juk/filerenamerconfigdlg.cpp b/juk/filerenamerconfigdlg.cpp index 27a3c3ec..9b8ddc86 100644 --- a/juk/filerenamerconfigdlg.cpp +++ b/juk/filerenamerconfigdlg.cpp @@ -39,5 +39,3 @@ void FileRenamerConfigDlg::accept() } #include "filerenamerconfigdlg.moc" - -// vim: set et sw=4 ts=4: diff --git a/juk/filerenamerconfigdlg.h b/juk/filerenamerconfigdlg.h index 96c29145..3a43e6fa 100644 --- a/juk/filerenamerconfigdlg.h +++ b/juk/filerenamerconfigdlg.h @@ -22,7 +22,7 @@ class FileRenamerWidget; class FileRenamerConfigDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FileRenamerConfigDlg(TQWidget *parent); @@ -35,5 +35,3 @@ class FileRenamerConfigDlg : public KDialogBase }; #endif // FILERENAMERCONFIGDLG_H - -// vim: set et ts=4 sw=4: diff --git a/juk/filerenameroptions.cpp b/juk/filerenameroptions.cpp index 0442be70..ddf087a3 100644 --- a/juk/filerenameroptions.cpp +++ b/juk/filerenameroptions.cpp @@ -153,5 +153,3 @@ void TagOptionsDialog::saveConfig() } #include "filerenameroptions.moc" - -// vim: set et ts=4 sw=4: diff --git a/juk/filerenameroptions.h b/juk/filerenameroptions.h index 6d0d6cee..82cc1584 100644 --- a/juk/filerenameroptions.h +++ b/juk/filerenameroptions.h @@ -27,7 +27,7 @@ */ class FileRenamerTagOptions : public FileRenamerTagOptionsBase { - Q_OBJECT + TQ_OBJECT public: @@ -51,7 +51,7 @@ class FileRenamerTagOptions : public FileRenamerTagOptionsBase */ class TagOptionsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -77,5 +77,3 @@ class TagOptionsDialog : public KDialogBase }; #endif /* JUK_FILERENAMEROPTIONS_H */ - -// vim: set et ts=4 sw=4: diff --git a/juk/filerenameroptionsbase.ui b/juk/filerenameroptionsbase.ui index ab3d2f61..061a5c5b 100644 --- a/juk/filerenameroptionsbase.ui +++ b/juk/filerenameroptionsbase.ui @@ -413,11 +413,11 @@ <slot>slotEmptyActionChanged()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotBracketsChanged()</slot> <slot access="protected">slotTrackWidthChanged()</slot> <slot access="protected">slotEmptyActionChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">knuminput.h</include> diff --git a/juk/folderplaylist.cpp b/juk/folderplaylist.cpp index 71934359..e12e0746 100644 --- a/juk/folderplaylist.cpp +++ b/juk/folderplaylist.cpp @@ -26,7 +26,7 @@ FolderPlaylist::FolderPlaylist(PlaylistCollection *collection, const TQString &f Playlist(collection, name, "folder"), m_folder(folder) { - TQTimer::singleShot(0, this, TQT_SLOT(slotReload())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReload())); } FolderPlaylist::~FolderPlaylist() @@ -42,7 +42,7 @@ TQString FolderPlaylist::folder() const void FolderPlaylist::setFolder(const TQString &s) { m_folder = s; - TQTimer::singleShot(0, this, TQT_SLOT(slotReload())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReload())); } //////////////////////////////////////////////////////////////////////////////// diff --git a/juk/folderplaylist.h b/juk/folderplaylist.h index a25ffb53..495625dc 100644 --- a/juk/folderplaylist.h +++ b/juk/folderplaylist.h @@ -19,7 +19,7 @@ class FolderPlaylist : public Playlist { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp index ffd892d4..464e7486 100644 --- a/juk/gstreamerplayer.cpp +++ b/juk/gstreamerplayer.cpp @@ -193,7 +193,7 @@ static GstBusSyncReply messageHandler(GstBus *, GstMessage *message, gpointer da { if(GST_MESSAGE_TYPE(message) == GST_MESSAGE_EOS) { GStreamerPlayer *player = static_cast<GStreamerPlayer *>(data); - TQTimer::singleShot(0, player, TQT_SLOT(stop())); + TQTimer::singleShot(0, player, TQ_SLOT(stop())); } gst_message_unref(message); @@ -346,5 +346,3 @@ GstState GStreamerPlayer::state() const #include "gstreamerplayer.moc" #endif - -// vim: set et sw=4: diff --git a/juk/gstreamerplayer.h b/juk/gstreamerplayer.h index ef18785c..d133d27e 100644 --- a/juk/gstreamerplayer.h +++ b/juk/gstreamerplayer.h @@ -30,7 +30,7 @@ class GStreamerPlayer : public Player { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp index 47e6fddb..85d01c0c 100644 --- a/juk/historyplaylist.cpp +++ b/juk/historyplaylist.cpp @@ -31,8 +31,8 @@ HistoryPlaylist::HistoryPlaylist(PlaylistCollection *collection) : setAllowDuplicates(true); m_timer = new TQTimer(this); - connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotAddPlaying())); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCreateNewItem())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotAddPlaying())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCreateNewItem())); } HistoryPlaylist::~HistoryPlaylist() diff --git a/juk/historyplaylist.h b/juk/historyplaylist.h index 2968f846..2b1e5c2e 100644 --- a/juk/historyplaylist.h +++ b/juk/historyplaylist.h @@ -36,7 +36,7 @@ private: class HistoryPlaylist : public Playlist { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/juk.cpp b/juk/juk.cpp index c66c19fc..ad35266c 100644 --- a/juk/juk.cpp +++ b/juk/juk.cpp @@ -71,8 +71,8 @@ JuK::JuK(TQWidget *parent, const char *name) : createDirs(); SplashScreen::finishedLoading(); - TQTimer::singleShot(0, CollectionList::instance(), TQT_SLOT(slotCheckCache())); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotProcessArgs())); + TQTimer::singleShot(0, CollectionList::instance(), TQ_SLOT(slotCheckCache())); + TQTimer::singleShot(0, this, TQ_SLOT(slotProcessArgs())); m_sliderAction->slotUpdateOrientation(); } @@ -99,8 +99,8 @@ void JuK::setupLayout() setCentralWidget(m_splitter); m_statusLabel = new StatusLabel(m_splitter->playlist(), statusBar()); - connect(CollectionList::instance(), TQT_SIGNAL(signalCollectionChanged()), - m_statusLabel, TQT_SLOT(updateData())); + connect(CollectionList::instance(), TQ_SIGNAL(signalCollectionChanged()), + m_statusLabel, TQ_SLOT(updateData())); statusBar()->addWidget(m_statusLabel, 1); PlayerManager::instance()->setStatusLabel(m_statusLabel); @@ -112,15 +112,15 @@ void JuK::setupActions() { ActionCollection::actions()->setWidget(this); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), ActionCollection::actions()); - KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), ActionCollection::actions()); - KStdAction::cut(TQT_TQOBJECT(kapp), TQT_SLOT(cut()), ActionCollection::actions()); - KStdAction::copy(TQT_TQOBJECT(kapp), TQT_SLOT(copy()), ActionCollection::actions()); - KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), ActionCollection::actions()); - KStdAction::clear(TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions()); - KStdAction::selectAll(TQT_TQOBJECT(kapp), TQT_SLOT(selectAll()), ActionCollection::actions()); + KStdAction::quit(this, TQ_SLOT(slotQuit()), ActionCollection::actions()); + KStdAction::undo(this, TQ_SLOT(slotUndo()), ActionCollection::actions()); + KStdAction::cut(kapp, TQ_SLOT(cut()), ActionCollection::actions()); + KStdAction::copy(kapp, TQ_SLOT(copy()), ActionCollection::actions()); + KStdAction::paste(kapp, TQ_SLOT(paste()), ActionCollection::actions()); + KStdAction::clear(kapp, TQ_SLOT(clear()), ActionCollection::actions()); + KStdAction::selectAll(kapp, TQ_SLOT(selectAll()), ActionCollection::actions()); - new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist"); + new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, kapp, TQ_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist"); TDEActionMenu *actionMenu = new TDEActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu"); actionMenu->setDelayed(false); @@ -135,15 +135,15 @@ void JuK::setupActions() ka = new TDERadioAction(i18n("Use &Album Random Play"), "roll", 0, ActionCollection::actions(), "albumRandomPlay"); ka->setExclusiveGroup("randomPlayGroup"); - connect(ka, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckAlbumNextAction(bool))); + connect(ka, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCheckAlbumNextAction(bool))); actionMenu->insert(ka); - new TDEAction(i18n("&Play"), "media-playback-start", 0, TQT_TQOBJECT(m_player), TQT_SLOT(play()), ActionCollection::actions(), "play"); - new TDEAction(i18n("P&ause"), "media-playback-pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause"); - new TDEAction(i18n("&Stop"), "media-playback-stop", 0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()), ActionCollection::actions(), "stop"); + new TDEAction(i18n("&Play"), "media-playback-start", 0, m_player, TQ_SLOT(play()), ActionCollection::actions(), "play"); + new TDEAction(i18n("P&ause"), "media-playback-pause", 0, m_player, TQ_SLOT(pause()), ActionCollection::actions(), "pause"); + new TDEAction(i18n("&Stop"), "media-playback-stop", 0, m_player, TQ_SLOT(stop()), ActionCollection::actions(), "stop"); - new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back"); - new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward"); + new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), m_player, TQ_SLOT(back()), ActionCollection::actions(), "back"); + new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), m_player, TQ_SLOT(forward()), ActionCollection::actions(), "forward"); new TDEToggleAction(i18n("&Loop Playlist"), 0, TDEShortcut(), ActionCollection::actions(), "loopPlaylist"); TDEToggleAction *resizeColumnAction = new TDEToggleAction(i18n("&Resize Playlist Columns Manually"), @@ -152,12 +152,12 @@ void JuK::setupActions() // the following are not visible by default - new TDEAction(i18n("Mute"), "mute", 0, TQT_TQOBJECT(m_player), TQT_SLOT(mute()), ActionCollection::actions(), "mute"); - new TDEAction(i18n("Volume Up"), "volumeUp", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp"); - new TDEAction(i18n("Volume Down"), "volumeDown", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown"); - new TDEAction(i18n("Play / Pause"), "playPause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()), ActionCollection::actions(), "playPause"); - new TDEAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward"); - new TDEAction(i18n("Seek Back"), "seekBack", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack"); + new TDEAction(i18n("Mute"), "mute", 0, m_player, TQ_SLOT(mute()), ActionCollection::actions(), "mute"); + new TDEAction(i18n("Volume Up"), "volumeUp", 0, m_player, TQ_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp"); + new TDEAction(i18n("Volume Down"), "volumeDown", 0, m_player, TQ_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown"); + new TDEAction(i18n("Play / Pause"), "playPause", 0, m_player, TQ_SLOT(playPause()), ActionCollection::actions(), "playPause"); + new TDEAction(i18n("Seek Forward"), "seekForward", 0, m_player, TQ_SLOT(seekForward()), ActionCollection::actions(), "seekForward"); + new TDEAction(i18n("Seek Back"), "seekBack", 0, m_player, TQ_SLOT(seekBack()), ActionCollection::actions(), "seekBack"); ////////////////////////////////////////////////// // settings menu @@ -175,12 +175,12 @@ void JuK::setupActions() TDEShortcut(), ActionCollection::actions(), "dockOnClose"); m_togglePopupsAction = new TDEToggleAction(i18n("Popup &Track Announcement"), - TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups"); + TDEShortcut(), this, 0, ActionCollection::actions(), "togglePopups"); new TDEToggleAction(i18n("Save &Play Queue on Exit"), - TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks"); + TDEShortcut(), this, 0, ActionCollection::actions(), "saveUpcomingTracks"); - connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleSystemTray(bool))); + connect(m_toggleSystemTrayAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleSystemTray(bool))); m_outputSelectAction = PlayerManager::playerSelectAction(ActionCollection::actions()); @@ -188,13 +188,13 @@ void JuK::setupActions() if(m_outputSelectAction) m_outputSelectAction->setCurrentItem(0); - new TDEAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()), + new TDEAction(i18n("&Tag Guesser..."), 0, 0, this, TQ_SLOT(slotConfigureTagGuesser()), ActionCollection::actions(), "tagGuesserConfig"); - new TDEAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()), + new TDEAction(i18n("&File Renamer..."), 0, 0, this, TQ_SLOT(slotConfigureFileRenamer()), ActionCollection::actions(), "fileRenamerConfig"); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), ActionCollection::actions()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), ActionCollection::actions()); ////////////////////////////////////////////////// // just in the toolbar @@ -213,7 +213,7 @@ void JuK::setupSystemTray() m_toggleDockOnCloseAction->setEnabled(true); m_togglePopupsAction->setEnabled(true); - connect(m_systemTray, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToQuit())); + connect(m_systemTray, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotAboutToQuit())); } else { m_systemTray = 0; @@ -224,20 +224,20 @@ void JuK::setupSystemTray() void JuK::setupGlobalAccels() { - m_accel = new TDEGlobalAccel(TQT_TQOBJECT(this)); - - KeyDialog::insert(m_accel, "Play", i18n("Play"), action("play"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "Stop", i18n("Stop Playing"), action("stop"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "Back", i18n("Back"), action("back"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "Forward", i18n("Forward"), action("forward"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "SeekBack", i18n("Seek Back"), action("seekBack"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "SeekForward", i18n("Seek Forward"), action("seekForward"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "VolumeUp", i18n("Volume Up"), action("volumeUp"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "VolumeDown", i18n("Volume Down"), action("volumeDown"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "Mute", i18n("Mute"), action("mute"), TQT_SLOT(activate())); - KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), TQT_TQOBJECT(this), TQT_SLOT(slotShowHide())); - KeyDialog::insert(m_accel, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQT_SLOT(activate())); + m_accel = new TDEGlobalAccel(this); + + KeyDialog::insert(m_accel, "Play", i18n("Play"), action("play"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "Stop", i18n("Stop Playing"), action("stop"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "Back", i18n("Back"), action("back"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "Forward", i18n("Forward"), action("forward"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "SeekBack", i18n("Seek Back"), action("seekBack"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "SeekForward", i18n("Seek Forward"), action("seekForward"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "VolumeUp", i18n("Volume Up"), action("volumeUp"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "VolumeDown", i18n("Volume Down"), action("volumeDown"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "Mute", i18n("Mute"), action("mute"), TQ_SLOT(activate())); + KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), this, TQ_SLOT(slotShowHide())); + KeyDialog::insert(m_accel, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQ_SLOT(activate())); m_accel->setConfigGroup("Shortcuts"); m_accel->readSettings(); @@ -36,7 +36,7 @@ class PlaylistSplitter; class JuK : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp index a8e50aa8..36f7eadb 100644 --- a/juk/k3bexporter.cpp +++ b/juk/k3bexporter.cpp @@ -62,7 +62,7 @@ class PlaylistAction : public TDEAction typedef TQMap<const Playlist *, TQObject *> PlaylistRecipientMap; /** - * Defines a TQObject to call (using the m_slot SLOT) when an action is + * Defines a TQObject to call (using the m_slot TQ_SLOT) when an action is * emitted from a Playlist. */ void addCallMapping(const Playlist *p, TQObject *obj) @@ -87,9 +87,9 @@ class PlaylistAction : public TDEAction // Invoke the slot using some trickery. // XXX: Use the TQMetaObject to do this in TQt 4. - connect(this, TQT_SIGNAL(activated()), recipient, m_slot); + connect(this, TQ_SIGNAL(activated()), recipient, m_slot); emit(activated()); - disconnect(this, TQT_SIGNAL(activated()), recipient, m_slot); + disconnect(this, TQ_SIGNAL(activated()), recipient, m_slot); } private: @@ -108,7 +108,7 @@ TDEAction *K3bExporter::action() "export_to_k3b", i18n("Add Selected Items to Audio or Data CD"), SmallIconSet("k3b"), - TQT_SLOT(slotExport()) + TQ_SLOT(slotExport()) ); m_action->setShortcutConfigurable(false); @@ -276,7 +276,7 @@ TDEAction *K3bPlaylistExporter::action() SmallIconSet("k3b"), 0, this, - TQT_SLOT(slotExport()), + TQ_SLOT(slotExport()), actions(), "export_playlist_to_k3b" ); @@ -294,5 +294,3 @@ void K3bPlaylistExporter::slotExport() } #include "k3bexporter.moc" - -// vim: set et sw=4 ts=4: diff --git a/juk/k3bexporter.h b/juk/k3bexporter.h index a6b1c27f..89337038 100644 --- a/juk/k3bexporter.h +++ b/juk/k3bexporter.h @@ -29,7 +29,7 @@ class PlaylistAction; */ class K3bExporter : public PlaylistExporter { - Q_OBJECT + TQ_OBJECT public: @@ -77,7 +77,7 @@ private: */ class K3bPlaylistExporter : public K3bExporter { - Q_OBJECT + TQ_OBJECT public: K3bPlaylistExporter(PlaylistBox *parent = 0); @@ -92,5 +92,3 @@ private: }; #endif /* K3BEXPORTER_H */ - -// vim: set et ts=4 sw=4: diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp index bc1d13a9..07584657 100644 --- a/juk/keydialog.cpp +++ b/juk/keydialog.cpp @@ -99,7 +99,7 @@ KeyDialog::KeyDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection new TQRadioButton(i18n("&No keys"), m_group); new TQRadioButton(i18n("&Standard keys"), m_group); new TQRadioButton(i18n("&Multimedia keys"), m_group); - connect(m_group, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotKeys(int))); + connect(m_group, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotKeys(int))); TQWhatsThis::add(m_group, i18n("Here you can select the keys used as global shortcuts to control the player")); @@ -127,7 +127,7 @@ void KeyDialog::newDialog(TDEGlobalAccel *keys, TDEActionCollection *actionColle m_widgetStack->raiseWidget(m_pKeyChooser); m_group->setButton(selectedButton); - connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotDefault())); + connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotDefault())); } int KeyDialog::configure() diff --git a/juk/keydialog.h b/juk/keydialog.h index a974598b..b23eff8f 100644 --- a/juk/keydialog.h +++ b/juk/keydialog.h @@ -25,7 +25,7 @@ class KeyDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp index 1d762a44..cf745f1c 100644 --- a/juk/ktrm.cpp +++ b/juk/ktrm.cpp @@ -602,5 +602,3 @@ void KTRMLookup::finished() } #endif - -// vim: set et ts=8 sw=4: diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp index 652bb30d..f1042930 100644 --- a/juk/musicbrainzquery.cpp +++ b/juk/musicbrainzquery.cpp @@ -82,11 +82,11 @@ void MusicBrainzLookup::confirmation() return; if(!queue.isEmpty()) { - queue.append(tqMakePair(m_file, results())); + queue.append(qMakePair(m_file, results())); return; } - queue.append(tqMakePair(m_file, results())); + queue.append(qMakePair(m_file, results())); while(!queue.isEmpty()) { TQPair<FileHandle, KTRMResultList> item = queue.first(); diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp index f603ad80..6c3110fa 100644 --- a/juk/nowplaying.cpp +++ b/juk/nowplaying.cpp @@ -67,8 +67,8 @@ NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const c setStretchFactor(new Line(this), 0); setStretchFactor(new HistoryItem(this), 1); - connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotUpdate())); - connect(PlayerManager::instance(), TQT_SIGNAL(signalStop()), this, TQT_SLOT(slotUpdate())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotUpdate())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalStop()), this, TQ_SLOT(slotUpdate())); hide(); } @@ -123,7 +123,7 @@ void CoverItem::update(const FileHandle &file) if(file.coverInfo()->hasCover()) { show(); TQImage image = file.coverInfo()->pixmap(CoverInfo::Thumbnail).convertToImage(); - setPixmap(image.smoothScale(imageSize, imageSize, TQ_ScaleMin)); + setPixmap(image.smoothScale(imageSize, imageSize, TQImage::ScaleMin)); } else hide(); @@ -138,7 +138,7 @@ void CoverItem::mouseReleaseEvent(TQMouseEvent *event) if(event->x() >= 0 && event->y() >= 0 && event->x() < width() && event->y() < height() && - event->button() == Qt::LeftButton && + event->button() == TQt::LeftButton && m_file.coverInfo()->hasCover()) { m_file.coverInfo()->popup(); @@ -230,14 +230,14 @@ TrackItem::TrackItem(NowPlaying *parent) : layout->addWidget(m_label); layout->addStretch(); - connect(m_label, TQT_SIGNAL(linkClicked(const TQString &)), this, - TQT_SLOT(slotOpenLink(const TQString &))); + connect(m_label, TQ_SIGNAL(linkClicked(const TQString &)), this, + TQ_SLOT(slotOpenLink(const TQString &))); } void TrackItem::update(const FileHandle &file) { m_file = file; - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdate())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdate())); } void TrackItem::slotOpenLink(const TQString &link) @@ -297,7 +297,7 @@ HistoryItem::HistoryItem(NowPlaying *parent) : setText(TQString("<b>%1</b>").arg(i18n("History"))); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAddPlaying())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAddPlaying())); } void HistoryItem::update(const FileHandle &file) @@ -364,5 +364,3 @@ void HistoryItem::slotAddPlaying() } #include "nowplaying.moc" - -// vim: set et sw=4 ts=8: diff --git a/juk/nowplaying.h b/juk/nowplaying.h index 60d040e2..0fc57f07 100644 --- a/juk/nowplaying.h +++ b/juk/nowplaying.h @@ -39,7 +39,7 @@ class Playlist; class NowPlaying : public TQHBox { - Q_OBJECT + TQ_OBJECT public: @@ -126,7 +126,7 @@ public: class TrackItem : public TQWidget, public NowPlayingItem { - Q_OBJECT + TQ_OBJECT public: @@ -148,7 +148,7 @@ private: class HistoryItem : public LinkLabel, public NowPlayingItem { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp index 7fc8727f..8fe33f72 100644 --- a/juk/playermanager.cpp +++ b/juk/playermanager.cpp @@ -642,12 +642,12 @@ void PlayerManager::setup() m_sliderAction = action<SliderAction>("trackPositionAction"); - connect(m_sliderAction, TQT_SIGNAL(signalPositionChanged(int)), - this, TQT_SLOT(seekPosition(int))); - connect(m_sliderAction->trackPositionSlider(), TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotUpdateTime(int))); - connect(m_sliderAction, TQT_SIGNAL(signalVolumeChanged(int)), - this, TQT_SLOT(slotSetVolume(int))); + connect(m_sliderAction, TQ_SIGNAL(signalPositionChanged(int)), + this, TQ_SLOT(seekPosition(int))); + connect(m_sliderAction->trackPositionSlider(), TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotUpdateTime(int))); + connect(m_sliderAction, TQ_SIGNAL(signalVolumeChanged(int)), + this, TQ_SLOT(slotSetVolume(int))); // Call this method manually to avoid warnings. @@ -655,7 +655,7 @@ void PlayerManager::setup() if(outputAction) { setOutput(static_cast<TDESelectAction *>(outputAction)->currentText()); - connect(outputAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetOutput(const TQString &))); + connect(outputAction, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotSetOutput(const TQString &))); } else m_player = createPlayer(); @@ -673,7 +673,7 @@ void PlayerManager::setup() m_player->setVolume(volume); m_timer = new TQTimer(this, "play timer"); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollPlay())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPollPlay())); } TQString PlayerManager::randomPlayMode() const @@ -696,5 +696,3 @@ void PlayerManager::setRandomPlayMode(const TQString &randomMode) } #include "playermanager.moc" - -// vim: set et ts=4 sw=4: diff --git a/juk/playermanager.h b/juk/playermanager.h index e8f6e528..3c722338 100644 --- a/juk/playermanager.h +++ b/juk/playermanager.h @@ -32,7 +32,7 @@ class PlaylistInterface; class PlayerManager : public Player, public PlayerIface { - Q_OBJECT + TQ_OBJECT protected: diff --git a/juk/playlist.cpp b/juk/playlist.cpp index de65b6e7..2895542d 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -65,6 +65,8 @@ #include "tagtransactionmanager.h" #include "cache.h" +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) + using namespace ActionCollection; /** @@ -312,7 +314,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQString &name, const TQString &iconName) : TDEListView(collection->playlistStack(), name.latin1()), m_collection(collection), - m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), + m_fetcher(new WebImageFetcher(this)), m_selectedCount(0), m_allowDuplicates(false), m_polished(false), @@ -336,7 +338,7 @@ Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items const TQString &name, const TQString &iconName) : TDEListView(collection->playlistStack(), name.latin1()), m_collection(collection), - m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), + m_fetcher(new WebImageFetcher(this)), m_selectedCount(0), m_allowDuplicates(false), m_polished(false), @@ -361,7 +363,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil const TQString &iconName) : TDEListView(collection->playlistStack()), m_collection(collection), - m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), + m_fetcher(new WebImageFetcher(this)), m_selectedCount(0), m_allowDuplicates(false), m_polished(false), @@ -385,7 +387,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil Playlist::Playlist(PlaylistCollection *collection, bool delaySetup) : TDEListView(collection->playlistStack()), m_collection(collection), - m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))), + m_fetcher(new WebImageFetcher(this)), m_selectedCount(0), m_allowDuplicates(false), m_polished(false), @@ -1110,11 +1112,11 @@ void Playlist::decode(TQMimeSource *s, PlaylistItem *item) bool Playlist::eventFilter(TQObject *watched, TQEvent *e) { - if(TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(header())) { + if(watched == header()) { switch(e->type()) { case TQEvent::MouseMove: { - if((TQT_TQMOUSEEVENT(e)->state() & Qt::LeftButton) == Qt::LeftButton && + if((static_cast<TQMouseEvent*>(e)->state() & TQt::LeftButton) == TQt::LeftButton && !action<TDEToggleAction>("resizeColumnsManually")->isChecked()) { m_columnWidthModeChanged = true; @@ -1127,7 +1129,7 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e) } case TQEvent::MouseButtonPress: { - if(TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton) + if(static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton) m_headerMenu->popup(TQCursor::pos()); break; @@ -1140,7 +1142,7 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e) } if(!manualResize() && m_widthsDirty) - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateColumnWidths())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateColumnWidths())); break; } default: @@ -1247,7 +1249,7 @@ void Playlist::contentsMouseDoubleClickEvent(TQMouseEvent *e) // Filter out non left button double clicks, that way users don't have the // weird experience of switching songs from a double right-click. - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) TDEListView::contentsMouseDoubleClickEvent(e); } @@ -1382,8 +1384,8 @@ void Playlist::refreshAlbums(const PlaylistItemList &items, coverKey id) TQString artist = (*it)->file().tag()->artist(); TQString album = (*it)->file().tag()->album(); - if(albums.find(tqMakePair(artist, album)) == albums.end()) - albums.append(tqMakePair(artist, album)); + if(albums.find(qMakePair(artist, album)) == albums.end()) + albums.append(qMakePair(artist, album)); (*it)->file().coverInfo()->setCoverId(id); if(setAlbumCovers) @@ -1545,7 +1547,7 @@ void Playlist::polish() // setup header RMB menu ////////////////////////////////////////////////// - m_columnVisibleAction = new TDEActionMenu(i18n("&Show Columns"), TQT_TQOBJECT(this), "showColumns"); + m_columnVisibleAction = new TDEActionMenu(i18n("&Show Columns"), this, "showColumns"); m_headerMenu = m_columnVisibleAction->popupMenu(); m_headerMenu->insertTitle(i18n("Show")); @@ -1559,25 +1561,25 @@ void Playlist::polish() adjustColumn(i); } - connect(m_headerMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleColumnVisible(int))); + connect(m_headerMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleColumnVisible(int))); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotShowRMBMenu(TQListViewItem *, const TQPoint &, int))); - connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)), - this, TQT_SLOT(slotInlineEditDone(TQListViewItem *, const TQString &, int))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(slotPlayCurrent())); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotPlayCurrent())); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotShowRMBMenu(TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)), + this, TQ_SLOT(slotInlineEditDone(TQListViewItem *, const TQString &, int))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(slotPlayCurrent())); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotPlayCurrent())); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(slotColumnSizeChanged(int, int, int))); - connect(renameLineEdit(), TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - this, TQT_SLOT(slotInlineCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(renameLineEdit(), TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + this, TQ_SLOT(slotInlineCompletionModeChanged(TDEGlobalSettings::Completion))); - connect(action("resizeColumnsManually"), TQT_SIGNAL(activated()), - this, TQT_SLOT(slotColumnResizeModeChanged())); + connect(action("resizeColumnsManually"), TQ_SIGNAL(activated()), + this, TQ_SLOT(slotColumnResizeModeChanged())); if(action<TDEToggleAction>("resizeColumnsManually")->isChecked()) setHScrollBarMode(Auto); @@ -1651,13 +1653,13 @@ void Playlist::setup() { setItemMargin(3); - connect(header(), TQT_SIGNAL(indexChange(int, int, int)), this, TQT_SLOT(slotColumnOrderChanged(int, int, int))); + connect(header(), TQ_SIGNAL(indexChange(int, int, int)), this, TQ_SLOT(slotColumnOrderChanged(int, int, int))); - connect(m_fetcher, TQT_SIGNAL(signalCoverChanged(int)), this, TQT_SLOT(slotCoverChanged(int))); + connect(m_fetcher, TQ_SIGNAL(signalCoverChanged(int)), this, TQ_SLOT(slotCoverChanged(int))); // Prevent list of selected items from changing while internet search is in // progress. - connect(this, TQT_SIGNAL(selectionChanged()), m_fetcher, TQT_SLOT(abortSearch())); + connect(this, TQ_SIGNAL(selectionChanged()), m_fetcher, TQ_SLOT(abortSearch())); setSorting(1); } @@ -2076,7 +2078,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c m_rmbMenu = new TDEPopupMenu(this); m_rmbUpcomingID = m_rmbMenu->insertItem(SmallIcon("today"), - i18n("Add to Play Queue"), this, TQT_SLOT(slotAddToUpcoming())); + i18n("Add to Play Queue"), this, TQ_SLOT(slotAddToUpcoming())); m_rmbMenu->insertSeparator(); if(!readOnly()) { @@ -2090,7 +2092,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c action("edit_copy")->plug(m_rmbMenu); m_rmbEditID = m_rmbMenu->insertItem( - i18n("Edit"), this, TQT_SLOT(slotRenameTag())); + i18n("Edit"), this, TQ_SLOT(slotRenameTag())); action("refresh")->plug(m_rmbMenu); action("removeItem")->plug(m_rmbMenu); @@ -2105,7 +2107,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c m_rmbMenu->insertSeparator(); m_rmbMenu->insertItem( - SmallIcon("folder-new"), i18n("Create Playlist From Selected Items..."), this, TQT_SLOT(slotCreateGroup())); + SmallIcon("folder-new"), i18n("Create Playlist From Selected Items..."), this, TQ_SLOT(slotCreateGroup())); K3bExporter *exporter = new K3bExporter(this); TDEAction *k3bAction = exporter->action(); @@ -2168,7 +2170,7 @@ void Playlist::slotRenameTag() TQStringList genreList; TagLib::StringList genres = TagLib::ID3v1::genreList(); for(TagLib::StringList::ConstIterator it = genres.begin(); it != genres.end(); ++it) - genreList.append(TStringToQString((*it))); + genreList.append(TStringToTQString((*it))); edit->completionObject()->setItems(genreList); break; } diff --git a/juk/playlist.h b/juk/playlist.h index e06744b3..2425b760 100644 --- a/juk/playlist.h +++ b/juk/playlist.h @@ -45,7 +45,7 @@ typedef TQValueList<PlaylistItem *> PlaylistItemList; class Playlist : public TDEListView, public PlaylistInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index 3da042d2..a8a09018 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -120,36 +120,36 @@ PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack, raise(CollectionList::instance()); viewModeAction->plug(m_contextMenu); - connect(viewModeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetViewMode(int))); + connect(viewModeAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetViewMode(int))); - connect(this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotPlaylistChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotPlaylistChanged())); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(slotDoubleClicked())); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(slotDoubleClicked())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotShowContextMenu(TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotShowContextMenu(TQListViewItem *, const TQPoint &, int))); TagTransactionManager *tagManager = TagTransactionManager::instance(); - connect(tagManager, TQT_SIGNAL(signalAboutToModifyTags()), TQT_SLOT(slotFreezePlaylists())); - connect(tagManager, TQT_SIGNAL(signalDoneModifyingTags()), TQT_SLOT(slotUnfreezePlaylists())); + connect(tagManager, TQ_SIGNAL(signalAboutToModifyTags()), TQ_SLOT(slotFreezePlaylists())); + connect(tagManager, TQ_SIGNAL(signalDoneModifyingTags()), TQ_SLOT(slotUnfreezePlaylists())); setupUpcomingPlaylist(); - connect(CollectionList::instance(), TQT_SIGNAL(signalNewTag(const TQString &, unsigned)), - this, TQT_SLOT(slotAddItem(const TQString &, unsigned))); - connect(CollectionList::instance(), TQT_SIGNAL(signalRemovedTag(const TQString &, unsigned)), - this, TQT_SLOT(slotRemoveItem(const TQString &, unsigned))); + connect(CollectionList::instance(), TQ_SIGNAL(signalNewTag(const TQString &, unsigned)), + this, TQ_SLOT(slotAddItem(const TQString &, unsigned))); + connect(CollectionList::instance(), TQ_SIGNAL(signalRemovedTag(const TQString &, unsigned)), + this, TQ_SLOT(slotRemoveItem(const TQString &, unsigned))); - TQTimer::singleShot(0, object(), TQT_SLOT(slotScanFolders())); + TQTimer::singleShot(0, object(), TQ_SLOT(slotScanFolders())); enableDirWatch(true); // Auto-save playlists after 10 minutes - TQTimer::singleShot(600000, this, TQT_SLOT(slotSavePlaylists())); + TQTimer::singleShot(600000, this, TQ_SLOT(slotSavePlaylists())); m_showTimer = new TQTimer(this); - connect(m_showTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotShowDropTarget())); + connect(m_showTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotShowDropTarget())); } PlaylistBox::~PlaylistBox() @@ -232,8 +232,8 @@ void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName) void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName, Item *parentItem) { - connect(playlist, TQT_SIGNAL(signalPlaylistItemsDropped(Playlist *)), - TQT_SLOT(slotPlaylistItemsDropped(Playlist *))); + connect(playlist, TQ_SIGNAL(signalPlaylistItemsDropped(Playlist *)), + TQ_SLOT(slotPlaylistItemsDropped(Playlist *))); PlaylistCollection::setupPlaylist(playlist, iconName); @@ -375,7 +375,7 @@ void PlaylistBox::slotSavePlaylists() Cache::savePlaylists(l); CoverManager::saveCovers(); - TQTimer::singleShot(600000, this, TQT_SLOT(slotSavePlaylists())); + TQTimer::singleShot(600000, this, TQ_SLOT(slotSavePlaylists())); } void PlaylistBox::slotShowDropTarget() @@ -524,14 +524,14 @@ void PlaylistBox::contentsDragLeaveEvent(TQDragLeaveEvent *e) void PlaylistBox::contentsMousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) m_doingMultiSelect = true; TDEListView::contentsMousePressEvent(e); } void PlaylistBox::contentsMouseReleaseEvent(TQMouseEvent *e) { - if(e->button() == Qt::LeftButton) { + if(e->button() == TQt::LeftButton) { m_doingMultiSelect = false; slotPlaylistChanged(); } @@ -770,11 +770,11 @@ void PlaylistBox::Item::init() list->addNameToDict(m_text); if(m_playlist) { - connect(m_playlist, TQT_SIGNAL(signalNameChanged(const TQString &)), - this, TQT_SLOT(slotSetName(const TQString &))); - connect(m_playlist, TQT_SIGNAL(destroyed()), this, TQT_SLOT(deleteLater())); - connect(m_playlist, TQT_SIGNAL(signalEnableDirWatch(bool)), - list->object(), TQT_SLOT(slotEnableDirWatch(bool))); + connect(m_playlist, TQ_SIGNAL(signalNameChanged(const TQString &)), + this, TQ_SLOT(slotSetName(const TQString &))); + connect(m_playlist, TQ_SIGNAL(destroyed()), this, TQ_SLOT(deleteLater())); + connect(m_playlist, TQ_SIGNAL(signalEnableDirWatch(bool)), + list->object(), TQ_SLOT(slotEnableDirWatch(bool))); } if(m_playlist == CollectionList::instance()) { diff --git a/juk/playlistbox.h b/juk/playlistbox.h index d8169714..4bcd82f9 100644 --- a/juk/playlistbox.h +++ b/juk/playlistbox.h @@ -40,7 +40,7 @@ typedef TQValueList<Playlist *> PlaylistList; class PlaylistBox : public TDEListView, public PlaylistCollection { - Q_OBJECT + TQ_OBJECT public: @@ -141,7 +141,7 @@ class PlaylistBox::Item : public TQObject, public TDEListViewItem friend class CompactViewMode; friend class TreeViewMode; - Q_OBJECT + TQ_OBJECT // moc won't let me create private TQObject subclasses and TQt won't let me diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp index 673506d0..1d96e025 100644 --- a/juk/playlistcollection.cpp +++ b/juk/playlistcollection.cpp @@ -158,7 +158,7 @@ TQStringList PlaylistCollection::playlists() const TQObjectList *childList = m_playlistStack->queryList("Playlist"); TQObject *obj; for(obj = childList->first(); obj; obj = childList->next()) { - Playlist *p = static_cast<Playlist *>(TQT_TQWIDGET(obj)); + Playlist *p = static_cast<Playlist *>(obj); l.append(p->name()); } @@ -670,8 +670,8 @@ void PlaylistCollection::setupPlaylist(Playlist *playlist, const TQString &) if(!playlist->name().isNull()) m_playlistNames.insert(playlist->name()); - TQObject::connect(playlist, TQT_SIGNAL(selectionChanged()), - object(), TQT_SIGNAL(signalSelectedItemsChanged())); + TQObject::connect(playlist, TQ_SIGNAL(selectionChanged()), + object(), TQ_SIGNAL(signalSelectedItemsChanged())); } bool PlaylistCollection::importPlaylists() const @@ -706,16 +706,16 @@ void PlaylistCollection::clearShowMore(bool raisePlaylist) void PlaylistCollection::enableDirWatch(bool enable) { - TQObject *collection = TQT_TQOBJECT(CollectionList::instance()); + TQObject *collection = CollectionList::instance(); m_dirLister.disconnect(object()); if(enable) { - TQObject::connect(&m_dirLister, TQT_SIGNAL(newItems(const KFileItemList &)), - object(), TQT_SLOT(slotNewItems(const KFileItemList &))); - TQObject::connect(&m_dirLister, TQT_SIGNAL(refreshItems(const KFileItemList &)), - collection, TQT_SLOT(slotRefreshItems(const KFileItemList &))); - TQObject::connect(&m_dirLister, TQT_SIGNAL(deleteItem(KFileItem *)), - collection, TQT_SLOT(slotDeleteItem(KFileItem *))); + TQObject::connect(&m_dirLister, TQ_SIGNAL(newItems(const KFileItemList &)), + object(), TQ_SLOT(slotNewItems(const KFileItemList &))); + TQObject::connect(&m_dirLister, TQ_SIGNAL(refreshItems(const KFileItemList &)), + collection, TQ_SLOT(slotRefreshItems(const KFileItemList &))); + TQObject::connect(&m_dirLister, TQ_SIGNAL(deleteItem(KFileItem *)), + collection, TQ_SLOT(slotDeleteItem(KFileItem *))); } } @@ -789,7 +789,7 @@ Playlist *PlaylistCollection::playlistByName(const TQString &name) const TQObject *obj; for(obj = l->first(); obj; obj = l->next()) { - Playlist *p = static_cast<Playlist*>(TQT_TQWIDGET(obj)); + Playlist *p = static_cast<Playlist*>(obj); if(p->name() == name) { list = p; break; @@ -842,11 +842,11 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) menu = new TDEActionMenu(i18n("&New"), "document-new", actions(), "file_new"); - menu->insert(createAction(i18n("&Empty Playlist..."), TQT_SLOT(slotCreatePlaylist()), + menu->insert(createAction(i18n("&Empty Playlist..."), TQ_SLOT(slotCreatePlaylist()), "newPlaylist", "window-new", "CTRL+n")); - menu->insert(createAction(i18n("&Search Playlist..."), TQT_SLOT(slotCreateSearchPlaylist()), + menu->insert(createAction(i18n("&Search Playlist..."), TQ_SLOT(slotCreateSearchPlaylist()), "newSearchPlaylist", "edit-find", "CTRL+f")); - menu->insert(createAction(i18n("Playlist From &Folder..."), TQT_SLOT(slotCreateFolderPlaylist()), + menu->insert(createAction(i18n("Playlist From &Folder..."), TQ_SLOT(slotCreateFolderPlaylist()), "newDirectoryPlaylist", "document-open", "CTRL+d")); // Guess tag info menu @@ -855,47 +855,47 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) menu = new TDEActionMenu(i18n("&Guess Tag Information"), TQString(), actions(), "guessTag"); menu->setIconSet(SmallIconSet("wizard")); - menu->insert(createAction(i18n("From &File Name"), TQT_SLOT(slotGuessTagFromFile()), + menu->insert(createAction(i18n("From &File Name"), TQ_SLOT(slotGuessTagFromFile()), "guessTagFile", "fileimport", "CTRL+g")); - menu->insert(createAction(i18n("From &Internet"), TQT_SLOT(slotGuessTagFromInternet()), + menu->insert(createAction(i18n("From &Internet"), TQ_SLOT(slotGuessTagFromInternet()), "guessTagInternet", "connect_established", "CTRL+i")); #else - createAction(i18n("Guess Tag Information From &File Name"), TQT_SLOT(slotGuessTagFromFile()), + createAction(i18n("Guess Tag Information From &File Name"), TQ_SLOT(slotGuessTagFromFile()), "guessTag", "fileimport", "CTRL+f"); #endif - createAction(i18n("Play First Track"),TQT_SLOT(slotPlayFirst()), "playFirst"); - createAction(i18n("Play Next Album"), TQT_SLOT(slotPlayNextAlbum()), "forwardAlbum", "next"); + createAction(i18n("Play First Track"),TQ_SLOT(slotPlayFirst()), "playFirst"); + createAction(i18n("Play Next Album"), TQ_SLOT(slotPlayNextAlbum()), "forwardAlbum", "next"); - createAction(i18n("Open..."), TQT_SLOT(slotOpen()), "file_open", "document-open", "CTRL+o"); - createAction(i18n("Add &Folder..."), TQT_SLOT(slotAddFolder()), "openDirectory", "document-open"); - createAction(i18n("&Rename..."), TQT_SLOT(slotRename()), "renamePlaylist", "lineedit"); - createAction(i18n("D&uplicate..."), TQT_SLOT(slotDuplicate()), "duplicatePlaylist", "edit-copy"); - createAction(i18n("Save"), TQT_SLOT(slotSave()), "file_save", "document-save", "CTRL+s"); - createAction(i18n("Save As..."), TQT_SLOT(slotSaveAs()), "file_save_as", "document-save-as"); - createAction(i18n("R&emove"), TQT_SLOT(slotRemove()), "deleteItemPlaylist", "edittrash"); - createAction(i18n("Reload"), TQT_SLOT(slotReload()), "reloadPlaylist", "reload"); - createAction(i18n("Edit Search..."), TQT_SLOT(slotEditSearch()), "editSearch", "edit-clear"); + createAction(i18n("Open..."), TQ_SLOT(slotOpen()), "file_open", "document-open", "CTRL+o"); + createAction(i18n("Add &Folder..."), TQ_SLOT(slotAddFolder()), "openDirectory", "document-open"); + createAction(i18n("&Rename..."), TQ_SLOT(slotRename()), "renamePlaylist", "lineedit"); + createAction(i18n("D&uplicate..."), TQ_SLOT(slotDuplicate()), "duplicatePlaylist", "edit-copy"); + createAction(i18n("Save"), TQ_SLOT(slotSave()), "file_save", "document-save", "CTRL+s"); + createAction(i18n("Save As..."), TQ_SLOT(slotSaveAs()), "file_save_as", "document-save-as"); + createAction(i18n("R&emove"), TQ_SLOT(slotRemove()), "deleteItemPlaylist", "edittrash"); + createAction(i18n("Reload"), TQ_SLOT(slotReload()), "reloadPlaylist", "reload"); + createAction(i18n("Edit Search..."), TQ_SLOT(slotEditSearch()), "editSearch", "edit-clear"); - createAction(i18n("&Delete"), TQT_SLOT(slotRemoveItems()), "removeItem", "edit-delete"); - createAction(i18n("Refresh"), TQT_SLOT(slotRefreshItems()), "refresh", "reload"); - createAction(i18n("&Rename File"), TQT_SLOT(slotRenameItems()), "renameFile", "document-save-as", "CTRL+r"); + createAction(i18n("&Delete"), TQ_SLOT(slotRemoveItems()), "removeItem", "edit-delete"); + createAction(i18n("Refresh"), TQ_SLOT(slotRefreshItems()), "refresh", "reload"); + createAction(i18n("&Rename File"), TQ_SLOT(slotRenameItems()), "renameFile", "document-save-as", "CTRL+r"); menu = new TDEActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager"); menu->setIconSet(SmallIconSet("image-x-generic")); menu->insert(createAction(i18n("&View Cover"), - TQT_SLOT(slotViewCovers()), "viewCover", "viewmag")); + TQ_SLOT(slotViewCovers()), "viewCover", "viewmag")); menu->insert(createAction(i18n("Get Cover From &File..."), - TQT_SLOT(slotAddLocalCover()), "addCover", "fileimport", "CTRL+SHIFT+f")); + TQ_SLOT(slotAddLocalCover()), "addCover", "fileimport", "CTRL+SHIFT+f")); // Do not rename googleCover for backward compatibility menu->insert(createAction(i18n("Get Cover From &Internet..."), - TQT_SLOT(slotAddInternetCover()), "googleCover", "connect_established", "CTRL+SHIFT+g")); + TQ_SLOT(slotAddInternetCover()), "googleCover", "connect_established", "CTRL+SHIFT+g")); menu->insert(createAction(i18n("&Delete Cover"), - TQT_SLOT(slotRemoveCovers()), "removeCover", "edit-delete")); + TQ_SLOT(slotRemoveCovers()), "removeCover", "edit-delete")); menu->insert(createAction(i18n("Show Cover &Manager"), - TQT_SLOT(slotShowCoverManager()), "showCoverManager")); + TQ_SLOT(slotShowCoverManager()), "showCoverManager")); TDEToggleAction *historyAction = new TDEToggleAction(i18n("Show &History"), "history", 0, actions(), "showHistory"); @@ -905,10 +905,10 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection) new TDEToggleAction(i18n("Show &Play Queue"), "today", 0, actions(), "showUpcoming"); upcomingAction->setCheckedState(i18n("Hide &Play Queue")); - connect(action<TDEToggleAction>("showHistory"), TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSetHistoryPlaylistEnabled(bool))); - connect(action<TDEToggleAction>("showUpcoming"), TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSetUpcomingPlaylistEnabled(bool))); + connect(action<TDEToggleAction>("showHistory"), TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSetHistoryPlaylistEnabled(bool))); + connect(action<TDEToggleAction>("showUpcoming"), TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSetUpcomingPlaylistEnabled(bool))); } TDEAction *PlaylistCollection::ActionHandler::createAction(const TQString &text, @@ -925,5 +925,3 @@ TDEAction *PlaylistCollection::ActionHandler::createAction(const TQString &text, #undef widget #include "playlistcollection.moc" - -// vim: set et sw=4: diff --git a/juk/playlistcollection.h b/juk/playlistcollection.h index e5bf42e0..997972dc 100644 --- a/juk/playlistcollection.h +++ b/juk/playlistcollection.h @@ -209,7 +209,7 @@ private: class PlaylistCollection::ActionHandler : public TQObject { - Q_OBJECT + TQ_OBJECT public: ActionHandler(PlaylistCollection *collection); diff --git a/juk/playlistexporter.h b/juk/playlistexporter.h index 39f13605..2619e9cd 100644 --- a/juk/playlistexporter.h +++ b/juk/playlistexporter.h @@ -45,5 +45,3 @@ public: }; #endif /* PLAYLISTEXPORTER_H */ - -// vim: set et ts=4 sw=4: diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp index 08cecf18..d1eff928 100644 --- a/juk/playlistsplitter.cpp +++ b/juk/playlistsplitter.cpp @@ -35,7 +35,7 @@ using namespace ActionCollection; //////////////////////////////////////////////////////////////////////////////// PlaylistSplitter::PlaylistSplitter(TQWidget *parent, const char *name) : - TQSplitter(Qt::Horizontal, parent, name), + TQSplitter(TQt::Horizontal, parent, name), m_newVisible(0), m_playlistBox(0), m_searchWidget(0), @@ -121,7 +121,7 @@ void PlaylistSplitter::setupActions() new TDEToggleAction(i18n("Show &Search Bar"), "filefind", 0, ActionCollection::actions(), "showSearch"); showSearch->setCheckedState(i18n("Hide &Search Bar")); - new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", TQT_TQOBJECT(this), TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch"); + new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", this, TQ_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch"); } void PlaylistSplitter::setupLayout() @@ -130,7 +130,7 @@ void PlaylistSplitter::setupLayout() // Create a splitter to go between the playlists and the editor. - TQSplitter *editorSplitter = new TQSplitter(Qt::Vertical, this, "editorSplitter"); + TQSplitter *editorSplitter = new TQSplitter(TQt::Vertical, this, "editorSplitter"); // Create the playlist and the editor. @@ -140,7 +140,7 @@ void PlaylistSplitter::setupLayout() m_playlistStack = new TQWidgetStack(top, "playlistStack"); m_playlistStack->installEventFilter(this); - connect(m_playlistStack, TQT_SIGNAL(aboutToShow(TQWidget *)), this, TQT_SLOT(slotPlaylistChanged(TQWidget *))); + connect(m_playlistStack, TQ_SIGNAL(aboutToShow(TQWidget *)), this, TQ_SLOT(slotPlaylistChanged(TQWidget *))); m_editor = new TagEditor(editorSplitter, "tagEditor"); @@ -152,31 +152,31 @@ void PlaylistSplitter::setupLayout() m_playlistBox = new PlaylistBox(this, m_playlistStack, "playlistBox"); - connect(m_playlistBox->object(), TQT_SIGNAL(signalSelectedItemsChanged()), - this, TQT_SLOT(slotPlaylistSelectionChanged())); - connect(m_playlistBox, TQT_SIGNAL(signalPlaylistDestroyed(Playlist *)), - m_editor, TQT_SLOT(slotPlaylistDestroyed(Playlist *))); + connect(m_playlistBox->object(), TQ_SIGNAL(signalSelectedItemsChanged()), + this, TQ_SLOT(slotPlaylistSelectionChanged())); + connect(m_playlistBox, TQ_SIGNAL(signalPlaylistDestroyed(Playlist *)), + m_editor, TQ_SLOT(slotPlaylistDestroyed(Playlist *))); moveToFirst(m_playlistBox); - connect(CollectionList::instance(), TQT_SIGNAL(signalCollectionChanged()), - m_editor, TQT_SLOT(slotUpdateCollection())); + connect(CollectionList::instance(), TQ_SIGNAL(signalCollectionChanged()), + m_editor, TQ_SLOT(slotUpdateCollection())); NowPlaying *nowPlaying = new NowPlaying(top, m_playlistBox); // Create the search widget -- this must be done after the CollectionList is created. m_searchWidget = new SearchWidget(top, "searchWidget"); - connect(m_searchWidget, TQT_SIGNAL(signalQueryChanged()), - this, TQT_SLOT(slotShowSearchResults())); - connect(m_searchWidget, TQT_SIGNAL(signalDownPressed()), - this, TQT_SLOT(slotFocusCurrentPlaylist())); - connect(m_searchWidget, TQT_SIGNAL(signalAdvancedSearchClicked()), - m_playlistBox->object(), TQT_SLOT(slotCreateSearchPlaylist())); - connect(m_searchWidget, TQT_SIGNAL(signalShown(bool)), - m_playlistBox->object(), TQT_SLOT(slotSetSearchEnabled(bool))); - connect(action<TDEToggleAction>("showSearch"), TQT_SIGNAL(toggled(bool)), - m_searchWidget, TQT_SLOT(setEnabled(bool))); + connect(m_searchWidget, TQ_SIGNAL(signalQueryChanged()), + this, TQ_SLOT(slotShowSearchResults())); + connect(m_searchWidget, TQ_SIGNAL(signalDownPressed()), + this, TQ_SLOT(slotFocusCurrentPlaylist())); + connect(m_searchWidget, TQ_SIGNAL(signalAdvancedSearchClicked()), + m_playlistBox->object(), TQ_SLOT(slotCreateSearchPlaylist())); + connect(m_searchWidget, TQ_SIGNAL(signalShown(bool)), + m_playlistBox->object(), TQ_SLOT(slotSetSearchEnabled(bool))); + connect(action<TDEToggleAction>("showSearch"), TQ_SIGNAL(toggled(bool)), + m_searchWidget, TQ_SLOT(setEnabled(bool))); topLayout->addWidget(nowPlaying); topLayout->addWidget(m_searchWidget); diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h index 8c6216ac..914bad4b 100644 --- a/juk/playlistsplitter.h +++ b/juk/playlistsplitter.h @@ -40,7 +40,7 @@ class TagEditor; class PlaylistSplitter : public TQSplitter { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/searchplaylist.h b/juk/searchplaylist.h index c40748c3..8bfbc216 100644 --- a/juk/searchplaylist.h +++ b/juk/searchplaylist.h @@ -20,7 +20,7 @@ class SearchPlaylist : public DynamicPlaylist { - Q_OBJECT + TQ_OBJECT public: SearchPlaylist(PlaylistCollection *collection, diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp index cb7d85f4..de6a1aa8 100644 --- a/juk/searchwidget.cpp +++ b/juk/searchwidget.cpp @@ -48,24 +48,24 @@ SearchLine::SearchLine(TQWidget *parent, bool simple, const char *name) : if(!m_simple) { m_searchFieldsBox = new KComboBox(this, "searchFields"); - connect(m_searchFieldsBox, TQT_SIGNAL(activated(int)), - this, TQT_SIGNAL(signalQueryChanged())); + connect(m_searchFieldsBox, TQ_SIGNAL(activated(int)), + this, TQ_SIGNAL(signalQueryChanged())); } m_lineEdit = new KLineEdit(this, "searchLineEdit"); m_lineEdit->installEventFilter(this); - connect(m_lineEdit, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SIGNAL(signalQueryChanged())); - connect(m_lineEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotActivate())); + connect(m_lineEdit, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SIGNAL(signalQueryChanged())); + connect(m_lineEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotActivate())); if(!m_simple) { m_caseSensitive = new KComboBox(this); m_caseSensitive->insertItem(i18n("Normal Matching"), 0); m_caseSensitive->insertItem(i18n("Case Sensitive"), 1); m_caseSensitive->insertItem(i18n("Pattern Matching"), 2); - connect(m_caseSensitive, TQT_SIGNAL(activated(int)), - this, TQT_SIGNAL(signalQueryChanged())); + connect(m_caseSensitive, TQ_SIGNAL(activated(int)), + this, TQ_SIGNAL(signalQueryChanged())); } else m_caseSensitive = 0; @@ -136,10 +136,10 @@ void SearchLine::setFocus() bool SearchLine::eventFilter(TQObject *watched, TQEvent *e) { - if(TQT_BASE_OBJECT(watched) != TQT_BASE_OBJECT(m_lineEdit) || e->type() != TQEvent::KeyPress) + if(watched != m_lineEdit || e->type() != TQEvent::KeyPress) return TQHBox::eventFilter(watched, e); - TQKeyEvent *key = TQT_TQKEYEVENT(e); + TQKeyEvent *key = static_cast<TQKeyEvent*>(e); if(key->key() == TQt::Key_Down) emit signalDownPressed(); @@ -273,9 +273,9 @@ void SearchWidget::setupLayout() label->setBuddy(m_searchLine); - connect(m_searchLine, TQT_SIGNAL(signalQueryChanged()), this, TQT_SIGNAL(signalQueryChanged())); - connect(m_searchLine, TQT_SIGNAL(signalDownPressed()), this, TQT_SIGNAL(signalDownPressed())); - connect(clearSearchButton, TQT_SIGNAL(pressed()), m_searchLine, TQT_SLOT(clear())); + connect(m_searchLine, TQ_SIGNAL(signalQueryChanged()), this, TQ_SIGNAL(signalQueryChanged())); + connect(m_searchLine, TQ_SIGNAL(signalDownPressed()), this, TQ_SIGNAL(signalDownPressed())); + connect(clearSearchButton, TQ_SIGNAL(pressed()), m_searchLine, TQ_SLOT(clear())); setStretchableWidget(m_searchLine); // I've decided that I think this is ugly, for now. @@ -285,7 +285,7 @@ void SearchWidget::setupLayout() b->setTextLabel(i18n("Advanced Search"), true); b->setIconSet(SmallIconSet("wizard")); - connect(b, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(signalAdvancedSearchClicked())); + connect(b, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(signalAdvancedSearchClicked())); */ } diff --git a/juk/searchwidget.h b/juk/searchwidget.h index 47354dae..a1d0a306 100644 --- a/juk/searchwidget.h +++ b/juk/searchwidget.h @@ -34,7 +34,7 @@ class Playlist; class SearchLine : public TQHBox { - Q_OBJECT + TQ_OBJECT public: @@ -72,7 +72,7 @@ private: class SearchWidget : public TDEToolBar, public SearchIface { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp index a1357d4d..f16b21eb 100644 --- a/juk/slideraction.cpp +++ b/juk/slideraction.cpp @@ -41,19 +41,19 @@ class TrackPositionSlider : public TQSlider public: TrackPositionSlider(TQWidget *parent, const char *name) : TQSlider(parent, name) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); } protected: virtual void mousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::LeftButton) { - TQMouseEvent reverse(TQEvent::MouseButtonPress, e->pos(), Qt::MidButton, e->state()); + if(e->button() == TQt::LeftButton) { + TQMouseEvent reverse(TQEvent::MouseButtonPress, e->pos(), TQt::MidButton, e->state()); TQSlider::mousePressEvent(&reverse); emit sliderPressed(); } - else if(e->button() == Qt::MidButton) { - TQMouseEvent reverse(TQEvent::MouseButtonPress, e->pos(), Qt::LeftButton, e->state()); + else if(e->button() == TQt::MidButton) { + TQMouseEvent reverse(TQEvent::MouseButtonPress, e->pos(), TQt::LeftButton, e->state()); TQSlider::mousePressEvent(&reverse); } } @@ -63,15 +63,15 @@ protected: // VolumeSlider implementation //////////////////////////////////////////////////////////////////////////////// -VolumeSlider::VolumeSlider(Qt::Orientation o, TQWidget *parent, const char *name) : +VolumeSlider::VolumeSlider(TQt::Orientation o, TQWidget *parent, const char *name) : TQSlider(o, parent, name) { - connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int))); } void VolumeSlider::wheelEvent(TQWheelEvent *e) { - if(orientation() ==Qt::Horizontal) { + if(orientation() ==TQt::Horizontal) { TQWheelEvent transposed(e->pos(), -(e->delta()), e->state(), e->orientation()); TQSlider::wheelEvent(&transposed); } @@ -86,7 +86,7 @@ void VolumeSlider::focusInEvent(TQFocusEvent *) int VolumeSlider::volume() const { - if(orientation() ==Qt::Horizontal) + if(orientation() ==TQt::Horizontal) return value(); else return maxValue() - value(); @@ -94,13 +94,13 @@ int VolumeSlider::volume() const void VolumeSlider::setVolume(int value) { - if(orientation() ==Qt::Horizontal) + if(orientation() ==TQt::Horizontal) setValue(value); else setValue(maxValue() - value); } -void VolumeSlider::setOrientation(Qt::Orientation o) +void VolumeSlider::setOrientation(TQt::Orientation o) { if(o == orientation()) return; @@ -113,7 +113,7 @@ void VolumeSlider::setOrientation(Qt::Orientation o) void VolumeSlider::slotValueChanged(int value) { - if(orientation() ==Qt::Horizontal) + if(orientation() ==TQt::Horizontal) emit signalVolumeChanged(value); else emit signalVolumeChanged(maxValue() - value); @@ -162,11 +162,11 @@ int SliderAction::plug(TQWidget *parent, int index) addContainer(m_toolBar, id); - connect(m_toolBar, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotToolbarDestroyed())); - connect(m_toolBar, TQT_SIGNAL(orientationChanged(Qt::Orientation)), - this, TQT_SLOT(slotUpdateOrientation())); - connect(m_toolBar, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), - this, TQT_SLOT(slotUpdateOrientation())); + connect(m_toolBar, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotToolbarDestroyed())); + connect(m_toolBar, TQ_SIGNAL(orientationChanged(TQt::Orientation)), + this, TQ_SLOT(slotUpdateOrientation())); + connect(m_toolBar, TQ_SIGNAL(placeChanged(TQDockWindow::Place)), + this, TQ_SLOT(slotUpdateOrientation())); slotUpdateOrientation(); return (containerCount() - 1); @@ -205,13 +205,13 @@ void SliderAction::slotUpdateOrientation() return; if(m_toolBar->barPos() == TDEToolBar::Right || m_toolBar->barPos() == TDEToolBar::Left) { - m_trackPositionSlider->setOrientation(Qt::Vertical); - m_volumeSlider->setOrientation(Qt::Vertical); + m_trackPositionSlider->setOrientation(TQt::Vertical); + m_volumeSlider->setOrientation(TQt::Vertical); m_layout->setDirection(TQBoxLayout::TopToBottom); } else { - m_trackPositionSlider->setOrientation(Qt::Horizontal); - m_volumeSlider->setOrientation(Qt::Horizontal); + m_trackPositionSlider->setOrientation(TQt::Horizontal); + m_volumeSlider->setOrientation(TQt::Horizontal); m_layout->setDirection(TQBoxLayout::LeftToRight); } slotUpdateSize(); @@ -233,12 +233,12 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas if(toolBar) toolBar->setStretchableWidget(base); - Qt::Orientation orientation; + TQt::Orientation orientation; if(toolBar && toolBar->barPos() == TDEToolBar::Right || toolBar->barPos() == TDEToolBar::Left) - orientation =Qt::Vertical; + orientation =TQt::Vertical; else - orientation =Qt::Horizontal; + orientation =TQt::Horizontal; m_layout = new TQBoxLayout(base, TQBoxLayout::TopToBottom, 5, 5); @@ -254,8 +254,8 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas m_trackPositionSlider->setMaxValue(maxPosition); TQToolTip::add(m_trackPositionSlider, i18n("Track position")); m_layout->addWidget(m_trackPositionSlider); - connect(m_trackPositionSlider, TQT_SIGNAL(sliderPressed()), this, TQT_SLOT(slotSliderPressed())); - connect(m_trackPositionSlider, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(slotSliderReleased())); + connect(m_trackPositionSlider, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(slotSliderPressed())); + connect(m_trackPositionSlider, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(slotSliderReleased())); m_layout->addItem(new TQSpacerItem(10, 1)); @@ -269,9 +269,9 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas m_volumeSlider->setMaxValue(100); TQToolTip::add(m_volumeSlider, i18n("Volume")); m_layout->addWidget(m_volumeSlider); - connect(m_volumeSlider, TQT_SIGNAL(signalVolumeChanged(int)), TQT_SIGNAL(signalVolumeChanged(int))); - connect(m_volumeSlider, TQT_SIGNAL(sliderPressed()), this, TQT_SLOT(slotVolumeSliderPressed())); - connect(m_volumeSlider, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(slotVolumeSliderReleased())); + connect(m_volumeSlider, TQ_SIGNAL(signalVolumeChanged(int)), TQ_SIGNAL(signalVolumeChanged(int))); + connect(m_volumeSlider, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(slotVolumeSliderPressed())); + connect(m_volumeSlider, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(slotVolumeSliderReleased())); m_volumeSlider->setName("tde toolbar widget"); m_trackPositionSlider->setName("tde toolbar widget"); @@ -279,7 +279,7 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas m_layout->setStretchFactor(m_trackPositionSlider, 4); m_layout->setStretchFactor(m_volumeSlider, 1); - connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotUpdateSize())); + connect(parent, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotUpdateSize())); return base; } @@ -353,5 +353,3 @@ void SliderAction::slotToolbarDestroyed() } #include "slideraction.moc" - -// vim: set et sw=4 ts=4: diff --git a/juk/slideraction.h b/juk/slideraction.h index 1c38c0a5..7bdc556f 100644 --- a/juk/slideraction.h +++ b/juk/slideraction.h @@ -24,16 +24,16 @@ class TQDockWindow; class VolumeSlider : public TQSlider { - Q_OBJECT + TQ_OBJECT public: - VolumeSlider(Qt::Orientation o, TQWidget *parent, const char *name); + VolumeSlider(TQt::Orientation o, TQWidget *parent, const char *name); int volume() const; void setVolume(int value); - void setOrientation(Qt::Orientation o); + void setOrientation(TQt::Orientation o); signals: void signalVolumeChanged(int value); @@ -48,7 +48,7 @@ private slots: class SliderAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp index 4dcf5163..1aea48b5 100644 --- a/juk/statuslabel.cpp +++ b/juk/statuslabel.cpp @@ -85,7 +85,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch jumpButton->setFlat(true); TQToolTip::add(jumpButton, i18n("Jump to the currently playing item")); - connect(jumpButton, TQT_SIGNAL(clicked()), action("showPlaying"), TQT_SLOT(activate())); + connect(jumpButton, TQ_SIGNAL(clicked()), action("showPlaying"), TQ_SLOT(activate())); installEventFilter(this); @@ -175,11 +175,11 @@ bool StatusLabel::eventFilter(TQObject *o, TQEvent *e) if(!o || !e) return false; - TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT(e); + TQMouseEvent *mouseEvent = static_cast<TQMouseEvent*>(e); if(e->type() == TQEvent::MouseButtonRelease && - mouseEvent->button() == Qt::LeftButton) + mouseEvent->button() == TQt::LeftButton) { - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_itemTimeLabel)) { + if(o == m_itemTimeLabel) { m_showTimeRemaining = !m_showTimeRemaining; updateTime(); } diff --git a/juk/statuslabel.h b/juk/statuslabel.h index a5f0bbff..9d9657a5 100644 --- a/juk/statuslabel.h +++ b/juk/statuslabel.h @@ -27,7 +27,7 @@ class FileHandle; class StatusLabel : public TQHBox, public PlaylistObserver { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index c2e0f686..2e46272e 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -97,7 +97,7 @@ PassiveInfo::PassiveInfo(TQWidget *parent, const char *name) : // that I'll just handle the timeout myself, thank you very much. KPassivePopup::setTimeout(0); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerExpired())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerExpired())); } void PassiveInfo::setTimeout(int delay) @@ -162,14 +162,14 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, // Just create this here so that it show up in the DCOP interface and the key // bindings dialog. - new TDEAction(i18n("Redisplay Popup"), TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT(slotPlay()), ActionCollection::actions(), "showPopup"); + new TDEAction(i18n("Redisplay Popup"), TDEShortcut(), this, + TQ_SLOT(slotPlay()), ActionCollection::actions(), "showPopup"); TDEPopupMenu *cm = contextMenu(); - connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotPlay())); - connect(PlayerManager::instance(), TQT_SIGNAL(signalPause()), this, TQT_SLOT(slotPause())); - connect(PlayerManager::instance(), TQT_SIGNAL(signalStop()), this, TQT_SLOT(slotStop())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotPlay())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalPause()), this, TQ_SLOT(slotPause())); + connect(PlayerManager::instance(), TQ_SIGNAL(signalStop()), this, TQ_SLOT(slotStop())); action("play")->plug(cm); action("pause")->plug(cm); @@ -181,7 +181,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, // Pity the actionCollection doesn't keep track of what sub-menus it has. - TDEActionMenu *menu = new TDEActionMenu(i18n("&Random Play"), TQT_TQOBJECT(this)); + TDEActionMenu *menu = new TDEActionMenu(i18n("&Random Play"), this); menu->insert(action("disableRandomPlay")); menu->insert(action("randomPlay")); menu->insert(action("albumRandomPlay")); @@ -190,7 +190,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, action("togglePopups")->plug(cm); m_fadeTimer = new TQTimer(this, "systrayFadeTimer"); - connect(m_fadeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNextStep())); + connect(m_fadeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNextStep())); if(PlayerManager::instance()->playing()) slotPlay(); @@ -278,8 +278,8 @@ void SystemTray::slotFadeOut() m_startColor = m_labels[0]->textColor(); m_endColor = m_labels[0]->backgroundColor(); - connect(this, TQT_SIGNAL(fadeDone()), m_popup, TQT_SLOT(hide())); - connect(m_popup, TQT_SIGNAL(mouseEntered()), this, TQT_SLOT(slotMouseInPopup())); + connect(this, TQ_SIGNAL(fadeDone()), m_popup, TQ_SLOT(hide())); + connect(m_popup, TQ_SIGNAL(mouseEntered()), this, TQ_SLOT(slotMouseInPopup())); m_fadeTimer->start(1500 / STEPS); } @@ -289,7 +289,7 @@ void SystemTray::slotFadeOut() void SystemTray::slotMouseInPopup() { m_endColor = m_labels[0]->textColor(); - disconnect(TQT_SIGNAL(fadeDone())); + disconnect(TQ_SIGNAL(fadeDone())); m_step = STEPS - 1; // Simulate end of fade to solid text slotNextStep(); @@ -360,8 +360,8 @@ void SystemTray::createPopup() m_step = 0; m_popup = new PassiveInfo(this); - connect(m_popup, TQT_SIGNAL(destroyed()), TQT_SLOT(slotPopupDestroyed())); - connect(m_popup, TQT_SIGNAL(timeExpired()), TQT_SLOT(slotFadeOut())); + connect(m_popup, TQ_SIGNAL(destroyed()), TQ_SLOT(slotPopupDestroyed())); + connect(m_popup, TQ_SIGNAL(timeExpired()), TQ_SLOT(slotFadeOut())); TQHBox *box = new TQHBox(m_popup, "popupMainLayout"); box->setSpacing(15); // Add space between text and buttons @@ -448,11 +448,11 @@ void SystemTray::createButtonBox(TQWidget *parent) TQPushButton *forwardButton = new TQPushButton(m_forwardPix, 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotForward())); + connect(forwardButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotForward())); TQPushButton *backButton = new TQPushButton(m_backPix, 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotBack())); + connect(backButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotBack())); } /** @@ -491,7 +491,7 @@ void SystemTray::addCoverButton(TQWidget *parent, const TQPixmap &cover) coverButton->setFixedSize(cover.size()); coverButton->setFlat(true); - connect(coverButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPopupLargeCover())); + connect(coverButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPopupLargeCover())); } TQColor SystemTray::interpolateColor(int step, int steps) @@ -540,7 +540,7 @@ void SystemTray::setToolTip(const TQString &tip, const TQPixmap &cover) void SystemTray::wheelEvent(TQWheelEvent *e) { - if(e->orientation() ==Qt::Horizontal) + if(e->orientation() ==TQt::Horizontal) return; // I already know the type here, but this file doesn't (and I don't want it @@ -571,13 +571,13 @@ void SystemTray::wheelEvent(TQWheelEvent *e) void SystemTray::mousePressEvent(TQMouseEvent *e) { switch(e->button()) { - case Qt::LeftButton: - case Qt::RightButton: + case TQt::LeftButton: + case TQt::RightButton: default: KSystemTray::mousePressEvent(e); break; - case Qt::MidButton: - if(!TQT_TQRECT_OBJECT(rect()).contains(e->pos())) + case TQt::MidButton: + if(!rect().contains(e->pos())) return; if(action("pause")->isEnabled()) action("pause")->activate(); @@ -635,5 +635,3 @@ static bool copyImage(TQImage &dest, TQImage &src, int x, int y) #include "systemtray.moc" - -// vim: et sw=4 ts=8 diff --git a/juk/systemtray.h b/juk/systemtray.h index 7a8994cc..469cf9ee 100644 --- a/juk/systemtray.h +++ b/juk/systemtray.h @@ -37,7 +37,7 @@ class FileHandle; */ class PassiveInfo : public KPassivePopup { - Q_OBJECT + TQ_OBJECT public: PassiveInfo(TQWidget *parent = 0, const char *name = 0); @@ -64,7 +64,7 @@ private: class SystemTray : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/tag.cpp b/juk/tag.cpp index 08a717ea..c5290610 100644 --- a/juk/tag.cpp +++ b/juk/tag.cpp @@ -41,6 +41,8 @@ #include "mediafiles.h" #include "stringshare.h" +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) + //////////////////////////////////////////////////////////////////////////////// // public members //////////////////////////////////////////////////////////////////////////////// @@ -227,11 +229,11 @@ Tag::Tag(const TQString &fileName, bool) : void Tag::setup(TagLib::File *file) { - m_title = TQString(TStringToQString(file->tag()->title())).stripWhiteSpace(); - m_artist = TQString(TStringToQString(file->tag()->artist())).stripWhiteSpace(); - m_album = TQString(TStringToQString(file->tag()->album())).stripWhiteSpace(); - m_genre = TQString(TStringToQString(file->tag()->genre())).stripWhiteSpace(); - m_comment = TQString(TStringToQString(file->tag()->comment())).stripWhiteSpace(); + m_title = TStringToTQString(file->tag()->title()).stripWhiteSpace(); + m_artist = TStringToTQString(file->tag()->artist()).stripWhiteSpace(); + m_album = TStringToTQString(file->tag()->album()).stripWhiteSpace(); + m_genre = TStringToTQString(file->tag()->genre()).stripWhiteSpace(); + m_comment = TStringToTQString(file->tag()->comment()).stripWhiteSpace(); m_track = file->tag()->track(); m_year = file->tag()->year(); diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index e4073d24..ed1cdca8 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -44,6 +44,8 @@ #undef KeyRelease +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) + using namespace ActionCollection; class FileNameValidator : public TQValidator @@ -172,8 +174,8 @@ void TagEditor::slotSetItems(const PlaylistItemList &list) saveChangesPrompt(); if(m_currentPlaylist) { - disconnect(m_currentPlaylist, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)), - this, TQT_SLOT(slotItemRemoved(PlaylistItem *))); + disconnect(m_currentPlaylist, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)), + this, TQ_SLOT(slotItemRemoved(PlaylistItem *))); } if(hadPlaylist && !m_currentPlaylist || !itemPlaylist) { @@ -189,9 +191,9 @@ void TagEditor::slotSetItems(const PlaylistItemList &list) } if(m_currentPlaylist) { - connect(m_currentPlaylist, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)), - this, TQT_SLOT(slotItemRemoved(PlaylistItem *))); - connect(m_currentPlaylist, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotPlaylistRemoved())); + connect(m_currentPlaylist, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)), + this, TQ_SLOT(slotItemRemoved(PlaylistItem *))); + connect(m_currentPlaylist, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotPlaylistRemoved())); } if(isVisible()) @@ -403,7 +405,7 @@ void TagEditor::updateCollection() TagLib::StringList genres = TagLib::ID3v1::genreList(); for(TagLib::StringList::ConstIterator it = genres.begin(); it != genres.end(); ++it) - genreHash.insert(TStringToQString((*it))); + genreHash.insert(TStringToTQString((*it))); m_genreList = genreHash.values(); m_genreList.sort(); @@ -436,7 +438,7 @@ void TagEditor::readConfig() TagLib::StringList genres = TagLib::ID3v1::genreList(); for(TagLib::StringList::ConstIterator it = genres.begin(); it != genres.end(); ++it) - m_genreList.append(TStringToQString((*it))); + m_genreList.append(TStringToTQString((*it))); m_genreList.sort(); m_genreBox->clear(); @@ -471,9 +473,9 @@ void TagEditor::setupActions() { TDEToggleAction *show = new TDEToggleAction(i18n("Show &Tag Editor"), "edit", 0, ActionCollection::actions(), "showEditor"); show->setCheckedState(i18n("Hide &Tag Editor")); - connect(show, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShown(bool))); + connect(show, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShown(bool))); - new TDEAction(i18n("&Save"), "document-save", "CTRL+t", TQT_TQOBJECT(this), TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem"); + new TDEAction(i18n("&Save"), "document-save", "CTRL+t", this, TQ_SLOT(slotSave()), ActionCollection::actions(), "saveItem"); } void TagEditor::setupLayout() @@ -524,7 +526,7 @@ void TagEditor::setupLayout() horizontalSpacing); m_fileNameBox = new KLineEdit(this, "fileNameBox"); - m_fileNameBox->setValidator(new FileNameValidator(TQT_TQOBJECT(m_fileNameBox))); + m_fileNameBox->setValidator(new FileNameValidator(m_fileNameBox)); TQLabel *fileNameIcon = new TQLabel(this); fileNameIcon->setPixmap(SmallIcon("audio-x-generic")); @@ -586,32 +588,32 @@ void TagEditor::setupLayout() } - connect(m_artistNameBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_artistNameBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_trackNameBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_trackNameBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_albumNameBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_albumNameBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_genreBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotDataChanged())); + connect(m_genreBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotDataChanged())); - connect(m_genreBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_genreBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_fileNameBox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotDataChanged())); + connect(m_fileNameBox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotDataChanged())); - connect(m_yearSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotDataChanged())); + connect(m_yearSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotDataChanged())); - connect(m_trackSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotDataChanged())); + connect(m_trackSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotDataChanged())); - connect(m_commentBox, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(slotDataChanged())); + connect(m_commentBox, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(slotDataChanged())); } void TagEditor::save(const PlaylistItemList &list) @@ -750,7 +752,7 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layou enableBox->hide(); - connect(enableBox, TQT_SIGNAL(toggled(bool)), item, TQT_SLOT(setEnabled(bool))); + connect(enableBox, TQ_SIGNAL(toggled(bool)), item, TQ_SLOT(setEnabled(bool))); m_enableBoxes.insert(item, enableBox); } @@ -766,8 +768,8 @@ void TagEditor::showEvent(TQShowEvent *e) bool TagEditor::eventFilter(TQObject *watched, TQEvent *e) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); - if(watched->inherits(TQSPINBOX_OBJECT_NAME_STRING) && e->type() == TQEvent::KeyRelease && ke->state() == 0) + TQKeyEvent *ke = static_cast<TQKeyEvent*>(e); + if(watched->inherits("TQSpinBox") && e->type() == TQEvent::KeyRelease && ke->state() == 0) slotDataChanged(); return false; diff --git a/juk/tageditor.h b/juk/tageditor.h index ee62c7b2..14cc9c67 100644 --- a/juk/tageditor.h +++ b/juk/tageditor.h @@ -36,7 +36,7 @@ class CollectionObserver; class TagEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/tagguesser.cpp b/juk/tagguesser.cpp index 8d256363..146f2ecb 100644 --- a/juk/tagguesser.cpp +++ b/juk/tagguesser.cpp @@ -214,5 +214,3 @@ TQString TagGuesser::capitalizeWords(const TQString &s) return result; } - -// vim:ts=4:sw=4:noet diff --git a/juk/tagguesser.h b/juk/tagguesser.h index 136ae742..13752e9c 100644 --- a/juk/tagguesser.h +++ b/juk/tagguesser.h @@ -71,4 +71,3 @@ class TagGuesser }; #endif // TAGGUESSER_H -// vim:ts=4:sw=4:noet diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp index b5ceaac9..201e2215 100644 --- a/juk/tagguesserconfigdlg.cpp +++ b/juk/tagguesserconfigdlg.cpp @@ -41,15 +41,15 @@ TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *parent, const char *name) item->moveItem(m_child->lvSchemes->lastItem()); } - connect(m_child->lvSchemes, TQT_SIGNAL(currentChanged(TQListViewItem *)), - this, TQT_SLOT(slotCurrentChanged(TQListViewItem *))); - connect(m_child->lvSchemes, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotRenameItem(TQListViewItem *, const TQPoint &, int))); - connect(m_child->bMoveUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUpClicked())); - connect(m_child->bMoveDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDownClicked())); - connect(m_child->bAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddClicked())); - connect(m_child->bModify, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotModifyClicked())); - connect(m_child->bRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveClicked())); + connect(m_child->lvSchemes, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem *))); + connect(m_child->lvSchemes, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotRenameItem(TQListViewItem *, const TQPoint &, int))); + connect(m_child->bMoveUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveUpClicked())); + connect(m_child->bMoveDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveDownClicked())); + connect(m_child->bAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddClicked())); + connect(m_child->bModify, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotModifyClicked())); + connect(m_child->bRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveClicked())); m_child->lvSchemes->setSelected(m_child->lvSchemes->firstChild(), true); slotCurrentChanged(m_child->lvSchemes->currentItem()); diff --git a/juk/tagguesserconfigdlg.h b/juk/tagguesserconfigdlg.h index cbb56845..ef0bca01 100644 --- a/juk/tagguesserconfigdlg.h +++ b/juk/tagguesserconfigdlg.h @@ -16,7 +16,7 @@ class TQListViewItem; class TagGuesserConfigDlgWidget; class TagGuesserConfigDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: TagGuesserConfigDlg(TQWidget *parent, const char *name = 0); diff --git a/juk/tagrenameroptions.cpp b/juk/tagrenameroptions.cpp index 172637a5..bf296b1f 100644 --- a/juk/tagrenameroptions.cpp +++ b/juk/tagrenameroptions.cpp @@ -154,5 +154,3 @@ TagType TagRenamerOptions::tagFromCategoryText(const TQString &text, bool transl return Unknown; } - -// vim: set et ts=4 sw=4: diff --git a/juk/tagrenameroptions.h b/juk/tagrenameroptions.h index 56ff036e..40a25f1e 100644 --- a/juk/tagrenameroptions.h +++ b/juk/tagrenameroptions.h @@ -172,5 +172,3 @@ private: }; #endif /* JUK_TAGRENAMEROPTIONS_H */ - -// vim: set et ts=4 sw=4: diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp index 6ba46e34..2c66f120 100644 --- a/juk/tagtransactionmanager.cpp +++ b/juk/tagtransactionmanager.cpp @@ -135,7 +135,7 @@ bool TagTransactionManager::renameFile(const TQFileInfo &from, const TQFileInfo if(!to.exists() || KMessageBox::warningContinueCancel( - TQT_TQWIDGET(parent()), + static_cast<TQWidget*>(parent()), i18n("This file already exists.\nDo you want to replace it?"), i18n("File Exists"),i18n("Replace")) == KMessageBox::Continue) { @@ -200,7 +200,7 @@ bool TagTransactionManager::processChangeList(bool undo) action("edit_undo")->setEnabled(false); if(!errorItems.isEmpty()) - KMessageBox::errorList(TQT_TQWIDGET(parent()), + KMessageBox::errorList(static_cast<TQWidget*>(parent()), i18n("The following files were unable to be changed."), errorItems, i18n("Error")); @@ -210,5 +210,3 @@ bool TagTransactionManager::processChangeList(bool undo) } #include "tagtransactionmanager.moc" - -// vim: set et ts=4 sw=4 tw=0: diff --git a/juk/tagtransactionmanager.h b/juk/tagtransactionmanager.h index 8792831a..0e169bba 100644 --- a/juk/tagtransactionmanager.h +++ b/juk/tagtransactionmanager.h @@ -105,7 +105,7 @@ typedef TQValueList<TagTransactionAtom> TagAlterationList; */ class TagTransactionManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -210,5 +210,3 @@ class TagTransactionManager : public TQObject }; #endif /* _TAGTRANSACTIONMANAGER_H */ - -// vim: set et ts=4 sw=4 tw=0: diff --git a/juk/trackpickerdialog.cpp b/juk/trackpickerdialog.cpp index 892b2156..f02d43fd 100644 --- a/juk/trackpickerdialog.cpp +++ b/juk/trackpickerdialog.cpp @@ -61,8 +61,8 @@ TrackPickerDialog::TrackPickerDialog(const TQString &name, m_base->trackList->setSelected(m_base->trackList->firstChild(), true); - connect(m_base->trackList, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(accept())); + connect(m_base->trackList, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(accept())); setMinimumWidth(kMax(400, width())); } diff --git a/juk/trackpickerdialog.h b/juk/trackpickerdialog.h index ff2912e2..4fd2b1fb 100644 --- a/juk/trackpickerdialog.h +++ b/juk/trackpickerdialog.h @@ -28,7 +28,7 @@ class TrackPickerDialogBase; class TrackPickerDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/tracksequenceiterator.cpp b/juk/tracksequenceiterator.cpp index f06f837f..0d43f5a3 100644 --- a/juk/tracksequenceiterator.cpp +++ b/juk/tracksequenceiterator.cpp @@ -306,5 +306,3 @@ void DefaultSequenceIterator::initAlbumSearch(PlaylistItem *searchItem) m_albumSearch.search(); } - -// vim: set et sw=4 tw=0: diff --git a/juk/tracksequenceiterator.h b/juk/tracksequenceiterator.h index a2339f01..da96d592 100644 --- a/juk/tracksequenceiterator.h +++ b/juk/tracksequenceiterator.h @@ -228,5 +228,3 @@ private: }; #endif /* _TRACKSEQUENCEITERATOR_H */ - -// vim: set et sw=4: diff --git a/juk/tracksequencemanager.cpp b/juk/tracksequencemanager.cpp index 6475043f..34076bf7 100644 --- a/juk/tracksequencemanager.cpp +++ b/juk/tracksequencemanager.cpp @@ -121,8 +121,8 @@ void TrackSequenceManager::setCurrentPlaylist(Playlist *list) m_playlist->disconnect(this); m_playlist = list; - connect(m_playlist, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)), - this, TQT_SLOT(slotItemAboutToDie(PlaylistItem *))); + connect(m_playlist, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)), + this, TQ_SLOT(slotItemAboutToDie(PlaylistItem *))); } void TrackSequenceManager::setCurrent(PlaylistItem *item) @@ -148,8 +148,8 @@ void TrackSequenceManager::initialize() return; // Make sure we don't use m_playNextItem if it's invalid. - connect(collection, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)), - this, TQT_SLOT(slotItemAboutToDie(PlaylistItem *))); + connect(collection, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)), + this, TQ_SLOT(slotItemAboutToDie(PlaylistItem *))); m_initialized = true; } @@ -179,5 +179,3 @@ void TrackSequenceManager::slotItemAboutToDie(PlaylistItem *item) } #include "tracksequencemanager.moc" - -// vim: set et sw=4 tw=0: diff --git a/juk/tracksequencemanager.h b/juk/tracksequencemanager.h index 4e7f26a7..898868ba 100644 --- a/juk/tracksequencemanager.h +++ b/juk/tracksequencemanager.h @@ -35,7 +35,7 @@ class Playlist; */ class TrackSequenceManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -189,5 +189,3 @@ private: }; #endif /* _TRACKSEQUENCEMANAGER_H */ - -// vim: set et sw=4: diff --git a/juk/treeviewitemplaylist.h b/juk/treeviewitemplaylist.h index bc1815e4..3dd4c803 100644 --- a/juk/treeviewitemplaylist.h +++ b/juk/treeviewitemplaylist.h @@ -23,7 +23,7 @@ class TQStringList; class TreeViewItemPlaylist : public SearchPlaylist { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/upcomingplaylist.cpp b/juk/upcomingplaylist.cpp index 9f91514b..ab6b8e63 100644 --- a/juk/upcomingplaylist.cpp +++ b/juk/upcomingplaylist.cpp @@ -273,5 +273,3 @@ TQDataStream &operator>>(TQDataStream &s, UpcomingPlaylist &p) return s; } - -// vim: set et ts=4 sw=4: diff --git a/juk/upcomingplaylist.h b/juk/upcomingplaylist.h index 4bd7b712..92d08d40 100644 --- a/juk/upcomingplaylist.h +++ b/juk/upcomingplaylist.h @@ -209,5 +209,3 @@ TQDataStream &operator<<(TQDataStream &s, const UpcomingPlaylist &p); TQDataStream &operator>>(TQDataStream &s, UpcomingPlaylist &p); #endif /* _UPCOMINGPLAYLIST_H */ - -// vim: set et sw=4 ts=4: diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp index dab099f2..040bf3a3 100644 --- a/juk/viewmode.cpp +++ b/juk/viewmode.cpp @@ -71,7 +71,7 @@ void ViewMode::paintCell(PlaylistBox::Item *item, TQPen newPen = oldPen; newPen.setWidth(5); - newPen.setJoinStyle(Qt::RoundJoin); + newPen.setJoinStyle(TQt::RoundJoin); newPen.setColor(TQColorGroup::Highlight); painter->setPen(newPen); @@ -104,8 +104,8 @@ void ViewMode::paintCell(PlaylistBox::Item *item, bool ViewMode::eventFilter(TQObject *watched, TQEvent *e) { - if(m_visible && TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_playlistBox->viewport()) && e->type() == TQEvent::Resize) { - TQResizeEvent *re = TQT_TQRESIZEEVENT(e); + if(m_visible && watched == m_playlistBox->viewport() && e->type() == TQEvent::Resize) { + TQResizeEvent *re = static_cast<TQResizeEvent*>(e); if(re->size().width() != re->oldSize().width()) m_needsRefresh = true; } @@ -168,7 +168,7 @@ void ViewMode::paintDropIndicator(TQPainter *painter, int width, int height) // TQPen newPen = oldPen; newPen.setWidth(lineWidth); - newPen.setStyle(Qt::DotLine); + newPen.setStyle(TQt::DotLine); painter->setPen(newPen); painter->drawRect(border, border, width - border * 2, height - border * 2); diff --git a/juk/viewmode.h b/juk/viewmode.h index cf260204..3852decb 100644 --- a/juk/viewmode.h +++ b/juk/viewmode.h @@ -28,7 +28,7 @@ class SearchPlaylist; class ViewMode : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -120,7 +120,7 @@ class TreeViewItemPlaylist; class TreeViewMode : public CompactViewMode { - Q_OBJECT + TQ_OBJECT public: @@ -150,7 +150,7 @@ private: class CoverManagerMode : public ViewMode { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp index 142b1eb9..368832d1 100644 --- a/juk/webimagefetcher.cpp +++ b/juk/webimagefetcher.cpp @@ -48,7 +48,7 @@ WebImageFetcher::WebImageFetcher(TQObject *parent) m_connectionId(-1), m_dialog(0) { - connect(m_connection, TQT_SIGNAL(requestFinished(int,bool)), TQT_SLOT(slotWebRequestFinished(int,bool))); + connect(m_connection, TQ_SIGNAL(requestFinished(int,bool)), TQ_SLOT(slotWebRequestFinished(int,bool))); } WebImageFetcher::~WebImageFetcher() @@ -173,8 +173,8 @@ void WebImageFetcher::slotWebRequestFinished(int id, bool error) m_dialog = new WebImageFetcherDialog(m_imageList, m_file, 0); m_dialog->setModal(true); - connect(m_dialog, TQT_SIGNAL(coverSelected()), TQT_SLOT(slotCoverChosen())); - connect(m_dialog, TQT_SIGNAL(newSearchRequested()), TQT_SLOT(slotNewSearch())); + connect(m_dialog, TQ_SIGNAL(coverSelected()), TQ_SLOT(slotCoverChosen())); + connect(m_dialog, TQ_SIGNAL(newSearchRequested()), TQ_SLOT(slotNewSearch())); } m_dialog->refreshScreen(m_imageList); diff --git a/juk/webimagefetcher.h b/juk/webimagefetcher.h index 26eefe60..32dbdbc2 100644 --- a/juk/webimagefetcher.h +++ b/juk/webimagefetcher.h @@ -54,7 +54,7 @@ typedef TQValueList<WebImage> WebImageList; class WebImageFetcher : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp index 5fd110d8..c7abdf1a 100644 --- a/juk/webimagefetcherdialog.cpp +++ b/juk/webimagefetcherdialog.cpp @@ -55,8 +55,8 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList, m_iconWidget->arrangeItemsInGrid(); m_iconWidget->setItemsMovable(false); mainLayout->addWidget(m_iconWidget); - connect(m_iconWidget, TQT_SIGNAL(executed(TQIconViewItem *)), - this, TQT_SLOT(slotOk())); + connect(m_iconWidget, TQ_SIGNAL(executed(TQIconViewItem *)), + this, TQ_SLOT(slotOk())); // Before changing the code below be sure to check the attribution terms // of the Yahoo Image Search API. @@ -66,8 +66,8 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList, logoLabel->setPixmap(UserIcon("yahoo_credit")); logoLabel->setMargin(15); // Allow large margin per attribution terms. logoLabel->setUseTips(true); // Show URL in tooltip. - connect(logoLabel, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(showCreditURL(const TQString &))); + connect(logoLabel, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(showCreditURL(const TQString &))); TQBoxLayout *creditLayout = new TQHBoxLayout(mainLayout); creditLayout->addStretch(); // Left spacer @@ -197,9 +197,9 @@ CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const WebImage &image) // Start downloading the image. m_job = TDEIO::get(image.thumbURL(), false, false); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(imageResult(TDEIO::Job *))); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(imageData(TDEIO::Job *, const TQByteArray &))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(imageResult(TDEIO::Job *))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(imageData(TDEIO::Job *, const TQByteArray &))); } CoverIconViewItem::~CoverIconViewItem() @@ -228,7 +228,7 @@ void CoverIconViewItem::imageResult(TDEIO::Job *job) return; TQPixmap iconImage(m_buffer); - iconImage = TQImage(iconImage.convertToImage()).smoothScale(80, 80, TQ_ScaleMin); + iconImage = TQImage(iconImage.convertToImage()).smoothScale(80, 80, TQImage::ScaleMin); setPixmap(iconImage, true, true); } diff --git a/juk/webimagefetcherdialog.h b/juk/webimagefetcherdialog.h index afe2cd18..5d34a614 100644 --- a/juk/webimagefetcherdialog.h +++ b/juk/webimagefetcherdialog.h @@ -26,7 +26,7 @@ class KURL; class WebImageFetcherDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -73,7 +73,7 @@ namespace TDEIO class CoverIconViewItem : public TQObject, public TDEIconViewItem { - Q_OBJECT + TQ_OBJECT public: |