diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
| commit | e8cac8c2717e721ff20d518f3b9acd0831048bbd (patch) | |
| tree | 9ba67d9c0df98a2aeb88e9e7c015dd3e86153d7b | |
| parent | 324094a18c888423212bcdafa8f4c68ace73d770 (diff) | |
| download | amarok-e8cac8c2717e721ff20d518f3b9acd0831048bbd.tar.gz amarok-e8cac8c2717e721ff20d518f3b9acd0831048bbd.zip | |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
81 files changed, 272 insertions, 272 deletions
diff --git a/amarok/src/Options1.ui b/amarok/src/Options1.ui index 7bd4fdfd..29a95d5d 100644 --- a/amarok/src/Options1.ui +++ b/amarok/src/Options1.ui @@ -691,7 +691,7 @@ <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui index c4bc3be0..ba39801a 100644 --- a/amarok/src/Options2.ui +++ b/amarok/src/Options2.ui @@ -755,7 +755,7 @@ <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontrequester.h</includehint> <includehint>kfontrequester.h</includehint> diff --git a/amarok/src/Options2.ui.h b/amarok/src/Options2.ui.h index fe6d6e36..2baf3184 100644 --- a/amarok/src/Options2.ui.h +++ b/amarok/src/Options2.ui.h @@ -41,8 +41,8 @@ class AmarokThemeNewStuff : public KNewStuff { public: - AmarokThemeNewStuff(const TQString &type, TQWidget *tqparentWidget=0) - : KNewStuff( type, tqparentWidget ) + AmarokThemeNewStuff(const TQString &type, TQWidget *parentWidget=0) + : KNewStuff( type, parentWidget ) {} bool install( const TQString& fileName ) diff --git a/amarok/src/Options4.ui b/amarok/src/Options4.ui index e49c6716..6baab8ed 100644 --- a/amarok/src/Options4.ui +++ b/amarok/src/Options4.ui @@ -618,5 +618,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui index d7b3c84c..cc7fc38b 100644 --- a/amarok/src/Options5.ui +++ b/amarok/src/Options5.ui @@ -523,7 +523,7 @@ <function access="protected">hideEvent( QHideEvent * )</function> <function access="protected">showEvent( QShowEvent * )</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/amarok/src/Options7.ui b/amarok/src/Options7.ui index 67f2ce27..8b6fffe0 100644 --- a/amarok/src/Options7.ui +++ b/amarok/src/Options7.ui @@ -73,7 +73,7 @@ <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui index 6210ba69..7f245e56 100644 --- a/amarok/src/Options8.ui +++ b/amarok/src/Options8.ui @@ -294,7 +294,7 @@ <Q_SLOTS> <slot access="protected">updateServices( const QString & s )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp index b5104365..d945c8b0 100644 --- a/amarok/src/browserbar.cpp +++ b/amarok/src/browserbar.cpp @@ -44,7 +44,7 @@ namespace Amarok virtual void paintEvent( TQPaintEvent* ) { TQPainter p( this ); - tqparentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), TQStyle::Style_Horizontal ); + parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), TQStyle::Style_Horizontal ); } virtual void styleChange( TQStyle& ) diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp index c5ef7cde..efcbf523 100644 --- a/amarok/src/collectionbrowser.cpp +++ b/amarok/src/collectionbrowser.cpp @@ -197,7 +197,7 @@ CollectionBrowser::CollectionBrowser( const char* name ) //m_tagfilterMenuButton->setEnabled( m_view->m_viewMode == CollectionView::modeTreeView ); //connect ( m_treeViewAction, TQT_SIGNAL ( toggled(bool) ), m_tagfilterMenuButton, TQT_SLOT( setEnabled (bool) ) ); - tqlayoutToolbar(); + layoutToolbar(); m_categoryMenu = m_tagfilterMenuButton->popupMenu(); m_categoryMenu->insertItem( i18n( "Artist" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdArtist ); @@ -395,7 +395,7 @@ CollectionBrowser::eventFilter( TQObject *o, TQEvent *e ) } void -CollectionBrowser::tqlayoutToolbar() +CollectionBrowser::layoutToolbar() { if ( !m_toolbar ) return; @@ -784,23 +784,23 @@ CollectionView::slotEnsureSelectedItemVisible() //SLOT if ( lastChild() ) ensureItemVisible( lastChild() ); - //Create a reverse list of tqparents, grandtqparents etc. - //Later we try to make the grandtqparents in view, then their tqchildren etc. + //Create a reverse list of parents, grandparents etc. + //Later we try to make the grandparents in view, then their tqchildren etc. //This means that the selected item has the most priority as it is done last. - TQValueStack<TQListViewItem*> tqparents; + TQValueStack<TQListViewItem*> parents; while ( r ) { - tqparents.push( r ); + parents.push( r ); r = r->tqparent(); } - while ( !tqparents.isEmpty() ) + while ( !parents.isEmpty() ) { //We would prefer the next item to be visible. - if ( tqparents.top()->nextSibling() ) - ensureItemVisible( tqparents.top()->nextSibling() ); + if ( parents.top()->nextSibling() ) + ensureItemVisible( parents.top()->nextSibling() ); //It's even more important the actual item is visible than the next one. - ensureItemVisible( tqparents.top() ); - tqparents.pop(); + ensureItemVisible( parents.top() ); + parents.pop(); } } } @@ -2378,7 +2378,7 @@ CollectionView::listSelected() } - //first pass: tqparents + //first pass: parents for ( item = firstChild(); item; item = item->nextSibling() ) if ( item->isSelected() ) { diff --git a/amarok/src/collectionbrowser.h b/amarok/src/collectionbrowser.h index dd09facc..d0a7b4b8 100644 --- a/amarok/src/collectionbrowser.h +++ b/amarok/src/collectionbrowser.h @@ -80,7 +80,7 @@ class CollectionBrowser: public TQVBox void slotEditFilter(); private: - void tqlayoutToolbar(); + void layoutToolbar(); void ipodToolbar( bool activate ); void appendSearchResults(); @@ -315,8 +315,8 @@ class CollectionView : public KListView, public DropProxyTarget void cacheView(); void restoreView(); - //Used to store the name of an item (and its tqparents), so it can be recalled later - //even if the pointer to the item has been tqinvalidated. + //Used to store the name of an item (and its parents), so it can be recalled later + //even if the pointer to the item has been invalidated. TQStringList makeStructuredNameList( TQListViewItem* ) const; TQListViewItem* findFromStructuredNameList( const TQStringList& ) const; diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp index 5d1f6b8d..6f936e9e 100644 --- a/amarok/src/collectiondb.cpp +++ b/amarok/src/collectiondb.cpp @@ -2572,7 +2572,7 @@ CollectionDB::addPodcastChannel( const PodcastChannelBundle &pcb, const bool &tq command += ( image.isEmpty() ? "NULL" : '\'' + escapeString( image.url() ) + '\'' ) + ','; command += ( description.isEmpty() ? "NULL" : '\'' + escapeString( description ) + '\'' ) + ','; command += ( copyright.isEmpty() ? "NULL" : '\'' + escapeString( copyright ) + '\'' ) + ','; - command += TQString::number( pcb.tqparentId() ) + ",'"; + command += TQString::number( pcb.parentId() ) + ",'"; command += escapeString( pcb.saveLocation() ) + "',"; command += pcb.autoscan() ? boolT() + ',' : boolF() + ','; command += TQString::number( pcb.fetchType() ) + ','; @@ -2812,17 +2812,17 @@ CollectionDB::getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *pc // return newly created folder id int -CollectionDB::addPodcastFolder( const TQString &name, const int tqparent_id, const bool isOpen ) +CollectionDB::addPodcastFolder( const TQString &name, const int parent_id, const bool isOpen ) { TQString command = TQString( "INSERT INTO podcastfolders ( name, tqparent, isOpen ) VALUES ('" ); command += escapeString( name ) + "',"; - command += TQString::number( tqparent_id ) + ","; + command += TQString::number( parent_id ) + ","; command += isOpen ? boolT() + ");" : boolF() + ");"; insert( command, NULL ); command = TQString( "SELECT id FROM podcastfolders WHERE name = '%1' AND tqparent = '%2';" ) - .tqarg( name, TQString::number(tqparent_id) ); + .tqarg( name, TQString::number(parent_id) ); TQStringList values = query( command ); return values[0].toInt(); @@ -2841,7 +2841,7 @@ CollectionDB::updatePodcastChannel( const PodcastChannelBundle &b ) << escapeString( b.link().url() ) << escapeString( b.description() ) << escapeString( b.copyright() ) - << TQString::number( b.tqparentId() ) + << TQString::number( b.parentId() ) << escapeString( b.saveLocation() ) << ( b.autoscan() ? boolT() : boolF() ) << TQString::number( b.fetchType() ) @@ -2888,13 +2888,13 @@ CollectionDB::updatePodcastEpisode( const int id, const PodcastEpisodeBundle &b } void -CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, const int tqparent_id, const bool isOpen ) +CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, const int parent_id, const bool isOpen ) { if( getDbConnectionType() == DbConnection::postgresql ) { query( TQStringx( "UPDATE podcastfolders SET name='%1', tqparent=%2, isOpen=%3 WHERE id=%4;" ) .args( TQStringList() << escapeString(name) - << TQString::number(tqparent_id) + << TQString::number(parent_id) << ( isOpen ? boolT() : boolF() ) << TQString::number(folder_id) ) @@ -2906,7 +2906,7 @@ CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, co .args( TQStringList() << TQString::number(folder_id) << escapeString(name) - << TQString::number(tqparent_id) + << TQString::number(parent_id) << ( isOpen ? boolT() : boolF() ) ) ); diff --git a/amarok/src/collectiondb.h b/amarok/src/collectiondb.h index 3c96538c..d3034020 100644 --- a/amarok/src/collectiondb.h +++ b/amarok/src/collectiondb.h @@ -345,7 +345,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver /// Insert a podcast episode into the database. If @param idToUpdate is provided, replace the row /// use updatePodcastEpisode() always in preference int addPodcastEpisode( const PodcastEpisodeBundle &episode, const int idToUpdate=0 ); - int addPodcastFolder( const TQString &name, const int tqparent_id=0, const bool isOpen=false ); + int addPodcastFolder( const TQString &name, const int parent_id=0, const bool isOpen=false ); TQValueList<PodcastChannelBundle> getPodcastChannels(); PodcastEpisodeBundle getPodcastEpisodeById( int id ); TQValueList<PodcastEpisodeBundle> getPodcastEpisodes( const KURL &tqparent, bool newOnly=false, int limit=-1 ); @@ -354,7 +354,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver void removePodcastFolder( const int id ); void updatePodcastChannel( const PodcastChannelBundle &b ); void updatePodcastEpisode( const int id, const PodcastEpisodeBundle &b ); - void updatePodcastFolder( const int folder_id, const TQString &name, const int tqparent_id=0, const bool isOpen=false ); + void updatePodcastFolder( const int folder_id, const TQString &name, const int parent_id=0, const bool isOpen=false ); // these return false when no bundle was available bool getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *channel ); bool getPodcastEpisodeBundle( const KURL &url, PodcastEpisodeBundle *channel ); @@ -494,7 +494,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver bool isConnected(); void releasePreviousConnection(TQThread *currThread); - void tqinvalidateArtistAlbumCache() { m_validArtistCache=false; m_validComposerCache=false; m_validAlbumCache=false; }; + void invalidateArtistAlbumCache() { m_validArtistCache=false; m_validComposerCache=false; m_validAlbumCache=false; }; void vacuum(); diff --git a/amarok/src/collectionscanner/collectionscanner.cpp b/amarok/src/collectionscanner/collectionscanner.cpp index fd9a88e7..81fcf194 100644 --- a/amarok/src/collectionscanner/collectionscanner.cpp +++ b/amarok/src/collectionscanner/collectionscanner.cpp @@ -132,7 +132,7 @@ CollectionScanner::doJob() //SLOT else { foreachType( TQStringList, m_folders ) { if( (*it).isEmpty() ) - //aptqparently somewhere empty strings get into the mix + //apparently somewhere empty strings get into the mix //which results in a full-system scan! Which we can't allow continue; diff --git a/amarok/src/dbsetup.ui b/amarok/src/dbsetup.ui index 9a718f8b..6625649b 100644 --- a/amarok/src/dbsetup.ui +++ b/amarok/src/dbsetup.ui @@ -455,7 +455,7 @@ <functions> <function access="private">init()</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>klineedit.h</includehint> diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui index b8f27c95..7ca52143 100644 --- a/amarok/src/deletedialogbase.ui +++ b/amarok/src/deletedialogbase.ui @@ -128,7 +128,7 @@ <Q_SLOTS> <slot access="protected">slotShouldDelete(bool)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> </includehints> diff --git a/amarok/src/devicemanager.cpp b/amarok/src/devicemanager.cpp index a0597124..e5144791 100644 --- a/amarok/src/devicemanager.cpp +++ b/amarok/src/devicemanager.cpp @@ -58,7 +58,7 @@ DeviceManager::DeviceManager() else { m_valid = true; - //run the DCOP query here because aptqparently if you don't run KDE as a DM the first call will fail + //run the DCOP query here because apparently if you don't run KDE as a DM the first call will fail //...go figure TQByteArray data, replyData; TQCString replyType; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h index df4b7548..ca46e4ac 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h @@ -497,7 +497,7 @@ DECLARE_INTERFACE_(IHXSiteWatcher, IUnknown) * * Purpose: * - * Interface implemented by renderers and objects with provide tqlayouts to + * Interface implemented by renderers and objects with provide layouts to * the client core. This interface is called by the core when it needs a * new IHXSiteUser, or when it is done using an IHXSiteUser. * @@ -1628,7 +1628,7 @@ DECLARE_INTERFACE_(IHXSubRectSite, IHXSite) STDTQT_METHOD(SendSubRectMessages) (THIS_ HXBOOL bRet ) PURE; /* * New damage region call that takes the cross platfrom region - * defined in hxwintyp.h and tqinvalidates the rects in it + * defined in hxwintyp.h and invalidates the rects in it */ STDTQT_METHOD(SubRectDamageRegion) (THIS_ HXxBoxRegion* pRegion ) PURE; /* diff --git a/amarok/src/engine/helix/hxplayercontrol.cpp b/amarok/src/engine/helix/hxplayercontrol.cpp index 9b647004..fd1b2e4c 100644 --- a/amarok/src/engine/helix/hxplayercontrol.cpp +++ b/amarok/src/engine/helix/hxplayercontrol.cpp @@ -160,7 +160,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co } - if (!iamtqparent) // tqchildren stay here, tqparents return + if (!iamtqparent) // tqchildren stay here, parents return { int rfd = m_tqchildren[m_index].m_pipeB[0]; int wfd = m_tqchildren[m_index].m_pipeA[1]; diff --git a/amarok/src/engine/nmm/nmm_configdialogbase.ui b/amarok/src/engine/nmm/nmm_configdialogbase.ui index 3ac71121..bef5c7e0 100644 --- a/amarok/src/engine/nmm/nmm_configdialogbase.ui +++ b/amarok/src/engine/nmm/nmm_configdialogbase.ui @@ -223,5 +223,5 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp index 8393ec94..341835c2 100644 --- a/amarok/src/engine/xine/xine-engine.cpp +++ b/amarok/src/engine/xine/xine-engine.cpp @@ -161,7 +161,7 @@ XineEngine::makeNewStream() m_audioPort = xine_open_audio_driver( m_xine, XineCfg::outputPlugin().local8Bit(), NULL ); if( !m_audioPort ) { - //TODO make engine method that is the same but tqparents the dialog for us + //TODO make engine method that is the same but parents the dialog for us KMessageBox::error( 0, i18n("xine was unable to initialize any audio drivers.") ); return false; } diff --git a/amarok/src/engine/xine/xineconfigbase.ui b/amarok/src/engine/xine/xineconfigbase.ui index 5e893916..a280f3e3 100644 --- a/amarok/src/engine/xine/xineconfigbase.ui +++ b/amarok/src/engine/xine/xineconfigbase.ui @@ -502,5 +502,5 @@ <includes> <include location="local" impldecl="in declaration">plugin/pluginconfig.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp index e14cc281..199cb389 100644 --- a/amarok/src/equalizersetup.cpp +++ b/amarok/src/equalizersetup.cpp @@ -96,7 +96,7 @@ EqualizerSetup::EqualizerSetup() m_groupBoxSliders->setInsideMargin( KDialog::marginHint() ); connect( m_groupBoxSliders, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setEqualizerEnabled( bool ) ) ); - // Helper widget for tqlayouting inside the groupbox + // Helper widget for layouting inside the groupbox TQWidget* slidersLayoutWidget = new TQWidget( m_groupBoxSliders ); slidersLayoutWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); TQGridLayout* slidersGridLayout = new TQGridLayout( slidersLayoutWidget, 1, 1, 0, KDialog::spacingHint() ); @@ -118,7 +118,7 @@ EqualizerSetup::EqualizerSetup() const char *bandLabels[] = { "30", "60", "125", "250", "500", "1k", "2k", "4k", "8k", "16k" }; int minWidth = 0; - TQFontMetrics fm = fontMetrics(); //aptqparently it's an expensive call + TQFontMetrics fm = fontMetrics(); //apparently it's an expensive call for ( int i = 0; i < 10; i++ ) { int w = fm.width( bandLabels[i] ); if ( w > minWidth ) diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h index 9c11e0c5..bd539e8a 100644 --- a/amarok/src/filebrowser.h +++ b/amarok/src/filebrowser.h @@ -117,7 +117,7 @@ private slots: void activate( TQListViewItem* ); private: - KURL searchURL() const { return static_cast<FileBrowser*>(tqparentWidget())->url(); } + KURL searchURL() const { return static_cast<FileBrowser*>(parentWidget())->url(); } TQLineEdit *m_lineEdit; KURLView *m_listView; diff --git a/amarok/src/firstrunwizard.ui b/amarok/src/firstrunwizard.ui index 94b3d8f2..4cf16752 100644 --- a/amarok/src/firstrunwizard.ui +++ b/amarok/src/firstrunwizard.ui @@ -290,7 +290,7 @@ <function specifier="non virtual">writeCollectionConfig()</function> <function specifier="non virtual" returnType="FirstRunWizard::Interface">interface()</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp index ae396a9f..993da6c6 100644 --- a/amarok/src/htmlview.cpp +++ b/amarok/src/htmlview.cpp @@ -27,8 +27,8 @@ KTempFile *HTMLView::m_headerGradientImage = 0; KTempFile *HTMLView::m_shadowGradientImage = 0; int HTMLView::m_instances = 0; -HTMLView::HTMLView( TQWidget *tqparentWidget, const char *widgetname, const bool DNDEnabled, const bool JScriptEnabled ) - : KHTMLPart( tqparentWidget, widgetname ) +HTMLView::HTMLView( TQWidget *parentWidget, const char *widgetname, const bool DNDEnabled, const bool JScriptEnabled ) + : KHTMLPart( parentWidget, widgetname ) { m_instances++; setJavaEnabled( false ); diff --git a/amarok/src/htmlview.h b/amarok/src/htmlview.h index 0efa2069..2f741bd9 100644 --- a/amarok/src/htmlview.h +++ b/amarok/src/htmlview.h @@ -19,7 +19,7 @@ class HTMLView : public KHTMLPart TQ_OBJECT public: - HTMLView( TQWidget *tqparentWidget = 0, const char *widgetname = 0, const bool DNDEnabled = false, const bool JScriptEnabled = true ); + HTMLView( TQWidget *parentWidget = 0, const char *widgetname = 0, const bool DNDEnabled = false, const bool JScriptEnabled = true ); ~HTMLView(); static TQString loadStyleSheet(); diff --git a/amarok/src/inotify/inotify.h b/amarok/src/inotify/inotify.h index 17dcd1e5..4c06aa13 100644 --- a/amarok/src/inotify/inotify.h +++ b/amarok/src/inotify/inotify.h @@ -73,7 +73,7 @@ struct inotify_event { extern void inotify_inode_queue_event(struct inode *, __u32, __u32, const char *); -extern void inotify_dentry_tqparent_queue_event(struct dentry *, __u32, __u32, +extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32, const char *); extern void inotify_unmount_inodes(struct list_head *); extern void inotify_inode_is_dead(struct inode *); @@ -87,7 +87,7 @@ static inline void inotify_inode_queue_event(struct inode *inode, { } -static inline void inotify_dentry_tqparent_queue_event(struct dentry *dentry, +static inline void inotify_dentry_parent_queue_event(struct dentry *dentry, __u32 tqmask, __u32 cookie, const char *filename) { diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp index 1e59471b..4c6bf43d 100644 --- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp +++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp @@ -25,8 +25,8 @@ #include <tqfile.h> -MagnatuneArtistInfoBox::MagnatuneArtistInfoBox( TQWidget *tqparentWidget, const char *widgetname ) - : KHTMLPart( tqparentWidget, widgetname ) +MagnatuneArtistInfoBox::MagnatuneArtistInfoBox( TQWidget *parentWidget, const char *widgetname ) + : KHTMLPart( parentWidget, widgetname ) {} diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h index ccca4387..1d9bc139 100644 --- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h +++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h @@ -41,11 +41,11 @@ class MagnatuneArtistInfoBox : public KHTMLPart public: /** * Constructor - * @param tqparentWidget The tqparent TQWidget + * @param parentWidget The tqparent TQWidget * @param widgetname The name of this widget * @return New MagnatuneArtistInfoBox object */ - MagnatuneArtistInfoBox( TQWidget *tqparentWidget, const char *widgetname ); + MagnatuneArtistInfoBox( TQWidget *parentWidget, const char *widgetname ); /** * Destructor diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui index 3f753691..012aff43 100644 --- a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui @@ -111,7 +111,7 @@ <Q_SLOTS> <slot access="protected">downloadButtonClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp index 8adb3784..47450697 100644 --- a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp +++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp @@ -59,7 +59,7 @@ void MagnatuneListViewArtistItem::setOpen( bool o ) } listView()->setUpdatesEnabled( true ); KListViewItem::setOpen( o ); - tqinvalidateHeight(); + invalidateHeight(); listView()->repaintContents(); @@ -117,7 +117,7 @@ void MagnatuneListViewAlbumItem::setOpen( bool o ) listView()->setUpdatesEnabled( true ); KListViewItem::setOpen( o ); - tqinvalidateHeight(); + invalidateHeight(); listView()->repaintContents(); diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui index 029c923b..71e66458 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui @@ -702,5 +702,5 @@ <slot>purchase()</slot> <slot>cancel()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui index cbd41c40..cfa248fa 100644 --- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui @@ -102,7 +102,7 @@ <slot access="protected">redownload()</slot> <slot access="protected">selectionChanged()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/amarok/src/mediadevice/daap/addhostbase.ui b/amarok/src/mediadevice/daap/addhostbase.ui index 683e7086..7d7489a0 100644 --- a/amarok/src/mediadevice/daap/addhostbase.ui +++ b/amarok/src/mediadevice/daap/addhostbase.ui @@ -170,7 +170,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>klineedit.h</includehint> diff --git a/amarok/src/mediadevice/daap/codes.rb b/amarok/src/mediadevice/daap/codes.rb index 97d51e6c..b90d7a99 100644 --- a/amarok/src/mediadevice/daap/codes.rb +++ b/amarok/src/mediadevice/daap/codes.rb @@ -81,7 +81,7 @@ METAS = { :songdateadded=>{:datatype=>:date, :code=>"asda"}, :songbitrate=>{:datatype=>:short, :code=>"asbr"}, :containeritemid=>{:datatype=>:long, :code=>"mcti"}, - :tqparentcontainerid=>{:datatype=>:long, :code=>"mpco"}, + :parentcontainerid=>{:datatype=>:long, :code=>"mpco"}, :databasescount=>{:datatype=>:long, :code=>"msdc"}, :loginresponse=>{:datatype=>:container, :code=>"mlog"}, :sessionid=>{:datatype=>:long, :code=>"mlid"}, @@ -227,4 +227,4 @@ CODE_TYPE = { 'abgn'=>:container, 'ascn'=>:string} -CONTENT_CODES = "mccr\000\000\027\335mstt\000\000\000\004\000\000\000\310mdcl\000\000\0005mcnm\000\000\000\004msexmcna\000\000\000\027dmap.supportsextensionsmcty\000\000\000\002\000\001mdcl\000\000\0001mcnm\000\000\000\004assrmcna\000\000\000\023daap.songsampleratemcty\000\000\000\002\000\005mdcl\000\000\0000mcnm\000\000\000\004asstmcna\000\000\000\022daap.songstarttimemcty\000\000\000\002\000\005mdcl\000\000\0000mcnm\000\000\000\004mrcomcna\000\000\000\022dmap.returnedcountmcty\000\000\000\002\000\005mdcl\000\000\000;mcnm\000\000\000\004aeGImcna\000\000\000\035com.apple.itunes.itms-genreidmcty\000\000\000\002\000\005mdcl\000\000\0006mcnm\000\000\000\004apsmmcna\000\000\000\030daap.playlistshufflemodemcty\000\000\000\002\000\001mdcl\000\000\0005mcnm\000\000\000\004aprmmcna\000\000\000\027daap.playlistrepeatmodemcty\000\000\000\002\000\001mdcl\000\000\0000mcnm\000\000\000\004apsomcna\000\000\000\022daap.playlistsongsmcty\000\000\000\002\000\fmdcl\000\000\0002mcnm\000\000\000\004apromcna\000\000\000\024daap.protocolversionmcty\000\000\000\002\000\vmdcl\000\000\000-mcnm\000\000\000\004asarmcna\000\000\000\017daap.songartistmcty\000\000\000\002\000\tmdcl\000\000\0004mcnm\000\000\000\004aplymcna\000\000\000\026daap.databaseplaylistsmcty\000\000\000\002\000\fmdcl\000\000\0005mcnm\000\000\000\004msalmcna\000\000\000\027dmap.supportsautologoutmcty\000\000\000\002\000\001mdcl\000\000\000@mcnm\000\000\000\004aeSFmcna\000\000\000\"com.apple.itunes.itms-storefrontidmcty\000\000\000\002\000\005mdcl\000\000\000.mcnm\000\000\000\004asbrmcna\000\000\000\020daap.songbitratemcty\000\000\000\002\000\003mdcl\000\000\000,mcnm\000\000\000\004asalmcna\000\000\000\016daap.songalbummcty\000\000\000\002\000\tmdcl\000\000\0008mcnm\000\000\000\004msasmcna\000\000\000\032dmap.authenticationschemesmcty\000\000\000\002\000\005mdcl\000\000\0000mcnm\000\000\000\004ascdmcna\000\000\000\022daap.songcodectypemcty\000\000\000\002\000\005mdcl\000\000\0007mcnm\000\000\000\004msaumcna\000\000\000\031dmap.authenticationmethodmcty\000\000\000\002\000\001mdcl\000\000\0000mcnm\000\000\000\004asdamcna\000\000\000\022daap.songdateaddedmcty\000\000\000\002\000\nmdcl\000\000\0001mcnm\000\000\000\004msbrmcna\000\000\000\023dmap.supportsbrowsemcty\000\000\000\002\000\001mdcl\000\000\0000mcnm\000\000\000\004asdcmcna\000\000\000\022daap.songdisccountmcty\000\000\000\002\000\003mdcl\000\000\0005mcnm\000\000\000\004asbtmcna\000\000\000\027daap.songbeatsperminutemcty\000\000\000\002\000\003mdcl\000\000\000.mcnm\000\000\000\004arifmcna\000\000\000\020daap.resolveinfomcty\000\000\000\002\000\fmdcl\000\000\000.mcnm\000\000\000\004ascmmcna\000\000\000\020daap.songcommentmcty\000\000\000\002\000\tmdcl\000\000\0009mcnm\000\000\000\004ascnmcna\000\000\000\edaap.songcontentdescriptionmcty\000\000\000\002\000\tmdcl\000\000\0002mcnm\000\000\000\004ascomcna\000\000\000\024daap.songcompilationmcty\000\000\000\002\000\001mdcl\000\000\000/mcnm\000\000\000\004ascpmcna\000\000\000\021daap.songcomposermcty\000\000\000\002\000\tmdcl\000\000\000/mcnm\000\000\000\004asdbmcna\000\000\000\021daap.songdisabledmcty\000\000\000\002\000\001mdcl\000\000\0001mcnm\000\000\000\004asdnmcna\000\000\000\023daap.songdiscnumbermcty\000\000\000\002\000\003mdcl\000\000\000/mcnm\000\000\000\004asctmcna\000\000\000\021daap.songcategorymcty\000\000\000\002\000\tmdcl\000\000\0004mcnm\000\000\000\004ascrmcna\000\000\000\026daap.songcontentratingmcty\000\000\000\002\000\001mdcl\000\000\0003mcnm\000\000\000\004ascsmcna\000\000\000\025daap.songcodecsubtypemcty\000\000\000\002\000\005mdcl\000\000\0002mcnm\000\000\000\004asdtmcna\000\000\000\024daap.songdescriptionmcty\000\000\000\002\000\tmdcl\000\000\000/mcnm\000\000\000\004asdkmcna\000\000\000\021daap.songdatakindmcty\000\000\000\002\000\001mdcl\000\000\000-mcnm\000\000\000\004asfmmcna\000\000\000\017daap.songformatmcty\000\000\000\002\000\tmdcl\000\000\000)mcnm\000\000\000\004miidmcna\000\000\000\vdmap.itemidmcty\000\000\000\002\000\005mdcl\000\000\000,mcnm\000\000\000\004asgnmcna\000\000\000\016daap.songgenremcty\000\000\000\002\000\tmdcl\000\000\000:mcnm\000\000\000\004aeNVmcna\000\000\000\034com.apple.itunes.norm-volumemcty\000\000\000\002\000\005mdcl\000\000\000)mcnm\000\000\000\004msttmcna\000\000\000\vdmap.statusmcty\000\000\000\002\000\005mdcl\000\000\000+mcnm\000\000\000\004mikdmcna\000\000\000\rdmap.itemkindmcty\000\000\000\002\000\001mdcl\000\000\0003mcnm\000\000\000\004asdmmcna\000\000\000\025daap.songdatemodifiedmcty\000\000\000\002\000\nmdcl\000\000\0006mcnm\000\000\000\004mtcomcna\000\000\000\030dmap.specifiedtotalcountmcty\000\000\000\002\000\005mdcl\000\000\000/mcnm\000\000\000\004agrpmcna\000\000\000\021daap.songgroupingmcty\000\000\000\002\000\tmdcl\000\000\000/mcnm\000\000\000\004aseqmcna\000\000\000\021daap.songeqpresetmcty\000\000\000\002\000\tmdcl\000\000\0000mcnm\000\000\000\004msixmcna\000\000\000\022dmap.supportsindexmcty\000\000\000\002\000\001mdcl\000\000\000:mcnm\000\000\000\004aeSImcna\000\000\000\034com.apple.itunes.itms-songidmcty\000\000\000\002\000\005mdcl\000\000\000=mcnm\000\000\000\004aeSPmcna\000\000\000\037com.apple.itunes.smart-playlistmcty\000\000\000\002\000\001mdcl\000\000\0000mcnm\000\000\000\004mslrmcna\000\000\000\022dmap.loginrequiredmcty\000\000\000\002\000\001mdcl\000\000\0009mcnm\000\000\000\004aePCmcna\000\000\000\ecom.apple.itunes.is-podcastmcty\000\000\000\002\000\001mdcl\000\000\0003mcnm\000\000\000\004mudlmcna\000\000\000\025dmap.deletedidlistingmcty\000\000\000\002\000\fmdcl\000\000\000Dmcnm\000\000\000\004aeSVmcna\000\000\000&com.apple.itunes.music-sharing-versionmcty\000\000\000\002\000\005mdcl\000\000\000+mcnm\000\000\000\004minmmcna\000\000\000\rdmap.itemnamemcty\000\000\000\002\000\tmdcl\000\000\000/mcnm\000\000\000\004askymcna\000\000\000\021daap.songkeywordsmcty\000\000\000\002\000\tmdcl\000\000\0008mcnm\000\000\000\004mspimcna\000\000\000\032dmap.supportspersistentidsmcty\000\000\000\002\000\001mdcl\000\000\000*mcnm\000\000\000\004arsvmcna\000\000\000\fdaap.resolvemcty\000\000\000\002\000\fmdcl\000\000\0005mcnm\000\000\000\004abalmcna\000\000\000\027daap.browsealbumlistingmcty\000\000\000\002\000\fmdcl\000\000\0002mcnm\000\000\000\004avdbmcna\000\000\000\024daap.serverdatabasesmcty\000\000\000\002\000\fmdcl\000\000\000&mcnm\000\000\000\004mbclmcna\000\000\000\010dmap.bagmcty\000\000\000\002\000\fmdcl\000\000\0006mcnm\000\000\000\004abarmcna\000\000\000\030daap.browseartistlistingmcty\000\000\000\002\000\fmdcl\000\000\0002mcnm\000\000\000\004msrsmcna\000\000\000\024dmap.supportsresolvemcty\000\000\000\002\000\001mdcl\000\000\0000mcnm\000\000\000\004msqymcna\000\000\000\022dmap.supportsquerymcty\000\000\000\002\000\001mdcl\000\000\0005mcnm\000\000\000\004msrvmcna\000\000\000\027dmap.serverinforesponsemcty\000\000\000\002\000\fmdcl\000\000\0002mcnm\000\000\000\004mstmmcna\000\000\000\024dmap.timeoutintervalmcty\000\000\000\002\000\005mdcl\000\000\0008mcnm\000\000\000\004abcpmcna\000\000\000\032daap.browsecomposerlistingmcty\000\000\000\002\000\fmdcl\000\000\000/mcnm\000\000\000\004asspmcna\000\000\000\021daap.songstoptimemcty\000\000\000\002\000\005mdcl\000\000\0005mcnm\000\000\000\004asrvmcna\000\000\000\027daap.songrelativevolumemcty\000\000\000\002\000\002mdcl\000\000\000+mcnm\000\000\000\004astmmcna\000\000\000\rdaap.songtimemcty\000\000\000\002\000\005mdcl\000\000\0002mcnm\000\000\000\004astnmcna\000\000\000\024daap.songtracknumbermcty\000\000\000\002\000\003mdcl\000\000\0001mcnm\000\000\000\004msupmcna\000\000\000\023dmap.supportsupdatemcty\000\000\000\002\000\001mdcl\000\000\000.mcnm\000\000\000\004asulmcna\000\000\000\020daap.songdataurlmcty\000\000\000\002\000\tmdcl\000\000\000,mcnm\000\000\000\004mlidmcna\000\000\000\016dmap.sessionidmcty\000\000\000\002\000\005mdcl\000\000\000+mcnm\000\000\000\004asszmcna\000\000\000\rdaap.songsizemcty\000\000\000\002\000\005mdcl\000\000\000,mcnm\000\000\000\004mimcmcna\000\000\000\016dmap.itemcountmcty\000\000\000\002\000\005mdcl\000\000\0001mcnm\000\000\000\004asurmcna\000\000\000\023daap.songuserratingmcty\000\000\000\002\000\001mdcl\000\000\0005mcnm\000\000\000\004abgnmcna\000\000\000\027daap.browsegenrelistingmcty\000\000\000\002\000\fmdcl\000\000\0001mcnm\000\000\000\004mupdmcna\000\000\000\023dmap.updateresponsemcty\000\000\000\002\000\fmdcl\000\000\0007mcnm\000\000\000\004mccrmcna\000\000\000\031dmap.contentcodesresponsemcty\000\000\000\002\000\fmdcl\000\000\0001mcnm\000\000\000\004astcmcna\000\000\000\023daap.songtrackcountmcty\000\000\000\002\000\003mdcl\000\000\000.mcnm\000\000\000\004mlitmcna\000\000\000\020dmap.listingitemmcty\000\000\000\002\000\fmdcl\000\000\000=mcnm\000\000\000\004aslcmcna\000\000\000\037daap.songlongcontentdescriptionmcty\000\000\000\002\000\tmdcl\000\000\000+mcnm\000\000\000\004asyrmcna\000\000\000\rdaap.songyearmcty\000\000\000\002\000\003mdcl\000\000\000-mcnm\000\000\000\004mdclmcna\000\000\000\017dmap.dictionarymcty\000\000\000\002\000\fmdcl\000\000\0000mcnm\000\000\000\004mlogmcna\000\000\000\022dmap.loginresponsemcty\000\000\000\002\000\fmdcl\000\000\0000mcnm\000\000\000\004adbsmcna\000\000\000\022daap.databasesongsmcty\000\000\000\002\000\fmdcl\000\000\0001mcnm\000\000\000\004musrmcna\000\000\000\023dmap.serverrevisionmcty\000\000\000\002\000\005mdcl\000\000\000Bmcnm\000\000\000\004aePPmcna\000\000\000$com.apple.itunes.is-podcast-playlistmcty\000\000\000\002\000\001mdcl\000\000\0001mcnm\000\000\000\004msdcmcna\000\000\000\023dmap.databasescountmcty\000\000\000\002\000\005mdcl\000\000\0003mcnm\000\000\000\004mcnamcna\000\000\000\025dmap.contentcodesnamemcty\000\000\000\002\000\tmdcl\000\000\000-mcnm\000\000\000\004mutymcna\000\000\000\017dmap.updatetypemcty\000\000\000\002\000\001mdcl\000\000\0005mcnm\000\000\000\004mcnmmcna\000\000\000\027dmap.contentcodesnumbermcty\000\000\000\002\000\005mdcl\000\000\0001mcnm\000\000\000\004abromcna\000\000\000\023daap.databasebrowsemcty\000\000\000\002\000\fmdcl\000\000\000,mcnm\000\000\000\004mconmcna\000\000\000\016dmap.containermcty\000\000\000\002\000\fmdcl\000\000\0001mcnm\000\000\000\004mctcmcna\000\000\000\023dmap.containercountmcty\000\000\000\002\000\005mdcl\000\000\0004mcnm\000\000\000\004mpcomcna\000\000\000\026dmap.tqparentcontaineridmcty\000\000\000\002\000\005mdcl\000\000\0002mcnm\000\000\000\004mctimcna\000\000\000\024dmap.containeritemidmcty\000\000\000\002\000\005mdcl\000\000\000/mcnm\000\000\000\004mstsmcna\000\000\000\021dmap.statusstringmcty\000\000\000\002\000\tmdcl\000\000\0002mcnm\000\000\000\004mpromcna\000\000\000\024dmap.protocolversionmcty\000\000\000\002\000\vmdcl\000\000\000/mcnm\000\000\000\004abplmcna\000\000\000\021daap.baseplaylistmcty\000\000\000\002\000\001mdcl\000\000\000/mcnm\000\000\000\004mpermcna\000\000\000\021dmap.persistentidmcty\000\000\000\002\000\amdcl\000\000\000*mcnm\000\000\000\004mlclmcna\000\000\000\fdmap.listingmcty\000\000\000\002\000\fmdcl\000\000\0003mcnm\000\000\000\004mctymcna\000\000\000\025dmap.contentcodestypemcty\000\000\000\002\000\003mdcl\000\000\000<mcnm\000\000\000\004aeAImcna\000\000\000\036com.apple.itunes.itms-artistidmcty\000\000\000\002\000\005mdcl\000\000\000>mcnm\000\000\000\004aePImcna\000\000\000 com.apple.itunes.itms-playlistidmcty\000\000\000\002\000\005mdcl\000\000\0005mcnm\000\000\000\004f\215chmcna\000\000\000\027dmap.haschildcontainersmcty\000\000\000\002\000\001mdcl\000\000\000>mcnm\000\000\000\004aeCImcna\000\000\000 com.apple.itunes.itms-composeridmcty\000\000\000\002\000\005" +CONTENT_CODES = "mccr\000\000\027\335mstt\000\000\000\004\000\000\000\310mdcl\000\000\0005mcnm\000\000\000\004msexmcna\000\000\000\027dmap.supportsextensionsmcty\000\000\000\002\000\001mdcl\000\000\0001mcnm\000\000\000\004assrmcna\000\000\000\023daap.songsampleratemcty\000\000\000\002\000\005mdcl\000\000\0000mcnm\000\000\000\004asstmcna\000\000\000\022daap.songstarttimemcty\000\000\000\002\000\005mdcl\000\000\0000mcnm\000\000\000\004mrcomcna\000\000\000\022dmap.returnedcountmcty\000\000\000\002\000\005mdcl\000\000\000;mcnm\000\000\000\004aeGImcna\000\000\000\035com.apple.itunes.itms-genreidmcty\000\000\000\002\000\005mdcl\000\000\0006mcnm\000\000\000\004apsmmcna\000\000\000\030daap.playlistshufflemodemcty\000\000\000\002\000\001mdcl\000\000\0005mcnm\000\000\000\004aprmmcna\000\000\000\027daap.playlistrepeatmodemcty\000\000\000\002\000\001mdcl\000\000\0000mcnm\000\000\000\004apsomcna\000\000\000\022daap.playlistsongsmcty\000\000\000\002\000\fmdcl\000\000\0002mcnm\000\000\000\004apromcna\000\000\000\024daap.protocolversionmcty\000\000\000\002\000\vmdcl\000\000\000-mcnm\000\000\000\004asarmcna\000\000\000\017daap.songartistmcty\000\000\000\002\000\tmdcl\000\000\0004mcnm\000\000\000\004aplymcna\000\000\000\026daap.databaseplaylistsmcty\000\000\000\002\000\fmdcl\000\000\0005mcnm\000\000\000\004msalmcna\000\000\000\027dmap.supportsautologoutmcty\000\000\000\002\000\001mdcl\000\000\000@mcnm\000\000\000\004aeSFmcna\000\000\000\"com.apple.itunes.itms-storefrontidmcty\000\000\000\002\000\005mdcl\000\000\000.mcnm\000\000\000\004asbrmcna\000\000\000\020daap.songbitratemcty\000\000\000\002\000\003mdcl\000\000\000,mcnm\000\000\000\004asalmcna\000\000\000\016daap.songalbummcty\000\000\000\002\000\tmdcl\000\000\0008mcnm\000\000\000\004msasmcna\000\000\000\032dmap.authenticationschemesmcty\000\000\000\002\000\005mdcl\000\000\0000mcnm\000\000\000\004ascdmcna\000\000\000\022daap.songcodectypemcty\000\000\000\002\000\005mdcl\000\000\0007mcnm\000\000\000\004msaumcna\000\000\000\031dmap.authenticationmethodmcty\000\000\000\002\000\001mdcl\000\000\0000mcnm\000\000\000\004asdamcna\000\000\000\022daap.songdateaddedmcty\000\000\000\002\000\nmdcl\000\000\0001mcnm\000\000\000\004msbrmcna\000\000\000\023dmap.supportsbrowsemcty\000\000\000\002\000\001mdcl\000\000\0000mcnm\000\000\000\004asdcmcna\000\000\000\022daap.songdisccountmcty\000\000\000\002\000\003mdcl\000\000\0005mcnm\000\000\000\004asbtmcna\000\000\000\027daap.songbeatsperminutemcty\000\000\000\002\000\003mdcl\000\000\000.mcnm\000\000\000\004arifmcna\000\000\000\020daap.resolveinfomcty\000\000\000\002\000\fmdcl\000\000\000.mcnm\000\000\000\004ascmmcna\000\000\000\020daap.songcommentmcty\000\000\000\002\000\tmdcl\000\000\0009mcnm\000\000\000\004ascnmcna\000\000\000\edaap.songcontentdescriptionmcty\000\000\000\002\000\tmdcl\000\000\0002mcnm\000\000\000\004ascomcna\000\000\000\024daap.songcompilationmcty\000\000\000\002\000\001mdcl\000\000\000/mcnm\000\000\000\004ascpmcna\000\000\000\021daap.songcomposermcty\000\000\000\002\000\tmdcl\000\000\000/mcnm\000\000\000\004asdbmcna\000\000\000\021daap.songdisabledmcty\000\000\000\002\000\001mdcl\000\000\0001mcnm\000\000\000\004asdnmcna\000\000\000\023daap.songdiscnumbermcty\000\000\000\002\000\003mdcl\000\000\000/mcnm\000\000\000\004asctmcna\000\000\000\021daap.songcategorymcty\000\000\000\002\000\tmdcl\000\000\0004mcnm\000\000\000\004ascrmcna\000\000\000\026daap.songcontentratingmcty\000\000\000\002\000\001mdcl\000\000\0003mcnm\000\000\000\004ascsmcna\000\000\000\025daap.songcodecsubtypemcty\000\000\000\002\000\005mdcl\000\000\0002mcnm\000\000\000\004asdtmcna\000\000\000\024daap.songdescriptionmcty\000\000\000\002\000\tmdcl\000\000\000/mcnm\000\000\000\004asdkmcna\000\000\000\021daap.songdatakindmcty\000\000\000\002\000\001mdcl\000\000\000-mcnm\000\000\000\004asfmmcna\000\000\000\017daap.songformatmcty\000\000\000\002\000\tmdcl\000\000\000)mcnm\000\000\000\004miidmcna\000\000\000\vdmap.itemidmcty\000\000\000\002\000\005mdcl\000\000\000,mcnm\000\000\000\004asgnmcna\000\000\000\016daap.songgenremcty\000\000\000\002\000\tmdcl\000\000\000:mcnm\000\000\000\004aeNVmcna\000\000\000\034com.apple.itunes.norm-volumemcty\000\000\000\002\000\005mdcl\000\000\000)mcnm\000\000\000\004msttmcna\000\000\000\vdmap.statusmcty\000\000\000\002\000\005mdcl\000\000\000+mcnm\000\000\000\004mikdmcna\000\000\000\rdmap.itemkindmcty\000\000\000\002\000\001mdcl\000\000\0003mcnm\000\000\000\004asdmmcna\000\000\000\025daap.songdatemodifiedmcty\000\000\000\002\000\nmdcl\000\000\0006mcnm\000\000\000\004mtcomcna\000\000\000\030dmap.specifiedtotalcountmcty\000\000\000\002\000\005mdcl\000\000\000/mcnm\000\000\000\004agrpmcna\000\000\000\021daap.songgroupingmcty\000\000\000\002\000\tmdcl\000\000\000/mcnm\000\000\000\004aseqmcna\000\000\000\021daap.songeqpresetmcty\000\000\000\002\000\tmdcl\000\000\0000mcnm\000\000\000\004msixmcna\000\000\000\022dmap.supportsindexmcty\000\000\000\002\000\001mdcl\000\000\000:mcnm\000\000\000\004aeSImcna\000\000\000\034com.apple.itunes.itms-songidmcty\000\000\000\002\000\005mdcl\000\000\000=mcnm\000\000\000\004aeSPmcna\000\000\000\037com.apple.itunes.smart-playlistmcty\000\000\000\002\000\001mdcl\000\000\0000mcnm\000\000\000\004mslrmcna\000\000\000\022dmap.loginrequiredmcty\000\000\000\002\000\001mdcl\000\000\0009mcnm\000\000\000\004aePCmcna\000\000\000\ecom.apple.itunes.is-podcastmcty\000\000\000\002\000\001mdcl\000\000\0003mcnm\000\000\000\004mudlmcna\000\000\000\025dmap.deletedidlistingmcty\000\000\000\002\000\fmdcl\000\000\000Dmcnm\000\000\000\004aeSVmcna\000\000\000&com.apple.itunes.music-sharing-versionmcty\000\000\000\002\000\005mdcl\000\000\000+mcnm\000\000\000\004minmmcna\000\000\000\rdmap.itemnamemcty\000\000\000\002\000\tmdcl\000\000\000/mcnm\000\000\000\004askymcna\000\000\000\021daap.songkeywordsmcty\000\000\000\002\000\tmdcl\000\000\0008mcnm\000\000\000\004mspimcna\000\000\000\032dmap.supportspersistentidsmcty\000\000\000\002\000\001mdcl\000\000\000*mcnm\000\000\000\004arsvmcna\000\000\000\fdaap.resolvemcty\000\000\000\002\000\fmdcl\000\000\0005mcnm\000\000\000\004abalmcna\000\000\000\027daap.browsealbumlistingmcty\000\000\000\002\000\fmdcl\000\000\0002mcnm\000\000\000\004avdbmcna\000\000\000\024daap.serverdatabasesmcty\000\000\000\002\000\fmdcl\000\000\000&mcnm\000\000\000\004mbclmcna\000\000\000\010dmap.bagmcty\000\000\000\002\000\fmdcl\000\000\0006mcnm\000\000\000\004abarmcna\000\000\000\030daap.browseartistlistingmcty\000\000\000\002\000\fmdcl\000\000\0002mcnm\000\000\000\004msrsmcna\000\000\000\024dmap.supportsresolvemcty\000\000\000\002\000\001mdcl\000\000\0000mcnm\000\000\000\004msqymcna\000\000\000\022dmap.supportsquerymcty\000\000\000\002\000\001mdcl\000\000\0005mcnm\000\000\000\004msrvmcna\000\000\000\027dmap.serverinforesponsemcty\000\000\000\002\000\fmdcl\000\000\0002mcnm\000\000\000\004mstmmcna\000\000\000\024dmap.timeoutintervalmcty\000\000\000\002\000\005mdcl\000\000\0008mcnm\000\000\000\004abcpmcna\000\000\000\032daap.browsecomposerlistingmcty\000\000\000\002\000\fmdcl\000\000\000/mcnm\000\000\000\004asspmcna\000\000\000\021daap.songstoptimemcty\000\000\000\002\000\005mdcl\000\000\0005mcnm\000\000\000\004asrvmcna\000\000\000\027daap.songrelativevolumemcty\000\000\000\002\000\002mdcl\000\000\000+mcnm\000\000\000\004astmmcna\000\000\000\rdaap.songtimemcty\000\000\000\002\000\005mdcl\000\000\0002mcnm\000\000\000\004astnmcna\000\000\000\024daap.songtracknumbermcty\000\000\000\002\000\003mdcl\000\000\0001mcnm\000\000\000\004msupmcna\000\000\000\023dmap.supportsupdatemcty\000\000\000\002\000\001mdcl\000\000\000.mcnm\000\000\000\004asulmcna\000\000\000\020daap.songdataurlmcty\000\000\000\002\000\tmdcl\000\000\000,mcnm\000\000\000\004mlidmcna\000\000\000\016dmap.sessionidmcty\000\000\000\002\000\005mdcl\000\000\000+mcnm\000\000\000\004asszmcna\000\000\000\rdaap.songsizemcty\000\000\000\002\000\005mdcl\000\000\000,mcnm\000\000\000\004mimcmcna\000\000\000\016dmap.itemcountmcty\000\000\000\002\000\005mdcl\000\000\0001mcnm\000\000\000\004asurmcna\000\000\000\023daap.songuserratingmcty\000\000\000\002\000\001mdcl\000\000\0005mcnm\000\000\000\004abgnmcna\000\000\000\027daap.browsegenrelistingmcty\000\000\000\002\000\fmdcl\000\000\0001mcnm\000\000\000\004mupdmcna\000\000\000\023dmap.updateresponsemcty\000\000\000\002\000\fmdcl\000\000\0007mcnm\000\000\000\004mccrmcna\000\000\000\031dmap.contentcodesresponsemcty\000\000\000\002\000\fmdcl\000\000\0001mcnm\000\000\000\004astcmcna\000\000\000\023daap.songtrackcountmcty\000\000\000\002\000\003mdcl\000\000\000.mcnm\000\000\000\004mlitmcna\000\000\000\020dmap.listingitemmcty\000\000\000\002\000\fmdcl\000\000\000=mcnm\000\000\000\004aslcmcna\000\000\000\037daap.songlongcontentdescriptionmcty\000\000\000\002\000\tmdcl\000\000\000+mcnm\000\000\000\004asyrmcna\000\000\000\rdaap.songyearmcty\000\000\000\002\000\003mdcl\000\000\000-mcnm\000\000\000\004mdclmcna\000\000\000\017dmap.dictionarymcty\000\000\000\002\000\fmdcl\000\000\0000mcnm\000\000\000\004mlogmcna\000\000\000\022dmap.loginresponsemcty\000\000\000\002\000\fmdcl\000\000\0000mcnm\000\000\000\004adbsmcna\000\000\000\022daap.databasesongsmcty\000\000\000\002\000\fmdcl\000\000\0001mcnm\000\000\000\004musrmcna\000\000\000\023dmap.serverrevisionmcty\000\000\000\002\000\005mdcl\000\000\000Bmcnm\000\000\000\004aePPmcna\000\000\000$com.apple.itunes.is-podcast-playlistmcty\000\000\000\002\000\001mdcl\000\000\0001mcnm\000\000\000\004msdcmcna\000\000\000\023dmap.databasescountmcty\000\000\000\002\000\005mdcl\000\000\0003mcnm\000\000\000\004mcnamcna\000\000\000\025dmap.contentcodesnamemcty\000\000\000\002\000\tmdcl\000\000\000-mcnm\000\000\000\004mutymcna\000\000\000\017dmap.updatetypemcty\000\000\000\002\000\001mdcl\000\000\0005mcnm\000\000\000\004mcnmmcna\000\000\000\027dmap.contentcodesnumbermcty\000\000\000\002\000\005mdcl\000\000\0001mcnm\000\000\000\004abromcna\000\000\000\023daap.databasebrowsemcty\000\000\000\002\000\fmdcl\000\000\000,mcnm\000\000\000\004mconmcna\000\000\000\016dmap.containermcty\000\000\000\002\000\fmdcl\000\000\0001mcnm\000\000\000\004mctcmcna\000\000\000\023dmap.containercountmcty\000\000\000\002\000\005mdcl\000\000\0004mcnm\000\000\000\004mpcomcna\000\000\000\026dmap.parentcontaineridmcty\000\000\000\002\000\005mdcl\000\000\0002mcnm\000\000\000\004mctimcna\000\000\000\024dmap.containeritemidmcty\000\000\000\002\000\005mdcl\000\000\000/mcnm\000\000\000\004mstsmcna\000\000\000\021dmap.statusstringmcty\000\000\000\002\000\tmdcl\000\000\0002mcnm\000\000\000\004mpromcna\000\000\000\024dmap.protocolversionmcty\000\000\000\002\000\vmdcl\000\000\000/mcnm\000\000\000\004abplmcna\000\000\000\021daap.baseplaylistmcty\000\000\000\002\000\001mdcl\000\000\000/mcnm\000\000\000\004mpermcna\000\000\000\021dmap.persistentidmcty\000\000\000\002\000\amdcl\000\000\000*mcnm\000\000\000\004mlclmcna\000\000\000\fdmap.listingmcty\000\000\000\002\000\fmdcl\000\000\0003mcnm\000\000\000\004mctymcna\000\000\000\025dmap.contentcodestypemcty\000\000\000\002\000\003mdcl\000\000\000<mcnm\000\000\000\004aeAImcna\000\000\000\036com.apple.itunes.itms-artistidmcty\000\000\000\002\000\005mdcl\000\000\000>mcnm\000\000\000\004aePImcna\000\000\000 com.apple.itunes.itms-playlistidmcty\000\000\000\002\000\005mdcl\000\000\0005mcnm\000\000\000\004f\215chmcna\000\000\000\027dmap.haschildcontainersmcty\000\000\000\002\000\001mdcl\000\000\000>mcnm\000\000\000\004aeCImcna\000\000\000 com.apple.itunes.itms-composeridmcty\000\000\000\002\000\005" diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp index c26f72d9..9dea6685 100644 --- a/amarok/src/mediadevice/daap/daapclient.cpp +++ b/amarok/src/mediadevice/daap/daapclient.cpp @@ -403,37 +403,37 @@ DaapClient::createTree( const TQString& /*host*/, Daap::SongList bundles ) TQStringList artists = bundles.keys(); foreach( artists ) { - MediaItem* tqparentArtist = new MediaItem( root ); - tqparentArtist->setType( MediaItem::ARTIST ); + MediaItem* parentArtist = new MediaItem( root ); + parentArtist->setType( MediaItem::ARTIST ); Daap::AlbumList albumMap = *( bundles.tqfind(*it) ); - tqparentArtist->setText( 0, (*albumMap.begin()).getFirst()->artist() ); //map was made case insensitively + parentArtist->setText( 0, (*albumMap.begin()).getFirst()->artist() ); //map was made case insensitively //just get the displayed-case from //the first track TQStringList albums = albumMap.keys(); for ( TQStringList::Iterator itAlbum = albums.begin(); itAlbum != albums.end(); ++itAlbum ) { - MediaItem* tqparentAlbum = new MediaItem( tqparentArtist ); - tqparentAlbum->setType( MediaItem::ALBUM ); + MediaItem* parentAlbum = new MediaItem( parentArtist ); + parentAlbum->setType( MediaItem::ALBUM ); MetaBundle* track; Daap::TrackList trackList = *albumMap.tqfind(*itAlbum); - tqparentAlbum->setText( 0, trackList.getFirst()->album() ); + parentAlbum->setText( 0, trackList.getFirst()->album() ); for( track = trackList.first(); track; track = trackList.next() ) { if( m_removeDuplicates && trackExistsInCollection( track ) ) continue; - MediaItem* childTrack = new MediaItem( tqparentAlbum ); + MediaItem* childTrack = new MediaItem( parentAlbum ); childTrack->setText( 0, track->title() ); childTrack->setType( MediaItem::TRACK ); childTrack->setBundle( track ); childTrack->m_order = track->track(); } - if( !tqparentAlbum->childCount() ) - delete tqparentAlbum; + if( !parentAlbum->childCount() ) + delete parentAlbum; } - if( !tqparentArtist->childCount() ) - delete tqparentArtist; + if( !parentArtist->childCount() ) + delete parentArtist; } root->resetTitle(); root->stopAnimation(); diff --git a/amarok/src/mediadevice/daap/daapreader/reader.cpp b/amarok/src/mediadevice/daap/daapreader/reader.cpp index 34d77f71..c501561a 100644 --- a/amarok/src/mediadevice/daap/daapreader/reader.cpp +++ b/amarok/src/mediadevice/daap/daapreader/reader.cpp @@ -122,7 +122,7 @@ Reader::Reader(const TQString& host, TQ_UINT16 port, ServerItem* root, const TQS s_codes["asda"] = Code( "daap.songdateadded", DATE ); s_codes["asbr"] = Code( "daap.songbitrate", SHORT ); s_codes["mcti"] = Code( "dmap.containeritemid", LONG ); - s_codes["mpco"] = Code( "dmap.tqparentcontainerid", LONG ); + s_codes["mpco"] = Code( "dmap.parentcontainerid", LONG ); s_codes["msdc"] = Code( "dmap.databasescount", LONG ); s_codes["mlog"] = Code( "dmap.loginresponse", CONTAINER ); s_codes["mlid"] = Code( "dmap.sessionid", LONG ); @@ -407,12 +407,12 @@ Reader::parse( TQDataStream &raw, uint containerLength, bool first ) } void -Reader::addElement( Map &tqparentMap, char* tag, TQVariant element ) +Reader::addElement( Map &parentMap, char* tag, TQVariant element ) { - if( !tqparentMap.tqcontains( tag ) ) - tqparentMap[tag] = TQVariant( TQValueList<TQVariant>() ); + if( !parentMap.tqcontains( tag ) ) + parentMap[tag] = TQVariant( TQValueList<TQVariant>() ); - tqparentMap[tag].asList().append(element); + parentMap[tag].asList().append(element); } void diff --git a/amarok/src/mediadevice/daap/daapreader/reader.h b/amarok/src/mediadevice/daap/daapreader/reader.h index eab97538..c05ce0ce 100644 --- a/amarok/src/mediadevice/daap/daapreader/reader.h +++ b/amarok/src/mediadevice/daap/daapreader/reader.h @@ -92,7 +92,7 @@ namespace Daap * @param containerLength length of the container (or entire result) being analyzed */ static Map parse( TQDataStream &raw, uint containerLength, bool first = false ); - static void addElement( Map &tqparentMap, char* tag, TQVariant element ); //! supporter function for parse + static void addElement( Map &parentMap, char* tag, TQVariant element ); //! supporter function for parse static TQ_UINT32 getTagAndLength( TQDataStream &raw, char tag[5] ); static TQMap<TQString, Code> s_codes; diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp index 33256369..b508a0f3 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.cpp +++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp @@ -614,8 +614,8 @@ GenericMediaDevice::buildPodcastDestination( const PodcastEpisodeBundle *bundle { TQString location = m_podcastLocation.endsWith("/") ? m_podcastLocation : m_podcastLocation + '/'; // get info about the PodcastChannel - TQString tqparentUrl = bundle->tqparent().url(); - TQString sql = "SELECT title,tqparent FROM podcastchannels WHERE url='" + CollectionDB::instance()->escapeString( tqparentUrl ) + "';"; + TQString parentUrl = bundle->tqparent().url(); + TQString sql = "SELECT title,tqparent FROM podcastchannels WHERE url='" + CollectionDB::instance()->escapeString( parentUrl ) + "';"; TQStringList values = CollectionDB::instance()->query( sql ); TQString channelTitle; int tqparent = 0; @@ -854,9 +854,9 @@ GenericMediaDevice::addTrackToList( int type, KURL url, int /*size*/ ) TQString path = url.isLocalFile() ? url.path( -1 ) : url.prettyURL( -1 ); //no trailing slash int index = path.tqfindRev( '/', -1 ); TQString baseName = path.right( path.length() - index - 1 ); - TQString tqparentName = path.left( index ); + TQString parentName = path.left( index ); - GenericMediaFile* tqparent = m_mfm[tqparentName]; + GenericMediaFile* tqparent = m_mfm[parentName]; GenericMediaFile* newItem = new GenericMediaFile( tqparent, baseName, this ); if( type == MediaItem::DIRECTORY ) //directory diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui index 4d050ede..7bc1bc2d 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui @@ -456,7 +456,7 @@ <function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">destroy()</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.h b/amarok/src/mediadevice/ifp/ifpmediadevice.h index 378181a6..8aa6b66c 100644 --- a/amarok/src/mediadevice/ifp/ifpmediadevice.h +++ b/amarok/src/mediadevice/ifp/ifpmediadevice.h @@ -87,7 +87,7 @@ class IfpMediaDevice : public MediaDevice // miscellaneous methods static int filetransferCallback( void *pData, struct ifp_transfer_status *progress ); int setProgressInfo( struct ifp_transfer_status *progress ); - // Will iterate over tqparents and add directory name to the item. + // Will iterate over parents and add directory name to the item. // getFilename = false will return only tqparent structure, as opposed to returning the filename as well TQString getFullPath( const TQListViewItem *item, const bool getFilename = true ); TQString cleanPath( const TQString &component ); diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp index e7bec53d..a6c04176 100644 --- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp +++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp @@ -666,15 +666,15 @@ IpodMediaDevice::copyTrackToDevice(const MetaBundle &bundle) while ( !dir.exists() ) { TQString path = dir.absPath(); - TQDir tqparentdir; + TQDir parentdir; TQDir create; do { create.setPath(path); path = path.section("/", 0, path.tqcontains('/')-1); - tqparentdir.setPath(path); + parentdir.setPath(path); } - while( !path.isEmpty() && !(path==mountPoint()) && !tqparentdir.exists() ); + while( !path.isEmpty() && !(path==mountPoint()) && !parentdir.exists() ); debug() << "trying to create \"" << path << "\"" << endl; if(!create.mkdir( create.absPath() )) { diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp index a96adec3..da29ba97 100644 --- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp +++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp @@ -372,11 +372,11 @@ uint32_t MtpMediaDevice::getDefaultParentId( void ) { // Decide which folder to send it to: - // If the device gave us a tqparent_folder setting, we use it + // If the device gave us a parent_folder setting, we use it uint32_t parent_id = 0; - if( m_default_tqparent_folder ) + if( m_default_parent_folder ) { - parent_id = m_default_tqparent_folder; + parent_id = m_default_parent_folder; } // Otherwise look for a folder called "Music" else if( m_folders != 0 ) @@ -1120,8 +1120,8 @@ MtpMediaDevice::openDevice( bool silent ) if(! ownername.isEmpty() ) m_name += " (" + ownername + ')'; - m_default_tqparent_folder = m_device->default_music_folder; - debug() << "setting default tqparent : " << m_default_tqparent_folder << endl; + m_default_parent_folder = m_device->default_music_folder; + debug() << "setting default tqparent : " << m_default_parent_folder << endl; MtpMediaDevice::readMtpMusic(); diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.h b/amarok/src/mediadevice/mtp/mtpmediadevice.h index 26455a6e..e8a595a6 100644 --- a/amarok/src/mediadevice/mtp/mtpmediadevice.h +++ b/amarok/src/mediadevice/mtp/mtpmediadevice.h @@ -173,10 +173,10 @@ class MtpMediaDevice : public MediaDevice void clearItems(); int deleteObject( MtpMediaItem *deleteItem ); uint32_t checkFolderStructure( const MetaBundle &bundle, bool create = true ); - uint32_t createFolder( const char *name, uint32_t tqparent_id ); + uint32_t createFolder( const char *name, uint32_t parent_id ); uint32_t getDefaultParentId( void ); uint32_t folderNameToID( char *name, LIBMTP_folder_t *folderlist ); - uint32_t subfolderNameToID( const char *name, LIBMTP_folder_t *folderlist, uint32_t tqparent_id ); + uint32_t subfolderNameToID( const char *name, LIBMTP_folder_t *folderlist, uint32_t parent_id ); void updateFolders( void ); void initView( void ); void readPlaylists( void ); @@ -190,7 +190,7 @@ class MtpMediaDevice : public MediaDevice TQMutex m_mutex; TQMutex m_critical_mutex; LIBMTP_folder_t *m_folders; - uint32_t m_default_tqparent_folder; + uint32_t m_default_parent_folder; TQString m_folderStructure; TQLineEdit *m_folderStructureBox; TQLabel *m_folderLabel; diff --git a/amarok/src/metabundle.cpp b/amarok/src/metabundle.cpp index 4bc90655..3f9085de 100644 --- a/amarok/src/metabundle.cpp +++ b/amarok/src/metabundle.cpp @@ -363,7 +363,7 @@ MetaBundle::operator=( const MetaBundle& bundle ) } -// delete m_podcastBundle; why does this crash Amarok? aptqparently m_podcastBundle isn't always initialized. +// delete m_podcastBundle; why does this crash Amarok? apparently m_podcastBundle isn't always initialized. m_podcastBundle = 0; if( bundle.m_podcastBundle ) setPodcastBundle( *bundle.m_podcastBundle ); diff --git a/amarok/src/metabundle.h b/amarok/src/metabundle.h index ddfd3f0e..d621c688 100644 --- a/amarok/src/metabundle.h +++ b/amarok/src/metabundle.h @@ -103,7 +103,7 @@ public: /** This is a bit vector for selecting columns. It's very fast to compare in matchFast. It might be a good idea to replace the TQValue<int> - column tqmasks with this eventually. */ + column masks with this eventually. */ typedef TQ_UINT32 ColumnMask; /** Returns the name of the column at \p index as a string -- not i18ned, for internal purposes. */ diff --git a/amarok/src/moodbar.cpp b/amarok/src/moodbar.cpp index 9b89901b..239e7622 100644 --- a/amarok/src/moodbar.cpp +++ b/amarok/src/moodbar.cpp @@ -802,7 +802,7 @@ Moodbar::detach( void ) m_data = TQDeepCopy<ColorList>(m_data); m_pixmap.detach(); - // Aptqparently this is the wrong hack -- don't detach urls + // Apparently this is the wrong hack -- don't detach urls //TQString url( TQDeepCopy<TQString>( m_url.url() ) ); //m_url = KURL::fromPathOrURL( url ); diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp index 83bd4fae..0e256114 100644 --- a/amarok/src/multitabbar.cpp +++ b/amarok/src/multitabbar.cpp @@ -596,14 +596,14 @@ void MultiTabBarButton::setStyle( MultiTabBar::MultiTabBarStyle style ) void MultiTabBarButton::hideEvent( TQHideEvent* he ) { TQPushButton::hideEvent( he ); - MultiTabBar *tb = dynamic_cast<MultiTabBar*>( tqparentWidget() ); + MultiTabBar *tb = dynamic_cast<MultiTabBar*>( parentWidget() ); if ( tb ) tb->updateSeparator(); } void MultiTabBarButton::showEvent( TQShowEvent* he ) { TQPushButton::showEvent( he ); - MultiTabBar *tb = dynamic_cast<MultiTabBar*>( tqparentWidget() ); + MultiTabBar *tb = dynamic_cast<MultiTabBar*>( parentWidget() ); if ( tb ) tb->updateSeparator(); } @@ -709,9 +709,9 @@ TQSize MultiTabBarButton::tqsizeHint() const // //PATCH by markey // if ( ( m_style == MultiTabBar::AMAROK ) ) { // if( m_position == MultiTabBar::Left || m_position == MultiTabBar::Right ) -// w = ( tqparentWidget()->height() - 3 ) / NUM_TABS; +// w = ( parentWidget()->height() - 3 ) / NUM_TABS; // else -// h = ( tqparentWidget()->width() - 3 ) / NUM_TABS; +// h = ( parentWidget()->width() - 3 ) / NUM_TABS; // } return ( tqstyle().tqsizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ). diff --git a/amarok/src/newdynamic.ui b/amarok/src/newdynamic.ui index 9d663392..7c49c2dd 100644 --- a/amarok/src/newdynamic.ui +++ b/amarok/src/newdynamic.ui @@ -351,7 +351,7 @@ <tabstop>m_previousIntSpinBox</tabstop> <tabstop>m_upcomingIntSpinBox</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/amarok/src/organizecollectiondialog.ui b/amarok/src/organizecollectiondialog.ui index 0ec408da..f63b6b1f 100644 --- a/amarok/src/organizecollectiondialog.ui +++ b/amarok/src/organizecollectiondialog.ui @@ -585,7 +585,7 @@ <function returnType="TQString">cleanPath( const QString & component )</function> <function>init()</function> </functions> -<tqlayoutdefaults spacing="6" margin="0"/> +<layoutdefaults spacing="6" margin="0"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp index ae9b1042..a2d56205 100644 --- a/amarok/src/osd.cpp +++ b/amarok/src/osd.cpp @@ -668,7 +668,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot { TQString tag; TQValueVector<int> availableTags; //eg, ones that aren't empty - static const TQValueList<int> parens = //display these in tqparentheses + static const TQValueList<int> parens = //display these in parentheses TQValueList<int>() << PlaylistItem::PlayCount << PlaylistItem::Year << PlaylistItem::Comment << PlaylistItem::Genre << PlaylistItem::Length << PlaylistItem::Bitrate << PlaylistItem::LastPlayed << PlaylistItem::Score << PlaylistItem::Filesize; diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp index 885bdf45..70ac5029 100644 --- a/amarok/src/playerwindow.cpp +++ b/amarok/src/playerwindow.cpp @@ -578,7 +578,7 @@ bool PlayerWidget::event( TQEvent *e ) //create! If you have an issue with the behaviour bring it up on the mailing //list before you even think about committing. Thanks! (includes case Hide) - const WId id = tqparentWidget()->winId(); + const WId id = parentWidget()->winId(); const uint desktop = KWin::windowInfo( winId() ).desktop(); const KWin::WindowInfo info = KWin::windowInfo( id ); @@ -594,8 +594,8 @@ bool PlayerWidget::event( TQEvent *e ) //XDeleteProperty( qt_xdisplay(), id, qt_wm_state ); - //tqparentWidget()->show(); - //if( !tqparentWidget()->isShown() ) XMapWindow( qt_xdisplay(), id ); + //parentWidget()->show(); + //if( !parentWidget()->isShown() ) XMapWindow( qt_xdisplay(), id ); // unsigned long data[2]; // data[0] = (unsigned long) NormalState; // data[1] = (unsigned long) None; @@ -608,7 +608,7 @@ bool PlayerWidget::event( TQEvent *e ) // XMapWindow( qt_xdisplay(), id ); // //KWin::deIconifyWindow( id, false ); - tqparentWidget()->show(); + parentWidget()->show(); } @@ -630,7 +630,7 @@ bool PlayerWidget::event( TQEvent *e ) //this prevents the PlaylistButton being set to off (see the eventFilter) //by leaving it on we ensure that we show the Playlist Window again when //we are next shown (see Show event handler above) - if( tqparentWidget()->isShown() ) dontChangeButtonState = true; + if( parentWidget()->isShown() ) dontChangeButtonState = true; if( e->spontaneous() ) //the window system caused the event { @@ -640,7 +640,7 @@ bool PlayerWidget::event( TQEvent *e ) const KWin::WindowInfo info = KWin::windowInfo( winId() ); - if( info.isMinimized() ) KWin::iconifyWindow( tqparentWidget()->winId(), false ); + if( info.isMinimized() ) KWin::iconifyWindow( parentWidget()->winId(), false ); else //this may seem strange, but it is correct //we have a handler in eventFilter for all other eventualities @@ -651,7 +651,7 @@ bool PlayerWidget::event( TQEvent *e ) //we caused Amarok to hide, so we should hide the Playlist Window //NOTE we "override" closeEvents and thus they count as non-spontaneous //hideEvents; which frankly is a huge relief! - tqparentWidget()->hide(); + parentWidget()->hide(); } return false; @@ -712,7 +712,7 @@ PlayerWidget::eventFilter( TQObject *o, TQEvent *e ) //we want to avoid setting the button for most spontaneous events //since they are not user driven, two are however: - KWin::WindowInfo info = KWin::windowInfo( tqparentWidget()->winId() ); + KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() ); if( !info.isMinimized() ) break; } diff --git a/amarok/src/playerwindow.h b/amarok/src/playerwindow.h index 283aa900..08552fc9 100644 --- a/amarok/src/playerwindow.h +++ b/amarok/src/playerwindow.h @@ -134,7 +134,7 @@ class PlayerWidget : public TQWidget, public EngineObserver virtual void mouseMoveEvent( TQMouseEvent* ); ///to make the code clearer to n00bies ;) - TQWidget *playlistWindow() { return tqparentWidget(); } + TQWidget *playlistWindow() { return parentWidget(); } static const int SCROLL_RATE = 1; static const int ANIM_TIMER = 30; diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp index f1c92bca..813ce594 100644 --- a/amarok/src/playlist.cpp +++ b/amarok/src/playlist.cpp @@ -1833,7 +1833,7 @@ Playlist::setCurrentTrack( PlaylistItem *item ) if ( prev ) { //reset to normal height - prev->tqinvalidateHeight(); + prev->invalidateHeight(); prev->setup(); //remove pixmap in first column prev->setPixmap( m_firstColumn, TQPixmap() ); @@ -2094,7 +2094,7 @@ Playlist::engineStateChanged( Engine::State state, Engine::State /*oldState*/ ) } //POSSIBLYAHACK - //aptqparently you can't rely on EngineController::engine()->state() == state here, so pass it explicitly + //apparently you can't rely on EngineController::engine()->state() == state here, so pass it explicitly setCurrentTrackPixmap( state ); } @@ -2371,7 +2371,7 @@ Playlist::paletteChange( const TQPalette &p ) KListView::paletteChange( p ); - counter = 0; // reset the counter or aptqparently the text lacks contrast + counter = 0; // reset the counter or apparently the text lacks contrast slotGlowTimer(); // tqrepaint currentTrack marker } @@ -4402,7 +4402,7 @@ void Playlist::ensureItemCentered( TQListViewItem *item ) if( !item ) return; - //HACK -- aptqparently the various metrics aren't reliable while the UI is still updating & stuff + //HACK -- apparently the various metrics aren't reliable while the UI is still updating & stuff m_itemToReallyCenter = item; TQTimer::singleShot( 0, this, TQT_SLOT( reallyEnsureItemCentered() ) ); } @@ -4797,7 +4797,7 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items ) textLabel2->setBuddy( lineEdit1 ); textLabel3->setBuddy( lineEdit2 ); - // tqlayouts + // layouts TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6 ); tqlayout1->addItem( new TQSpacerItem( 181, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); tqlayout1->addWidget( new KPushButton( KStdGuiItem::ok(), this, "OkButton" ) ); diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp index 0e55ec7a..36b2a7db 100644 --- a/amarok/src/playlistbrowser.cpp +++ b/amarok/src/playlistbrowser.cpp @@ -1172,9 +1172,9 @@ DEBUG_BLOCK foreachType( TQValueList<PodcastChannelBundle>, channels ) { PlaylistCategory *tqparent = p; - const int tqparentId = (*it).tqparentId(); - if( tqparentId > 0 && folderMap.tqfind( tqparentId ) != folderMap.end() ) - tqparent = folderMap[tqparentId]; + const int parentId = (*it).parentId(); + if( parentId > 0 && folderMap.tqfind( parentId ) != folderMap.end() ) + tqparent = folderMap[parentId]; channel = new PodcastChannel( tqparent, channel, *it ); @@ -1206,12 +1206,12 @@ DEBUG_BLOCK { const int id = (*it).toInt(); const TQString t = *++it; - const int tqparentId = (*++it).toInt(); + const int parentId = (*++it).toInt(); const bool isOpen = ( (*++it) == CollectionDB::instance()->boolT() ? true : false ); PlaylistCategory *tqparent = p; - if( tqparentId > 0 && folderMap.tqfind( tqparentId ) != folderMap.end() ) - tqparent = folderMap[tqparentId]; + if( parentId > 0 && folderMap.tqfind( parentId ) != folderMap.end() ) + tqparent = folderMap[parentId]; folder = new PlaylistCategory( tqparent, folder, t, id ); folder->setOpen( isOpen ); @@ -1242,14 +1242,14 @@ void PlaylistBrowser::savePodcastFolderStates( PlaylistCategory *folder ) { if( folder->id() < 0 ) // probably due to a 1.3->1.4 migration { // we add the folder to the db, set the id and then update all the tqchildren - int tqparentId = static_cast<PlaylistCategory*>(folder->tqparent())->id(); - int newId = CollectionDB::instance()->addPodcastFolder( folder->text(0), tqparentId, folder->isOpen() ); + int parentId = static_cast<PlaylistCategory*>(folder->tqparent())->id(); + int newId = CollectionDB::instance()->addPodcastFolder( folder->text(0), parentId, folder->isOpen() ); folder->setId( newId ); PodcastChannel *chan = static_cast<PodcastChannel*>(folder->firstChild()); while( chan ) { if( isPodcastChannel( chan ) ) - // will update the database so child has correct tqparentId. + // will update the database so child has correct parentId. chan->setParent( folder ); chan = static_cast<PodcastChannel*>(chan->nextSibling()); } @@ -3168,7 +3168,7 @@ InfoPane::getHeight() if( TQT_TQWIDGET( child( "container" ) )->isShown() ) { //If the InfoPane is shown, return true height. - return static_cast<TQSplitter*>( tqparentWidget() )->sizes().last(); + return static_cast<TQSplitter*>( parentWidget() )->sizes().last(); } return m_storedHeight; @@ -3182,7 +3182,7 @@ InfoPane::setStoredHeight( const int newHeight ) { void InfoPane::toggle( bool toggled ) { - TQSplitter *splitter = static_cast<TQSplitter*>( tqparentWidget() ); + TQSplitter *splitter = static_cast<TQSplitter*>( parentWidget() ); if ( !toggled ) { @@ -3196,7 +3196,7 @@ InfoPane::toggle( bool toggled ) m_pushButton->setEnabled( m_enable ); } else { - setMaximumHeight( ( int )( tqparentWidget()->height() / 1.5 ) ); + setMaximumHeight( ( int )( parentWidget()->height() / 1.5 ) ); //Restore the height of the InfoPane (change the splitter properties) //Done every time since the pane forgets its height if you try to resize it while the info is hidden. diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp index 2c800ad0..96a00f5a 100644 --- a/amarok/src/playlistbrowseritem.cpp +++ b/amarok/src/playlistbrowseritem.cpp @@ -249,8 +249,8 @@ void PlaylistCategory::okRename( int col ) if( m_id < 0 ) return; // update the database entry to have the correct name - const int tqparentId = tqparent() ? static_cast<PlaylistCategory*>(tqparent())->id() : 0; - CollectionDB::instance()->updatePodcastFolder( m_id, text(0), tqparentId, isOpen() ); + const int parentId = tqparent() ? static_cast<PlaylistCategory*>(tqparent())->id() : 0; + CollectionDB::instance()->updatePodcastFolder( m_id, text(0), parentId, isOpen() ); } void PlaylistCategory::setXml( const TQDomElement &xml ) @@ -399,10 +399,10 @@ PlaylistCategory::showContextMenu( const TQPoint &position ) enum Actions { RENAME, REMOVE, CREATE, PLAYLIST, PLAYLIST_IMPORT, SMART, STREAM, DYNAMIC, LASTFM, LASTFMCUSTOM, PODCAST, REFRESH, CONFIG, INTERVAL }; - TQListViewItem *tqparentCat = this; + TQListViewItem *parentCat = this; - while( tqparentCat->tqparent() ) - tqparentCat = tqparentCat->tqparent(); + while( parentCat->tqparent() ) + parentCat = parentCat->tqparent(); bool isPodcastFolder = false; @@ -412,37 +412,37 @@ PlaylistCategory::showContextMenu( const TQPoint &position ) menu.insertSeparator(); } - if( tqparentCat == static_cast<TQListViewItem*>( PlaylistBrowser::instance()->m_playlistCategory) ) + if( parentCat == static_cast<TQListViewItem*>( PlaylistBrowser::instance()->m_playlistCategory) ) { menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Create Playlist..."), PLAYLIST ); menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Import Playlist..."), PLAYLIST_IMPORT ); } - else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_smartCategory) ) + else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_smartCategory) ) menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("New Smart Playlist..."), SMART ); - else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_dynamicCategory) ) + else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_dynamicCategory) ) menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("New Dynamic Playlist..."), DYNAMIC ); - else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_streamsCategory) ) + else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_streamsCategory) ) menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Radio Stream..."), STREAM ); - else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_lastfmCategory) ) + else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_lastfmCategory) ) { menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Last.fm Radio..."), LASTFM ); menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Custom Last.fm Radio..."), LASTFMCUSTOM ); } - else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_podcastCategory) ) + else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_podcastCategory) ) { isPodcastFolder = true; menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n("Add Podcast..."), PODCAST ); menu.insertItem( SmallIconSet( Amarok::icon( "refresh" ) ), i18n("Refresh All Podcasts"), REFRESH ); menu.insertSeparator(); menu.insertItem( SmallIconSet( Amarok::icon( "configure" ) ), i18n( "&Configure Podcasts..." ), CONFIG ); - if( tqparentCat->childCount() == 0 ) + if( parentCat->childCount() == 0 ) menu.setItemEnabled( CONFIG, false ); - if( tqparentCat == this ) + if( parentCat == this ) menu.insertItem( SmallIconSet( Amarok::icon( "configure" ) ), i18n("Scan Interval..."), INTERVAL ); } @@ -2428,10 +2428,10 @@ PodcastEpisode::PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after, if( title.isEmpty() ) title = link.fileName(); - KURL tqparentUrl = static_cast<PodcastChannel*>(tqparent)->url(); + KURL parentUrl = static_cast<PodcastChannel*>(tqparent)->url(); m_bundle.setDBId( -1 ); m_bundle.setURL( link ); - m_bundle.setParent( tqparentUrl ); + m_bundle.setParent( parentUrl ); m_bundle.setTitle( title ); m_bundle.setSubtitle( subtitle ); m_bundle.setAuthor( author ); @@ -2587,8 +2587,8 @@ void PodcastEpisode::createLocalDir( const KURL &localDir ) TQString localDirString = localDir.path(); if( !TQFile::exists( localDirString ) ) { - TQString tqparentDirString = localDir.directory( true, true ); - createLocalDir( tqparentDirString ); + TQString parentDirString = localDir.directory( true, true ); + createLocalDir( parentDirString ); TQDir dir( localDirString ); dir.mkdir( localDirString ); } diff --git a/amarok/src/podcastbundle.h b/amarok/src/podcastbundle.h index c5738228..5df89ae0 100644 --- a/amarok/src/podcastbundle.h +++ b/amarok/src/podcastbundle.h @@ -13,7 +13,7 @@ class PodcastChannelBundle { public: PodcastChannelBundle() - : m_tqparentId( -1 ) + : m_parentId( -1 ) , m_autoscan( false ) , m_fetchType( -1 ) , m_autotransfer( false ) @@ -28,7 +28,7 @@ class PodcastChannelBundle m_link = link; m_description = desc; m_copyright = copy; - m_tqparentId = -1; + m_parentId = -1; setSettings( settings ); } @@ -61,7 +61,7 @@ class PodcastChannelBundle const TQString &description() const; const TQString ©right() const; /// The id which the tqparent folder has in the database - int tqparentId() const; + int parentId() const; void setURL( const KURL &u ); void setTitle( const TQString &t ); @@ -95,7 +95,7 @@ class PodcastChannelBundle KURL m_imageUrl; TQString m_description; TQString m_copyright; - int m_tqparentId; + int m_parentId; TQString m_saveLocation; bool m_autoscan; @@ -112,7 +112,7 @@ inline const KURL &PodcastChannelBundle::link() const { return m_link; inline const KURL &PodcastChannelBundle::imageURL() const { return m_imageUrl; } inline const TQString &PodcastChannelBundle::description() const { return m_description; } inline const TQString &PodcastChannelBundle::copyright() const { return m_copyright; } -inline int PodcastChannelBundle::tqparentId() const { return m_tqparentId; } +inline int PodcastChannelBundle::parentId() const { return m_parentId; } inline void PodcastChannelBundle::setURL ( const KURL &u ) { m_url = u; } inline void PodcastChannelBundle::setTitle ( const TQString &t ) { m_title = t; } @@ -121,7 +121,7 @@ inline void PodcastChannelBundle::setLink ( const KURL &l ) { m_lin inline void PodcastChannelBundle::setImageURL ( const KURL &i ) { m_imageUrl = i; } inline void PodcastChannelBundle::setDescription ( const TQString &d ) { m_description = d; } inline void PodcastChannelBundle::setCopyright ( const TQString &c ) { m_copyright = c; } -inline void PodcastChannelBundle::setParentId ( const int p ) { m_tqparentId = p; } +inline void PodcastChannelBundle::setParentId ( const int p ) { m_parentId = p; } inline void PodcastChannelBundle::setSaveLocation( const TQString &s ) { m_saveLocation = s; } inline void PodcastChannelBundle::setAutoScan( const bool b ) { m_autoscan = b; } diff --git a/amarok/src/podcastsettings.h b/amarok/src/podcastsettings.h index 65137785..8ad7beb1 100644 --- a/amarok/src/podcastsettings.h +++ b/amarok/src/podcastsettings.h @@ -22,7 +22,7 @@ class PodcastSettings { public: PodcastSettings( const TQDomNode &channelSettings, const TQString &title ); - PodcastSettings( const PodcastSettings *tqparentSettings, const TQString &title ); + PodcastSettings( const PodcastSettings *parentSettings, const TQString &title ); PodcastSettings( const TQString &title ); // standard settings PodcastSettings( const TQString &title, const TQString &save, const bool autoScan, const int fetchType, const bool autotransfer, const bool purge, const int purgecount ); diff --git a/amarok/src/podcastsettingsbase.ui b/amarok/src/podcastsettingsbase.ui index c983ffd4..8027f273 100644 --- a/amarok/src/podcastsettingsbase.ui +++ b/amarok/src/podcastsettingsbase.ui @@ -210,7 +210,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/amarok/src/scancontroller.cpp b/amarok/src/scancontroller.cpp index 64182944..6f44206b 100644 --- a/amarok/src/scancontroller.cpp +++ b/amarok/src/scancontroller.cpp @@ -248,7 +248,7 @@ ScanController::doJob() //in), so preserve the necessary other tables (eg artist) CollectionDB::instance()->prepareTempTables(); - CollectionDB::instance()->tqinvalidateArtistAlbumCache(); + CollectionDB::instance()->invalidateArtistAlbumCache(); main_loop: uint delayCount = 100; diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp index a22d83f7..407d14a2 100644 --- a/amarok/src/scriptmanager.cpp +++ b/amarok/src/scriptmanager.cpp @@ -114,8 +114,8 @@ namespace Amarok { class AmarokScriptNewStuff : public KNewStuff { public: - AmarokScriptNewStuff(const TQString &type, TQWidget *tqparentWidget=0) - : KNewStuff( type, tqparentWidget ) + AmarokScriptNewStuff(const TQString &type, TQWidget *parentWidget=0) + : KNewStuff( type, parentWidget ) {} bool install( const TQString& fileName ) diff --git a/amarok/src/scriptmanagerbase.ui b/amarok/src/scriptmanagerbase.ui index 962e51e0..4fe50c2f 100644 --- a/amarok/src/scriptmanagerbase.ui +++ b/amarok/src/scriptmanagerbase.ui @@ -130,6 +130,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="0"/> -<tqlayoutfunctions spacing="KDialog::spacingHint"/> +<layoutdefaults spacing="6" margin="0"/> +<layoutfunctions spacing="KDialog::spacingHint"/> </UI> diff --git a/amarok/src/scripts/graphequalizer/eqdialog.ui b/amarok/src/scripts/graphequalizer/eqdialog.ui index 8622e9da..af027a99 100644 --- a/amarok/src/scripts/graphequalizer/eqdialog.ui +++ b/amarok/src/scripts/graphequalizer/eqdialog.ui @@ -205,7 +205,7 @@ <functions> <function specifier="non virtual">init()</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>equalizercanvasview.h</includehint> </includehints> diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp index 84b27efa..c8d2f157 100644 --- a/amarok/src/sliderwidget.cpp +++ b/amarok/src/sliderwidget.cpp @@ -217,7 +217,7 @@ Amarok::PrettySlider::paintEvent( TQPaintEvent *e ) TQPixmap buf( size() ); TQPainter p( &buf, this ); - buf.fill( tqparentWidget()->backgroundColor() ); + buf.fill( parentWidget()->backgroundColor() ); if ( orientation() == Qt::Vertical ) { @@ -470,8 +470,8 @@ Amarok::VolumeSlider::paintEvent( TQPaintEvent * ) TQPixmap buf( size() ); // Erase background - if( tqparentWidget()->backgroundPixmap() ) - buf.fill( tqparentWidget(), pos() ); + if( parentWidget()->backgroundPixmap() ) + buf.fill( parentWidget(), pos() ); else { buf.fill( tqcolorGroup().background() ); // TQPainter p( &buf ); diff --git a/amarok/src/socketserver.cpp b/amarok/src/socketserver.cpp index e0aa98a8..813e412d 100644 --- a/amarok/src/socketserver.cpp +++ b/amarok/src/socketserver.cpp @@ -189,7 +189,7 @@ Vis::Selector::Selector( TQWidget *tqparent ) resize( tqsizeHint() + TQSize(20,0) ); // Center the widget on screen - move( tqparentWidget()->width()/2 - width()/2, tqparentWidget()->height()/2 - height()/2 ); + move( parentWidget()->width()/2 - width()/2, parentWidget()->height()/2 - height()/2 ); } void diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c index 5281e7ba..a7b1e93f 100644 --- a/amarok/src/sqlite/sqlite3.c +++ b/amarok/src/sqlite/sqlite3.c @@ -317,7 +317,7 @@ STQLITE_API int sqlite3_exec( ** primary result code as a prefix. Primary result codes contain a single ** "_" character. Extended result codes contain two or more "_" characters. ** The numeric value of an extended result code can be converted to its -** corresponding primary result code by tqmasking off the lower 8 bytes. +** corresponding primary result code by masking off the lower 8 bytes. ** ** The STQLITE_OK result code will never be extended. It will always ** be exactly zero. @@ -1532,7 +1532,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** ** Note that when type conversions occur, pointers returned by prior ** calls to sqlite3_column_blob(), sqlite3_column_text(), and/or -** sqlite3_column_text16() may be tqinvalidated. +** sqlite3_column_text16() may be invalidated. ** Type conversions and pointer invalidations might occur ** in the following cases: ** @@ -1554,7 +1554,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** not tqinvalidate a prior pointer, though of course the content of the buffer ** that the prior pointer points to will have been modified. Other kinds ** of conversion are done in place when it is possible, but sometime it is -** not possible and in those cases prior pointers are tqinvalidated. +** not possible and in those cases prior pointers are invalidated. ** ** The safest and easiest to remember policy is to invoke these routines ** in one of the following ways: @@ -1757,7 +1757,7 @@ int sqlite3_global_recover(void); ** ** Please pay particular attention to the fact that the pointer that ** is returned from [sqlite3_value_blob()], [sqlite3_value_text()], or -** [sqlite3_value_text16()] can be tqinvalidated by a subsequent call to +** [sqlite3_value_text16()] can be invalidated by a subsequent call to ** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite_value_text()], ** or [sqlite3_value_text16()]. */ @@ -18824,7 +18824,7 @@ static void pagerUnlockAndRollback(Pager *p){ /* ** Clear the in-memory cache. This routine ** sets the state of the pager back to what it was when it was first -** opened. Any outstanding pages are tqinvalidated and subsequent attempts +** opened. Any outstanding pages are invalidated and subsequent attempts ** to access those pages will likely result in a coredump. */ static void pager_reset(Pager *pPager){ @@ -20061,7 +20061,7 @@ STQLITE_PRIVATE int sqlite3PagerTruncate(Pager *pPager, Pgno nPage){ ** Shutdown the page cache. Free all memory and close all files. ** ** If a transaction was in progress when this routine is called, that -** transaction is rolled back. All outstanding pages are tqinvalidated +** transaction is rolled back. All outstanding pages are invalidated ** and their memory is freed. Any attempt to use a page associated ** with this page cache after this function returns will likely ** result in a coredump. @@ -23114,7 +23114,7 @@ static void releasePage(MemPage *pPage); /* Forward reference */ /* ** Invalidate the overflow page-list cache for cursor pCur, if any. */ -static void tqinvalidateOverflowCache(BtCursor *pCur){ +static void invalidateOverflowCache(BtCursor *pCur){ sqliteFree(pCur->aOverflow); pCur->aOverflow = 0; } @@ -23123,15 +23123,15 @@ static void tqinvalidateOverflowCache(BtCursor *pCur){ ** Invalidate the overflow page-list cache for all cursors opened ** on the shared btree structure pBt. */ -static void tqinvalidateAllOverflowCache(BtShared *pBt){ +static void invalidateAllOverflowCache(BtShared *pBt){ BtCursor *p; for(p=pBt->pCursor; p; p=p->pNext){ - tqinvalidateOverflowCache(p); + invalidateOverflowCache(p); } } #else - #define tqinvalidateOverflowCache(x) - #define tqinvalidateAllOverflowCache(x) + #define invalidateOverflowCache(x) + #define invalidateAllOverflowCache(x) #endif /* @@ -23173,7 +23173,7 @@ static int saveCursorPosition(BtCursor *pCur){ pCur->eState = CURSOR_RETQUIRESEEK; } - tqinvalidateOverflowCache(pCur); + invalidateOverflowCache(pCur); return rc; } @@ -24872,7 +24872,7 @@ STQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *p){ if( !pBt->autoVacuum ){ return STQLITE_DONE; } - tqinvalidateAllOverflowCache(pBt); + invalidateAllOverflowCache(pBt); return incrVacuumStep(pBt, 0); } @@ -24892,7 +24892,7 @@ static int autoVacuumCommit(BtShared *pBt, Pgno *pnTrunc){ int nRef = sqlite3PagerRefcount(pPager); #endif - tqinvalidateAllOverflowCache(pBt); + invalidateAllOverflowCache(pBt); assert(pBt->autoVacuum); if( !pBt->incrVacuum ){ Pgno nFin = 0; @@ -25199,7 +25199,7 @@ STQLITE_PRIVATE int sqlite3BtreeCommitStmt(Btree *p){ ** Rollback the active statement subtransaction. If no subtransaction ** is active this routine is a no-op. ** -** All cursors will be tqinvalidated by this operation. Any attempt +** All cursors will be invalidated by this operation. Any attempt ** to use a cursor that was open at the beginning of this operation ** will result in an error. */ @@ -25355,7 +25355,7 @@ STQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){ } releasePage(pCur->pPage); unlockBtreeIfUnused(pBt); - tqinvalidateOverflowCache(pCur); + invalidateOverflowCache(pCur); sqliteFree(pCur); return STQLITE_OK; } @@ -25609,7 +25609,7 @@ static int copyPayload( ** cache to make seeking to the supplied offset more efficient. ** ** Once an overflow page-list cache has been allocated, it may be -** tqinvalidated if some other cursor writes to the same table, or if +** invalidated if some other cursor writes to the same table, or if ** the cursor is moved to a different row. Additionally, in auto-vacuum ** mode, the following events may tqinvalidate an overflow page-list cache. ** @@ -27133,9 +27133,9 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){ int szCell; CellInfo info; BtShared *pBt = pPage->pBt; - int tqparentIdx = pParent->nCell; /* pParent new divider cell index */ - int tqparentSize; /* Size of new divider cell */ - u8 tqparentCell[64]; /* Space for the new divider cell */ + int parentIdx = pParent->nCell; /* pParent new divider cell index */ + int parentSize; /* Size of new divider cell */ + u8 parentCell[64]; /* Space for the new divider cell */ /* Allocate a new page. Insert the overflow cell from pPage ** into it. Then remove the overflow cell from pPage. @@ -27161,16 +27161,16 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){ assert( pPage->nCell>0 ); pCell = findCell(pPage, pPage->nCell-1); sqlite3BtreeParseCellPtr(pPage, pCell, &info); - rc = fillInCell(pParent, tqparentCell, 0, info.nKey, 0, 0, 0, &tqparentSize); + rc = fillInCell(pParent, parentCell, 0, info.nKey, 0, 0, 0, &parentSize); if( rc!=STQLITE_OK ){ return rc; } - assert( tqparentSize<64 ); - rc = insertCell(pParent, tqparentIdx, tqparentCell, tqparentSize, 0, 4); + assert( parentSize<64 ); + rc = insertCell(pParent, parentIdx, parentCell, parentSize, 0, 4); if( rc!=STQLITE_OK ){ return rc; } - put4byte(findOverflowCell(pParent,tqparentIdx), pPage->pgno); + put4byte(findOverflowCell(pParent,parentIdx), pPage->pgno); put4byte(&pParent->aData[pParent->hdrOffset+8], pgnoNew); #ifndef STQLITE_OMIT_AUTOVACUUM @@ -28249,7 +28249,7 @@ STQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree *p, int *piTable, int flags){ ** out to be an overflow page, delete all overflow page-map caches ** held by open cursors. */ - tqinvalidateAllOverflowCache(pBt); + invalidateAllOverflowCache(pBt); /* Read the value of meta[3] from the database to determine where the ** root page of the new table should go. meta[3] is the largest root-page @@ -29591,7 +29591,7 @@ STQLITE_PRIVATE int sqlite3VdbeMemNulTerminate(Mem *pMem){ ** are converted using sqlite3_snprintf(). Converting a BLOB to a string ** is a no-op. ** -** Existing representations MEM_Int and MEM_Real are *not* tqinvalidated. +** Existing representations MEM_Int and MEM_Real are *not* invalidated. ** ** A MEM_Null value will never be passed to this function. This function is ** used for converting values to text for returning to the user (i.e. via @@ -30630,13 +30630,13 @@ static int opcodeNoPush(u8 op){ ** NOPUSH_MASK_0 corresponds to opcodes 0 to 15. NOPUSH_MASK_1 tqcontains ** one bit for opcodes 16 to 31, and so on. ** - ** 16-bit bittqmasks (rather than 32-bit) are specified in opcodes.h + ** 16-bit bitmasks (rather than 32-bit) are specified in opcodes.h ** because the file is generated by an awk program. Awk manipulates ** all numbers as floating-point and we don't want to risk a rounding ** error if someone builds with an awk that uses (for example) 32-bit ** IEEE floats. */ - static const u32 tqmasks[5] = { + static const u32 masks[5] = { NOPUSH_MASK_0 + (((unsigned)NOPUSH_MASK_1)<<16), NOPUSH_MASK_2 + (((unsigned)NOPUSH_MASK_3)<<16), NOPUSH_MASK_4 + (((unsigned)NOPUSH_MASK_5)<<16), @@ -30644,7 +30644,7 @@ static int opcodeNoPush(u8 op){ NOPUSH_MASK_8 + (((unsigned)NOPUSH_MASK_9)<<16) }; assert( op<32*5 ); - return (tqmasks[op>>5] & (1<<(op&0x1F))); + return (masks[op>>5] & (1<<(op&0x1F))); } #ifndef NDEBUG @@ -36150,7 +36150,7 @@ case OP_VerifyCookie: { /* no-push */ ** prepared queries. If such a query is out-of-date, we do not want to ** discard the database schema, as the user code implementing the ** v-table would have to be ready for the sqlite3_vtab structure itself - ** to be tqinvalidated whenever sqlite3_step() is called from within + ** to be invalidated whenever sqlite3_step() is called from within ** a v-table method. */ if( db->aDb[pOp->p1].pSchema->schema_cookie!=iMeta ){ @@ -39004,7 +39004,7 @@ static int blobReadWrite( sqlite3 *db; /* If there is no statement handle, then the blob-handle has - ** already been tqinvalidated. Return STQLITE_ABORT in this case. + ** already been invalidated. Return STQLITE_ABORT in this case. */ if( !v ) return STQLITE_ABORT; @@ -41690,7 +41690,7 @@ static void renameTableFunc( /* The principle used to locate the table name in the CREATE TABLE ** statement is that the table name is the first token that is immediatedly - ** followed by a left tqparenthesis - TK_LP - or "USING" TK_USING. + ** followed by a left parenthesis - TK_LP - or "USING" TK_USING. */ if( zSql ){ do { @@ -51963,7 +51963,7 @@ static int getTempStore(const char *z){ ** Invalidate temp storage, either when the temp storage is changed ** from default, or when 'file' and the temp_store_directory has changed */ -static int tqinvalidateTempStorage(Parse *pParse){ +static int invalidateTempStorage(Parse *pParse){ sqlite3 *db = pParse->db; if( db->aDb[1].pBt!=0 ){ if( !db->autoCommit ){ @@ -51989,7 +51989,7 @@ static int changeTempStorage(Parse *pParse, const char *zStorageType){ int ts = getTempStore(zStorageType); sqlite3 *db = pParse->db; if( db->temp_store==ts ) return STQLITE_OK; - if( tqinvalidateTempStorage( pParse ) != STQLITE_OK ){ + if( invalidateTempStorage( pParse ) != STQLITE_OK ){ return STQLITE_ERROR; } db->temp_store = ts; @@ -52393,7 +52393,7 @@ STQLITE_PRIVATE void sqlite3Pragma( ** Return or set the local value of the temp_store_directory flag. Changing ** the value sets a specific directory to be used for temporary files. ** Setting to a null string reverts to the default temporary directory search. - ** If temporary directory is changed, then tqinvalidateTempStorage. + ** If temporary directory is changed, then invalidateTempStorage. ** */ if( sqlite3StrICmp(zLeft, "temp_store_directory")==0 ){ @@ -52414,7 +52414,7 @@ STQLITE_PRIVATE void sqlite3Pragma( || (TEMP_STORE==1 && db->temp_store<=1) || (TEMP_STORE==2 && db->temp_store==1) ){ - tqinvalidateTempStorage(pParse); + invalidateTempStorage(pParse); } sqliteFree(sqlite3_temp_directory); if( zRight[0] ){ @@ -56578,7 +56578,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){ ** This routine does NOT free the Select structure passed in. The ** calling function needs to do that. ** -** The pParent, tqparentTab, and *pParentAgg fields are filled in if this +** The pParent, parentTab, and *pParentAgg fields are filled in if this ** SELECT is a subquery. This routine may try to combine this SELECT ** with its tqparent to form a single flat query. In so doing, it might ** change the tqparent query from a non-aggregate to an aggregate query. @@ -56596,7 +56596,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){ ** pParent will be NULL. During the processing of the outer query, this ** routine is called recursively to handle the subquery. For the recursive ** call, pParent will point to the outer query. Because the subquery is -** the second element in a three-way join, the tqparentTab parameter will +** the second element in a three-way join, the parentTab parameter will ** be 1 (the 2nd value of a 0-indexed array.) */ STQLITE_PRIVATE int sqlite3Select( @@ -56605,7 +56605,7 @@ STQLITE_PRIVATE int sqlite3Select( int eDest, /* How to dispose of the results */ int iParm, /* A parameter used by the eDest disposal method */ Select *pParent, /* Another SELECT for which this is a sub-query */ - int tqparentTab, /* Index in pParent->pSrc of this query */ + int parentTab, /* Index in pParent->pSrc of this query */ int *pParentAgg, /* True if pParent uses aggregate functions */ char *aff /* If eDest is SRT_Union, the affinity string */ ){ @@ -56755,7 +56755,7 @@ STQLITE_PRIVATE int sqlite3Select( */ #ifndef STQLITE_OMIT_VIEW if( pParent && pParentAgg && - flattenSubquery(pParent, tqparentTab, *pParentAgg, isAgg) ){ + flattenSubquery(pParent, parentTab, *pParentAgg, isAgg) ){ if( isAgg ) *pParentAgg = 1; goto select_end; } @@ -57104,9 +57104,9 @@ STQLITE_PRIVATE int sqlite3Select( ** the temporary table. */ if( pParent ){ - assert( pParent->pSrc->nSrc>tqparentTab ); - assert( pParent->pSrc->a[tqparentTab].pSelect==p ); - pParent->pSrc->a[tqparentTab].isPopulated = 1; + assert( pParent->pSrc->nSrc>parentTab ); + assert( pParent->pSrc->a[parentTab].pSelect==p ); + pParent->pSrc->a[parentTab].isPopulated = 1; } #endif @@ -60040,7 +60040,7 @@ struct WhereTerm { */ struct WhereClause { Parse *pParse; /* The parser context */ - ExprMaskSet *pMaskSet; /* Mapping of table indices to bittqmasks */ + ExprMaskSet *pMaskSet; /* Mapping of table indices to bitmasks */ int nTerm; /* Number of terms */ int nSlot; /* Number of entries in a[] */ WhereTerm *a; /* Each a[] describes a term of the WHERE cluase */ @@ -60049,13 +60049,13 @@ struct WhereClause { /* ** An instance of the following structure keeps track of a mapping -** between VDBE cursor numbers and bits of the bittqmasks in WhereTerm. +** between VDBE cursor numbers and bits of the bitmasks in WhereTerm. ** ** The VDBE cursor numbers are small integers contained in ** SrcList_item.iCursor and Expr.iTable fields. For any given WHERE ** clause, the cursor numbers might not begin with 0 and they might ** contain gaps in the numbering sequence. But we want to make maximum -** use of the bits in our bittqmasks. This structure provides a mapping +** use of the bits in our bitmasks. This structure provides a mapping ** from the sparse cursor numbers into consecutive integers beginning ** with 0. ** @@ -60080,7 +60080,7 @@ struct ExprMaskSet { /* -** Bittqmasks for the operators that indices are able to exploit. An +** Bitmasks for the operators that indices are able to exploit. An ** OR-ed combination of these values can be used when searching for ** terms in the where clause. */ @@ -60123,7 +60123,7 @@ struct ExprMaskSet { static void whereClauseInit( WhereClause *pWC, /* The WhereClause to be initialized */ Parse *pParse, /* The parsing context */ - ExprMaskSet *pMaskSet /* Mapping from table indices to bittqmasks */ + ExprMaskSet *pMaskSet /* Mapping from table indices to bitmasks */ ){ pWC->pParse = pParse; pWC->pMaskSet = pMaskSet; @@ -60259,7 +60259,7 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){ ** sets their opcodes to TK_COLUMN and their Expr.iTable fields to ** the VDBE cursor number of the table. This routine just has to ** translate the cursor numbers into bittqmask values and OR all -** the bittqmasks together. +** the bitmasks together. */ static Bittqmask exprListTableUsage(ExprMaskSet*, ExprList*); static Bittqmask exprSelectTableUsage(ExprMaskSet*, Select*); @@ -61889,7 +61889,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( int brk, cont = 0; /* Addresses used during code generation */ Bittqmask notReady; /* Cursors that are not yet positioned */ WhereTerm *pTerm; /* A single term in the WHERE clause */ - ExprMaskSet tqmaskSet; /* The expression tqmask set */ + ExprMaskSet maskSet; /* The expression tqmask set */ WhereClause wc; /* The WHERE clause is divided into these terms */ struct SrcList_item *pTabItem; /* A single entry from pTabList */ WhereLevel *pLevel; /* A single level in the pWInfo list */ @@ -61907,8 +61907,8 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( /* Split the WHERE clause into separate subexpressions where each ** subexpression is separated by an AND operator. */ - initMaskSet(&tqmaskSet); - whereClauseInit(&wc, pParse, &tqmaskSet); + initMaskSet(&maskSet); + whereClauseInit(&wc, pParse, &maskSet); whereSplit(&wc, pWhere, TK_AND); /* Allocate and initialize the WhereInfo structure that will become the @@ -61937,7 +61937,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( ** and work forward so that the added virtual terms are never processed. */ for(i=0; i<pTabList->nSrc; i++){ - createMask(&tqmaskSet, pTabList->a[i].iCursor); + createMask(&maskSet, pTabList->a[i].iCursor); } exprAnalyzeAll(pTabList, &wc); if( sqlite3MallocFailed() ){ @@ -61984,7 +61984,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( doNotReorder = (pTabItem->jointype & (JT_LEFT|JT_CROSS))!=0; if( once && doNotReorder ) break; - m = getMask(&tqmaskSet, pTabItem->iCursor); + m = getMask(&maskSet, pTabItem->iCursor); if( (m & notReady)==0 ){ if( j==iFrom ) iFrom++; continue; @@ -62046,7 +62046,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( }else{ pLevel->iIdxCur = -1; } - notReady &= ~getMask(&tqmaskSet, pTabList->a[bestJ].iCursor); + notReady &= ~getMask(&maskSet, pTabList->a[bestJ].iCursor); pLevel->iFrom = bestJ; } WHERETRACE(("*** Optimizer Finished ***\n")); @@ -62494,7 +62494,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( pLevel->p1 = iCur; pLevel->p2 = 1 + sqlite3VdbeAddOp(v, OP_Rewind, iCur, brk); } - notReady &= ~getMask(&tqmaskSet, iCur); + notReady &= ~getMask(&maskSet, iCur); /* Insert code to test every subexpression that can be completely ** computed using the current set of tables. @@ -67305,7 +67305,7 @@ static int createCollation( /* If collation sequence pColl was created directly by a call to ** sqlite3_create_collation, and not generated by synthCollSeq(), - ** then any copies made by synthCollSeq() need to be tqinvalidated. + ** then any copies made by synthCollSeq() need to be invalidated. ** Also, collation destructor - CollSeq.xDel() - function may need ** to be called. */ diff --git a/amarok/src/sqlite/sqlite3.h b/amarok/src/sqlite/sqlite3.h index ae518c8e..2c65b1d1 100644 --- a/amarok/src/sqlite/sqlite3.h +++ b/amarok/src/sqlite/sqlite3.h @@ -288,7 +288,7 @@ int sqlite3_exec( ** primary result code as a prefix. Primary result codes contain a single ** "_" character. Extended result codes contain two or more "_" characters. ** The numeric value of an extended result code can be converted to its -** corresponding primary result code by tqmasking off the lower 8 bytes. +** corresponding primary result code by masking off the lower 8 bytes. ** ** The STQLITE_OK result code will never be extended. It will always ** be exactly zero. @@ -1503,7 +1503,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** ** Note that when type conversions occur, pointers returned by prior ** calls to sqlite3_column_blob(), sqlite3_column_text(), and/or -** sqlite3_column_text16() may be tqinvalidated. +** sqlite3_column_text16() may be invalidated. ** Type conversions and pointer invalidations might occur ** in the following cases: ** @@ -1525,7 +1525,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** not tqinvalidate a prior pointer, though of course the content of the buffer ** that the prior pointer points to will have been modified. Other kinds ** of conversion are done in place when it is possible, but sometime it is -** not possible and in those cases prior pointers are tqinvalidated. +** not possible and in those cases prior pointers are invalidated. ** ** The safest and easiest to remember policy is to invoke these routines ** in one of the following ways: @@ -1728,7 +1728,7 @@ int sqlite3_global_recover(void); ** ** Please pay particular attention to the fact that the pointer that ** is returned from [sqlite3_value_blob()], [sqlite3_value_text()], or -** [sqlite3_value_text16()] can be tqinvalidated by a subsequent call to +** [sqlite3_value_text16()] can be invalidated by a subsequent call to ** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite_value_text()], ** or [sqlite3_value_text16()]. */ diff --git a/amarok/src/statusbar/overlayWidget.cpp b/amarok/src/statusbar/overlayWidget.cpp index f3cac1ef..05fcf2c0 100644 --- a/amarok/src/statusbar/overlayWidget.cpp +++ b/amarok/src/statusbar/overlayWidget.cpp @@ -27,7 +27,7 @@ namespace KDE { OverlayWidget::OverlayWidget( TQWidget *tqparent, TQWidget *anchor, const char* name ) - : TQFrame( tqparent->tqparentWidget(), name ) + : TQFrame( tqparent->parentWidget(), name ) , m_anchor( anchor ) , m_tqparent( tqparent ) { @@ -39,7 +39,7 @@ OverlayWidget::OverlayWidget( TQWidget *tqparent, TQWidget *anchor, const char* void OverlayWidget::reposition() { - setMaximumSize( tqparentWidget()->size() ); + setMaximumSize( parentWidget()->size() ); adjustSize(); // p is in the alignWidget's coordinates @@ -51,8 +51,8 @@ OverlayWidget::reposition() // Position in the toplevelwidget's coordinates TQPoint pTopLevel = m_anchor->mapTo( tqtopLevelWidget(), p ); - // Position in the widget's tqparentWidget coordinates - TQPoint pParent = tqparentWidget() ->mapFrom( tqtopLevelWidget(), pTopLevel ); + // Position in the widget's parentWidget coordinates + TQPoint pParent = parentWidget() ->mapFrom( tqtopLevelWidget(), pTopLevel ); // keep it on the screen if( pParent.x() < 0 ) pParent.rx() = 0; diff --git a/amarok/src/statusbar/overlayWidget.h b/amarok/src/statusbar/overlayWidget.h index 34cd6bb5..673099c5 100644 --- a/amarok/src/statusbar/overlayWidget.h +++ b/amarok/src/statusbar/overlayWidget.h @@ -28,7 +28,7 @@ namespace KDE { public: /** - * The widget is tqparented to the toplevelwidget of alignWidget, + * The widget is parented to the toplevelwidget of alignWidget, * this could be an issue if that widget has an autoAdd Layout */ OverlayWidget( TQWidget *tqparent, TQWidget *anchor, const char *name = 0 ); diff --git a/amarok/src/statusbar/popupMessage.cpp b/amarok/src/statusbar/popupMessage.cpp index 71b2f089..136e01b9 100644 --- a/amarok/src/statusbar/popupMessage.cpp +++ b/amarok/src/statusbar/popupMessage.cpp @@ -42,7 +42,7 @@ PopupMessage::PopupMessage( TQWidget *tqparent, TQWidget *anchor, int timeout, c : OverlayWidget( tqparent, anchor, name ) , m_anchor( anchor ) , m_tqparent( tqparent ) - , m_tqmaskEffect( Slide ) + , m_maskEffect( Slide ) , m_dissolveSize( 0 ) , m_dissolveDelta( -1 ) , m_offset( 0 ) @@ -143,7 +143,7 @@ void PopupMessage::display() //SLOT m_dissolveSize = 24; m_dissolveDelta = -1; - if( m_tqmaskEffect == Dissolve ) + if( m_maskEffect == Dissolve ) { // necessary to create the tqmask m_tqmask.resize( width(), height() ); @@ -164,7 +164,7 @@ void PopupMessage::display() //SLOT void PopupMessage::timerEvent( TQTimerEvent* ) { - switch( m_tqmaskEffect ) + switch( m_maskEffect ) { case Plain: plainMask(); @@ -214,19 +214,19 @@ void PopupMessage::dissolveMask() if( m_stage == 1 ) { tqrepaint( false ); - TQPainter tqmaskPainter(&m_tqmask); + TQPainter maskPainter(&m_tqmask); m_tqmask.fill(TQt::black); - tqmaskPainter.setBrush(TQt::white); - tqmaskPainter.setPen(TQt::white); - tqmaskPainter.drawRect( m_tqmask.rect() ); + maskPainter.setBrush(TQt::white); + maskPainter.setPen(TQt::white); + maskPainter.drawRect( m_tqmask.rect() ); m_dissolveSize += m_dissolveDelta; if( m_dissolveSize > 0 ) { - tqmaskPainter.setRasterOp( TQt::EraseROP ); + maskPainter.setRasterOp( TQt::EraseROP ); int x, y, s; const int size = 16; @@ -241,7 +241,7 @@ void PopupMessage::dissolveMask() if (s < 0) break; - tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); + maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); } } } diff --git a/amarok/src/statusbar/popupMessage.h b/amarok/src/statusbar/popupMessage.h index 1665155b..dfad9080 100644 --- a/amarok/src/statusbar/popupMessage.h +++ b/amarok/src/statusbar/popupMessage.h @@ -57,7 +57,7 @@ namespace KDE void setShowCounter( const bool show ); void setImage( const TQString &location ); void setImage( const TQPixmap &pix ); - void setMaskEffect( const MaskEffect type ) { m_tqmaskEffect = type; } + void setMaskEffect( const MaskEffect type ) { m_maskEffect = type; } void setText( const TQString &text ); void setTimeout( const int time ) { m_timeout = time; } @@ -90,7 +90,7 @@ namespace KDE TQWidget *m_anchor; TQWidget *m_tqparent; TQBitmap m_tqmask; - MaskEffect m_tqmaskEffect; + MaskEffect m_maskEffect; int m_dissolveSize; int m_dissolveDelta; diff --git a/amarok/src/statusbar/progressBar.cpp b/amarok/src/statusbar/progressBar.cpp index 57382e29..6b426f0d 100644 --- a/amarok/src/statusbar/progressBar.cpp +++ b/amarok/src/statusbar/progressBar.cpp @@ -69,7 +69,7 @@ ProgressBar::settqStatus( const TQString &text ) s += ']'; m_label->setText( s ); - tqparentWidget()->adjustSize(); + parentWidget()->adjustSize(); return *this; } @@ -81,7 +81,7 @@ ProgressBar::setAbortSlot( TQObject *receiver, const char *slot ) connect( m_abort, TQT_SIGNAL(clicked()), this, TQT_SLOT(hide()) ); m_abort->show(); - tqparentWidget()->adjustSize(); + parentWidget()->adjustSize(); return *this; } diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp index f549ddaf..1309da98 100644 --- a/amarok/src/statusbar/queueLabel.cpp +++ b/amarok/src/statusbar/queueLabel.cpp @@ -270,7 +270,7 @@ void QueueLabel::showToolTip() text += i18n( "Next: %1" ).tqarg( veryNiceTitle( item, true /*bold*/ ) ); - m_tooltip = new KDE::PopupMessage( tqparentWidget()->tqparentWidget(), this, 0 ); + m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), this, 0 ); m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCounter( false ); m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); diff --git a/amarok/src/statusbar/selectLabel.h b/amarok/src/statusbar/selectLabel.h index 1d3552ea..f9d3fb3a 100644 --- a/amarok/src/statusbar/selectLabel.h +++ b/amarok/src/statusbar/selectLabel.h @@ -141,7 +141,7 @@ class SelectLabel : public TQLabel tip += " "; - m_tooltip = new KDE::PopupMessage( tqparentWidget()->tqparentWidget(), tqparentWidget(), 0 /*timeout*/ ); + m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), parentWidget(), 0 /*timeout*/ ); m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCounter( false ); m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h index 6d241a2d..267550bb 100644 --- a/amarok/src/statusbar/toggleLabel.h +++ b/amarok/src/statusbar/toggleLabel.h @@ -119,7 +119,7 @@ class ToggleLabel : public TQLabel const TQString path = KGlobal::iconLoader()->iconPath( m_action->icon(), -KIcon::SizeHuge ); - m_tooltip = new KDE::PopupMessage( tqparentWidget()->tqparentWidget(), tqparentWidget(), 0 /*timeout*/ ); + m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), parentWidget(), 0 /*timeout*/ ); m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCounter( false ); m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); diff --git a/amarok/src/tagdialogbase.ui b/amarok/src/tagdialogbase.ui index fd52c299..8ce0a726 100644 --- a/amarok/src/tagdialogbase.ui +++ b/amarok/src/tagdialogbase.ui @@ -820,7 +820,7 @@ <tabstop>pushButton_cancel</tabstop> </tabstops> <pixmapinproject/> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>ktabwidget.h</includehint> diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui index f22160cd..eaac3d73 100644 --- a/amarok/src/tagguesserconfigdialog.ui +++ b/amarok/src/tagguesserconfigdialog.ui @@ -205,8 +205,8 @@ Note that the order in which the schemes appear in the list is relevant, since t <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<tqlayoutdefaults spacing="6" margin="0"/> -<tqlayoutfunctions spacing="KDialog::spacingHint"/> +<layoutdefaults spacing="6" margin="0"/> +<layoutfunctions spacing="KDialog::spacingHint"/> <includehints> <includehint>kdialog.h</includehint> <includehint>klistview.h</includehint> diff --git a/amarok/src/threadmanager.cpp b/amarok/src/threadmanager.cpp index c6f4e19a..6b13a647 100644 --- a/amarok/src/threadmanager.cpp +++ b/amarok/src/threadmanager.cpp @@ -268,7 +268,7 @@ void ThreadManager::Thread::runJob( Job *job ) { job->m_thread = this; - job->m_tqparentThreadId = m_threadId; + job->m_parentThreadId = m_threadId; if ( job->isAborted() ) TQApplication::postEvent( ThreadManager::instance(), job ); diff --git a/amarok/src/threadmanager.h b/amarok/src/threadmanager.h index 1388a88c..8fa85628 100644 --- a/amarok/src/threadmanager.h +++ b/amarok/src/threadmanager.h @@ -313,7 +313,7 @@ public: */ //void setVisible( bool ); - uint tqparentThreadId() { return m_tqparentThreadId; } + uint parentThreadId() { return m_parentThreadId; } protected: /** @@ -341,7 +341,7 @@ public: uint m_percentDone; uint m_progressDone; uint m_totalSteps; - uint m_tqparentThreadId; + uint m_parentThreadId; TQString m_description; TQString m_status; diff --git a/amarok/src/tooltip.cpp b/amarok/src/tooltip.cpp index 24ee97cd..76421182 100644 --- a/amarok/src/tooltip.cpp +++ b/amarok/src/tooltip.cpp @@ -79,7 +79,7 @@ void Amarok::ToolTip::add( ToolTipClient *client, TQWidget *tqparent ) //static void Amarok::ToolTip::remove( TQWidget *widget ) //static { for( int i = s_tooltips.count() - 1; i >= 0; --i ) - if( s_tooltips[i]->TQToolTip::tqparentWidget() == widget ) + if( s_tooltips[i]->TQToolTip::parentWidget() == widget ) delete s_tooltips[i]; } @@ -93,7 +93,7 @@ void Amarok::ToolTip::hideTips() //static TQString Amarok::ToolTip::textFor( TQWidget *widget, const TQPoint &pos ) //static { for( int i = 0, n = s_tooltips.count(); i < n; ++i ) - if( s_tooltips[i]->TQToolTip::tqparentWidget() == widget ) + if( s_tooltips[i]->TQToolTip::parentWidget() == widget ) return s_tooltips[i]->m_client->toolTipText( widget, pos ).first; return TQToolTip::textFor( widget, pos ); } @@ -103,7 +103,7 @@ void Amarok::ToolTip::updateTip() //static for( int i = 0, n = s_tooltips.count(); i < n; ++i ) if( s_tooltips[i]->isVisible() ) { - TQWidget* const w = s_tooltips[i]->TQToolTip::tqparentWidget(); + TQWidget* const w = s_tooltips[i]->TQToolTip::parentWidget(); TQPair<TQString, TQRect> p = s_tooltips[i]->m_client->toolTipText( w, w->mapFromGlobal( s_pos ) ); TQString prev = s_text; if( prev != p.first ) @@ -133,12 +133,12 @@ Amarok::ToolTip::~ToolTip() void Amarok::ToolTip::maybeTip( const TQPoint &pos ) { - s_pos = TQToolTip::tqparentWidget()->mapToGlobal( pos ); + s_pos = TQToolTip::parentWidget()->mapToGlobal( pos ); TQString prev = s_text; - TQPair<TQString, TQRect> p = m_client->toolTipText( TQToolTip::tqparentWidget(), pos ); + TQPair<TQString, TQRect> p = m_client->toolTipText( TQToolTip::parentWidget(), pos ); s_text = p.first; s_rect = p.second; - if( TQToolTip::tqparentWidget() && !s_text.isEmpty() ) + if( TQToolTip::parentWidget() && !s_text.isEmpty() ) { if( s_text != prev ) hideTips(); @@ -167,7 +167,7 @@ void Amarok::ToolTip::hideTip() if( !isVisible() ) return; TQFrame::hide(); - TQToolTip::tqparentWidget()->update(); + TQToolTip::parentWidget()->update(); m_timer.stop(); s_hack = 0; } @@ -181,13 +181,13 @@ void Amarok::ToolTip::drawContents( TQPainter *painter ) p.setPen( tqcolorGroup().foreground() ); p.drawRect( buf.rect() ); - TQSimpleRichText text( s_text, TQToolTip::tqparentWidget()->font() ); + TQSimpleRichText text( s_text, TQToolTip::parentWidget()->font() ); text.setWidth( width() ); p.translate( 0, height() / 2 - text.height() / 2); TQPoint pos = s_rect.isNull() ? TQPoint(2, -1) : s_hack == 1 ? TQPoint(4, -2) : TQPoint(2, -2); //HACK positioning - p.setFont( TQToolTip::tqparentWidget()->font() ); + p.setFont( TQToolTip::parentWidget()->font() ); text.draw( &p, pos.x(), pos.y(), rect(), tqcolorGroup() ); painter->drawPixmap( 0, 0, buf ); @@ -199,7 +199,7 @@ TQSize Amarok::ToolTip::tqsizeHint() const return s_rect.size(); else { - TQSimpleRichText text( s_text, TQToolTip::tqparentWidget()->font() ); + TQSimpleRichText text( s_text, TQToolTip::parentWidget()->font() ); text.setWidth( 500 ); //is this reasonable? return TQSize( text.widthUsed() - 2, text.height() ); } @@ -207,7 +207,7 @@ TQSize Amarok::ToolTip::tqsizeHint() const void Amarok::ToolTip::position() { - const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::tqparentWidget() ); + const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() ); const TQSize size = tqsizeHint(); const int width = size.width(), height = size.height(); TQPoint pos; @@ -221,7 +221,7 @@ void Amarok::ToolTip::position() } else { - const TQRect r = TQRect( TQToolTip::tqparentWidget()->mapToGlobal( TQToolTip::tqparentWidget()->pos() ), TQToolTip::tqparentWidget()->size() ); + const TQRect r = TQRect( TQToolTip::parentWidget()->mapToGlobal( TQToolTip::parentWidget()->pos() ), TQToolTip::parentWidget()->size() ); pos = r.bottomRight(); if( pos.y() + height > drect.bottom() ) pos.setY( kMax( drect.top(), r.top() - height ) ); diff --git a/amarok/src/trackpickerdialogbase.ui b/amarok/src/trackpickerdialogbase.ui index 9061ec8e..6ab2e7e7 100644 --- a/amarok/src/trackpickerdialogbase.ui +++ b/amarok/src/trackpickerdialogbase.ui @@ -175,7 +175,7 @@ <tabstops> <tabstop>trackList</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> |