diff options
422 files changed, 12815 insertions, 12595 deletions
diff --git a/amarok/src/Options1.ui b/amarok/src/Options1.ui index 5fa3f3bf..b8d48942 100644 --- a/amarok/src/Options1.ui +++ b/amarok/src/Options1.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Options1</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>General</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -30,7 +30,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>generalBox</cstring> </property> @@ -44,7 +44,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowSplashscreen</cstring> </property> @@ -58,7 +58,7 @@ <string>Check to enable the splashscreen during Amarok startup.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowTrayIcon</cstring> </property> @@ -72,9 +72,9 @@ <string>Check to enable the Amarok system tray icon.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -90,14 +90,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>21</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AnimateTrayIcon</cstring> </property> @@ -116,7 +116,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowPlayerWindow</cstring> </property> @@ -130,15 +130,15 @@ <string>Check to enable an extra player window.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -155,7 +155,7 @@ <string>Size of the cover image in the context viewer in pixels.</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_CoverPreviewSize</cstring> </property> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -197,19 +197,19 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -234,7 +234,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -254,7 +254,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>21</height> @@ -263,22 +263,22 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkBox_customBrowser</cstring> </property> <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -303,7 +303,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>21</height> @@ -334,7 +334,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>componentsBox</cstring> </property> @@ -348,7 +348,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_UseScores</cstring> </property> @@ -362,7 +362,7 @@ <string>Scores for tracks are calculated automatically, based on your listening habits.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_UseRatings</cstring> </property> @@ -395,7 +395,7 @@ <string>You need the <a href='http://amarok.kde.org/wiki/Moodbar'>moodbar package</a> installed to enable the moodbar feature.</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>moodFrame</cstring> </property> @@ -421,7 +421,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowMoodbar</cstring> </property> @@ -441,9 +441,9 @@ <string>Displays a visual representation of the current track in the slider bar of the player window and a column in the playlist window.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8_2_2</cstring> + <cstring>tqlayout8_2_2</cstring> </property> <hbox> <property name="name"> @@ -459,14 +459,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>21</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_MakeMoodier</cstring> </property> @@ -483,7 +483,7 @@ <string>When enabled, the hue distribution is quantised and respread evenly, giving a prettier but less meaningful output.</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Happy Like a Rainbow</string> @@ -516,7 +516,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>130</width> <height>20</height> @@ -525,9 +525,9 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7_2_2</cstring> + <cstring>tqlayout7_2_2</cstring> </property> <hbox> <property name="name"> @@ -543,14 +543,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>21</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_MoodsWithMusic</cstring> </property> @@ -573,7 +573,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -587,7 +587,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_SavePlaylist</cstring> </property> @@ -601,7 +601,7 @@ <string>If checked, Amarok saves the current playlist on quit and restores it when restarted.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_RelativePlaylist</cstring> </property> @@ -615,7 +615,7 @@ <string>If checked, Amarok uses a relative path for the tracks of manually saved playlists</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoShowContextBrowser</cstring> </property> @@ -641,7 +641,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -685,13 +685,13 @@ <includes> <include location="local" impldecl="in implementation">Options1.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>slotUpdateMoodFrame()</slot> -</slots> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/amarok/src/Options1.ui.h b/amarok/src/Options1.ui.h index ec21b172..e4f8e723 100644 --- a/amarok/src/Options1.ui.h +++ b/amarok/src/Options1.ui.h @@ -3,7 +3,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). @@ -37,11 +37,11 @@ void Options1::init() else ++it; } -#ifdef Q_WS_MAC - if ( KStandardDirs::findExe( "open" ) != TQString::null ) +#ifdef TQ_WS_MAC + if ( KStandardDirs::findExe( "open" ) != TQString() ) browsers.prepend( i18n( "Default Browser" ) ); #else - if ( KStandardDirs::findExe( "kfmclient" ) != TQString::null ) + if ( KStandardDirs::findExe( "kfmclient" ) != TQString() ) browsers.prepend( i18n( "Default KDE Browser" ) ); #endif @@ -51,7 +51,7 @@ void Options1::init() if( index >= 0 ) kComboBox_browser->setCurrentItem( index ); else if( AmarokConfig::externalBrowser() == -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC "open" #else "kfmclient openURL" diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui index 71f2a31e..bb21ca0f 100644 --- a/amarok/src/Options2.ui +++ b/amarok/src/Options2.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Options2</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Options2</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -27,7 +27,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_UseCustomIconTheme</cstring> </property> @@ -54,7 +54,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -65,7 +65,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_UseCustomFonts</cstring> </property> @@ -82,7 +82,7 @@ <string>Check to enable custom fonts.</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>fontGroupBox</cstring> </property> @@ -113,7 +113,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -157,7 +157,7 @@ <string>The font to use in the playlist window.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -172,7 +172,7 @@ <property name="text"> <string>Player Window:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="toolTip" stdset="0"> @@ -182,7 +182,7 @@ <string>The font to use in the player window.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -252,7 +252,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -263,7 +263,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>radioGroup</cstring> </property> @@ -280,9 +280,9 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> @@ -291,7 +291,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>kcfg_SchemeCustom</cstring> </property> @@ -308,7 +308,7 @@ <string>If selected, Amarok uses the user-defined colors in the playlist.</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>customSchemeBox</cstring> </property> @@ -334,7 +334,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>fgLabel</cstring> </property> @@ -349,7 +349,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -400,7 +400,7 @@ <string>Selects the color to use as foreground (text) color in the playlist.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>bgColor</cstring> </property> @@ -443,13 +443,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>192</width> <height>32767</height> @@ -476,7 +476,7 @@ </widget> </vbox> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>kcfg_SchemeKDE</cstring> </property> @@ -493,7 +493,7 @@ <string>If selected, Amarok uses the KDE standard colors in the playlist.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>kcfg_SchemeAmarok</cstring> </property> @@ -526,15 +526,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -563,7 +563,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>contextGroupBox</cstring> </property> @@ -574,15 +574,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -614,15 +614,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>installPushButton</cstring> </property> @@ -636,7 +636,7 @@ <string>Select and install a new Context Browser style.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>retrievePushButton</cstring> </property> @@ -660,14 +660,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>uninstallPushButton</cstring> </property> @@ -695,7 +695,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -745,17 +745,17 @@ <includes> <include location="local" impldecl="in implementation">Options2.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>installPushButton_clicked()</slot> <slot>retrievePushButton_clicked()</slot> <slot>uninstallPushButton_clicked()</slot> <slot>styleComboBox_activated( const QString & s )</slot> <slot>updateStyleComboBox()</slot> -</slots> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults 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 5601daff..fe6d6e36 100644 --- a/amarok/src/Options2.ui.h +++ b/amarok/src/Options2.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). @@ -41,8 +41,8 @@ class AmarokThemeNewStuff : public KNewStuff { public: - AmarokThemeNewStuff(const TQString &type, TQWidget *parentWidget=0) - : KNewStuff( type, parentWidget ) + AmarokThemeNewStuff(const TQString &type, TQWidget *tqparentWidget=0) + : KNewStuff( type, tqparentWidget ) {} bool install( const TQString& fileName ) @@ -80,7 +80,7 @@ void Options2::init() // This method is basically lifted from ScriptManager::slotInstallScript() void Options2::installPushButton_clicked() { - KFileDialog dia( TQString::null, "*.tar *.tar.bz2 *.tar.gz|" + i18n( "Style Packages (*.tar, *.tar.bz2, *.tar.gz)" ), 0, 0, true ); + KFileDialog dia( TQString(), "*.tar *.tar.bz2 *.tar.gz|" + i18n( "Style Packages (*.tar, *.tar.bz2, *.tar.gz)" ), 0, 0, true ); kapp->setTopWidget( &dia ); dia.setCaption( kapp->makeStdCaption( i18n( "Select Style Package" ) ) ); dia.setMode( KFile::File | KFile::ExistingOnly ); @@ -108,7 +108,7 @@ void Options2::retrievePushButton_clicked() // Delete KNewStuff's configuration entries. These entries reflect which styles // are already installed. As we cannot yet keep them in sync after uninstalling // styles, we deactivate the check marks entirely. - Amarok::config()->deleteGroup( "KNewStuffStatus" ); + Amarok::config()->deleteGroup( "KNewStufftqStatus" ); // we need this because KNewStuffGeneric's install function isn't clever enough AmarokThemeNewStuff *kns = new AmarokThemeNewStuff( "amarok/themes", this ); @@ -137,7 +137,7 @@ void Options2::uninstallPushButton_clicked() return; if( KMessageBox::warningContinueCancel( 0, - i18n( "<p>Are you sure you want to uninstall the theme <strong>%1</strong>?</p>" ).arg( name ), + i18n( "<p>Are you sure you want to uninstall the theme <strong>%1</strong>?</p>" ).tqarg( name ), i18n("Uninstall Theme"), i18n("Uninstall") ) == KMessageBox::Cancel ) return; @@ -152,7 +152,7 @@ void Options2::uninstallPushButton_clicked() if( !KIO::NetAccess::del( themeDir, 0 ) ) { KMessageBox::sorry( 0, i18n( "<p>Could not uninstall this theme.</p>" "<p>You may not have sufficient permissions to delete the folder <strong>%1<strong></p>." - ).arg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) ); + ).tqarg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) ); return; } diff --git a/amarok/src/Options4.ui b/amarok/src/Options4.ui index f55eab85..b4ba9c3c 100644 --- a/amarok/src/Options4.ui +++ b/amarok/src/Options4.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Options4</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Options4</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -24,7 +24,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>opt_crossfade</cstring> </property> @@ -36,7 +36,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>180</height> @@ -59,7 +59,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>radioButtonNormalPlayback</cstring> </property> @@ -73,15 +73,15 @@ <string>Enable normal track transition. You may insert a gap of silence between tracks.</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>trackDelayLengthLabel</cstring> </property> @@ -93,7 +93,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -106,7 +106,7 @@ <cstring>kcfg_TrackDelayLength</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_TrackDelayLength</cstring> </property> @@ -118,7 +118,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>160</width> <height>0</height> @@ -142,7 +142,7 @@ </widget> </hbox> </widget> - <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_Crossfade</cstring> </property> @@ -156,23 +156,23 @@ <string>Enable crossfading between tracks.</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>crossfadeLengthLabel</cstring> </property> @@ -187,7 +187,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -200,7 +200,7 @@ <cstring>kcfg_CrossfadeLength</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>crossfadeDropdownText</cstring> </property> @@ -215,7 +215,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -230,15 +230,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_CrossfadeLength</cstring> </property> @@ -253,7 +253,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>50</width> <height>0</height> @@ -278,7 +278,7 @@ <string>The length of the crossfade between tracks, in milliseconds.</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Always</string> @@ -308,7 +308,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>50</width> <height>0</height> @@ -338,7 +338,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -347,7 +347,7 @@ </spacer> </grid> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>kcfg_FadeoutOnExit</cstring> </property> @@ -358,7 +358,7 @@ <string>If checked, Amarok will fade out the music on program exit.</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>kcfg_ResumePlayback</cstring> </property> @@ -379,14 +379,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>30</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>opt_crossfade_2</cstring> </property> @@ -398,7 +398,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>120</height> @@ -421,7 +421,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>radioButtonNormalPlayback_2</cstring> </property> @@ -445,30 +445,30 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>layout9_2</cstring> + <cstring>tqlayout9_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7_2</cstring> + <cstring>tqlayout7_2</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>fadeoutLengthLabel</cstring> </property> @@ -483,7 +483,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -498,15 +498,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8_2</cstring> + <cstring>tqlayout8_2</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_FadeoutLength</cstring> </property> @@ -521,7 +521,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>50</width> <height>0</height> @@ -550,7 +550,7 @@ </widget> </hbox> </widget> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_Fadeout</cstring> </property> @@ -618,5 +618,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui index 50c54cc8..5681e76e 100644 --- a/amarok/src/Options5.ui +++ b/amarok/src/Options5.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Options5</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Options5</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_OsdEnabled</cstring> </property> @@ -36,9 +36,9 @@ <string>Check to enable the On-Screen-Display. The OSD briefly displays track data when a new track is played.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -54,14 +54,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>mainBox</cstring> </property> @@ -78,7 +78,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>fontBox</cstring> </property> @@ -119,7 +119,7 @@ <string>The font to use for the On-Screen Display.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_OsdDrawShadow</cstring> </property> @@ -129,7 +129,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox9</cstring> </property> @@ -140,9 +140,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> @@ -151,7 +151,7 @@ <property name="spacing"> <number>2</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_OsdUseCustomColors</cstring> </property> @@ -165,9 +165,9 @@ <string>Check to enable custom colors for the On-Screen-Display.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -183,14 +183,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>colorsBox</cstring> </property> @@ -213,7 +213,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -293,7 +293,7 @@ <string>The color of the OSD background.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -318,7 +318,7 @@ </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_OsdUseFakeTranslucency</cstring> </property> @@ -328,7 +328,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>osdText</cstring> </property> @@ -345,7 +345,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_OsdUsePlaylistColumns</cstring> </property> @@ -377,7 +377,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox22</cstring> </property> @@ -388,7 +388,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -458,7 +458,7 @@ <string>The screen that should display the OSD.</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -504,26 +504,26 @@ </connection> </connections> <includes> - <include location="global" impldecl="in implementation">qapplication.h</include> - <include location="global" impldecl="in implementation">qdesktopwidget.h</include> + <include location="global" impldecl="in implementation">tqapplication.h</include> + <include location="global" impldecl="in implementation">tqdesktopwidget.h</include> <include location="local" impldecl="in declaration">osd.h</include> </includes> <variables> <variable access="private">OSDPreviewWidget *m_pOSDPreview;</variable> </variables> -<signals> +<Q_SIGNALS> <signal>settingsChanged()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot access="protected">slotPositionChanged()</slot> <slot access="protected">useCustomColorsToggled( bool on )</slot> -</slots> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> <function access="protected">hideEvent( QHideEvent * )</function> <function access="protected">showEvent( QShowEvent * )</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/amarok/src/Options5.ui.h b/amarok/src/Options5.ui.h index 22e0a04e..0bda6b20 100644 --- a/amarok/src/Options5.ui.h +++ b/amarok/src/Options5.ui.h @@ -18,7 +18,7 @@ email : fh@ez.no ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -32,7 +32,7 @@ email : fh@ez.no void Options5::init() { m_pOSDPreview = new OSDPreviewWidget( this ); //must be child!!! - m_pOSDPreview->setAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) ); + m_pOSDPreview->tqsetAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) ); m_pOSDPreview->setOffset( AmarokConfig::osdYOffset() ); connect( m_pOSDPreview, TQT_SIGNAL( positionChanged() ), TQT_SLOT( slotPositionChanged() ) ); @@ -56,7 +56,7 @@ void Options5::init() connect( kcfg_OsdEnabled, TQT_SIGNAL( toggled(bool) ), m_pOSDPreview, TQT_SLOT( setShown(bool) ) ); - Amarok::QStringx text = i18n( + Amarok::TQStringx text = i18n( "<h3>Tags Displayed in OSD</h3>" "You can use the following tokens:" "<ul>" @@ -89,7 +89,7 @@ void Options5::init() << "%year " << "%length" << "%track" << "%filename" << "%directory" << "%type" << "%comment" << "%score" << "%playcount" << "%discnumber" << "%rating" << "%moodbar" << "%elapsed" - << "%title {" + i18n( "Score: %1" ).arg( "%score" ) +'}' ) ); + << "%title {" + i18n( "Score: %1" ).tqarg( "%score" ) +'}' ) ); } void diff --git a/amarok/src/Options7.ui b/amarok/src/Options7.ui index 56cf6c3c..2beea9db 100644 --- a/amarok/src/Options7.ui +++ b/amarok/src/Options7.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Options7</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Options7</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>collectionFoldersBox</cstring> </property> @@ -30,7 +30,7 @@ <string>Collection Folders</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>databaseBox</cstring> </property> @@ -73,7 +73,7 @@ <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults 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 6ad0d1de..06eff1bb 100644 --- a/amarok/src/Options8.ui +++ b/amarok/src/Options8.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Options8</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Options8</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,7 +12,7 @@ <height>418</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>1</width> <height>1</height> @@ -28,9 +28,9 @@ <property name="spacing"> <number>12</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -39,7 +39,7 @@ <property name="spacing"> <number>12</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>infoPixmap_2</cstring> </property> @@ -54,7 +54,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -70,7 +70,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>-1</width> <height>-1</height> @@ -82,7 +82,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -109,9 +109,9 @@ <string><P>To use last.fm with Amarok, you need a <A href='http://www.last.fm:80/signup.php'>last.fm profile</A>.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -130,7 +130,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>labelPassword</cstring> </property> @@ -149,7 +149,7 @@ <cstring>kcfg_ScrobblerPassword</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>labelUsername</cstring> </property> @@ -188,7 +188,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -202,7 +202,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -213,7 +213,7 @@ <enum>RichText</enum> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_SubmitPlayedSongs</cstring> </property> @@ -232,7 +232,7 @@ <string>Improve m&y profile by submitting the tracks I play</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_RetrieveSimilarArtists</cstring> </property> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -291,10 +291,10 @@ <includes> <include location="local" impldecl="in implementation">Options8.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">updateServices( const QString & s )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/amarok/src/Options8.ui.h b/amarok/src/Options8.ui.h index 4e23949e..524b9c87 100644 --- a/amarok/src/Options8.ui.h +++ b/amarok/src/Options8.ui.h @@ -4,7 +4,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp index 614045cc..ec85dd26 100644 --- a/amarok/src/actionclasses.cpp +++ b/amarok/src/actionclasses.cpp @@ -87,7 +87,7 @@ MenuAction::plug( TQWidget *w, int index ) //TODO create menu on demand //TODO create menu above and aligned within window //TODO make the arrow point upwards! - bar->insertButton( TQString::null, id, true, i18n( "Menu" ), index ); + bar->insertButton( TQString(), id, true, i18n( "Menu" ), index ); bar->alignItemRight( id ); KToolBarButton* button = bar->getButton( id ); @@ -120,7 +120,7 @@ Menu::Menu() insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n( "C&over Manager" ), ID_SHOW_COVER_MANAGER ); safePlug( ac, "queue_manager", this ); insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n( "&Visualizations" ), ID_SHOW_VIS_SELECTOR ); - insertItem( SmallIconSet( Amarok::icon( "equalizer" ) ), i18n( "E&qualizer" ), kapp, TQT_SLOT( slotConfigEqualizer() ), 0, ID_CONFIGURE_EQUALIZER ); + insertItem( SmallIconSet( Amarok::icon( "equalizer" ) ), i18n( "E&qualizer" ), kapp, TQT_SLOT( slotConfigEqualizer() ), 0, ID_CONFIGURE_ETQUALIZER ); safePlug( ac, "script_manager", this ); safePlug( ac, "statistics", this ); @@ -131,7 +131,7 @@ Menu::Menu() insertItem( SmallIconSet( Amarok::icon( "rescan" ) ), i18n("&Rescan Collection"), ID_RESCAN_COLLECTION ); setItemEnabled( ID_RESCAN_COLLECTION, !ThreadManager::instance()->isJobPending( "CollectionScanner" ) ); -#ifndef Q_WS_MAC +#ifndef TQ_WS_MAC insertSeparator(); safePlug( ac, KStdAction::name(KStdAction::ShowMenubar), this ); @@ -169,12 +169,12 @@ Menu::instance() } KPopupMenu* -Menu::helpMenu( TQWidget *parent ) //STATIC +Menu::helpMenu( TQWidget *tqparent ) //STATIC { extern KAboutData aboutData; if ( s_helpMenu == 0 ) - s_helpMenu = new KHelpMenu( parent, &aboutData, Amarok::actionCollection() ); + s_helpMenu = new KHelpMenu( tqparent, &aboutData, Amarok::actionCollection() ); return s_helpMenu->menu(); } @@ -182,7 +182,7 @@ Menu::helpMenu( TQWidget *parent ) //STATIC void Menu::slotAboutToShow() { - setItemEnabled( ID_CONFIGURE_EQUALIZER, EngineController::hasEngineProperty( "HasEqualizer" ) ); + setItemEnabled( ID_CONFIGURE_ETQUALIZER, EngineController::hasEngineProperty( "HasEqualizer" ) ); setItemEnabled( ID_CONF_DECODER, EngineController::hasEngineProperty( "HasConfigure" ) ); } @@ -288,8 +288,8 @@ AnalyzerAction::plug( TQWidget *w, int index ) } -AnalyzerContainer::AnalyzerContainer( TQWidget *parent ) - : TQWidget( parent, "AnalyzerContainer" ) +AnalyzerContainer::AnalyzerContainer( TQWidget *tqparent ) + : TQWidget( tqparent, "AnalyzerContainer" ) , m_child( 0 ) { TQToolTip::add( this, i18n( "Click for more analyzers" ) ); @@ -421,7 +421,7 @@ TQString SelectAction::currentText() const { VolumeAction::VolumeAction( KActionCollection *ac ) : KAction( i18n( "Volume" ), 0, ac, "toolbar_volume" ) , EngineObserver( EngineController::instance() ) - , m_slider( 0 ) //is QGuardedPtr + , m_slider( 0 ) //is TQGuardedPtr {} int @@ -434,7 +434,7 @@ VolumeAction::plug( TQWidget *w, int index ) m_slider = new Amarok::VolumeSlider( w, Amarok::VOLUME_MAX ); m_slider->setName( "ToolBarVolume" ); m_slider->setValue( AmarokConfig::masterVolume() ); - m_slider->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Ignored ); + m_slider->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Ignored ); TQToolTip::add( m_slider, i18n( "Volume control" ) ); @@ -521,7 +521,7 @@ BurnMenuAction::plug( TQWidget *w, int index ) addContainer( bar, id ); connect( bar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) ); - bar->insertButton( TQString::null, id, true, i18n( "Burn" ), index ); + bar->insertButton( TQString(), id, true, i18n( "Burn" ), index ); KToolBarButton* button = bar->getButton( id ); button->setPopup( Amarok::BurnMenu::instance() ); @@ -589,7 +589,7 @@ StopAction::plug( TQWidget *w, int index ) addContainer( bar, id ); connect( bar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotDestroyed() ) ); - bar->insertButton( TQString::null, id, TQT_SIGNAL( clicked() ), EngineController::instance(), TQT_SLOT( stop() ), + bar->insertButton( TQString(), id, TQT_SIGNAL( clicked() ), EngineController::instance(), TQT_SLOT( stop() ), true, i18n( "Stop" ), index ); KToolBarButton* button = bar->getButton( id ); @@ -608,7 +608,7 @@ StopMenu::StopMenu() insertTitle( i18n( "Stop" ) ); insertItem( i18n("Now"), NOW ); insertItem( i18n("After Current Track"), AFTER_TRACK ); - insertItem( i18n("After Queue"), AFTER_QUEUE ); + insertItem( i18n("After Queue"), AFTER_TQUEUE ); connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); @@ -631,8 +631,8 @@ StopMenu::slotAboutToShow() setItemEnabled( AFTER_TRACK, EngineController::engine()->loaded() ); setItemChecked( AFTER_TRACK, pl->stopAfterMode() == Playlist::StopAfterCurrent ); - setItemEnabled( AFTER_QUEUE, pl->nextTracks().count() ); - setItemChecked( AFTER_QUEUE, pl->stopAfterMode() == Playlist::StopAfterQueue ); + setItemEnabled( AFTER_TQUEUE, pl->nextTracks().count() ); + setItemChecked( AFTER_TQUEUE, pl->stopAfterMode() == Playlist::StopAfterQueue ); } void @@ -653,7 +653,7 @@ StopMenu::slotActivated( int index ) ? Playlist::DoNotStop : Playlist::StopAfterCurrent ); break; - case AFTER_QUEUE: + case AFTER_TQUEUE: pl->setStopAfterMode( mode == Playlist::StopAfterQueue ? Playlist::DoNotStop : Playlist::StopAfterQueue ); diff --git a/amarok/src/actionclasses.h b/amarok/src/actionclasses.h index 2abff936..2725bd7a 100644 --- a/amarok/src/actionclasses.h +++ b/amarok/src/actionclasses.h @@ -24,15 +24,16 @@ namespace Amarok class Menu : public PrettyPopupMenu { Q_OBJECT + TQ_OBJECT public: static Menu *instance(); - static KPopupMenu *helpMenu( TQWidget *parent = 0 ); + static KPopupMenu *helpMenu( TQWidget *tqparent = 0 ); enum MenuIds { ID_CONF_DECODER, ID_SHOW_VIS_SELECTOR, ID_SHOW_COVER_MANAGER, - ID_CONFIGURE_EQUALIZER, + ID_CONFIGURE_ETQUALIZER, ID_RESCAN_COLLECTION }; @@ -64,10 +65,10 @@ namespace Amarok virtual void engineStateChanged( Engine::State, Engine::State = Engine::Empty ); }; - class AnalyzerContainer : public QWidget + class AnalyzerContainer : public TQWidget { public: - AnalyzerContainer( TQWidget *parent ); + AnalyzerContainer( TQWidget *tqparent ); protected: virtual void resizeEvent( TQResizeEvent* ); virtual void mousePressEvent( TQMouseEvent* ); @@ -154,6 +155,7 @@ namespace Amarok class BurnMenu : public KPopupMenu { Q_OBJECT + TQ_OBJECT public: enum MenuIds { @@ -182,12 +184,13 @@ namespace Amarok class StopMenu : public KPopupMenu { Q_OBJECT + TQ_OBJECT public: enum MenuIds { NOW, AFTER_TRACK, - AFTER_QUEUE + AFTER_TQUEUE }; static KPopupMenu *instance(); diff --git a/amarok/src/amarok.h b/amarok/src/amarok.h index dd70b3ef..535c6fa1 100644 --- a/amarok/src/amarok.h +++ b/amarok/src/amarok.h @@ -41,7 +41,7 @@ namespace Amarok ///eg. base of the Amarok Player-window extern TQColor Base; //Amarok::blue ///eg. text in the Amarok Player-window - extern TQColor Text; //Qt::white + extern TQColor Text; //TQt::white ///eg. background colour for Amarok::PrettySliders extern TQColor Background; //brighter blue ///eg. outline of slider widgets in Player-window @@ -90,12 +90,12 @@ namespace Amarok bool invokeBrowser( const TQString& url ); //defined in app.cpp /** - * Obtain an Amarok PNG image as a QPixmap + * Obtain an Amarok PNG image as a TQPixmap */ TQPixmap getPNG( const TQString& /*fileName*/ ); //defined in app.cpp /** - * Obtain an Amarok JPG image as a QPixmap + * Obtain an Amarok JPG image as a TQPixmap */ TQPixmap getJPG( const TQString& /*fileName*/ ); //defined in app.cpp @@ -111,7 +111,7 @@ namespace Amarok */ class OverrideCursor { //defined in app.cpp public: - OverrideCursor( Qt::CursorShape cursor = Qt::WaitCursor ); + OverrideCursor( TQt::tqCursorShape cursor = TQt::WaitCursor ); ~OverrideCursor(); }; @@ -120,7 +120,7 @@ namespace Amarok * @param directory will be created if not existing, you MUST end the string * with '/' */ - LIBAMAROK_EXPORT TQString saveLocation( const TQString &directory = TQString::null ); //defined in collectionreader.cpp + LIBAMAROK_EXPORT TQString saveLocation( const TQString &directory = TQString() ); //defined in collectionreader.cpp KIO::Job *trashFiles( const KURL::List &files ); //defined in app.cpp @@ -146,7 +146,7 @@ namespace Amarok */ inline TQString extension( const TQString &fileName ) { - return fileName.contains( '.' ) ? fileName.mid( fileName.findRev( '.' ) + 1 ).lower() : ""; + return fileName.tqcontains( '.' ) ? fileName.mid( fileName.tqfindRev( '.' ) + 1 ).lower() : ""; } /** Transform url into a file url if possible */ @@ -176,7 +176,7 @@ namespace Amarok /** * Returns internal code for database type, DbConnection::sqlite, DbConnection::mysql, or DbConnection::postgresql - * @param type either "SQLite", "MySQL", or "Postgresql". + * @param type either "STQLite", "MySQL", or "Postgresql". */ int databaseTypeCode( const TQString type ); //defined in configdialog.cpp @@ -203,7 +203,7 @@ namespace Amarok TQStringList splitPath( TQString path ); //defined in playlistbrowser.cpp /** - * Creates a copy of of the KURL instance, that doesn't have any QStrings sharing memory. + * Creates a copy of of the KURL instance, that doesn't have any TQStrings sharing memory. **/ KURL detachedKURL( const KURL &url ); //defined in metabundle.cpp @@ -293,7 +293,7 @@ namespace Amarok */ class LIBAMAROK_EXPORT Process : public KProcess { public: - Process( TQObject *parent = 0 ) : KProcess( parent ) {} + Process( TQObject *tqparent = 0 ) : KProcess( tqparent ) {} virtual int commSetupDoneC() { const int i = KProcess::commSetupDoneC(); Amarok::closeOpenFiles(KProcess::out[0],KProcess::in[0], KProcess::err[0]); @@ -304,9 +304,12 @@ namespace Amarok } +#ifdef USE_QT4 +#undef foreach +#endif // USE_QT4 /** - * Use this to const-iterate over QStringLists, if you like. + * Use this to const-iterate over TQStringLists, if you like. * Watch out for the definition of last in the scope of your for. * * TQStringList strings; @@ -317,7 +320,7 @@ namespace Amarok for( TQStringList::ConstIterator it = x.begin(), end = x.end(); it != end; ++it ) /** - * You can use this for lists that aren't QStringLists. + * You can use this for lists that aren't TQStringLists. * Watch out for the definition of last in the scope of your for. * * BundleList bundles; diff --git a/amarok/src/amarok_play_audiocd.desktop b/amarok/src/amarok_play_audiocd.desktop index 6ccd96ec..b363be0e 100644 --- a/amarok/src/amarok_play_audiocd.desktop +++ b/amarok/src/amarok_play_audiocd.desktop @@ -35,11 +35,11 @@ Name[ne]=अमारोकसँग अडियो सीडी बजाउ Name[nl]=Audio-cd met Amarok afspelen Name[nn]=Spel lyd-CD med Amarok Name[pa]=ਅਮਰੋਕ ਨਾਲ ਆਡੀਓ CD ਚਲਾਓ -Name[pl]=Odtwórz Audio CD za pomocą Amarok +Name[pl]=Odtwórz Audio CD za potqmocą Amarok Name[pt]=Tocar o CD de Áudio com o Amarok Name[pt_BR]=Reproduzir CD de Áudio com o Amarok Name[se]=Čuojat jietna-CD:a Amarokain -Name[sk]=Zahrať Audio CD pomocou Amarok +Name[sk]=Zahrať Audio CD potqmocou Amarok Name[sr]=Пусти аудио CD помоћу Amarok-а Name[sr@Latn]=Pusti audio CD pomoću Amarok-a Name[sv]=Spela ljud-cd med Amarok diff --git a/amarok/src/amarokcore/amarok.kcfg b/amarok/src/amarokcore/amarok.kcfg index 0601edc5..bf618fcc 100644 --- a/amarok/src/amarokcore/amarok.kcfg +++ b/amarok/src/amarokcore/amarok.kcfg @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > -<include>qdir.h</include> +<include>tqdir.h</include> <kcfgfile name="amarokrc"/> @@ -443,7 +443,7 @@ </entry> <entry key="Osd Y Offset" type="Int"> <label>Y position offset</label> - <whatsthis>The Y position of the OSD relative to the chosen screen and OSD alignment. If Top alignment is chosen the Y offset is the space between the upper part of the OSD and the top of the screen. If Bottom alignment is chosen the Y offset is the space between the bottom part of the OSD and the bottom of the screen.</whatsthis> + <whatsthis>The Y position of the OSD relative to the chosen screen and OSD tqalignment. If Top tqalignment is chosen the Y offset is the space between the upper part of the OSD and the top of the screen. If Bottom tqalignment is chosen the Y offset is the space between the bottom part of the OSD and the bottom of the screen.</whatsthis> <default>50</default> <min>0</min> <max>10000</max> diff --git a/amarok/src/amarokcore/amarokdcophandler.cpp b/amarok/src/amarokcore/amarokdcophandler.cpp index 584935a1..ab3ec320 100644 --- a/amarok/src/amarokcore/amarokdcophandler.cpp +++ b/amarok/src/amarokcore/amarokdcophandler.cpp @@ -72,7 +72,7 @@ namespace Amarok return APP_VERSION; } - bool DcopPlayerHandler::dynamicModeStatus() + bool DcopPlayerHandler::dynamicModetqStatus() { return Amarok::dynamicMode(); } @@ -95,17 +95,17 @@ namespace Amarok return EngineController::engine()->state() == Engine::Playing; } - bool DcopPlayerHandler::randomModeStatus() + bool DcopPlayerHandler::randomModetqStatus() { return AmarokConfig::randomMode(); } - bool DcopPlayerHandler::repeatPlaylistStatus() + bool DcopPlayerHandler::repeatPlaylisttqStatus() { return Amarok::repeatPlaylist(); } - bool DcopPlayerHandler::repeatTrackStatus() + bool DcopPlayerHandler::repeatTracktqStatus() { return Amarok::repeatTrack(); } @@ -237,7 +237,7 @@ namespace Amarok TQString DcopPlayerHandler::lastfmStation() { - return LastFm::Controller::stationDescription(); //return TQString::null if not playing + return LastFm::Controller::stationDescription(); //return TQString() if not playing } TQString DcopPlayerHandler::nowPlaying() @@ -521,7 +521,7 @@ namespace Amarok //the amarok binary anyway --mxcl debug() << "Startup ID: " << args.first() << endl; kapp->setStartupId( args.first().local8Bit() ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // currently X11 only KStartupInfo::appStarted(); #endif diff --git a/amarok/src/amarokcore/amarokdcophandler.h b/amarok/src/amarokcore/amarokdcophandler.h index 33d5d711..028bb4c9 100644 --- a/amarok/src/amarokcore/amarokdcophandler.h +++ b/amarok/src/amarokcore/amarokdcophandler.h @@ -30,19 +30,20 @@ namespace Amarok class DcopPlayerHandler : public TQObject, virtual public AmarokPlayerInterface { Q_OBJECT + TQ_OBJECT public: DcopPlayerHandler(); public: virtual TQString version(); - virtual bool dynamicModeStatus(); + virtual bool dynamicModetqStatus(); virtual bool equalizerEnabled(); virtual bool osdEnabled(); virtual bool isPlaying(); - virtual bool randomModeStatus(); - virtual bool repeatPlaylistStatus(); - virtual bool repeatTrackStatus(); + virtual bool randomModetqStatus(); + virtual bool repeatPlaylisttqStatus(); + virtual bool repeatTracktqStatus(); virtual int getVolume(); virtual int sampleRate(); virtual float score (); @@ -116,6 +117,7 @@ class DcopPlayerHandler : public TQObject, virtual public AmarokPlayerInterface class DcopPlaylistHandler : public TQObject, virtual public AmarokPlaylistInterface { Q_OBJECT + TQ_OBJECT public: DcopPlaylistHandler(); @@ -146,6 +148,7 @@ class DcopPlaylistHandler : public TQObject, virtual public AmarokPlaylistInterf class DcopPlaylistBrowserHandler : public TQObject, virtual public AmarokPlaylistBrowserInterface { Q_OBJECT + TQ_OBJECT public: DcopPlaylistBrowserHandler(); @@ -160,6 +163,7 @@ class DcopPlaylistBrowserHandler : public TQObject, virtual public AmarokPlaylis class DcopContextBrowserHandler : public TQObject, virtual public AmarokContextBrowserInterface { Q_OBJECT + TQ_OBJECT public: DcopContextBrowserHandler(); @@ -175,6 +179,7 @@ class DcopContextBrowserHandler : public TQObject, virtual public AmarokContextB class DcopCollectionHandler : public TQObject, virtual public AmarokCollectionInterface { Q_OBJECT + TQ_OBJECT public: DcopCollectionHandler(); @@ -208,6 +213,7 @@ class DcopCollectionHandler : public TQObject, virtual public AmarokCollectionIn class DcopScriptHandler : public TQObject, virtual public AmarokScriptInterface { Q_OBJECT + TQ_OBJECT public: DcopScriptHandler(); @@ -227,6 +233,7 @@ class DcopScriptHandler : public TQObject, virtual public AmarokScriptInterface class DcopDevicesHandler : public TQObject, virtual public AmarokDevicesInterface { Q_OBJECT + TQ_OBJECT public: DcopDevicesHandler(); @@ -241,6 +248,7 @@ class DcopDevicesHandler : public TQObject, virtual public AmarokDevicesInterfac class DcopMediaBrowserHandler : public TQObject, virtual public AmarokMediaBrowserInterface { Q_OBJECT + TQ_OBJECT public: DcopMediaBrowserHandler(); diff --git a/amarok/src/amarokcore/amarokdcopiface.h b/amarok/src/amarokcore/amarokdcopiface.h index 32b330a7..1ce3849b 100644 --- a/amarok/src/amarokcore/amarokdcopiface.h +++ b/amarok/src/amarokcore/amarokdcopiface.h @@ -36,13 +36,13 @@ class AmarokPlayerInterface : virtual public DCOPObject k_dcop: virtual TQString version() = 0; ///< returns amarok version string - virtual bool dynamicModeStatus() = 0; ///< Return dynamic mode status. + virtual bool dynamicModetqStatus() = 0; ///< Return dynamic mode status. virtual bool equalizerEnabled() = 0; ///< Return the equalizer status. virtual bool osdEnabled() = 0; ///< Return the OSD display status. virtual bool isPlaying() = 0; ///< Return true if something is playing now. - virtual bool randomModeStatus() = 0; ///< Return random mode status. - virtual bool repeatPlaylistStatus() = 0; ///< Return repeat playlist status. - virtual bool repeatTrackStatus() = 0; ///< Return repeat track status. + virtual bool randomModetqStatus() = 0; ///< Return random mode status. + virtual bool repeatPlaylisttqStatus() = 0; ///< Return repeat playlist status. + virtual bool repeatTracktqStatus() = 0; ///< Return repeat track status. virtual int getVolume() = 0; ///< Return volume in range 0-100%. virtual int sampleRate() = 0; ///< Return the sample rate of the currently playing track. virtual float score() = 0; ///< Return the score of the currently playing track. diff --git a/amarok/src/amarokcore/crashhandler.cpp b/amarok/src/amarokcore/crashhandler.cpp index c0185b4f..e2258d9d 100644 --- a/amarok/src/amarokcore/crashhandler.cpp +++ b/amarok/src/amarokcore/crashhandler.cpp @@ -47,13 +47,13 @@ namespace Amarok }; #endif - static QString + static TQString runCommand( const TQCString &command ) { static const uint SIZE = 40960; //40 KiB static char stdoutBuf[ SIZE ] = {0}; - std::cout << "Running: " << command << std::endl; + std::cout << "Running: " << command.data() << std::endl; FILE *process = ::popen( command, "r" ); if ( process ) @@ -100,7 +100,7 @@ namespace Amarok "Build date: " __DATE__ "\n" "CC version: " __VERSION__ "\n" //assuming we're using GCC "KDElibs: " KDE_VERSION_STRING "\n" - "Qt: %2\n" + "TQt: %2\n" "TagLib: %3.%4.%5\n" "CPU count: %6\n"; @@ -120,12 +120,12 @@ namespace Amarok #endif - body = body.arg( AmarokConfig::soundSystem() ) - .arg( qVersion() ) - .arg( TAGLIB_MAJOR_VERSION ) - .arg( TAGLIB_MINOR_VERSION ) - .arg( TAGLIB_PATCH_VERSION ) - .arg( cpucount ); + body = body.tqarg( AmarokConfig::soundSystem() ) + .tqarg( qVersion() ) + .tqarg( TAGLIB_MAJOR_VERSION ) + .tqarg( TAGLIB_MINOR_VERSION ) + .tqarg( TAGLIB_PATCH_VERSION ) + .tqarg( cpucount ); #ifdef NDEBUG body += "NDEBUG: true"; @@ -171,37 +171,37 @@ namespace Amarok /// clean up bt.remove( "(no debugging symbols found)..." ); bt.remove( "(no debugging symbols found)\n" ); - bt.replace( TQRegExp("\n{2,}"), "\n" ); //clean up multiple \n characters + bt.tqreplace( TQRegExp("\n{2,}"), "\n" ); //clean up multiple \n characters bt.stripWhiteSpace(); /// analyze usefulness bool useful = true; const TQString fileCommandOutput = runCommand( "file `which amarokapp`" ); - if( fileCommandOutput.find( "not stripped", false ) == -1 ) + if( fileCommandOutput.tqfind( "not stripped", false ) == -1 ) subject += "[___stripped]"; //same length as below else subject += "[NOTstripped]"; if( !bt.isEmpty() ) { - const int invalidFrames = bt.contains( TQRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ in \\?\\?") ); - const int validFrames = bt.contains( TQRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ in [^?]") ); + const int invalidFrames = bt.tqcontains( TQRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ in \\?\\?") ); + const int validFrames = bt.tqcontains( TQRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ in [^?]") ); const int totalFrames = invalidFrames + validFrames; if( totalFrames > 0 ) { const double validity = double(validFrames) / totalFrames; - subject += TQString("[validity: %1]").arg( validity, 0, 'f', 2 ); + subject += TQString("[validity: %1]").tqarg( validity, 0, 'f', 2 ); if( validity <= 0.5 ) useful = false; } - subject += TQString("[frames: %1]").arg( totalFrames, 3 /*padding*/ ); + subject += TQString("[frames: %1]").tqarg( totalFrames, 3 /*padding*/ ); - if( bt.find( TQRegExp(" at \\w*\\.cpp:\\d+\n") ) >= 0 ) + if( bt.tqfind( TQRegExp(" at \\w*\\.cpp:\\d+\n") ) >= 0 ) subject += "[line numbers]"; } else useful = false; - subject += TQString("[%1]").arg( AmarokConfig::soundSystem().remove( TQRegExp("-?engine") ) ); + subject += TQString("[%1]").tqarg( AmarokConfig::soundSystem().remove( TQRegExp("-?engine") ) ); std::cout << subject.latin1() << std::endl; @@ -232,7 +232,7 @@ namespace Amarok else { std::cout << i18n( "\nAmarok has crashed! We are terribly sorry about this :(\n\n" "But, all is not lost! Perhaps an upgrade is already available " - "which fixes the problem. Please check your distribution's software repository.\n" ).local8Bit(); + "which fixes the problem. Please check your distribution's software repository.\n" ).local8Bit().data(); } //_exit() exits immediately, otherwise this @@ -265,10 +265,10 @@ namespace Amarok Amarok::CrashHandlerWidget::CrashHandlerWidget() { - TQBoxLayout *layout = new TQHBoxLayout( this, 18, 12 ); + TQBoxLayout *tqlayout = new TQHBoxLayout( this, 18, 12 ); { - TQBoxLayout *lay = new TQVBoxLayout( layout ); + TQBoxLayout *lay = new TQVBoxLayout( tqlayout ); TQLabel *label = new TQLabel( this ); label->setPixmap( locate( "data", "drkonqi/pics/konqi.png" ) ); label->setFrameStyle( TQFrame::Plain | TQFrame::Box ); @@ -276,9 +276,9 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget() lay->addItem( new TQSpacerItem( 3, 3, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); } - layout = new TQVBoxLayout( layout, 6 ); + tqlayout = new TQVBoxLayout( tqlayout, 6 ); - layout->add( new TQLabel( /*i18n*/( + tqlayout->add( new TQLabel( /*i18n*/( "<p>" "Amarok has crashed! We are terribly sorry about this :(" "<p>" "However you now have an opportunity to help us fix this crash so that it doesn't " "happen again! Click <b>Send Email</b> and Amarok will prepare an email that you " @@ -286,11 +286,11 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget() "as soon as possible." "<p>" "Thanks for choosing Amarok.<br>" ), this ) ); - layout = new TQHBoxLayout( layout, 6 ); + tqlayout = new TQHBoxLayout( tqlayout, 6 ); - layout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) ); - layout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) ); - layout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) ); + tqlayout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) ); + tqlayout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) ); + tqlayout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) ); static_cast<TQPushButton*>(child("email"))->setDefault( true ); @@ -298,6 +298,6 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget() connect( child( "close" ), TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); setCaption( i18n("Crash Handler") ); - setFixedSize( sizeHint() ); + setFixedSize( tqsizeHint() ); } #endif diff --git a/amarok/src/analyzers/analyzerbase.cpp b/amarok/src/analyzers/analyzerbase.cpp index 27fb7abc..83fb1595 100644 --- a/amarok/src/analyzers/analyzerbase.cpp +++ b/amarok/src/analyzers/analyzerbase.cpp @@ -31,7 +31,7 @@ //can't mod scope in analyze you have to use transform -//TODO for 2D use setErasePixmap Qt function insetead of m_background +//TODO for 2D use setErasePixmap TQt function insetead of m_background // make the linker happy only for gcc < 4.0 #if !( __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 0 ) ) @@ -40,8 +40,8 @@ template class Analyzer::Base<TQWidget>; template<class W> -Analyzer::Base<W>::Base( TQWidget *parent, uint timeout, uint scopeSize ) - : W( parent ) +Analyzer::Base<W>::Base( TQWidget *tqparent, uint timeout, uint scopeSize ) + : W( tqparent ) , m_timeout( timeout ) , m_fht( new FHT(scopeSize) ) {} @@ -188,10 +188,10 @@ Analyzer::Base<W>::demo() //virtual -Analyzer::Base2D::Base2D( TQWidget *parent, uint timeout, uint scopeSize ) - : Base<TQWidget>( parent, timeout, scopeSize ) +Analyzer::Base2D::Base2D( TQWidget *tqparent, uint timeout, uint scopeSize ) + : Base<TQWidget>( tqparent, timeout, scopeSize ) { - setWFlags( Qt::WNoAutoErase ); //no flicker + setWFlags( TQt::WNoAutoErase ); //no flicker connect( &m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( draw() ) ); } @@ -228,9 +228,9 @@ Analyzer::Base2D::paletteChange( const TQPalette& ) -#ifdef HAVE_QGLWIDGET -Analyzer::Base3D::Base3D( TQWidget *parent, uint timeout, uint scopeSize ) - : Base<TQGLWidget>( parent, timeout, scopeSize ) +#ifdef HAVE_TQGLWIDGET +Analyzer::Base3D::Base3D( TQWidget *tqparent, uint timeout, uint scopeSize ) + : Base<TQGLWidget>( tqparent, timeout, scopeSize ) { connect( &m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( draw() ) ); } diff --git a/amarok/src/analyzers/analyzerbase.h b/amarok/src/analyzers/analyzerbase.h index e15f5ee1..41f7d742 100644 --- a/amarok/src/analyzers/analyzerbase.h +++ b/amarok/src/analyzers/analyzerbase.h @@ -5,7 +5,7 @@ #define ANALYZERBASE_H -#include <config.h> //HAVE_QGLWIDGET +#include <config.h> //HAVE_TQGLWIDGET #ifdef __FreeBSD__ #include <sys/types.h> @@ -17,9 +17,9 @@ #include <tqwidget.h> //baseclass #include <vector> //included for convenience -//#ifdef HAVE_QGLWIDGET +//#ifdef HAVE_TQGLWIDGET #include <tqgl.h> //baseclass -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/gl.h> //included for convenience #include <OpenGL/glu.h> //included for convenience #else @@ -27,8 +27,8 @@ #include <GL/glu.h> //included for convenience #endif //#else -////this is a workaround for compile problems due to moc -//#define TQGLWidget QWidget +////this is a workaround for compile problems due to tqmoc +//#define TQGLWidget TQWidget //#endif class TQEvent; @@ -76,6 +76,7 @@ protected: class Base2D : public Base<TQWidget> { Q_OBJECT + TQ_OBJECT public: const TQPixmap *background() const { return &m_background; } const TQPixmap *canvas() const { return &m_canvas; } @@ -105,16 +106,17 @@ private: -//This mess is because moc generates an entry for this class despite the #if block -//1. the Q_OBJECT macro must be exposed +//This mess is because tqmoc generates an entry for this class despite the #if block +//1. the TQ_OBJECT macro must be exposed //2. we have to define the class //3. we have to declare a ctor (to satisfy the inheritance) //4. the slot must also by visible (!) -//TODO find out how to stop moc generating a metaobject for this class +//TODO find out how to stop tqmoc generating a metaobject for this class class Base3D : public Base<TQGLWidget> { Q_OBJECT -#ifdef HAVE_QGLWIDGET + TQ_OBJECT +#ifdef HAVE_TQGLWIDGET protected: Base3D( TQWidget*, uint, uint = 7 ); private slots: diff --git a/amarok/src/analyzers/analyzerfactory.cpp b/amarok/src/analyzers/analyzerfactory.cpp index 16b10acd..e712b4cf 100644 --- a/amarok/src/analyzers/analyzerfactory.cpp +++ b/amarok/src/analyzers/analyzerfactory.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <config.h> //for HAVE_QGLWIDGET macro +#include <config.h> //for HAVE_TQGLWIDGET macro #include "amarokcore/amarokconfig.h" #include "analyzerbase.h" //declaration here @@ -26,7 +26,7 @@ #include "turbine.h" #include "blockanalyzer.h" -#ifdef HAVE_QGLWIDGET +#ifdef HAVE_TQGLWIDGET #include "glanalyzer.h" #include "glanalyzer2.h" #include "glanalyzer3.h" @@ -38,7 +38,7 @@ //separate from analyzerbase.cpp to save compile time -TQWidget *Analyzer::Factory::createAnalyzer( TQWidget *parent ) +TQWidget *Analyzer::Factory::createAnalyzer( TQWidget *tqparent ) { //new XmmsWrapper(); //toplevel @@ -47,80 +47,80 @@ TQWidget *Analyzer::Factory::createAnalyzer( TQWidget *parent ) switch( AmarokConfig::currentAnalyzer() ) { case 2: - analyzer = new Sonogram( parent ); + analyzer = new Sonogram( tqparent ); break; case 1: - analyzer = new TurbineAnalyzer( parent ); + analyzer = new TurbineAnalyzer( tqparent ); break; case 3: - analyzer = new BarAnalyzer( parent ); + analyzer = new BarAnalyzer( tqparent ); break; case 4: - analyzer = new BlockAnalyzer( parent ); + analyzer = new BlockAnalyzer( tqparent ); break; -#ifdef HAVE_QGLWIDGET +#ifdef HAVE_TQGLWIDGET case 5: - analyzer = new GLAnalyzer( parent ); + analyzer = new GLAnalyzer( tqparent ); break; case 6: - analyzer = new GLAnalyzer2( parent ); + analyzer = new GLAnalyzer2( tqparent ); break; case 7: - analyzer = new GLAnalyzer3( parent ); + analyzer = new GLAnalyzer3( tqparent ); break; case 8: #else case 5: #endif - analyzer = new TQLabel( i18n( "Click for Analyzers" ), parent ); //blank analyzer to satisfy Grue - static_cast<TQLabel *>(analyzer)->setAlignment( Qt::AlignCenter ); + analyzer = new TQLabel( i18n( "Click for Analyzers" ), tqparent ); //blank analyzer to satisfy Grue + static_cast<TQLabel *>(analyzer)->tqsetAlignment( TQt::AlignCenter ); break; default: AmarokConfig::setCurrentAnalyzer( 0 ); case 0: - analyzer = new BoomAnalyzer( parent ); + analyzer = new BoomAnalyzer( tqparent ); } return analyzer; } -TQWidget *Analyzer::Factory::createPlaylistAnalyzer( TQWidget *parent) +TQWidget *Analyzer::Factory::createPlaylistAnalyzer( TQWidget *tqparent) { TQWidget *analyzer = 0; switch( AmarokConfig::currentPlaylistAnalyzer() ) { case 1: - analyzer = new TurbineAnalyzer( parent ); + analyzer = new TurbineAnalyzer( tqparent ); break; case 2: - analyzer = new Sonogram( parent ); + analyzer = new Sonogram( tqparent ); break; case 3: - analyzer = new BoomAnalyzer( parent ); + analyzer = new BoomAnalyzer( tqparent ); break; - #ifdef HAVE_QGLWIDGET + #ifdef HAVE_TQGLWIDGET case 4: - analyzer = new GLAnalyzer( parent ); + analyzer = new GLAnalyzer( tqparent ); break; case 5: - analyzer = new GLAnalyzer2( parent ); + analyzer = new GLAnalyzer2( tqparent ); break; case 6: - analyzer = new GLAnalyzer3( parent ); + analyzer = new GLAnalyzer3( tqparent ); break; case 7: #else case 4: #endif - analyzer = new TQLabel( i18n( "Click for Analyzers" ), parent ); //blank analyzer to satisfy Grue - static_cast<TQLabel *>(analyzer)->setAlignment( Qt::AlignCenter ); + analyzer = new TQLabel( i18n( "Click for Analyzers" ), tqparent ); //blank analyzer to satisfy Grue + static_cast<TQLabel *>(analyzer)->tqsetAlignment( TQt::AlignCenter ); break; default: AmarokConfig::setCurrentPlaylistAnalyzer( 0 ); case 0: - analyzer = new BlockAnalyzer( parent ); + analyzer = new BlockAnalyzer( tqparent ); break; } return analyzer; diff --git a/amarok/src/analyzers/baranalyzer.cpp b/amarok/src/analyzers/baranalyzer.cpp index 24a24c9c..40f5694f 100644 --- a/amarok/src/analyzers/baranalyzer.cpp +++ b/amarok/src/analyzers/baranalyzer.cpp @@ -17,15 +17,15 @@ #include <tqpainter.h> -BarAnalyzer::BarAnalyzer( TQWidget *parent ) - : Analyzer::Base2D( parent, 12, 8 ) +BarAnalyzer::BarAnalyzer( TQWidget *tqparent ) + : Analyzer::Base2D( tqparent, 12, 8 ) //, m_bands( BAND_COUNT ) //, barVector( BAND_COUNT, 0 ) //, roofVector( BAND_COUNT, 50 ) //, roofVelocityVector( BAND_COUNT, ROOF_VELOCITY_REDUCTION_FACTOR ) { //roof pixmaps don't depend on size() so we do in the ctor - m_bg = parent->paletteBackgroundColor(); + m_bg = tqparent->paletteBackgroundColor(); TQColor fg( 0xff, 0x50, 0x70 ); #define m_bg backgroundColor() @@ -150,7 +150,7 @@ void BarAnalyzer::analyze( const Scope &s ) //blt the bar bitBlt( canvas(), x, height() - y2, - gradient(), y2 * COLUMN_WIDTH, height() - y2, COLUMN_WIDTH, y2, Qt::CopyROP ); + gradient(), y2 * COLUMN_WIDTH, height() - y2, COLUMN_WIDTH, y2, TQt::CopyROP ); m_roofMem[i].push_back( height() - roofVector[i] - 2 ); diff --git a/amarok/src/analyzers/baranalyzer.h b/amarok/src/analyzers/baranalyzer.h index 6eb470c8..4bb4e3f3 100644 --- a/amarok/src/analyzers/baranalyzer.h +++ b/amarok/src/analyzers/baranalyzer.h @@ -21,7 +21,7 @@ class BarAnalyzer : public Analyzer::Base2D //virtual void transform( Scope& ); /** - * Resizes the widget to a new geometry according to @p e + * Resizes the widget to a new tqgeometry according to @p e * @param e The resize-event */ void resizeEvent( TQResizeEvent * e); diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp index 886243d8..ed61161a 100644 --- a/amarok/src/analyzers/blockanalyzer.cpp +++ b/amarok/src/analyzers/blockanalyzer.cpp @@ -29,8 +29,8 @@ static inline uint myMax( uint v1, uint v2 ) { return v1 > v2 ? v1 : v2; } namespace Amarok { extern KConfig *config( const TQString& ); } -BlockAnalyzer::BlockAnalyzer( TQWidget *parent ) - : Analyzer::Base2D( parent, 20, 9 ) +BlockAnalyzer::BlockAnalyzer( TQWidget *tqparent ) + : Analyzer::Base2D( tqparent, 20, 9 ) , m_columns( 0 ) //uint , m_rows( 0 ) //uint , m_y( 0 ) //uint @@ -141,7 +141,7 @@ BlockAnalyzer::analyze( const Analyzer::Scope &s ) // y starts from the top and increases in units of blocks // m_yscale looks similar to: { 0.7, 0.5, 0.25, 0.15, 0.1, 0 } - // if it contains 6 elements there are 5 rows in the analyzer + // if it tqcontains 6 elements there are 5 rows in the analyzer Analyzer::interpolate( s, m_scope ); @@ -222,7 +222,7 @@ adjustToLimits( int &b, int &f, uint &amount ) * It won't modify the hue of fg unless absolutely necessary * @return the adjusted form of fg */ -QColor +TQColor ensureContrast( const TQColor &bg, const TQColor &fg, uint _amount = 150 ) { class OutputOnExit { @@ -244,8 +244,8 @@ ensureContrast( const TQColor &bg, const TQColor &fg, uint _amount = 150 ) int bh, bs, bv; int fh, fs, fv; - bg.getHsv( bh, bs, bv ); - fg.getHsv( fh, fs, fv ); + bg.getHsv( &bh, &bs, &bv ); + fg.getHsv( &fh, &fs, &fv ); int dv = abs( bv - fv ); @@ -345,7 +345,7 @@ ensureContrast( const TQColor &bg, const TQColor &fg, uint _amount = 150 ) // STAMP // debug() << "Something went wrong!\n"; - return Qt::blue; + return TQt::blue; #undef amount // #undef STAMP @@ -354,7 +354,7 @@ ensureContrast( const TQColor &bg, const TQColor &fg, uint _amount = 150 ) void BlockAnalyzer::paletteChange( const TQPalette& ) //virtual { - const TQColor bg = palette().active().background(); + const TQColor bg = tqpalette().active().background(); const TQColor fg = ensureContrast( bg, KGlobalSettings::activeTitleColor() ); m_topBarPixmap.fill( fg ); @@ -372,11 +372,11 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual p.fillRect( 0, y*(HEIGHT+1), WIDTH, HEIGHT, TQColor( r+int(dr*y), g+int(dg*y), b+int(db*y) ) ); { - const TQColor bg = palette().active().background().dark( 112 ); + const TQColor bg = tqpalette().active().background().dark( 112 ); //make a complimentary fadebar colour //TODO dark is not always correct, dumbo! - int h,s,v; palette().active().background().dark( 150 ).getHsv( &h, &s, &v ); + int h,s,v; tqpalette().active().background().dark( 150 ).getHsv( &h, &s, &v ); const TQColor fg( h + 120, s, v, TQColor::Hsv ); const double dr = fg.red() - bg.red(); @@ -386,7 +386,7 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual // Precalculate all fade-bar pixmaps for( uint y = 0; y < FADE_SIZE; ++y ) { - m_fade_bars[y].fill( palette().active().background() ); + m_fade_bars[y].fill( tqpalette().active().background() ); TQPainter f( &m_fade_bars[y] ); for( int z = 0; (uint)z < m_rows; ++z ) { const double Y = 1.0 - (log10( FADE_SIZE - y ) / log10( FADE_SIZE )); @@ -401,7 +401,7 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual void BlockAnalyzer::drawBackground() { - const TQColor bg = palette().active().background(); + const TQColor bg = tqpalette().active().background(); const TQColor bgdark = bg.dark( 112 ); background()->fill( bg ); @@ -430,7 +430,7 @@ BlockAnalyzer::contextMenuEvent( TQContextMenuEvent *e ) { const uint v = ids[x]; - menu.insertItem( i18n( "%1 fps" ).arg( 1000/v ), v ); + menu.insertItem( i18n( "%1 fps" ).tqarg( 1000/v ), v ); menu.setItemChecked( v, v == timeout() ); } diff --git a/amarok/src/analyzers/boomanalyzer.cpp b/amarok/src/analyzers/boomanalyzer.cpp index 3505c82c..d50ca3af 100644 --- a/amarok/src/analyzers/boomanalyzer.cpp +++ b/amarok/src/analyzers/boomanalyzer.cpp @@ -10,8 +10,8 @@ #include <tqslider.h> #include <tqspinbox.h> -BoomAnalyzer::BoomAnalyzer( TQWidget *parent ) - : Analyzer::Base2D( parent, 10, 9 ) +BoomAnalyzer::BoomAnalyzer( TQWidget *tqparent ) + : Analyzer::Base2D( tqparent, 10, 9 ) , K_barHeight( 1.271 )//1.471 , F_peakSpeed( 1.103 )//1.122 , F( 1.0 ) diff --git a/amarok/src/analyzers/boomanalyzer.h b/amarok/src/analyzers/boomanalyzer.h index 37007649..be347b97 100644 --- a/amarok/src/analyzers/boomanalyzer.h +++ b/amarok/src/analyzers/boomanalyzer.h @@ -14,6 +14,7 @@ class BoomAnalyzer : public Analyzer::Base2D { Q_OBJECT + TQ_OBJECT public: BoomAnalyzer( TQWidget* ); diff --git a/amarok/src/analyzers/glanalyzer.cpp b/amarok/src/analyzers/glanalyzer.cpp index 21382efe..a3387734 100644 --- a/amarok/src/analyzers/glanalyzer.cpp +++ b/amarok/src/analyzers/glanalyzer.cpp @@ -17,15 +17,15 @@ #include <config.h> -#ifdef HAVE_QGLWIDGET +#ifdef HAVE_TQGLWIDGET #include <cmath> #include "glanalyzer.h" #include <kdebug.h> -GLAnalyzer::GLAnalyzer( TQWidget *parent ) - : Analyzer::Base3D(parent, 15) +GLAnalyzer::GLAnalyzer( TQWidget *tqparent ) + : Analyzer::Base3D(tqparent, 15) , m_oldy(32, -10.0f) , m_peaks(32) {} diff --git a/amarok/src/analyzers/glanalyzer.h b/amarok/src/analyzers/glanalyzer.h index d25583f5..0f996817 100644 --- a/amarok/src/analyzers/glanalyzer.h +++ b/amarok/src/analyzers/glanalyzer.h @@ -19,7 +19,7 @@ #define GLOSCOPE_H #include <config.h> -#ifdef HAVE_QGLWIDGET +#ifdef HAVE_TQGLWIDGET #include "analyzerbase.h" diff --git a/amarok/src/analyzers/glanalyzer2.cpp b/amarok/src/analyzers/glanalyzer2.cpp index bee9b816..19fae32d 100644 --- a/amarok/src/analyzers/glanalyzer2.cpp +++ b/amarok/src/analyzers/glanalyzer2.cpp @@ -17,7 +17,7 @@ #include <config.h> -#ifdef HAVE_QGLWIDGET +#ifdef HAVE_TQGLWIDGET #include <cmath> #include <cstdlib> @@ -28,8 +28,8 @@ #include <sys/time.h> -GLAnalyzer2::GLAnalyzer2( TQWidget *parent ): -Analyzer::Base3D(parent, 15) +GLAnalyzer2::GLAnalyzer2( TQWidget *tqparent ): +Analyzer::Base3D(tqparent, 15) { //initialize openGL context before managing GL calls makeCurrent(); @@ -232,7 +232,7 @@ void GLAnalyzer2::paintGL() glLoadIdentity(); // glRotatef( -frame.rotDegrees, 0,0,1 ); - glBegin( GL_QUADS ); + glBegin( GL_TQUADS ); // Particle * particle = particleList.first(); // for (; particle; particle = particleList.next()) { diff --git a/amarok/src/analyzers/glanalyzer2.h b/amarok/src/analyzers/glanalyzer2.h index 77ef9c9d..b22443d9 100644 --- a/amarok/src/analyzers/glanalyzer2.h +++ b/amarok/src/analyzers/glanalyzer2.h @@ -19,7 +19,7 @@ #define GLSTARVIEW_H #include <config.h> -#ifdef HAVE_QGLWIDGET +#ifdef HAVE_TQGLWIDGET #include "analyzerbase.h" #include <tqstring.h> diff --git a/amarok/src/analyzers/glanalyzer3.cpp b/amarok/src/analyzers/glanalyzer3.cpp index 7a69301a..74f8ad29 100644 --- a/amarok/src/analyzers/glanalyzer3.cpp +++ b/amarok/src/analyzers/glanalyzer3.cpp @@ -17,7 +17,7 @@ #include <config.h> -#ifdef HAVE_QGLWIDGET +#ifdef HAVE_TQGLWIDGET #include <cmath> #include <cstdlib> @@ -121,8 +121,8 @@ class Paddle }; -GLAnalyzer3::GLAnalyzer3( TQWidget *parent ): -Analyzer::Base3D(parent, 15) +GLAnalyzer3::GLAnalyzer3( TQWidget *tqparent ): +Analyzer::Base3D(tqparent, 15) { //initialize openGL context before managing GL calls makeCurrent(); @@ -347,7 +347,7 @@ void GLAnalyzer3::drawDot3s( float x, float y, float z, float size ) pYm = y - sizeY, pYM = y + sizeY; // Draw the Dot - glBegin( GL_QUADS ); + glBegin( GL_TQUADS ); glTexCoord2f( 0, 0 ); // Bottom Left glVertex3f( pXm, pYm, z ); glTexCoord2f( 0, 1 ); // Top Left @@ -370,7 +370,7 @@ void GLAnalyzer3::drawDot3s( float x, float y, float z, float size ) // Draw the top shadow currentColor[3] = topSide * topSide * alpha; glColor4fv( currentColor ); - glBegin( GL_QUADS ); + glBegin( GL_TQUADS ); glTexCoord2f( 0, 0 ); // Bottom Left glVertex3f( pXm, 1, pZm ); glTexCoord2f( 0, 1 ); // Top Left @@ -383,7 +383,7 @@ void GLAnalyzer3::drawDot3s( float x, float y, float z, float size ) // Draw the bottom shadow currentColor[3] = bottomSide * bottomSide * alpha; glColor4fv( currentColor ); - glBegin( GL_QUADS ); + glBegin( GL_TQUADS ); glTexCoord2f( 0, 0 ); // Bottom Left glVertex3f( pXm, -1, pZm ); glTexCoord2f( 0, 1 ); // Top Left diff --git a/amarok/src/analyzers/glanalyzer3.h b/amarok/src/analyzers/glanalyzer3.h index e33009c5..d6f80d6c 100644 --- a/amarok/src/analyzers/glanalyzer3.h +++ b/amarok/src/analyzers/glanalyzer3.h @@ -16,7 +16,7 @@ ***************************************************************************/ #include <config.h> -#ifdef HAVE_QGLWIDGET +#ifdef HAVE_TQGLWIDGET #ifndef GLBOUNCER_H #define GLBOUNCER_H diff --git a/amarok/src/analyzers/sonogram.cpp b/amarok/src/analyzers/sonogram.cpp index 60e7749c..cff361fb 100644 --- a/amarok/src/analyzers/sonogram.cpp +++ b/amarok/src/analyzers/sonogram.cpp @@ -14,8 +14,8 @@ #include <tqpainter.h> #include "sonogram.h" -Sonogram::Sonogram(TQWidget *parent) : - Analyzer::Base2D(parent, 16, 9) +Sonogram::Sonogram(TQWidget *tqparent) : + Analyzer::Base2D(tqparent, 16, 9) { } @@ -64,7 +64,7 @@ void Sonogram::analyze(const Scope &s) else if (*it < 1.0) c.setHsv(95 - int(*it * 90.0), 255, 255); else - c = Qt::red; + c = TQt::red; p.setPen(c); p.drawPoint(x, y--); diff --git a/amarok/src/analyzers/turbine.h b/amarok/src/analyzers/turbine.h index 6ad34fbc..c216a9a0 100644 --- a/amarok/src/analyzers/turbine.h +++ b/amarok/src/analyzers/turbine.h @@ -14,7 +14,7 @@ class TurbineAnalyzer : public BoomAnalyzer { public: - TurbineAnalyzer( TQWidget *parent ) : BoomAnalyzer( parent ) {} + TurbineAnalyzer( TQWidget *tqparent ) : BoomAnalyzer( tqparent ) {} void analyze( const Scope& ); }; diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp index 4cd964d8..edd041c7 100644 --- a/amarok/src/app.cpp +++ b/amarok/src/app.cpp @@ -91,12 +91,12 @@ TQMutex Amarok::globalDirsMutex; int App::mainThreadId = 0; -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC #include <qt_mac.h> static AEEventHandlerUPP appleEventProcessorUPP = 0; -OSStatus +OStqStatus appleEventProcessor(const AppleEvent *ae, AppleEvent *, long /*handlerRefCon*/) { OSType aeID = typeWildCard; @@ -130,7 +130,7 @@ App::App() { DEBUG_BLOCK -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC // this is inspired by OpenSceneGraph: osgDB/FilePath.cpp // Start with the the Bundle PlugIns directory. @@ -192,7 +192,7 @@ App::App() qWarning("AtomicString was initialized from a thread other than the GUI " "thread. This could lead to memory leaks."); -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC appleEventProcessorUPP = AEEventHandlerUPP(appleEventProcessor); AEInstallEventHandler(kCoreEventClass, kAEReopenApplication, appleEventProcessorUPP, (long)this, true); #endif @@ -214,7 +214,7 @@ App::~App() AmarokConfig::setResumeTrack( EngineController::instance()->playingURL().prettyURL() ); AmarokConfig::setResumeTime( engine->position() ); } - else AmarokConfig::setResumeTrack( TQString::null ); //otherwise it'll play previous resume next time! + else AmarokConfig::setResumeTrack( TQString() ); //otherwise it'll play previous resume next time! } EngineController::instance()->endSession(); //records final statistics @@ -442,7 +442,7 @@ void App::initGlobalShortcuts() m_pGlobalAccel->insert( "stop", i18n( "Stop" ), 0, KKey("WIN+v"), 0, ec, TQT_SLOT( stop() ), true, true ); m_pGlobalAccel->insert( "stop_after_global", i18n( "Stop Playing After Current Track" ), 0, KKey("WIN+CTRL+v"), 0, - Playlist::instance()->qscrollview(), TQT_SLOT( toggleStopAfterCurrentTrack() ), true, true ); + TQT_TQOBJECT(Playlist::instance()->qscrollview()), TQT_SLOT( toggleStopAfterCurrentTrack() ), true, true ); m_pGlobalAccel->insert( "next", i18n( "Next Track" ), 0, KKey("WIN+b"), 0, ec, TQT_SLOT( next() ), true, true ); m_pGlobalAccel->insert( "prev", i18n( "Previous Track" ), 0, KKey("WIN+z"), 0, @@ -456,26 +456,26 @@ void App::initGlobalShortcuts() m_pGlobalAccel->insert( "seekbackward", i18n( "Seek Backward" ), 0, KKey("WIN+Shift+KP_Subtract"), 0, ec, TQT_SLOT( seekBackward() ), true, true ); m_pGlobalAccel->insert( "playlist_add", i18n( "Add Media..." ), 0, KKey("WIN+a"), 0, - m_pPlaylistWindow, TQT_SLOT( slotAddLocation() ), true, true ); + TQT_TQOBJECT(m_pPlaylistWindow), TQT_SLOT( slotAddLocation() ), true, true ); m_pGlobalAccel->insert( "show", i18n( "Toggle Playlist Window" ), 0, KKey("WIN+p"), 0, - m_pPlaylistWindow, TQT_SLOT( showHide() ), true, true ); -#ifdef Q_WS_X11 + TQT_TQOBJECT(m_pPlaylistWindow), TQT_SLOT( showHide() ), true, true ); +#ifdef TQ_WS_X11 m_pGlobalAccel->insert( "osd", i18n( "Show OSD" ), 0, KKey("WIN+o"), 0, - Amarok::OSD::instance(), TQT_SLOT( forceToggleOSD() ), true, true ); + TQT_TQOBJECT(Amarok::OSD::instance()), TQT_SLOT( forceToggleOSD() ), true, true ); #endif m_pGlobalAccel->insert( "mute", i18n( "Mute Volume" ), 0, KKey("WIN+m"), 0, ec, TQT_SLOT( mute() ), true, true ); m_pGlobalAccel->insert( "rating1", i18n( "Rate Current Track: 1" ), 0, KKey("WIN+1"), 0, - this, TQT_SLOT( setRating1() ), true, true ); + TQT_TQOBJECT(this), TQT_SLOT( setRating1() ), true, true ); m_pGlobalAccel->insert( "rating2", i18n( "Rate Current Track: 2" ), 0, KKey("WIN+2"), 0, - this, TQT_SLOT( setRating2() ), true, true ); + TQT_TQOBJECT(this), TQT_SLOT( setRating2() ), true, true ); m_pGlobalAccel->insert( "rating3", i18n( "Rate Current Track: 3" ), 0, KKey("WIN+3"), 0, - this, TQT_SLOT( setRating3() ), true, true ); + TQT_TQOBJECT(this), TQT_SLOT( setRating3() ), true, true ); m_pGlobalAccel->insert( "rating4", i18n( "Rate Current Track: 4" ), 0, KKey("WIN+4"), 0, - this, TQT_SLOT( setRating4() ), true, true ); + TQT_TQOBJECT(this), TQT_SLOT( setRating4() ), true, true ); m_pGlobalAccel->insert( "rating5", i18n( "Rate Current Track: 5" ), 0, KKey("WIN+5"), 0, - this, TQT_SLOT( setRating5() ), true, true ); + TQT_TQOBJECT(this), TQT_SLOT( setRating5() ), true, true ); m_pGlobalAccel->setConfigGroup( "Shortcuts" ); m_pGlobalAccel->readSettings( kapp->config() ); @@ -530,13 +530,13 @@ void App::fixHyperThreading() // If the library is new enough try and call sched_setaffinity. #ifdef SCHEDAFFINITY_SUPPORT - cpu_set_t mask; - CPU_ZERO( &mask ); // Initializes all the bits in the mask to zero - CPU_SET( 0, &mask ); // Sets only the bit corresponding to cpu + cpu_set_t tqmask; + CPU_ZERO( &tqmask ); // Initializes all the bits in the tqmask to zero + CPU_SET( 0, &tqmask ); // Sets only the bit corresponding to cpu #ifdef SCHEDAFFINITY_3PARAMS - if ( sched_setaffinity( 0, sizeof(mask), &mask ) == -1 ) + if ( sched_setaffinity( 0, sizeof(tqmask), &tqmask ) == -1 ) #else //SCHEDAFFINITY_3PARAMS - if ( sched_setaffinity( 0, &mask ) == -1 ) + if ( sched_setaffinity( 0, &tqmask ) == -1 ) #endif //SCHEDAFFINITY_3PARAMS { warning() << "sched_setaffinity() call failed with error code: " << errno << endl; @@ -622,7 +622,7 @@ void App::applySettings( bool firstTime ) //determine and apply colors first applyColorScheme(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TrackToolTip::instance()->removeFromWidget( m_pTray ); #endif @@ -644,9 +644,9 @@ void App::applySettings( bool firstTime ) connect( m_pPlayerWindow, TQT_SIGNAL(playlistToggled( bool )), m_pPlaylistWindow, TQT_SLOT(showHide()) ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 //TODO get this to work! - //may work if you set no parent for the systray? + //may work if you set no tqparent for the systray? //KWin::setSystemTrayWindowFor( m_pTray->winId(), m_pPlayerWindow->winId() ); delete m_pTray; m_pTray = new Amarok::TrayIcon( m_pPlayerWindow ); @@ -666,7 +666,7 @@ void App::applySettings( bool firstTime ) m_pPlayerWindow->applySettings(); } else if( m_pPlayerWindow ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 delete m_pTray; m_pTray = new Amarok::TrayIcon( m_pPlaylistWindow ); m_pTray->engineStateChanged(EngineController::instance()->engine()->state(), EngineController::instance()->engine()->state()); m_pTray->engineNewMetaData(EngineController::instance()->bundle(), false); @@ -675,7 +675,7 @@ void App::applySettings( bool firstTime ) //Set the caption correctly. if ( !EngineController::instance()->bundle().prettyTitle().isEmpty() ) - m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( EngineController::instance()->bundle().veryNiceTitle() ) ); + m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( EngineController::instance()->bundle().veryNiceTitle() ) ); else m_pPlaylistWindow->setCaption( "Amarok" ); @@ -691,7 +691,7 @@ void App::applySettings( bool firstTime ) Scrobbler::instance()->applySettings(); Amarok::OSD::instance()->applySettings(); CollectionDB::instance()->applySettings(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 m_pTray->setShown( AmarokConfig::showTrayIcon() ); TrackToolTip::instance()->addToWidget( m_pTray ); #endif @@ -700,7 +700,7 @@ void App::applySettings( bool firstTime ) //on startup we need to show the window, but only if it wasn't hidden on exit //and always if the trayicon isn't showing TQWidget* main_window = mainWindow(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( ( main_window && firstTime && !Amarok::config()->readBoolEntry( "HiddenOnExit", false ) ) || ( main_window && !AmarokConfig::showTrayIcon() ) ) #endif { @@ -780,9 +780,9 @@ App::continueInit() CollectionDB::instance()->checkDatabase(); m_pMediaDeviceManager = MediaDeviceManager::instance(); - m_pGlobalAccel = new KGlobalAccel( this ); + m_pGlobalAccel = new KGlobalAccel( TQT_TQOBJECT(this) ); m_pPlaylistWindow = new PlaylistWindow(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 m_pTray = new Amarok::TrayIcon( m_pPlaylistWindow ); #endif m_pPlaylistWindow->init(); //creates the playlist, browsers, etc. @@ -855,8 +855,8 @@ App::applyColorScheme() TQColorGroup group; using Amarok::ColorScheme::AltBase; int h, s, v; - TQWidget* const browserBar = static_cast<TQWidget*>( playlistWindow()->child( "BrowserBar" ) ); - TQWidget* const contextBrowser = static_cast<TQWidget*>( ContextBrowser::instance() ); + TQWidget* const browserBar = TQT_TQWIDGET( playlistWindow()->child( "BrowserBar" ) ); + TQWidget* const contextBrowser = TQT_TQWIDGET( ContextBrowser::instance() ); if( AmarokConfig::schemeKDE() ) { @@ -871,11 +871,11 @@ App::applyColorScheme() else if( AmarokConfig::schemeAmarok() ) { - group = TQApplication::palette().active(); + group = TQApplication::tqpalette().active(); const TQColor bg( Amarok::blue ); AltBase.setRgb( 57, 64, 98 ); - group.setColor( TQColorGroup::Text, Qt::white ); + group.setColor( TQColorGroup::Text, TQt::white ); group.setColor( TQColorGroup::Link, 0xCCCCCC ); group.setColor( TQColorGroup::Base, bg ); group.setColor( TQColorGroup::Foreground, 0xd7d7ef ); @@ -884,13 +884,13 @@ App::applyColorScheme() group.setColor( TQColorGroup::Button, AltBase ); group.setColor( TQColorGroup::ButtonText, 0xd7d7ef ); -// group.setColor( TQColorGroup::Light, Qt::cyan /*lighter than Button color*/ ); -// group.setColor( TQColorGroup::Midlight, Qt::blue /*between Button and Light*/ ); -// group.setColor( TQColorGroup::Dark, Qt::green /*darker than Button*/ ); -// group.setColor( TQColorGroup::Mid, Qt::red /*between Button and Dark*/ ); -// group.setColor( TQColorGroup::Shadow, Qt::yellow /*a very dark color. By default, the shadow color is Qt::black*/ ); +// group.setColor( TQColorGroup::Light, TQt::cyan /*lighter than Button color*/ ); +// group.setColor( TQColorGroup::Midlight, TQt::blue /*between Button and Light*/ ); +// group.setColor( TQColorGroup::Dark, TQt::green /*darker than Button*/ ); +// group.setColor( TQColorGroup::Mid, TQt::red /*between Button and Dark*/ ); +// group.setColor( TQColorGroup::Shadow, TQt::yellow /*a very dark color. By default, the shadow color is TQt::black*/ ); - group.setColor( TQColorGroup::Highlight, Qt::white ); + group.setColor( TQColorGroup::Highlight, TQt::white ); group.setColor( TQColorGroup::HighlightedText, bg ); //group.setColor( TQColorGroup::BrightText, TQColor( 0xff, 0x40, 0x40 ) ); //GlowColor @@ -902,11 +902,11 @@ App::applyColorScheme() using namespace Amarok::ColorScheme; Base = Amarok::blue; - Text = Qt::white; + Text = TQt::white; Background = 0x002090; Foreground = 0x80A0FF; - //all children() derive their palette from this + //all tqchildren() derive their palette from this playlistWindow()->setPalette( TQPalette( group, group, group ) ); browserBar->unsetPalette(); contextBrowser->setPalette( TQPalette( group, group, group ) ); @@ -916,7 +916,7 @@ App::applyColorScheme() { // we try to be smart: this code figures out contrasting colors for // selection and alternate background rows - group = TQApplication::palette().active(); + group = TQApplication::tqpalette().active(); const TQColor fg( AmarokConfig::playlistWindowFgColor() ); const TQColor bg( AmarokConfig::playlistWindowBgColor() ); @@ -937,8 +937,8 @@ App::applyColorScheme() group.setColor( TQColorGroup::Text, fg ); group.setColor( TQColorGroup::Link, fg.light( 120 ) ); group.setColor( TQColorGroup::Highlight, highlight ); - group.setColor( TQColorGroup::HighlightedText, Qt::white ); - group.setColor( TQColorGroup::Dark, Qt::darkGray ); + group.setColor( TQColorGroup::HighlightedText, TQt::white ); + group.setColor( TQColorGroup::Dark, TQt::darkGray ); PlayerWidget::determineAmarokColors(); @@ -952,7 +952,7 @@ App::applyColorScheme() // set the KListView alternate colours TQObjectList* const list = playlistWindow()->queryList( "KListView" ); for( TQObject *o = list->first(); o; o = list->next() ) - static_cast<KListView*>(o)->setAlternateBackground( AltBase ); + static_cast<KListView*>(TQT_TQWIDGET(o))->setAlternateBackground( AltBase ); delete list; //heap allocated! } @@ -964,7 +964,7 @@ bool Amarok::genericEventHandler( TQWidget *recipient, TQEvent *e ) //to use it just pass the event eg: // - // void Foo::barEvent( QBarEvent *e ) + // void Foo::barEvent( TQBarEvent *e ) // { // Amarok::genericEventHandler( this, e ); // } @@ -1009,14 +1009,14 @@ bool Amarok::genericEventHandler( TQWidget *recipient, TQEvent *e ) //please don't remove! case TQEvent::Wheel: { - #define e static_cast<TQWheelEvent*>(e) + #define e TQT_TQWHEELEVENT(e) //this behaviour happens for the systray and the player window //to override one, override it in that class switch( e->state() ) { - case Qt::ControlButton: + case TQt::ControlButton: { const bool up = e->delta() > 0; @@ -1026,7 +1026,7 @@ bool Amarok::genericEventHandler( TQWidget *recipient, TQEvent *e ) else EngineController::instance()->next(); break; } - case Qt::ShiftButton: + case TQt::ShiftButton: { EngineController::instance()->seekRelative( ( e->delta() / 120 ) * 10000 ); // 10 seconds break; @@ -1046,7 +1046,7 @@ bool Amarok::genericEventHandler( TQWidget *recipient, TQEvent *e ) //KDE policy states we should hide to tray and not quit() when the //close window button is pushed for the main widget - static_cast<TQCloseEvent*>(e)->accept(); //if we don't do this the info box appears on quit()! + TQT_TQCLOSEEVENT(e)->accept(); //if we don't do this the info box appears on quit()! if( AmarokConfig::showTrayIcon() && !e->spontaneous() && !kapp->sessionSaving() ) { @@ -1084,7 +1084,7 @@ void App::engineStateChanged( Engine::State state, Engine::State oldState ) if ( oldState == Engine::Paused ) Amarok::OSD::instance()->OSDWidget::show( i18n( "state, as in playing", "Play" ) ); if ( !bundle.prettyTitle().isEmpty() ) - m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( bundle.veryNiceTitle() ) ); + m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( bundle.veryNiceTitle() ) ); break; case Engine::Paused: @@ -1106,7 +1106,7 @@ void App::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ ) { Amarok::OSD::instance()->show( bundle ); if ( !bundle.prettyTitle().isEmpty() ) - m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( bundle.veryNiceTitle() ) ); + m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( bundle.veryNiceTitle() ) ); TrackToolTip::instance()->setTrack( bundle ); } @@ -1272,8 +1272,8 @@ void App::slotTrashResult( KIO::Job *job ) TQWidget *App::mainWindow() const { - return AmarokConfig::showPlayerWindow() ? static_cast<TQWidget*>( m_pPlayerWindow ) - : static_cast<TQWidget*>( m_pPlaylistWindow ); + return AmarokConfig::showPlayerWindow() ? TQT_TQWIDGET( m_pPlayerWindow ) + : TQT_TQWIDGET( m_pPlaylistWindow ); } void App::quit() @@ -1313,7 +1313,7 @@ namespace Amarok { //URL can be in whatever forms KURL::fromPathOrURL understands - ie most. const TQString cmd = "%1 \"%2\""; - return KRun::runCommand( cmd.arg( AmarokConfig::externalBrowser(), KURL::fromPathOrURL( url ).url() ) ) > 0; + return KRun::runCommand( cmd.tqarg( AmarokConfig::externalBrowser(), KURL::fromPathOrURL( url ).url() ) ) > 0; } namespace ColorScheme @@ -1325,9 +1325,9 @@ namespace Amarok TQColor AltBase; } - OverrideCursor::OverrideCursor( Qt::CursorShape cursor ) + OverrideCursor::OverrideCursor( TQt::tqCursorShape cursor ) { - TQApplication::setOverrideCursor( cursor == Qt::WaitCursor ? KCursor::waitCursor() : KCursor::workingCursor() ); + TQApplication::setOverrideCursor( cursor == TQt::WaitCursor ? KCursor::waitCursor() : KCursor::workingCursor() ); } OverrideCursor::~OverrideCursor() @@ -1347,24 +1347,24 @@ namespace Amarok { TQString result = path; // german umlauts - result.replace( TQChar(0x00e4), "ae" ).replace( TQChar(0x00c4), "Ae" ); - result.replace( TQChar(0x00f6), "oe" ).replace( TQChar(0x00d6), "Oe" ); - result.replace( TQChar(0x00fc), "ue" ).replace( TQChar(0x00dc), "Ue" ); - result.replace( TQChar(0x00df), "ss" ); + result.tqreplace( TQChar(0x00e4), "ae" ).tqreplace( TQChar(0x00c4), "Ae" ); + result.tqreplace( TQChar(0x00f6), "oe" ).tqreplace( TQChar(0x00d6), "Oe" ); + result.tqreplace( TQChar(0x00fc), "ue" ).tqreplace( TQChar(0x00dc), "Ue" ); + result.tqreplace( TQChar(0x00df), "ss" ); // some strange accents - result.replace( TQChar(0x00e7), "c" ).replace( TQChar(0x00c7), "C" ); - result.replace( TQChar(0x00fd), "y" ).replace( TQChar(0x00dd), "Y" ); - result.replace( TQChar(0x00f1), "n" ).replace( TQChar(0x00d1), "N" ); + result.tqreplace( TQChar(0x00e7), "c" ).tqreplace( TQChar(0x00c7), "C" ); + result.tqreplace( TQChar(0x00fd), "y" ).tqreplace( TQChar(0x00dd), "Y" ); + result.tqreplace( TQChar(0x00f1), "n" ).tqreplace( TQChar(0x00d1), "N" ); // czech letters with carons - result.replace( TQChar(0x0161), "s" ).replace( TQChar(0x0160), "S" ); - result.replace( TQChar(0x010d), "c" ).replace( TQChar(0x010c), "C" ); - result.replace( TQChar(0x0159), "r" ).replace( TQChar(0x0158), "R" ); - result.replace( TQChar(0x017e), "z" ).replace( TQChar(0x017d), "Z" ); - result.replace( TQChar(0x0165), "t" ).replace( TQChar(0x0164), "T" ); - result.replace( TQChar(0x0148), "n" ).replace( TQChar(0x0147), "N" ); - result.replace( TQChar(0x010f), "d" ).replace( TQChar(0x010e), "D" ); + result.tqreplace( TQChar(0x0161), "s" ).tqreplace( TQChar(0x0160), "S" ); + result.tqreplace( TQChar(0x010d), "c" ).tqreplace( TQChar(0x010c), "C" ); + result.tqreplace( TQChar(0x0159), "r" ).tqreplace( TQChar(0x0158), "R" ); + result.tqreplace( TQChar(0x017e), "z" ).tqreplace( TQChar(0x017d), "Z" ); + result.tqreplace( TQChar(0x0165), "t" ).tqreplace( TQChar(0x0164), "T" ); + result.tqreplace( TQChar(0x0148), "n" ).tqreplace( TQChar(0x0147), "N" ); + result.tqreplace( TQChar(0x010f), "d" ).tqreplace( TQChar(0x010e), "D" ); // accented vowels TQChar a[] = { 'a', 0xe0,0xe1,0xe2,0xe3,0xe5, 0 }; diff --git a/amarok/src/app.h b/amarok/src/app.h index fcbb3316..79eac9ea 100644 --- a/amarok/src/app.h +++ b/amarok/src/app.h @@ -42,11 +42,12 @@ class MediaDeviceManager; class LIBAMAROK_EXPORT App : public KApplication, public EngineObserver { Q_OBJECT + TQ_OBJECT public: App(); ~App(); - static App *instance() { return static_cast<App*>( qApp ); } + static App *instance() { return static_cast<App*>( tqApp ); } static void handleCliArgs(); static void initCliArgs( int argc, char *argv[] ); @@ -113,7 +114,7 @@ class LIBAMAROK_EXPORT App : public KApplication, public EngineObserver KGlobalAccel *m_pGlobalAccel; PlayerWidget *m_pPlayerWindow; PlaylistWindow *m_pPlaylistWindow; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Amarok::TrayIcon *m_pTray; #endif MediaDeviceManager *m_pMediaDeviceManager; diff --git a/amarok/src/atomicstring.cpp b/amarok/src/atomicstring.cpp index 2de299af..a384ee72 100644 --- a/amarok/src/atomicstring.cpp +++ b/amarok/src/atomicstring.cpp @@ -27,7 +27,7 @@ #include "atomicstring.h" -class AtomicString::Data: public QString +class AtomicString::Data: public TQString { public: uint refcount; @@ -82,7 +82,7 @@ TQString AtomicString::string() const TQString AtomicString::deepCopy() const { if (m_string) - return TQString( m_string->unicode(), m_string->length() ); + return TQString( m_string->tqunicode(), m_string->length() ); return TQString(); } @@ -95,7 +95,7 @@ const TQString *AtomicString::ptr() const { if( m_string ) return m_string; - return &TQString::null; + return &TQString(); } uint AtomicString::refcount() const @@ -150,10 +150,10 @@ inline void AtomicString::ref( Data *s ) bool AtomicString::isMainThread() { // For isMainThread(), we could use TQThread::currentThread(), except the - // docs say it's unreliable. And in general QThreads don't like to be called from + // docs say it's unreliable. And in general TQThreads don't like to be called from // app destructors. Good old pthreads will serve us well. As for Windows, these // two calls surely have equivalents; better yet we'll have QT4 and thread safe - // QStrings by then. + // TQStrings by then. // Note that the the static local init is thread safe. static pthread_t main_thread = pthread_self(); return pthread_equal(pthread_self(), main_thread); diff --git a/amarok/src/atomicstring.h b/amarok/src/atomicstring.h index 11790ce9..4cee7fff 100644 --- a/amarok/src/atomicstring.h +++ b/amarok/src/atomicstring.h @@ -27,7 +27,7 @@ * can hash 5 million 256 byte strings in 1.34s on a 1.62GHz Athlon XP.) For * other use, the overhead compared to a plain TQString should be minimal. * - * Added note: due to QString's thread unsafe refcounting, special precautions have to be + * Added note: due to TQString's thread unsafe refcounting, special precautions have to be * taken to avoid memory corruption, while still maintaining some level of efficiency. * We deepCopy strings, unless we are in the same thread that *first* used * AtomicStrings. Also, deletions from other threads are delayed until that first thread @@ -136,15 +136,15 @@ public: * different ones. This can be useful for certain kinds of hacks, but * shouldn't normally be used. * - * Note: DO NOT COPY this pointer with TQString() or QString=. It is not + * Note: DO NOT COPY this pointer with TQString() or TQString=. It is not * thread safe to do it (TQString internal refcount) * @return the internal pointer to the string */ const TQString *ptr() const; /** - * For convenience, so you can do atomicstring->QStringfunction(), - * instead of atomicstring.string().QStringfunction(). The same warning + * For convenience, so you can do atomicstring->TQStringfunction(), + * instead of atomicstring.string().TQStringfunction(). The same warning * applies as for the above ptr() function. */ inline const TQString *operator->() const { return ptr(); } diff --git a/amarok/src/browserToolBar.h b/amarok/src/browserToolBar.h index 6d421ab0..1425cd37 100644 --- a/amarok/src/browserToolBar.h +++ b/amarok/src/browserToolBar.h @@ -18,8 +18,8 @@ namespace Browser class ToolBar : public KToolBar { public: - ToolBar( TQWidget *parent ) - : KToolBar( parent, "NotMainToolBar" ) + ToolBar( TQWidget *tqparent ) + : KToolBar( tqparent, "NotMainToolBar" ) { setMovingEnabled(false); setFlat(true); diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp index 5574a915..b5104365 100644 --- a/amarok/src/browserbar.cpp +++ b/amarok/src/browserbar.cpp @@ -38,38 +38,38 @@ namespace Amarok Splitter( BrowserBar *w ) : TQWidget( w, "divider" ) { setCursor( TQCursor(SplitHCursor) ); - styleChange( style() ); + styleChange( tqstyle() ); } virtual void paintEvent( TQPaintEvent* ) { TQPainter p( this ); - parentWidget()->style().drawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal ); + tqparentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), TQStyle::Style_Horizontal ); } virtual void styleChange( TQStyle& ) { - setFixedWidth( style().pixelMetric( TQStyle::PM_SplitterWidth, this ) ); + setFixedWidth( tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth, this ) ); } virtual void mouseMoveEvent( TQMouseEvent *e ) { - static_cast<BrowserBar*>(parent())->mouseMovedOverSplitter( e ); + static_cast<BrowserBar*>(TQT_TQWIDGET(tqparent()))->mouseMovedOverSplitter( e ); } }; } BrowserBar* BrowserBar::s_instance = 0; -BrowserBar::BrowserBar( TQWidget *parent ) - : TQWidget( parent, "BrowserBar" ) +BrowserBar::BrowserBar( TQWidget *tqparent ) + : TQWidget( tqparent, "BrowserBar" ) , EngineObserver( EngineController::instance() ) , m_playlistBox( new TQVBox( this ) ) , m_divider( new Amarok::Splitter( this ) ) , m_browserBox( new TQVBox( this ) ) , m_currentIndex( -1 ) , m_lastIndex( -1 ) - , m_mapper( new TQSignalMapper( this ) ) + , m_mapper( new TQSignalMapper( TQT_TQOBJECT(this) ) ) { m_tabManagementButton = new TQPushButton( SmallIconSet(Amarok::icon( "configure" )), 0, this, "tab_managment_button" ); connect (m_tabManagementButton, TQT_SIGNAL(clicked()), TQT_SLOT(showBrowserSelectionMenu())); @@ -81,12 +81,12 @@ BrowserBar::BrowserBar( TQWidget *parent ) m_tabBar = new MultiTabBar( MultiTabBar::Vertical, this ); - m_tabManagementButton->setFixedWidth(m_tabBar->sizeHint().width()); - m_tabManagementButton->setFixedHeight(m_tabBar->sizeHint().width()); + m_tabManagementButton->setFixedWidth(m_tabBar->tqsizeHint().width()); + m_tabManagementButton->setFixedHeight(m_tabBar->tqsizeHint().width()); s_instance = this; - m_pos = m_tabBar->sizeHint().width() + 5; //5 = esthetic spacing + m_pos = m_tabBar->tqsizeHint().width() + 5; //5 = esthetic spacing m_tabBar->setStyle( MultiTabBar::AMAROK ); m_tabBar->setPosition( MultiTabBar::Left ); @@ -94,9 +94,9 @@ BrowserBar::BrowserBar( TQWidget *parent ) m_tabBar->setFixedWidth( m_pos ); m_tabBar->move( 0, 25 ); - TQVBoxLayout *layout = new TQVBoxLayout( m_browserBox ); - layout->addSpacing( 3 ); // aesthetics - layout->setAutoAdd( true ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( m_browserBox ); + tqlayout->addSpacing( 3 ); // aesthetics + tqlayout->setAutoAdd( true ); m_browserBox->move( m_pos, 0 ); m_browserBox->hide(); @@ -109,14 +109,14 @@ BrowserBar::BrowserBar( TQWidget *parent ) - //m_tabBar->appendButton( Amarok::icon( "configure" ), 1, 0, TQString::null ); + //m_tabBar->appendButton( Amarok::icon( "configure" ), 1, 0, TQString() ); } BrowserBar::~BrowserBar() { KConfig* const config = Amarok::config( "BrowserBar" ); - config->writeEntry( "CurrentPane", m_currentIndex != -1 ? TQString(currentBrowser()->name()) : TQString::null ); + config->writeEntry( "CurrentPane", m_currentIndex != -1 ? TQString(currentBrowser()->name()) : TQString() ); config->writeEntry( "Width", m_browserBox->width() ); } @@ -133,7 +133,7 @@ int BrowserBar::restoreWidth() { const int index = indexForName( Amarok::config( "BrowserBar" )->readEntry( "CurrentPane" ) ); - const int width = Amarok::config( "BrowserBar" )->readNumEntry( "Width", browser( index )->sizeHint().width() ); + const int width = Amarok::config( "BrowserBar" )->readNumEntry( "Width", browser( index )->tqsizeHint().width() ); m_browserBox->resize( width, height() ); m_pos = m_browserBox->width() + m_tabBar->width(); @@ -170,7 +170,7 @@ BrowserBar::polish() void BrowserBar::adjustWidgetSizes() { - //TODO set the geometry of the PlaylistWindow before + //TODO set the tqgeometry of the PlaylistWindow before // the browsers are loaded so this isn't called twice const uint w = width(); @@ -226,8 +226,8 @@ BrowserBar::event( TQEvent *e ) case TQEvent::Resize: // DEBUG_LINE_INFO - m_divider->resize( 0, height() ); //Qt will set width - m_tabBar->resize( 0, height() ); //Qt will set width + m_divider->resize( 0, height() ); //TQt will set width + m_tabBar->resize( 0, height() ); //TQt will set width adjustWidgetSizes(); @@ -253,11 +253,11 @@ BrowserBar::addBrowser( const TQString &identifier, TQWidget *widget, const TQSt m_tabBar->appendTab( SmallIcon( icon ), id, title, identifier ); tab = m_tabBar->tab( id ); - tab->setFocusPolicy( TQWidget::NoFocus ); //FIXME you can focus on the tab, but they respond to no input! + tab->setFocusPolicy( TQ_NoFocus ); //FIXME you can focus on the tab, but they respond to no input! //we use a SignalMapper to show/hide the corresponding browser when tabs are clicked connect( tab, TQT_SIGNAL(clicked()), m_mapper, TQT_SLOT(map()) ); - m_mapper->setMapping( tab, id ); + m_mapper->setMapping( TQT_TQOBJECT(tab), id ); connect( tab, TQT_SIGNAL(initiateDrag ( int ) ), this, TQT_SLOT( showBrowser( int )) ); m_browsers.push_back( widget ); @@ -266,12 +266,12 @@ BrowserBar::addBrowser( const TQString &identifier, TQWidget *widget, const TQSt void BrowserBar::removeMediaBrowser( TQWidget *widget ) { - BrowserList::iterator it = qFind( m_browsers.begin(), m_browsers.end(), widget ); + BrowserList::iterator it = tqFind( m_browsers.begin(), m_browsers.end(), widget ); if( it != m_browsers.end() ) m_browsers.erase( it ); TQWidget *tab; tab = m_tabBar->tab( m_browserIds["MediaBrowser"] ); - m_mapper->removeMappings( tab ); + m_mapper->removeMappings( TQT_TQOBJECT(tab) ); m_tabBar->removeTab( m_browserIds["MediaBrowser"] ); } diff --git a/amarok/src/browserbar.h b/amarok/src/browserbar.h index 54b3b090..c0cb226d 100644 --- a/amarok/src/browserbar.h +++ b/amarok/src/browserbar.h @@ -33,9 +33,10 @@ class TQVBox; class BrowserBar : public TQWidget, public EngineObserver { Q_OBJECT + TQ_OBJECT public: - BrowserBar( TQWidget *parent ); + BrowserBar( TQWidget *tqparent ); ~BrowserBar(); LIBAMAROK_EXPORT static BrowserBar* instance() { return s_instance; } @@ -84,12 +85,12 @@ private: LIBAMAROK_EXPORT static BrowserBar *s_instance; uint m_pos; ///the x-axis position of m_divider - TQVBox *m_playlistBox; ///parent to playlist, playlist filter and toolbar + TQVBox *m_playlistBox; ///tqparent to playlist, playlist filter and toolbar TQWidget *m_divider; ///a qsplitter like widget MultiTabBar *m_tabBar; BrowserList m_browsers; BrowserIdMap m_browserIds; - TQVBox *m_browserBox; ///parent widget to the browsers + TQVBox *m_browserBox; ///tqparent widget to the browsers int m_currentIndex; int m_lastIndex; TQSignalMapper *m_mapper; ///maps tab clicks to browsers diff --git a/amarok/src/clicklineedit.cpp b/amarok/src/clicklineedit.cpp index f33da486..8e1b2b77 100644 --- a/amarok/src/clicklineedit.cpp +++ b/amarok/src/clicklineedit.cpp @@ -25,8 +25,8 @@ #include "tqpainter.h" -ClickLineEdit::ClickLineEdit( const TQString &msg, TQWidget *parent, const char* name ) : - KLineEdit( parent, name ) +ClickLineEdit::ClickLineEdit( const TQString &msg, TQWidget *tqparent, const char* name ) : + KLineEdit( tqparent, name ) { mDrawClickMsg = true; setClickMessage( msg ); @@ -40,14 +40,14 @@ ClickLineEdit::ClickLineEdit( const TQString &msg, TQWidget *parent, const char* void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - repaint(); + tqrepaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - repaint(); + tqrepaint(); KLineEdit::setText( txt ); } @@ -86,7 +86,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) { if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - repaint(); + tqrepaint(); } TQLineEdit::focusInEvent( ev ); } @@ -96,7 +96,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) { if ( text().isEmpty() ) { mDrawClickMsg = true; - repaint(); + tqrepaint(); } TQLineEdit::focusOutEvent( ev ); } diff --git a/amarok/src/clicklineedit.h b/amarok/src/clicklineedit.h index 5dc02a1f..9881ab3f 100644 --- a/amarok/src/clicklineedit.h +++ b/amarok/src/clicklineedit.h @@ -33,9 +33,10 @@ class ClickLineEdit : public KLineEdit { Q_OBJECT - Q_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage ) + TQ_OBJECT + TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage ) public: - ClickLineEdit( const TQString &msg, TQWidget *parent, const char* name = 0 ); + ClickLineEdit( const TQString &msg, TQWidget *tqparent, const char* name = 0 ); void setClickMessage( const TQString &msg ); TQString clickMessage() const { return mClickMessage; } diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp index ce777298..c5ef7cde 100644 --- a/amarok/src/collectionbrowser.cpp +++ b/amarok/src/collectionbrowser.cpp @@ -128,7 +128,7 @@ CollectionBrowser::CollectionBrowser( const char* name ) m_timeFilter = new KComboBox( m_ipodHbox, "timeFilter" ); m_ipodHbox->setStretchFactor( m_timeFilter, 1 ); // Allow the combobox to shrink so the iPod buttons are still visible - m_timeFilter->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + m_timeFilter->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); m_timeFilter->insertItem( i18n( "Entire Collection" ) ); m_timeFilter->insertItem( i18n( "Added Today" ) ); m_timeFilter->insertItem( i18n( "Added Within One Week" ) ); @@ -149,10 +149,10 @@ CollectionBrowser::CollectionBrowser( const char* name ) m_view = new CollectionView( this ); m_view->installEventFilter( this ); - m_configureAction = new KAction( i18n( "Configure Folders" ), Amarok::icon( "configure" ), 0, this, TQT_SLOT( setupDirs() ), ac, "Configure" ); - m_treeViewAction = new KRadioAction( i18n( "Tree View" ), "view_tree", 0, m_view, TQT_SLOT( setTreeMode() ), ac, "Tree View" ); - m_flatViewAction = new KRadioAction( i18n( "Flat View" ), "view_detailed", 0, m_view, TQT_SLOT( setFlatMode() ), ac, "Flat View" ); - m_ipodViewAction = new KRadioAction( i18n( "iPod View" ), Amarok::icon("device"), 0, m_view, TQT_SLOT( setIpodMode() ), ac, "iPod View" ); + m_configureAction = new KAction( i18n( "Configure Folders" ), Amarok::icon( "configure" ), 0, TQT_TQOBJECT(this), TQT_SLOT( setupDirs() ), ac, "Configure" ); + m_treeViewAction = new KRadioAction( i18n( "Tree View" ), "view_tree", 0, TQT_TQOBJECT(m_view), TQT_SLOT( setTreeMode() ), ac, "Tree View" ); + m_flatViewAction = new KRadioAction( i18n( "Flat View" ), "view_detailed", 0, TQT_TQOBJECT(m_view), TQT_SLOT( setFlatMode() ), ac, "Flat View" ); + m_ipodViewAction = new KRadioAction( i18n( "iPod View" ), Amarok::icon("device"), 0, TQT_TQOBJECT(m_view), TQT_SLOT( setIpodMode() ), ac, "iPod View" ); m_treeViewAction->setExclusiveGroup("view mode"); m_flatViewAction->setExclusiveGroup("view mode"); m_ipodViewAction->setExclusiveGroup("view mode"); @@ -169,7 +169,7 @@ CollectionBrowser::CollectionBrowser( const char* name ) break; } - m_showDividerAction = new KToggleAction( i18n( "Show Divider" ), "leftjust", 0, this, TQT_SLOT( toggleDivider() ), ac, "Show Divider" ); + m_showDividerAction = new KToggleAction( i18n( "Show Divider" ), "leftjust", 0, TQT_TQOBJECT(this), TQT_SLOT( toggleDivider() ), ac, "Show Divider" ); m_showDividerAction->setChecked(m_view->m_showDivider); @@ -178,11 +178,11 @@ CollectionBrowser::CollectionBrowser( const char* name ) // browser window; see the "For iPod-style navigation" comments below. m_ipodDecrement = new KAction( i18n( "Browse backward" ), TQIconSet( m_view->ipodDecrementIcon(), TQIconSet::Small ), - 0, m_view, TQT_SLOT( decrementDepth() ), ac, + 0, TQT_TQOBJECT(m_view), TQT_SLOT( decrementDepth() ), ac, "iPod Decrement" ); m_ipodIncrement = new KAction( i18n( "Browse forward" ), TQIconSet( m_view->ipodIncrementIcon(), TQIconSet::Small ), - 0, m_view, TQT_SLOT( incrementDepth() ), ac, + 0, TQT_TQOBJECT(m_view), TQT_SLOT( incrementDepth() ), ac, "iPod Increment" ); m_ipodDecrement->plug( m_ipodToolbar ); m_ipodIncrement->plug( m_ipodToolbar ); @@ -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) ) ); - layoutToolbar(); + tqlayoutToolbar(); m_categoryMenu = m_tagfilterMenuButton->popupMenu(); m_categoryMenu->insertItem( i18n( "Artist" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdArtist ); @@ -334,9 +334,9 @@ CollectionBrowser::eventFilter( TQObject *o, TQEvent *e ) //there are a few keypresses that we intercept - #define e static_cast<TQKeyEvent*>(e) + #define e TQT_TQKEYEVENT(e) - if( o == m_searchEdit ) //the search lineedit + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_searchEdit) ) //the search lineedit { switch( e->key() ) { @@ -395,7 +395,7 @@ CollectionBrowser::eventFilter( TQObject *o, TQEvent *e ) } void -CollectionBrowser::layoutToolbar() +CollectionBrowser::tqlayoutToolbar() { if ( !m_toolbar ) return; @@ -415,7 +415,7 @@ CollectionBrowser::layoutToolbar() m_configureAction->plug( m_toolbar ); //This would break things if the toolbar is too big, see bug #121915 - //setMinimumWidth( m_toolbar->sizeHint().width() + 2 ); //set a reasonable minWidth + //setMinimumWidth( m_toolbar->tqsizeHint().width() + 2 ); //set a reasonable minWidth } @@ -440,9 +440,9 @@ CollectionBrowser::ipodToolbar( bool activate ) CollectionView* CollectionView::m_instance = 0; -CollectionView::CollectionView( CollectionBrowser* parent ) - : KListView( parent ) - , m_parent( parent ) +CollectionView::CollectionView( CollectionBrowser* tqparent ) + : KListView( tqparent ) + , m_tqparent( tqparent ) , m_timeFilter( 0 ) , m_currentDepth( 0 ) , m_ipodIncremented ( 1 ) @@ -494,7 +494,7 @@ CollectionView::CollectionView( CollectionBrowser* parent ) //</READ CONFIG> KActionCollection* ac = new KActionCollection( this ); - KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "collectionview_select_all" ); + KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "collectionview_select_all" ); connect( CollectionDB::instance(), TQT_SIGNAL( scanStarted() ), this, TQT_SLOT( scanStarted() ) ); @@ -570,7 +570,7 @@ CollectionView::keyPressEvent( TQKeyEvent *e ) // This rewritten code is more faithful to the ordinary moving // behavior, even when looping around. (For instance, it behaves // correctly if control-up is pressed at the top of the screen.) - // It sends fake keypress events to the parent instead of programatically + // It sends fake keypress events to the tqparent instead of programatically // selecting items. if( (e->key() == Key_Up || e->key() == Key_Down ) && currentItem() ) { @@ -610,7 +610,7 @@ CollectionView::keyPressEvent( TQKeyEvent *e ) TQKeyEvent e2 ( e->type(), (e->key() == Key_Up ? Key_End : Key_Home), 0, e->state(), - TQString::null, e->isAutoRepeat(), e->count() ); + TQString(), e->isAutoRepeat(), e->count() ); TQApplication::sendEvent( this, &e2 ); cur = currentItem(); @@ -637,10 +637,10 @@ CollectionView::keyPressEvent( TQKeyEvent *e ) && m_viewMode == modeIpodView ) { if( e->key() == Key_Right ) - m_parent->m_ipodIncrement->activate(); + m_tqparent->m_ipodIncrement->activate(); else if( e->key() == Key_Left ) - m_parent->m_ipodDecrement->activate(); + m_tqparent->m_ipodDecrement->activate(); } @@ -660,7 +660,7 @@ CollectionView::renderView(bool force /* = false */) //SLOT if(!force && !m_dirty ) return; - if( BrowserBar::instance()->currentBrowser() != m_parent ) + if( BrowserBar::instance()->currentBrowser() != m_tqparent ) { // the collectionbrowser is intensive for sql, so we only renderView() if the tab // is currently active. else, wait until user focuses it. @@ -784,23 +784,23 @@ CollectionView::slotEnsureSelectedItemVisible() //SLOT if ( lastChild() ) ensureItemVisible( lastChild() ); - //Create a reverse list of parents, grandparents etc. - //Later we try to make the grandparents in view, then their children etc. + //Create a reverse list of tqparents, grandtqparents etc. + //Later we try to make the grandtqparents in view, then their tqchildren etc. //This means that the selected item has the most priority as it is done last. - TQValueStack<TQListViewItem*> parents; + TQValueStack<TQListViewItem*> tqparents; while ( r ) { - parents.push( r ); - r = r->parent(); + tqparents.push( r ); + r = r->tqparent(); } - while ( !parents.isEmpty() ) + while ( !tqparents.isEmpty() ) { //We would prefer the next item to be visible. - if ( parents.top()->nextSibling() ) - ensureItemVisible( parents.top()->nextSibling() ); + if ( tqparents.top()->nextSibling() ) + ensureItemVisible( tqparents.top()->nextSibling() ); //It's even more important the actual item is visible than the next one. - ensureItemVisible( parents.top() ); - parents.pop(); + ensureItemVisible( tqparents.top() ); + tqparents.pop(); } } } @@ -864,14 +864,14 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT } if ( translateTimeFilter( timeFilter() ) > 0 ) - qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); + qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); TQString itemText; bool isUnknown; if ( dynamic_cast<CollectionItem*>( item ) ) { - itemText = static_cast<CollectionItem*>( item )->getSQLText( 0 ); + itemText = static_cast<CollectionItem*>( item )->getSTQLText( 0 ); } else { @@ -891,7 +891,7 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT if( VisYearAlbum == 1 ) { tmptext = item->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); qb.addMatch( QueryBuilder::tabYear, year, false, true ); if ( isUnknown ) @@ -939,19 +939,19 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT break; case 1: - tmptext = dynamic_cast<CollectionItem*>( item->parent() ) ? - static_cast<CollectionItem*>( item->parent() )->getSQLText( 0 ) : - item->parent()->text( 0 ); + tmptext = dynamic_cast<CollectionItem*>( item->tqparent() ) ? + static_cast<CollectionItem*>( item->tqparent() )->getSTQLText( 0 ) : + item->tqparent()->text( 0 ); isUnknown = tmptext.isEmpty(); - if( !static_cast<CollectionItem*>( item->parent() )->isSampler() ) + if( !static_cast<CollectionItem*>( item->tqparent() )->isSampler() ) { if ( m_cat1 == IdArtist ) qb.setOptions( QueryBuilder::optNoCompilations ); if( VisYearAlbum == 1 ) { - tmptext = item->parent()->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + tmptext = item->tqparent()->text( 0 ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); qb.addMatch( QueryBuilder::tabYear, year, false, true ); if ( isUnknown ) @@ -972,7 +972,7 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT if( VisYearAlbum == 2 ) { tmptext = item->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); qb.addMatch( QueryBuilder::tabYear, year, false, true ); if ( isUnknown ) @@ -1014,19 +1014,19 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT break; case 2: - tmptext = dynamic_cast<CollectionItem*> ( item->parent()->parent() ) ? - static_cast<CollectionItem*>( item->parent()->parent() )->getSQLText( 0 ) : - item->parent()->parent()->text( 0 ); + tmptext = dynamic_cast<CollectionItem*> ( item->tqparent()->tqparent() ) ? + static_cast<CollectionItem*>( item->tqparent()->tqparent() )->getSTQLText( 0 ) : + item->tqparent()->tqparent()->text( 0 ); isUnknown = tmptext.isEmpty(); - if ( !static_cast<CollectionItem*>( item->parent()->parent() )->isSampler() ) + if ( !static_cast<CollectionItem*>( item->tqparent()->tqparent() )->isSampler() ) { if ( m_cat1 == IdArtist ) qb.setOptions( QueryBuilder::optNoCompilations ); if( VisYearAlbum == 1 ) { - tmptext = item->parent()->parent()->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + tmptext = item->tqparent()->tqparent()->text( 0 ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); qb.addMatch( QueryBuilder::tabYear, year, false, true ); if ( isUnknown ) @@ -1041,15 +1041,15 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT c = true; } - tmptext = dynamic_cast<CollectionItem*>( item->parent() ) ? - static_cast<CollectionItem*>( item->parent() )->getSQLText( 0 ) : - item->parent()->text( 0 ); + tmptext = dynamic_cast<CollectionItem*>( item->tqparent() ) ? + static_cast<CollectionItem*>( item->tqparent() )->getSTQLText( 0 ) : + item->tqparent()->text( 0 ); isUnknown = tmptext.isEmpty(); if( VisYearAlbum == 2 ) { - tmptext = item->parent()->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + tmptext = item->tqparent()->text( 0 ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); qb.addMatch( QueryBuilder::tabYear, year, false, true ); if ( isUnknown ) @@ -1064,7 +1064,7 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT if( VisYearAlbum == 3 ) { tmptext = item->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); qb.addMatch( QueryBuilder::tabYear, year, false, true ); if ( isUnknown ) @@ -1151,7 +1151,7 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT child->setExpandable( expandable ); } - //Display the album cover for the parent item now it is expanded + //Display the album cover for the tqparent item now it is expanded if ( dynamic_cast<CollectionItem*>( item ) ) { CollectionItem *i = static_cast<CollectionItem*>( item ); @@ -1175,7 +1175,7 @@ CollectionView::slotCollapse( TQListViewItem* item ) //SLOT TQListViewItem* child = item->firstChild(); TQListViewItem* childTmp; - //delete all children + //delete all tqchildren while ( child ) { childTmp = child; @@ -1235,29 +1235,29 @@ CollectionView::presetMenu( int id ) //SLOT void CollectionView::cat1Menu( int id, bool rerender ) //SLOT { - m_parent->m_cat1Menu->setItemChecked( m_cat1, false ); //uncheck old item - m_parent->m_cat2Menu->setItemEnabled( m_cat1, true ); //enable old items - m_parent->m_cat3Menu->setItemEnabled( m_cat1, true ); + m_tqparent->m_cat1Menu->setItemChecked( m_cat1, false ); //uncheck old item + m_tqparent->m_cat2Menu->setItemEnabled( m_cat1, true ); //enable old items + m_tqparent->m_cat3Menu->setItemEnabled( m_cat1, true ); m_cat1 = id; updateColumnHeader(); resetIpodDepth(); - m_parent->m_cat1Menu->setItemChecked( m_cat1, true ); + m_tqparent->m_cat1Menu->setItemChecked( m_cat1, true ); //prevent choosing the same category in both menus - m_parent->m_cat2Menu->setItemEnabled( id , false ); - m_parent->m_cat3Menu->setItemEnabled( id , false ); + m_tqparent->m_cat2Menu->setItemEnabled( id , false ); + m_tqparent->m_cat3Menu->setItemEnabled( id , false ); //if this item is checked in second menu, uncheck it - if ( m_parent->m_cat2Menu->isItemChecked( id ) ) { - m_parent->m_cat2Menu->setItemChecked( id, false ); - m_parent->m_cat2Menu->setItemChecked( IdNone, true ); + if ( m_tqparent->m_cat2Menu->isItemChecked( id ) ) { + m_tqparent->m_cat2Menu->setItemChecked( id, false ); + m_tqparent->m_cat2Menu->setItemChecked( IdNone, true ); m_cat2 = IdNone; enableCat3Menu( false ); } //if this item is checked in third menu, uncheck it - if ( m_parent->m_cat3Menu->isItemChecked( id ) ) { - m_parent->m_cat3Menu->setItemChecked( id, false ); - m_parent->m_cat3Menu->setItemChecked( IdNone, true ); + if ( m_tqparent->m_cat3Menu->isItemChecked( id ) ) { + m_tqparent->m_cat3Menu->setItemChecked( id, false ); + m_tqparent->m_cat3Menu->setItemChecked( IdNone, true ); m_cat3 = IdNone; } updateTrackDepth(); @@ -1271,23 +1271,23 @@ CollectionView::cat1Menu( int id, bool rerender ) //SLOT void CollectionView::cat2Menu( int id, bool rerender ) //SLOT { - m_parent->m_cat2Menu->setItemChecked( m_cat2, false ); //uncheck old item - m_parent->m_cat3Menu->setItemEnabled( m_cat3, true ); //enable old item + m_tqparent->m_cat2Menu->setItemChecked( m_cat2, false ); //uncheck old item + m_tqparent->m_cat3Menu->setItemEnabled( m_cat3, true ); //enable old item m_cat2 = id; - m_parent->m_cat2Menu->setItemChecked( m_cat2, true ); + m_tqparent->m_cat2Menu->setItemChecked( m_cat2, true ); updateColumnHeader(); resetIpodDepth(); enableCat3Menu( id != IdNone ); //prevent choosing the same category in both menus - m_parent->m_cat3Menu->setItemEnabled( m_cat1 , false ); + m_tqparent->m_cat3Menu->setItemEnabled( m_cat1 , false ); if( id != IdNone ) - m_parent->m_cat3Menu->setItemEnabled( id , false ); + m_tqparent->m_cat3Menu->setItemEnabled( id , false ); //if this item is checked in third menu, uncheck it - if ( m_parent->m_cat3Menu->isItemChecked( id ) ) { - m_parent->m_cat3Menu->setItemChecked( id, false ); + if ( m_tqparent->m_cat3Menu->isItemChecked( id ) ) { + m_tqparent->m_cat3Menu->setItemChecked( id, false ); enableCat3Menu( false ); } updateTrackDepth(); @@ -1301,9 +1301,9 @@ CollectionView::cat2Menu( int id, bool rerender ) //SLOT void CollectionView::cat3Menu( int id, bool rerender ) //SLOT { - m_parent->m_cat3Menu->setItemChecked( m_cat3, false ); //uncheck old item + m_tqparent->m_cat3Menu->setItemChecked( m_cat3, false ); //uncheck old item m_cat3 = id; - m_parent->m_cat3Menu->setItemChecked( m_cat3, true ); + m_tqparent->m_cat3Menu->setItemChecked( m_cat3, true ); updateColumnHeader(); resetIpodDepth(); updateTrackDepth(); @@ -1317,17 +1317,17 @@ CollectionView::cat3Menu( int id, bool rerender ) //SLOT void CollectionView::enableCat3Menu( bool enable ) { - m_parent->m_cat3Menu->setItemEnabled( IdAlbum, enable ); - m_parent->m_cat3Menu->setItemEnabled( IdVisYearAlbum, enable ); - m_parent->m_cat3Menu->setItemEnabled( IdArtist, enable ); - m_parent->m_cat3Menu->setItemEnabled( IdComposer, enable ); - m_parent->m_cat3Menu->setItemEnabled( IdGenre, enable ); - m_parent->m_cat3Menu->setItemEnabled( IdYear, enable ); - m_parent->m_cat3Menu->setItemEnabled( IdLabel, enable ); + m_tqparent->m_cat3Menu->setItemEnabled( IdAlbum, enable ); + m_tqparent->m_cat3Menu->setItemEnabled( IdVisYearAlbum, enable ); + m_tqparent->m_cat3Menu->setItemEnabled( IdArtist, enable ); + m_tqparent->m_cat3Menu->setItemEnabled( IdComposer, enable ); + m_tqparent->m_cat3Menu->setItemEnabled( IdGenre, enable ); + m_tqparent->m_cat3Menu->setItemEnabled( IdYear, enable ); + m_tqparent->m_cat3Menu->setItemEnabled( IdLabel, enable ); if( !enable ) { - m_parent->m_cat3Menu->setItemChecked( m_cat3, false ); - m_parent->m_cat3Menu->setItemChecked( IdNone, true ); + m_tqparent->m_cat3Menu->setItemChecked( m_cat3, false ); + m_tqparent->m_cat3Menu->setItemChecked( IdNone, true ); m_cat3 = IdNone; } updateTrackDepth(); @@ -1373,8 +1373,8 @@ CollectionView::ipodItemClicked( TQListViewItem *item, const TQPoint&, int c ) if( m_viewMode != modeIpodView ) return; - // The Qt manual says NOT to delete items from within this slot - TQTimer::singleShot( 0, m_parent->m_ipodIncrement, TQT_SLOT( activate() ) ); + // The TQt manual says NOT to delete items from within this slot + TQTimer::singleShot( 0, m_tqparent->m_ipodIncrement, TQT_SLOT( activate() ) ); } @@ -1416,7 +1416,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // cat = catArr[m_currentDepth]; } - enum Actions { APPEND, QUEUE, MAKE, SAVE, MEDIA_DEVICE, BURN_ARTIST, + enum Actions { APPEND, TQUEUE, MAKE, SAVE, MEDIA_DEVICE, BURN_ARTIST, BURN_COMPOSER, BURN_ALBUM, BURN_CD, FETCH, INFO, COMPILATION_SET, COMPILATION_UNSET, ORGANIZE, DELETE, TRASH, FILE_MENU }; @@ -1428,7 +1428,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), MAKE ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), selection.count() == 1 ? i18n( "&Queue Track" ) - : i18n( "&Queue Tracks" ), QUEUE ); + : i18n( "&Queue Tracks" ), TQUEUE ); if( selection.count() > 1 || item->isExpandable() ) menu.insertItem( SmallIconSet( Amarok::icon( "save" ) ), i18n( "&Save as Playlist..." ), SAVE ); @@ -1471,7 +1471,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // if( (cat == IdAlbum || cat == IdVisYearAlbum) && siblingSelection.count() == 1 ) // cover fetch isn't multiselection capable { - menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch Cover From amazon.%1" ).arg( CoverManager::amazonTld() ), this, TQT_SLOT( fetchCover() ), 0, FETCH ); + menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch Cover From amazon.%1" ).tqarg( CoverManager::amazonTld() ), this, TQT_SLOT( fetchCover() ), 0, FETCH ); #ifndef AMAZON_SUPPORT menu.setItemEnabled( FETCH, false ); #endif @@ -1504,7 +1504,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // case SAVE: playlistFromURLs( selection ); break; - case QUEUE: + case TQUEUE: Playlist::instance()->insertMedia( selection, Playlist::Queue ); break; case MEDIA_DEVICE: @@ -1525,11 +1525,11 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // { TQString artist; if( item->depth() - artistLevel == 1 ) - artist = item->parent()->text( 0 ); + artist = item->tqparent()->text( 0 ); else if( item->depth() - artistLevel == 2 ) - artist = item->parent()->parent()->text( 0 ); + artist = item->tqparent()->tqparent()->text( 0 ); else if( item->depth() - artistLevel == 3 ) - artist = item->parent()->parent()->parent()->text( 0 ); + artist = item->tqparent()->tqparent()->tqparent()->text( 0 ); K3bExporter::instance()->exportAlbum( artist, trueItemText ); } break; @@ -1579,15 +1579,15 @@ CollectionView::setViewMode( int mode, bool rerender /*=true*/ ) #if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) setShadeSortColumn( false ); #endif - m_parent->m_ipodDecrement->setEnabled( m_currentDepth > 0 ); - m_parent->ipodToolbar( true ); + m_tqparent->m_ipodDecrement->setEnabled( m_currentDepth > 0 ); + m_tqparent->ipodToolbar( true ); } else { #if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) setShadeSortColumn( true ); #endif - m_parent->ipodToolbar( false ); + m_tqparent->ipodToolbar( false ); } if ( rerender ) @@ -1628,9 +1628,9 @@ CollectionItem::setPixmap(int column, const TQPixmap & pix) //Now work out the artist CollectionItem *p = this; - while ( p->parent() && dynamic_cast<CollectionItem*>( p->parent() ) ) + while ( p->tqparent() && dynamic_cast<CollectionItem*>( p->tqparent() ) ) { - p = static_cast<CollectionItem*>( p->parent() ); + p = static_cast<CollectionItem*>( p->tqparent() ); if ( IdArtist == p->m_cat ) { artist = p->text( 0 ); @@ -1687,9 +1687,9 @@ CollectionView::fetchCover() //SLOT TQString album = item->text(0); if( cat == IdVisYearAlbum ) { - // we can't use findRev since an album may have " - " within it. + // we can't use tqfindRev since an album may have " - " within it. TQString sep = i18n(" - "); - album = album.right( album.length() - sep.length() - album.find( sep ) ); + album = album.right( album.length() - sep.length() - album.tqfind( sep ) ); } // find the first artist's name @@ -1698,7 +1698,7 @@ CollectionView::fetchCover() //SLOT "SELECT DISTINCT artist.name FROM artist, album, tags " "WHERE artist.id = tags.artist AND tags.album = album.id " "AND album.name = '%1';" ) - .arg( CollectionDB::instance()->escapeString( album ) ) ); + .tqarg( CollectionDB::instance()->escapeString( album ) ) ); if ( !values.isEmpty() ) CollectionDB::instance()->fetchCover( this, values[0], album, false, static_cast<TQListViewItem*>(item) ); @@ -1761,7 +1761,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption, else { m_organizeURLs += Amarok::recursiveUrlExpand( urls ); - Amarok::StatusBar::instance()->incrementProgressTotalSteps( this, urls.count() ); + Amarok::StatusBar::instance()->incrementProgressTotalSteps( TQT_TQOBJECT(this), urls.count() ); return; } } @@ -1774,7 +1774,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption, return; } - OrganizeCollectionDialogBase base( m_parent, "OrganizeFiles", true, caption, + OrganizeCollectionDialogBase base( m_tqparent, "OrganizeFiles", true, caption, KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Details ); TQVBox* page = base.makeVBoxMainWidget(); @@ -1833,9 +1833,9 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption, m_organizeURLs = Amarok::recursiveUrlExpand( urls ); m_organizeCopyMode = copy; CollectionDB::instance()->createTables( true ); // create temp tables - Amarok::StatusBar::instance()->newProgressOperation( this ) + Amarok::StatusBar::instance()->newProgressOperation( TQT_TQOBJECT(this) ) .setDescription( caption ) - .setAbortSlot( this, TQT_SLOT( cancelOrganizingFiles() ) ) + .setAbortSlot( TQT_TQOBJECT(this), TQT_SLOT( cancelOrganizingFiles() ) ) .setTotalSteps( m_organizeURLs.count() ); while( !m_organizeURLs.empty() && !m_organizingFileCancelled ) @@ -1848,7 +1848,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption, } m_organizeURLs.pop_front(); - Amarok::StatusBar::instance()->incrementProgress( this ); + Amarok::StatusBar::instance()->incrementProgress( TQT_TQOBJECT(this) ); if( m_organizingFileCancelled ) m_organizeURLs.clear(); } @@ -1889,7 +1889,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption, m_dirty = true; TQTimer::singleShot( 0, CollectionView::instance(), TQT_SLOT( renderView() ) ); - Amarok::StatusBar::instance()->endProgressOperation( this ); + Amarok::StatusBar::instance()->endProgressOperation( TQT_TQOBJECT(this) ); } } @@ -1979,7 +1979,7 @@ CollectionView::safeClear() TQListViewItem *n; itemCoverMapMutex->lock(); while( c ) { - if( itemCoverMap->contains( c ) ) + if( itemCoverMap->tqcontains( c ) ) itemCoverMap->erase( c ); n = c->nextSibling(); delete c; @@ -2069,13 +2069,13 @@ CollectionView::updateColumnHeader() } } - setColumnAlignment( Track, Qt::AlignCenter ); - setColumnAlignment( DiscNumber, Qt::AlignCenter ); - setColumnAlignment( Length, Qt::AlignRight ); - setColumnAlignment( Bitrate, Qt::AlignCenter ); - setColumnAlignment( Score, Qt::AlignCenter ); - setColumnAlignment( Playcount, Qt::AlignCenter ); - setColumnAlignment( BPM, Qt::AlignRight ); + setColumnAlignment( Track, TQt::AlignCenter ); + setColumnAlignment( DiscNumber, TQt::AlignCenter ); + setColumnAlignment( Length, TQt::AlignRight ); + setColumnAlignment( Bitrate, TQt::AlignCenter ); + setColumnAlignment( Score, TQt::AlignCenter ); + setColumnAlignment( Playcount, TQt::AlignCenter ); + setColumnAlignment( BPM, TQt::AlignRight ); //TQListView allows invisible columns to be resized, so we disable resizing for them for ( int i = 0; i < columns(); ++i ) { @@ -2142,12 +2142,12 @@ CollectionView::updateColumnHeader() TQResizeEvent rev( size(), TQSize() ); viewportResizeEvent( &rev ); - m_parent->m_categoryMenu->setItemChecked( IdArtist, m_cat1 == IdArtist && m_cat2 == IdNone ); - m_parent->m_categoryMenu->setItemChecked( IdAlbum, m_cat1 == IdAlbum && m_cat2 == IdNone ); - m_parent->m_categoryMenu->setItemChecked( IdArtistAlbum, m_cat1 == IdArtist && m_cat2 == IdAlbum && m_cat3 == IdNone ); - m_parent->m_categoryMenu->setItemChecked( IdArtistVisYearAlbum, m_cat1 == IdArtist && m_cat2 == IdVisYearAlbum && m_cat3 == IdNone ); - m_parent->m_categoryMenu->setItemChecked( IdGenreArtist, m_cat1 == IdGenre && m_cat2 == IdArtist && m_cat3 == IdNone ); - m_parent->m_categoryMenu->setItemChecked( IdGenreArtistAlbum, m_cat1 == IdGenre && m_cat2 == IdArtist && m_cat3 == IdAlbum ); + m_tqparent->m_categoryMenu->setItemChecked( IdArtist, m_cat1 == IdArtist && m_cat2 == IdNone ); + m_tqparent->m_categoryMenu->setItemChecked( IdAlbum, m_cat1 == IdAlbum && m_cat2 == IdNone ); + m_tqparent->m_categoryMenu->setItemChecked( IdArtistAlbum, m_cat1 == IdArtist && m_cat2 == IdAlbum && m_cat3 == IdNone ); + m_tqparent->m_categoryMenu->setItemChecked( IdArtistVisYearAlbum, m_cat1 == IdArtist && m_cat2 == IdVisYearAlbum && m_cat3 == IdNone ); + m_tqparent->m_categoryMenu->setItemChecked( IdGenreArtist, m_cat1 == IdGenre && m_cat2 == IdArtist && m_cat3 == IdNone ); + m_tqparent->m_categoryMenu->setItemChecked( IdGenreArtistAlbum, m_cat1 == IdGenre && m_cat2 == IdArtist && m_cat3 == IdAlbum ); } @@ -2162,7 +2162,7 @@ CollectionView::startDrag() d->dragCopy(); } -QString +TQString CollectionView::getTrueItemText( int cat, TQListViewItem* item ) const { //Work out the true name of the album ( where Unknown is "" ) , and the @@ -2175,9 +2175,9 @@ CollectionView::getTrueItemText( int cat, TQListViewItem* item ) const if ( dynamic_cast<CollectionItem*>( item ) ) { CollectionItem* collectItem = static_cast<CollectionItem*>( item ); - trueItemText = collectItem->getSQLText( 0 ); + trueItemText = collectItem->getSTQLText( 0 ); if ( cat == IdVisYearAlbum && !collectItem->isUnknown() ) - trueItemText = trueItemText.right( trueItemText.length() - trueItemText.find( i18n( " - " ) ) - i18n( " - " ).length() ); + trueItemText = trueItemText.right( trueItemText.length() - trueItemText.tqfind( i18n( " - " ) ) - i18n( " - " ).length() ); } else { @@ -2187,7 +2187,7 @@ CollectionView::getTrueItemText( int cat, TQListViewItem* item ) const return trueItemText; } -QStringList +TQStringList CollectionView::listSelectedSiblingsOf( int cat, TQListViewItem* item ) { // notice that using the nextSibling()-axis does not work in this case as this @@ -2219,8 +2219,8 @@ CollectionView::listSelectedSiblingsOf( int cat, TQListViewItem* item ) KURL::List CollectionView::listSelected() { - //Here we determine the URLs of all selected items. We use two passes, one for the parent items, - //and another one for the children. + //Here we determine the URLs of all selected items. We use two passes, one for the tqparent items, + //and another one for the tqchildren. KURL::List list; TQListViewItem* item; @@ -2266,7 +2266,7 @@ CollectionView::listSelected() // The iPod selection code is written to resemble the tree mode // selection logic, as well as what happens on an actual iPod. If // we're in track mode, just return the list of tracks selected. - // Otherwise select all children of all currently selected items, + // Otherwise select all tqchildren of all currently selected items, // sorting first by m_cat1, then m_cat2, then m_cat3. Sort by // track first if one of the categories is Id(VisYear)Album. // There is a difficulty with compilation albums -- if we're @@ -2335,7 +2335,7 @@ CollectionView::listSelected() buildIpodQuery( qb, trackDepth(), filters, filterYear, true, true ); if ( translateTimeFilter( timeFilter() ) > 0 ) - qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); + qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); qb.setOptions( QueryBuilder::optOnlyCompilations ); qb.setGoogleFilter( tables | QueryBuilder::tabSong, m_filter ); @@ -2350,7 +2350,7 @@ CollectionView::listSelected() buildIpodQuery( qb, trackDepth(), filters, filterYear, true, false ); if ( translateTimeFilter( timeFilter() ) > 0 ) - qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); + qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); if( sortByTrackFirst ) qb.setOptions( QueryBuilder::optNoCompilations ); @@ -2378,18 +2378,18 @@ CollectionView::listSelected() } - //first pass: parents + //first pass: tqparents for ( item = firstChild(); item; item = item->nextSibling() ) if ( item->isSelected() ) { const bool sampler = static_cast<CollectionItem*>( item )->isSampler(); qb.clear(); if ( translateTimeFilter( timeFilter() ) > 0 ) - qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); + qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); qb.addReturnValue( QueryBuilder::tabSong, QueryBuilder::valURL ); - tmptext = static_cast<CollectionItem*>( item )->getSQLText( 0 ); + tmptext = static_cast<CollectionItem*>( item )->getSTQLText( 0 ); unknownText = tmptext.isEmpty(); if ( !sampler ) @@ -2399,7 +2399,7 @@ CollectionView::listSelected() if( VisYearAlbum == 1 ) { tmptext = item->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); qb.addMatch( QueryBuilder::tabYear, year, false, true ); if ( unknownText ) @@ -2450,18 +2450,18 @@ CollectionView::listSelected() { for ( item = firstChild(); item; item = item->nextSibling() ) for ( TQListViewItem* child = item->firstChild(); child; child = child->nextSibling() ) - if ( child->isSelected() && !child->parent()->isSelected() ) + if ( child->isSelected() && !child->tqparent()->isSelected() ) list << static_cast<CollectionItem*>( child ) ->url(); } else { for ( item = firstChild(); item; item = item->nextSibling() ) for ( TQListViewItem* child = item->firstChild(); child; child = child->nextSibling() ) - if ( child->isSelected() && !child->parent()->isSelected() ) + if ( child->isSelected() && !child->tqparent()->isSelected() ) { const bool sampler = static_cast<CollectionItem*>( item )->isSampler(); qb.clear(); if ( translateTimeFilter( timeFilter() ) > 0 ) - qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); + qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); qb.addReturnValue( QueryBuilder::tabSong, QueryBuilder::valURL ); @@ -2470,13 +2470,13 @@ CollectionView::listSelected() if ( q_cat1 == IdArtist ) qb.setOptions( QueryBuilder::optNoCompilations ); - tmptext = static_cast<CollectionItem*>( item )->getSQLText( 0 ); + tmptext = static_cast<CollectionItem*>( item )->getSTQLText( 0 ); unknownText = tmptext.isEmpty(); if( VisYearAlbum == 1 ) { tmptext = item->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); qb.addMatch( QueryBuilder::tabYear, year, false, true ); if ( unknownText ) @@ -2489,13 +2489,13 @@ CollectionView::listSelected() qb.setOptions( QueryBuilder::optOnlyCompilations ); - tmptext = static_cast<CollectionItem*>( child )->getSQLText( 0 ); + tmptext = static_cast<CollectionItem*>( child )->getSTQLText( 0 ); unknownText = tmptext.isEmpty(); if( VisYearAlbum == 2 ) { tmptext = child->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); qb.addMatch( QueryBuilder::tabYear, year, false, true ); if ( unknownText ) @@ -2543,7 +2543,7 @@ CollectionView::listSelected() for ( item = firstChild(); item; item = item->nextSibling() ) for ( TQListViewItem* child = item->firstChild(); child; child = child->nextSibling() ) for ( TQListViewItem* grandChild = child->firstChild(); grandChild; grandChild = grandChild->nextSibling() ) - if ( grandChild->isSelected() && !grandChild->isExpandable() && !child->parent()->isSelected() && !child->isSelected() ) + if ( grandChild->isSelected() && !grandChild->isExpandable() && !child->tqparent()->isSelected() && !child->isSelected() ) list << static_cast<CollectionItem*>( grandChild ) ->url(); //category 3 @@ -2553,19 +2553,19 @@ CollectionView::listSelected() for ( TQListViewItem* child = item->firstChild(); child; child = child->nextSibling() ) for ( TQListViewItem* grandChild = child->firstChild(); grandChild; grandChild = grandChild->nextSibling() ) for ( TQListViewItem* grandChild2 = grandChild->firstChild(); grandChild2; grandChild2 = grandChild2->nextSibling() ) - if ( grandChild2->isSelected() && !child->parent()->isSelected() && !child->isSelected() && !grandChild->isSelected() ) + if ( grandChild2->isSelected() && !child->tqparent()->isSelected() && !child->isSelected() && !grandChild->isSelected() ) list << static_cast<CollectionItem*>( grandChild2 ) ->url(); } else { for ( item = firstChild(); item; item = item->nextSibling() ) for ( TQListViewItem* child = item->firstChild(); child; child = child->nextSibling() ) for ( TQListViewItem* grandChild = child->firstChild(); grandChild; grandChild = grandChild->nextSibling() ) - if ( grandChild->isSelected() && !grandChild->parent()->isSelected() ) + if ( grandChild->isSelected() && !grandChild->tqparent()->isSelected() ) { const bool sampler = static_cast<CollectionItem*>( item )->isSampler(); qb.clear(); if ( translateTimeFilter( timeFilter() ) > 0 ) - qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); + qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); qb.addReturnValue( QueryBuilder::tabSong, QueryBuilder::valURL ); @@ -2574,13 +2574,13 @@ CollectionView::listSelected() if ( q_cat1 == IdArtist ) qb.setOptions( QueryBuilder::optNoCompilations ); - tmptext = static_cast<CollectionItem*>( item )->getSQLText( 0 ); + tmptext = static_cast<CollectionItem*>( item )->getSTQLText( 0 ); unknownText = tmptext.isEmpty(); if( VisYearAlbum == 1 ) { tmptext = item->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); qb.addMatch( QueryBuilder::tabYear, year, false, true ); if ( unknownText ) @@ -2592,13 +2592,13 @@ CollectionView::listSelected() else qb.setOptions( QueryBuilder::optOnlyCompilations ); - tmptext = static_cast<CollectionItem*>( child )->getSQLText( 0 ); + tmptext = static_cast<CollectionItem*>( child )->getSTQLText( 0 ); unknownText = tmptext.isEmpty(); if( VisYearAlbum == 2 ) { tmptext = child->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); qb.addMatch( QueryBuilder::tabYear, year, false, true ); if ( unknownText ) @@ -2607,13 +2607,13 @@ CollectionView::listSelected() qb.addMatch( q_cat2, tmptext, false, true ); - tmptext = static_cast<CollectionItem*>( grandChild )->getSQLText( 0 ); + tmptext = static_cast<CollectionItem*>( grandChild )->getSTQLText( 0 ); unknownText = tmptext.isEmpty(); if( VisYearAlbum == 3 ) { tmptext = grandChild->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); qb.addMatch( QueryBuilder::tabYear, year, false, true ); if ( unknownText ) @@ -2661,7 +2661,7 @@ CollectionView::listSelected() for ( TQListViewItem* child = item->firstChild(); child; child = child->nextSibling() ) for ( TQListViewItem* grandChild = child->firstChild(); grandChild; grandChild = grandChild->nextSibling() ) for ( TQListViewItem* grandChild2 = grandChild->firstChild(); grandChild2; grandChild2 = grandChild2->nextSibling() ) - if ( grandChild2->isSelected() && !child->parent()->isSelected() && !child->isSelected() && !grandChild->isSelected() ) + if ( grandChild2->isSelected() && !child->tqparent()->isSelected() && !child->isSelected() && !grandChild->isSelected() ) list << static_cast<CollectionItem*>( grandChild2 ) ->url(); return list; @@ -2693,7 +2693,7 @@ CollectionView::playlistFromURLs( const KURL::List &urls ) KURL rpath; MountPointManager::instance()->getRelativePath( deviceid, *it, rpath ); const TQString query = TQString("SELECT title, length FROM tags WHERE url = '%1' AND deviceid = %2;") - .arg( db->escapeString( rpath.path() ) ).arg( deviceid ); + .tqarg( db->escapeString( rpath.path() ) ).tqarg( deviceid ); debug() << "media id: " << deviceid << " rpath: " << rpath.path() << endl; TQStringList result = db->query( query ); titles << result[0]; @@ -2704,7 +2704,7 @@ CollectionView::playlistFromURLs( const KURL::List &urls ) PlaylistWindow::self()->showBrowser( "PlaylistBrowser" ); } -QPixmap +TQPixmap CollectionView::iconForCategory( const int cat ) const { TQString icon; @@ -2739,7 +2739,7 @@ CollectionView::iconForCategory( const int cat ) const return KGlobal::iconLoader()->loadIcon( icon, KIcon::Toolbar, KIcon::SizeSmall ); } -QString +TQString CollectionView::captionForCategory( const int cat ) const { switch( cat ) @@ -2773,7 +2773,7 @@ CollectionView::captionForCategory( const int cat ) const } -QString +TQString CollectionView::captionForTag( const Tag tag) const { TQString caption; @@ -2894,7 +2894,7 @@ CollectionView::captionForTag( const Tag tag) const // Returns the text for the "All" filter option for the given category // and the number of items in that category. -QString +TQString CollectionView::allForCategory( const int cat, const int num ) const { switch( cat ) @@ -2957,7 +2957,7 @@ CollectionView::incrementDepth( bool rerender /*= true*/ ) return; } - m_parent->m_ipodDecrement->setEnabled( true ); + m_tqparent->m_ipodDecrement->setEnabled( true ); // We're not in track mode int catArr[3] = {m_cat1, m_cat2, m_cat3}; @@ -2969,8 +2969,8 @@ CollectionView::incrementDepth( bool rerender /*= true*/ ) m_ipodFilterYear.clear(); m_ipodSelected[m_currentDepth].clear(); - m_ipodCurrent[m_currentDepth] = TQString::null; - m_ipodTopItem[m_currentDepth] = TQString::null; + m_ipodCurrent[m_currentDepth] = TQString(); + m_ipodTopItem[m_currentDepth] = TQString(); // Save the current item if( currentItem() ) @@ -3003,7 +3003,7 @@ CollectionView::incrementDepth( bool rerender /*= true*/ ) // selection, since All will then be reselected automatically // in selectIpodItems() m_ipodSelected[m_currentDepth].clear(); - m_ipodCurrent[m_currentDepth] = TQString::null; + m_ipodCurrent[m_currentDepth] = TQString(); break; } @@ -3011,7 +3011,7 @@ CollectionView::incrementDepth( bool rerender /*= true*/ ) if( cat == IdVisYearAlbum ) { TQString tmptext = item->text( 0 ); - TQString year = tmptext.left( tmptext.find( i18n(" - ") ) ); + TQString year = tmptext.left( tmptext.tqfind( i18n(" - ") ) ); yearAlbumCalc( year, tmptext ); if( !item->isUnknown() ) m_ipodFilters[m_currentDepth] << tmptext; @@ -3021,7 +3021,7 @@ CollectionView::incrementDepth( bool rerender /*= true*/ ) } else - m_ipodFilters[m_currentDepth] << item->getSQLText( 0 ); + m_ipodFilters[m_currentDepth] << item->getSTQLText( 0 ); // Save the selection m_ipodSelected[m_currentDepth] << item->text( 0 ); @@ -3051,7 +3051,7 @@ CollectionView::decrementDepth ( bool rerender /*= true*/ ) return; m_currentDepth--; - m_parent->m_ipodDecrement->setEnabled( m_currentDepth > 0 ); + m_tqparent->m_ipodDecrement->setEnabled( m_currentDepth > 0 ); m_ipodFilters[m_currentDepth].clear(); int catArr[3] = {m_cat1, m_cat2, m_cat3}; int cat = catArr[m_currentDepth]; @@ -3062,8 +3062,8 @@ CollectionView::decrementDepth ( bool rerender /*= true*/ ) for( int i = m_currentDepth + 1; i < 3; ++i ) { m_ipodSelected[i].clear(); - m_ipodCurrent[i] = TQString::null; - m_ipodTopItem[i] = TQString::null; + m_ipodCurrent[i] = TQString(); + m_ipodTopItem[i] = TQString(); } if( rerender ) @@ -3086,7 +3086,7 @@ CollectionView::resetIpodDepth ( void ) m_ipodFilters[1].clear(); m_ipodFilters[2].clear(); m_ipodIncremented = 1; - m_parent->m_ipodDecrement->setEnabled( false ); + m_tqparent->m_ipodDecrement->setEnabled( false ); } @@ -3189,7 +3189,7 @@ CollectionView::buildIpodQuery ( QueryBuilder &qb, int depth, TQStringList filte qb.sortBy( q_cat, QueryBuilder::valName ); // ensure we don't get empty genres/albums/etc due to tag changes - qb.addFilter( QueryBuilder::tabSong, TQString::null ); + qb.addFilter( QueryBuilder::tabSong, TQString() ); } @@ -3256,7 +3256,7 @@ CollectionView::selectIpodItems ( void ) TQStringList::iterator it = m_ipodSelected[m_currentDepth].begin(); while( it != m_ipodSelected[m_currentDepth].end() ) { - TQListViewItem *item = findItem( *it, 0 ); + TQListViewItem *item = tqfindItem( *it, 0 ); ++it; if( !item ) @@ -3281,7 +3281,7 @@ CollectionView::selectIpodItems ( void ) !m_ipodTopItem[m_currentDepth].isNull() ) { //scroll to previous viewport top item - TQListViewItem* item = findItem( m_ipodTopItem[m_currentDepth], 0 ); + TQListViewItem* item = tqfindItem( m_ipodTopItem[m_currentDepth], 0 ); if ( item ) setContentsPos( 0, itemPos( item ) ); } @@ -3289,7 +3289,7 @@ CollectionView::selectIpodItems ( void ) if( !m_ipodCurrent[m_currentDepth].isEmpty() && !m_ipodCurrent[m_currentDepth].isNull() ) { - TQListViewItem *item = findItem( m_ipodCurrent[m_currentDepth], 0); + TQListViewItem *item = tqfindItem( m_ipodCurrent[m_currentDepth], 0); if( item ) setCurrentItem( item ); } @@ -3327,13 +3327,13 @@ CollectionView::selectIpodItems ( void ) // Convenience methods for returning the correct (small version of) // the browse forward / backward buttons -QPixmap +TQPixmap CollectionView::ipodIncrementIcon ( void ) { return SmallIcon( Amarok::icon( "fastforward" ) ); } -QPixmap +TQPixmap CollectionView::ipodDecrementIcon ( void ) { return SmallIcon( Amarok::icon( "rewind" ) ); @@ -3384,7 +3384,7 @@ CollectionView::cacheView() if ( item->isOpen() ) { //construct path to item TQStringList itemPath; - for( const TQListViewItem *i = item; i; i = i->parent() ) + for( const TQListViewItem *i = item; i; i = i->tqparent() ) itemPath.prepend( i->text( 0 ) ); m_cacheOpenItemPaths.append ( itemPath ); @@ -3405,7 +3405,7 @@ CollectionView::restoreView() if ( m_viewMode == modeTreeView ) { TQValueList<TQStringList>::const_iterator it; for ( it = m_cacheOpenItemPaths.begin(); it != m_cacheOpenItemPaths.end(); ++it ) { - TQListViewItem* item = findItem( (*it)[0], 0 ); + TQListViewItem* item = tqfindItem( (*it)[0], 0 ); if ( item ) item->setOpen ( true ); @@ -3441,11 +3441,11 @@ CollectionView::restoreView() m_cacheCurrentItem = TQStringList(); } -QStringList +TQStringList CollectionView::makeStructuredNameList( TQListViewItem *item ) const { TQStringList nameList; - for ( TQListViewItem *current = item; current; current = current->parent() ) + for ( TQListViewItem *current = item; current; current = current->tqparent() ) nameList.push_front( current->text( 0 ) ); return nameList; } @@ -3483,7 +3483,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse ) if( reverse ) { TQString begin = str.left( 3 ); - str = str.append( ", %1" ).arg( begin ); + str = TQString(str.append( ", %1" )).tqarg( begin ); str = str.mid( 4 ); return; } @@ -3492,7 +3492,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse ) return; TQString end = str.right( 3 ); - str = str.prepend( "%1 " ).arg( end ); + str = TQString(str.prepend( "%1 " )).tqarg( end ); uint newLen = str.length() - end.length() - 2; @@ -3502,7 +3502,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse ) bool CollectionView::endsInThe( const TQString & text ) { - return text.endsWith( ", the", false ); + return text.tqendsWith( ", the", false ); } // avoid code duplication @@ -3513,7 +3513,7 @@ CollectionView::yearAlbumCalc( TQString &year, TQString &text ) year = ""; text = text.right( text.length() - - text.find( i18n(" - ") ) - + text.tqfind( i18n(" - ") ) - i18n(" - ").length() ); } @@ -3539,9 +3539,9 @@ CollectionView::viewportPaintEvent( TQPaintEvent *e ) const uint w = t.width() + 20; const uint h = t.height() + 20; - p.setBrush( colorGroup().background() ); + p.setBrush( tqcolorGroup().background() ); p.drawRoundRect( 15, 15, w, h, (8*200)/w, (8*200)/h ); - t.draw( &p, 20, 20, TQRect(), colorGroup() ); + t.draw( &p, 20, 20, TQRect(), tqcolorGroup() ); } } @@ -3621,9 +3621,9 @@ CollectionView::viewportResizeEvent( TQResizeEvent* e) bool CollectionView::eventFilter( TQObject* o, TQEvent* e ) { - if( o == header() + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header()) && e->type() == TQEvent::MouseButtonPress - && static_cast<TQMouseEvent*>( e )->button() == Qt::RightButton + && TQT_TQMOUSEEVENT( e )->button() == Qt::RightButton && m_viewMode == modeFlatView ) { KPopupMenu popup; @@ -3641,7 +3641,7 @@ CollectionView::eventFilter( TQObject* o, TQEvent* e ) popup.setItemVisible( Score, AmarokConfig::useScores() ); popup.setItemVisible( Rating, AmarokConfig::useRatings() ); - const int returnID = popup.exec( static_cast<TQMouseEvent *>(e)->globalPos() ); + const int returnID = popup.exec( TQT_TQMOUSEEVENT(e)->globalPos() ); if ( returnID != -1 ) { @@ -3710,10 +3710,10 @@ CollectionView::renderFlatModeView( bool /*=false*/ ) QueryBuilder qb; if ( translateTimeFilter( timeFilter() ) > 0 ) - qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); + qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); if ( translateTimeFilter( timeFilter() ) <= 0 - && (m_filter.length() < 3 || (!m_filter.contains( " " ) && m_filter.endsWith( ":" ) ) ) ) + && (m_filter.length() < 3 || (!m_filter.tqcontains( " " ) && m_filter.endsWith( ":" ) ) ) ) { // Redraw bubble help triggerUpdate(); @@ -3820,7 +3820,7 @@ CollectionView::renderFlatModeView( bool /*=false*/ ) //we leftjoin the query so it can return mysql NULL cells, i.e. for score and playcount //this is an ugly hack - should be integrated in querybuilder itself instead. TQString leftQuery = qb.query(); - leftQuery.replace( "INNER JOIN", "LEFT JOIN" ); + leftQuery.tqreplace( "INNER JOIN", "LEFT JOIN" ); values = CollectionDB::instance()->query( leftQuery ); //construct items @@ -3883,7 +3883,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ ) QueryBuilder qb; if ( translateTimeFilter( timeFilter() ) > 0 ) - qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); + qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); setSorting( 0 ); int VisYearAlbum = -1; @@ -3941,7 +3941,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ ) qb.setOptions( QueryBuilder::optNoCompilations ); // ensure we don't get empty genres/albums/etc due to tag changes - qb.addFilter( QueryBuilder::tabSong, TQString::null ); + qb.addFilter( QueryBuilder::tabSong, TQString() ); values = qb.run(); @@ -3985,7 +3985,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ ) //Dividers for "The Who" should be created as "W", not "T", because //that's how we sort it TQString actualStr = *it; - if ( m_cat1 == IdArtist && actualStr.startsWith( "the ", false ) ) + if ( m_cat1 == IdArtist && actualStr.tqstartsWith( "the ", false ) ) manipulateThe( actualStr, true ); TQString headerStr = DividerItem::createGroup( actualStr, m_cat1); @@ -4020,7 +4020,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ ) qb.clear(); if ( translateTimeFilter( timeFilter() ) > 0 ) qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, - TQString().setNum( TQDateTime::currentDateTime().toTime_t() - + TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); qb.addReturnValue( q_cat1, QueryBuilder::valName, true ); @@ -4061,7 +4061,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ ) continue; couldOpen.push_back( top ); } - //Expand suggested items and expand or enqueue their children until we run out of + //Expand suggested items and expand or enqueue their tqchildren until we run out of //rows or have expanded everything for ( TQValueList<TQListViewItem*>::iterator it = couldOpen.begin(); it != couldOpen.end() && totalCount < maxRows; ++it ) { @@ -4080,7 +4080,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ ) } else { - //Prioritize expanding its children - add it immediately next + //Prioritize expanding its tqchildren - add it immediately next TQValueList<TQListViewItem*>::iterator next = it; ++next; couldOpen.insert( next, j ); @@ -4131,9 +4131,9 @@ CollectionView::removeDuplicatedHeaders() { if ( empty ) { - if ( !current->text(0).at(0).isLetterOrNumber() - || ( last->text(0).at(0).isLetterOrNumber() - && current->text(0).at(0).unicode() > last->text(0).at(0).unicode() ) ) + if ( !current->text(0).tqat(0).isLetterOrNumber() + || ( last->text(0).tqat(0).isLetterOrNumber() + && current->text(0).tqat(0).tqunicode() > last->text(0).tqat(0).tqunicode() ) ) toDelete += current; else { @@ -4174,7 +4174,7 @@ CollectionView::renderIpodModeView( bool /*=false*/ ) QueryBuilder qb; if ( translateTimeFilter( timeFilter() ) > 0 ) - qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); + qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater ); int catArr[3] = {m_cat1, m_cat2, m_cat3}; // stillFiltering is true when we're not viewing tracks @@ -4300,7 +4300,7 @@ CollectionView::renderIpodModeView( bool /*=false*/ ) //because that's how we sort it TQString actualStr = item->text( 0 ); if ( m_cat == IdArtist && - actualStr.startsWith( "the ", false ) ) + actualStr.tqstartsWith( "the ", false ) ) manipulateThe( actualStr, true ); TQString headerStr = DividerItem::createGroup( actualStr, m_cat ); @@ -4366,7 +4366,7 @@ CollectionItem::paintCell ( TQPainter * painter, const TQColorGroup & cg, TQPixmap buf( width, height() ); TQPainter p( &buf, true ); - const TQColorGroup _cg = listView()->palette().active(); + const TQColorGroup _cg = listView()->tqpalette().active(); TQColor bg = isSelected() ? _cg.highlight() : isAlternate() ? listView()->alternateBackground() @@ -4378,7 +4378,7 @@ CollectionItem::paintCell ( TQPainter * painter, const TQColorGroup & cg, Copyright (C) 2000 Reginald Stadlbauer <reggie@kde.org> Copyright (C) 2000,2003 Charles Samuels <charles@kde.org> Copyright (C) 2000 Peter Putzer */ - if ( bg == Qt::black ) + if ( bg == TQt::black ) bg = TQColor(55, 55, 55); // dark gray else { @@ -4491,8 +4491,8 @@ CollectionItem::compare( TQListViewItem* i, int col, bool ascending ) const switch( m_cat ) { case IdVisYearAlbum: - a = a.left( a.find( i18n(" - ") ) ); - b = b.left( b.find( i18n(" - ") ) ); + a = a.left( a.tqfind( i18n(" - ") ) ); + b = b.left( b.tqfind( i18n(" - ") ) ); // "?" are the last ones if ( a == "?" ) return 1; @@ -4510,9 +4510,9 @@ CollectionItem::compare( TQListViewItem* i, int col, bool ascending ) const return -1; //For artists, we sort by ignoring "The" eg "The Who" sorts as if it were "Who" case IdArtist: - if ( a.startsWith( "the ", false ) ) + if ( a.tqstartsWith( "the ", false ) ) CollectionView::manipulateThe( a, true ); - if ( b.startsWith( "the ", false ) ) + if ( b.tqstartsWith( "the ", false ) ) CollectionView::manipulateThe( b, true ); break; } @@ -4538,8 +4538,8 @@ CollectionItem::sortChildItems ( int column, bool ascending ) { // // DividerItem -DividerItem::DividerItem( TQListView* parent, TQString txt, int cat/*, bool sortYearsInverted*/) -: KListViewItem( parent), m_blockText(false), m_text(txt), m_cat(cat)/*, m_sortYearsInverted(sortYearsInverted)*/ +DividerItem::DividerItem( TQListView* tqparent, TQString txt, int cat/*, bool sortYearsInverted*/) +: KListViewItem( tqparent), m_blockText(false), m_text(txt), m_cat(cat)/*, m_sortYearsInverted(sortYearsInverted)*/ { setExpandable(false); setDropEnabled(false); @@ -4572,7 +4572,7 @@ DividerItem::paintCell ( TQPainter * p, const TQColorGroup & cg, } //draw the baseline - p->setPen( TQPen(Qt::gray, 2) ); + p->setPen( TQPen(TQt::gray, 2) ); p->drawLine(0, height() -2 , width, height() -2 ); p->restore(); @@ -4586,7 +4586,7 @@ DividerItem::paintFocus ( TQPainter* /*p*/, const TQColorGroup& /*cg*/, const TQ //to draw the text on my own I have to be able to block the text, otherwise I could // not use TQListViewItem::paintCell() to draw the basic cell -QString +TQString DividerItem::text(int column) const { if (column == 0) { @@ -4622,13 +4622,13 @@ DividerItem::compare( TQListViewItem* i, int col, bool ascending ) const return TQString::localeAwareCompare( text(col).lower(), i->text(col).lower() ); } -QString +TQString DividerItem::createGroup(const TQString& src, int cat) { TQString ret; switch (cat) { case IdVisYearAlbum: { - ret = src.left( src.find(" - ") ); + ret = src.left( src.tqfind(" - ") ); break; } case IdYear: { @@ -4675,8 +4675,8 @@ DividerItem::shareTheSameGroup(const TQString& itemStr, const TQString& divStr, switch (cat) { case IdVisYearAlbum: { - TQString sa = itemStr.left( itemStr.find( i18n(" - ") ) ); - TQString sb = divStr.left( divStr.find( i18n(" - ") ) ); + TQString sa = itemStr.left( itemStr.tqfind( i18n(" - ") ) ); + TQString sb = divStr.left( divStr.tqfind( i18n(" - ") ) ); if (sa == sb) { inGroup = true; } @@ -4698,7 +4698,7 @@ DividerItem::shareTheSameGroup(const TQString& itemStr, const TQString& divStr, } case IdArtist: //"The Who" should count as being in "W" and not "T" - if ( tmp.startsWith( "the ", false ) ) + if ( tmp.tqstartsWith( "the ", false ) ) CollectionView::manipulateThe( tmp, true ); //Fall through default: @@ -4706,7 +4706,7 @@ DividerItem::shareTheSameGroup(const TQString& itemStr, const TQString& divStr, if (divStr == "0-9" && TQChar(tmp.at(0)).isDigit()) { inGroup = true; } - else if (tmp.startsWith(divStr, 0)) { + else if (tmp.tqstartsWith(divStr, 0)) { inGroup = true; } } diff --git a/amarok/src/collectionbrowser.h b/amarok/src/collectionbrowser.h index f4325ba5..dd09facc 100644 --- a/amarok/src/collectionbrowser.h +++ b/amarok/src/collectionbrowser.h @@ -56,9 +56,10 @@ namespace CollectionBrowserIds }; } -class CollectionBrowser: public QVBox +class CollectionBrowser: public TQVBox { Q_OBJECT + TQ_OBJECT friend class CollectionView; public: @@ -79,7 +80,7 @@ class CollectionBrowser: public QVBox void slotEditFilter(); private: - void layoutToolbar(); + void tqlayoutToolbar(); void ipodToolbar( bool activate ); void appendSearchResults(); @@ -123,7 +124,7 @@ public: static bool shareTheSameGroup(const TQString& a, const TQString& b, int cat); public: - DividerItem( TQListView* parent, TQString txt, int cat); + DividerItem( TQListView* tqparent, TQString txt, int cat); virtual void paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); virtual void paintFocus ( TQPainter * p, const TQColorGroup & cg, const TQRect & r ); @@ -145,13 +146,13 @@ private: class CollectionItem : public KListViewItem { public: - CollectionItem( TQListView* parent, int cat = 0, bool unknown = false, bool sampler=false ) - : KListViewItem( parent ) + CollectionItem( TQListView* tqparent, int cat = 0, bool unknown = false, bool sampler=false ) + : KListViewItem( tqparent ) , m_cat( cat ) , m_isUnknown( unknown ) , m_isSampler( sampler ) {}; - CollectionItem( TQListViewItem* parent, int cat = 0, bool unknown = false, bool sampler=false ) - : KListViewItem( parent ) + CollectionItem( TQListViewItem* tqparent, int cat = 0, bool unknown = false, bool sampler=false ) + : KListViewItem( tqparent ) , m_cat( cat ) , m_isUnknown( unknown ) , m_isSampler( sampler ) {}; @@ -160,7 +161,7 @@ class CollectionItem : public KListViewItem { virtual void sortChildItems ( int column, bool ascending ); //reimplemented - inline TQString getSQLText( int column ) + inline TQString getSTQLText( int column ) { return ( !column && m_isUnknown ) ? "" : text( column ); } @@ -191,6 +192,7 @@ class CollectionItem : public KListViewItem { class CollectionView : public KListView, public DropProxyTarget { Q_OBJECT + TQ_OBJECT friend class CollectionBrowser; public: @@ -199,7 +201,7 @@ class CollectionView : public KListView, public DropProxyTarget friend class CollectionItem; // for access to m_cat2 friend class ContextBrowser; // for setupDirs() - CollectionView( CollectionBrowser* parent ); + CollectionView( CollectionBrowser* tqparent ); ~CollectionView(); LIBAMAROK_EXPORT static CollectionView* instance() { return m_instance; } @@ -313,8 +315,8 @@ class CollectionView : public KListView, public DropProxyTarget void cacheView(); void restoreView(); - //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. + //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. TQStringList makeStructuredNameList( TQListViewItem* ) const; TQListViewItem* findFromStructuredNameList( const TQStringList& ) const; @@ -341,7 +343,7 @@ class CollectionView : public KListView, public DropProxyTarget //attributes: LIBAMAROK_EXPORT static CollectionView* m_instance; - CollectionBrowser* m_parent; + CollectionBrowser* m_tqparent; TQString m_filter; uint m_timeFilter; @@ -379,11 +381,12 @@ class CollectionView : public KListView, public DropProxyTarget class OrganizeCollectionDialogBase : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - OrganizeCollectionDialogBase( TQWidget *parent=0, const char *name=0, bool modal=true, - const TQString &caption=TQString::null, + OrganizeCollectionDialogBase( TQWidget *tqparent=0, const char *name=0, bool modal=true, + const TQString &caption=TQString(), int buttonMask=Ok|Apply|Cancel ) - : KDialogBase( parent, name, modal, caption, buttonMask ) + : KDialogBase( tqparent, name, modal, caption, buttonMask ) { } diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp index 1db531e7..5d1f6b8d 100644 --- a/amarok/src/collectiondb.cpp +++ b/amarok/src/collectiondb.cpp @@ -90,7 +90,7 @@ #include "inotify/inotify-syscalls.h" #endif -using Amarok::QStringx; +using Amarok::TQStringx; #define DEBUG 0 @@ -100,9 +100,9 @@ using Amarok::QStringx; INotify* INotify::s_instance = 0; -INotify::INotify( CollectionDB *parent, int fd ) - : DependentJob( parent, "INotify" ) - , m_parent( parent ) +INotify::INotify( CollectionDB *tqparent, int fd ) + : DependentJob( tqparent, "INotify" ) + , m_tqparent( tqparent ) , m_fd( fd ) { s_instance = this; @@ -144,8 +144,8 @@ INotify::doJob() if ( !deviceIds.isEmpty() ) deviceIds += ','; deviceIds += TQString::number(*it); } - const TQStringList values = m_parent->query( TQString( "SELECT dir, deviceid FROM directories WHERE deviceid IN (%1);" ) - .arg( deviceIds ) ); + const TQStringList values = m_tqparent->query( TQString( "SELECT dir, deviceid FROM directories WHERE deviceid IN (%1);" ) + .tqarg( deviceIds ) ); foreach( values ) { TQString rpath = *it; @@ -185,7 +185,7 @@ INotify::doJob() i += EVENT_SIZE + event->len; } - TQTimer::singleShot( 0, m_parent, TQT_SLOT( scanMonitor() ) ); + TQTimer::singleShot( 0, m_tqparent, TQT_SLOT( scanMonitor() ) ); } } } @@ -203,7 +203,7 @@ INotify::doJob() TQMutex* CollectionDB::connectionMutex = new TQMutex(); TQMutex* CollectionDB::itemCoverMapMutex = new TQMutex(); //we don't have to worry about this map leaking memory since ThreadManager limits the total -//number of QThreads ever created +//number of TQThreads ever created TQMap<TQThread *, DbConnection *> *CollectionDB::threadConnections = new TQMap<TQThread *, DbConnection *>(); TQMap<TQListViewItem*, CoverFetcher*> *CollectionDB::itemCoverMap = new TQMap<TQListViewItem*, CoverFetcher*>(); @@ -258,7 +258,7 @@ CollectionDB::CollectionDB() connect( this, TQT_SIGNAL(uniqueIdChanged(const TQString&, const TQString&, const TQString&)), this, TQT_SLOT(aftMigratePermanentTablesUniqueId(const TQString&, const TQString&, const TQString&)) ); - connect( qApp, TQT_SIGNAL( aboutToQuit() ), this, TQT_SLOT( disableAutoScoring() ) ); + connect( tqApp, TQT_SIGNAL( aboutToQuit() ), this, TQT_SLOT( disableAutoScoring() ) ); connect( this, TQT_SIGNAL( coverRemoved( const TQString&, const TQString& ) ), TQT_SIGNAL( coverChanged( const TQString&, const TQString& ) ) ); @@ -286,7 +286,7 @@ CollectionDB::~CollectionDB() } -inline QString +inline TQString CollectionDB::exactCondition( const TQString &right ) { if ( DbConnection::mysql == instance()->getDbConnectionType() ) @@ -296,11 +296,11 @@ CollectionDB::exactCondition( const TQString &right ) } -QString +TQString CollectionDB::likeCondition( const TQString &right, bool anyBegin, bool anyEnd ) { TQString escaped = right; - escaped.replace( '/', "//" ).replace( '%', "/%" ).replace( '_', "/_" ); + escaped.tqreplace( '/', "//" ).tqreplace( '%', "/%" ).tqreplace( '_', "/_" ); escaped = instance()->escapeString( escaped ); TQString ret; @@ -343,7 +343,7 @@ CollectionDB::initDirOperations() if ( inotify_fd < 0 ) #endif { -// debug() << "INotify not available, using QTimer!" << endl; +// debug() << "INotify not available, using TQTimer!" << endl; startTimer( MONITOR_INTERVAL * 1000 ); } #ifdef HAVE_INOTIFY @@ -362,7 +362,7 @@ CollectionDB::initDirOperations() * @param statement SQL program to execute. Only one SQL statement is allowed. * @return The queried data, or TQStringList() on error. */ -QStringList +TQStringList CollectionDB::query( const TQString& statement, bool suppressDebug ) { m_mutex.lock(); @@ -424,7 +424,7 @@ CollectionDB::insert( const TQString& statement, const TQString& table ) return id; } -QString +TQString CollectionDB::deviceidSelection( const bool showAll ) { if ( !showAll ) @@ -441,7 +441,7 @@ CollectionDB::deviceidSelection( const bool showAll ) else return ""; } -QStringList +TQStringList CollectionDB::URLsFromQuery( const TQStringList &result ) const { TQStringList values; @@ -505,11 +505,11 @@ CollectionDB::isValid( ) } -QString +TQString CollectionDB::adminValue( TQString noption ) { TQStringList values; values = query ( - TQString( "SELECT value FROM admin WHERE noption = '%1';").arg(noption) + TQString( "SELECT value FROM admin WHERE noption = '%1';").tqarg(noption) ); return values.isEmpty() ? "" : values.first(); } @@ -518,14 +518,14 @@ CollectionDB::adminValue( TQString noption ) { void CollectionDB::setAdminValue( TQString noption, TQString value ) { - TQStringList values = query( TQString( "SELECT value FROM admin WHERE noption = '%1';").arg( noption )); + TQStringList values = query( TQString( "SELECT value FROM admin WHERE noption = '%1';").tqarg( noption )); if(values.count() > 0) { - query( TQString( "UPDATE admin SET value = '%1' WHERE noption = '%2';" ).arg( value, noption ) ); + query( TQString( "UPDATE admin SET value = '%1' WHERE noption = '%2';" ).tqarg( value, noption ) ); } else { - insert( TQString( "INSERT INTO admin (value, noption) values ( '%1', '%2' );" ).arg( value, noption ), + insert( TQString( "INSERT INTO admin (value, noption) values ( '%1', '%2' );" ).tqarg( value, noption ), NULL ); } } @@ -560,8 +560,8 @@ CollectionDB::createTables( const bool temporary ) "sampler BOOL," "bpm FLOAT," "deviceid INTEGER);" ) - .arg( temporary ? "TEMPORARY" : "" ) - .arg( temporary ? "_temp" : "" ) ); + .tqarg( temporary ? "TEMPORARY" : "" ) + .tqarg( temporary ? "_temp" : "" ) ); TQString albumAutoIncrement = ""; TQString artistAutoIncrement = ""; @@ -598,41 +598,41 @@ CollectionDB::createTables( const bool temporary ) query( TQString( "CREATE %1 TABLE album%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .arg( temporary ? "TEMPORARY" : "" ) - .arg( temporary ? "_temp" : "" ) - .arg( albumAutoIncrement ) ); + .tqarg( temporary ? "TEMPORARY" : "" ) + .tqarg( temporary ? "_temp" : "" ) + .tqarg( albumAutoIncrement ) ); //create artist table query( TQString( "CREATE %1 TABLE artist%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .arg( temporary ? "TEMPORARY" : "" ) - .arg( temporary ? "_temp" : "" ) - .arg( artistAutoIncrement ) ); + .tqarg( temporary ? "TEMPORARY" : "" ) + .tqarg( temporary ? "_temp" : "" ) + .tqarg( artistAutoIncrement ) ); //create composer table query( TQString( "CREATE %1 TABLE composer%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .arg( temporary ? "TEMPORARY" : "" ) - .arg( temporary ? "_temp" : "" ) - .arg( composerAutoIncrement ) ); + .tqarg( temporary ? "TEMPORARY" : "" ) + .tqarg( temporary ? "_temp" : "" ) + .tqarg( composerAutoIncrement ) ); //create genre table query( TQString( "CREATE %1 TABLE genre%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() +");" ) - .arg( temporary ? "TEMPORARY" : "" ) - .arg( temporary ? "_temp" : "" ) - .arg( genreAutoIncrement ) ); + .tqarg( temporary ? "TEMPORARY" : "" ) + .tqarg( temporary ? "_temp" : "" ) + .tqarg( genreAutoIncrement ) ); //create year table query( TQString( "CREATE %1 TABLE year%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .arg( temporary ? "TEMPORARY" : "" ) - .arg( temporary ? "_temp" : "" ) - .arg( yearAutoIncrement ) ); + .tqarg( temporary ? "TEMPORARY" : "" ) + .tqarg( temporary ? "_temp" : "" ) + .tqarg( yearAutoIncrement ) ); //create images table query( TQString( "CREATE %1 TABLE images%2 (" @@ -640,8 +640,8 @@ CollectionDB::createTables( const bool temporary ) "deviceid INTEGER," "artist " + textColumnType() + "," "album " + textColumnType() + ");" ) - .arg( temporary ? "TEMPORARY" : "" ) - .arg( temporary ? "_temp" : "" ) ); + .tqarg( temporary ? "TEMPORARY" : "" ) + .tqarg( temporary ? "_temp" : "" ) ); //create embed table query( TQString( "CREATE %1 TABLE embed%2 (" @@ -649,37 +649,37 @@ CollectionDB::createTables( const bool temporary ) "deviceid INTEGER," "hash " + exactTextColumnType() + "," "description " + textColumnType() + ");" ) - .arg( temporary ? "TEMPORARY" : "" ) - .arg( temporary ? "_temp" : "" ) ); + .tqarg( temporary ? "TEMPORARY" : "" ) + .tqarg( temporary ? "_temp" : "" ) ); // create directory statistics table query( TQString( "CREATE %1 TABLE directories%2 (" "dir " + exactTextColumnType() + "," "deviceid INTEGER," "changedate INTEGER);" ) - .arg( temporary ? "TEMPORARY" : "" ) - .arg( temporary ? "_temp" : "" ) ); + .tqarg( temporary ? "TEMPORARY" : "" ) + .tqarg( temporary ? "_temp" : "" ) ); //create uniqueid table query( TQString( "CREATE %1 TABLE uniqueid%2 (" "url " + exactTextColumnType() + "," "deviceid INTEGER," - "uniqueid " + exactTextColumnType(32) + " UNIQUE," + "uniqueid " + exactTextColumnType(32) + " UNITQUE," "dir " + exactTextColumnType() + ");" ) - .arg( temporary ? "TEMPORARY" : "" ) - .arg( temporary ? "_temp" : "" ) ); + .tqarg( temporary ? "TEMPORARY" : "" ) + .tqarg( temporary ? "_temp" : "" ) ); //create indexes query( TQString( "CREATE INDEX album_idx%1 ON album%2( name );" ) - .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); + .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); query( TQString( "CREATE INDEX artist_idx%1 ON artist%2( name );" ) - .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); + .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); query( TQString( "CREATE INDEX composer_idx%1 ON composer%2( name );" ) - .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); + .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); query( TQString( "CREATE INDEX genre_idx%1 ON genre%2( name );" ) - .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); + .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); query( TQString( "CREATE INDEX year_idx%1 ON year%2( name );" ) - .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); + .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); if ( !temporary ) { @@ -698,9 +698,9 @@ CollectionDB::createTables( const bool temporary ) } else { - query( "CREATE UNIQUE INDEX url_tagtemp ON tags_temp( url, deviceid );" ); - query( "CREATE UNIQUE INDEX embed_urltemp ON embed_temp( url, deviceid );" ); - query( "CREATE UNIQUE INDEX dir_temp_dir ON directories_temp( dir, deviceid );" ); + query( "CREATE UNITQUE INDEX url_tagtemp ON tags_temp( url, deviceid );" ); + query( "CREATE UNITQUE INDEX embed_urltemp ON embed_temp( url, deviceid );" ); + query( "CREATE UNITQUE INDEX dir_temp_dir ON directories_temp( dir, deviceid );" ); query( "CREATE INDEX album_tagtemp ON tags_temp( album );" ); query( "CREATE INDEX artist_tagtemp ON tags_temp( artist );" ); query( "CREATE INDEX sampler_tagtemp ON tags_temp( sampler );" ); @@ -716,7 +716,7 @@ CollectionDB::createIndices() //tables which are not created in that function. debug() << "Creating indices, ignore errors about already existing indices" << endl; - query( "CREATE UNIQUE INDEX url_tag ON tags( url, deviceid );" ); + query( "CREATE UNITQUE INDEX url_tag ON tags( url, deviceid );" ); query( "CREATE INDEX album_tag ON tags( album );" ); query( "CREATE INDEX artist_tag ON tags( artist );" ); query( "CREATE INDEX composer_tag ON tags( composer );" ); @@ -729,10 +729,10 @@ CollectionDB::createIndices() query( "CREATE INDEX images_url ON images( path, deviceid );" ); - query( "CREATE UNIQUE INDEX embed_url ON embed( url, deviceid );" ); + query( "CREATE UNITQUE INDEX embed_url ON embed( url, deviceid );" ); query( "CREATE INDEX embed_hash ON embed( hash );" ); - query( "CREATE UNIQUE INDEX directories_dir ON directories( dir, deviceid );" ); + query( "CREATE UNITQUE INDEX directories_dir ON directories( dir, deviceid );" ); query( "CREATE INDEX uniqueid_uniqueid ON uniqueid( uniqueid );"); query( "CREATE INDEX uniqueid_url ON uniqueid( url, deviceid );"); @@ -764,16 +764,16 @@ CollectionDB::createPermanentIndices() //already exist, but these can be ignored debug() << "Creating permanent indices, ignore errors about already existing indices" << endl; - query( "CREATE UNIQUE INDEX lyrics_url ON lyrics( url, deviceid );" ); + query( "CREATE UNITQUE INDEX lyrics_url ON lyrics( url, deviceid );" ); query( "CREATE INDEX lyrics_uniqueid ON lyrics( uniqueid );" ); query( "CREATE INDEX playlist_playlists ON playlists( playlist );" ); query( "CREATE INDEX url_playlists ON playlists( url );" ); - query( "CREATE UNIQUE INDEX labels_name ON labels( name, type );" ); - query( "CREATE INDEX tags_labels_uniqueid ON tags_labels( uniqueid );" ); //m:n relationship, DO NOT MAKE UNIQUE! - query( "CREATE INDEX tags_labels_url ON tags_labels( url, deviceid );" ); //m:n relationship, DO NOT MAKE UNIQUE! - query( "CREATE INDEX tags_labels_labelid ON tags_labels( labelid );" ); //m:n relationship, DO NOT MAKE UNIQUE! + query( "CREATE UNITQUE INDEX labels_name ON labels( name, type );" ); + query( "CREATE INDEX tags_labels_uniqueid ON tags_labels( uniqueid );" ); //m:n relationship, DO NOT MAKE UNITQUE! + query( "CREATE INDEX tags_labels_url ON tags_labels( url, deviceid );" ); //m:n relationship, DO NOT MAKE UNITQUE! + query( "CREATE INDEX tags_labels_labelid ON tags_labels( labelid );" ); //m:n relationship, DO NOT MAKE UNITQUE! - query( "CREATE UNIQUE INDEX url_stats ON statistics( deviceid, url );" ); + query( "CREATE UNITQUE INDEX url_stats ON statistics( deviceid, url );" ); query( "CREATE INDEX percentage_stats ON statistics( percentage );" ); query( "CREATE INDEX rating_stats ON statistics( rating );" ); query( "CREATE INDEX playcounter_stats ON statistics( playcounter );" ); @@ -791,16 +791,16 @@ CollectionDB::createPermanentIndices() void CollectionDB::dropTables( const bool temporary ) { - query( TQString( "DROP TABLE tags%1;" ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE album%1;" ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE artist%1;" ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE composer%1;" ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE genre%1;" ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE year%1;" ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE images%1;" ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE embed%1;" ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE directories%1;" ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE uniqueid%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE tags%1;" ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE album%1;" ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE artist%1;" ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE composer%1;" ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE genre%1;" ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE year%1;" ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE images%1;" ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE embed%1;" ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE directories%1;" ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE uniqueid%1;" ).tqarg( temporary ? "_temp" : "" ) ); if ( !temporary ) { query( TQString( "DROP TABLE related_artists;" ) ); @@ -830,21 +830,21 @@ CollectionDB::clearTables( const bool temporary ) clearCommand = "TRUNCATE TABLE"; } - query( TQString( "%1 tags%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 album%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 artist%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 composer%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 genre%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 year%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 images%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 embed%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 directories%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 uniqueid%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 tags%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 album%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 artist%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 composer%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 genre%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 year%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 images%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 embed%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 directories%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 uniqueid%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); if ( !temporary ) { - query( TQString( "%1 related_artists;" ).arg( clearCommand ) ); + query( TQString( "%1 related_artists;" ).tqarg( clearCommand ) ); //debug() << "Clearing media table" << endl; - //query( TQString( "%1 media;" ).arg( clearCommand ) ); + //query( TQString( "%1 media;" ).tqarg( clearCommand ) ); } } @@ -866,7 +866,7 @@ CollectionDB::copyTempTables( ) albumIds += ','; albumIds += *it; } - insert( TQString ( "INSERT INTO album SELECT * FROM album_temp WHERE album_temp.id NOT IN ( %1 );" ).arg( albumIds ), NULL ); + insert( TQString ( "INSERT INTO album SELECT * FROM album_temp WHERE album_temp.id NOT IN ( %1 );" ).tqarg( albumIds ), NULL ); TQStringList artistIdList = query( "SELECT artist.id FROM artist;" ); TQString artistIds = "-1"; @@ -875,7 +875,7 @@ CollectionDB::copyTempTables( ) artistIds += ','; artistIds += *it; } - insert( TQString ( "INSERT INTO artist SELECT * FROM artist_temp WHERE artist_temp.id NOT IN ( %1 );" ).arg( artistIds ), NULL ); + insert( TQString ( "INSERT INTO artist SELECT * FROM artist_temp WHERE artist_temp.id NOT IN ( %1 );" ).tqarg( artistIds ), NULL ); TQStringList composerIdList = query( "SELECT composer.id FROM composer;" ); TQString composerIds = "-1"; @@ -884,7 +884,7 @@ CollectionDB::copyTempTables( ) composerIds += ','; composerIds += *it; } - insert( TQString ( "INSERT INTO composer SELECT * FROM composer_temp WHERE composer_temp.id NOT IN ( %1 );" ).arg( composerIds ), NULL ); + insert( TQString ( "INSERT INTO composer SELECT * FROM composer_temp WHERE composer_temp.id NOT IN ( %1 );" ).tqarg( composerIds ), NULL ); TQStringList genreIdList = query( "SELECT genre.id FROM genre;" ); TQString genreIds = "-1"; @@ -893,7 +893,7 @@ CollectionDB::copyTempTables( ) genreIds += ','; genreIds += *it; } - insert( TQString ( "INSERT INTO genre SELECT * FROM genre_temp WHERE genre_temp.id NOT IN ( %1 );" ).arg( genreIds ), NULL ); + insert( TQString ( "INSERT INTO genre SELECT * FROM genre_temp WHERE genre_temp.id NOT IN ( %1 );" ).tqarg( genreIds ), NULL ); TQStringList yearIdList = query( "SELECT year.id FROM year;" ); TQString yearIds = "-1"; @@ -902,7 +902,7 @@ CollectionDB::copyTempTables( ) yearIds += ','; yearIds += *it; } - insert( TQString ( "INSERT INTO year SELECT * FROM year_temp WHERE year_temp.id NOT IN ( %1 );" ).arg( yearIds ), NULL ); + insert( TQString ( "INSERT INTO year SELECT * FROM year_temp WHERE year_temp.id NOT IN ( %1 );" ).tqarg( yearIds ), NULL ); insert( "INSERT INTO images SELECT * FROM images_temp;", NULL ); insert( "INSERT INTO embed SELECT * FROM embed_temp;", NULL ); @@ -943,7 +943,7 @@ CollectionDB::createDevicesTable() "uuid " + textColumnType() + "," "servername " + textColumnType() + "," "sharename " + textColumnType() + ");" ) - .arg( deviceAutoIncrement ) ); + .tqarg( deviceAutoIncrement ) ); query( "CREATE INDEX devices_type ON devices( type );" ); query( "CREATE INDEX devices_uuid ON devices( uuid );" ); query( "CREATE INDEX devices_rshare ON devices( servername, sharename );" ); @@ -961,7 +961,7 @@ CollectionDB::createStatsTable() "percentage FLOAT," "rating INTEGER DEFAULT 0," "playcounter INTEGER," - "uniqueid " + exactTextColumnType(32) + " UNIQUE," + "uniqueid " + exactTextColumnType(32) + " UNITQUE," "deleted BOOL DEFAULT " + boolF() + "," "PRIMARY KEY(url, deviceid) );" ) ); @@ -973,13 +973,13 @@ CollectionDB::createStatsTableV8() { // create music statistics database - old form, for upgrade code. query( TQString( "CREATE TABLE statistics (" - "url " + textColumnType() + " UNIQUE," + "url " + textColumnType() + " UNITQUE," "createdate INTEGER," "accessdate INTEGER," "percentage FLOAT," "rating INTEGER DEFAULT 0," "playcounter INTEGER," - "uniqueid " + textColumnType(8) + " UNIQUE," + "uniqueid " + textColumnType(8) + " UNITQUE," "deleted BOOL DEFAULT " + boolF() + ");" ) ); query( "CREATE INDEX url_stats ON statistics( url );" ); @@ -1002,15 +1002,15 @@ CollectionDB::createStatsTableV10( bool temp ) "percentage FLOAT," "rating INTEGER DEFAULT 0," "playcounter INTEGER," - "uniqueid " + exactTextColumnType(32) + " UNIQUE," + "uniqueid " + exactTextColumnType(32) + " UNITQUE," "deleted BOOL DEFAULT " + boolF() + "," "PRIMARY KEY(url, deviceid) );" - ).arg( temp ? "TEMPORARY" : "" ) - .arg( temp ? "_fix_ten" : "" ) ); + ).tqarg( temp ? "TEMPORARY" : "" ) + .tqarg( temp ? "_fix_ten" : "" ) ); if ( !temp ) { - query( "CREATE UNIQUE INDEX url_stats ON statistics( deviceid, url );" ); + query( "CREATE UNITQUE INDEX url_stats ON statistics( deviceid, url );" ); query( "CREATE INDEX percentage_stats ON statistics( percentage );" ); query( "CREATE INDEX rating_stats ON statistics( rating );" ); query( "CREATE INDEX playcounter_stats ON statistics( playcounter );" ); @@ -1074,7 +1074,7 @@ CollectionDB::createPersistentTables() query( TQString( "CREATE TABLE tags_labels (" "deviceid INTEGER," "url " + exactTextColumnType() + ", " - "uniqueid " + exactTextColumnType(32) + ", " //m:n relationship, DO NOT MAKE UNIQUE! + "uniqueid " + exactTextColumnType(32) + ", " //m:n relationship, DO NOT MAKE UNITQUE! "labelid INTEGER REFERENCES labels( id ) ON DELETE CASCADE );" ) ); } @@ -1120,22 +1120,22 @@ CollectionDB::createPersistentTablesV14( bool temp ) "asin " + textColumnType(20) + ", " "locale " + textColumnType(2) + ", " "filename " + exactTextColumnType(33) + ", " - "refetchdate INTEGER );" ).arg( a,b ) ); + "refetchdate INTEGER );" ).tqarg( a,b ) ); // create lyrics table query( TQString( "CREATE %1 TABLE lyrics%2 (" "url " + exactTextColumnType() + ", " "deviceid INTEGER," - "lyrics " + longTextColumnType() + ");" ).arg( a,b ) ); + "lyrics " + longTextColumnType() + ");" ).tqarg( a,b ) ); query( TQString( "CREATE %1 TABLE playlists%2 (" "playlist " + textColumnType() + ", " "url " + exactTextColumnType() + ", " - "tracknum INTEGER );" ).arg( a,b ) ); + "tracknum INTEGER );" ).tqarg( a,b ) ); if ( !temp ) { - query( "CREATE UNIQUE INDEX lyrics_url ON lyrics( url, deviceid );" ); + query( "CREATE UNITQUE INDEX lyrics_url ON lyrics( url, deviceid );" ); query( "CREATE INDEX playlist_playlists ON playlists( playlist );" ); query( "CREATE INDEX url_playlists ON playlists( url );" ); } @@ -1163,13 +1163,13 @@ CollectionDB::createPodcastTables() // create podcast channels table query( TQString( "CREATE TABLE podcastchannels (" - "url " + exactTextColumnType() + " UNIQUE," + "url " + exactTextColumnType() + " UNITQUE," "title " + textColumnType() + "," "weblink " + exactTextColumnType() + "," "image " + exactTextColumnType() + "," "comment " + longTextColumnType() + "," "copyright " + textColumnType() + "," - "parent INTEGER," + "tqparent INTEGER," "directory " + textColumnType() + "," "autoscan BOOL, fetchtype INTEGER, " "autotransfer BOOL, haspurge BOOL, purgecount INTEGER );" ) ); @@ -1177,9 +1177,9 @@ CollectionDB::createPodcastTables() // create podcast episodes table query( TQString( "CREATE TABLE podcastepisodes (" "id INTEGER PRIMARY KEY %1, " - "url " + exactTextColumnType() + " UNIQUE," + "url " + exactTextColumnType() + " UNITQUE," "localurl " + exactTextColumnType() + "," - "parent " + exactTextColumnType() + "," + "tqparent " + exactTextColumnType() + "," "guid " + exactTextColumnType() + "," "title " + textColumnType() + "," "subtitle " + textColumnType() + "," @@ -1190,14 +1190,14 @@ CollectionDB::createPodcastTables() "length INTEGER," "size INTEGER," "isNew BOOL );" ) - .arg( podcastAutoIncrement ) ); + .tqarg( podcastAutoIncrement ) ); // create podcast folders table query( TQString( "CREATE TABLE podcastfolders (" "id INTEGER PRIMARY KEY %1, " "name " + textColumnType() + "," - "parent INTEGER, isOpen BOOL );" ) - .arg( podcastFolderAutoInc ) ); + "tqparent INTEGER, isOpen BOOL );" ) + .tqarg( podcastFolderAutoInc ) ); query( "CREATE INDEX url_podchannel ON podcastchannels( url );" ); query( "CREATE INDEX url_podepisode ON podcastepisodes( url );" ); @@ -1230,23 +1230,23 @@ CollectionDB::createPodcastTablesV2( bool temp ) // create podcast channels table query( TQString( "CREATE %1 TABLE podcastchannels%2 (" - "url " + exactTextColumnType() + " UNIQUE," + "url " + exactTextColumnType() + " UNITQUE," "title " + textColumnType() + "," "weblink " + exactTextColumnType() + "," "image " + exactTextColumnType() + "," "comment " + longTextColumnType() + "," "copyright " + textColumnType() + "," - "parent INTEGER," + "tqparent INTEGER," "directory " + textColumnType() + "," "autoscan BOOL, fetchtype INTEGER, " - "autotransfer BOOL, haspurge BOOL, purgecount INTEGER );" ).arg( a,b ) ); + "autotransfer BOOL, haspurge BOOL, purgecount INTEGER );" ).tqarg( a,b ) ); // create podcast episodes table query( TQString( "CREATE %2 TABLE podcastepisodes%3 (" "id INTEGER PRIMARY KEY %1, " - "url " + exactTextColumnType() + " UNIQUE," + "url " + exactTextColumnType() + " UNITQUE," "localurl " + exactTextColumnType() + "," - "parent " + exactTextColumnType() + "," + "tqparent " + exactTextColumnType() + "," "guid " + exactTextColumnType() + "," "title " + textColumnType() + "," "subtitle " + textColumnType() + "," @@ -1257,14 +1257,14 @@ CollectionDB::createPodcastTablesV2( bool temp ) "length INTEGER," "size INTEGER," "isNew BOOL );" ) - .arg( podcastAutoIncrement, a, b ) ); + .tqarg( podcastAutoIncrement, a, b ) ); // create podcast folders table query( TQString( "CREATE %2 TABLE podcastfolders%3 (" "id INTEGER PRIMARY KEY %1, " "name " + textColumnType() + "," - "parent INTEGER, isOpen BOOL );" ) - .arg( podcastFolderAutoInc, a, b ) ); + "tqparent INTEGER, isOpen BOOL );" ) + .tqarg( podcastFolderAutoInc, a, b ) ); if ( !temp ) { @@ -1339,7 +1339,7 @@ CollectionDB::artistID( TQString value, bool autocreate, const bool temporary, b } -QString +TQString CollectionDB::artistValue( uint id ) { // lookup cache @@ -1378,7 +1378,7 @@ CollectionDB::composerID( TQString value, bool autocreate, const bool temporary, } -QString +TQString CollectionDB::composerValue( uint id ) { // lookup cache @@ -1416,7 +1416,7 @@ CollectionDB::albumID( TQString value, bool autocreate, const bool temporary, bo return id; } -QString +TQString CollectionDB::albumValue( uint id ) { // lookup cache @@ -1440,7 +1440,7 @@ CollectionDB::genreID( TQString value, bool autocreate, const bool temporary, bo IDFromValue( "genre", value, autocreate, temporary ); } -QString +TQString CollectionDB::genreValue( uint id ) { return valueFromID( "genre", id ); @@ -1456,7 +1456,7 @@ CollectionDB::yearID( TQString value, bool autocreate, const bool temporary, boo } -QString +TQString CollectionDB::yearValue( uint id ) { return valueFromID( "year", id ); @@ -1475,16 +1475,16 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const TQStringList values = query( TQString( "SELECT id, name FROM %1 WHERE name %2;" ) - .arg( name ) - .arg( CollectionDB::likeCondition( value ) ) ); + .tqarg( name ) + .tqarg( CollectionDB::likeCondition( value ) ) ); //check if item exists. if not, should we autocreate it? uint id; if ( values.isEmpty() && autocreate ) { id = insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" ) - .arg( name ) - .arg( CollectionDB::instance()->escapeString( value ) ), name ); + .tqarg( name ) + .tqarg( CollectionDB::instance()->escapeString( value ) ), name ); return id; } @@ -1493,28 +1493,28 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const } -QString +TQString CollectionDB::valueFromID( TQString table, uint id ) { TQStringList values = query( TQString( "SELECT name FROM %1 WHERE id=%2;" ) - .arg( table ) - .arg( id ) ); + .tqarg( table ) + .tqarg( id ) ); return values.isEmpty() ? 0 : values.first(); } -QString +TQString CollectionDB::albumSongCount( const TQString &artist_id, const TQString &album_id ) { TQStringList values = query( TQString( "SELECT COUNT( url ) FROM tags WHERE album = %1 AND artist = %2;" ) - .arg( album_id ) - .arg( artist_id ) ); + .tqarg( album_id ) + .tqarg( artist_id ) ); return values.first(); } @@ -1524,13 +1524,13 @@ CollectionDB::albumIsCompilation( const TQString &album_id ) TQStringList values = query( TQString( "SELECT sampler FROM tags WHERE sampler=%1 AND album=%2" ) - .arg( CollectionDB::instance()->boolT() ) - .arg( album_id ) ); + .tqarg( CollectionDB::instance()->boolT() ) + .tqarg( album_id ) ); return (values.count() != 0); } -QStringList +TQStringList CollectionDB::albumTracks( const TQString &artist_id, const TQString &album_id ) { QueryBuilder qb; @@ -1555,16 +1555,16 @@ CollectionDB::albumTracks( const TQString &artist_id, const TQString &album_id ) return ret; } -QStringList +TQStringList CollectionDB::albumDiscTracks( const TQString &artist_id, const TQString &album_id, const TQString &discNumber) { TQStringList rs; rs = query( TQString( "SELECT tags.deviceid, tags.url FROM tags, year WHERE tags.album = %1 AND " "tags.artist = %2 AND year.id = tags.year AND tags.discnumber = %3 " + deviceidSelection() + " ORDER BY tags.track;" ) - .arg( album_id ) - .arg( artist_id ) - .arg( discNumber ) ); + .tqarg( album_id ) + .tqarg( artist_id ) + .tqarg( discNumber ) ); TQStringList result; foreach( rs ) { @@ -1574,13 +1574,13 @@ CollectionDB::albumDiscTracks( const TQString &artist_id, const TQString &album_ return result; } -QStringList +TQStringList CollectionDB::artistTracks( const TQString &artist_id ) { TQStringList rs = query( TQString( "SELECT tags.deviceid, tags.url FROM tags, album " "WHERE tags.artist = '%1' AND album.id = tags.album " + deviceidSelection() + "ORDER BY album.name, tags.discnumber, tags.track;" ) - .arg( artist_id ) ); + .tqarg( artist_id ) ); TQStringList result = TQStringList(); foreach( rs ) { @@ -1592,21 +1592,21 @@ CollectionDB::artistTracks( const TQString &artist_id ) void -CollectionDB::addImageToAlbum( const TQString& image, TQValueList< QPair<TQString, TQString> > info, const bool temporary ) +CollectionDB::addImageToAlbum( const TQString& image, TQValueList< TQPair<TQString, TQString> > info, const bool temporary ) { int deviceid = MountPointManager::instance()->getIdForUrl( image ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, image ); - for ( TQValueList< QPair<TQString, TQString> >::ConstIterator it = info.begin(); it != info.end(); ++it ) + for ( TQValueList< TQPair<TQString, TQString> >::ConstIterator it = info.begin(); it != info.end(); ++it ) { if ( (*it).first.isEmpty() || (*it).second.isEmpty() ) continue; TQString sql = TQString( "INSERT INTO images%1 ( path, deviceid, artist, album ) VALUES ( '%3', %2" ) - .arg( temporary ? "_temp" : "" ) - .arg( deviceid ) - .arg( escapeString( rpath ) ); - sql += TQString( ", '%1'" ).arg( escapeString( (*it).first ) ); - sql += TQString( ", '%1' );" ).arg( escapeString( (*it).second ) ); + .tqarg( temporary ? "_temp" : "" ) + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ); + sql += TQString( ", '%1'" ).tqarg( escapeString( (*it).first ) ); + sql += TQString( ", '%1' );" ).tqarg( escapeString( (*it).second ) ); // debug() << "Added image for album: " << (*it).first << " - " << (*it).second << ": " << image << endl; insert( sql, NULL ); @@ -1622,8 +1622,8 @@ CollectionDB::addEmbeddedImage( const TQString& path, const TQString& hash, cons int deviceid = MountPointManager::instance()->getIdForUrl( path ); TQString rpath = MountPointManager::instance()->getRelativePath(deviceid, path ); insert( TQString( "INSERT INTO embed_temp ( url, deviceid, hash, description ) VALUES ( '%2', %1, '%3', '%4' );" ) - .arg( deviceid ) - .arg( escapeString( rpath ), escapeString( hash ), escapeString( description ) ), NULL ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ), escapeString( hash ), escapeString( description ) ), NULL ); } void @@ -1636,11 +1636,11 @@ CollectionDB::removeOrphanedEmbeddedImages() TQString deviceid = *it; TQString rpath = *(++it); query( TQString( "DELETE FROM embed WHERE embed.deviceid = %1 AND embed.url = '%2';" ) - .arg( deviceid, escapeString( rpath ) ) ); + .tqarg( deviceid, escapeString( rpath ) ) ); } } -QPixmap +TQPixmap CollectionDB::createDragPixmapFromSQL( const TQString &sql, TQString textOverRide ) { // it is too slow to check if the url is actually in the colleciton. @@ -1656,7 +1656,7 @@ CollectionDB::createDragPixmapFromSQL( const TQString &sql, TQString textOverRid return createDragPixmap( list, textOverRide ); } -QPixmap +TQPixmap CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) { // settings @@ -1710,7 +1710,7 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) if( mb.compilation() == MetaBundle::CompilationYes ) artist = TQString( "Various_AMAROK_Artists" ); // magic key for the albumMap! - if( !albumMap.contains( artist + album ) ) + if( !albumMap.tqcontains( artist + album ) ) { albumMap[ artist + album ] = 1; TQString coverName = CollectionDB::instance()->albumImage( mb.artist(), album, false, coverW ); @@ -1722,7 +1722,7 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) else { MetaBundle mb( *it ); - if( !albumMap.contains( mb.artist() + mb.album() ) ) + if( !albumMap.tqcontains( mb.artist() + mb.album() ) ) { albumMap[ mb.artist() + mb.album() ] = 1; TQString coverName = CollectionDB::instance()->podcastImage( mb, false, coverW ); @@ -1752,11 +1752,11 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) { if( correctAlbumCount ) { text = i18n( "X songs from X albums", "%2 from %1" ); - text = text.arg( albums == 1 && !album.isEmpty() ? album : i18n( "one album", "%n albums",albums ) ); + text = text.tqarg( albums == 1 && !album.isEmpty() ? album : i18n( "one album", "%n albums",albums ) ); } else text = "%1"; - text = text.arg( songs == 1 && !song.isEmpty() ? song : i18n( "One song", "%n songs", songs ) ); + text = text.tqarg( songs == 1 && !song.isEmpty() ? song : i18n( "One song", "%n songs", songs ) ); } else if( playlists > 0 ) text = i18n( "One playlist", "%n playlists", playlists ); @@ -1780,7 +1780,7 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) coverPm[i] = coverPm[i-1]; TQImage im( locate( "data","amarok/images/more_albums.png" ) ); - coverPm[0].convertFromImage( im.smoothScale( coverW, coverH, TQImage::ScaleMin ) ); + coverPm[0].convertFromImage( im.smoothScale( coverW, coverH, TQ_ScaleMin ) ); } pixmapH = coverPm[0].height(); @@ -1813,7 +1813,7 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) TQPainter p; p.begin( &pmtext ); - p.fillRect( 0, 0, pixmapW, fontH, TQBrush( Qt::black ) ); // border + p.fillRect( 0, 0, pixmapW, fontH, TQBrush( TQt::black ) ); // border p.fillRect( 1, 1, pixmapW-margin, fontH-margin, palette.brush( TQPalette::Normal, TQColorGroup::Background ) ); p.setBrush( palette.color( TQPalette::Normal, TQColorGroup::Text ) ); p.setFont( font ); @@ -1821,7 +1821,7 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) p.end(); TQBitmap pmtextMask(pixmapW, fontH); - pmtextMask.fill( Qt::color1 ); + pmtextMask.fill( TQt::color1 ); // when we have found no covers, just display the text message if( !covers ) @@ -1834,25 +1834,25 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) p.begin( &pmdrag ); p.setBackgroundMode( Qt::TransparentMode ); for ( int i = 0; i < covers; i++ ) - bitBlt( &pmdrag, i * coverSpacing, i * coverSpacing, &coverPm[i], 0, Qt::CopyROP ); + bitBlt( &pmdrag, i * coverSpacing, i * coverSpacing, &coverPm[i], 0, TQt::CopyROP ); - bitBlt( &pmdrag, 0, pixmapH - fontH, &pmtext, 0, Qt::CopyROP ); + bitBlt( &pmdrag, 0, pixmapH - fontH, &pmtext, 0, TQt::CopyROP ); p.end(); TQBitmap pmdragMask( pmdrag.size(), true ); for ( int i = 0; i < covers; i++ ) { TQBitmap coverMask( coverPm[i].width(), coverPm[i].height() ); - coverMask.fill( Qt::color1 ); - bitBlt( &pmdragMask, i * coverSpacing, i * coverSpacing, &coverMask, 0, Qt::CopyROP ); + coverMask.fill( TQt::color1 ); + bitBlt( &pmdragMask, i * coverSpacing, i * coverSpacing, &coverMask, 0, TQt::CopyROP ); } - bitBlt( &pmdragMask, 0, pixmapH - fontH, &pmtextMask, 0, Qt::CopyROP ); + bitBlt( &pmdragMask, 0, pixmapH - fontH, &pmtextMask, 0, TQt::CopyROP ); pmdrag.setMask( pmdragMask ); return pmdrag; } -QImage +TQImage CollectionDB::fetchImage( const KURL& url, TQString &/*tmpFile*/ ) { if ( url.protocol() != "file" ) @@ -1901,7 +1901,7 @@ CollectionDB::setAlbumImage( const TQString& artist, const TQString& album, TQIm } -QString +TQString CollectionDB::podcastImage( const MetaBundle &bundle, const bool withShadow, uint width ) { PodcastEpisodeBundle peb; @@ -1911,7 +1911,7 @@ CollectionDB::podcastImage( const MetaBundle &bundle, const bool withShadow, uin if( getPodcastEpisodeBundle( url, &peb ) ) { - url = peb.parent().url(); + url = peb.tqparent().url(); } if( getPodcastChannelBundle( url, &pcb ) ) @@ -1924,7 +1924,7 @@ CollectionDB::podcastImage( const MetaBundle &bundle, const bool withShadow, uin } -QString +TQString CollectionDB::podcastImage( const TQString &remoteURL, const bool withShadow, uint width ) { // we aren't going to need a 1x1 size image. this is just a quick hack to be able to show full size images. @@ -1991,7 +1991,7 @@ CollectionDB::podcastImageResult( KIO::Job *gjob ) } -QString +TQString CollectionDB::albumImage( const TQString &artist, const TQString &album, bool withShadow, uint width, bool* embedded ) { TQString s; @@ -2027,14 +2027,14 @@ CollectionDB::albumImage( const TQString &artist, const TQString &album, bool wi } -QString +TQString CollectionDB::albumImage( const uint artist_id, const uint album_id, bool withShadow, uint width, bool* embedded ) { return albumImage( artistValue( artist_id ), albumValue( album_id ), withShadow, width, embedded ); } -QString +TQString CollectionDB::albumImage( const MetaBundle &trackInformation, bool withShadow, uint width, bool* embedded ) { TQString s; @@ -2062,12 +2062,12 @@ CollectionDB::albumImage( const MetaBundle &trackInformation, bool withShadow, u return s; } -QString +TQString CollectionDB::makeShadowedImage( const TQString& albumImage, bool cache ) { - qApp->lock(); + tqApp->lock(); const TQImage original( albumImage, "PNG" ); - qApp->unlock(); + tqApp->unlock(); if( original.hasAlphaBuffer() ) return albumImage; @@ -2082,11 +2082,11 @@ CollectionDB::makeShadowedImage( const TQString& albumImage, bool cache ) TQImage shadow; const TQString folder = Amarok::saveLocation( "covershadow-cache/" ); - const TQString file = TQString( "shadow_albumcover%1x%2.png" ).arg( original.width() + shadowSize ).arg( original.height() + shadowSize ); + const TQString file = TQString( "shadow_albumcover%1x%2.png" ).tqarg( original.width() + shadowSize ).tqarg( original.height() + shadowSize ); if ( TQFile::exists( folder + file ) ) { - qApp->lock(); + tqApp->lock(); shadow.load( folder + file, "PNG" ); - qApp->unlock(); + tqApp->unlock(); } else { shadow = TQDeepCopy<TQImage>(instance()->m_shadowImage); @@ -2108,7 +2108,7 @@ CollectionDB::makeShadowedImage( const TQString& albumImage, bool cache ) // Amazon Image -QString +TQString CollectionDB::findAmazonImage( const TQString &artist, const TQString &album, uint width ) { TQCString widthKey = makeWidthKey( width ); @@ -2129,7 +2129,7 @@ CollectionDB::findAmazonImage( const TQString &artist, const TQString &album, ui if ( width > 1 ) { TQImage img( imageDir.filePath( key ) ); - img.smoothScale( width, width, TQImage::ScaleMin ).save( cacheCoverDir().filePath( widthKey + key ), "PNG" ); + img.smoothScale( width, width, TQ_ScaleMin ).save( cacheCoverDir().filePath( widthKey + key ), "PNG" ); return cacheCoverDir().filePath( widthKey + key ); } @@ -2141,7 +2141,7 @@ CollectionDB::findAmazonImage( const TQString &artist, const TQString &album, ui } -QString +TQString CollectionDB::findDirectoryImage( const TQString& artist, const TQString& album, uint width ) { if ( width == 1 ) @@ -2168,17 +2168,17 @@ CollectionDB::findDirectoryImage( const TQString& artist, const TQString& album, "AND tags.sampler = %1 " "AND images.album %2 " "AND images.deviceid IN (%3) " ) - .arg( boolT() ) - .arg( CollectionDB::likeCondition( album ) ) - .arg( deviceIds ) ); + .tqarg( boolT() ) + .tqarg( CollectionDB::likeCondition( album ) ) + .tqarg( deviceIds ) ); } else { rs = query( TQString( "SELECT distinct images.deviceid,images.path FROM images WHERE artist %1 AND album %2 AND deviceid IN (%3) ORDER BY path;" ) - .arg( CollectionDB::likeCondition( artist ) ) - .arg( CollectionDB::likeCondition( album ) ) - .arg( deviceIds ) ); + .tqarg( CollectionDB::likeCondition( artist ) ) + .tqarg( CollectionDB::likeCondition( album ) ) + .tqarg( deviceIds ) ); } TQStringList values = URLsFromQuery( rs ); if ( !values.isEmpty() ) @@ -2189,7 +2189,7 @@ CollectionDB::findDirectoryImage( const TQString& artist, const TQString& album, TQRegExp iTunesArt( "^AlbumArt_.*Large" ); for ( uint i = 0; i < values.count(); i++ ) { - matches = values[i].contains( "front", false ) + values[i].contains( "cover", false ) + values[i].contains( "folder", false ) + values[i].contains( iTunesArt ); + matches = values[i].tqcontains( "front", false ) + values[i].tqcontains( "cover", false ) + values[i].tqcontains( "folder", false ) + values[i].tqcontains( iTunesArt ); if ( matches > maxmatches ) { image = values[i]; @@ -2205,7 +2205,7 @@ CollectionDB::findDirectoryImage( const TQString& artist, const TQString& album, if ( !TQFile::exists( path ) ) { TQImage img( image ); - img.smoothScale( width, width, TQImage::ScaleMin ).save( path, "PNG" ); + img.smoothScale( width, width, TQ_ScaleMin ).save( path, "PNG" ); } return path; } @@ -2216,7 +2216,7 @@ CollectionDB::findDirectoryImage( const TQString& artist, const TQString& album, } -QString +TQString CollectionDB::findEmbeddedImage( const TQString& artist, const TQString& album, uint width ) { // In the case of multiple embedded images, we arbitrarily choose one from the newest file @@ -2234,8 +2234,8 @@ CollectionDB::findEmbeddedImage( const TQString& artist, const TQString& album, "album.name = '%1' " "AND tags.sampler = %2 " "ORDER BY modifydate DESC LIMIT 1;" ) - .arg( escapeString( album ) ) - .arg( boolT() ) ); + .tqarg( escapeString( album ) ) + .tqarg( boolT() ) ); } else { rs = query( TQString( "SELECT embed.hash, embed.deviceid, embed.url FROM " @@ -2246,8 +2246,8 @@ CollectionDB::findEmbeddedImage( const TQString& artist, const TQString& album, "artist.name = '%1' " "AND album.name = '%2' " "ORDER BY modifydate DESC LIMIT 1;" ) - .arg( escapeString( artist ) ) - .arg( escapeString( album ) ) ); + .tqarg( escapeString( artist ) ) + .tqarg( escapeString( album ) ) ); } TQStringList values = TQStringList(); @@ -2273,7 +2273,7 @@ CollectionDB::findEmbeddedImage( const TQString& artist, const TQString& album, } -QString +TQString CollectionDB::findMetaBundleImage( const MetaBundle& trackInformation, uint width ) { int deviceid = MountPointManager::instance()->getIdForUrl( trackInformation.url() ); @@ -2282,7 +2282,7 @@ CollectionDB::findMetaBundleImage( const MetaBundle& trackInformation, uint widt query( TQString( "SELECT embed.hash FROM tags LEFT JOIN embed ON tags.url = embed.url " " AND tags.deviceid = embed.deviceid WHERE tags.url = '%2' AND tags.deviceid = %1 ORDER BY hash DESC LIMIT 1;" ) - .arg( deviceid ).arg( escapeString( rpath ) ) ); + .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); if ( values.empty() || !values.first().isEmpty() ) { TQCString hash; @@ -2304,7 +2304,7 @@ CollectionDB::findMetaBundleImage( const MetaBundle& trackInformation, uint widt } -QCString +TQCString CollectionDB::makeWidthKey( uint width ) { return TQString::number( width ).local8Bit() + '@'; @@ -2321,7 +2321,7 @@ CollectionDB::removeAlbumImage( const TQString &artist, const TQString &album ) query( "DELETE FROM amazon WHERE filename='" + key + '\'' ); // remove scaled versions of images (and add the asterisk for the shadow-caches) - TQStringList scaledList = cacheCoverDir().entryList( widthKey + key + '*' ); + TQStringList scaledList = cacheCoverDir().entryList( TQString(widthKey + key + '*') ); if ( scaledList.count() > 0 ) for ( uint i = 0; i < scaledList.count(); i++ ) TQFile::remove( cacheCoverDir().filePath( scaledList[ i ] ) ); @@ -2359,7 +2359,7 @@ CollectionDB::removeAlbumImage( const uint artist_id, const uint album_id ) } -QString +TQString CollectionDB::notAvailCover( const bool withShadow, int width ) { if ( width <= 1 ) @@ -2371,7 +2371,7 @@ CollectionDB::notAvailCover( const bool withShadow, int width ) s = cacheCoverDir().filePath( widthKey + "nocover.png" ); else { - m_noCover.smoothScale( width, width, TQImage::ScaleMin ).save( cacheCoverDir().filePath( widthKey + "nocover.png" ), "PNG" ); + m_noCover.smoothScale( width, width, TQ_ScaleMin ).save( cacheCoverDir().filePath( widthKey + "nocover.png" ), "PNG" ); s = cacheCoverDir().filePath( widthKey + "nocover.png" ); } @@ -2382,7 +2382,7 @@ CollectionDB::notAvailCover( const bool withShadow, int width ) } -QStringList +TQStringList CollectionDB::artistList( bool withUnknowns, bool withCompilations ) { QueryBuilder qb; @@ -2400,7 +2400,7 @@ CollectionDB::artistList( bool withUnknowns, bool withCompilations ) } -QStringList +TQStringList CollectionDB::composerList( bool withUnknowns, bool withCompilations ) { DEBUG_BLOCK @@ -2419,7 +2419,7 @@ CollectionDB::composerList( bool withUnknowns, bool withCompilations ) } -QStringList +TQStringList CollectionDB::albumList( bool withUnknowns, bool withCompilations ) { QueryBuilder qb; @@ -2437,7 +2437,7 @@ CollectionDB::albumList( bool withUnknowns, bool withCompilations ) } -QStringList +TQStringList CollectionDB::genreList( bool withUnknowns, bool withCompilations ) { QueryBuilder qb; @@ -2458,7 +2458,7 @@ CollectionDB::genreList( bool withUnknowns, bool withCompilations ) } -QStringList +TQStringList CollectionDB::yearList( bool withUnknowns, bool withCompilations ) { QueryBuilder qb; @@ -2475,7 +2475,7 @@ CollectionDB::yearList( bool withUnknowns, bool withCompilations ) return qb.run(); } -QStringList +TQStringList CollectionDB::labelList() { QueryBuilder qb; @@ -2486,7 +2486,7 @@ CollectionDB::labelList() return qb.run(); } -QStringList +TQStringList CollectionDB::albumListOfArtist( const TQString &artist, bool withUnknown, bool withCompilations ) { if (getDbConnectionType() == DbConnection::postgresql) @@ -2494,8 +2494,8 @@ CollectionDB::albumListOfArtist( const TQString &artist, bool withUnknown, bool return query( "SELECT DISTINCT album.name, lower( album.name ) AS __discard FROM tags, album, artist WHERE " "tags.album = album.id AND tags.artist = artist.id " "AND lower(artist.name) = lower('" + escapeString( artist ) + "') " + - ( withUnknown ? TQString::null : "AND album.name <> '' " ) + - ( withCompilations ? TQString::null : "AND tags.sampler = " + boolF() ) + deviceidSelection() + + ( withUnknown ? TQString() : "AND album.name <> '' " ) + + ( withCompilations ? TQString() : "AND tags.sampler = " + boolF() ) + deviceidSelection() + " ORDER BY lower( album.name );" ); } // mysql is case insensitive and lower() is very slow @@ -2504,8 +2504,8 @@ CollectionDB::albumListOfArtist( const TQString &artist, bool withUnknown, bool return query( "SELECT DISTINCT album.name FROM tags, album, artist WHERE " "tags.album = album.id AND tags.artist = artist.id " "AND artist.name = '" + escapeString( artist ) + "' " + - ( withUnknown ? TQString::null : "AND album.name <> '' " ) + - ( withCompilations ? TQString::null : "AND tags.sampler = " + boolF() ) + deviceidSelection() + + ( withUnknown ? TQString() : "AND album.name <> '' " ) + + ( withCompilations ? TQString() : "AND tags.sampler = " + boolF() ) + deviceidSelection() + " ORDER BY album.name;" ); } else // sqlite @@ -2513,46 +2513,46 @@ CollectionDB::albumListOfArtist( const TQString &artist, bool withUnknown, bool return query( "SELECT DISTINCT album.name FROM tags, album, artist WHERE " "tags.album = album.id AND tags.artist = artist.id " "AND lower(artist.name) = lower('" + escapeString( artist ) + "') " + - ( withUnknown ? TQString::null : "AND album.name <> '' " ) + - ( withCompilations ? TQString::null : "AND tags.sampler = " + boolF() ) + deviceidSelection() + + ( withUnknown ? TQString() : "AND album.name <> '' " ) + + ( withCompilations ? TQString() : "AND tags.sampler = " + boolF() ) + deviceidSelection() + " ORDER BY lower( album.name );" ); } } -QStringList +TQStringList CollectionDB::artistAlbumList( bool withUnknown, bool withCompilations ) { if (getDbConnectionType() == DbConnection::postgresql) { return query( "SELECT DISTINCT artist.name, album.name, lower( album.name ) AS __discard FROM tags, album, artist WHERE " "tags.album = album.id AND tags.artist = artist.id " + - ( withUnknown ? TQString::null : "AND album.name <> '' AND artist.name <> '' " ) + - ( withCompilations ? TQString::null : "AND tags.sampler = " + boolF() ) + deviceidSelection() + + ( withUnknown ? TQString() : "AND album.name <> '' AND artist.name <> '' " ) + + ( withCompilations ? TQString() : "AND tags.sampler = " + boolF() ) + deviceidSelection() + " ORDER BY lower( album.name );" ); } else { return query( "SELECT DISTINCT artist.name, album.name FROM tags, album, artist WHERE " "tags.album = album.id AND tags.artist = artist.id " + - ( withUnknown ? TQString::null : "AND album.name <> '' AND artist.name <> '' " ) + - ( withCompilations ? TQString::null : "AND tags.sampler = " + boolF() ) + deviceidSelection() + + ( withUnknown ? TQString() : "AND album.name <> '' AND artist.name <> '' " ) + + ( withCompilations ? TQString() : "AND tags.sampler = " + boolF() ) + deviceidSelection() + " ORDER BY lower( album.name );" ); } } bool -CollectionDB::addPodcastChannel( const PodcastChannelBundle &pcb, const bool &replace ) +CollectionDB::addPodcastChannel( const PodcastChannelBundle &pcb, const bool &tqreplace ) { TQString command; - if( replace ) { + if( tqreplace ) { command = "REPLACE INTO podcastchannels " - "( url, title, weblink, image, comment, copyright, parent, directory" + "( url, title, weblink, image, comment, copyright, tqparent, directory" ", autoscan, fetchtype, autotransfer, haspurge, purgecount ) " "VALUES ("; } else { command = "INSERT INTO podcastchannels " - "( url, title, weblink, image, comment, copyright, parent, directory" + "( url, title, weblink, image, comment, copyright, tqparent, directory" ", autoscan, fetchtype, autotransfer, haspurge, purgecount ) " "VALUES ("; } @@ -2572,7 +2572,7 @@ CollectionDB::addPodcastChannel( const PodcastChannelBundle &pcb, const bool &re command += ( image.isEmpty() ? "NULL" : '\'' + escapeString( image.url() ) + '\'' ) + ','; command += ( description.isEmpty() ? "NULL" : '\'' + escapeString( description ) + '\'' ) + ','; command += ( copyright.isEmpty() ? "NULL" : '\'' + escapeString( copyright ) + '\'' ) + ','; - command += TQString::number( pcb.parentId() ) + ",'"; + command += TQString::number( pcb.tqparentId() ) + ",'"; command += escapeString( pcb.saveLocation() ) + "',"; command += pcb.autoscan() ? boolT() + ',' : boolF() + ','; command += TQString::number( pcb.fetchType() ) + ','; @@ -2593,11 +2593,11 @@ CollectionDB::addPodcastEpisode( const PodcastEpisodeBundle &episode, const int if( idToUpdate ) { command = "REPLACE INTO podcastepisodes " - "( id, url, localurl, parent, title, subtitle, composer, comment, filetype, createdate, guid, length, size, isNew ) " + "( id, url, localurl, tqparent, title, subtitle, composer, comment, filetype, createdate, guid, length, size, isNew ) " "VALUES ("; } else { command = "INSERT INTO podcastepisodes " - "( url, localurl, parent, title, subtitle, composer, comment, filetype, createdate, guid, length, size, isNew ) " + "( url, localurl, tqparent, title, subtitle, composer, comment, filetype, createdate, guid, length, size, isNew ) " "VALUES ("; } @@ -2620,7 +2620,7 @@ CollectionDB::addPodcastEpisode( const PodcastEpisodeBundle &episode, const int command += '\'' + escapeString( episode.url().url() ) + "',"; command += ( localurl.isEmpty() ? "NULL" : '\'' + escapeString( localurl ) + '\'' ) + ','; - command += '\'' + escapeString( episode.parent().url()) + "',"; + command += '\'' + escapeString( episode.tqparent().url()) + "',"; command += ( title.isEmpty() ? "NULL" : '\'' + escapeString( title ) + '\'' ) + ','; command += ( subtitle.isEmpty() ? "NULL" : '\'' + escapeString( subtitle ) + '\'' ) + ','; command += ( author.isEmpty() ? "NULL" : '\'' + escapeString( author ) + '\'' ) + ','; @@ -2638,7 +2638,7 @@ CollectionDB::addPodcastEpisode( const PodcastEpisodeBundle &episode, const int //This is a bit of a hack. We have just inserted an item, so it is going to be the one with the //highest id. Change this if threaded insertions are used in the future. TQStringList values = query( TQString("SELECT id FROM podcastepisodes WHERE url='%1' ORDER BY id DESC;") - .arg( escapeString( episode.url().url() ) ) ); + .tqarg( escapeString( episode.url().url() ) ) ); if( values.isEmpty() ) return -1; return values[0].toInt(); @@ -2647,7 +2647,7 @@ CollectionDB::addPodcastEpisode( const PodcastEpisodeBundle &episode, const int TQValueList<PodcastChannelBundle> CollectionDB::getPodcastChannels() { - TQString command = "SELECT url, title, weblink, image, comment, copyright, parent, directory " + TQString command = "SELECT url, title, weblink, image, comment, copyright, tqparent, directory " ", autoscan, fetchtype, autotransfer, haspurge, purgecount FROM podcastchannels;"; TQStringList values = query( command ); @@ -2677,14 +2677,14 @@ CollectionDB::getPodcastChannels() } TQValueList<PodcastEpisodeBundle> -CollectionDB::getPodcastEpisodes( const KURL &parent, bool onlyNew, int limit ) +CollectionDB::getPodcastEpisodes( const KURL &tqparent, bool onlyNew, int limit ) { - TQString command = TQString( "SELECT id, url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE ( parent='%1'" ).arg( parent.url() ); + TQString command = TQString( "SELECT id, url, localurl, tqparent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE ( tqparent='%1'" ).tqarg( tqparent.url() ); if( onlyNew ) - command += TQString( " AND isNew='%1'" ).arg( boolT() ); + command += TQString( " AND isNew='%1'" ).tqarg( boolT() ); command += " ) ORDER BY id"; if( limit != -1 ) - command += TQString( " DESC LIMIT %1 OFFSET 0" ).arg( limit ); + command += TQString( " DESC LIMIT %1 OFFSET 0" ).tqarg( limit ); command += ';'; TQStringList values = query( command ); @@ -2722,7 +2722,7 @@ CollectionDB::getPodcastEpisodes( const KURL &parent, bool onlyNew, int limit ) PodcastEpisodeBundle CollectionDB::getPodcastEpisodeById( int id ) { - TQString command = TQString( "SELECT url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE id=%1;").arg( id ); + TQString command = TQString( "SELECT url, localurl, tqparent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE id=%1;").tqarg( id ); TQStringList values = query( command ); PodcastEpisodeBundle peb; @@ -2759,7 +2759,7 @@ CollectionDB::getPodcastEpisodeBundle( const KURL &url, PodcastEpisodeBundle *pe { TQStringList values = query( TQString( "SELECT id FROM podcastepisodes WHERE localurl = '%1';" ) - .arg( escapeString( url.url() ) ) ); + .tqarg( escapeString( url.url() ) ) ); if( !values.isEmpty() ) id = values[0].toInt(); } @@ -2767,7 +2767,7 @@ CollectionDB::getPodcastEpisodeBundle( const KURL &url, PodcastEpisodeBundle *pe { TQStringList values = query( TQString( "SELECT id FROM podcastepisodes WHERE url = '%1';" ) - .arg( escapeString( url.url() ) ) ); + .tqarg( escapeString( url.url() ) ) ); if( !values.isEmpty() ) id = values[0].toInt(); } @@ -2785,9 +2785,9 @@ bool CollectionDB::getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *pcb ) { TQStringList values = query( TQString( - "SELECT url, title, weblink, image, comment, copyright, parent, directory " + "SELECT url, title, weblink, image, comment, copyright, tqparent, directory " ", autoscan, fetchtype, autotransfer, haspurge, purgecount FROM podcastchannels WHERE url = '%1';" - ).arg( escapeString( url.url() ) ) ); + ).tqarg( escapeString( url.url() ) ) ); foreach( values ) { @@ -2812,17 +2812,17 @@ CollectionDB::getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *pc // return newly created folder id int -CollectionDB::addPodcastFolder( const TQString &name, const int parent_id, const bool isOpen ) +CollectionDB::addPodcastFolder( const TQString &name, const int tqparent_id, const bool isOpen ) { - TQString command = TQString( "INSERT INTO podcastfolders ( name, parent, isOpen ) VALUES ('" ); + TQString command = TQString( "INSERT INTO podcastfolders ( name, tqparent, isOpen ) VALUES ('" ); command += escapeString( name ) + "',"; - command += TQString::number( parent_id ) + ","; + command += TQString::number( tqparent_id ) + ","; command += isOpen ? boolT() + ");" : boolF() + ");"; insert( command, NULL ); - command = TQString( "SELECT id FROM podcastfolders WHERE name = '%1' AND parent = '%2';" ) - .arg( name, TQString::number(parent_id) ); + command = TQString( "SELECT id FROM podcastfolders WHERE name = '%1' AND tqparent = '%2';" ) + .tqarg( name, TQString::number(tqparent_id) ); TQStringList values = query( command ); return values[0].toInt(); @@ -2833,15 +2833,15 @@ CollectionDB::updatePodcastChannel( const PodcastChannelBundle &b ) { if( getDbConnectionType() == DbConnection::postgresql ) { - query( QStringx( "UPDATE podcastchannels SET title='%1', weblink='%2', comment='%3', " - "copyright='%4', parent=%5, directory='%6', autoscan=%7, fetchtype=%8, " + query( TQStringx( "UPDATE podcastchannels SET title='%1', weblink='%2', comment='%3', " + "copyright='%4', tqparent=%5, directory='%6', autoscan=%7, fetchtype=%8, " "autotransfer=%9, haspurge=%10, purgecount=%11 WHERE url='%12';" ) .args ( TQStringList() << escapeString( b.title() ) << escapeString( b.link().url() ) << escapeString( b.description() ) << escapeString( b.copyright() ) - << TQString::number( b.parentId() ) + << TQString::number( b.tqparentId() ) << escapeString( b.saveLocation() ) << ( b.autoscan() ? boolT() : boolF() ) << TQString::number( b.fetchType() ) @@ -2862,12 +2862,12 @@ CollectionDB::updatePodcastEpisode( const int id, const PodcastEpisodeBundle &b { if( getDbConnectionType() == DbConnection::postgresql ) { - query( QStringx( "UPDATE podcastepisodes SET url='%1', localurl='%2', parent='%3', title='%4', subtitle='%5', composer='%6', comment='%7', " + query( TQStringx( "UPDATE podcastepisodes SET url='%1', localurl='%2', tqparent='%3', title='%4', subtitle='%5', composer='%6', comment='%7', " "filetype='%8', createdate='%9', guid='%10', length=%11, size=%12, isNew=%13 WHERE id=%14;" ) .args( TQStringList() << escapeString( b.url().url() ) << ( b.localUrl().isValid() ? escapeString( b.localUrl().url() ) : "NULL" ) - << escapeString( b.parent().url() ) + << escapeString( b.tqparent().url() ) << escapeString( b.title() ) << escapeString( b.subtitle() ) << escapeString( b.author() ) @@ -2888,25 +2888,25 @@ CollectionDB::updatePodcastEpisode( const int id, const PodcastEpisodeBundle &b } void -CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, const int parent_id, const bool isOpen ) +CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, const int tqparent_id, const bool isOpen ) { if( getDbConnectionType() == DbConnection::postgresql ) { - query( QStringx( "UPDATE podcastfolders SET name='%1', parent=%2, isOpen=%3 WHERE id=%4;" ) + query( TQStringx( "UPDATE podcastfolders SET name='%1', tqparent=%2, isOpen=%3 WHERE id=%4;" ) .args( TQStringList() << escapeString(name) - << TQString::number(parent_id) + << TQString::number(tqparent_id) << ( isOpen ? boolT() : boolF() ) << TQString::number(folder_id) ) ); } else { - query( QStringx( "REPLACE INTO podcastfolders ( id, name, parent, isOpen ) " + query( TQStringx( "REPLACE INTO podcastfolders ( id, name, tqparent, isOpen ) " "VALUES ( %1, '%2', %3, %4 );" ) .args( TQStringList() << TQString::number(folder_id) << escapeString(name) - << TQString::number(parent_id) + << TQString::number(tqparent_id) << ( isOpen ? boolT() : boolF() ) ) ); @@ -2918,10 +2918,10 @@ CollectionDB::removePodcastChannel( const KURL &url ) { //remove channel query( TQString( "DELETE FROM podcastchannels WHERE url = '%1';" ) - .arg( escapeString( url.url() ) ) ); - //remove all children - query( TQString( "DELETE FROM podcastepisodes WHERE parent = '%1';" ) - .arg( escapeString( url.url() ) ) ); + .tqarg( escapeString( url.url() ) ) ); + //remove all tqchildren + query( TQString( "DELETE FROM podcastepisodes WHERE tqparent = '%1';" ) + .tqarg( escapeString( url.url() ) ) ); } @@ -2931,7 +2931,7 @@ CollectionDB::removePodcastEpisode( const int id ) { if( id < 0 ) return; query( TQString( "DELETE FROM podcastepisodes WHERE id = '%1';" ) - .arg( TQString::number(id) ) ); + .tqarg( TQString::number(id) ) ); } void @@ -2939,7 +2939,7 @@ CollectionDB::removePodcastFolder( const int id ) { if( id < 0 ) return; query( TQString("DELETE FROM podcastfolders WHERE id=%1;") - .arg( TQString::number(id) ) ); + .tqarg( TQString::number(id) ) ); } bool @@ -2958,15 +2958,15 @@ CollectionDB::addSong( MetaBundle* bundle, const bool incremental ) if ( title.isEmpty() ) { title = bundle->url().fileName(); - if ( bundle->url().fileName().find( '-' ) > 0 ) + if ( bundle->url().fileName().tqfind( '-' ) > 0 ) { if ( artist.isEmpty() ) { - artist = bundle->url().fileName().section( '-', 0, 0 ).stripWhiteSpace(); + artist = TQString(bundle->url().fileName().section( '-', 0, 0 )).stripWhiteSpace(); bundle->setArtist( artist ); } - title = bundle->url().fileName().section( '-', 1 ).stripWhiteSpace(); - title = title.left( title.findRev( '.' ) ).stripWhiteSpace(); + title = TQString(bundle->url().fileName().section( '-', 1 )).stripWhiteSpace(); + title = title.left( title.tqfindRev( '.' ) ).stripWhiteSpace(); if ( title.isEmpty() ) title = bundle->url().fileName(); } bundle->setTitle( title ); @@ -3047,7 +3047,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) "SELECT url, uniqueid " "FROM uniqueid%1 " "WHERE deviceid = %2 AND url = '%3';" ) - .arg( tempTables ? "_temp" : "" + .tqarg( tempTables ? "_temp" : "" , currdeviceid , currurl ) ); @@ -3055,20 +3055,20 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) "SELECT url, uniqueid, deviceid " "FROM uniqueid%1 " "WHERE uniqueid = '%2';" ) - .arg( tempTables ? "_temp" : "" + .tqarg( tempTables ? "_temp" : "" , currid ) ); TQStringList nonTempIDs = query( TQString( "SELECT url, uniqueid, deviceid " "FROM uniqueid " "WHERE uniqueid = '%1';" ) - .arg( currid ) ); + .tqarg( currid ) ); TQStringList nonTempURLs = query( TQString( "SELECT url, uniqueid " "FROM uniqueid " "WHERE deviceid = %1 AND url = '%2';" ) - .arg( currdeviceid + .tqarg( currdeviceid , currurl ) ); bool tempTablesAndInPermanent = false; @@ -3090,7 +3090,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) if( !tempTablesAndInPermanent && urls.empty() && uniqueids.empty() ) { //debug() << "first case" << endl; - TQString insertline = QStringx( "INSERT INTO uniqueid%1 (deviceid, url, uniqueid, dir) " + TQString insertline = TQStringx( "INSERT INTO uniqueid%1 (deviceid, url, uniqueid, dir) " "VALUES ( %2,'%3', '%4', '%5');" ) .args( TQStringList() << ( tempTables ? "_temp" : "" ) @@ -3122,8 +3122,8 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) else //it's a move, not a copy, or a copy and then both files were moved...can't detect that { //debug() << "stat was NOT successful, updating tables with: " << endl; - //debug() << TQString( "UPDATE uniqueid%1 SET url='%2', dir='%3' WHERE uniqueid='%4';" ).arg( ( tempTables ? "_temp" : "" ), currurl, currdir, currid ) << endl; - query( QStringx( "UPDATE uniqueid%1 SET deviceid = %2, url='%3', dir='%4' WHERE uniqueid='%5';" ) + //debug() << TQString( "UPDATE uniqueid%1 SET url='%2', dir='%3' WHERE uniqueid='%4';" ).tqarg( ( tempTables ? "_temp" : "" ), currurl, currdir, currid ) << endl; + query( TQStringx( "UPDATE uniqueid%1 SET deviceid = %2, url='%3', dir='%4' WHERE uniqueid='%5';" ) .args( TQStringList() << ( tempTables ? "_temp" : "" ) << currdeviceid @@ -3142,7 +3142,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) { //debug() << "file exists in same place as before, new uniqueid" << endl; query( TQString( "UPDATE uniqueid%1 SET uniqueid='%2' WHERE deviceid = %3 AND url='%4';" ) - .arg( tempTables ? "_temp" : "" + .tqarg( tempTables ? "_temp" : "" , currid , currdeviceid , currurl ) ); @@ -3161,9 +3161,9 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) { TQString insertline = TQString( "INSERT INTO uniqueid_temp (deviceid, url, uniqueid, dir) " "VALUES ( %1, '%2'" ) - .arg( currdeviceid + .tqarg( currdeviceid , currurl ); - insertline += TQString( ", '%1', '%2');" ).arg( currid ).arg( currdir ); + insertline += TQString( ", '%1', '%2');" ).tqarg( currid ).tqarg( currdir ); //debug() << "running command: " << insertline << endl; insert( insertline, NULL ); //debug() << "aftCheckPermanentTables #2" << endl; @@ -3187,10 +3187,10 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) { //debug() << "stat part 2 was NOT successful, updating tables with: " << endl; query( TQString( "DELETE FROM uniqueid WHERE uniqueid='%1';" ) - .arg( currid ) ); + .tqarg( currid ) ); query( TQString( "INSERT INTO uniqueid_temp (deviceid, url, uniqueid, dir) " "VALUES ( %1, '%2', '%3', '%4')" ) - .arg( currdeviceid + .tqarg( currdeviceid , currurl , currid , currdir ) ); @@ -3202,10 +3202,10 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) { //debug() << "file exists in same place as before, part 2, new uniqueid" << endl; query( TQString( "DELETE FROM uniqueid WHERE deviceid = %1 AND url='%2';" ) - .arg( currdeviceid ) - .arg( currurl ) ); + .tqarg( currdeviceid ) + .tqarg( currurl ) ); query( TQString( "INSERT INTO uniqueid_temp (deviceid, url, uniqueid, dir) VALUES ( %1, '%2', '%3', '%4')" ) - .arg( currdeviceid + .tqarg( currdeviceid , currurl , currid , currdir ) ); @@ -3234,7 +3234,7 @@ CollectionDB::emitFileAdded( const TQString &absPath, const TQString &uniqueid ) emit fileAdded( absPath, uniqueid ); } -QString +TQString CollectionDB::urlFromUniqueId( const TQString &id ) { bool scanning = ( ScanController::instance() && ScanController::instance()->tablesCreated() ); @@ -3242,15 +3242,15 @@ CollectionDB::urlFromUniqueId( const TQString &id ) "SELECT deviceid, url " "FROM uniqueid%1 " "WHERE uniqueid = '%2';" ) - .arg( scanning ? "_temp" : TQString::null ) - .arg( id ), true ); + .tqarg( scanning ? "_temp" : TQString() ) + .tqarg( id ), true ); if( urls.empty() && scanning ) urls = query( TQString( "SELECT deviceid, url " "FROM uniqueid " "WHERE uniqueid = '%1';" ) - .arg( id ) ); + .tqarg( id ) ); if( urls.empty() ) return TQString(); @@ -3258,7 +3258,7 @@ CollectionDB::urlFromUniqueId( const TQString &id ) return MountPointManager::instance()->getAbsolutePath( urls[0].toInt(), urls[1] ); } -QString +TQString CollectionDB::uniqueIdFromUrl( const KURL &url ) { MountPointManager *mpm = MountPointManager::instance(); @@ -3270,17 +3270,17 @@ CollectionDB::uniqueIdFromUrl( const KURL &url ) "SELECT uniqueid " "FROM uniqueid%1 " "WHERE deviceid = %2 AND url = '%3';" ) - .arg( scanning ? "_temp" : TQString::null ) - .arg( currdeviceid ) - .arg( currurl ), true ); + .tqarg( scanning ? "_temp" : TQString() ) + .tqarg( currdeviceid ) + .tqarg( currurl ), true ); if( uid.empty() && scanning ) uid = query( TQString( "SELECT uniqueid " "FROM uniqueid " "WHERE deviceid = %1 AND url = '%2';" ) - .arg( currdeviceid ) - .arg( currurl ) ); + .tqarg( currdeviceid ) + .tqarg( currurl ) ); if( uid.empty() ) return TQString(); @@ -3288,7 +3288,7 @@ CollectionDB::uniqueIdFromUrl( const KURL &url ) return uid[0]; } -QString +TQString CollectionDB::getURL( const MetaBundle &bundle ) { uint artID = artistID( bundle.artist(), false ); @@ -3303,10 +3303,10 @@ CollectionDB::getURL( const MetaBundle &bundle ) "FROM tags " "WHERE tags.album = '%1' AND tags.artist = '%2' AND tags.track = '%3' AND tags.title = '%4'" + deviceidSelection() + ';' ) - .arg( albID ) - .arg( artID ) - .arg( bundle.track() ) - .arg( escapeString( bundle.title() ) ); + .tqarg( albID ) + .tqarg( artID ) + .tqarg( bundle.track() ) + .tqarg( escapeString( bundle.title() ) ); TQStringList urls = URLsFromQuery( query( q ) ); @@ -3443,8 +3443,8 @@ CollectionDB::bundleForUrl( MetaBundle* bundle ) "album, artist, composer, genre, year " "WHERE album.id = tags.album AND artist.id = tags.artist AND composer.id = tags.composer AND " "genre.id = tags.genre AND year.id = tags.year AND tags.url = '%2' AND tags.deviceid = %1;" ) - .arg( deviceid ) - .arg( escapeString( rpath.path( ) ) ) ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath.path( ) ) ) ); bool valid = false; @@ -3577,7 +3577,7 @@ CollectionDB::bundlesByUrls( const KURL::List& urls ) b.setUrl( url ); // FIXME: more context for i18n after string freeze b.setTitle( TQString( "%1 %2 %3%4" ) - .arg( url.filename(), + .tqarg( url.filename(), i18n( "from" ), url.hasHost() ? url.host() : TQString(), url.directory( false ) ) ); @@ -3633,11 +3633,11 @@ CollectionDB::addAudioproperties( const MetaBundle& bundle ) KURL rpath; MountPointManager::instance()->getRelativePath( deviceid, bundle.url(), rpath ); query( TQString( "UPDATE tags SET bitrate='%1', length='%2', samplerate='%3' WHERE url='%5' AND deviceid = %4;" ) - .arg( bundle.bitrate() ) - .arg( bundle.length() ) - .arg( bundle.sampleRate() ) - .arg( deviceid ) - .arg( escapeString( rpath.path() ) ) ); + .tqarg( bundle.bitrate() ) + .tqarg( bundle.length() ) + .tqarg( bundle.sampleRate() ) + .tqarg( deviceid ) + .tqarg( escapeString( rpath.path() ) ) ); } @@ -3655,7 +3655,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, query( TQString( "SELECT playcounter, createdate, percentage, rating FROM statistics " "WHERE url = '%2' AND deviceid = %1;" ) - .arg( statDevId ).arg( escapeString( statRPath ) ) ); + .tqarg( statDevId ).tqarg( escapeString( statRPath ) ) ); //handle corner case: deviceid!=-1 but there is a statistics row for that song with deviceid -1 if ( values.isEmpty() ) @@ -3664,7 +3664,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, values = query( TQString( "SELECT playcounter, createdate, percentage, rating FROM statistics " "WHERE url = '%1' AND deviceid = -1;" ) - .arg( escapeString( rpath2 ) ) ); + .tqarg( escapeString( rpath2 ) ) ); if ( !values.isEmpty() ) { statRPath = rpath2; @@ -3672,7 +3672,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, } } - uint atime = playtime ? playtime->toTime_t() : TQDateTime::currentDateTime().toTime_t(); + uint atime = playtime ? playtime->toTime_t() : TQDateTime::tqcurrentDateTime().toTime_t(); // check boundaries if ( percentage > 100.f ) percentage = 100.f; @@ -3683,21 +3683,21 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, // increment playcounter and update accesstime query( TQString( "UPDATE statistics SET playcounter=%1, accessdate=%2 WHERE url='%4' AND deviceid= %3;" ) - .arg( values[0] + " + 1" ) - .arg( atime ) - .arg( statDevId ) - .arg( escapeString( statRPath ) ) ); + .tqarg( values[0] + " + 1" ) + .tqarg( atime ) + .tqarg( statDevId ) + .tqarg( escapeString( statRPath ) ) ); } else { insert( TQString( "INSERT INTO statistics ( url, deviceid, createdate, accessdate, percentage, playcounter, rating, uniqueid, deleted ) " "VALUES ( '%6', %5, %1, %2, 0, 1, 0, %3, %4 );" ) - .arg( atime ) - .arg( atime ) - .arg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) - .arg( boolF() ) - .arg( statDevId ) - .arg( escapeString( statRPath ) ), 0 ); + .tqarg( atime ) + .tqarg( atime ) + .tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) + .tqarg( boolF() ) + .tqarg( statDevId ) + .tqarg( escapeString( statRPath ) ), 0 ); } double prevscore = 50; @@ -3711,7 +3711,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, prevscore = values[ 2 ].toDouble(); } const TQStringList v = query( TQString( "SELECT length FROM tags WHERE url = '%2' AND deviceid = %1;" ) - .arg( deviceid ).arg( escapeString( rpath ) ) ); + .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); const int length = v.isEmpty() ? 0 : v.first().toInt(); ScriptManager::instance()->requestNewScore( url, prevscore, playcount, length, percentage, reason ); @@ -3756,7 +3756,7 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage) TQStringList values = query( TQString( "SELECT playcounter, createdate, accessdate, rating FROM statistics WHERE url = '%2' AND deviceid = %1;" ) - .arg( deviceid ).arg( escapeString( rpath ) ) ); + .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); //handle corner case: deviceid!=-1 but there is a statistics row for that song with deviceid -1 if ( values.isEmpty() ) @@ -3765,7 +3765,7 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage) values = query( TQString( "SELECT playcounter, createdate, accessdate, rating FROM statistics " "WHERE url = '%1' AND deviceid = -1;" ) - .arg( escapeString( rpath2 ) ) ); + .tqarg( escapeString( rpath2 ) ) ); if ( !values.isEmpty() ) { rpath = rpath2; @@ -3780,20 +3780,20 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage) if ( !values.isEmpty() ) { query( TQString( "UPDATE statistics SET percentage=%1 WHERE url='%3' AND deviceid = %2;" ) - .arg( percentage ) - .arg( deviceid ).arg( escapeString( rpath ) ) ); + .tqarg( percentage ) + .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); } else { insert( TQString( "INSERT INTO statistics ( url, deviceid, createdate, accessdate, percentage, playcounter, rating, uniqueid, deleted ) " "VALUES ( '%7', %6, %2, %3, %1, 0, 0, %3, %4 );" ) - .arg( percentage ) - .arg( TQDateTime::currentDateTime().toTime_t() ) - .arg( 0 ) - .arg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) - .arg( boolF() ) - .arg( deviceid ) - .arg( escapeString( rpath ) ),0 ); + .tqarg( percentage ) + .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() ) + .tqarg( 0 ) + .tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) + .tqarg( boolF() ) + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ),0 ); } emit scoreChanged( url, percentage ); @@ -3807,8 +3807,8 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf ) TQStringList values = query( TQString( "SELECT playcounter, createdate, accessdate, percentage, rating FROM statistics WHERE url = '%2' AND deviceid = %1;" ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); //handle corner case: deviceid!=-1 but there is a statistics row for that song with deviceid -1 if( values.isEmpty() ) @@ -3817,7 +3817,7 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf ) values = query( TQString( "SELECT playcounter, createdate, accessdate, percentage, rating FROM statistics " "WHERE url = '%1' AND deviceid = -1;" ) - .arg( escapeString( rpath2 ) ) ); + .tqarg( escapeString( rpath2 ) ) ); if ( !values.isEmpty() ) { rpath = rpath2; @@ -3847,21 +3847,21 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf ) if ( !values.isEmpty() ) { query( TQString( "UPDATE statistics SET rating=%1 WHERE url='%3' AND deviceid = %2;" ) - .arg( rating ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( rating ) + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); } else { insert( TQString( "INSERT INTO statistics ( url, deviceid, createdate, accessdate, percentage, rating, playcounter, uniqueid, deleted ) " "VALUES ( '%7', %6, %2, %3, 0, %1, 0, %4, %5 );" ) - .arg( rating ) - .arg( TQDateTime::currentDateTime().toTime_t() ) - .arg( 0 ) - .arg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) - .arg( boolF() ) - .arg( deviceid ) - .arg( escapeString( rpath ) ), NULL ); + .tqarg( rating ) + .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() ) + .tqarg( 0 ) + .tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) + .tqarg( boolF() ) + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ), NULL ); } emit ratingChanged( url, rating ); @@ -3880,7 +3880,7 @@ CollectionDB::getPlayCount( const TQString &url ) return 0; } -QDateTime +TQDateTime CollectionDB::getFirstPlay( const TQString &url ) { QueryBuilder qb; @@ -3893,7 +3893,7 @@ CollectionDB::getFirstPlay( const TQString &url ) return dt; } -QDateTime +TQDateTime CollectionDB::getLastPlay( const TQString &url ) { QueryBuilder qb; @@ -3923,43 +3923,43 @@ CollectionDB::migrateFile( const TQString &oldURL, const TQString &newURL ) // Ensure destination is clear. query( TQString( "DELETE FROM tags WHERE url = '%2' AND deviceid = %1;" ) - .arg( newMediaid ).arg( escapeString( newRpath ) ) ); + .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) ); query( TQString( "DELETE FROM statistics WHERE url = '%2' AND deviceid = %1;" ) - .arg( newMediaid ).arg( escapeString( newRpath ) ) ); + .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) ); query( TQString( "DELETE FROM tags_labels WHERE url = '%2' and deviceid = %1;" ) - .arg( newMediaid).arg( escapeString( newRpath ) ) ); + .tqarg( newMediaid).tqarg( escapeString( newRpath ) ) ); if ( !getLyrics( oldURL ).isEmpty() ) query( TQString( "DELETE FROM lyrics WHERE url = '%2' AND deviceid = %1;" ) - .arg( newMediaid ).arg( escapeString( newRpath ) ) ); + .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) ); // Migrate //code looks ugly but prevents problems when the URL contains HTTP escaped characters query( TQString( "UPDATE tags SET url = '%3', deviceid = %1" ) - .arg( newMediaid ).arg( escapeString( newRpath ) ) + .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) + TQString( " WHERE deviceid=%1 AND url = '%2';" ) - .arg( oldMediaid ).arg( escapeString( oldRpath ) ) ); + .tqarg( oldMediaid ).tqarg( escapeString( oldRpath ) ) ); query( TQString( "UPDATE statistics SET url = '%2', deviceid = %1" ) - .arg( newMediaid ).arg( escapeString( newRpath ) ) + .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) + TQString( " WHERE deviceid=%1 AND url = '%2';" ) - .arg( oldMediaid ).arg( escapeString( oldRpath ) ) ); + .tqarg( oldMediaid ).tqarg( escapeString( oldRpath ) ) ); query( TQString( "UPDATE lyrics SET url = '%2', deviceid = %1" ) - .arg( newMediaid ).arg( escapeString( newRpath ) ) + .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) + TQString( " WHERE deviceid=%1 AND url = '%2';" ) - .arg( oldMediaid ).arg( escapeString( oldRpath ) ) ); + .tqarg( oldMediaid ).tqarg( escapeString( oldRpath ) ) ); query( TQString( "UPDATE tags_labels SET url = '%2', deviceid = %1 WHERE deviceid = %3 AND url = '%4';" ) - .arg( TQString::number( newMediaid ), escapeString( newRpath ), TQString::number( oldMediaid ), escapeString( oldRpath ) ) ); + .tqarg( TQString::number( newMediaid ), escapeString( newRpath ), TQString::number( oldMediaid ), escapeString( oldRpath ) ) ); query( TQString( "UPDATE uniqueid SET url = '%1', deviceid = %2 WHERE url = '%3' AND deviceid = %4;" ) - .arg( escapeString( newRpath ), TQString::number( newMediaid ), + .tqarg( escapeString( newRpath ), TQString::number( newMediaid ), escapeString( oldRpath ), TQString::number( oldMediaid ) ) ); query( TQString( "UPDATE playlists SET url = '%1' WHERE url = '%2';" ) - .arg( escapeString( newURL ), + .tqarg( escapeString( newURL ), escapeString( oldURL ) ) ); } @@ -4002,7 +4002,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b int count = 0; do { - tmp = TQString( dialog.folderCombo->currentText() + "/amarok-tmp-%1." + extension ).arg( count ); + tmp = TQString( dialog.folderCombo->currentText() + "/amarok-tmp-%1." + extension ).tqarg( count ); count++; } while( TQFile::exists( tmp ) ); tmpSrc = KURL::fromPathOrURL( tmp ); @@ -4024,7 +4024,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b { disconnect( job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(fileOperationResult( KIO::Job * )) ); - TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() ); + TQString partFile = TQString( "%1.part" ).tqarg( (job->destURL()).path() ); job->kill(); TQFile file( partFile ); if( file.exists() ) file.remove(); @@ -4035,7 +4035,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b } usleep( 10000 ); - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); } if( m_fileOperationFailed ) @@ -4125,7 +4125,7 @@ CollectionDB::moveFile( const TQString &src, const TQString &dest, bool overwrit // Get just the directory. KURL dir = dstURL; - dir.setFileName(TQString::null); + dir.setFileName(TQString()); // Create the directory. if(!KStandardDirs::exists(dir.path())) @@ -4151,7 +4151,7 @@ CollectionDB::moveFile( const TQString &src, const TQString &dest, bool overwrit { disconnect( job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(fileOperationResult( KIO::Job * )) ); - TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() ); + TQString partFile = TQString( "%1.part" ).tqarg( (job->destURL()).path() ); job->kill(); TQFile file( partFile ); if( file.exists() ) file.remove(); @@ -4162,7 +4162,7 @@ CollectionDB::moveFile( const TQString &src, const TQString &dest, bool overwrit } usleep( 10000 ); - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); } if( !m_fileOperationFailed ) @@ -4215,35 +4215,35 @@ CollectionDB::updateDirStats( TQString path, const long datetime, const bool tem // REPLACE INTO is not valid SQL for postgres, so we need to check whether we // should UPDATE() or INSERT() TQStringList values = query( TQString("SELECT * FROM directories%1 WHERE dir='%3' AND deviceid=%2;") - .arg( temporary ? "_temp" : "") - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( temporary ? "_temp" : "") + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); if(values.count() > 0 ) { query( TQString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%4'AND deviceid=%3;") - .arg( temporary ? "_temp" : "" ) - .arg( datetime ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( temporary ? "_temp" : "" ) + .tqarg( datetime ) + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); } else { query( TQString( "INSERT INTO directories%1 (dir, deviceid,changedate) VALUES ('%4', %3, '%2');") - .arg( temporary ? "_temp" : "") - .arg( datetime ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( temporary ? "_temp" : "") + .tqarg( datetime ) + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); } } else { query( TQString( "REPLACE INTO directories%1 ( dir, deviceid, changedate ) VALUES ( '%4', %3, %2 );" ) - .arg( temporary ? "_temp" : "" ) - .arg( datetime ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( temporary ? "_temp" : "" ) + .tqarg( datetime ) + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); } INotify::instance()->watchDir( path ); @@ -4266,8 +4266,8 @@ CollectionDB::removeSongsInDir( TQString path, TQMap<TQString,TQString> *tagsRem "LEFT JOIN uniqueid ON uniqueid.url = tags.url " "AND uniqueid.deviceid = tags.deviceid " "WHERE tags.dir = '%2' AND tags.deviceid = %1" ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); TQStringList::ConstIterator it = result.begin(), end = result.end(); while( it != end ) { @@ -4280,12 +4280,12 @@ CollectionDB::removeSongsInDir( TQString path, TQMap<TQString,TQString> *tagsRem } query( TQString( "DELETE FROM tags WHERE dir = '%2' AND deviceid = %1;" ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); query( TQString( "DELETE FROM uniqueid WHERE dir = '%2' AND deviceid = %1;" ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); } @@ -4299,8 +4299,8 @@ CollectionDB::isDirInCollection( TQString path ) TQStringList values = query( TQString( "SELECT changedate FROM directories WHERE dir = '%2' AND deviceid = %1;" ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); return !values.isEmpty(); } @@ -4313,8 +4313,8 @@ CollectionDB::isFileInCollection( const TQString &url ) TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); TQString sql = TQString( "SELECT url FROM tags WHERE url = '%2' AND deviceid = %1" ) - .arg( deviceid ) - .arg( escapeString( rpath ) ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ); if ( deviceid == -1 ) { sql += ';'; @@ -4323,7 +4323,7 @@ CollectionDB::isFileInCollection( const TQString &url ) { TQString rpath2 = '.' + url; sql += TQString( " OR url = '%1' AND deviceid = -1;" ) - .arg( escapeString( rpath2 ) ); + .tqarg( escapeString( rpath2 ) ); } TQStringList values = query( sql ); @@ -4340,26 +4340,26 @@ CollectionDB::removeSongs( const KURL::List& urls ) TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, (*it).path() ); query( TQString( "DELETE FROM tags WHERE url = '%2' AND deviceid = %1;" ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); query( TQString( "DELETE FROM uniqueid WHERE url = '%2' AND deviceid = %1;" ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); query( TQString( "UPDATE statistics SET deleted = %1 WHERE url = '%3' AND deviceid = %2;" ) - .arg( boolT() ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( boolT() ) + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); } } -QStringList +TQStringList CollectionDB::similarArtists( const TQString &artist, uint count ) { TQStringList values; values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' ORDER BY %2 LIMIT %3 OFFSET 0;" ) - .arg( escapeString( artist ), randomFunc(), TQString::number( count ) ) ); + .tqarg( escapeString( artist ), randomFunc(), TQString::number( count ) ) ); if ( values.isEmpty() ) Scrobbler::instance()->similarArtists( artist ); @@ -4371,7 +4371,7 @@ CollectionDB::similarArtists( const TQString &artist, uint count ) void CollectionDB::sanitizeCompilations() { - query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE sampler IS NULL;").arg( boolF() ) ); + query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE sampler IS NULL;").tqarg( boolF() ) ); } void @@ -4385,9 +4385,9 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary ) TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, path ); albums = query( TQString( "SELECT DISTINCT album.name FROM tags_temp, album%1 AS album WHERE tags_temp.dir = '%3' AND tags_temp.deviceid = %2 AND album.id = tags_temp.album AND tags_temp.sampler IS NULL;" ) - .arg( temporary ? "_temp" : "" ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( temporary ? "_temp" : "" ) + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); for ( uint i = 0; i < albums.count(); i++ ) { @@ -4395,17 +4395,17 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary ) const uint album_id = albumID( albums[ i ], false, temporary, true ); artists = query( TQString( "SELECT DISTINCT artist.name FROM tags_temp, artist%1 AS artist WHERE tags_temp.album = '%2' AND tags_temp.artist = artist.id;" ) - .arg( temporary ? "_temp" : "" ) - .arg( album_id ) ); + .tqarg( temporary ? "_temp" : "" ) + .tqarg( album_id ) ); dirs = query( TQString( "SELECT DISTINCT dir FROM tags_temp WHERE album = '%1';" ) - .arg( album_id ) ); + .tqarg( album_id ) ); if ( artists.count() > dirs.count() ) { debug() << "Detected compilation: " << albums[ i ] << " - " << artists.count() << ':' << dirs.count() << endl; } query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE album = '%2' AND sampler IS NULL;" ) - .arg(artists.count() > dirs.count() ? boolT() : boolF()).arg( album_id ) ); + .tqarg(artists.count() > dirs.count() ? boolT() : boolF()).tqarg( album_id ) ); } } @@ -4420,7 +4420,7 @@ CollectionDB::setCompilation( const KURL::List &urls, bool enabled, bool updateV TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); query( TQString( "UPDATE tags SET sampler = %1 WHERE tags.url = '%2' AND tags.deviceid = %3;" ) - .arg( ( enabled ? boolT() : boolF() ), escapeString( rpath ), TQString::number( deviceid ) ) ); + .tqarg( ( enabled ? boolT() : boolF() ), escapeString( rpath ), TQString::number( deviceid ) ) ); } // Update the Collection-Browser view, @@ -4439,12 +4439,12 @@ CollectionDB::removeDirFromCollection( TQString path ) TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, path ); query( TQString( "DELETE FROM directories WHERE dir = '%2' AND deviceid = %1;" ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); } -QString +TQString CollectionDB::IDFromExactValue( TQString table, TQString value, bool autocreate, bool temporary /* = false */ ) { if ( temporary ) @@ -4452,14 +4452,14 @@ CollectionDB::IDFromExactValue( TQString table, TQString value, bool autocreate, table.append( "_temp" ); } - TQString querystr( TQString( "SELECT id FROM %1 WHERE name " ).arg( table ) ); + TQString querystr( TQString( "SELECT id FROM %1 WHERE name " ).tqarg( table ) ); querystr += exactCondition( value ) + ';'; TQStringList result = query( querystr ); if ( result.isEmpty() ) { if ( autocreate ) return TQString::number( insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" ) - .arg( table, escapeString( value ) ), + .tqarg( table, escapeString( value ) ), table ) ); else return 0; @@ -4475,17 +4475,17 @@ CollectionDB::IDFromExactValue( TQString table, TQString value, bool autocreate, void CollectionDB::deleteRedundantName( const TQString &table, const TQString &id ) { - TQString querystr( TQString( "SELECT %1 FROM tags WHERE tags.%1 = %2 LIMIT 1;" ).arg( table, id ) ); + TQString querystr( TQString( "SELECT %1 FROM tags WHERE tags.%1 = %2 LIMIT 1;" ).tqarg( table, id ) ); TQStringList result = query( querystr ); if ( result.isEmpty() ) - query( TQString( "DELETE FROM %1 WHERE id = %2;" ).arg( table,id ) ); + query( TQString( "DELETE FROM %1 WHERE id = %2;" ).tqarg( table,id ) ); } void CollectionDB::deleteAllRedundant( const TQString &table ) { //This works with MySQL4. I thought it might not do, due to the comment in copyTempTables - query( TQString( "DELETE FROM %1 WHERE id NOT IN ( SELECT %2 FROM tags )" ).arg( table, table ) ); + query( TQString( "DELETE FROM %1 WHERE id NOT IN ( SELECT %2 FROM tags )" ).tqarg( table, table ) ); } @@ -4624,14 +4624,14 @@ CollectionDB::updateURL( const TQString &url, const bool updateView ) doAFTStuff( &bundle, false ); } -QString +TQString CollectionDB::getUniqueId( const TQString &url ) { int deviceid = MountPointManager::instance()->getIdForUrl( url ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); TQStringList values = query( TQString( "SELECT uniqueid FROM uniqueid WHERE deviceid = %1 AND url = '%2';" ) - .arg( deviceid ) - .arg( escapeString( rpath ) )); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) )); if( !values.empty() ) return values[0]; else @@ -4645,65 +4645,65 @@ CollectionDB::setLyrics( const TQString &url, const TQString &lyrics, const TQSt TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); TQStringList values = query(TQString("SELECT lyrics FROM lyrics WHERE url = '%2' AND deviceid = %1;") - .arg( deviceid ).arg( escapeString( rpath ) ) ); + .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); if(values.count() > 0) { if ( !lyrics.isEmpty() ) query( TQString( "UPDATE lyrics SET lyrics = '%1' WHERE url = '%3' AND deviceid = %2;" ) - .arg( escapeString( lyrics), TQString::number(deviceid), escapeString( rpath ) ) ); + .tqarg( escapeString( lyrics), TQString::number(deviceid), escapeString( rpath ) ) ); else query( TQString( "DELETE FROM lyrics WHERE url = '%2' AND deviceid = %1;" ) - .arg( deviceid).arg( escapeString( rpath ) ) ); + .tqarg( deviceid).tqarg( escapeString( rpath ) ) ); } else { insert( TQString( "INSERT INTO lyrics (deviceid, url, lyrics, uniqueid) values ( %1, '%2', '%3', '%4' );" ) - .arg( TQString::number(deviceid), escapeString( rpath ), escapeString( lyrics ), escapeString( uniqueid ) ), NULL); + .tqarg( TQString::number(deviceid), escapeString( rpath ), escapeString( lyrics ), escapeString( uniqueid ) ), NULL); } } -QString +TQString CollectionDB::getLyrics( const TQString &url ) { int deviceid = MountPointManager::instance()->getIdForUrl( url ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); TQStringList values = query( TQString( "SELECT lyrics FROM lyrics WHERE url = '%2' AND deviceid = %1;" ) - .arg( deviceid ).arg( escapeString( rpath ) ) ); + .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); return values[0]; } void CollectionDB::removeInvalidAmazonInfo( const TQString& md5sum ) { - query( TQString( "DELETE FROM amazon WHERE filename='%1'" ).arg( md5sum ) ); + query( TQString( "DELETE FROM amazon WHERE filename='%1'" ).tqarg( md5sum ) ); } void CollectionDB::newAmazonReloadDate( const TQString& asin, const TQString& locale, const TQString& md5sum) { TQStringList values = query(TQString("SELECT filename FROM amazon WHERE filename = '%1'") - .arg(md5sum)); + .tqarg(md5sum)); if(values.count() > 0) { query( TQString("UPDATE amazon SET asin = '%1', locale = '%2', refetchdate = '%3' WHERE filename = '%4'") - .arg(asin) - .arg(locale) - .arg(TQDateTime::currentDateTime().addDays(80).toTime_t()) - .arg(md5sum)); + .tqarg(asin) + .tqarg(locale) + .tqarg(TQDateTime::tqcurrentDateTime().addDays(80).toTime_t()) + .tqarg(md5sum)); } else { insert( TQString( "INSERT INTO amazon ( asin, locale, filename, refetchdate ) VALUES ( '%1', '%2', '%3', '%4');" ) - .arg(asin) - .arg(locale) - .arg(md5sum) - .arg(TQDateTime::currentDateTime().addDays(80).toTime_t()), NULL ); + .tqarg(asin) + .tqarg(locale) + .tqarg(md5sum) + .tqarg(TQDateTime::tqcurrentDateTime().addDays(80).toTime_t()), NULL ); } } TQStringList CollectionDB::staleImages() { return query(TQString("SELECT asin, locale, filename FROM amazon WHERE refetchdate < %1 ;") - .arg(TQDateTime::currentDateTime().toTime_t() )); + .tqarg(TQDateTime::tqcurrentDateTime().toTime_t() )); } void @@ -4795,9 +4795,9 @@ DbConnection * CollectionDB::getMyConnection() DbConnection *dbConn; TQThread *currThread = ThreadManager::Thread::getRunning(); - if (threadConnections->contains(currThread)) + if (threadConnections->tqcontains(currThread)) { - TQMap<TQThread *, DbConnection *>::Iterator it = threadConnections->find(currThread); + TQMap<TQThread *, DbConnection *>::Iterator it = threadConnections->tqfind(currThread); dbConn = it.data(); connectionMutex->unlock(); return dbConn; @@ -4834,9 +4834,9 @@ CollectionDB::releasePreviousConnection(TQThread *currThread) //if something already exists, delete the object, and erase knowledge of it from the TQMap. connectionMutex->lock(); DbConnection *dbConn; - if (threadConnections->contains(currThread)) + if (threadConnections->tqcontains(currThread)) { - TQMap<TQThread *, DbConnection *>::Iterator it = threadConnections->find(currThread); + TQMap<TQThread *, DbConnection *>::Iterator it = threadConnections->tqfind(currThread); dbConn = it.data(); delete dbConn; threadConnections->erase(currThread); @@ -4854,7 +4854,7 @@ CollectionDB::isConnected() // PROTECTED ////////////////////////////////////////////////////////////////////////////////////////// -QCString +TQCString CollectionDB::md5sum( const TQString& artist, const TQString& album, const TQString& file ) { KMD5 context( artist.lower().local8Bit() + album.lower().local8Bit() + file.local8Bit() ); @@ -4880,7 +4880,7 @@ void CollectionDB::engineTrackEnded( int finalPosition, int trackLength, const T PodcastEpisodeBundle peb; if( getPodcastEpisodeBundle( url.url(), &peb ) ) { - PodcastEpisode *p = PlaylistBrowser::instance()->findPodcastEpisode( peb.url(), peb.parent() ); + PodcastEpisode *p = PlaylistBrowser::instance()->findPodcastEpisode( peb.url(), peb.tqparent() ); if ( p ) p->setListened(); @@ -4913,7 +4913,7 @@ CollectionDB::timerEvent( TQTimerEvent* ) ////////////////////////////////////////////////////////////////////////////////////////// void -CollectionDB::fetchCover( TQWidget* parent, const TQString& artist, const TQString& album, bool noedit, TQListViewItem* item ) //SLOT +CollectionDB::fetchCover( TQWidget* tqparent, const TQString& artist, const TQString& album, bool noedit, TQListViewItem* item ) //SLOT { #ifdef AMAZON_SUPPORT debug() << "Fetching cover for " << artist << " - " << album << endl; @@ -4922,9 +4922,9 @@ CollectionDB::fetchCover( TQWidget* parent, const TQString& artist, const TQStri CoverFetcher* fetcher; if( isCompilation ) // avoid putting various artists in front of album title. this causes problems for locales other than US. - fetcher = new CoverFetcher( parent, "", album ); + fetcher = new CoverFetcher( tqparent, "", album ); else - fetcher = new CoverFetcher( parent, artist, album ); + fetcher = new CoverFetcher( tqparent, artist, album ); if( item ) { itemCoverMapMutex->lock(); @@ -5022,12 +5022,12 @@ class SimilarArtistsInsertionJob : public ThreadManager::DependentJob { virtual bool doJob() { - CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).arg( escapedArtist ) ); + CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).tqarg( escapedArtist ) ); const TQString sql = "INSERT INTO related_artists ( artist, suggestion, changedate ) VALUES ( '%1', '%2', 0 );"; foreach( suggestions ) CollectionDB::instance()->insert( sql - .arg( escapedArtist, + .tqarg( escapedArtist, CollectionDB::instance()->escapeString( *it ) ), NULL); return true; @@ -5040,10 +5040,10 @@ class SimilarArtistsInsertionJob : public ThreadManager::DependentJob const TQStringList suggestions; public: - SimilarArtistsInsertionJob( CollectionDB *parent, const TQString &s, const TQStringList &list ) - : ThreadManager::DependentJob( parent, "SimilarArtistsInsertionJob" ) + SimilarArtistsInsertionJob( CollectionDB *tqparent, const TQString &s, const TQStringList &list ) + : ThreadManager::DependentJob( tqparent, "SimilarArtistsInsertionJob" ) , artist( TQDeepCopy<TQString>(s) ) - , escapedArtist( parent->escapeString( TQDeepCopy<TQString>(s) ) ) + , escapedArtist( tqparent->escapeString( TQDeepCopy<TQString>(s) ) ) , suggestions( TQDeepCopy<TQStringList>(list) ) {} }; @@ -5071,23 +5071,23 @@ CollectionDB::aftCheckPermanentTables( const TQString &currdeviceid, const TQStr "SELECT url, deviceid " "FROM %1 " "WHERE uniqueid = '%2';" ) - .arg( escapeString( *it ) ) - .arg( currid ) ); + .tqarg( escapeString( *it ) ) + .tqarg( currid ) ); check2 = query( TQString( "SELECT url, uniqueid " "FROM %1 " "WHERE deviceid = %2 AND url = '%3';" ) - .arg( escapeString( *it ) ) - .arg( currdeviceid + .tqarg( escapeString( *it ) ) + .tqarg( currdeviceid , currurl ) ); if( !check1.empty() ) { //debug() << "uniqueid found, updating url" << endl; query( TQString( "UPDATE %1 SET deviceid = %2, url = '%4' WHERE uniqueid = '%3';" ) - .arg( escapeString( *it ) ) - .arg( currdeviceid + .tqarg( escapeString( *it ) ) + .tqarg( currdeviceid , currid , currurl ) ); } @@ -5095,8 +5095,8 @@ CollectionDB::aftCheckPermanentTables( const TQString &currdeviceid, const TQStr { //debug() << "url found, updating uniqueid" << endl; query( TQString( "UPDATE %1 SET uniqueid = '%2' WHERE deviceid = %3 AND url = '%4';" ) - .arg( escapeString( *it ) ) - .arg( currid + .tqarg( escapeString( *it ) ) + .tqarg( currid , currdeviceid , currurl ) ); } @@ -5115,14 +5115,14 @@ CollectionDB::aftMigratePermanentTablesUrl( const TQString& /*oldUrl*/, const TQ foreach( m_aftEnabledPersistentTables ) { query( TQString( "DELETE FROM %1 WHERE deviceid = %2 AND url = '%3';" ) - .arg( escapeString( *it ) ) - .arg( deviceid ) - .arg( escapeString( rpath ) ) ); + .tqarg( escapeString( *it ) ) + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ) ); query( TQString( "UPDATE %1 SET deviceid = %2, url = '%4' WHERE uniqueid = '%3';" ) - .arg( escapeString( *it ) ) - .arg( deviceid ) - .arg( escapeString( uniqueid ) ) - .arg( escapeString( rpath ) ) ); + .tqarg( escapeString( *it ) ) + .tqarg( deviceid ) + .tqarg( escapeString( uniqueid ) ) + .tqarg( escapeString( rpath ) ) ); } } @@ -5136,12 +5136,12 @@ CollectionDB::aftMigratePermanentTablesUniqueId( const TQString& /*url*/, const foreach( m_aftEnabledPersistentTables ) { query( TQString( "DELETE FROM %1 WHERE uniqueid = '%2';" ) - .arg( escapeString( *it ) ) - .arg( escapeString( newid ) ) ); + .tqarg( escapeString( *it ) ) + .tqarg( escapeString( newid ) ) ); query( TQString( "UPDATE %1 SET uniqueid = '%1' WHERE uniqueid = '%2';" ) - .arg( escapeString( *it ) ) - .arg( escapeString( newid ) ) - .arg( escapeString( oldid ) ) ); + .tqarg( escapeString( *it ) ) + .tqarg( escapeString( newid ) ) + .tqarg( escapeString( oldid ) ) ); } } @@ -5202,8 +5202,8 @@ CollectionDB::initialize() AmarokConfig::setPostgresqlPassword2( passwd ); } else if( appVersion.startsWith( "1.4" ) && - ( appVersion.contains( "beta", false ) || - appVersion.contains( "svn", false ) ) ) + ( appVersion.tqcontains( "beta", false ) || + appVersion.tqcontains( "svn", false ) ) ) { passwd = Amarok::config( "Postgresql" )->readEntry( "PostgresqlPassword" ); AmarokConfig::setPostgresqlPassword2( passwd ); @@ -5265,7 +5265,7 @@ CollectionDB::initialize() // We should rmeove this before 1.4.5 if ( m_dbConnType == DbConnection::sqlite ) { TQStringList indices = query( "SELECT name FROM sqlite_master WHERE type='index' ORDER BY name;" ); - if (!indices.contains("url_tag")) { + if (!indices.tqcontains("url_tag")) { createIndices(); } } @@ -5343,7 +5343,7 @@ CollectionDB::checkDatabase() { KDialogBase *dialog = new KDialogBase( KDialogBase::Swallow, - Qt::WType_TopLevel|Qt::WStyle_Customize|Qt::WStyle_DialogBorder, + TQt::WType_TopLevel|TQt::WStyle_Customize|TQt::WStyle_DialogBorder, 0, "Update database warning dialog", false, @@ -5462,11 +5462,11 @@ CollectionDB::updateStatsTables() //pre somewhere in the 1.3-1.4 timeframe, the version wasn't stored in the DB, so try to guess it const TQString q = "SELECT COUNT( %1 ) FROM statistics;"; - if( !prev && query( q.arg( "url" ) ).first().toInt() - && query( q.arg( "createdate" ) ).first().toInt() - && query( q.arg( "accessdate" ) ).first().toInt() - && query( q.arg( "percentage" ) ).first().toInt() - && query( q.arg( "playcounter" ) ).first().toInt() ) + if( !prev && query( q.tqarg( "url" ) ).first().toInt() + && query( q.tqarg( "createdate" ) ).first().toInt() + && query( q.tqarg( "accessdate" ) ).first().toInt() + && query( q.tqarg( "percentage" ) ).first().toInt() + && query( q.tqarg( "playcounter" ) ).first().toInt() ) { prev = 3; } @@ -5494,7 +5494,7 @@ CollectionDB::updateStatsTables() if( prev < 8 ) //Versions 6, 7 and 8 all were all attempts to add columns for ATF. his code should do it all. { query( TQString( "CREATE TABLE statistics_fix (" - "url " + textColumnType() + " UNIQUE," + "url " + textColumnType() + " UNITQUE," "createdate INTEGER," "accessdate INTEGER," "percentage FLOAT," @@ -5533,9 +5533,9 @@ CollectionDB::updateStatsTables() int deviceid = exists ? MountPointManager::instance()->getIdForUrl( *it ) : -2; TQString rpath = exists ? MountPointManager::instance()->getRelativePath( deviceid, *it ) : *it; TQString update = TQString( "UPDATE statistics SET deviceid = %1, url = '%2' WHERE " ) - .arg( deviceid ) - .arg( escapeString( rpath ) ); - update += TQString( "url = '%1';" ).arg( escapeString( *it ) ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ); + update += TQString( "url = '%1';" ).tqarg( escapeString( *it ) ); query ( update ); } } @@ -5642,9 +5642,9 @@ CollectionDB::updatePersistentTables() int deviceid = MountPointManager::instance()->getIdForUrl( *it ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, *it ); TQString update = TQString( "UPDATE lyrics SET deviceid = %1, url = '%2' WHERE " ) - .arg( deviceid ) - .arg( escapeString( rpath ) ); - update += TQString( "url = '%1';" ).arg( escapeString( *it ) ); + .tqarg( deviceid ) + .tqarg( escapeString( rpath ) ); + update += TQString( "url = '%1';" ).tqarg( escapeString( *it ) ); query ( update ); } } @@ -5687,12 +5687,12 @@ CollectionDB::updatePersistentTables() query( TQString( "CREATE TABLE tags_labels (" "deviceid INTEGER," "url " + exactTextColumnType() + ", " - "uniqueid " + exactTextColumnType(32) + ", " //m:n relationship, DO NOT MAKE UNIQUE! + "uniqueid " + exactTextColumnType(32) + ", " //m:n relationship, DO NOT MAKE UNITQUE! "labelid INTEGER REFERENCES labels( id ) ON DELETE CASCADE );" ) ); - query( "CREATE UNIQUE INDEX labels_name ON labels( name, type );" ); - query( "CREATE INDEX tags_labels_uniqueid ON tags_labels( uniqueid );" ); //m:n relationship, DO NOT MAKE UNIQUE! - query( "CREATE INDEX tags_labels_url ON tags_labels( url, deviceid );" ); //m:n relationship, DO NOT MAKE UNIQUE! + query( "CREATE UNITQUE INDEX labels_name ON labels( name, type );" ); + query( "CREATE INDEX tags_labels_uniqueid ON tags_labels( uniqueid );" ); //m:n relationship, DO NOT MAKE UNITQUE! + query( "CREATE INDEX tags_labels_url ON tags_labels( url, deviceid );" ); //m:n relationship, DO NOT MAKE UNITQUE! } if ( PersistentVersion.toInt() < 18 ) { @@ -5701,7 +5701,7 @@ CollectionDB::updatePersistentTables() } if ( PersistentVersion.toInt() < 19 ) { - query( "CREATE INDEX tags_labels_labelid ON tags_labels( labelid );" ); //m:n relationship, DO NOT MAKE UNIQUE! + query( "CREATE INDEX tags_labels_labelid ON tags_labels( labelid );" ); //m:n relationship, DO NOT MAKE UNITQUE! } //Up to date. Keep this number \/ in sync! if ( PersistentVersion.toInt() > 19 || PersistentVersion.toInt() < 0 ) @@ -5729,12 +5729,12 @@ CollectionDB::updatePodcastTables() { createPodcastTablesV2( true ); query( "INSERT INTO podcastchannels_fix SELECT url,title,weblink,image,comment," - "copyright,parent,directory,autoscan,fetchtype,autotransfer,haspurge," + "copyright,tqparent,directory,autoscan,fetchtype,autotransfer,haspurge," "purgecount FROM podcastchannels;" ); - query( "INSERT INTO podcastepisodes_fix SELECT id,url,localurl,parent,guid,title," + query( "INSERT INTO podcastepisodes_fix SELECT id,url,localurl,tqparent,guid,title," "subtitle,composer,comment,filetype,createdate,length,size,isNew FROM " "podcastepisodes;" ); - query( "INSERT INTO podcastfolders_fix SELECT id,name,parent,isOpen FROM podcastfolders;" ); + query( "INSERT INTO podcastfolders_fix SELECT id,name,tqparent,isOpen FROM podcastfolders;" ); dropPodcastTablesV2(); createPodcastTablesV2( false ); query( "INSERT INTO podcastchannels SELECT * FROM podcastchannels_fix;" ); @@ -5767,8 +5767,8 @@ CollectionDB::vacuum() void CollectionDB::destroy() { - //do we need or want to delete the actual connection objects as well as clearing them from the QMap? - //or does QMap's clear function delete them? + //do we need or want to delete the actual connection objects as well as clearing them from the TQMap? + //or does TQMap's clear function delete them? //this situation is not at all likely to happen often, so leaving them might be okay to prevent a //thread from having its connection torn out from under it...not likely, but possible //and leaving it should not end up eating much memory at all @@ -5830,7 +5830,7 @@ CollectionDB::customEvent( TQCustomEvent *e ) } -QString +TQString CollectionDB::loadHashFile( const TQCString& hash, uint width ) { //debug() << "loadHashFile: " << hash << " - " << width << endl; @@ -5853,7 +5853,7 @@ CollectionDB::loadHashFile( const TQCString& hash, uint width ) } else if ( TQFileInfo( full ).isReadable() ) { //debug() << "loadHashFile: scaling: " << full << endl; TQImage image( full ); - if ( image.smoothScale( width, width, TQImage::ScaleMin ).save( path, "PNG" ) ) { + if ( image.smoothScale( width, width, TQ_ScaleMin ).save( path, "PNG" ) ) { //debug() << "loadHashFile: scaled: " << path << endl; return path; } @@ -5882,7 +5882,7 @@ CollectionDB::extractEmbeddedImage( const MetaBundle &trackInformation, TQCStrin return false; } -QStringList +TQStringList CollectionDB::getLabels( const TQString &url, const uint type ) { int deviceid = MountPointManager::instance()->getIdForUrl( url ); @@ -5890,7 +5890,7 @@ CollectionDB::getLabels( const TQString &url, const uint type ) return query( TQString( "SELECT labels.name FROM labels " "LEFT JOIN tags_labels ON labels.id = tags_labels.labelid " "WHERE labels.type = %1 AND tags_labels.deviceid = %2 AND tags_labels.url = '%3';" ) - .arg( type ).arg( deviceid ).arg( escapeString( rpath ) ) ); + .tqarg( type ).tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); } void @@ -5911,7 +5911,7 @@ CollectionDB::cleanLabels() } query( TQString( "DELETE FROM labels " "WHERE labels.id IN ( %1 );" ) - .arg( ids ) ); + .tqarg( ids ) ); } } @@ -5921,7 +5921,7 @@ CollectionDB::setLabels( const TQString &url, const TQStringList &labels, const DEBUG_BLOCK int deviceid = MountPointManager::instance()->getIdForUrl( url ); TQString rpath = escapeString( MountPointManager::instance()->getRelativePath( deviceid, url ) ); - TQStringList labelIds = query( TQString( "SELECT id FROM labels WHERE type = %1;" ).arg( type ) ); + TQStringList labelIds = query( TQString( "SELECT id FROM labels WHERE type = %1;" ).tqarg( type ) ); TQString ids; if ( !labelIds.isEmpty() ) { @@ -5934,20 +5934,20 @@ CollectionDB::setLabels( const TQString &url, const TQStringList &labels, const //TODO: max: add uniqueid handling query( TQString( "DELETE FROM tags_labels " "WHERE tags_labels.labelid IN (%1) AND tags_labels.deviceid = %2 AND tags_labels.url = '%3';" ) - .arg( ids, TQString::number(deviceid), rpath ) ); + .tqarg( ids, TQString::number(deviceid), rpath ) ); } foreach( labels ) { int id = query( TQString( "SELECT id FROM labels WHERE type = %1 AND name = '%2';" ) - .arg( type ).arg( escapeString( *it ) ) ).first().toInt(); + .tqarg( type ).tqarg( escapeString( *it ) ) ).first().toInt(); if ( !id ) { id = insert( TQString( "INSERT INTO labels( name, type ) VALUES ( '%2', %1 );" ) - .arg( type ).arg( escapeString( *it ) ), "labels" ); + .tqarg( type ).tqarg( escapeString( *it ) ), "labels" ); } insert( TQString( "INSERT INTO tags_labels( labelid, deviceid, url, uniqueid ) VALUES ( %1, %2, '%3', '%4' );" ) - .arg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), 0 ); + .tqarg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), 0 ); } emit labelsChanged( url ); @@ -5962,10 +5962,10 @@ CollectionDB::removeLabels( const TQString &url, const TQStringList &labels, con TQString sql = TQString( "DELETE FROM tags_labels " "FROM tags_labels AS t LEFT JOIN labels AS l ON t.labelid = l.id " "WHERE l.type = %1 AND t.deviceid = %2 AND t.url = '%3' AND ( 0" ) - .arg( type ).arg( deviceid ).arg( rpath ); + .tqarg( type ).tqarg( deviceid ).tqarg( rpath ); foreach( labels ) { - sql += TQString( " OR l.name = '%1'" ).arg( escapeString( *it ) ); + sql += TQString( " OR l.name = '%1'" ).tqarg( escapeString( *it ) ); } sql += ");"; query( sql ); @@ -5981,53 +5981,53 @@ CollectionDB::addLabel( const TQString &url, const TQString &label, const TQStri TQString rpath = escapeString( MountPointManager::instance()->getRelativePath( deviceid, url ) ); int id = query( TQString( "SELECT id FROM labels WHERE type = %1 AND name = '%2';" ) - .arg( type ).arg( escapeString( label ) ) ).first().toInt(); + .tqarg( type ).tqarg( escapeString( label ) ) ).first().toInt(); bool labelAlreadyExists = id > 0; if ( !id ) { id = insert( TQString( "INSERT INTO labels( name, type ) VALUES ( '%2', %1 );" ) - .arg( type ).arg( escapeString( label ) ), "labels" ); + .tqarg( type ).tqarg( escapeString( label ) ), "labels" ); } if ( labelAlreadyExists ) { //we can return if the link between the tags row and the labels row already exists int count = query( TQString( "SELECT COUNT(*) FROM tags_labels WHERE labelid = %1 AND deviceid = %2 AND url = '%3';" ) - .arg( id ).arg( deviceid ).arg( rpath ) ).first().toInt(); + .tqarg( id ).tqarg( deviceid ).tqarg( rpath ) ).first().toInt(); if ( count ) return false; } insert( TQString( "INSERT INTO tags_labels( labelid, deviceid, url, uniqueid ) VALUES ( %1, %2, '%3', '%4' );" ) - .arg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), "tags_labels" ); + .tqarg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), "tags_labels" ); emit labelsChanged( url ); return true; } -QStringList +TQStringList CollectionDB::favoriteLabels( int type, int count ) { return query( TQString( "SELECT labels.name, count( tags_labels.labelid ) " "FROM labels LEFT JOIN tags_labels ON labels.id = tags_labels.labelid " "WHERE labels.type = %1 GROUP BY labels.name " "ORDER BY count(tags_labels.labelid) DESC LIMIT %2;" ) - .arg( TQString::number( type ), TQString::number( count ) ) ); + .tqarg( TQString::number( type ), TQString::number( count ) ) ); } -QDir +TQDir CollectionDB::largeCoverDir() //static { return TQDir( Amarok::saveLocation( "albumcovers/large/" ) ); } -QDir +TQDir CollectionDB::tagCoverDir() //static { return TQDir( Amarok::saveLocation( "albumcovers/tagcover/" ) ); } -QDir +TQDir CollectionDB::cacheCoverDir() //static { return TQDir( Amarok::saveLocation( "albumcovers/cache/" ) ); @@ -6062,11 +6062,11 @@ SqliteConnection::SqliteConnection( const SqliteConfig* config ) { TQString format; file.readLine( format, 50 ); - if ( !format.startsWith( "SQLite format 3" ) ) + if ( !format.startsWith( "STQLite format 3" ) ) { warning() << "Database versions incompatible. Removing and rebuilding database.\n"; } - else if ( sqlite3_open( path, &m_db ) != SQLITE_OK ) + else if ( sqlite3_open( path, &m_db ) != STQLITE_OK ) { warning() << "Database file corrupt. Removing and rebuilding database.\n"; sqlite3_close( m_db ); @@ -6079,24 +6079,24 @@ SqliteConnection::SqliteConnection( const SqliteConfig* config ) { // Remove old db file; create new TQFile::remove( path ); - if ( sqlite3_open( path, &m_db ) == SQLITE_OK ) + if ( sqlite3_open( path, &m_db ) == STQLITE_OK ) { m_initialized = true; } } if ( m_initialized ) { - if( sqlite3_create_function(m_db, "rand", 0, SQLITE_UTF8, NULL, sqlite_rand, NULL, NULL) != SQLITE_OK ) + if( sqlite3_create_function(m_db, "rand", 0, STQLITE_UTF8, NULL, sqlite_rand, NULL, NULL) != STQLITE_OK ) m_initialized = false; - if( sqlite3_create_function(m_db, "power", 2, SQLITE_UTF8, NULL, sqlite_power, NULL, NULL) != SQLITE_OK ) + if( sqlite3_create_function(m_db, "power", 2, STQLITE_UTF8, NULL, sqlite_power, NULL, NULL) != STQLITE_OK ) m_initialized = false; - if ( sqlite3_create_function(m_db, "like", 2, SQLITE_UTF8, NULL, sqlite_like_new, NULL, NULL) != SQLITE_OK ) + if ( sqlite3_create_function(m_db, "like", 2, STQLITE_UTF8, NULL, sqlite_like_new, NULL, NULL) != STQLITE_OK ) m_initialized = false; - if ( sqlite3_create_function(m_db, "like", 3, SQLITE_UTF8, NULL, sqlite_like_new, NULL, NULL) != SQLITE_OK ) + if ( sqlite3_create_function(m_db, "like", 3, STQLITE_UTF8, NULL, sqlite_like_new, NULL, NULL) != STQLITE_OK ) m_initialized = false; } - //optimization for speeding up SQLite + //optimization for speeding up STQLite query( "PRAGMA default_synchronous = OFF;" ); } @@ -6128,11 +6128,11 @@ TQStringList SqliteConnection::query( const TQString& statement, bool /*suppress } error = sqlite3_prepare( m_db, statement.utf8(), -1, &stmt, &tail ); } - while ( SQLITE_BUSY==error && busyCnt++ < 120 ); + while ( STQLITE_BUSY==error && busyCnt++ < 120 ); - if ( error != SQLITE_OK ) + if ( error != STQLITE_OK ) { - if ( SQLITE_BUSY==error ) + if ( STQLITE_BUSY==error ) Debug::error() << "Gave up waiting for lock to clear" << endl; Debug::error() << k_funcinfo << " sqlite3_compile error:" << endl; Debug::error() << sqlite3_errmsg( m_db ) << endl; @@ -6149,7 +6149,7 @@ TQStringList SqliteConnection::query( const TQString& statement, bool /*suppress { error = sqlite3_step( stmt ); - if ( error == SQLITE_BUSY ) + if ( error == STQLITE_BUSY ) { if ( busyCnt++ > 120 ) { Debug::error() << "Busy-counter has reached maximum. Aborting this sql statement!\n"; @@ -6159,9 +6159,9 @@ TQStringList SqliteConnection::query( const TQString& statement, bool /*suppress debug() << "sqlite3_step: BUSY counter: " << busyCnt << endl; continue; } - if ( error == SQLITE_MISUSE ) + if ( error == STQLITE_MISUSE ) debug() << "sqlite3_step: MISUSE" << endl; - if ( error == SQLITE_DONE || error == SQLITE_ERROR ) + if ( error == STQLITE_DONE || error == STQLITE_ERROR ) break; //iterate over columns @@ -6173,17 +6173,17 @@ TQStringList SqliteConnection::query( const TQString& statement, bool /*suppress //deallocate vm resources rc = sqlite3_finalize( stmt ); - if ( error != SQLITE_DONE && rc != SQLITE_SCHEMA ) + if ( error != STQLITE_DONE && rc != STQLITE_SCHEMA ) { Debug::error() << k_funcinfo << "sqlite_step error.\n"; Debug::error() << sqlite3_errmsg( m_db ) << endl; Debug::error() << "on query: " << statement << endl; values = TQStringList(); } - if ( rc == SQLITE_SCHEMA ) + if ( rc == STQLITE_SCHEMA ) { retryCnt++; - debug() << "SQLITE_SCHEMA error occurred on query: " << statement << endl; + debug() << "STQLITE_SCHEMA error occurred on query: " << statement << endl; if ( retryCnt < 10 ) debug() << "Retrying now." << endl; else @@ -6195,7 +6195,7 @@ TQStringList SqliteConnection::query( const TQString& statement, bool /*suppress } } } - while ( rc == SQLITE_SCHEMA && retryCnt < 10 ); + while ( rc == STQLITE_SCHEMA && retryCnt < 10 ); return values; } @@ -6220,11 +6220,11 @@ int SqliteConnection::insert( const TQString& statement, const TQString& /* tabl } error = sqlite3_prepare( m_db, statement.utf8(), -1, &stmt, &tail ); } - while ( SQLITE_BUSY==error && busyCnt++ < 120 ); + while ( STQLITE_BUSY==error && busyCnt++ < 120 ); - if ( error != SQLITE_OK ) + if ( error != STQLITE_OK ) { - if ( SQLITE_BUSY==error ) + if ( STQLITE_BUSY==error ) Debug::error() << "Gave up waiting for lock to clear" << endl; Debug::error() << k_funcinfo << " sqlite3_compile error:" << endl; Debug::error() << sqlite3_errmsg( m_db ) << endl; @@ -6239,7 +6239,7 @@ int SqliteConnection::insert( const TQString& statement, const TQString& /* tabl { error = sqlite3_step( stmt ); - if ( error == SQLITE_BUSY ) + if ( error == STQLITE_BUSY ) { if ( busyCnt++ > 120 ) { Debug::error() << "Busy-counter has reached maximum. Aborting this sql statement!\n"; @@ -6248,24 +6248,24 @@ int SqliteConnection::insert( const TQString& statement, const TQString& /* tabl ::usleep( 100000 ); // Sleep 100 msec debug() << "sqlite3_step: BUSY counter: " << busyCnt << endl; } - if ( error == SQLITE_MISUSE ) + if ( error == STQLITE_MISUSE ) debug() << "sqlite3_step: MISUSE" << endl; - if ( error == SQLITE_DONE || error == SQLITE_ERROR ) + if ( error == STQLITE_DONE || error == STQLITE_ERROR ) break; } //deallocate vm resources rc = sqlite3_finalize( stmt ); - if ( error != SQLITE_DONE && rc != SQLITE_SCHEMA) + if ( error != STQLITE_DONE && rc != STQLITE_SCHEMA) { Debug::error() << k_funcinfo << "sqlite_step error.\n"; Debug::error() << sqlite3_errmsg( m_db ) << endl; Debug::error() << "on insert: " << statement << endl; } - if ( rc == SQLITE_SCHEMA ) + if ( rc == STQLITE_SCHEMA ) { retryCnt++; - debug() << "SQLITE_SCHEMA error occurred on insert: " << statement << endl; + debug() << "STQLITE_SCHEMA error occurred on insert: " << statement << endl; if ( retryCnt < 10 ) debug() << "Retrying now." << endl; else @@ -6276,7 +6276,7 @@ int SqliteConnection::insert( const TQString& statement, const TQString& /* tabl } } } - while ( SQLITE_SCHEMA == rc && retryCnt < 10 ); + while ( STQLITE_SCHEMA == rc && retryCnt < 10 ); return sqlite3_last_insert_rowid( m_db ); } @@ -6291,7 +6291,7 @@ void SqliteConnection::sqlite_rand(sqlite3_context *context, int /*argc*/, sqlit void SqliteConnection::sqlite_power(sqlite3_context *context, int argc, sqlite3_value **argv) { Q_ASSERT( argc==2 ); - if( sqlite3_value_type(argv[0])==SQLITE_NULL || sqlite3_value_type(argv[1])==SQLITE_NULL ) { + if( sqlite3_value_type(argv[0])==STQLITE_NULL || sqlite3_value_type(argv[1])==STQLITE_NULL ) { sqlite3_result_null(context); return; } @@ -6318,12 +6318,12 @@ void SqliteConnection::sqlite_like_new( sqlite3_context *context, int argc, sqli pattern = pattern.left( pattern.length() - 1 ); if( argc == 3 ) // The function is given an escape character. In likeCondition() it defaults to '/' - pattern.replace( "/%", "%" ).replace( "/_", "_" ).replace( "//", "/" ); + pattern.tqreplace( "/%", "%" ).tqreplace( "/_", "_" ).tqreplace( "//", "/" ); int result = 0; - if ( begin && end ) result = ( text.find( pattern, 0, 0 ) != -1); - else if ( begin ) result = text.endsWith( pattern, 0 ); - else if ( end ) result = text.startsWith( pattern, 0 ); + if ( begin && end ) result = ( text.tqfind( pattern, 0, 0 ) != -1); + else if ( begin ) result = text.tqendsWith( pattern, 0 ); + else if ( end ) result = text.tqstartsWith( pattern, 0 ); else result = ( text.lower() == pattern.lower() ); sqlite3_result_int( context, result ); @@ -6356,7 +6356,7 @@ MySqlConnection::MySqlConnection( const MySqlConfig* config ) { m_initialized = true; -#if MYSQL_VERSION_ID >= 40113 +#if MYSTQL_VERSION_ID >= 40113 // now set the right charset for the connection TQStringList my_qslist = query( "SHOW VARIABLES LIKE 'character_set_database'" ); if( !my_qslist.isEmpty() && !mysql_set_character_set( m_db, const_cast<char *>( my_qslist[1].latin1() ) ) ) @@ -6409,11 +6409,11 @@ TQStringList MySqlConnection::query( const TQString& statement, bool suppressDeb if ( !mysql_query( m_db, statement.utf8() ) ) { - MYSQL_RES* result; + MYSTQL_RES* result; if ( ( result = mysql_use_result( m_db ) ) ) { int number = mysql_field_count( m_db ); - MYSQL_ROW row; + MYSTQL_ROW row; while ( ( row = mysql_fetch_row( result ) ) ) { for ( int i = 0; i < number; i++ ) @@ -6427,7 +6427,7 @@ TQStringList MySqlConnection::query( const TQString& statement, bool suppressDeb if ( mysql_field_count( m_db ) != 0 ) { if ( !suppressDebug ) - debug() << "MYSQL QUERY FAILED: " << mysql_error( m_db ) << "\n" << "FAILED QUERY: " << statement << "\n"; + debug() << "MYSQL TQUERY FAILED: " << mysql_error( m_db ) << "\n" << "FAILED TQUERY: " << statement << "\n"; values = TQStringList(); } } @@ -6436,7 +6436,7 @@ TQStringList MySqlConnection::query( const TQString& statement, bool suppressDeb else { if ( !suppressDebug ) - debug() << "MYSQL QUERY FAILED: " << mysql_error( m_db ) << "\n" << "FAILED QUERY: " << statement << "\n"; + debug() << "MYSQL TQUERY FAILED: " << mysql_error( m_db ) << "\n" << "FAILED TQUERY: " << statement << "\n"; values = TQStringList(); } @@ -6526,15 +6526,15 @@ TQStringList PostgresqlConnection::query( const TQString& statement, bool suppre if (result == NULL) { if ( !suppressDebug ) - debug() << "POSTGRESQL QUERY FAILED: " << PQerrorMessage( m_db ) << "\n" << "FAILED QUERY: " << statement << "\n"; + debug() << "POSTGRESQL TQUERY FAILED: " << PQerrorMessage( m_db ) << "\n" << "FAILED TQUERY: " << statement << "\n"; return values; } - status = PQresultStatus(result); + status = PQresulttqStatus(result); if ((status != PGRES_COMMAND_OK) && (status != PGRES_TUPLES_OK)) { if ( !suppressDebug ) - debug() << "POSTGRESQL QUERY FAILED: " << PQerrorMessage( m_db ) << "\n" << "FAILED QUERY: " << statement << "\n"; + debug() << "POSTGRESQL TQUERY FAILED: " << PQerrorMessage( m_db ) << "\n" << "FAILED TQUERY: " << statement << "\n"; PQclear(result); return values; } @@ -6579,7 +6579,7 @@ int PostgresqlConnection::insert( const TQString& statement, const TQString& tab return 0; } - status = PQresultStatus(result); + status = PQresulttqStatus(result); if (status != PGRES_COMMAND_OK) { debug() << "POSTGRESQL INSERT FAILED: " << PQerrorMessage( m_db ) << "\n" << "FAILED SQL: " << statement << "\n"; @@ -6591,9 +6591,9 @@ int PostgresqlConnection::insert( const TQString& statement, const TQString& tab if (table == NULL) return 0; TQString _table = table; - if (table.find("_temp") > 0) _table = table.left(table.find("_temp")); + if (table.tqfind("_temp") > 0) _table = table.left(table.tqfind("_temp")); - curvalSql = TQString("SELECT currval('%1_seq');").arg(_table); + curvalSql = TQString("SELECT currval('%1_seq');").tqarg(_table); result = PQexec(m_db, curvalSql.utf8()); if (result == NULL) { @@ -6601,7 +6601,7 @@ int PostgresqlConnection::insert( const TQString& statement, const TQString& tab return 0; } - status = PQresultStatus(result); + status = PQresulttqStatus(result); if (status != PGRES_TUPLES_OK) { debug() << "POSTGRESQL INSERT FAILED: " << PQerrorMessage( m_db ) << "\n" << "FAILED SQL: " << curvalSql << "\n"; @@ -6733,7 +6733,7 @@ QueryBuilder::linkTables( int tables ) //if ( !m_url.isEmpty() ) { // TQString url = TQString( '.' ) + m_url; // m_tables += TQString( " OR statistics.deviceid = -1 AND statistics.url = '%1'" ) - // .arg( CollectionDB::instance()->escapeString( url ) ); + // .tqarg( CollectionDB::instance()->escapeString( url ) ); //} } if ( tables & tabLyrics ) @@ -6750,7 +6750,7 @@ QueryBuilder::linkTables( int tables ) void -QueryBuilder::addReturnValue( int table, Q_INT64 value, bool caseSensitive /* = false, unless value refers to a string */ ) +QueryBuilder::addReturnValue( int table, TQ_INT64 value, bool caseSensitive /* = false, unless value refers to a string */ ) { caseSensitive |= value == valName || value == valTitle || value == valComment; @@ -6780,7 +6780,7 @@ QueryBuilder::addReturnValue( int table, Q_INT64 value, bool caseSensitive /* = } void -QueryBuilder::addReturnFunctionValue( int function, int table, Q_INT64 value) +QueryBuilder::addReturnFunctionValue( int function, int table, TQ_INT64 value) { // translate NULL and 0 values into the default value for percentage/rating // First translate 0 to NULL via NULLIF, then NULL to default via COALESCE @@ -6827,7 +6827,7 @@ QueryBuilder::addURLFilters( const TQStringList& filter ) int deviceid = MountPointManager::instance()->getIdForUrl( filter[i] ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid , filter[i] ); m_where += "OR (tags.url = '" + CollectionDB::instance()->escapeString( rpath ) + "' "; - m_where += TQString( "AND tags.deviceid = %1 ) " ).arg( TQString::number( deviceid ) ); + m_where += TQString( "AND tags.deviceid = %1 ) " ).tqarg( TQString::number( deviceid ) ); //TODO MountPointManager fix this } @@ -6862,7 +6862,7 @@ QueryBuilder::setGoogleFilter( int defaultTables, TQString query ) bool exact = false; // enable for numeric values int table = -1; - Q_INT64 value = -1; + TQ_INT64 value = -1; if( e.field == "artist" ) table = tabArtist; else if( e.field == "composer" ) @@ -7028,7 +7028,7 @@ QueryBuilder::addFilter( int tables, const TQString& filter ) if ( tables & tabLabels ) m_where += "OR labels.name " + CollectionDB::likeCondition( filter, true, true ); - if ( i18n( "Unknown" ).contains( filter, false ) ) + if ( i18n( "Unknown" ).tqcontains( filter, false ) ) { if ( tables & tabAlbum ) m_where += "OR album.name = '' "; @@ -7043,8 +7043,8 @@ QueryBuilder::addFilter( int tables, const TQString& filter ) if ( tables & tabSong ) m_where += "OR tags.title = '' "; } - if ( ( tables & tabArtist ) && i18n( "Various Artists" ).contains( filter, false ) ) - m_where += TQString( "OR tags.sampler = %1 " ).arg( CollectionDB::instance()->boolT() ); + if ( ( tables & tabArtist ) && i18n( "Various Artists" ).tqcontains( filter, false ) ) + m_where += TQString( "OR tags.sampler = %1 " ).tqarg( CollectionDB::instance()->boolT() ); m_where += " ) "; } @@ -7052,9 +7052,9 @@ QueryBuilder::addFilter( int tables, const TQString& filter ) } void -QueryBuilder::addFilter( int tables, Q_INT64 value, const TQString& filter, int mode, bool exact ) +QueryBuilder::addFilter( int tables, TQ_INT64 value, const TQString& filter, int mode, bool exact ) { - //true for INTEGER fields (see comment of coalesceField(int, Q_INT64) + //true for INTEGER fields (see comment of coalesceField(int, TQ_INT64) bool useCoalesce = coalesceField( tables, value ); m_where += ANDslashOR() + " ( "; @@ -7080,12 +7080,12 @@ QueryBuilder::addFilter( int tables, Q_INT64 value, const TQString& filter, int } if( coalesceField( tables, value ) ) - m_where += TQString( "COALESCE(%1.%2,0) " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s; + m_where += TQString( "COALESCE(%1.%2,0) " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s; else - m_where += TQString( "%1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s; + m_where += TQString( "%1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s; - if ( !exact && (value & valName) && mode == modeNormal && i18n( "Unknown").contains( filter, false ) ) - m_where += TQString( "OR %1.%2 = '' " ).arg( tableName( tables ) ).arg( valueName( value ) ); + if ( !exact && (value & valName) && mode == modeNormal && i18n( "Unknown").tqcontains( filter, false ) ) + m_where += TQString( "OR %1.%2 = '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); m_where += " ) "; @@ -7118,7 +7118,7 @@ QueryBuilder::addFilters( int tables, const TQStringList& filter ) if ( tables & tabLabels ) m_where += "OR labels.name " + CollectionDB::likeCondition( filter[i], true, true ); - if ( i18n( "Unknown" ).contains( filter[i], false ) ) + if ( i18n( "Unknown" ).tqcontains( filter[i], false ) ) { if ( tables & tabAlbum ) m_where += "OR album.name = '' "; @@ -7133,7 +7133,7 @@ QueryBuilder::addFilters( int tables, const TQStringList& filter ) if ( tables & tabSong ) m_where += "OR tags.title = '' "; } - if ( i18n( "Various Artists" ).contains( filter[ i ], false ) && ( tables & tabArtist ) ) + if ( i18n( "Various Artists" ).tqcontains( filter[ i ], false ) && ( tables & tabArtist ) ) m_where += "OR tags.sampler = " + CollectionDB::instance()->boolT() + ' '; m_where += " ) "; } @@ -7167,7 +7167,7 @@ QueryBuilder::excludeFilter( int tables, const TQString& filter ) if ( tables & tabLabels ) m_where += "AND labels.name NOT " + CollectionDB::likeCondition( filter, true, true ); - if ( i18n( "Unknown" ).contains( filter, false ) ) + if ( i18n( "Unknown" ).tqcontains( filter, false ) ) { if ( tables & tabAlbum ) m_where += "AND album.name <> '' "; @@ -7183,7 +7183,7 @@ QueryBuilder::excludeFilter( int tables, const TQString& filter ) m_where += "AND tags.title <> '' "; } - if ( i18n( "Various Artists" ).contains( filter, false ) && ( tables & tabArtist ) ) + if ( i18n( "Various Artists" ).tqcontains( filter, false ) && ( tables & tabArtist ) ) m_where += "AND tags.sampler = " + CollectionDB::instance()->boolF() + ' '; @@ -7194,7 +7194,7 @@ QueryBuilder::excludeFilter( int tables, const TQString& filter ) } void -QueryBuilder::excludeFilter( int tables, Q_INT64 value, const TQString& filter, int mode, bool exact ) +QueryBuilder::excludeFilter( int tables, TQ_INT64 value, const TQString& filter, int mode, bool exact ) { m_where += ANDslashOR() + " ( "; @@ -7217,12 +7217,12 @@ QueryBuilder::excludeFilter( int tables, Q_INT64 value, const TQString& filter, } if( coalesceField( tables, value ) ) - m_where += TQString( "COALESCE(%1.%2,0) " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s; + m_where += TQString( "COALESCE(%1.%2,0) " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s; else - m_where += TQString( "%1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s; + m_where += TQString( "%1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s; - if ( !exact && (value & valName) && mode == modeNormal && i18n( "Unknown").contains( filter, false ) ) - m_where += TQString( "AND %1.%2 <> '' " ).arg( tableName( tables ) ).arg( valueName( value ) ); + if ( !exact && (value & valName) && mode == modeNormal && i18n( "Unknown").tqcontains( filter, false ) ) + m_where += TQString( "AND %1.%2 <> '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); m_where += " ) "; @@ -7269,7 +7269,7 @@ QueryBuilder::addMatch( int tables, const TQString& match, bool interpretUnknown void -QueryBuilder::addMatch( int tables, Q_INT64 value, const TQString& match, bool interpretUnknown /* = true */, bool caseSensitive /* = true */ ) +QueryBuilder::addMatch( int tables, TQ_INT64 value, const TQString& match, bool interpretUnknown /* = true */, bool caseSensitive /* = true */ ) { m_where += ANDslashOR() + " ( " + CollectionDB::instance()->boolF() + ' '; if ( value & valURL ) @@ -7283,27 +7283,27 @@ QueryBuilder::addMatch( int tables, Q_INT64 value, const TQString& match, bool i //which is automatially appended if m_showAll = false m_showAll = true; m_where += TQString( "OR %1.%2 " ) - .arg( tableName( tables ) ) - .arg( valueName( value ) ); + .tqarg( tableName( tables ) ) + .tqarg( valueName( value ) ); m_where += caseSensitive ? CollectionDB::exactCondition( rpath ) : CollectionDB::likeCondition( rpath ); - m_where += TQString( " AND %1.deviceid = %2 " ).arg( tableName( tables ) ).arg( deviceid ); + m_where += TQString( " AND %1.deviceid = %2 " ).tqarg( tableName( tables ) ).tqarg( deviceid ); if ( deviceid != -1 ) { //handle corner case TQString rpath2( '.' + match ); - m_where += TQString( " OR %1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ); + m_where += TQString( " OR %1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); m_where += caseSensitive ? CollectionDB::exactCondition( rpath2 ) : CollectionDB::likeCondition( rpath2 ); - m_where += TQString( " AND %1.deviceid = -1 " ).arg( tableName( tables ) ); + m_where += TQString( " AND %1.deviceid = -1 " ).tqarg( tableName( tables ) ); } } else { - m_where += TQString( "OR %1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ); + m_where += TQString( "OR %1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); m_where += caseSensitive ? CollectionDB::exactCondition( match ) : CollectionDB::likeCondition( match ); } if ( ( value & valName ) && interpretUnknown && match == i18n( "Unknown" ) ) - m_where += TQString( "OR %1.%2 = '' " ).arg( tableName( tables ) ).arg( valueName( value ) ); + m_where += TQString( "OR %1.%2 = '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); m_where += " ) "; @@ -7383,7 +7383,7 @@ QueryBuilder::excludeMatch( int tables, const TQString& match ) void -QueryBuilder::exclusiveFilter( int tableMatching, int tableNotMatching, Q_INT64 value ) +QueryBuilder::exclusiveFilter( int tableMatching, int tableNotMatching, TQ_INT64 value ) { m_where += " AND "; m_where += tableName( tableNotMatching ) + '.'; @@ -7396,9 +7396,9 @@ QueryBuilder::exclusiveFilter( int tableMatching, int tableNotMatching, Q_INT64 void -QueryBuilder::addNumericFilter(int tables, Q_INT64 value, const TQString &n, +QueryBuilder::addNumericFilter(int tables, TQ_INT64 value, const TQString &n, int mode /* = modeNormal */, - const TQString &endRange /* = TQString::null */ ) + const TQString &endRange /* = TQString() */ ) { m_where.append( ANDslashOR() ).append( " ( " ); @@ -7442,8 +7442,8 @@ QueryBuilder::setOptions( int options ) if ( options & optNoCompilations || options & optOnlyCompilations ) m_linkTables |= tabSong; - if ( options & optNoCompilations ) m_where += TQString("AND tags.sampler = %1 ").arg(CollectionDB::instance()->boolF()); - if ( options & optOnlyCompilations ) m_where += TQString("AND tags.sampler = %1 ").arg(CollectionDB::instance()->boolT()); + if ( options & optNoCompilations ) m_where += TQString("AND tags.sampler = %1 ").tqarg(CollectionDB::instance()->boolF()); + if ( options & optOnlyCompilations ) m_where += TQString("AND tags.sampler = %1 ").tqarg(CollectionDB::instance()->boolT()); if (CollectionDB::instance()->getType() == DbConnection::postgresql && options & optRemoveDuplicates && options & optRandomize) { @@ -7468,7 +7468,7 @@ QueryBuilder::setOptions( int options ) void -QueryBuilder::sortBy( int table, Q_INT64 value, bool descending ) +QueryBuilder::sortBy( int table, TQ_INT64 value, bool descending ) { //shall we sort case-sensitively? (not for integer columns!) bool b = true; @@ -7509,7 +7509,7 @@ QueryBuilder::sortBy( int table, Q_INT64 value, bool descending ) } void -QueryBuilder::sortByFunction( int function, int table, Q_INT64 value, bool descending ) +QueryBuilder::sortByFunction( int function, int table, TQ_INT64 value, bool descending ) { // This function should be used with the equivalent addReturnFunctionValue (with the same function on same values) // since it uses the "func(table.value) AS functablevalue" definition. @@ -7569,7 +7569,7 @@ QueryBuilder::sortByFunction( int function, int table, Q_INT64 value, bool desce } void -QueryBuilder::groupBy( int table, Q_INT64 value ) +QueryBuilder::groupBy( int table, TQ_INT64 value ) { if ( !m_group.isEmpty() ) m_group += ','; @@ -7587,7 +7587,7 @@ QueryBuilder::groupBy( int table, Q_INT64 value ) } void -QueryBuilder::having( int table, Q_INT64 value, int function, int mode, const TQString& match ) +QueryBuilder::having( int table, TQ_INT64 value, int function, int mode, const TQString& match ) { if( !m_having.isEmpty() ) m_having += " AND "; @@ -7617,11 +7617,11 @@ QueryBuilder::having( int table, Q_INT64 value, int function, int mode, const TQ void QueryBuilder::setLimit( int startPos, int length ) { - m_limit = TQString( " LIMIT %2 OFFSET %1 " ).arg( startPos ).arg( length ); + m_limit = TQString( " LIMIT %2 OFFSET %1 " ).tqarg( startPos ).tqarg( length ); } void -QueryBuilder::shuffle( int table, Q_INT64 value ) +QueryBuilder::shuffle( int table, TQ_INT64 value ) { if ( !m_sort.isEmpty() ) m_sort += " , "; if ( table == 0 || value == 0 ) { @@ -7645,9 +7645,9 @@ QueryBuilder::shuffle( int table, Q_INT64 value ) // non-zero), and finally POWER(...) is used instead of 1-POWER(...) because it // only changes the order type. m_sort += TQString("POWER( %1, 1.0 / (%2.%3 + 1) ) DESC") - .arg( CollectionDB::instance()->randomFunc() ) - .arg( tableName( table ) ) - .arg( valueName( value ) ); + .tqarg( CollectionDB::instance()->randomFunc() ) + .tqarg( tableName( table ) ) + .tqarg( valueName( value ) ); m_linkTables |= table; } @@ -7659,8 +7659,8 @@ QueryBuilder::shuffle( int table, Q_INT64 value ) const int QueryBuilder::dragFieldCount = 21; -QString -QueryBuilder::dragSQLFields() +TQString +QueryBuilder::dragSTQLFields() { return "tags.url, tags.deviceid, album.name, artist.name, composer.name, " "genre.name, tags.title, year.name, " @@ -7672,7 +7672,7 @@ QueryBuilder::dragSQLFields() } void -QueryBuilder::initSQLDrag() +QueryBuilder::initSTQLDrag() { clear(); addReturnValue( QueryBuilder::tabSong, QueryBuilder::valURL ); @@ -7715,7 +7715,7 @@ QueryBuilder::buildQuery( bool withDeviceidPlaceholder ) m_query += CollectionDB::instance()->boolT(); m_query += ' '; m_query += m_where; - if ( !m_showAll && ( m_linkTables & tabSong || m_tables.contains( tableName( tabSong) ) ) ) //Only stuff on mounted devices, unless you use optShowAll + if ( !m_showAll && ( m_linkTables & tabSong || m_tables.tqcontains( tableName( tabSong) ) ) ) //Only stuff on mounted devices, unless you use optShowAll { if ( withDeviceidPlaceholder ) m_query += "(*MountedDeviceSelection*)"; @@ -7743,7 +7743,7 @@ QueryBuilder::buildQuery( bool withDeviceidPlaceholder ) } // get the builded SQL-Query (used in smartplaylisteditor soon) -QString +TQString QueryBuilder::getQuery() { if ( m_query.isEmpty()) @@ -7753,7 +7753,7 @@ QueryBuilder::getQuery() return m_query; } -QStringList +TQStringList QueryBuilder::run() { buildQuery(); @@ -7788,9 +7788,9 @@ QueryBuilder::clear() } -Q_INT64 +TQ_INT64 QueryBuilder::valForFavoriteSorting() { - Q_INT64 favSortBy = valRating; + TQ_INT64 favSortBy = valRating; if ( !AmarokConfig::useScores() && !AmarokConfig::useRatings() ) favSortBy = valPlayCounter; else if( !AmarokConfig::useRatings() ) @@ -7829,9 +7829,9 @@ QueryBuilder::sortByFavoriteAvg() { m_having += " ("; if (AmarokConfig::useRatings() ) m_having += TQString("%1(%2.%3) > 0 OR ") - .arg( functionName( funcAvg ), tableName(tabStats), valueName(valRating) ); + .tqarg( functionName( funcAvg ), tableName(tabStats), valueName(valRating) ); m_having += TQString("%1(%2.%3) > 0") - .arg( functionName( funcAvg ), tableName(tabStats), valueName(valPlayCounter) ); + .tqarg( functionName( funcAvg ), tableName(tabStats), valueName(valPlayCounter) ); m_having += ")"; } @@ -7853,7 +7853,7 @@ searchBit( ValueType value, int numBits ) { return -1; } -QString +TQString QueryBuilder::tableName( int table ) { // optimize for 1 table which is by far the most frequent case @@ -7908,7 +7908,7 @@ QueryBuilder::tableName( int table ) const TQString & -QueryBuilder::valueName( Q_INT64 value ) +QueryBuilder::valueName( TQ_INT64 value ) { static const TQString values[] = { "id", @@ -7939,7 +7939,7 @@ QueryBuilder::valueName( Q_INT64 value ) "sampler", "bpm", "copyright", - "parent", + "tqparent", "weblink", "autoscan", "fetchtype", @@ -7964,12 +7964,12 @@ QueryBuilder::valueName( Q_INT64 value ) /* * Return true if we should call COALESCE(..,0) for this DB field * (field names sourced from the old smartplaylistbrowser.cpp code) - * Warning: addFilter( int, Q_INT64, const TQString&, int bool ) + * Warning: addFilter( int, TQ_INT64, const TQString&, int bool ) * expects this method to return true for all statistics table clomuns of type INTEGER * Sqlite doesn't like comparing strings to an INTEGER column. */ bool -QueryBuilder::coalesceField( int table, Q_INT64 value ) +QueryBuilder::coalesceField( int table, TQ_INT64 value ) { if( tableName( table ) == "statistics" && ( valueName( value ) == "playcounter" || @@ -7983,7 +7983,7 @@ QueryBuilder::coalesceField( int table, Q_INT64 value ) return false; } -QString +TQString QueryBuilder::functionName( int function ) { TQString functions; @@ -8009,10 +8009,10 @@ QueryBuilder::getTableByName(const TQString &name) return -1; } -Q_INT64 +TQ_INT64 QueryBuilder::getValueByName(const TQString &name) { - for ( Q_INT64 i = 1; i <= valType; i <<= 1 ) { + for ( TQ_INT64 i = 1; i <= valType; i <<= 1 ) { if (valueName(i) == name) return i; } @@ -8020,12 +8020,12 @@ QueryBuilder::getValueByName(const TQString &name) } bool -QueryBuilder::getField(const TQString &tableValue, int *table, Q_INT64 *value) +QueryBuilder::getField(const TQString &tableValue, int *table, TQ_INT64 *value) { - int dotIndex = tableValue.find( '.' ) ; + int dotIndex = tableValue.tqfind( '.' ) ; if ( dotIndex < 0 ) return false; int tmpTable = getTableByName( tableValue.left(dotIndex) ); - Q_UINT64 tmpValue = getValueByName( tableValue.mid( dotIndex + 1 ) ); + TQ_UINT64 tmpValue = getValueByName( tableValue.mid( dotIndex + 1 ) ); if ( tmpTable >= 0 && value ) { *table = tmpTable; *value = tmpValue; @@ -8040,7 +8040,7 @@ QueryBuilder::getField(const TQString &tableValue, int *table, Q_INT64 *value) -QStringList +TQStringList QueryBuilder::cleanURL( TQStringList result ) { //this method replaces the fields for relative path and devive/media id with a diff --git a/amarok/src/collectiondb.h b/amarok/src/collectiondb.h index ab38b6cb..3c96538c 100644 --- a/amarok/src/collectiondb.h +++ b/amarok/src/collectiondb.h @@ -195,6 +195,7 @@ class PostgresqlConnection : public DbConnection class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver { Q_OBJECT + TQ_OBJECT friend class SimilarArtistsInsertionJob; @@ -246,9 +247,9 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver #ifdef USE_MYSQL // We have to escape "\" for mysql, but can't do so for sqlite ( m_dbConnType == DbConnection::mysql ) - ? string.replace("\\", "\\\\").replace( '\'', "''" ) : + ? string.tqreplace("\\", "\\\\").tqreplace( '\'', "''" ) : #endif - string.replace( '\'', "''" ); + string.tqreplace( '\'', "''" ); } TQString boolT() const { if (getDbConnectionType() == DbConnection::postgresql) return "true"; else return "1"; } @@ -256,13 +257,13 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver inline bool boolFromSql( const TQString &b ) { return ( b == boolT() || b == "t" ); } //textColumnType should be used for normal strings, which need to be compared //either case-sensitively or -insensitively - TQString textColumnType( int length=255 ) const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return TQString("VARCHAR(%1)").arg(length); } + TQString textColumnType( int length=255 ) const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return TQString("VARCHAR(%1)").tqarg(length); } //exactTextColumnType should be used for strings that must be stored exactly, such //as URLs (necessary for holding control chars etc. if present in URL), except for //trailing spaces. Comparisions should always be done case-sensitively. //As we create indices on these columns, we have to restrict them to //<= 255 chars for mysql < 5.0.3 - TQString exactTextColumnType( int length=1024 ) const { if ( getDbConnectionType() == DbConnection::mysql ) return TQString( "VARBINARY(%1)" ).arg( length>255 ? 255 : length ); else return textColumnType( length ); } + TQString exactTextColumnType( int length=1024 ) const { if ( getDbConnectionType() == DbConnection::mysql ) return TQString( "VARBINARY(%1)" ).tqarg( length>255 ? 255 : length ); else return textColumnType( length ); } // We might consider using LONGTEXT type, as some lyrics could be VERY long..??? TQString longTextColumnType() const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return "TEXT"; } TQString randomFunc() const { if ( getDbConnectionType() == DbConnection::postgresql ) return "random()"; else return "RAND()"; } @@ -328,10 +329,10 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver void aftCheckPermanentTables( const TQString &currdeviceid, const TQString &currid, const TQString &currurl ); void doAFTStuff( MetaBundle *bundle, const bool tempTables = true ); void emitFileAdded( const TQString &absPath, - const TQString &uniqueid = TQString::null ); + const TQString &uniqueid = TQString() ); void emitFilesAdded( const TQMap<TQString,TQString> &map ) { emit filesAdded( map ); } void emitFileDeleted( const TQString &absPath, - const TQString &uniqueid = TQString::null ); + const TQString &uniqueid = TQString() ); bool newUniqueIdForFile( const TQString &path ); bool removeUniqueIdFromFile( const TQString &path ); TQString urlFromUniqueId( const TQString &id ); @@ -340,20 +341,20 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver //podcast methods /// Insert a podcast channel into the database. If @param replace is true, replace the row /// use updatePodcastChannel() always in preference - bool addPodcastChannel( const PodcastChannelBundle &pcb, const bool &replace=false ); + bool addPodcastChannel( const PodcastChannelBundle &pcb, const bool &tqreplace=false ); /// 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 parent_id=0, const bool isOpen=false ); + int addPodcastFolder( const TQString &name, const int tqparent_id=0, const bool isOpen=false ); TQValueList<PodcastChannelBundle> getPodcastChannels(); PodcastEpisodeBundle getPodcastEpisodeById( int id ); - TQValueList<PodcastEpisodeBundle> getPodcastEpisodes( const KURL &parent, bool newOnly=false, int limit=-1 ); + TQValueList<PodcastEpisodeBundle> getPodcastEpisodes( const KURL &tqparent, bool newOnly=false, int limit=-1 ); void removePodcastChannel( const KURL &url ); // will remove all episodes too void removePodcastEpisode( const int id ); 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 parent_id=0, const bool isOpen=false ); + void updatePodcastFolder( const int folder_id, const TQString &name, const int tqparent_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 ); @@ -434,7 +435,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver /** Saves images located on the user's filesystem */ bool setAlbumImage( const TQString& artist, const TQString& album, const KURL& url ); /** Saves images obtained from CoverFetcher */ - bool setAlbumImage( const TQString& artist, const TQString& album, TQImage img, const TQString& amazonUrl = TQString::null, const TQString& asin = TQString::null ); + bool setAlbumImage( const TQString& artist, const TQString& album, TQImage img, const TQString& amazonUrl = TQString(), const TQString& asin = TQString() ); TQString findAmazonImage( const TQString &artist, const TQString &album, const uint width = 1 ); TQString findDirectoryImage( const TQString& artist, const TQString& album, uint width = 0 ); @@ -442,8 +443,8 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver TQString findMetaBundleImage( const MetaBundle &trackInformation, const uint = 1 ); /// ensure the sql only return urls to tracks for efficiency - static TQPixmap createDragPixmapFromSQL( const TQString &sql, TQString textOverRide=TQString::null ); - static TQPixmap createDragPixmap( const KURL::List &urls, TQString textOverRide=TQString::null ); + static TQPixmap createDragPixmapFromSQL( const TQString &sql, TQString textOverRide=TQString() ); + static TQPixmap createDragPixmap( const KURL::List &urls, TQString textOverRide=TQString() ); static const int DRAGPIXMAP_OFFSET_X = -12; static const int DRAGPIXMAP_OFFSET_Y = -28; @@ -472,7 +473,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver static TQString makeShadowedImage( const TQString& albumImage, bool cache = true ); //local cover methods - void addImageToAlbum( const TQString& image, TQValueList< QPair<TQString, TQString> > info, const bool temporary ); + void addImageToAlbum( const TQString& image, TQValueList< TQPair<TQString, TQString> > info, const bool temporary ); TQString notAvailCover( const bool withShadow = false, int width = 1 ); //embedded cover methods @@ -481,7 +482,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver void applySettings(); - void setLyrics( const TQString& url, const TQString& lyrics, const TQString &uniqueid = TQString::null ); + void setLyrics( const TQString& url, const TQString& lyrics, const TQString &uniqueid = TQString() ); TQString getLyrics( const TQString& url ); /** Remove from the amazon table the item with the specified md5sum **/ @@ -493,7 +494,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver bool isConnected(); void releasePreviousConnection(TQThread *currThread); - void invalidateArtistAlbumCache() { m_validArtistCache=false; m_validComposerCache=false; m_validAlbumCache=false; }; + void tqinvalidateArtistAlbumCache() { m_validArtistCache=false; m_validComposerCache=false; m_validAlbumCache=false; }; void vacuum(); @@ -503,13 +504,13 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver void cancelMovingFileJob(); protected: - TQCString md5sum( const TQString& artist, const TQString& album, const TQString& file = TQString::null ); + TQCString md5sum( const TQString& artist, const TQString& album, const TQString& file = TQString() ); void engineTrackEnded( int finalPosition, int trackLength, const TQString &reason ); /** Manages regular folder monitoring scan */ void timerEvent( TQTimerEvent* e ); public slots: - void fetchCover( TQWidget* parent, const TQString& artist, const TQString& album, bool noedit, TQListViewItem* item = 0 ); + void fetchCover( TQWidget* tqparent, const TQString& artist, const TQString& album, bool noedit, TQListViewItem* item = 0 ); void scanMonitor(); void startScan(); void stopScan(); @@ -645,12 +646,19 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver TQMutex m_mutex; }; +#ifdef Q_MOC_RUN +// MOC_SKIP_BEGIN +class INotify : public JobBase +// MOC_SKIP_END +#else // Q_MOC_RUN class INotify : public ThreadManager::DependentJob +#endif // Q_MOC_RUN { Q_OBJECT + TQ_OBJECT public: - INotify( CollectionDB *parent, int fd ); + INotify( CollectionDB *tqparent, int fd ); ~INotify(); static INotify *instance() { return s_instance; } @@ -661,7 +669,7 @@ class INotify : public ThreadManager::DependentJob private: virtual bool doJob(); - CollectionDB* m_parent; + CollectionDB* m_tqparent; int m_fd; static INotify* s_instance; @@ -681,53 +689,53 @@ class QueryBuilder optRandomize = 8, optShowAll = 16 /* get all songs, not just mounted ones */ }; /* This has been an enum in the past, but 32 bits wasn't enough anymore :-( */ - static const Q_INT64 valDummy = 0; - static const Q_INT64 valID = 1LL << 0; - static const Q_INT64 valName = 1LL << 1; - static const Q_INT64 valURL = 1LL << 2; - static const Q_INT64 valTitle = 1LL << 3; - static const Q_INT64 valTrack = 1LL << 4; - static const Q_INT64 valScore = 1LL << 5; - static const Q_INT64 valComment = 1LL << 6; - static const Q_INT64 valBitrate = 1LL << 7; - static const Q_INT64 valLength = 1LL << 8; - static const Q_INT64 valSamplerate = 1LL << 9; - static const Q_INT64 valPlayCounter = 1LL << 10; - static const Q_INT64 valCreateDate = 1LL << 11; - static const Q_INT64 valAccessDate = 1LL << 12; - //static const Q_INT64 valPercentage = 1LL << 13; // same as valScore - static const Q_INT64 valArtistID = 1LL << 14; - static const Q_INT64 valAlbumID = 1LL << 15; - static const Q_INT64 valYearID = 1LL << 16; - static const Q_INT64 valGenreID = 1LL << 17; - static const Q_INT64 valDirectory = 1LL << 18; - static const Q_INT64 valLyrics = 1LL << 19; - static const Q_INT64 valRating = 1LL << 20; - static const Q_INT64 valComposerID = 1LL << 21; - static const Q_INT64 valDiscNumber = 1LL << 22; - static const Q_INT64 valFilesize = 1LL << 23; - static const Q_INT64 valFileType = 1LL << 24; - static const Q_INT64 valIsCompilation = 1LL << 25; - static const Q_INT64 valBPM = 1LL << 26; + static const TQ_INT64 valDummy = 0; + static const TQ_INT64 valID = 1LL << 0; + static const TQ_INT64 valName = 1LL << 1; + static const TQ_INT64 valURL = 1LL << 2; + static const TQ_INT64 valTitle = 1LL << 3; + static const TQ_INT64 valTrack = 1LL << 4; + static const TQ_INT64 valScore = 1LL << 5; + static const TQ_INT64 valComment = 1LL << 6; + static const TQ_INT64 valBitrate = 1LL << 7; + static const TQ_INT64 valLength = 1LL << 8; + static const TQ_INT64 valSamplerate = 1LL << 9; + static const TQ_INT64 valPlayCounter = 1LL << 10; + static const TQ_INT64 valCreateDate = 1LL << 11; + static const TQ_INT64 valAccessDate = 1LL << 12; + //static const TQ_INT64 valPercentage = 1LL << 13; // same as valScore + static const TQ_INT64 valArtistID = 1LL << 14; + static const TQ_INT64 valAlbumID = 1LL << 15; + static const TQ_INT64 valYearID = 1LL << 16; + static const TQ_INT64 valGenreID = 1LL << 17; + static const TQ_INT64 valDirectory = 1LL << 18; + static const TQ_INT64 valLyrics = 1LL << 19; + static const TQ_INT64 valRating = 1LL << 20; + static const TQ_INT64 valComposerID = 1LL << 21; + static const TQ_INT64 valDiscNumber = 1LL << 22; + static const TQ_INT64 valFilesize = 1LL << 23; + static const TQ_INT64 valFileType = 1LL << 24; + static const TQ_INT64 valIsCompilation = 1LL << 25; + static const TQ_INT64 valBPM = 1LL << 26; // podcast relevant: - static const Q_INT64 valCopyright = 1LL << 27; - static const Q_INT64 valParent = 1LL << 28; - static const Q_INT64 valWeblink = 1LL << 29; - static const Q_INT64 valAutoscan = 1LL << 30; - static const Q_INT64 valFetchtype = 1LL << 31; - static const Q_INT64 valAutotransfer = 1LL << 32; - static const Q_INT64 valPurge = 1LL << 33; - static const Q_INT64 valPurgeCount = 1LL << 34; - static const Q_INT64 valIsNew = 1LL << 35; + static const TQ_INT64 valCopyright = 1LL << 27; + static const TQ_INT64 valParent = 1LL << 28; + static const TQ_INT64 valWeblink = 1LL << 29; + static const TQ_INT64 valAutoscan = 1LL << 30; + static const TQ_INT64 valFetchtype = 1LL << 31; + static const TQ_INT64 valAutotransfer = 1LL << 32; + static const TQ_INT64 valPurge = 1LL << 33; + static const TQ_INT64 valPurgeCount = 1LL << 34; + static const TQ_INT64 valIsNew = 1LL << 35; // dynamic collection relevant: - static const Q_INT64 valDeviceId = 1LL << 36; - static const Q_INT64 valRelativePath = 1LL << 37; - static const Q_INT64 valDeviceLabel = 1LL << 38; - static const Q_INT64 valMountPoint = 1LL << 39; + static const TQ_INT64 valDeviceId = 1LL << 36; + static const TQ_INT64 valRelativePath = 1LL << 37; + static const TQ_INT64 valDeviceLabel = 1LL << 38; + static const TQ_INT64 valMountPoint = 1LL << 39; //label relevant - static const Q_INT64 valType = 1LL << 40; + static const TQ_INT64 valType = 1LL << 40; - static Q_INT64 valForFavoriteSorting(); + static TQ_INT64 valForFavoriteSorting(); void sortByFavorite(); // sortByFavoriteAvg() add the average rating, if enabled, the average score, if enabled, @@ -742,8 +750,8 @@ class QueryBuilder QueryBuilder(); - void addReturnValue( int table, Q_INT64 value, bool caseSensitive = false /* unless value refers to a string */ ); - void addReturnFunctionValue( int function, int table, Q_INT64 value); + void addReturnValue( int table, TQ_INT64 value, bool caseSensitive = false /* unless value refers to a string */ ); + void addReturnFunctionValue( int function, int table, TQ_INT64 value); uint countReturnValues(); // Note: the filter chain begins in AND mode @@ -757,30 +765,30 @@ class QueryBuilder void addURLFilters( const TQStringList& filter ); void addFilter( int tables, const TQString& filter); - void addFilter( int tables, Q_INT64 value, const TQString& filter, int mode = modeNormal, bool exact = false ); + void addFilter( int tables, TQ_INT64 value, const TQString& filter, int mode = modeNormal, bool exact = false ); void addFilters( int tables, const TQStringList& filter ); void excludeFilter( int tables, const TQString& filter ); - void excludeFilter( int tables, Q_INT64 value, const TQString& filter, int mode = modeNormal, bool exact = false ); + void excludeFilter( int tables, TQ_INT64 value, const TQString& filter, int mode = modeNormal, bool exact = false ); void addMatch( int tables, const TQString& match, bool interpretUnknown = true, bool caseSensitive = true ); - void addMatch( int tables, Q_INT64 value, const TQString& match, bool interpretUnknown = true, bool caseSensitive = true ); + void addMatch( int tables, TQ_INT64 value, const TQString& match, bool interpretUnknown = true, bool caseSensitive = true ); void addMatches( int tables, const TQStringList& match, bool interpretUnknown = true, bool caseSensitive = true ); void excludeMatch( int tables, const TQString& match ); - void having( int table, Q_INT64 value, int function, int mode, const TQString& match ); + void having( int table, TQ_INT64 value, int function, int mode, const TQString& match ); - void exclusiveFilter( int tableMatching, int tableNotMatching, Q_INT64 value ); + void exclusiveFilter( int tableMatching, int tableNotMatching, TQ_INT64 value ); // For numeric filters: // modeNormal means strict equality; modeBeginMatch and modeEndMatch are not // allowed; modeBetween needs a second value endRange - void addNumericFilter(int tables, Q_INT64 value, const TQString &n, + void addNumericFilter(int tables, TQ_INT64 value, const TQString &n, int mode = modeNormal, - const TQString &endRange = TQString::null); + const TQString &endRange = TQString()); void setOptions( int options ); - void sortBy( int table, Q_INT64 value, bool descending = false ); - void sortByFunction( int function, int table, Q_INT64 value, bool descending = false ); - void groupBy( int table, Q_INT64 value ); + void sortBy( int table, TQ_INT64 value, bool descending = false ); + void sortByFunction( int function, int table, TQ_INT64 value, bool descending = false ); + void groupBy( int table, TQ_INT64 value ); void setLimit( int startPos, int length ); // Returns the results in random order. @@ -788,16 +796,16 @@ class QueryBuilder // that field. // The shuffle is cumulative with other sorts, but any sorts after this are // pointless because of the precision of the random function. - void shuffle( int table = 0, Q_INT64 value = 0 ); + void shuffle( int table = 0, TQ_INT64 value = 0 ); static const int dragFieldCount; - static TQString dragSQLFields(); - void initSQLDrag(); + static TQString dragSTQLFields(); + void initSTQLDrag(); void buildQuery( bool withDeviceidPlaceholder = false ); TQString getQuery(); //use withDeviceidPlaceholder = false if the query isn't run immediately (*CurrentTimeT*) - //and replace (*MountedDeviceSelection*) with CollectionDB::instance()->deviceIdSelection() + //and tqreplace (*MountedDeviceSelection*) with CollectionDB::instance()->deviceIdSelection() TQString query( bool withDeviceidPlaceholder = false ) { buildQuery( withDeviceidPlaceholder ); return m_query; }; void clear(); @@ -805,16 +813,16 @@ class QueryBuilder // Transform a string table.value "field" into enum values // @return true if we succeeded - bool getField(const TQString &tableValue, int *table, Q_INT64 *value); + bool getField(const TQString &tableValue, int *table, TQ_INT64 *value); private: TQString tableName( int table ); - const TQString &valueName( Q_INT64 value ); + const TQString &valueName( TQ_INT64 value ); TQString functionName( int functions ); - bool coalesceField( int table, Q_INT64 value ); + bool coalesceField( int table, TQ_INT64 value ); int getTableByName(const TQString &name); - Q_INT64 getValueByName(const TQString &field); + TQ_INT64 getValueByName(const TQString &field); TQStringList cleanURL( TQStringList result ); diff --git a/amarok/src/collectionscanner/collectionscanner.cpp b/amarok/src/collectionscanner/collectionscanner.cpp index a609eaca..fd9a88e7 100644 --- a/amarok/src/collectionscanner/collectionscanner.cpp +++ b/amarok/src/collectionscanner/collectionscanner.cpp @@ -56,7 +56,7 @@ CollectionScanner::CollectionScanner( const TQStringList& folders, , m_recursively( recursive ) , m_incremental( incremental ) , m_restart( restart ) - , m_logfile( Amarok::saveLocation( TQString::null ) + "collection_scan.log" ) + , m_logfile( Amarok::saveLocation( TQString() ) + "collection_scan.log" ) , m_pause( false ) { DcopCollectionScannerHandler* dcsh = new DcopCollectionScannerHandler(); @@ -108,31 +108,31 @@ CollectionScanner::doJob() //SLOT << endl; else { TQTextStream logStream; - logStream.setDevice(&logFile); + logStream.setDevice(TQT_TQIODEVICE(&logFile)); logStream.setEncoding(TQTextStream::UnicodeUTF8); lastFile = logStream.read(); logFile.close(); } - TQFile folderFile( Amarok::saveLocation( TQString::null ) + "collection_scan.files" ); + TQFile folderFile( Amarok::saveLocation( TQString() ) + "collection_scan.files" ); if ( !folderFile.open( IO_ReadOnly ) ) warning() << "Failed to open folder file " << folderFile.name() << " read-only" << endl; else { TQTextStream folderStream; - folderStream.setDevice(&folderFile); + folderStream.setDevice(TQT_TQIODEVICE(&folderFile)); folderStream.setEncoding(TQTextStream::UnicodeUTF8); entries = TQStringList::split( "\n", folderStream.read() ); } - for( int count = entries.findIndex( lastFile ) + 1; count; --count ) + for( int count = entries.tqfindIndex( lastFile ) + 1; count; --count ) entries.pop_front(); } else { foreachType( TQStringList, m_folders ) { if( (*it).isEmpty() ) - //apparently somewhere empty strings get into the mix + //aptqparently somewhere empty strings get into the mix //which results in a full-system scan! Which we can't allow continue; @@ -143,7 +143,7 @@ CollectionScanner::doJob() //SLOT readDir( dir, entries ); } - TQFile folderFile( Amarok::saveLocation( TQString::null ) + "collection_scan.files" ); + TQFile folderFile( Amarok::saveLocation( TQString() ) + "collection_scan.files" ); if ( !folderFile.open( IO_WriteOnly ) ) warning() << "Failed to open folder file " << folderFile.name() << " read-only" << endl; @@ -213,7 +213,7 @@ CollectionScanner::readDir( const TQString& dir, TQStringList& entries ) f = i; break; } #else - f = m_processedDirs.find( de ); + f = m_processedDirs.tqfind( de ); #endif if ( ! S_ISDIR( statBuf.st_mode ) || f != -1 ) { @@ -280,7 +280,7 @@ CollectionScanner::scanFiles( const TQStringList& entries ) { DEBUG_BLOCK - typedef QPair<TQString, TQString> CoverBundle; + typedef TQPair<TQString, TQString> CoverBundle; TQStringList validImages; validImages << "jpg" << "png" << "gif" << "jpeg"; TQStringList validPlaylists; validPlaylists << "m3u" << "pls"; @@ -309,10 +309,10 @@ CollectionScanner::scanFiles( const TQStringList& entries ) } } - if( validImages.contains( ext ) ) + if( validImages.tqcontains( ext ) ) images += path; - else if( m_importPlaylists && validPlaylists.contains( ext ) ) { + else if( m_importPlaylists && validPlaylists.tqcontains( ext ) ) { AttributeMap attributes; attributes["path"] = path; writeElement( "playlist", attributes ); @@ -328,7 +328,7 @@ CollectionScanner::scanFiles( const TQStringList& entries ) CoverBundle cover( attributes["artist"], attributes["album"] ); - if( !covers.contains( cover ) ) + if( !covers.tqcontains( cover ) ) covers += cover; foreachType( MetaBundle::EmbeddedImageList, images ) { @@ -447,7 +447,7 @@ CollectionScanner::writeElement( const TQString& name, const AttributeMap& attri foreachType( AttributeMap, attributes ) { - // There are at least some characters that Qt cannot categorize which make the resulting + // There are at least some characters that TQt cannot categorize which make the resulting // xml document ill-formed and prevent the parser from processing the remaining document. // Because of this we skip attributes containing characters not belonging to any category. TQString data = it.data(); @@ -472,7 +472,7 @@ CollectionScanner::writeElement( const TQString& name, const AttributeMap& attri TQTextStream stream( &text, IO_WriteOnly ); element.save( stream, 0 ); - std::cout << text.utf8() << std::endl; + std::cout << text.utf8().data() << std::endl; } diff --git a/amarok/src/collectionscanner/collectionscanner.h b/amarok/src/collectionscanner/collectionscanner.h index 49ae6a41..2130a1c8 100644 --- a/amarok/src/collectionscanner/collectionscanner.h +++ b/amarok/src/collectionscanner/collectionscanner.h @@ -42,6 +42,7 @@ typedef TQMap<TQString, TQString> AttributeMap; class CollectionScanner : public KApplication { Q_OBJECT + TQ_OBJECT public: CollectionScanner( const TQStringList& folders, @@ -84,7 +85,7 @@ private: */ inline TQString extension( const TQString &fileName ) { - return fileName.contains( '.' ) ? fileName.mid( fileName.findRev( '.' ) + 1 ).lower() : ""; + return fileName.tqcontains( '.' ) ? fileName.mid( fileName.tqfindRev( '.' ) + 1 ).lower() : ""; } /** diff --git a/amarok/src/collectionscanner/collectionscannerdcophandler.h b/amarok/src/collectionscanner/collectionscannerdcophandler.h index 3973f31a..bc010106 100644 --- a/amarok/src/collectionscanner/collectionscannerdcophandler.h +++ b/amarok/src/collectionscanner/collectionscannerdcophandler.h @@ -27,6 +27,7 @@ class DcopCollectionScannerHandler : public TQObject, virtual public CollectionScannerInterface { Q_OBJECT + TQ_OBJECT public: DcopCollectionScannerHandler(); diff --git a/amarok/src/colorgenerator.h b/amarok/src/colorgenerator.h index b7ab81eb..1ca9e0a7 100644 --- a/amarok/src/colorgenerator.h +++ b/amarok/src/colorgenerator.h @@ -27,7 +27,7 @@ namespace Amarok { -class Color : public QColor +class Color : public TQColor { static const int CONTRAST = 130; static const int SATURATION_TARGET = 30; diff --git a/amarok/src/columnlist.cpp b/amarok/src/columnlist.cpp index deaaf984..9d1eb698 100644 --- a/amarok/src/columnlist.cpp +++ b/amarok/src/columnlist.cpp @@ -31,7 +31,7 @@ #include "columnlist.h" -class MyCheckListItem: public QCheckListItem +class MyCheckListItem: public TQCheckListItem { typedef TQCheckListItem super; ColumnList *m_list; @@ -56,18 +56,18 @@ public: MyCheckListItem *itemBelow() { return static_cast<MyCheckListItem*>( TQCheckListItem::itemBelow() ); } }; -ColumnList::ColumnList( TQWidget *parent, const char *name ) - : TQHBox( parent, name ), m_changed( true ) +ColumnList::ColumnList( TQWidget *tqparent, const char *name ) + : TQHBox( tqparent, name ), m_changed( true ) { setSpacing( 5 ); TQVBox *buttonbox = new TQVBox( this ); - m_up = new KPushButton( KGuiItem( TQString::null, "up" ), buttonbox ); + m_up = new KPushButton( KGuiItem( TQString(), "up" ), buttonbox ); TQToolTip::add( m_up, i18n( "Move column up" ) ); connect( m_up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveUp() ) ); - m_down = new KPushButton( KGuiItem( TQString::null, "down" ), buttonbox ); + m_down = new KPushButton( KGuiItem( TQString(), "down" ), buttonbox ); TQToolTip::add( m_down, i18n( "Move column down" ) ); connect( m_down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveDown() ) ); diff --git a/amarok/src/columnlist.h b/amarok/src/columnlist.h index d28c9be7..efc59b06 100644 --- a/amarok/src/columnlist.h +++ b/amarok/src/columnlist.h @@ -27,11 +27,12 @@ class KListView; class KPushButton; template<class T> class TQValueList; -class ColumnList: public QHBox +class ColumnList: public TQHBox { Q_OBJECT + TQ_OBJECT public: - ColumnList( TQWidget *parent = 0, const char *name = 0 ); + ColumnList( TQWidget *tqparent = 0, const char *name = 0 ); TQValueList<int> visibleColumns() const; TQValueList<int> columnOrder() const; bool isChanged() const; @@ -56,6 +57,7 @@ private: class ColumnsDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: static void display(); diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp index 2a76839f..e364a2a2 100644 --- a/amarok/src/configdialog.cpp +++ b/amarok/src/configdialog.cpp @@ -79,8 +79,8 @@ int AmarokConfigDialog::s_currentPage = 0; // PUBLIC ////////////////////////////////////////////////////////////////////////////////////////// -AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config ) - : KConfigDialog( parent, name, config ) +AmarokConfigDialog::AmarokConfigDialog( TQWidget *tqparent, const char* name, KConfigSkeleton *config ) + : KConfigDialog( tqparent, name, config ) , m_engineConfig( 0 ) , m_opt4( 0 ) { @@ -88,7 +88,7 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, KCon // IMPORTANT Don't simply change the page names, they are used as identifiers in other parts of the app. m_opt1 = new Options1( 0, "General" ); -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC m_opt1->kcfg_ShowSplashscreen->setEnabled(false); m_opt1->kcfg_ShowTrayIcon->setEnabled(false); m_opt1->kcfg_AnimateTrayIcon->setEnabled(false); @@ -96,7 +96,7 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, KCon #endif m_opt2 = new Options2( 0, "Appearance" ); m_opt4 = new Options4( 0, "Playback" ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Options5 *opt5 = new Options5( 0, "OSD" ); #endif TQVBox *opt6 = new TQVBox; @@ -153,29 +153,29 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, KCon TQVBox *topbox = new TQVBox( opt9 ); topbox->setSpacing( KDialog::spacingHint() ); TQGroupBox *mediaBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Media Devices"), topbox ); - mediaBox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + mediaBox->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); TQVBox *vbox = new TQVBox( mediaBox ); vbox->setSpacing( KDialog::spacingHint() ); m_deviceManager = new MediumPluginManager( vbox ); TQHBox *hbox = new TQHBox( topbox ); hbox->setSpacing( KDialog::spacingHint() ); - hbox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + hbox->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); KPushButton *autodetect = new KPushButton( i18n( "Autodetect Devices" ), hbox ); - autodetect->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + autodetect->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); connect( autodetect, TQT_SIGNAL(clicked()), m_deviceManager, TQT_SLOT(redetectDevices()) ); KPushButton *add = new KPushButton( i18n( "Add Device..." ), hbox ); - add->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + add->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); connect( add, TQT_SIGNAL(clicked()), m_deviceManager, TQT_SLOT(newDevice()) ); TQFrame *frame = new TQFrame( topbox ); - frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + frame->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); // add pages addPage( m_opt1, i18n( "General" ), Amarok::icon( "settings_general" ), i18n( "Configure General Options" ) ); addPage( m_opt2, i18n( "Appearance" ), Amarok::icon( "settings_view" ), i18n( "Configure Amarok's Appearance" ) ); addPage( m_opt4, i18n( "Playback" ), Amarok::icon( "settings_playback" ), i18n( "Configure Playback" ) ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 addPage( opt5, i18n( "OSD" ), Amarok::icon( "settings_indicator" ), i18n( "Configure On-Screen-Display" ) ); #endif addPage( opt6, i18n( "Engine" ), Amarok::icon( "settings_engine" ), i18n( "Configure Engine" ) ); @@ -187,19 +187,19 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, KCon TQObjectList *list = queryList( TQLABEL_OBJECT_NAME_STRING, "infoPixmap" ); TQPixmap const info = KGlobal::iconLoader()->iconPath( "messagebox_info", -KIcon::SizeHuge ); for( TQObject *label = list->first(); label; label = list->next() ) - static_cast<TQLabel*>(label)->setPixmap( info ); + static_cast<TQLabel*>(TQT_TQWIDGET(label))->setPixmap( info ); delete list; //stop KFont Requesters getting stupidly large list = queryList( TQLABEL_OBJECT_NAME_STRING, "m_sampleLabel" ); for( TQObject *label = list->first(); label; label = list->next() ) - static_cast<TQLabel*>(label)->setMaximumWidth( 250 ); + static_cast<TQLabel*>(TQT_TQWIDGET(label))->setMaximumWidth( 250 ); delete list; connect( m_deviceManager, TQT_SIGNAL(changed()), TQT_SLOT(updateButtons()) ); connect( m_soundSystem, TQT_SIGNAL(activated( int )), TQT_SLOT(updateButtons()) ); connect( aboutEngineButton, TQT_SIGNAL(clicked()), TQT_SLOT(aboutEngine()) ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 connect( opt5, TQT_SIGNAL(settingsChanged()), TQT_SLOT(updateButtons()) ); //see options5.ui.h #endif connect( m_opt2->styleComboBox, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateButtons() ) ); @@ -262,14 +262,14 @@ void AmarokConfigDialog::updateButtons() */ void AmarokConfigDialog::updateSettings() { -#ifdef Q_WS_X11 - OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( child( "osdpreview" ) ); - AmarokConfig::setOsdAlignment( osd->alignment() ); +#ifdef TQ_WS_X11 + OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( TQT_TQWIDGET(child( "osdpreview" )) ); + AmarokConfig::setOsdAlignment( osd->tqalignment() ); AmarokConfig::setOsdYOffset( osd->y() ); Amarok::OSD::instance()->applySettings(); #endif - static_cast<CollectionSetup*>(child("CollectionSetup"))->writeConfig(); + static_cast<CollectionSetup*>(TQT_TQWIDGET(child("CollectionSetup")))->writeConfig(); if ( m_engineConfig ) m_engineConfig->save(); @@ -351,14 +351,14 @@ void AmarokConfigDialog::updateWidgetsDefault() */ bool AmarokConfigDialog::hasChanged() { -#ifdef Q_WS_X11 - OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( child( "osdpreview" ) ); +#ifdef TQ_WS_X11 + OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( TQT_TQWIDGET(child( "osdpreview" )) ); #endif return m_soundSystem->currentText() != m_pluginAmarokName[AmarokConfig::soundSystem()] || -#ifdef Q_WS_X11 - osd->alignment() != AmarokConfig::osdAlignment() || - osd->alignment() != OSDWidget::Center && osd->y() != AmarokConfig::osdYOffset() || +#ifdef TQ_WS_X11 + osd->tqalignment() != AmarokConfig::osdAlignment() || + osd->tqalignment() != OSDWidget::Center && osd->y() != AmarokConfig::osdYOffset() || #endif m_opt2->styleComboBox->currentText() != AmarokConfig::contextBrowserStyleSheet() || Amarok::databaseTypeCode( m_opt7->dbSetupFrame->databaseEngine->currentText() ) != AmarokConfig::databaseEngine().toInt() || @@ -385,7 +385,7 @@ bool AmarokConfigDialog::isDefault() void AmarokConfigDialog::aboutEngine() //SLOT { - PluginManager::showAbout( TQString( "Name == '%1'" ).arg( m_soundSystem->currentText() ) ); + PluginManager::showAbout( TQString( "Name == '%1'" ).tqarg( m_soundSystem->currentText() ) ); } @@ -407,7 +407,7 @@ void AmarokConfigDialog::soundSystemChanged() m_engineConfig = EngineController::engine()->configure(); m_engineConfig->view()->reparent( m_engineConfigFrame, TQPoint() ); m_engineConfig->view()->show(); - m_engineConfigFrame->setTitle( i18n( "to change settings", "Configure %1" ).arg( m_soundSystem->currentText() ) ); + m_engineConfigFrame->setTitle( i18n( "to change settings", "Configure %1" ).tqarg( m_soundSystem->currentText() ) ); m_engineConfigFrame->show(); connect( m_engineConfig, TQT_SIGNAL(viewChanged()), TQT_SLOT(updateButtons()) ); @@ -434,7 +434,7 @@ void AmarokConfigDialog::soundSystemChanged() TQString AmarokConfigDialog::externalBrowser() const { return m_opt1->kComboBox_browser->isEnabled() ? -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC m_opt1->kComboBox_browser->currentText() == i18n( "Default Browser" ) ? "open" : #else diff --git a/amarok/src/configdialog.h b/amarok/src/configdialog.h index bd29cc6a..ba0f284a 100644 --- a/amarok/src/configdialog.h +++ b/amarok/src/configdialog.h @@ -34,13 +34,14 @@ class MediumPluginManager; class AmarokConfigDialog : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: - AmarokConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config ); + AmarokConfigDialog( TQWidget *tqparent, const char* name, KConfigSkeleton *config ); ~AmarokConfigDialog(); void addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName, - const TQString &header=TQString::null, bool manage=true); + const TQString &header=TQString(), bool manage=true); void showPageByName( const TQCString& page ); diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp index b03685fa..ee3b30bc 100644 --- a/amarok/src/contextbrowser.cpp +++ b/amarok/src/contextbrowser.cpp @@ -75,29 +75,29 @@ namespace Amarok { TQString escapeHTML( const TQString &s ) { - return TQString(s).replace( "&", "&" ).replace( "<", "<" ).replace( ">", ">" ); - // .replace( "%", "%25" ) has to be the first(!) one, otherwise we would do things like converting spaces into %20 and then convert them into %25%20 + return TQString(s).tqreplace( "&", "&" ).tqreplace( "<", "<" ).tqreplace( ">", ">" ); + // .tqreplace( "%", "%25" ) has to be the first(!) one, otherwise we would do things like converting spaces into %20 and then convert them into %25%20 } TQString escapeHTMLAttr( const TQString &s ) { - return TQString(s).replace( "%", "%25" ).replace( "'", "%27" ).replace( "\"", "%22" ).replace( "#", "%23" ).replace( "?", "%3F" ); + return TQString(s).tqreplace( "%", "%25" ).tqreplace( "'", "%27" ).tqreplace( "\"", "%22" ).tqreplace( "#", "%23" ).tqreplace( "?", "%3F" ); } TQString unescapeHTMLAttr( const TQString &s ) { - return TQString(s).replace( "%3F", "?" ).replace( "%23", "#" ).replace( "%22", "\"" ).replace( "%27", "'" ).replace( "%25", "%" ); + return TQString(s).tqreplace( "%3F", "?" ).tqreplace( "%23", "#" ).tqreplace( "%22", "\"" ).tqreplace( "%27", "'" ).tqreplace( "%25", "%" ); } TQString verboseTimeSince( const TQDateTime &datetime ) { - const TQDateTime now = TQDateTime::currentDateTime(); + const TQDateTime now = TQDateTime::tqcurrentDateTime(); const int datediff = datetime.daysTo( now ); if( datediff >= 6*7 /*six weeks*/ ) { // return absolute month/year const KCalendarSystem *cal = KGlobal::locale()->calendar(); const TQDate date = datetime.date(); - return i18n( "monthname year", "%1 %2" ).arg( cal->monthName(date), cal->yearString(date, false) ); + return i18n( "monthname year", "%1 %2" ).tqarg( cal->monthName(date), cal->yearString(date, false) ); } //TODO "last week" = maybe within 7 days, but prolly before last sunday @@ -146,7 +146,7 @@ namespace Amarok */ void albumArtistTrackFromUrl( TQString url, TQString &artist, TQString &album, TQString &detail ) { - if ( !url.contains("@@@") ) return; + if ( !url.tqcontains("@@@") ) return; //KHTML removes the trailing space! if ( url.endsWith( " @@@" ) ) url += ' '; @@ -165,7 +165,7 @@ namespace Amarok } -using Amarok::QStringx; +using Amarok::TQStringx; using Amarok::escapeHTML; using Amarok::escapeHTMLAttr; using Amarok::unescapeHTMLAttr; @@ -175,7 +175,7 @@ static TQString albumImageTooltip( const TQString &albumImage, int size ) { if ( albumImage == CollectionDB::instance()->notAvailCover( false, size ) ) - return escapeHTMLAttr( i18n( "Click to fetch cover from amazon.%1, right-click for menu." ).arg( CoverManager::amazonTld() ) ); + return escapeHTMLAttr( i18n( "Click to fetch cover from amazon.%1, right-click for menu." ).tqarg( CoverManager::amazonTld() ) ); return escapeHTMLAttr( i18n( "Click for information from Amazon, right-click for menu." ) ); } @@ -259,7 +259,7 @@ ContextBrowser::ContextBrowser( const char *name ) connect ( m_lyricsSearchText, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(lyricsSearchText(const TQString & )) ); connect ( m_lyricsSearchText, TQT_SIGNAL(returnPressed()), this, (TQT_SLOT(lyricsSearchTextNext())) ); Amarok::actionCollection()->setAutoConnectShortcuts ( true ); - new KAction( i18n("Search text in lyrics"), KShortcut("/"), this,TQT_SLOT( lyricsSearchTextShow() ), Amarok::actionCollection(), "search_text_lyric"); + new KAction( i18n("Search text in lyrics"), KShortcut("/"), TQT_TQOBJECT(this),TQT_SLOT( lyricsSearchTextShow() ), Amarok::actionCollection(), "search_text_lyric"); Amarok::actionCollection()->setAutoConnectShortcuts ( false ); } @@ -267,7 +267,7 @@ ContextBrowser::ContextBrowser( const char *name ) m_lyricsPage = new HTMLView( m_lyricsTab, "lyrics_page", true /* DNDEnabled */, false /* JScriptEnabled*/ ); m_lyricsTextEdit = new KTextEdit ( m_lyricsTab, "lyrics_text_edit"); - m_lyricsTextEdit->setTextFormat( Qt::PlainText ); + m_lyricsTextEdit->setTextFormat( TQt::PlainText ); m_lyricsTextEdit->hide(); m_wikiTab = new TQVBox(this, "wiki_tab"); @@ -429,7 +429,7 @@ void ContextBrowser::openURLRequest( const KURL &url ) if ( url.hasHTMLRef() ) { KURL base = url; - base.setRef(TQString::null); + base.setRef(TQString()); // Wikipedia also has links to otherpages with Anchors, so we have to check if it's for the current one if ( m_wikiCurrentUrl == base.url() ) { m_wikiPage->gotoAnchor( url.htmlRef() ); @@ -438,14 +438,14 @@ void ContextBrowser::openURLRequest( const KURL &url ) } // new page m_dirtyWikiPage = true; - m_wikiCurrentEntry = TQString::null; + m_wikiCurrentEntry = TQString(); showWikipedia( url.url() ); } else if ( url.protocol() == "show" ) { - if ( url.path().contains( "suggestLyric-" ) ) + if ( url.path().tqcontains( "suggestLyric-" ) ) { - TQString _url = url.url().mid( url.url().find( TQString( "-" ) ) +1 ); + TQString _url = url.url().mid( url.url().tqfind( TQString( "-" ) ) +1 ); debug() << "Clicked lyrics URL: " << _url << endl; m_dirtyLyricsPage = true; showLyrics( _url ); @@ -497,13 +497,13 @@ void ContextBrowser::openURLRequest( const KURL &url ) else if ( url.protocol() == "musicbrainz" ) { const TQString url = "http://www.musicbrainz.org/taglookup.html?artist=%1&album=%2&track=%3"; - Amarok::invokeBrowser( url.arg( KURL::encode_string_no_slash( artist, 106 /*utf-8*/ ), + Amarok::invokeBrowser( url.tqarg( KURL::encode_string_no_slash( artist, 106 /*utf-8*/ ), KURL::encode_string_no_slash( album, 106 /*utf-8*/ ), KURL::encode_string_no_slash( track, 106 /*utf-8*/ ) ) ); } else if ( url.protocol() == "externalurl" ) - Amarok::invokeBrowser( url.url().replace( TQRegExp( "^externalurl:" ), "http:") ); + Amarok::invokeBrowser( url.url().tqreplace( TQRegExp( "^externalurl:" ), "http:") ); else if ( url.protocol() == "lastfm" ) { @@ -547,7 +547,7 @@ void ContextBrowser::openURLRequest( const KURL &url ) else if( url.protocol() == "ggartist" ) { const TQString url2 = TQString( "http://www.google.com/musicsearch?q=%1&res=artist" ) - .arg( KURL::encode_string_no_slash( unescapeHTMLAttr( url.path() ).replace( " ", "+" ), 106 /*utf-8*/ ) ); + .tqarg( KURL::encode_string_no_slash( unescapeHTMLAttr( url.path() ).tqreplace( " ", "+" ), 106 /*utf-8*/ ) ); Amarok::invokeBrowser( url2 ); } @@ -558,7 +558,7 @@ void ContextBrowser::openURLRequest( const KURL &url ) else if( url.protocol() == "stream" ) { - Playlist::instance()->insertMedia( KURL::fromPathOrURL( url.url().replace( TQRegExp( "^stream:" ), "http:" ) ), Playlist::DefaultOptions ); + Playlist::instance()->insertMedia( KURL::fromPathOrURL( url.url().tqreplace( TQRegExp( "^stream:" ), "http:" ) ), Playlist::DefaultOptions ); } else if( url.protocol() == "compilationdisc" || url.protocol() == "albumdisc" ) @@ -639,10 +639,10 @@ void ContextBrowser::engineNewMetaData( const MetaBundle& bundle, bool trackChan if ( MetaBundle( m_currentURL ).artist() != bundle.artist() ) m_dirtyWikiPage = true; // Prepend stream metadata history item to list - if ( !m_metadataHistory.first().contains( bundle.prettyTitle() ) ) + if ( !m_metadataHistory.first().tqcontains( bundle.prettyTitle() ) ) { newMetaData = true; - const TQString timeString = KGlobal::locale()->formatTime( TQTime::currentTime() ).replace(" ", " "); // don't break over lines + const TQString timeString = KGlobal::locale()->formatTime( TQTime::currentTime() ).tqreplace(" ", " "); // don't break over lines m_metadataHistory.prepend( TQString( "<td valign='top'>" + timeString + " </td><td align='left'>" + escapeHTML( bundle.prettyTitle() ) + "</td>" ) ); } @@ -676,7 +676,7 @@ void ContextBrowser::engineNewMetaData( const MetaBundle& bundle, bool trackChan // look for the cue file that matches the media file played first TQString path = bundle.url().path(); - TQString cueFile = path.left( path.findRev('.') ) + ".cue"; + TQString cueFile = path.left( path.tqfindRev('.') ) + ".cue"; m_cuefile->setCueFileName( cueFile ); @@ -709,11 +709,11 @@ void ContextBrowser::engineNewMetaData( const MetaBundle& bundle, bool trackChan { line = stream.readLine().simplifyWhiteSpace(); - if( line.startsWith( "file", false ) ) + if( line.tqstartsWith( "file", false ) ) { line = line.mid( 5 ).remove( '"' ); - if ( line.contains( bundle.filename(), false ) ) + if ( line.tqcontains( bundle.filename(), false ) ) { cueFile = dir.filePath(*it); foundCueFile = true; @@ -799,10 +799,10 @@ void ContextBrowser::saveHtmlData() TQTextStream stream( &exportedDocument ); stream.setEncoding( TQTextStream::UnicodeUTF8 ); stream << m_HTMLSource // the pure html data.. - .replace( "<html>", + .tqreplace( "<html>", TQString( "<html><head><style type=\"text/css\">" "%1</style></head>" ) - .arg( HTMLView::loadStyleSheet() ) ); // and the + .tqarg( HTMLView::loadStyleSheet() ) ); // and the // stylesheet // code exportedDocument.close(); @@ -931,7 +931,7 @@ void ContextBrowser::slotContextMenu( const TQString& urlString, const TQPoint& } else if( url.protocol() == "stream" ) { - url = KURL::fromPathOrURL( url.url().replace( TQRegExp( "^stream:" ), "http:" ) ); + url = KURL::fromPathOrURL( url.url().tqreplace( TQRegExp( "^stream:" ), "http:" ) ); urls = KURL::List( url ); menu.insertTitle( i18n("Podcast"), TITLE ); menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), MAKE ); @@ -1102,9 +1102,9 @@ void ContextBrowser::slotContextMenu( const TQString& urlString, const TQPoint& class CurrentTrackJob : public ThreadManager::DependentJob { public: - CurrentTrackJob( ContextBrowser *parent ) - : ThreadManager::DependentJob( parent, "CurrentTrackJob" ) - , b( parent ) + CurrentTrackJob( ContextBrowser *tqparent ) + : ThreadManager::DependentJob( TQT_TQOBJECT(tqparent), "CurrentTrackJob" ) + , b( tqparent ) , m_currentTrack( TQDeepCopy<MetaBundle>( EngineController::instance()->bundle() ) ) , m_isStream( EngineController::engine()->isStream() ) { @@ -1190,8 +1190,8 @@ ContextBrowser::showContext( const KURL &url, bool fromHistory ) { m_browseArtists = false; m_browseLabels = false; - m_label = TQString::null; - m_artist = TQString::null; + m_label = TQString(); + m_artist = TQString(); m_contextBackHistory.clear(); m_contextBackHistory.push_back( "current://track" ); } @@ -1199,14 +1199,14 @@ ContextBrowser::showContext( const KURL &url, bool fromHistory ) { m_browseArtists = true; m_browseLabels = false; - m_label = TQString::null; + m_label = TQString(); m_artist = unescapeHTMLAttr( url.path() ); } else if( url.protocol() == "showlabel" ) { m_browseLabels = true; m_browseArtists = false; - m_artist = TQString::null; + m_artist = TQString(); m_label = unescapeHTMLAttr( url.path() ); } @@ -1243,7 +1243,7 @@ void ContextBrowser::showCurrentTrack() //SLOT debug() << "current browser is not context, aborting showCurrentTrack()" << endl; m_dirtyCurrentTrackPage = true; m_currentTrackPage->set( TQString( "<html><body><div class='box-body'>%1</div></body></html>" ) - .arg( i18n( "Updating..." ) ) ); + .tqarg( i18n( "Updating..." ) ) ); return; } #endif @@ -1271,7 +1271,7 @@ void ContextBrowser::showCurrentTrack() //SLOT if( !m_dirtyCurrentTrackPage ) return; m_currentURL = EngineController::instance()->bundle().url(); - m_currentTrackPage->write( TQString::null ); + m_currentTrackPage->write( TQString() ); ThreadManager::instance()->onlyOneJob( new CurrentTrackJob( this ) ); } @@ -1325,7 +1325,7 @@ void CurrentTrackJob::showHome() TQString playTime = MetaBundle::fuzzyTime( a[0].toInt() ); m_HTMLSource.append( - QStringx( + TQStringx( "<div id='introduction_box' class='box'>\n" "<div id='introduction_box-header-title' class='box-header'>\n" "<span id='introduction_box-header-title' class='box-header-title'>\n" @@ -1397,7 +1397,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h for ( uint j = 0; j < albumValues.count(); j += qb.countReturnValues()) if ( albumValues[j + 3] != albumYear || albumYear == "0" ) { - albumYear = TQString::null; + albumYear = TQString(); break; } } @@ -1408,7 +1408,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h TQString albumLength = ( i_albumLength==0 ? i18n( "Unknown" ) : MetaBundle::prettyTime( i_albumLength, true ) ); - htmlCode.append( QStringx ( + htmlCode.append( TQStringx ( "<tr class='" + TQString( (i % 4) ? "box-row-alt" : "box-row" ) + "'>\n" "<td>\n" "<div class='album-header' onClick=\"toggleBlock('IDA%1')\">\n" @@ -1425,7 +1425,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h TQString albumImageTitleAttr = albumImageTooltip( albumImage, 50 ); // Album image - htmlCode.append( QStringx ( + htmlCode.append( TQStringx ( "<td width='1'>\n" "<a href='fetchcover:%1 @@@ %2'>\n" "<img class='album-image' align='left' vspace='2' hspace='2' title='%3' src='%4'/>\n" @@ -1451,7 +1451,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h << albumName ) ); // Tracks number, year and length - htmlCode.append( QStringx ( + htmlCode.append( TQStringx ( "<span class='album-info'>%1</span> " "<br />\n" "<span class='album-year'>%2</span>\n" @@ -1463,7 +1463,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h << albumLength) ); // Begining of the 'toggleable div' that contains the songs - htmlCode.append( QStringx ( + htmlCode.append( TQStringx ( "</tr>\n" "</table>\n" "</div>\n" @@ -1482,7 +1482,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h if( discNumber != newDiscNumber && newDiscNumber.toInt() > 0) { discNumber = newDiscNumber; - htmlCode.append( QStringx ( + htmlCode.append( TQStringx ( "<div class='disc-separator'>\n" "<a href=\"albumdisc: %1 @@@ %2 @@@ %3\">\n" "%4" @@ -1492,7 +1492,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h << albumValues[6] << reqResult[ i + 1 ] //album.id << escapeHTMLAttr( discNumber ) - << i18n( "Disc %1" ).arg( discNumber ) ) ); + << i18n( "Disc %1" ).tqarg( discNumber ) ) ); } TQString track = albumValues[j + 2].stripWhiteSpace(); if( track.length() > 0 ) @@ -1527,7 +1527,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h // return list of albums shown -QStringList +TQStringList CurrentTrackJob::showHomeByAlbums() { QueryBuilder qb; @@ -1576,9 +1576,9 @@ CurrentTrackJob::showHomeByAlbums() date = ep.dateTime().toString(); TQString image = CollectionDB::instance()->podcastImage( pcb.imageURL().url(), true, 50 ); - TQString imageAttr = escapeHTMLAttr( i18n( "Click to go to podcast website: %1." ).arg( pcb.link().prettyURL() ) ); + TQString imageAttr = escapeHTMLAttr( i18n( "Click to go to podcast website: %1." ).tqarg( pcb.link().prettyURL() ) ); - m_HTMLSource.append( QStringx ( + m_HTMLSource.append( TQStringx ( "<tr class='" + TQString( (i % 2) ? "box-row-alt" : "box-row" ) + "'>\n" "<td>\n" "<div class='album-header' onClick=\"toggleBlock('IDP%1')\">\n" @@ -1601,13 +1601,13 @@ CurrentTrackJob::showHomeByAlbums() "<div class='album-body' style='display:%9;' id='IDP%10'>\n" ) .args( TQStringList() << TQString::number( i ) - << pcb.link().url().replace( TQRegExp( "^http:" ), "externalurl:" ) + << pcb.link().url().tqreplace( TQRegExp( "^http:" ), "externalurl:" ) << escapeHTMLAttr( imageAttr ) << escapeHTMLAttr( image ) << escapeHTML( ep.duration() ? MetaBundle::prettyTime( ep.duration() ) : TQString( "" ) ) << ( ep.localUrl().isValid() ? ep.localUrl().url() - : ep.url().url().replace( TQRegExp( "^http:" ), "stream:" ) ) + : ep.url().url().tqreplace( TQRegExp( "^http:" ), "stream:" ) ) << escapeHTML( pcb.title() + ": " + ep.title() ) << escapeHTML( date ) << "none" @@ -1615,7 +1615,7 @@ CurrentTrackJob::showHomeByAlbums() ) ); - m_HTMLSource.append( QStringx ( "<p>%1</p>\n" ).arg( ep.description() ) ); + m_HTMLSource.append( TQStringx ( "<p>%1</p>\n" ).tqarg( ep.description() ) ); m_HTMLSource.append( "</div>\n" @@ -1772,14 +1772,14 @@ void CurrentTrackJob::showLastFm( const MetaBundle ¤tTrack ) newUrls.append( &titleUrl ); for ( TQString* url = newUrls.first(); url; url = newUrls.next() ) - url->replace( TQRegExp( "^http:" ), "externalurl:" ); + url->tqreplace( TQRegExp( "^http:" ), "externalurl:" ); const TQString skipIcon = KGlobal::iconLoader()->iconPath( Amarok::icon("next"), -KIcon::SizeSmallMedium ); const TQString loveIcon = KGlobal::iconLoader()->iconPath( Amarok::icon("love"), -KIcon::SizeSmallMedium ); const TQString banIcon = KGlobal::iconLoader()->iconPath( Amarok::icon("remove"), -KIcon::SizeSmallMedium ); - m_HTMLSource.append( QStringx( + m_HTMLSource.append( TQStringx( "<div id='current_box' class='box'>\n" "<div id='current_box-header' class='box-header'>\n" "<span id='current_box-header-stream' class='box-header-title'>%1</span> " @@ -1878,7 +1878,7 @@ void CurrentTrackJob::showLastFm( const MetaBundle ¤tTrack ) void CurrentTrackJob::showStream( const MetaBundle ¤tTrack ) { - m_HTMLSource.append( QStringx( + m_HTMLSource.append( TQStringx( "<div id='current_box' class='box'>\n" "<div id='current_box-header' class='box-header'>\n" "<span id='current_box-header-stream' class='box-header-title'>%1</span> " @@ -1929,7 +1929,7 @@ void CurrentTrackJob::addMetaHistory() for ( uint i = 0; i < m_metadataHistory.count(); ++i ) { const TQString &str = m_metadataHistory[i]; - m_HTMLSource.append( QStringx( "<tr class='box-row'><td>%1</td></tr>\n" ).arg( str ) ); + m_HTMLSource.append( TQStringx( "<tr class='box-row'><td>%1</td></tr>\n" ).tqarg( str ) ); } m_HTMLSource.append( @@ -1946,7 +1946,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) PodcastEpisodeBundle peb = *currentTrack.podcastBundle(); PodcastChannelBundle pcb; bool channelInDB = true; - if( !CollectionDB::instance()->getPodcastChannelBundle( peb.parent(), &pcb ) ) + if( !CollectionDB::instance()->getPodcastChannelBundle( peb.tqparent(), &pcb ) ) { pcb.setTitle( i18n( "Unknown Channel (not in Database)" ) ); channelInDB = false; @@ -1959,11 +1959,11 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) image = CollectionDB::instance()->notAvailCover( true ); TQString imageAttr = escapeHTMLAttr( pcb.link().isValid() - ? i18n( "Click to go to podcast website: %1." ).arg( pcb.link().prettyURL() ) + ? i18n( "Click to go to podcast website: %1." ).tqarg( pcb.link().prettyURL() ) : i18n( "No podcast website." ) ); - m_HTMLSource.append( QStringx( + m_HTMLSource.append( TQStringx( "<div id='current_box' class='box'>\n" "<div id='current_box-header' class='box-header'>\n" "<span id='current_box-header-artist' class='box-header-title'>%1</span> " @@ -1988,13 +1988,13 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) << escapeHTML( pcb.title() ) << escapeHTML( peb.title() ) << ( pcb.link().isValid() - ? pcb.link().url().replace( TQRegExp( "^http:" ), "externalurl:" ) + ? pcb.link().url().tqreplace( TQRegExp( "^http:" ), "externalurl:" ) : "current://track" ) << image << imageAttr << escapeHTML( peb.author().isEmpty() ? i18n( "Podcast" ) - : i18n( "Podcast by %1" ).arg( peb.author() ) ) + : i18n( "Podcast by %1" ).tqarg( peb.author() ) ) << ( peb.localUrl().isValid() ? "<br />\n" + escapeHTML( i18n( "(Cached)" ) ) : "" ) @@ -2011,7 +2011,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) for ( uint i = 0; i < m_metadataHistory.count(); ++i ) { const TQString &str = m_metadataHistory[i]; - m_HTMLSource.append( QStringx( "<tr class='box-row'><td>%1</td></tr>\n" ).arg( str ) ); + m_HTMLSource.append( TQStringx( "<tr class='box-row'><td>%1</td></tr>\n" ).tqarg( str ) ); } m_HTMLSource.append( @@ -2024,7 +2024,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) "<div id='albums_box-header' class='box-header'>\n" "<span id='albums_box-header-title' class='box-header-title'>\n" + ( channelInDB - ? i18n( "Episodes from %1" ).arg( escapeHTML( pcb.title() ) ) + ? i18n( "Episodes from %1" ).tqarg( escapeHTML( pcb.title() ) ) : i18n( "Episodes from this Channel" ) ) + "</span>\n" @@ -2032,7 +2032,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) "<table id='albums_box-body' class='box-body' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); uint i = 0; - TQValueList<PodcastEpisodeBundle> episodes = CollectionDB::instance()->getPodcastEpisodes( peb.parent() ); + TQValueList<PodcastEpisodeBundle> episodes = CollectionDB::instance()->getPodcastEpisodes( peb.tqparent() ); while( !episodes.isEmpty() ) { PodcastEpisodeBundle &ep = episodes.back(); @@ -2042,7 +2042,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) date = ep.date() : date = ep.dateTime().toString(); - m_HTMLSource.append( QStringx ( + m_HTMLSource.append( TQStringx ( "<tr class='" + TQString( (i % 2) ? "box-row-alt" : "box-row" ) + "'>\n" "<td>\n" "<div class='album-header' onClick=\"toggleBlock('IDE%1')\">\n" @@ -2064,7 +2064,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) << escapeHTML( ep.duration() ? MetaBundle::prettyTime( ep.duration() ) : TQString( "" ) ) << ( ep.localUrl().isValid() ? ep.localUrl().url() - : ep.url().url().replace( TQRegExp( "^http:" ), "stream:" ) ) + : ep.url().url().tqreplace( TQRegExp( "^http:" ), "stream:" ) ) << escapeHTML( ep.title() ) << escapeHTML( date ) << (peb.url() == ep.url() ? "block" : "none" ) @@ -2072,7 +2072,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) ) ); - m_HTMLSource.append( QStringx ( "<p>%1</p>\n" ).arg( ep.description() ) ); + m_HTMLSource.append( TQStringx ( "<p>%1</p>\n" ).tqarg( ep.description() ) ); m_HTMLSource.append( "</div>\n" @@ -2106,9 +2106,9 @@ void CurrentTrackJob::showBrowseArtistHeader( const TQString &artist ) "<td><div id='current_box-header-nav' class='box-header-nav'>%3</div></td>\n" "</tr></table>\n" "</div>\n" ) - .arg( escapeHTML( artist ) ) - .arg( escapeHTML( i18n( "Browse Artist" ) ) ) - .arg( back ) ); + .tqarg( escapeHTML( artist ) ) + .tqarg( escapeHTML( i18n( "Browse Artist" ) ) ) + .tqarg( back ) ); m_HTMLSource.append( "<table id='current_box-table' class='box-body' width='100%' cellpadding='0' cellspacing='0'>\n" ); @@ -2126,16 +2126,16 @@ void CurrentTrackJob::showBrowseArtistHeader( const TQString &artist ) m_HTMLSource.append( "<tr>\n" "<td id='artist-wikipedia'>\n" - + TQString( "<a id='artist-wikipedia-a' href='wikipedia:%1'>\n" ).arg( escapeHTMLAttr( artist + b->wikiArtistPostfix() ) ) - + i18n( "Wikipedia Information for %1" ).arg( escapeHTML( artist ) ) + + + TQString( "<a id='artist-wikipedia-a' href='wikipedia:%1'>\n" ).tqarg( escapeHTMLAttr( artist + b->wikiArtistPostfix() ) ) + + i18n( "Wikipedia Information for %1" ).tqarg( escapeHTML( artist ) ) + "</a>\n" "</td>\n" "</tr>\n"); m_HTMLSource.append( "<tr>\n" "<td id='artist-google'>\n" - + TQString( "<a id='artist-google-a' href='ggartist:%1'>\n" ).arg( escapeHTMLAttr( artist ) ) - + i18n( "Google Musicsearch for %1" ).arg( escapeHTML( artist ) ) + + + TQString( "<a id='artist-google-a' href='ggartist:%1'>\n" ).tqarg( escapeHTMLAttr( artist ) ) + + i18n( "Google Musicsearch for %1" ).tqarg( escapeHTML( artist ) ) + "</a>\n" "</td>\n" "</tr>\n" @@ -2170,9 +2170,9 @@ CurrentTrackJob::showBrowseLabelHeader( const TQString &label ) "<td><div id='current_box-header-nav' class='box-header-nav'>%3</div></td>\n" "</tr></table>\n" "</div>\n" ) - .arg( escapeHTML( label ) ) - .arg( escapeHTML( i18n( "Browse Label" ) ) ) - .arg( back ) ); + .tqarg( escapeHTML( label ) ) + .tqarg( escapeHTML( i18n( "Browse Label" ) ) ) + .tqarg( back ) ); m_HTMLSource.append( "<table id='current_box-table' class='box-body' width='100%' cellpadding='0' cellspacing='0'>\n" ); @@ -2190,8 +2190,8 @@ CurrentTrackJob::showBrowseLabelHeader( const TQString &label ) m_HTMLSource.append( "<tr>\n" "<td id='label-lastfm'>\n" - + TQString( "<a id='label-lastfm-a' href='externalurl://www.last.fm/tag/%1'>\n" ).arg( escapeHTMLAttr( label ) ) - + i18n( "Last.fm Information for %1" ).arg( escapeHTML( label ) ) + + + TQString( "<a id='label-lastfm-a' href='externalurl://www.last.fm/tag/%1'>\n" ).tqarg( escapeHTMLAttr( label ) ) + + i18n( "Last.fm Information for %1" ).tqarg( escapeHTML( label ) ) + "</a>\n" "</td>\n" "</tr>\n"); @@ -2235,7 +2235,7 @@ void CurrentTrackJob::showCurrentArtistHeader( const MetaBundle ¤tTrack ) "<div id='current_box-header' class='box-header'>\n" // Show "Title - Artist \n Album", or only "PrettyTitle" if there's no title tag + ( !currentTrack.title().isEmpty() - ? QStringx( + ? TQStringx( "<span id='current_box-header-songname' class='box-header-title'>%1</span> " "<span id='current_box-header-separator' class='box-header-title'>-</span> " "<span id='current_box-header-artist' class='box-header-title'>%2</span>\n" @@ -2281,11 +2281,11 @@ void CurrentTrackJob::showCurrentArtistHeader( const MetaBundle ¤tTrack ) "</td>\n" "<td id='current_box-information-td' align='right'>\n" ) - .arg( escapeHTML( currentTrack.prettyTitle() ) ) - .arg( escapeHTMLAttr( currentTrack.artist() ) ) - .arg( escapeHTMLAttr( currentTrack.album() ) ) - .arg( escapeHTMLAttr( albumImage ) ) - .arg( albumImageTitleAttr ) + .tqarg( escapeHTML( currentTrack.prettyTitle() ) ) + .tqarg( escapeHTMLAttr( currentTrack.artist() ) ) + .tqarg( escapeHTMLAttr( currentTrack.album() ) ) + .tqarg( escapeHTMLAttr( albumImage ) ) + .tqarg( albumImageTitleAttr ) ) ); if ( !values.isEmpty() && values[2].toInt() ) @@ -2299,18 +2299,18 @@ void CurrentTrackJob::showCurrentArtistHeader( const MetaBundle ¤tTrack ) const uint score = static_cast<uint>( values[3].toFloat() ); const uint rating = values[4].toInt(); - //SAFE = .arg( x, y ) - //UNSAFE = .arg( x ).arg( y ) + //SAFE = .tqarg( x, y ) + //UNSAFE = .tqarg( x ).tqarg( y ) m_HTMLSource.append( TQString( "<span>%1</span><br />\n" "<div>%2</div>\n" "<span>%3</span><br />\n" "<span>%4</span>\n" ) - .arg( i18n( "Track played once", "Track played %n times", playtimes ), + .tqarg( i18n( "Track played once", "Track played %n times", playtimes ), statsHTML( score, rating, false ), - i18n( "Last played: %1" ).arg( Amarok::verboseTimeSince( lastPlay ) ), - i18n( "First played: %1" ).arg( Amarok::verboseTimeSince( firstPlay ) ) ) ); + i18n( "Last played: %1" ).tqarg( Amarok::verboseTimeSince( lastPlay ) ), + i18n( "First played: %1" ).tqarg( Amarok::verboseTimeSince( firstPlay ) ) ) ); } else m_HTMLSource.append( i18n( "Never played before" ) ); @@ -2391,7 +2391,7 @@ void CurrentTrackJob::showRelatedArtists( const TQString &artist, const TQString "<span id='related_box-header-title' class='box-header-title'>%1</span>\n" "</div>\n" "<table class='box-body' id='T_RA' width='100%' border='0' cellspacing='0' cellpadding='1'>\n" ) - .arg( i18n( "Artists Related to %1" ).arg( escapeHTML( artist ) ) ) ); + .tqarg( i18n( "Artists Related to %1" ).tqarg( escapeHTML( artist ) ) ) ); m_HTMLSource.append( "<tr><td>\n" ); for ( uint i = 0; i < relArtists.count(); i += 1 ) { @@ -2492,7 +2492,7 @@ CurrentTrackJob::showSongsWithLabel( const TQString &label ) "<div id='suggested_box' class='box'>\n" "<div id='suggested_box-header' class='box-header' onClick=\"toggleBlock('T_SS'); window.location.href='togglebox:ss';\" style='cursor: pointer;'>\n" "<span id='suggested_box-header-title' class='box-header-title'>\n" - + i18n( "Songs with label %1" ).arg( label ) + + + i18n( "Songs with label %1" ).tqarg( label ) + "</span>\n" "</div>\n" "<table class='box-body' id='T_' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); @@ -2540,7 +2540,7 @@ CurrentTrackJob::showUserLabels( const MetaBundle ¤tTrack ) "<div id='songlabels_box' class='box'>\n" "<div id='songlabels-header' class='box-header' onCLick=\"toggleBlock('T_SL');window.location.href='togglebox:sl';\" style='cursor: pointer;'>\n" "<span id='songlabels_box-header-title' class='box-header-title'>\n" - + i18n( " Labels for %1 " ).arg( escapeHTML( title ) ) + + + i18n( " Labels for %1 " ).tqarg( escapeHTML( title ) ) + "</span>\n" "</div>\n" "<table class='box-body' id='T_SL' width='100%' border='0' cellspacing='0' cellpadding='1'>\n" ); @@ -2555,7 +2555,7 @@ CurrentTrackJob::showUserLabels( const MetaBundle ¤tTrack ) } } m_HTMLSource.append( "</td></tr>\n" ); - m_HTMLSource.append( "<tr><td><a id='songlabels_box_addlabel' href='show:editLabels'>" + i18n( "Add labels to %1" ).arg( escapeHTML( title ) ) + "</a></td></tr>\n" ); + m_HTMLSource.append( "<tr><td><a id='songlabels_box_addlabel' href='show:editLabels'>" + i18n( "Add labels to %1" ).tqarg( escapeHTML( title ) ) + "</a></td></tr>\n" ); m_HTMLSource.append( "</table>\n" "</div>\n" ); @@ -2588,7 +2588,7 @@ void CurrentTrackJob::showArtistsFaves( const TQString &artist, uint artist_id ) "<div id='favoritesby_box' class='box'>\n" "<div id='favoritesby-header' class='box-header' onClick=\"toggleBlock('T_FT'); window.location.href='togglebox:ft';\" style='cursor: pointer;'>\n" "<span id='favoritesby_box-header-title' class='box-header-title'>\n" - + i18n( "Favorite Tracks by %1" ).arg( artistName ) + + + i18n( "Favorite Tracks by %1" ).tqarg( artistName ) + "</span>\n" "</div>\n" "<table class='box-body' id='T_FT' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); @@ -2642,7 +2642,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id, "<div id='albums_box' class='box'>\n" "<div id='albums_box-header' class='box-header'>\n" "<span id='albums_box-header-title' class='box-header-title'>\n" - + i18n( "Albums by %1" ).arg( artistName ) + + + i18n( "Albums by %1" ).tqarg( artistName ) + "</span>\n" "</div>\n" "<table id='albums_box-body' class='box-body' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); @@ -2676,7 +2676,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id, for ( uint j = 0; j < albumValues.count(); j += qb.countReturnValues() ) if ( albumValues[j + 3] != albumYear || albumYear == "0" ) { - albumYear = TQString::null; + albumYear = TQString(); break; } } @@ -2689,7 +2689,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id, TQString albumImage = ContextBrowser::getEncodedImage( CollectionDB::instance()->albumImage( artist, values[ i ], true, 50 ) ); TQString albumImageTitleAttr = albumImageTooltip( albumImage, 50 ); - m_HTMLSource.append( QStringx ( + m_HTMLSource.append( TQStringx ( "<tr class='" + TQString( (i % 4) ? "box-row-alt" : "box-row" ) + "'>\n" "<td>\n" "<div class='album-header' onClick=\"toggleBlock('IDA%1')\">\n" @@ -2734,7 +2734,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id, if( discNumber != newDiscNumber && newDiscNumber.toInt() > 0) { discNumber = newDiscNumber; - m_HTMLSource.append( QStringx ( + m_HTMLSource.append( TQStringx ( "<div class='disc-separator'>\n" "<a href=\"albumdisc: %1 @@@ %2 @@@ %3\">\n" "%4" @@ -2744,7 +2744,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id, << TQString::number( artist_id ) << values[ i + 1 ] //album.id << escapeHTMLAttr( discNumber ) - << i18n( "Disc %1" ).arg( discNumber ) ) ); + << i18n( "Disc %1" ).tqarg( discNumber ) ) ); } TQString track = albumValues[j + 2].stripWhiteSpace(); if( track.length() > 0 ) { @@ -2806,7 +2806,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti "<div id='albums_box' class='box'>\n" "<div id='albums_box-header' class='box-header'>\n" "<span id='albums_box-header-title' class='box-header-title'>\n" - + i18n( "Compilations with %1" ).arg( artistName ) + + + i18n( "Compilations with %1" ).tqarg( artistName ) + "</span>\n" "</div>\n" "<table id='albums_box-body' class='box-body' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); @@ -2839,7 +2839,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti for ( uint j = 0; j < albumValues.count(); j += qb.countReturnValues() ) if ( albumValues[j + 3] != albumYear || albumYear == "0" ) { - albumYear = TQString::null; + albumYear = TQString(); break; } } @@ -2852,7 +2852,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti TQString albumImage = ContextBrowser::getEncodedImage( CollectionDB::instance()->albumImage( artist, values[ i ], true, 50 ) ); TQString albumImageTitleAttr = albumImageTooltip( albumImage, 50 ); - m_HTMLSource.append( QStringx ( + m_HTMLSource.append( TQStringx ( "<tr class='" + TQString( (i % 4) ? "box-row-alt" : "box-row" ) + "'>\n" "<td>\n" "<div class='album-header' onClick=\"toggleBlock('IDA%1')\">\n" @@ -2895,7 +2895,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti if( discNumber != newDiscNumber && newDiscNumber.toInt() > 0) { discNumber = newDiscNumber; - m_HTMLSource.append( QStringx ( + m_HTMLSource.append( TQStringx ( "<div class='disc-separator'>\n" "<a href=\"compilationdisc: __discard__ @@@ %1 @@@ %2\">\n" "%3" @@ -2904,7 +2904,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti .args( TQStringList() << values[ i + 1 ] //album.id << escapeHTMLAttr( discNumber ) - << i18n( "Disc %1" ).arg( discNumber ) ) ); + << i18n( "Disc %1" ).tqarg( discNumber ) ) ); } TQString track = albumValues[j + 2].stripWhiteSpace(); @@ -2921,7 +2921,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti TQString tracktitle_formated; TQString tracktitle; - tracktitle = escapeHTML( i18n("%1 - %2").arg( albumValues[j + 5], albumValues[j] ) ); + tracktitle = escapeHTML( i18n("%1 - %2").tqarg( albumValues[j + 5], albumValues[j] ) ); tracktitle_formated = "<span class='album-song-title'>\n"; if( i==vectorPlace && albumValues[j + 2].toInt() == m_currentTrack.track() && discNumber.toInt() == m_currentTrack.discNumber() ) tracktitle_formated += "<i>\n"; @@ -2966,11 +2966,11 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st rating = 10; TQString table = TQString( "<table %1 align='right' border='0' cellspacing='0' cellpadding='0' width='100%'>%2</table>\n" ) - .arg( statsbox ? "class='statsBox'" : "" ); + .tqarg( statsbox ? "class='statsBox'" : "" ); TQString contents; if( AmarokConfig::useScores() ) - contents += TQString( "<tr title='%1'>\n" ).arg( i18n( "Score: %1" ).arg( score ) ) + + contents += TQString( "<tr title='%1'>\n" ).tqarg( i18n( "Score: %1" ).tqarg( score ) ) + "<td class='sbtext' width='100%' align='right'>\n" + TQString::number( score ) + "</td>\n" "<td align='left' width='1'>\n" "<div class='sbouter'>\n" @@ -2982,8 +2982,8 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st if( AmarokConfig::useRatings() ) { - contents += TQString( "<tr title='%1'>\n" ).arg( i18n( "Rating: %1" ) - .arg( MetaBundle::ratingDescription( rating ) ) ) + + contents += TQString( "<tr title='%1'>\n" ).tqarg( i18n( "Rating: %1" ) + .tqarg( MetaBundle::ratingDescription( rating ) ) ) + "<td class='ratingBox' align='right' colspan='2'>\n"; if( rating ) { @@ -2995,14 +2995,14 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st fullStarIO.setFormat( "PNG" ); TQBuffer fullStarBuf; fullStarBuf.open( IO_WriteOnly ); - fullStarIO.setIODevice( &fullStarBuf ); + fullStarIO.setIODevice( TQT_TQIODEVICE(&fullStarBuf) ); fullStarIO.write(); fullStarBuf.close(); TQCString fullStar = KCodecs::base64Encode( fullStarBuf.buffer(), true ); const TQString img = "<img src='%1' height='13px' class='ratingStar'></img>\n"; for( int i = 0, n = rating / 2; i < n; ++i ) - contents += img.arg( "data:image/png;base64," + fullStar ); + contents += img.tqarg( TQString("data:image/png;base64," + fullStar) ); if( rating % 2 ) { TQImageIO halfStarIO; @@ -3010,11 +3010,11 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st halfStarIO.setFormat( "PNG" ); TQBuffer halfStarBuf; halfStarBuf.open( IO_WriteOnly ); - halfStarIO.setIODevice( &halfStarBuf ); + halfStarIO.setIODevice( TQT_TQIODEVICE(&halfStarBuf) ); halfStarIO.write(); halfStarBuf.close(); TQCString halfStar = KCodecs::base64Encode( halfStarBuf.buffer(), true ); - contents += img.arg( "data:image/png;base64," + halfStar ); + contents += img.tqarg( TQString("data:image/png;base64," + halfStar) ); } contents += "</nobr>\n"; } @@ -3024,7 +3024,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st "</tr>\n"; } - return table.arg( contents ); + return table.tqarg( contents ); } bool CurrentTrackJob::doJob() @@ -3080,7 +3080,7 @@ bool CurrentTrackJob::doJob() if( artist == m_currentTrack.artist() ) { b->m_browseArtists = false; - b->m_artist = TQString::null; + b->m_artist = TQString(); b->m_contextBackHistory.clear(); b->m_contextBackHistory.push_back( "current://track" ); } @@ -3146,7 +3146,7 @@ void ContextBrowser::showIntroduction() } // Do we have to rebuild the page? I don't care - m_HTMLSource = TQString::null; + m_HTMLSource = TQString(); m_HTMLSource.append( "<html><body>\n" "<div id='introduction_box' class='box'>\n" @@ -3206,21 +3206,21 @@ void ContextBrowser::showScanning() saveHtmlData(); // Send html code to file } -QString +TQString ContextBrowser::getEncodedImage( const TQString &imageUrl ) { // Embed cover image in html (encoded string), to get around khtml's caching //debug() << "Encoding imageUrl: " << imageUrl << endl; - qApp->lock(); + tqApp->lock(); const TQImage img( imageUrl, "PNG" ); - qApp->unlock(); + tqApp->unlock(); TQByteArray ba; TQBuffer buffer( ba ); buffer.open( IO_WriteOnly ); - qApp->lock(); + tqApp->lock(); img.save( &buffer, "PNG" ); // writes image into ba in PNG format - qApp->unlock(); - const TQString coverImage = TQString( "data:image/png;base64,%1" ).arg( KCodecs::base64Encode( ba ) ); + tqApp->unlock(); + const TQString coverImage = TQString( "data:image/png;base64,%1" ).tqarg( KCodecs::base64Encode( ba ).data() ); //debug() << "Encoded imageUrl: " << coverImage << endl; return coverImage; } @@ -3256,9 +3256,9 @@ void ContextBrowser::showLyrics( const TQString &url ) TQString title = EngineController::instance()->bundle().title(); TQString artist = EngineController::instance()->bundle().artist(); - if( title.contains("PREVIEW: buy it at www.magnatune.com", true) >= 1 ) + if( title.tqcontains("PREVIEW: buy it at www.magnatune.com", true) >= 1 ) title = title.remove(" (PREVIEW: buy it at www.magnatune.com)"); - if( artist.contains("PREVIEW: buy it at www.magnatune.com", true) >= 1 ) + if( artist.tqcontains("PREVIEW: buy it at www.magnatune.com", true) >= 1 ) artist = artist.remove(" (PREVIEW: buy it at www.magnatune.com)"); if ( title.isEmpty() ) { @@ -3266,15 +3266,15 @@ void ContextBrowser::showLyrics( const TQString &url ) The fact that it often (but not always) has artist name together, can be bad, but at least the user will hopefully get nice suggestions. */ TQString prettyTitle = EngineController::instance()->bundle().prettyTitle(); - int h = prettyTitle.find( '-' ); + int h = prettyTitle.tqfind( '-' ); if ( h != -1 ) { title = prettyTitle.mid( h+1 ).stripWhiteSpace(); - if( title.contains("PREVIEW: buy it at www.magnatune.com", true) >= 1 ) + if( title.tqcontains("PREVIEW: buy it at www.magnatune.com", true) >= 1 ) title = title.remove(" (PREVIEW: buy it at www.magnatune.com)"); if ( artist.isEmpty() ) { artist = prettyTitle.mid( 0, h ).stripWhiteSpace(); - if( artist.contains("PREVIEW: buy it at www.magnatune.com", true) >= 1 ) + if( artist.tqcontains("PREVIEW: buy it at www.magnatune.com", true) >= 1 ) artist = artist.remove(" (PREVIEW: buy it at www.magnatune.com)"); } @@ -3282,7 +3282,7 @@ void ContextBrowser::showLyrics( const TQString &url ) } m_lyricSearchUrl = TQString( "http://www.google.com/search?ie=UTF-8&q=lyrics+%1+%2" ) - .arg( KURL::encode_string_no_slash( '"' + artist + '"', 106 /*utf-8*/ ), + .tqarg( KURL::encode_string_no_slash( '"' + artist + '"', 106 /*utf-8*/ ), KURL::encode_string_no_slash( '"' + title + '"', 106 /*utf-8*/ ) ); m_lyricsToolBar->getButton( LYRICS_BROWSER )->setEnabled(false); @@ -3294,7 +3294,7 @@ void ContextBrowser::showLyrics( const TQString &url ) "<br /><div class='info'>\n"+ i18n( "Available Lyrics Scripts:" ) + "<br />\n"; foreach ( scripts ) { - lyrics += TQString( "<a href=\"runscript:%1\">%2</a><br />\n" ).arg( *it, *it ); + lyrics += TQString( "<a href=\"runscript:%1\">%2</a><br />\n" ).tqarg( *it, *it ); } lyrics += "<br />\n" + i18n( "Click on one of the scripts to run it, or use the Script Manager, to be able" " to see all the scripts, and download new ones from the Web." ); @@ -3399,10 +3399,10 @@ ContextBrowser::lyricsResult( TQCString cXmlDoc, bool cached ) //SLOT if ( el.attribute( "add_url" ).isEmpty() ) { m_lyricAddUrl = spec.readPathEntry( "add_url" ); - m_lyricAddUrl.replace( "MAGIC_ARTIST", KURL::encode_string_no_slash( EngineController::instance()->bundle().artist() ) ); - m_lyricAddUrl.replace( "MAGIC_TITLE", KURL::encode_string_no_slash( EngineController::instance()->bundle().title() ) ); - m_lyricAddUrl.replace( "MAGIC_ALBUM", KURL::encode_string_no_slash( EngineController::instance()->bundle().album() ) ); - m_lyricAddUrl.replace( "MAGIC_YEAR", KURL::encode_string_no_slash( TQString::number( EngineController::instance()->bundle().year() ) ) ); + m_lyricAddUrl.tqreplace( "MAGIC_ARTIST", KURL::encode_string_no_slash( EngineController::instance()->bundle().artist() ) ); + m_lyricAddUrl.tqreplace( "MAGIC_TITLE", KURL::encode_string_no_slash( EngineController::instance()->bundle().title() ) ); + m_lyricAddUrl.tqreplace( "MAGIC_ALBUM", KURL::encode_string_no_slash( EngineController::instance()->bundle().album() ) ); + m_lyricAddUrl.tqreplace( "MAGIC_YEAR", KURL::encode_string_no_slash( TQString::number( EngineController::instance()->bundle().year() ) ) ); } else m_lyricAddUrl = el.attribute( "add_url" ); @@ -3425,16 +3425,16 @@ ContextBrowser::lyricsResult( TQCString cXmlDoc, bool cached ) //SLOT const TQString artist = l.item( i ).toElement().attribute( "artist" ); const TQString title = l.item( i ).toElement().attribute( "title" ); - lyrics += "<a href='show:suggestLyric-" + url + "'>\n" + i18n("%1 - %2").arg( artist, title ); + lyrics += "<a href='show:suggestLyric-" + url + "'>\n" + i18n("%1 - %2").tqarg( artist, title ); lyrics += "</a><br/>\n"; } } lyrics += i18n( "<p>You can <a href=\"%1\">search for the lyrics</a> on the Web.</p>" ) - .arg( TQString( m_lyricSearchUrl ).replace( TQRegExp( "^http:" ), "externalurl:" ) ); + .tqarg( TQString( m_lyricSearchUrl ).tqreplace( TQRegExp( "^http:" ), "externalurl:" ) ); } else { lyrics = el.text(); - lyrics.replace( "\n", "<br/>\n" ); // Plaintext -> HTML + lyrics.tqreplace( "\n", "<br/>\n" ); // Plaintext -> HTML const TQString title = el.attribute( "title" ); const TQString artist = el.attribute( "artist" ); @@ -3444,7 +3444,7 @@ ContextBrowser::lyricsResult( TQCString cXmlDoc, bool cached ) //SLOT lyrics.prepend( "<font size='2'><b>\n" + title + "</b><br/><u>\n" + artist+ "</font></u></font><br/>\n" ); if( !cached ) { - lyrics.append( "<br/><br/><i>\n" + i18n( "Powered by %1 (%2)" ).arg( site, site_url ) + "</i>\n" ); + lyrics.append( "<br/><br/><i>\n" + i18n( "Powered by %1 (%2)" ).tqarg( site, site_url ) + "</i>\n" ); CollectionDB::instance()->setLyrics( EngineController::instance()->bundle().url().path(), xmldoc, EngineController::instance()->bundle().uniqueId() ); } } @@ -3502,7 +3502,7 @@ ContextBrowser::lyricsEditToggle() //SLOT if( doc.setContent( xml ) ) lyrics = doc.documentElement().text(); else - lyrics = TQString::null; + lyrics = TQString(); m_lyricsTextEdit->setText( lyrics ); m_lyricsPage->hide(); m_lyricsTextEdit->show(); @@ -3587,7 +3587,7 @@ ContextBrowser::lyricsSearchTextToggle() //SLOT // Wikipedia-Tab ////////////////////////////////////////////////////////////////////////////////////////// -QString +TQString ContextBrowser::wikiArtistPostfix() const { if( wikiLocale() == "en" ) @@ -3598,7 +3598,7 @@ ContextBrowser::wikiArtistPostfix() const return ""; } -QString +TQString ContextBrowser::wikiAlbumPostfix() const { if( wikiLocale() == "en" ) @@ -3607,7 +3607,7 @@ ContextBrowser::wikiAlbumPostfix() const return ""; } -QString +TQString ContextBrowser::wikiTrackPostfix() const { if( wikiLocale() == "en" ) @@ -3720,7 +3720,7 @@ ContextBrowser::wikiConfig() // SLOT delete m_wikiConfigDialog; } -QString +TQString ContextBrowser::wikiLocale() { if( s_wikiLocale.isEmpty() ) @@ -3736,13 +3736,13 @@ ContextBrowser::setWikiLocale( const TQString &locale ) s_wikiLocale = locale; } -QString +TQString ContextBrowser::wikiURL( const TQString &item ) { // add any special characters to be replaced here - TQString wStr = TQString(item).replace( "/", " " ); + TQString wStr = TQString(item).tqreplace( "/", " " ); - return TQString( "http://%1.wikipedia.org/wiki/" ).arg( wikiLocale() ) + return TQString( "http://%1.wikipedia.org/wiki/" ).tqarg( wikiLocale() ) + KURL::encode_string_no_slash( wStr, 106 /*utf-8*/ ); } @@ -3768,7 +3768,7 @@ ContextBrowser::showLabelsDialog() TQStringList allLabels = CollectionDB::instance()->labelList(); TQStringList trackLabels = CollectionDB::instance()->getLabels( currentUrl.path(), CollectionDB::typeUser ); debug() << "Showing add label dialog" << endl; - KDialogBase *dialog = new KDialogBase( this, 0, false, TQString::null, KDialogBase::Ok|KDialogBase::Cancel ); + KDialogBase *dialog = new KDialogBase( this, 0, false, TQString(), KDialogBase::Ok|KDialogBase::Cancel ); dialog->makeVBoxMainWidget(); TQLabel *labelText = new TQLabel( i18n( @@ -3783,13 +3783,13 @@ ContextBrowser::showLabelsDialog() m_labelListView = new TQListView( dialog->mainWidget() ); m_labelListView->addColumn( i18n( "Label" ) ); - m_labelListView->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + m_labelListView->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); m_labelListView->setColumnWidthMode( 0, TQListView::Maximum ); foreach( allLabels ) { TQCheckListItem *item = new TQCheckListItem( m_labelListView, *it, TQCheckListItem::CheckBox ); - item->setOn( trackLabels.contains( *it ) ); + item->setOn( trackLabels.tqcontains( *it ) ); } if( dialog->exec() == TQDialog::Accepted ) { @@ -3815,7 +3815,7 @@ ContextBrowser::showLabelsDialog() showCurrentTrack(); } } - delete dialog; //deletes children + delete dialog; //deletes tqchildren m_addLabelEdit = 0; m_labelListView = 0; } @@ -3826,9 +3826,9 @@ ContextBrowser::eventFilter( TQObject *o, TQEvent *e ) switch( e->type() ) { case 6/*TQEvent::KeyPress*/: - #define e static_cast<TQKeyEvent*>(e) + #define e TQT_TQKEYEVENT(e) - if( o == m_addLabelEdit ) //the add label lineedit + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_addLabelEdit) ) //the add label lineedit { switch( e->key() ) { @@ -3845,7 +3845,8 @@ ContextBrowser::eventFilter( TQObject *o, TQEvent *e ) return false; } } - if (o == m_lyricsSearchText) + + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lyricsSearchText)) { switch ( e->key() ) { @@ -3863,7 +3864,7 @@ ContextBrowser::eventFilter( TQObject *o, TQEvent *e ) break; } - return KTabWidget::eventFilter( o, e ); + return KTabWidget::eventFilter( TQT_TQOBJECT(o), TQT_TQEVENT(e) ); } void ContextBrowser::showWikipedia( const TQString &url, bool fromHistory, bool replaceHistory ) @@ -3935,9 +3936,9 @@ void ContextBrowser::showWikipedia( const TQString &url, bool fromHistory, bool } //Hack to make wiki searches work with magnatune preview tracks - if (tmpWikiStr.contains( "PREVIEW: buy it at www.magnatune.com" ) >= 1 ) { + if (tmpWikiStr.tqcontains( "PREVIEW: buy it at www.magnatune.com" ) >= 1 ) { tmpWikiStr = tmpWikiStr.remove(" (PREVIEW: buy it at www.magnatune.com)" ); - int index = tmpWikiStr.find( '-' ); + int index = tmpWikiStr.tqfind( '-' ); if ( index != -1 ) { tmpWikiStr = tmpWikiStr.left (index - 1); } @@ -3987,7 +3988,7 @@ void ContextBrowser::showWikipedia( const TQString &url, bool fromHistory, bool m_wikiToolBar->setItemEnabled( WIKI_BACK, m_wikiBackHistory.size() > 1 ); m_wikiToolBar->setItemEnabled( WIKI_FORWARD, m_wikiForwardHistory.size() > 0 ); - m_wikiBaseUrl = m_wikiCurrentUrl.mid(0 , m_wikiCurrentUrl.find("wiki/")); + m_wikiBaseUrl = m_wikiCurrentUrl.mid(0 , m_wikiCurrentUrl.tqfind("wiki/")); m_wikiJob = KIO::storedGet( m_wikiCurrentUrl, false, false ); Amarok::StatusBar::instance()->newProgressOperation( m_wikiJob ) @@ -4008,7 +4009,7 @@ ContextBrowser::wikiHistoryBack() //SLOT m_wikiBackHistory.pop_back(); m_dirtyWikiPage = true; - m_wikiCurrentEntry = TQString::null; + m_wikiCurrentEntry = TQString(); showWikipedia( m_wikiBackHistory.last(), true ); } @@ -4024,7 +4025,7 @@ ContextBrowser::wikiHistoryForward() //SLOT m_wikiForwardHistory.pop_back(); m_dirtyWikiPage = true; - m_wikiCurrentEntry = TQString::null; + m_wikiCurrentEntry = TQString(); showWikipedia( m_wikiBackHistory.last(), true ); } @@ -4042,7 +4043,7 @@ ContextBrowser::wikiBackPopupActivated( int id ) //SLOT } while( id >= 0 ); m_dirtyWikiPage = true; - m_wikiCurrentEntry = TQString::null; + m_wikiCurrentEntry = TQString(); showWikipedia( m_wikiBackHistory.last(), true ); } @@ -4060,7 +4061,7 @@ ContextBrowser::wikiForwardPopupActivated( int id ) //SLOT } while( id >= 0 ); m_dirtyWikiPage = true; - m_wikiCurrentEntry = TQString::null; + m_wikiCurrentEntry = TQString(); showWikipedia( m_wikiBackHistory.last(), true ); } @@ -4135,11 +4136,11 @@ ContextBrowser::wikiResult( KIO::Job* job ) //SLOT m_wikiToolBar->setItemEnabled( WIKI_BROWSER, true ); // FIXME: Get a safer Regexp here, to match only inside of <head> </head> at least. - if ( m_wiki.contains( "charset=utf-8" ) ) { + if ( m_wiki.tqcontains( "charset=utf-8" ) ) { m_wiki = TQString::fromUtf8( storedJob->data().data(), storedJob->data().size() ); } - if( m_wiki.find( "var wgArticleId = 0" ) != -1 ) + if( m_wiki.tqfind( "var wgArticleId = 0" ) != -1 ) { debug() << "Article not found." << endl; @@ -4165,65 +4166,65 @@ ContextBrowser::wikiResult( KIO::Job* job ) //SLOT } //remove the new-lines and tabs(replace with spaces IS needed). - m_wiki.replace( "\n", " " ); - m_wiki.replace( "\t", " " ); + m_wiki.tqreplace( "\n", " " ); + m_wiki.tqreplace( "\t", " " ); - m_wikiLanguages = TQString::null; + m_wikiLanguages = TQString(); // Get the available language list - if ( m_wiki.find("<div id=\"p-lang\" class=\"portlet\">") != -1 ) + if ( m_wiki.tqfind("<div id=\"p-lang\" class=\"portlet\">") != -1 ) { - m_wikiLanguages = m_wiki.mid( m_wiki.find("<div id=\"p-lang\" class=\"portlet\">") ); - m_wikiLanguages = m_wikiLanguages.mid( m_wikiLanguages.find("<ul>") ); - m_wikiLanguages = m_wikiLanguages.mid( 0, m_wikiLanguages.find( "</div>" ) ); + m_wikiLanguages = m_wiki.mid( m_wiki.tqfind("<div id=\"p-lang\" class=\"portlet\">") ); + m_wikiLanguages = m_wikiLanguages.mid( m_wikiLanguages.tqfind("<ul>") ); + m_wikiLanguages = m_wikiLanguages.mid( 0, m_wikiLanguages.tqfind( "</div>" ) ); } TQString copyright; TQString copyrightMark = "<li id=\"f-copyright\">"; - if ( m_wiki.find( copyrightMark ) != -1 ) + if ( m_wiki.tqfind( copyrightMark ) != -1 ) { - copyright = m_wiki.mid( m_wiki.find(copyrightMark) + copyrightMark.length() ); - copyright = copyright.mid( 0, copyright.find( "</li>" ) ); - copyright.replace( "<br />", TQString::null ); + copyright = m_wiki.mid( m_wiki.tqfind(copyrightMark) + copyrightMark.length() ); + copyright = copyright.mid( 0, copyright.tqfind( "</li>" ) ); + copyright.tqreplace( "<br />", TQString() ); //only one br at the beginning copyright.prepend( "<br />" ); } // Ok lets remove the top and bottom parts of the page - m_wiki = m_wiki.mid( m_wiki.find( "<h1 id=\"firstHeading\" class=\"firstHeading\">" ) ); - m_wiki = m_wiki.mid( 0, m_wiki.find( "<div class=\"printfooter\">" ) ); + m_wiki = m_wiki.mid( m_wiki.tqfind( "<h1 id=\"firstHeading\" class=\"firstHeading\">" ) ); + m_wiki = m_wiki.mid( 0, m_wiki.tqfind( "<div class=\"printfooter\">" ) ); // Adding back license information m_wiki += copyright; m_wiki.append( "</div>" ); - m_wiki.replace( TQRegExp("<h3 id=\"siteSub\">[^<]*</h3>"), TQString::null ); + m_wiki.tqreplace( TQRegExp("<h3 id=\"siteSub\">[^<]*</h3>"), TQString() ); - m_wiki.replace( TQRegExp( "<span class=\"editsection\"[^>]*>[^<]*<[^>]*>[^<]*<[^>]*>[^<]*</span>" ), TQString::null ); + m_wiki.tqreplace( TQRegExp( "<span class=\"editsection\"[^>]*>[^<]*<[^>]*>[^<]*<[^>]*>[^<]*</span>" ), TQString() ); - m_wiki.replace( TQRegExp( "<a href=\"[^\"]*\" class=\"new\"[^>]*>([^<]*)</a>" ), "\\1" ); + m_wiki.tqreplace( TQRegExp( "<a href=\"[^\"]*\" class=\"new\"[^>]*>([^<]*)</a>" ), "\\1" ); // Remove anything inside of a class called urlexpansion, as it's pointless for us - m_wiki.replace( TQRegExp( "<span class= *'urlexpansion'>[^(]*[(][^)]*[)]</span>" ), TQString::null ); + m_wiki.tqreplace( TQRegExp( "<span class= *'urlexpansion'>[^(]*[(][^)]*[)]</span>" ), TQString() ); // Remove hidden table rows as well TQRegExp hidden( "<tr *class= *[\"\']hiddenStructure[\"\']>.*</tr>", false ); hidden.setMinimal( true ); //greedy behaviour wouldn't be any good! - m_wiki.replace( hidden, TQString::null ); + m_wiki.tqreplace( hidden, TQString() ); // we want to keep our own style (we need to modify the stylesheet a bit to handle things nicely) - m_wiki.replace( TQRegExp( "style= *\"[^\"]*\"" ), TQString::null ); - m_wiki.replace( TQRegExp( "class= *\"[^\"]*\"" ), TQString::null ); + m_wiki.tqreplace( TQRegExp( "style= *\"[^\"]*\"" ), TQString() ); + m_wiki.tqreplace( TQRegExp( "class= *\"[^\"]*\"" ), TQString() ); // let's remove the form elements, we don't want them. - m_wiki.replace( TQRegExp( "<input[^>]*>" ), TQString::null ); - m_wiki.replace( TQRegExp( "<select[^>]*>" ), TQString::null ); - m_wiki.replace( "</select>\n" , TQString::null ); - m_wiki.replace( TQRegExp( "<option[^>]*>" ), TQString::null ); - m_wiki.replace( "</option>\n" , TQString::null ); - m_wiki.replace( TQRegExp( "<textarea[^>]*>" ), TQString::null ); - m_wiki.replace( "</textarea>" , TQString::null ); + m_wiki.tqreplace( TQRegExp( "<input[^>]*>" ), TQString() ); + m_wiki.tqreplace( TQRegExp( "<select[^>]*>" ), TQString() ); + m_wiki.tqreplace( "</select>\n" , TQString() ); + m_wiki.tqreplace( TQRegExp( "<option[^>]*>" ), TQString() ); + m_wiki.tqreplace( "</option>\n" , TQString() ); + m_wiki.tqreplace( TQRegExp( "<textarea[^>]*>" ), TQString() ); + m_wiki.tqreplace( "</textarea>" , TQString() ); //first we convert all the links with protocol to external, as they should all be External Links. - m_wiki.replace( TQRegExp( "href= *\"http:" ), "href=\"externalurl:" ); - m_wiki.replace( TQRegExp( "href= *\"/" ), "href=\"" +m_wikiBaseUrl ); - m_wiki.replace( TQRegExp( "href= *\"#" ), "href=\"" +m_wikiCurrentUrl + '#' ); + m_wiki.tqreplace( TQRegExp( "href= *\"http:" ), "href=\"externalurl:" ); + m_wiki.tqreplace( TQRegExp( "href= *\"/" ), "href=\"" +m_wikiBaseUrl ); + m_wiki.tqreplace( TQRegExp( "href= *\"#" ), "href=\"" +m_wikiCurrentUrl + '#' ); m_HTMLSource = "<html><body>\n"; m_HTMLSource.append( @@ -4270,7 +4271,7 @@ ContextBrowser::coverFetched( const TQString &artist, const TQString &album ) // !m_browseArtists ) { m_dirtyCurrentTrackPage = true; - if( m_shownAlbums.contains( album ) ) + if( m_shownAlbums.tqcontains( album ) ) showCurrentTrack(); return; } @@ -4296,7 +4297,7 @@ ContextBrowser::coverRemoved( const TQString &artist, const TQString &album ) // !m_browseArtists ) { m_dirtyCurrentTrackPage = true; - if( m_shownAlbums.contains( album ) ) + if( m_shownAlbums.tqcontains( album ) ) showCurrentTrack(); return; } @@ -4332,7 +4333,7 @@ ContextBrowser::imageFetched( const TQString &url ) //SLOT if( CollectionDB::instance()->getPodcastEpisodeBundle( currentTrack.url(), &peb ) ) { PodcastChannelBundle pcb; - if( CollectionDB::instance()->getPodcastChannelBundle( peb.parent(), &pcb ) ) + if( CollectionDB::instance()->getPodcastChannelBundle( peb.tqparent(), &pcb ) ) { if( pcb.imageURL().url() == url ) { @@ -4362,7 +4363,7 @@ void ContextBrowser::tagsChanged( const MetaBundle &bundle ) //SLOT { const MetaBundle ¤tTrack = EngineController::instance()->bundle(); - if( !m_shownAlbums.contains( bundle.album() ) && m_artist != bundle.artist() ) + if( !m_shownAlbums.tqcontains( bundle.album() ) && m_artist != bundle.artist() ) { if( currentTrack.artist().isEmpty() && currentTrack.album().isEmpty() ) return; @@ -4378,7 +4379,7 @@ void ContextBrowser::tagsChanged( const TQString &oldArtist, const TQString &old { const MetaBundle ¤tTrack = EngineController::instance()->bundle(); - if( !m_shownAlbums.contains( oldAlbum ) && m_artist != oldArtist ) + if( !m_shownAlbums.tqcontains( oldAlbum ) && m_artist != oldArtist ) { if( currentTrack.artist().isEmpty() && currentTrack.album().isEmpty() ) return; @@ -4491,7 +4492,7 @@ ContextBrowser::expandURL( const KURL &url ) } else if( protocol == "stream" ) { - urls += KURL::fromPathOrURL( url.url().replace( TQRegExp( "^stream:" ), "http:" ) ); + urls += KURL::fromPathOrURL( url.url().tqreplace( TQRegExp( "^stream:" ), "http:" ) ); } return urls; diff --git a/amarok/src/contextbrowser.h b/amarok/src/contextbrowser.h index 7cc24538..436118cd 100644 --- a/amarok/src/contextbrowser.h +++ b/amarok/src/contextbrowser.h @@ -39,6 +39,7 @@ namespace KIO { class Job; class TransferJob; } class ContextBrowser : public KTabWidget, public EngineObserver { Q_OBJECT + TQ_OBJECT friend class CurrentTrackJob; friend class Amarok::DcopContextBrowserHandler; @@ -80,8 +81,8 @@ class ContextBrowser : public KTabWidget, public EngineObserver void slotContextMenu( const TQString& urlString, const TQPoint& point ); void showContext( const KURL& url, bool fromHistory = false ); void showCurrentTrack(); - void showLyrics( const TQString& url = TQString::null ); - void showWikipedia( const TQString& url = TQString::null, bool fromHistory = false, bool replaceHistory = false ); + void showLyrics( const TQString& url = TQString() ); + void showWikipedia( const TQString& url = TQString(), bool fromHistory = false, bool replaceHistory = false ); void showWikipediaEntry( const TQString& entry, bool replaceHistory = false ); void reloadWikipedia(); void showLabelsDialog(); diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp index bdd7268e..0aa7992a 100644 --- a/amarok/src/coverfetcher.cpp +++ b/amarok/src/coverfetcher.cpp @@ -35,7 +35,7 @@ void -Amarok::coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artist, const TQString &album, bool showCoverManager ) +Amarok::coverContextMenu( TQWidget *tqparent, TQPoint point, const TQString &artist, const TQString &album, bool showCoverManager ) { KPopupMenu menu; enum { SHOW, FETCH, CUSTOM, DELETE, MANAGER }; @@ -43,7 +43,7 @@ Amarok::coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artis menu.insertTitle( i18n( "Cover Image" ) ); menu.insertItem( SmallIconSet( Amarok::icon( "zoom" ) ), i18n( "&Show Fullsize" ), SHOW ); - menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).arg( CoverManager::amazonTld() ), FETCH ); + menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).tqarg( CoverManager::amazonTld() ), FETCH ); menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Set &Custom Cover" ), CUSTOM ); bool disable = !album.isEmpty(); // disable setting covers for unknown albums menu.setItemEnabled( FETCH, disable ); @@ -58,21 +58,21 @@ Amarok::coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artis #ifndef AMAZON_SUPPORT menu.setItemEnabled( FETCH, false ); #endif - disable = !CollectionDB::instance()->albumImage( artist, album, 0 ).contains( "nocover" ); + disable = !CollectionDB::instance()->albumImage( artist, album, 0 ).tqcontains( "nocover" ); menu.setItemEnabled( SHOW, disable ); menu.setItemEnabled( DELETE, disable ); switch( menu.exec( point ) ) { case SHOW: - CoverManager::viewCover( artist, album, parent ); + CoverManager::viewCover( artist, album, tqparent ); break; case DELETE: { - const int button = KMessageBox::warningContinueCancel( parent, + const int button = KMessageBox::warningContinueCancel( tqparent, i18n( "Are you sure you want to remove this cover from the Collection?" ), - TQString::null, + TQString(), KStdGuiItem::del() ); if ( button == KMessageBox::Continue ) @@ -82,7 +82,7 @@ Amarok::coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artis case FETCH: #ifdef AMAZON_SUPPORT - CollectionDB::instance()->fetchCover( parent, artist, album, false ); + CollectionDB::instance()->fetchCover( tqparent, artist, album, false ); break; #endif @@ -99,7 +99,7 @@ Amarok::coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artis startPath = url.directory(); } - KURL file = KFileDialog::getImageOpenURL( startPath, parent, i18n("Select Cover Image File") ); + KURL file = KFileDialog::getImageOpenURL( startPath, tqparent, i18n("Select Cover Image File") ); if ( !file.isEmpty() ) CollectionDB::instance()->setAlbumImage( artist, album, file ); break; @@ -113,21 +113,21 @@ Amarok::coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artis -CoverLabel::CoverLabel ( TQWidget * parent, const char * name, WFlags f ) - : TQLabel( parent, name, f) +CoverLabel::CoverLabel ( TQWidget * tqparent, const char * name, WFlags f ) + : TQLabel( tqparent, name, f) {} void CoverLabel::mouseReleaseEvent(TQMouseEvent *pEvent) { - if (pEvent->button() == LeftButton || pEvent->button() == RightButton) + if (pEvent->button() == Qt::LeftButton || pEvent->button() == Qt::RightButton) { Amarok::coverContextMenu( this, pEvent->globalPos(), m_artist, m_album, false ); } } -CoverFetcher::CoverFetcher( TQWidget *parent, const TQString &artist, TQString album ) - : TQObject( parent, "CoverFetcher" ) +CoverFetcher::CoverFetcher( TQWidget *tqparent, const TQString &artist, TQString album ) + : TQObject( tqparent, "CoverFetcher" ) , m_artist( artist ) , m_album( album ) , m_size( 2 ) @@ -143,7 +143,7 @@ CoverFetcher::CoverFetcher( TQWidget *parent, const TQString &artist, TQString a //the others have the above strings removed with the following regex, as this can increase hit-rate const TQString template1 = " ?-? ?[(^{]* ?%1 ?\\d*[)^}\\]]* *$"; //eg album - [disk 1] -> album foreach( extensions ) { - TQRegExp regexp( template1.arg( *it ) ); + TQRegExp regexp( template1.tqarg( *it ) ); regexp.setCaseSensitive( false ); album.remove( regexp ); } @@ -201,7 +201,7 @@ CoverFetcher::startFetch() m_coverAsins.clear(); m_coverUrls.clear(); m_coverNames.clear(); - m_xml = TQString::null; + m_xml = TQString(); m_size = 2; if ( m_queries.isEmpty() ) { @@ -459,8 +459,8 @@ CoverFetcher::attemptAnotherFetch() class EditSearchDialog : public KDialog { public: - EditSearchDialog( TQWidget* parent, const TQString &text, const TQString &keyword, CoverFetcher *fetcher ) - : KDialog( parent ) + EditSearchDialog( TQWidget* tqparent, const TQString &text, const TQString &keyword, CoverFetcher *fetcher ) + : KDialog( tqparent ) { setCaption( i18n( "Amazon Query Editor" ) ); @@ -508,10 +508,10 @@ CoverFetcher::attemptAnotherFetch() connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); } - TQString query() { return static_cast<KLineEdit*>(child( "Query" ))->text(); } + TQString query() { return static_cast<KLineEdit*>(TQT_TQWIDGET(child( "Query" )))->text(); } }; -QString +TQString CoverFetcher::localeIDToString( int id )//static { switch ( id ) @@ -561,7 +561,7 @@ CoverFetcher::getUserQuery( TQString explanation ) explanation = i18n("Ask Amazon for covers using this query:"); EditSearchDialog dialog( - static_cast<TQWidget*>( parent() ), + TQT_TQWIDGET( tqparent() ), explanation, m_userQuery, this ); @@ -582,8 +582,8 @@ CoverFetcher::getUserQuery( TQString explanation ) class CoverFoundDialog : public KDialog { public: - CoverFoundDialog( TQWidget *parent, const TQImage &cover, const TQString &productname ) - : KDialog( parent ) + CoverFoundDialog( TQWidget *tqparent, const TQImage &cover, const TQString &productname ) + : KDialog( tqparent ) { // Gives the window a small title bar, and skips a taskbar entry KWin::setType( winId(), NET::Utility ); @@ -599,13 +599,13 @@ CoverFetcher::getUserQuery( TQString explanation ) KPushButton *nextcover = new KPushButton( i18n( "&Next Cover" ), buttons, "NextCover" ); KPushButton *cancel = new KPushButton( KStdGuiItem::cancel(), buttons ); - labelPix ->setAlignment( Qt::AlignHCenter ); - labelName->setAlignment( Qt::AlignHCenter ); + labelPix ->tqsetAlignment( TQt::AlignHCenter ); + labelName->tqsetAlignment( TQt::AlignHCenter ); labelPix ->setPixmap( cover ); labelName->setText( productname ); save->setDefault( true ); - this->setFixedSize( sizeHint() ); + this->setFixedSize( tqsizeHint() ); this->setCaption( i18n("Cover Found") ); connect( save, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); @@ -616,9 +616,9 @@ CoverFetcher::getUserQuery( TQString explanation ) virtual void accept() { - if( qstrcmp( sender()->name(), "NewSearch" ) == 0 ) + if( tqstrcmp( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(), "NewSearch" ) == 0 ) done( 1000 ); - else if( qstrcmp( sender()->name(), "NextCover" ) == 0 ) + else if( tqstrcmp( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(), "NextCover" ) == 0 ) done( 1001 ); else KDialog::accept(); @@ -629,7 +629,7 @@ CoverFetcher::getUserQuery( TQString explanation ) void CoverFetcher::showCover() { - CoverFoundDialog dialog( static_cast<TQWidget*>( parent() ), m_image, m_currentCoverName ); + CoverFoundDialog dialog( TQT_TQWIDGET( tqparent() ), m_image, m_currentCoverName ); switch( dialog.exec() ) { diff --git a/amarok/src/coverfetcher.h b/amarok/src/coverfetcher.h index fad72eea..00aef24a 100644 --- a/amarok/src/coverfetcher.h +++ b/amarok/src/coverfetcher.h @@ -12,13 +12,13 @@ #include <tqdom.h> //stack allocated namespace Amarok { - void coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artist, const TQString &album, bool showCoverManager = true ); + void coverContextMenu( TQWidget *tqparent, TQPoint point, const TQString &artist, const TQString &album, bool showCoverManager = true ); } class CoverLabel : public TQLabel { public: - CoverLabel ( TQWidget * parent, const char * name = 0, WFlags f = 0 ); + CoverLabel ( TQWidget * tqparent, const char * name = 0, WFlags f = 0 ); void setInformation( const TQString artist, const TQString album ) { m_artist = artist; @@ -37,15 +37,16 @@ class CoverLabel : public TQLabel { namespace KIO { class Job; } -class CoverFetcher : public QObject +class CoverFetcher : public TQObject { friend class EditSearchDialog; Q_OBJECT + TQ_OBJECT static const uint MAX_COVERS_CHOICE = 10; public: - CoverFetcher( TQWidget *parent, const TQString &artist, TQString album ); + CoverFetcher( TQWidget *tqparent, const TQString &artist, TQString album ); ~CoverFetcher(); /// allow the user to edit the query? @@ -109,7 +110,7 @@ private: void finishWithError( const TQString &message, KIO::Job *job = 0 ); /// Prompt the user for a query - void getUserQuery( TQString explanation = TQString::null ); + void getUserQuery( TQString explanation = TQString() ); /// Will try all available queries, and then prompt the user, if allowed void attemptAnotherFetch(); diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp index 79b5d571..bf1c60ef 100644 --- a/amarok/src/covermanager.cpp +++ b/amarok/src/covermanager.cpp @@ -73,9 +73,9 @@ class ArtistItem : public KListViewItem TQString a = text(0); TQString b = i->text(0); - if ( a.startsWith( "the ", false ) ) + if ( a.tqstartsWith( "the ", false ) ) CollectionView::manipulateThe( a, true ); - if ( b.startsWith( "the ", false ) ) + if ( b.tqstartsWith( "the ", false ) ) CollectionView::manipulateThe( b, true ); return TQString::localeAwareCompare( a.lower(), b.lower() ); @@ -270,26 +270,26 @@ void CoverManager::init() } -CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album, TQWidget *parent ) - : TQDialog( parent, 0, false, WDestructiveClose | WType_TopLevel | WNoAutoErase ) +CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album, TQWidget *tqparent ) + : TQDialog( tqparent, 0, false, WDestructiveClose | WType_TopLevel | WNoAutoErase ) , m_pixmap( CollectionDB::instance()->albumImage( artist, album, false, 0 ) ) { KWin::setType( winId(), NET::Utility ); kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n("%1 - %2").arg( artist, album ) ) ); + setCaption( kapp->makeStdCaption( i18n("%1 - %2").tqarg( artist, album ) ) ); - m_layout = new TQHBoxLayout( this ); - m_layout->setAutoAdd( true ); + m_tqlayout = new TQHBoxLayout( this ); + m_tqlayout->setAutoAdd( true ); m_pixmapViewer = new PixmapViewer( this, m_pixmap ); setFixedSize( m_pixmapViewer->maximalSize() ); } -void CoverManager::viewCover( const TQString& artist, const TQString& album, TQWidget *parent ) //static +void CoverManager::viewCover( const TQString& artist, const TQString& album, TQWidget *tqparent ) //static { //TQDialog means "escape" works as expected - TQDialog *dialog = new CoverViewDialog( artist, album, parent ); + TQDialog *dialog = new CoverViewDialog( artist, album, tqparent ); dialog->show(); } @@ -394,9 +394,9 @@ void CoverManager::slotArtistSelected( TQListViewItem *item ) //SLOT progress.TQDialog::setCaption( i18n("...") ); //NOTE we MUST show the dialog, otherwise the closeEvents get processed - // in the processEvents() calls below, GRUMBLE! Qt sux0rs + // in the processEvents() calls below, GRUMBLE! TQt sux0rs progress.show(); - progress.repaint( false ); //ensures the dialog isn't blank + progress.tqrepaint( false ); //ensures the dialog isn't blank //this is an extra processEvent call for the sake of init() and aesthetics //it isn't necessary @@ -456,8 +456,8 @@ void CoverManager::slotArtistSelected( TQListViewItem *item ) //SLOT m_coverItems.append( new CoverViewItem( m_coverView, m_coverView->lastItem(), artist, album ) ); if ( ++x % 50 == 0 ) { - progress.setProgress( x / 5 ); // we do it less often due to bug in Qt, ask Max - kapp->processEvents(); // TQProgressDialog also calls this, but not always due to Qt bug! + progress.setProgress( x / 5 ); // we do it less often due to bug in TQt, ask Max + kapp->processEvents(); // TQProgressDialog also calls this, but not always due to TQt bug! //only worth testing for after processEvents() is called if( progress.wasCancelled() ) @@ -499,7 +499,7 @@ void CoverManager::showCoverMenu( TQIconViewItem *item, const TQPoint &p ) //SLO } else { menu.insertItem( SmallIconSet( Amarok::icon( "zoom" ) ), i18n( "&Show Fullsize" ), SHOW ); - menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).arg( CoverManager::amazonTld() ), FETCH ); + menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).tqarg( CoverManager::amazonTld() ), FETCH ); menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Set &Custom Cover" ), CUSTOM ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); menu.insertSeparator(); @@ -586,7 +586,7 @@ void CoverManager::slotSetFilter() //SLOT for( TQIconViewItem *item = m_coverItems.first(); item; item = m_coverItems.next() ) { CoverViewItem *coverItem = static_cast<CoverViewItem*>(item); - if( coverItem->album().contains( m_filter, false ) || coverItem->artist().contains( m_filter, false ) ) + if( coverItem->album().tqcontains( m_filter, false ) || coverItem->artist().tqcontains( m_filter, false ) ) m_coverView->insertItem( item, m_coverView->lastItem() ); } m_coverView->setAutoArrange( true ); @@ -621,7 +621,7 @@ void CoverManager::changeView( int id ) //SLOT bool show = false; CoverViewItem *coverItem = static_cast<CoverViewItem*>(item); if( !m_filter.isEmpty() ) { - if( !coverItem->album().contains( m_filter, false ) && !coverItem->artist().contains( m_filter, false ) ) + if( !coverItem->album().tqcontains( m_filter, false ) && !coverItem->artist().tqcontains( m_filter, false ) ) continue; } @@ -729,7 +729,7 @@ void CoverManager::setCustomSelectedCovers() } KURL file = KFileDialog::getImageOpenURL( startPath, this, i18n( "Select Cover Image File" ) ); if ( !file.isEmpty() ) { - qApp->processEvents(); //it may takes a while so process pending events + tqApp->processEvents(); //it may takes a while so process pending events TQString tmpFile; TQImage image = CollectionDB::fetchImage(file, tmpFile); for ( CoverViewItem* item = selected.first(); item; item = selected.next() ) { @@ -763,12 +763,12 @@ void CoverManager::deleteSelectedCovers() i18n( "Are you sure you want to remove this cover from the Collection?", "Are you sure you want to delete these %n covers from the Collection?", selected.count() ), - TQString::null, + TQString(), KStdGuiItem::del() ); if ( button == KMessageBox::Continue ) { for ( CoverViewItem* item = selected.first(); item; item = selected.next() ) { - qApp->processEvents(); + tqApp->processEvents(); if ( CollectionDB::instance()->removeAlbumImage( item->artist(), item->album() ) ) //delete selected cover coverRemoved( item->artist(), item->album() ); } @@ -817,9 +817,9 @@ void CoverManager::updateStatusBar() if ( values.count() >= 2 ) { if( values[0].isEmpty() ) - text = i18n( "Fetching cover for %1..." ).arg( values[1] ); + text = i18n( "Fetching cover for %1..." ).tqarg( values[1] ); else - text = i18n( "Fetching cover for %1 - %2..." ).arg( values[0], values[1] ); + text = i18n( "Fetching cover for %1 - %2..." ).tqarg( values[0], values[1] ); } } else if( m_fetchingCovers ) { @@ -851,7 +851,7 @@ void CoverManager::updateStatusBar() } if( !m_filter.isEmpty() ) - text = i18n( "1 result for \"%1\"", "%n results for \"%1\"", totalCounter ).arg( m_filter ); + text = i18n( "1 result for \"%1\"", "%n results for \"%1\"", totalCounter ).tqarg( m_filter ); else if( m_artistView->selectedItem() ) { text = i18n( "1 album", "%n albums", totalCounter ); if( m_artistView->selectedItem() != m_artistView->firstChild() ) //showing albums by an artist @@ -864,7 +864,7 @@ void CoverManager::updateStatusBar() } if( missingCounter ) - text += i18n(" - ( <b>%1</b> without cover )" ).arg( missingCounter ); + text += i18n(" - ( <b>%1</b> without cover )" ).tqarg( missingCounter ); #ifdef AMAZON_SUPPORT m_fetchButton->setEnabled( missingCounter ); @@ -884,8 +884,8 @@ void CoverManager::setStatusText( TQString text ) // CLASS CoverView ///////////////////////////////////////////////////////////////////// -CoverView::CoverView( TQWidget *parent, const char *name, WFlags f ) - : KIconView( parent, name, f ) +CoverView::CoverView( TQWidget *tqparent, const char *name, WFlags f ) + : KIconView( tqparent, name, f ) { Debug::Block block( __PRETTY_FUNCTION__ ); @@ -912,7 +912,7 @@ TQDragObject *CoverView::dragObject() return 0; const TQString sql = "SELECT tags.url FROM tags, album WHERE album.name %1 AND tags.album = album.id ORDER BY tags.track;"; - const TQStringList values = CollectionDB::instance()->query( sql.arg( CollectionDB::likeCondition( item->album() ) ) ); + const TQStringList values = CollectionDB::instance()->query( sql.tqarg( CollectionDB::likeCondition( item->album() ) ) ); KURL::List urls; for( TQStringList::ConstIterator it = values.begin(), end = values.end(); it != end; ++it ) @@ -939,8 +939,8 @@ void CoverView::setStatusText( TQIconViewItem *item ) //FIXME: Don't rely on other independent code, use an sql query if( item->artist().isEmpty() ) sampler = true; - TQString tipContent = i18n( "%1 - %2" ).arg( sampler ? i18n("Various Artists") : item->artist() ) - .arg( item->album() ); + TQString tipContent = i18n( "%1 - %2" ).tqarg( sampler ? i18n("Various Artists") : item->artist() ) + .tqarg( item->album() ); CoverManager::instance()->setStatusText( tipContent ); @@ -951,8 +951,8 @@ void CoverView::setStatusText( TQIconViewItem *item ) // CLASS CoverViewItem ///////////////////////////////////////////////////////////////////// -CoverViewItem::CoverViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &artist, const TQString &album ) - : KIconViewItem( parent, after, album ) +CoverViewItem::CoverViewItem( TQIconView *tqparent, TQIconViewItem *after, const TQString &artist, const TQString &album ) + : KIconViewItem( tqparent, after, album ) , m_artist( artist ) , m_album( album ) , m_coverImagePath( CollectionDB::instance()->albumImage( m_artist, m_album, false, 0, &m_embedded ) ) @@ -973,7 +973,7 @@ void CoverViewItem::loadCover() m_coverImagePath = CollectionDB::instance()->albumImage( m_artist, m_album, false, 1, &m_embedded ); m_coverPixmap = TQPixmap( m_coverImagePath ); //create the scaled cover - repaint(); + tqrepaint(); } @@ -983,27 +983,27 @@ void CoverViewItem::calcRect( const TQString& ) TQFontMetrics fm = iconView()->fontMetrics(); TQRect itemPixmapRect( 5, 1, thumbWidth, thumbWidth ); - TQRect itemRect = rect(); - itemRect.setWidth( thumbWidth + 10 ); - itemRect.setHeight( thumbWidth + fm.lineSpacing() + 2 ); - TQRect itemTextRect( 0, thumbWidth+2, itemRect.width(), fm.lineSpacing() ); + TQRect tqitemRect = rect(); + tqitemRect.setWidth( thumbWidth + 10 ); + tqitemRect.setHeight( thumbWidth + fm.lineSpacing() + 2 ); + TQRect itemTextRect( 0, thumbWidth+2, tqitemRect.width(), fm.lineSpacing() ); setPixmapRect( itemPixmapRect ); setTextRect( itemTextRect ); - setItemRect( itemRect ); + setItemRect( tqitemRect ); } void CoverViewItem::paintItem(TQPainter* p, const TQColorGroup& cg) { - TQRect itemRect = rect(); + TQRect tqitemRect = rect(); p->save(); - p->translate( itemRect.x(), itemRect.y() ); + p->translate( tqitemRect.x(), tqitemRect.y() ); // draw the border p->setPen( cg.mid() ); - p->drawRect( 0, 0, itemRect.width(), pixmapRect().height()+2 ); + p->drawRect( 0, 0, tqitemRect.width(), pixmapRect().height()+2 ); // draw the cover image if( !m_coverPixmap.isNull() ) @@ -1019,7 +1019,7 @@ void CoverViewItem::paintItem(TQPainter* p, const TQColorGroup& cg) str = KStringHandler::rPixelSqueeze( str, p->fontMetrics(), textRect().width() ); } p->setPen( cg.text() ); - p->drawText( textRect(), Qt::AlignCenter, str ); + p->drawText( textRect(), TQt::AlignCenter, str ); if( isSelected() ) { p->setPen( cg.highlight() ); diff --git a/amarok/src/covermanager.h b/amarok/src/covermanager.h index 638ac1f7..7f4b9262 100644 --- a/amarok/src/covermanager.h +++ b/amarok/src/covermanager.h @@ -25,9 +25,10 @@ class KProgress; class TQHBoxLayout; class PixmapViewer; -class CoverManager : public QSplitter +class CoverManager : public TQSplitter { Q_OBJECT + TQ_OBJECT static CoverManager *s_instance; @@ -37,8 +38,8 @@ class CoverManager : public QSplitter static CoverManager *instance() { return s_instance; } - static void showOnce( const TQString &artist = TQString::null ); - static void viewCover( const TQString& artist, const TQString& album, TQWidget *parent=0 ); + static void showOnce( const TQString &artist = TQString() ); + static void viewCover( const TQString& artist, const TQString& album, TQWidget *tqparent=0 ); void setStatusText( TQString text ); @@ -110,9 +111,10 @@ class CoverManager : public QSplitter class CoverView : public KIconView { Q_OBJECT + TQ_OBJECT public: - CoverView( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); + CoverView( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); protected: TQDragObject *dragObject(); @@ -124,7 +126,7 @@ class CoverView : public KIconView class CoverViewItem : public KIconViewItem { public: - CoverViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &artist, const TQString &album ); + CoverViewItem( TQIconView *tqparent, TQIconViewItem *after, const TQString &artist, const TQString &album ); void loadCover(); bool hasCover() const; @@ -134,12 +136,12 @@ class CoverViewItem : public KIconViewItem TQPixmap coverPixmap() const { return m_coverPixmap; } protected: - void paintItem(TQPainter* painter, const TQColorGroup& colorGroup); + void paintItem(TQPainter* painter, const TQColorGroup& tqcolorGroup); void paintFocus(TQPainter *, const TQColorGroup &) { } void dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ); void dragEntered(); void dragLeft(); - void calcRect( const TQString& text_=TQString::null ); + void calcRect( const TQString& text_=TQString() ); private: TQString m_artist; @@ -152,12 +154,13 @@ class CoverViewItem : public KIconViewItem class CoverViewDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - CoverViewDialog(const TQString& artist, const TQString& album, TQWidget *parent); + CoverViewDialog(const TQString& artist, const TQString& album, TQWidget *tqparent); private: - TQHBoxLayout *m_layout; + TQHBoxLayout *m_tqlayout; TQPixmap m_pixmap; PixmapViewer *m_pixmapViewer; TQLabel *m_label; diff --git a/amarok/src/cuefile.cpp b/amarok/src/cuefile.cpp index 76915fa2..f28788dc 100644 --- a/amarok/src/cuefile.cpp +++ b/amarok/src/cuefile.cpp @@ -68,10 +68,10 @@ bool CueFile::load(int mediaLength) { TQFile file( m_cueFileName ); int track = 0; - TQString defaultArtist = TQString::null; - TQString defaultAlbum = TQString::null; - TQString artist = TQString::null; - TQString title = TQString::null; + TQString defaultArtist = TQString(); + TQString defaultAlbum = TQString(); + TQString artist = TQString(); + TQString title = TQString(); long length = 0; long prevIndex = -1; bool index00Present = false; @@ -87,33 +87,33 @@ bool CueFile::load(int mediaLength) { line = stream.readLine().simplifyWhiteSpace(); - if( line.startsWith( "title", false ) ) + if( line.tqstartsWith( "title", false ) ) { title = line.mid( 6 ).remove( '"' ); if( mode == BEGIN ) { defaultAlbum = title; - title = TQString::null; + title = TQString(); debug() << "Album: " << defaultAlbum << endl; } else debug() << "Title: " << title << endl; } - else if( line.startsWith( "performer", false )) + else if( line.tqstartsWith( "performer", false )) { artist = line.mid( 10 ).remove( '"' ); if( mode == BEGIN ) { defaultArtist = artist; - artist = TQString::null; + artist = TQString(); debug() << "Album Artist: " << defaultArtist << endl; } else debug() << "Artist: " << artist << endl; } - else if( line.startsWith( "track", false ) ) + else if( line.tqstartsWith( "track", false ) ) { if( mode == TRACK_FOUND ) { @@ -131,15 +131,15 @@ bool CueFile::load(int mediaLength) // add previous entry to map insert( index, CueFileItem( title, artist, defaultAlbum, track, index ) ); prevIndex = index; - title = TQString::null; - artist = TQString::null; + title = TQString(); + artist = TQString(); track = 0; } track = line.section (' ',1,1).toInt(); debug() << "Track: " << track << endl; mode = TRACK_FOUND; } - else if( line.startsWith( "index", false ) ) + else if( line.tqstartsWith( "index", false ) ) { if( mode == TRACK_FOUND) { diff --git a/amarok/src/cuefile.h b/amarok/src/cuefile.h index f0001efc..20e14376 100644 --- a/amarok/src/cuefile.h +++ b/amarok/src/cuefile.h @@ -52,6 +52,7 @@ class CueFileItem { class CueFile : public TQObject, public TQMap<long, CueFileItem>, public EngineObserver { Q_OBJECT + TQ_OBJECT public: static CueFile *instance(); diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp index e38a66e8..341783da 100644 --- a/amarok/src/database_refactor/collectiondb.cpp +++ b/amarok/src/database_refactor/collectiondb.cpp @@ -81,7 +81,7 @@ CollectionDB::CollectionDB() // Load DBEngine plugin TQString query = "[X-KDE-Amarok-plugintype] == 'dbengine' and [X-KDE-Amarok-name] != '%1'"; - KTrader::OfferList offers = PluginManager::query( query.arg( "sqlite-dbengine" ) ); + KTrader::OfferList offers = PluginManager::query( query.tqarg( "sqlite-dbengine" ) ); m_dbEngine = (DBEngine*) PluginManager::createFromService( offers.first() ); //<OPEN DATABASE> @@ -137,7 +137,7 @@ CollectionDB::returnStaticDbConnection( DbConnection *conn ) * @param statement SQL program to execute. Only one SQL statement is allowed. * @return The queried data, or TQStringList() on error. */ -QStringList +TQStringList CollectionDB::query( const TQString& statement, DbConnection *conn ) { if ( DEBUG ) @@ -272,8 +272,8 @@ CollectionDB::createTables( DbConnection *conn ) "length INTEGER," "samplerate INTEGER," "sampler BOOL );" ) - .arg( conn ? "TEMPORARY" : "" ) - .arg( conn ? "_temp" : "" ), conn ); + .tqarg( conn ? "TEMPORARY" : "" ) + .tqarg( conn ? "_temp" : "" ), conn ); TQString albumAutoIncrement = ""; TQString artistAutoIncrement = ""; @@ -302,59 +302,59 @@ CollectionDB::createTables( DbConnection *conn ) query( TQString( "CREATE %1 TABLE album%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .arg( conn ? "TEMPORARY" : "" ) - .arg( conn ? "_temp" : "" ) - .arg( albumAutoIncrement ), conn ); + .tqarg( conn ? "TEMPORARY" : "" ) + .tqarg( conn ? "_temp" : "" ) + .tqarg( albumAutoIncrement ), conn ); //create artist table query( TQString( "CREATE %1 TABLE artist%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .arg( conn ? "TEMPORARY" : "" ) - .arg( conn ? "_temp" : "" ) - .arg( artistAutoIncrement ), conn ); + .tqarg( conn ? "TEMPORARY" : "" ) + .tqarg( conn ? "_temp" : "" ) + .tqarg( artistAutoIncrement ), conn ); //create genre table query( TQString( "CREATE %1 TABLE genre%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() +");" ) - .arg( conn ? "TEMPORARY" : "" ) - .arg( conn ? "_temp" : "" ) - .arg( genreAutoIncrement ), conn ); + .tqarg( conn ? "TEMPORARY" : "" ) + .tqarg( conn ? "_temp" : "" ) + .tqarg( genreAutoIncrement ), conn ); //create year table query( TQString( "CREATE %1 TABLE year%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .arg( conn ? "TEMPORARY" : "" ) - .arg( conn ? "_temp" : "" ) - .arg( yearAutoIncrement ), conn ); + .tqarg( conn ? "TEMPORARY" : "" ) + .tqarg( conn ? "_temp" : "" ) + .tqarg( yearAutoIncrement ), conn ); //create images table query( TQString( "CREATE %1 TABLE images%2 (" "path " + textColumnType() + "," "artist " + textColumnType() + "," "album " + textColumnType() + ");" ) - .arg( conn ? "TEMPORARY" : "" ) - .arg( conn ? "_temp" : "" ), conn ); + .tqarg( conn ? "TEMPORARY" : "" ) + .tqarg( conn ? "_temp" : "" ), conn ); // create directory statistics table query( TQString( "CREATE %1 TABLE directories%2 (" - "dir " + textColumnType() + " UNIQUE," + "dir " + textColumnType() + " UNITQUE," "changedate INTEGER );" ) - .arg( conn ? "TEMPORARY" : "" ) - .arg( conn ? "_temp" : "" ), conn ); + .tqarg( conn ? "TEMPORARY" : "" ) + .tqarg( conn ? "_temp" : "" ), conn ); //create indexes query( TQString( "CREATE INDEX album_idx%1 ON album%2( name );" ) - .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn ); + .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "CREATE INDEX artist_idx%1 ON artist%2( name );" ) - .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn ); + .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "CREATE INDEX genre_idx%1 ON genre%2( name );" ) - .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn ); + .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "CREATE INDEX year_idx%1 ON year%2( name );" ) - .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn ); + .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn ); if ( !conn ) { @@ -385,13 +385,13 @@ CollectionDB::dropTables( DbConnection *conn ) { DEBUG_FUNC_INFO - query( TQString( "DROP TABLE tags%1;" ).arg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE album%1;" ).arg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE artist%1;" ).arg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE genre%1;" ).arg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE year%1;" ).arg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE images%1;" ).arg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE directories%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE tags%1;" ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE album%1;" ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE artist%1;" ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE genre%1;" ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE year%1;" ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE images%1;" ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE directories%1;" ).tqarg( conn ? "_temp" : "" ), conn ); if ( !conn ) { query( TQString( "DROP TABLE related_artists;" ) ); @@ -421,16 +421,16 @@ CollectionDB::clearTables( DbConnection *conn ) clearCommand = "TRUNCATE TABLE"; } - query( TQString( "%1 tags%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 album%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 artist%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 genre%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 year%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 images%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 directories%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 tags%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 album%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 artist%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 genre%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 year%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 images%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 directories%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); if ( !conn ) { - query( TQString( "%1 related_artists;" ).arg( clearCommand ) ); + query( TQString( "%1 related_artists;" ).tqarg( clearCommand ) ); } } @@ -455,7 +455,7 @@ CollectionDB::createStatsTable() // create music statistics database query( TQString( "CREATE TABLE statistics (" - "url " + textColumnType() + " UNIQUE," + "url " + textColumnType() + " UNITQUE," "createdate INTEGER," "accessdate INTEGER," "percentage FLOAT," @@ -493,7 +493,7 @@ CollectionDB::artistID( TQString value, bool autocreate, const bool temporary, c } -QString +TQString CollectionDB::artistValue( uint id ) { // lookup cache @@ -528,7 +528,7 @@ CollectionDB::albumID( TQString value, bool autocreate, const bool temporary, co } -QString +TQString CollectionDB::albumValue( uint id ) { // lookup cache @@ -552,7 +552,7 @@ CollectionDB::genreID( TQString value, bool autocreate, const bool temporary, co } -QString +TQString CollectionDB::genreValue( uint id ) { return valueFromID( "genre", id ); @@ -566,7 +566,7 @@ CollectionDB::yearID( TQString value, bool autocreate, const bool temporary, con } -QString +TQString CollectionDB::yearValue( uint id ) { return valueFromID( "year", id ); @@ -584,16 +584,16 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const TQStringList values = query( TQString( "SELECT id, name FROM %1 WHERE name LIKE '%2';" ) - .arg( name ) - .arg( CollectionDB::instance()->escapeString( value ) ), conn ); + .tqarg( name ) + .tqarg( CollectionDB::instance()->escapeString( value ) ), conn ); if ( updateSpelling && !values.isEmpty() && ( values[1] != value ) ) { query( TQString( "UPDATE %1 SET id = %2, name = '%3' WHERE id = %4;" ) - .arg( name ) - .arg( values.first() ) - .arg( CollectionDB::instance()->escapeString( value ) ) - .arg( values.first() ), conn ); + .tqarg( name ) + .tqarg( values.first() ) + .tqarg( CollectionDB::instance()->escapeString( value ) ) + .tqarg( values.first() ), conn ); } //check if item exists. if not, should we autocreate it? @@ -601,8 +601,8 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const if ( values.isEmpty() && autocreate ) { id = insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" ) - .arg( name ) - .arg( CollectionDB::instance()->escapeString( value ) ), name, conn ); + .tqarg( name ) + .tqarg( CollectionDB::instance()->escapeString( value ) ), name, conn ); return id; } @@ -611,28 +611,28 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const } -QString +TQString CollectionDB::valueFromID( TQString table, uint id ) { TQStringList values = query( TQString( "SELECT name FROM %1 WHERE id=%2;" ) - .arg( table ) - .arg( id ) ); + .tqarg( table ) + .tqarg( id ) ); return values.isEmpty() ? 0 : values.first(); } -QString +TQString CollectionDB::albumSongCount( const TQString &artist_id, const TQString &album_id ) { TQStringList values = query( TQString( "SELECT COUNT( url ) FROM tags WHERE album = %1 AND artist = %2;" ) - .arg( album_id ) - .arg( artist_id ) ); + .tqarg( album_id ) + .tqarg( artist_id ) ); return values.first(); } @@ -642,52 +642,52 @@ CollectionDB::albumIsCompilation( const TQString &album_id ) TQStringList values = query( TQString( "SELECT sampler FROM tags WHERE sampler=%1 AND album=%2" ) - .arg( CollectionDB::instance()->boolT() ) - .arg( album_id ) ); + .tqarg( CollectionDB::instance()->boolT() ) + .tqarg( album_id ) ); return (values.count() != 0); } -QStringList +TQStringList CollectionDB::albumTracks( const TQString &artist_id, const TQString &album_id ) { if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { return query( TQString( "SELECT tags.url, tags.track AS __discard FROM tags, year WHERE tags.album = %1 AND " "( tags.sampler = %2 OR tags.artist = %3 ) AND year.id = tags.year " "ORDER BY tags.track;" ) - .arg( album_id ) - .arg( boolT() ) - .arg( artist_id ) ); + .tqarg( album_id ) + .tqarg( boolT() ) + .tqarg( artist_id ) ); } else { return query( TQString( "SELECT tags.url FROM tags, year WHERE tags.album = %1 AND " "( tags.sampler = 1 OR tags.artist = %2 ) AND year.id = tags.year " "ORDER BY tags.track;" ) - .arg( album_id ) - .arg( artist_id ) ); + .tqarg( album_id ) + .tqarg( artist_id ) ); } } void -CollectionDB::addImageToAlbum( const TQString& image, TQValueList< QPair<TQString, TQString> > info, DbConnection *conn ) +CollectionDB::addImageToAlbum( const TQString& image, TQValueList< TQPair<TQString, TQString> > info, DbConnection *conn ) { - for ( TQValueList< QPair<TQString, TQString> >::ConstIterator it = info.begin(); it != info.end(); ++it ) + for ( TQValueList< TQPair<TQString, TQString> >::ConstIterator it = info.begin(); it != info.end(); ++it ) { if ( (*it).first.isEmpty() || (*it).second.isEmpty() ) continue; debug() << "Added image for album: " << (*it).first << " - " << (*it).second << ": " << image << endl; insert( TQString( "INSERT INTO images%1 ( path, artist, album ) VALUES ( '%1', '%2', '%3' );" ) - .arg( conn ? "_temp" : "" ) - .arg( escapeString( image ) ) - .arg( escapeString( (*it).first ) ) - .arg( escapeString( (*it).second ) ), NULL, conn ); + .tqarg( conn ? "_temp" : "" ) + .tqarg( escapeString( image ) ) + .tqarg( escapeString( (*it).first ) ) + .tqarg( escapeString( (*it).second ) ), NULL, conn ); } } -QImage +TQImage CollectionDB::fetchImage(const KURL& url, TQString &/*tmpFile*/) { if(url.protocol() != "file") @@ -734,7 +734,7 @@ CollectionDB::setAlbumImage( const TQString& artist, const TQString& album, TQIm } -QString +TQString CollectionDB::findImageByMetabundle( MetaBundle trackInformation, uint width ) { if( width == 1 ) width = AmarokConfig::coverPreviewSize(); @@ -791,7 +791,7 @@ CollectionDB::findImageByMetabundle( MetaBundle trackInformation, uint width ) } -QString +TQString CollectionDB::findImageByArtistAlbum( const TQString &artist, const TQString &album, uint width ) { TQCString widthKey = makeWidthKey( width ); @@ -827,7 +827,7 @@ CollectionDB::findImageByArtistAlbum( const TQString &artist, const TQString &al } -QString +TQString CollectionDB::albumImage( const TQString &artist, const TQString &album, uint width ) { TQString s; @@ -842,14 +842,14 @@ CollectionDB::albumImage( const TQString &artist, const TQString &album, uint wi } -QString +TQString CollectionDB::albumImage( const uint artist_id, const uint album_id, const uint width ) { return albumImage( artistValue( artist_id ), albumValue( album_id ), width ); } -QString +TQString CollectionDB::albumImage( MetaBundle trackInformation, uint width ) { TQString path = findImageByMetabundle( trackInformation, width ); @@ -860,14 +860,14 @@ CollectionDB::albumImage( MetaBundle trackInformation, uint width ) } -QCString +TQCString CollectionDB::makeWidthKey( uint width ) { return TQString::number( width ).local8Bit() + "@"; } // get image from path -QString +TQString CollectionDB::getImageForAlbum( const TQString& artist, const TQString& album, uint width ) { if ( width == 1 ) width = AmarokConfig::coverPreviewSize(); @@ -879,8 +879,8 @@ CollectionDB::getImageForAlbum( const TQString& artist, const TQString& album, u TQStringList values = query( TQString( "SELECT path FROM images WHERE artist LIKE '%1' AND album LIKE '%2' ORDER BY path;" ) - .arg( escapeString( artist ) ) - .arg( escapeString( album ) ) ); + .tqarg( escapeString( artist ) ) + .tqarg( escapeString( album ) ) ); if ( !values.isEmpty() ) { @@ -889,7 +889,7 @@ CollectionDB::getImageForAlbum( const TQString& artist, const TQString& album, u uint maxmatches = 0; for ( uint i = 0; i < values.count(); i++ ) { - matches = values[i].contains( "front", false ) + values[i].contains( "cover", false ) + values[i].contains( "folder", false ); + matches = values[i].tqcontains( "front", false ) + values[i].tqcontains( "cover", false ) + values[i].tqcontains( "folder", false ); if ( matches > maxmatches ) { image = values[i]; @@ -949,7 +949,7 @@ CollectionDB::removeAlbumImage( const uint artist_id, const uint album_id ) } -QString +TQString CollectionDB::notAvailCover( int width ) { if ( !width ) width = AmarokConfig::coverPreviewSize(); @@ -966,7 +966,7 @@ CollectionDB::notAvailCover( int width ) } -QStringList +TQStringList CollectionDB::artistList( bool withUnknowns, bool withCompilations ) { QueryBuilder qb; @@ -983,7 +983,7 @@ CollectionDB::artistList( bool withUnknowns, bool withCompilations ) } -QStringList +TQStringList CollectionDB::albumList( bool withUnknowns, bool withCompilations ) { QueryBuilder qb; @@ -1000,7 +1000,7 @@ CollectionDB::albumList( bool withUnknowns, bool withCompilations ) } -QStringList +TQStringList CollectionDB::genreList( bool withUnknowns, bool withCompilations ) { QueryBuilder qb; @@ -1017,7 +1017,7 @@ CollectionDB::genreList( bool withUnknowns, bool withCompilations ) } -QStringList +TQStringList CollectionDB::yearList( bool withUnknowns, bool withCompilations ) { QueryBuilder qb; @@ -1034,7 +1034,7 @@ CollectionDB::yearList( bool withUnknowns, bool withCompilations ) } -QStringList +TQStringList CollectionDB::albumListOfArtist( const TQString &artist, bool withUnknown, bool withCompilations ) { if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) @@ -1042,8 +1042,8 @@ CollectionDB::albumListOfArtist( const TQString &artist, bool withUnknown, bool return query( "SELECT DISTINCT album.name, lower( album.name ) AS __discard FROM tags, album, artist WHERE " "tags.album = album.id AND tags.artist = artist.id " "AND artist.name = '" + escapeString( artist ) + "' " + - ( withUnknown ? TQString::null : "AND album.name <> '' " ) + - ( withCompilations ? TQString::null : "AND tags.sampler = " + boolF() ) + + ( withUnknown ? TQString() : "AND album.name <> '' " ) + + ( withCompilations ? TQString() : "AND tags.sampler = " + boolF() ) + " ORDER BY lower( album.name );" ); } else @@ -1051,30 +1051,30 @@ CollectionDB::albumListOfArtist( const TQString &artist, bool withUnknown, bool return query( "SELECT DISTINCT album.name FROM tags, album, artist WHERE " "tags.album = album.id AND tags.artist = artist.id " "AND artist.name = '" + escapeString( artist ) + "' " + - ( withUnknown ? TQString::null : "AND album.name <> '' " ) + - ( withCompilations ? TQString::null : "AND tags.sampler = " + boolF() ) + + ( withUnknown ? TQString() : "AND album.name <> '' " ) + + ( withCompilations ? TQString() : "AND tags.sampler = " + boolF() ) + " ORDER BY lower( album.name );" ); } } -QStringList +TQStringList CollectionDB::artistAlbumList( bool withUnknown, bool withCompilations ) { if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { return query( "SELECT DISTINCT artist.name, album.name, lower( album.name ) AS __discard FROM tags, album, artist WHERE " "tags.album = album.id AND tags.artist = artist.id " + - ( withUnknown ? TQString::null : "AND album.name <> '' AND artist.name <> '' " ) + - ( withCompilations ? TQString::null : "AND tags.sampler = " + boolF() ) + + ( withUnknown ? TQString() : "AND album.name <> '' AND artist.name <> '' " ) + + ( withCompilations ? TQString() : "AND tags.sampler = " + boolF() ) + " ORDER BY lower( album.name );" ); } else { return query( "SELECT DISTINCT artist.name, album.name FROM tags, album, artist WHERE " "tags.album = album.id AND tags.artist = artist.id " + - ( withUnknown ? TQString::null : "AND album.name <> '' AND artist.name <> '' " ) + - ( withCompilations ? TQString::null : "AND tags.sampler = " + boolF() ) + + ( withUnknown ? TQString() : "AND album.name <> '' AND artist.name <> '' " ) + + ( withCompilations ? TQString() : "AND tags.sampler = " + boolF() ) + " ORDER BY lower( album.name );" ); } } @@ -1094,11 +1094,11 @@ CollectionDB::addSong( MetaBundle* bundle, const bool incremental, DbConnection if ( title.isEmpty() ) { title = bundle->url().fileName(); - if ( bundle->url().fileName().find( '-' ) > 0 ) + if ( bundle->url().fileName().tqfind( '-' ) > 0 ) { if ( artist.isEmpty() ) artist = bundle->url().fileName().section( '-', 0, 0 ).stripWhiteSpace(); title = bundle->url().fileName().section( '-', 1 ).stripWhiteSpace(); - title = title.left( title.findRev( '.' ) ).stripWhiteSpace(); + title = title.left( title.tqfindRev( '.' ) ).stripWhiteSpace(); if ( title.isEmpty() ) title = bundle->url().fileName(); } } @@ -1165,7 +1165,7 @@ CollectionDB::bundleForUrl( MetaBundle* bundle ) "FROM tags, album, artist, genre, year " "WHERE album.id = tags.album AND artist.id = tags.artist AND " "genre.id = tags.genre AND year.id = tags.year AND tags.url = '%1';" ) - .arg( escapeString( bundle->url().path() ) ) ); + .tqarg( escapeString( bundle->url().path() ) ) ); if ( !values.empty() ) fillInBundle( values, *bundle ); @@ -1260,10 +1260,10 @@ void CollectionDB::addAudioproperties( const MetaBundle& bundle ) { query( TQString( "UPDATE tags SET bitrate='%1', length='%2', samplerate='%3' WHERE url='%4';" ) - .arg( bundle.bitrate() ) - .arg( bundle.length() ) - .arg( bundle.sampleRate() ) - .arg( escapeString( bundle.url().path() ) ) ); + .tqarg( bundle.bitrate() ) + .tqarg( bundle.length() ) + .tqarg( bundle.sampleRate() ) + .tqarg( escapeString( bundle.url().path() ) ) ); } @@ -1275,7 +1275,7 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage ) query( TQString( "SELECT playcounter, createdate, percentage FROM statistics " "WHERE url = '%1';" ) - .arg( escapeString( url ) ) ); + .tqarg( escapeString( url ) ) ); // check boundaries if ( percentage > 100 ) percentage = 100; @@ -1288,19 +1288,19 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage ) if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { query( TQString( "UPDATE statistics SET percentage=%1, playcounter=%2+1 WHERE url='%3';" ) - .arg( score ) - .arg( values[0] + " + 1" ) - .arg( escapeString( url ) ) ); + .tqarg( score ) + .tqarg( values[0] + " + 1" ) + .tqarg( escapeString( url ) ) ); } else { query( TQString( "REPLACE INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " "VALUES ( '%1', %2, %3, %4, %5 );" ) - .arg( escapeString( url ) ) - .arg( values[1] ) - .arg( TQDateTime::currentDateTime().toTime_t() ) - .arg( score ) - .arg( values[0] + " + 1" ) ); + .tqarg( escapeString( url ) ) + .tqarg( values[1] ) + .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() ) + .tqarg( score ) + .tqarg( values[0] + " + 1" ) ); } } else @@ -1310,10 +1310,10 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage ) insert( TQString( "INSERT INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " "VALUES ( '%1', %2, %3, %4, 1 );" ) - .arg( escapeString( url ) ) - .arg( TQDateTime::currentDateTime().toTime_t() ) - .arg( TQDateTime::currentDateTime().toTime_t() ) - .arg( score ), NULL ); + .tqarg( escapeString( url ) ) + .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() ) + .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() ) + .tqarg( score ), NULL ); } int iscore = getSongPercentage( url ); @@ -1326,7 +1326,7 @@ int CollectionDB::getSongPercentage( const TQString &url ) { TQStringList values = query( TQString( "SELECT round( percentage + 0.4 ) FROM statistics WHERE url = '%1';" ) - .arg( escapeString( url ) ) ); + .tqarg( escapeString( url ) ) ); if( values.count() ) return values.first().toInt(); @@ -1341,7 +1341,7 @@ CollectionDB::setSongPercentage( const TQString &url , int percentage ) TQStringList values = query( TQString( "SELECT playcounter, createdate, accessdate FROM statistics WHERE url = '%1';" ) - .arg( escapeString( url ) ) ); + .tqarg( escapeString( url ) ) ); // check boundaries if ( percentage > 100 ) percentage = 100; @@ -1351,29 +1351,29 @@ CollectionDB::setSongPercentage( const TQString &url , int percentage ) { if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { query( TQString( "UPDATE statistics SET percentage=%1 WHERE url='%2';" ) - .arg( percentage ) - .arg( escapeString( url ) ) ); + .tqarg( percentage ) + .tqarg( escapeString( url ) ) ); } else { // entry exists query( TQString( "REPLACE INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " "VALUES ( '%1', '%2', '%3', %4, %5 );" ) - .arg( escapeString( url ) ) - .arg( values[1] ) - .arg( values[2] ) - .arg( percentage ) - .arg( values[0] ) ); + .tqarg( escapeString( url ) ) + .tqarg( values[1] ) + .tqarg( values[2] ) + .tqarg( percentage ) + .tqarg( values[0] ) ); } } else { insert( TQString( "INSERT INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " "VALUES ( '%1', %2, %3, %4, 0 );" ) - .arg( escapeString( url ) ) - .arg( TQDateTime::currentDateTime().toTime_t() ) - .arg( TQDateTime::currentDateTime().toTime_t() ) - .arg( percentage ), NULL ); + .tqarg( escapeString( url ) ) + .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() ) + .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() ) + .tqarg( percentage ), NULL ); } emit scoreChanged( url, percentage ); @@ -1388,16 +1388,16 @@ CollectionDB::updateDirStats( TQString path, const long datetime, DbConnection * if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { query( TQString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%3';") - .arg( conn ? "_temp" : "" ) - .arg( datetime ) - .arg( escapeString( path ) ), conn ); + .tqarg( conn ? "_temp" : "" ) + .tqarg( datetime ) + .tqarg( escapeString( path ) ), conn ); } else { query( TQString( "REPLACE INTO directories%1 ( dir, changedate ) VALUES ( '%3', %2 );" ) - .arg( conn ? "_temp" : "" ) - .arg( datetime ) - .arg( escapeString( path ) ), + .tqarg( conn ? "_temp" : "" ) + .tqarg( datetime ) + .tqarg( escapeString( path ) ), conn ); } } @@ -1410,7 +1410,7 @@ CollectionDB::removeSongsInDir( TQString path ) path = path.left( path.length() - 1 ); query( TQString( "DELETE FROM tags WHERE dir = '%1';" ) - .arg( escapeString( path ) ) ); + .tqarg( escapeString( path ) ) ); } @@ -1422,7 +1422,7 @@ CollectionDB::isDirInCollection( TQString path ) TQStringList values = query( TQString( "SELECT changedate FROM directories WHERE dir = '%1';" ) - .arg( escapeString( path ) ) ); + .tqarg( escapeString( path ) ) ); return !values.isEmpty(); } @@ -1433,7 +1433,7 @@ CollectionDB::isFileInCollection( const TQString &url ) { TQStringList values = query( TQString( "SELECT url FROM tags WHERE url = '%1';" ) - .arg( escapeString( url ) ) ); + .tqarg( escapeString( url ) ) ); return !values.isEmpty(); } @@ -1445,24 +1445,24 @@ CollectionDB::removeSongs( const KURL::List& urls ) for( KURL::List::ConstIterator it = urls.begin(), end = urls.end(); it != end; ++it ) { query( TQString( "DELETE FROM tags WHERE url = '%1';" ) - .arg( escapeString( (*it).path() ) ) ); + .tqarg( escapeString( (*it).path() ) ) ); } } -QStringList +TQStringList CollectionDB::similarArtists( const TQString &artist, uint count ) { TQStringList values; if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' OFFSET 0 LIMIT %2;" ) - .arg( escapeString( artist ) ).arg( count ) ); + .tqarg( escapeString( artist ) ).tqarg( count ) ); } else { values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' LIMIT 0, %2;" ) - .arg( escapeString( artist ) ).arg( count ) ); + .tqarg( escapeString( artist ) ).tqarg( count ) ); } if ( values.isEmpty() ) @@ -1480,8 +1480,8 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary, DbC TQStringList dirs; albums = query( TQString( "SELECT DISTINCT album.name FROM tags_temp, album%1 AS album WHERE tags_temp.dir = '%2' AND album.id = tags_temp.album;" ) - .arg( temporary ? "_temp" : "" ) - .arg( escapeString( path ) ), conn ); + .tqarg( temporary ? "_temp" : "" ) + .tqarg( escapeString( path ) ), conn ); for ( uint i = 0; i < albums.count(); i++ ) { @@ -1489,16 +1489,16 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary, DbC const uint album_id = albumID( albums[ i ], false, temporary, false, conn ); artists = query( TQString( "SELECT DISTINCT artist.name FROM tags_temp, artist%1 AS artist WHERE tags_temp.album = '%2' AND tags_temp.artist = artist.id;" ) - .arg( temporary ? "_temp" : "" ) - .arg( album_id ), conn ); + .tqarg( temporary ? "_temp" : "" ) + .tqarg( album_id ), conn ); dirs = query( TQString( "SELECT DISTINCT dir FROM tags_temp WHERE album = '%1';" ) - .arg( album_id ), conn ); + .tqarg( album_id ), conn ); if ( artists.count() > dirs.count() ) { debug() << "Detected compilation: " << albums[ i ] << " - " << artists.count() << ":" << dirs.count() << endl; query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE album = '%2';" ) - .arg(boolT()).arg( album_id ), conn ); + .tqarg(boolT()).tqarg( album_id ), conn ); } } } @@ -1508,8 +1508,8 @@ void CollectionDB::setCompilation( const TQString &album, const bool enabled, const bool updateView ) { query( TQString( "UPDATE tags, album SET tags.sampler = %1 WHERE tags.album = album.id AND album.name = '%2';" ) - .arg( enabled ? "1" : "0" ) - .arg( escapeString( album ) ) ); + .tqarg( enabled ? "1" : "0" ) + .tqarg( escapeString( album ) ) ); // Update the Collection-Browser view, // using TQTimer to make sure we don't manipulate the GUI from a thread @@ -1525,7 +1525,7 @@ CollectionDB::removeDirFromCollection( TQString path ) path = path.left( path.length() - 1 ); query( TQString( "DELETE FROM directories WHERE dir = '%1';" ) - .arg( escapeString( path ) ) ); + .tqarg( escapeString( path ) ) ); } @@ -1631,7 +1631,7 @@ CollectionDB::applySettings() // PROTECTED ////////////////////////////////////////////////////////////////////////////////////////// -QCString +TQCString CollectionDB::md5sum( const TQString& artist, const TQString& album, const TQString& file ) { KMD5 context( artist.lower().local8Bit() + album.lower().local8Bit() + file.local8Bit() ); @@ -1675,12 +1675,12 @@ CollectionDB::timerEvent( TQTimerEvent* ) ////////////////////////////////////////////////////////////////////////////////////////// void -CollectionDB::fetchCover( TQWidget* parent, const TQString& artist, const TQString& album, bool noedit ) //SLOT +CollectionDB::fetchCover( TQWidget* tqparent, const TQString& artist, const TQString& album, bool noedit ) //SLOT { #ifdef AMAZON_SUPPORT debug() << "Fetching cover for " << artist << " - " << album << endl; - CoverFetcher* fetcher = new CoverFetcher( parent, artist, album ); + CoverFetcher* fetcher = new CoverFetcher( tqparent, artist, album ); connect( fetcher, TQT_SIGNAL(result( CoverFetcher* )), TQT_SLOT(coverFetcherResult( CoverFetcher* )) ); fetcher->setUserCanEditQuery( !noedit ); fetcher->startFetch(); @@ -1755,13 +1755,13 @@ class SimilarArtistsInsertionJob : public ThreadWeaver::DependentJob { virtual bool doJob() { - CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).arg( escapedArtist ) ); + CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).tqarg( escapedArtist ) ); const TQString sql = "INSERT INTO related_artists ( artist, suggestion, changedate ) VALUES ( '%1', '%2', 0 );"; foreach( suggestions ) CollectionDB::instance()->insert( sql - .arg( escapedArtist ) - .arg( CollectionDB::instance()->escapeString( *it ) ), NULL ); + .tqarg( escapedArtist ) + .tqarg( CollectionDB::instance()->escapeString( *it ) ), NULL ); return true; } @@ -1773,10 +1773,10 @@ class SimilarArtistsInsertionJob : public ThreadWeaver::DependentJob const TQStringList suggestions; public: - SimilarArtistsInsertionJob( CollectionDB *parent, const TQString &s, const TQStringList &list ) - : ThreadWeaver::DependentJob( parent, "SimilarArtistsInsertionJob" ) + SimilarArtistsInsertionJob( CollectionDB *tqparent, const TQString &s, const TQStringList &list ) + : ThreadWeaver::DependentJob( tqparent, "SimilarArtistsInsertionJob" ) , artist( s ) - , escapedArtist( parent->escapeString( s ) ) + , escapedArtist( tqparent->escapeString( s ) ) , suggestions( list ) {} }; diff --git a/amarok/src/database_refactor/collectiondb.h b/amarok/src/database_refactor/collectiondb.h index 665da5b1..8217ec06 100644 --- a/amarok/src/database_refactor/collectiondb.h +++ b/amarok/src/database_refactor/collectiondb.h @@ -44,6 +44,7 @@ class DbConnectionPool : TQPtrQueue<DbConnection> class CollectionDB : public TQObject, public EngineObserver { Q_OBJECT + TQ_OBJECT friend class SimilarArtistsInsertionJob; @@ -155,7 +156,7 @@ class CollectionDB : public TQObject, public EngineObserver /** Saves images located on the user's filesystem */ bool setAlbumImage( const TQString& artist, const TQString& album, const KURL& url ); /** Saves images obtained from CoverFetcher */ - bool setAlbumImage( const TQString& artist, const TQString& album, TQImage img, const TQString& amazonUrl = TQString::null ); + bool setAlbumImage( const TQString& artist, const TQString& album, TQImage img, const TQString& amazonUrl = TQString() ); TQString findImageByMetabundle( MetaBundle trackInformation, const uint = 1 ); TQString findImageByArtistAlbum( const TQString &artist, const TQString &album, const uint width = 1 ); @@ -167,7 +168,7 @@ class CollectionDB : public TQObject, public EngineObserver bool removeAlbumImage( const TQString &artist, const TQString &album ); //local cover methods - void addImageToAlbum( const TQString& image, TQValueList< QPair<TQString, TQString> > info, DbConnection *conn = NULL ); + void addImageToAlbum( const TQString& image, TQValueList< TQPair<TQString, TQString> > info, DbConnection *conn = NULL ); TQString getImageForAlbum( const TQString& artist, const TQString& album, uint width = 0 ); TQString notAvailCover( int width = 0 ); @@ -177,13 +178,13 @@ class CollectionDB : public TQObject, public EngineObserver CollectionDB(); ~CollectionDB(); - TQCString md5sum( const TQString& artist, const TQString& album, const TQString& file = TQString::null ); + TQCString md5sum( const TQString& artist, const TQString& album, const TQString& file = TQString() ); void engineTrackEnded( int finalPosition, int trackLength ); /** Manages regular folder monitoring scan */ void timerEvent( TQTimerEvent* e ); public slots: - void fetchCover( TQWidget* parent, const TQString& artist, const TQString& album, bool noedit ); + void fetchCover( TQWidget* tqparent, const TQString& artist, const TQString& album, bool noedit ); void scanMonitor(); void startScan(); void stopScan(); diff --git a/amarok/src/database_refactor/dbenginebase.cpp b/amarok/src/database_refactor/dbenginebase.cpp index 837fde90..bca3a0c2 100644 --- a/amarok/src/database_refactor/dbenginebase.cpp +++ b/amarok/src/database_refactor/dbenginebase.cpp @@ -216,10 +216,10 @@ QueryBuilder::addMatch( int tables, int value, const TQString& match ) if ( !match.isEmpty() ) { m_where += "AND ( true "; - m_where += TQString( "OR %1.%2 LIKE '" ).arg( tableName( tables ) ).arg( valueName( value ) ) + escapeString( match ) + "' "; + m_where += TQString( "OR %1.%2 LIKE '" ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + escapeString( match ) + "' "; if ( ( value & valName ) && match == i18n( "Unknown" ) ) - m_where += TQString( "OR %1.%2 = '' " ).arg( tableName( tables ) ).arg( valueName( value ) ); + m_where += TQString( "OR %1.%2 = '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); m_where += " ) "; } @@ -410,12 +410,12 @@ QueryBuilder::groupBy( int table, int value ) void QueryBuilder::setLimit( int startPos, int length ) { - m_limit = TQString( " LIMIT %1, %2 " ).arg( startPos ).arg( length ); + m_limit = TQString( " LIMIT %1, %2 " ).tqarg( startPos ).tqarg( length ); } void -QueryBuilder::initSQLDrag() +QueryBuilder::initSTQLDrag() { clear(); addReturnValue( QueryBuilder::tabAlbum, QueryBuilder::valName ); @@ -448,7 +448,7 @@ QueryBuilder::buildQuery() } // get the builded SQL-Query (used in smartplaylisteditor soon) -QString +TQString QueryBuilder::getQuery() { if ( m_query.isEmpty()) @@ -458,7 +458,7 @@ QueryBuilder::getQuery() return m_query; } -QStringList +TQStringList QueryBuilder::run() { buildQuery(); @@ -484,7 +484,7 @@ QueryBuilder::clear() } -QString +TQString QueryBuilder::tableName( int table ) { TQString tables; @@ -501,7 +501,7 @@ QueryBuilder::tableName( int table ) } -QString +TQString QueryBuilder::valueName( int value ) { TQString values; @@ -528,7 +528,7 @@ QueryBuilder::valueName( int value ) return values; } -QString +TQString QueryBuilder::functionName( int value ) { TQString function; diff --git a/amarok/src/database_refactor/dbenginebase.h b/amarok/src/database_refactor/dbenginebase.h index 9458d6ce..9e459faa 100644 --- a/amarok/src/database_refactor/dbenginebase.h +++ b/amarok/src/database_refactor/dbenginebase.h @@ -72,10 +72,10 @@ class QueryBuilder #ifdef USE_MYSQL // We have to escape "\" for mysql, but can't do so for sqlite (m_dbConnType == DbConnection::mysql) - ? string.replace("\\", "\\\\").replace( '\'', "''" ) + ? string.tqreplace("\\", "\\\\").tqreplace( '\'', "''" ) : #endif - string.replace( '\'', "''" ); + string.tqreplace( '\'', "''" ); } void addReturnValue( int table, int value ); @@ -101,7 +101,7 @@ class QueryBuilder void groupBy( int table, int value ); void setLimit( int startPos, int length ); - void initSQLDrag(); + void initSTQLDrag(); void buildQuery(); TQString getQuery(); TQString query() { buildQuery(); return m_query; }; diff --git a/amarok/src/database_refactor/sqlite/sqlite_dbengine.cpp b/amarok/src/database_refactor/sqlite/sqlite_dbengine.cpp index c8dd911f..5f13f7db 100644 --- a/amarok/src/database_refactor/sqlite/sqlite_dbengine.cpp +++ b/amarok/src/database_refactor/sqlite/sqlite_dbengine.cpp @@ -4,7 +4,7 @@ // (c) 2005 Ian Monroe <ian@monroe.nu> // See COPYING file for licensing information. -#define DEBUG_PREFIX "SQLite-DBEngine" +#define DEBUG_PREFIX "STQLite-DBEngine" #include "app.h" #include "amarok.h" @@ -43,11 +43,11 @@ SqliteDbEngine::SqliteDbEngine() { TQString format; file.readLine( format, 50 ); - if ( !format.startsWith( "SQLite format 3" ) ) + if ( !format.startsWith( "STQLite format 3" ) ) { warning() << "Database versions incompatible. Removing and rebuilding database.\n"; } - else if ( sqlite3_open( path, &m_db ) != SQLITE_OK ) + else if ( sqlite3_open( path, &m_db ) != STQLITE_OK ) { warning() << "Database file corrupt. Removing and rebuilding database.\n"; sqlite3_close( m_db ); @@ -60,20 +60,20 @@ SqliteDbEngine::SqliteDbEngine() { // Remove old db file; create new TQFile::remove( path ); - if ( sqlite3_open( path, &m_db ) == SQLITE_OK ) + if ( sqlite3_open( path, &m_db ) == STQLITE_OK ) { m_initialized = true; } } if ( m_initialized ) { - if( sqlite3_create_function(m_db, "rand", 0, SQLITE_UTF8, NULL, sqlite_rand, NULL, NULL) != SQLITE_OK ) + if( sqlite3_create_function(m_db, "rand", 0, STQLITE_UTF8, NULL, sqlite_rand, NULL, NULL) != STQLITE_OK ) m_initialized = false; - if( sqlite3_create_function(m_db, "power", 2, SQLITE_UTF8, NULL, sqlite_power, NULL, NULL) != SQLITE_OK ) + if( sqlite3_create_function(m_db, "power", 2, STQLITE_UTF8, NULL, sqlite_power, NULL, NULL) != STQLITE_OK ) m_initialized = false; } - //optimization for speeding up SQLite + //optimization for speeding up STQLite query( "PRAGMA default_synchronous = OFF;" ); } @@ -94,7 +94,7 @@ TQStringList SqliteDbEngine::query( const TQString& statement ) //compile SQL program to virtual machine error = sqlite3_prepare( m_db, statement.utf8(), statement.length(), &stmt, &tail ); - if ( error != SQLITE_OK ) + if ( error != STQLITE_OK ) { Debug::error() << k_funcinfo << " sqlite3_compile error:" << endl; Debug::error() << sqlite3_errmsg( m_db ) << endl; @@ -110,7 +110,7 @@ TQStringList SqliteDbEngine::query( const TQString& statement ) { error = sqlite3_step( stmt ); - if ( error == SQLITE_BUSY ) + if ( error == STQLITE_BUSY ) { if ( busyCnt++ > 20 ) { Debug::error() << "Busy-counter has reached maximum. Aborting this sql statement!\n"; @@ -119,9 +119,9 @@ TQStringList SqliteDbEngine::query( const TQString& statement ) ::usleep( 100000 ); // Sleep 100 msec debug() << "sqlite3_step: BUSY counter: " << busyCnt << endl; } - if ( error == SQLITE_MISUSE ) + if ( error == STQLITE_MISUSE ) debug() << "sqlite3_step: MISUSE" << endl; - if ( error == SQLITE_DONE || error == SQLITE_ERROR ) + if ( error == STQLITE_DONE || error == STQLITE_ERROR ) break; //iterate over columns @@ -133,7 +133,7 @@ TQStringList SqliteDbEngine::query( const TQString& statement ) //deallocate vm resources sqlite3_finalize( stmt ); - if ( error != SQLITE_DONE ) + if ( error != STQLITE_DONE ) { Debug::error() << k_funcinfo << "sqlite_step error.\n"; Debug::error() << sqlite3_errmsg( m_db ) << endl; @@ -155,7 +155,7 @@ int SqliteDbEngine::insert( const TQString& statement, const TQString& /* table //compile SQL program to virtual machine error = sqlite3_prepare( m_db, statement.utf8(), statement.length(), &stmt, &tail ); - if ( error != SQLITE_OK ) + if ( error != STQLITE_OK ) { Debug::error() << k_funcinfo << " sqlite3_compile error:" << endl; Debug::error() << sqlite3_errmsg( m_db ) << endl; @@ -169,7 +169,7 @@ int SqliteDbEngine::insert( const TQString& statement, const TQString& /* table { error = sqlite3_step( stmt ); - if ( error == SQLITE_BUSY ) + if ( error == STQLITE_BUSY ) { if ( busyCnt++ > 20 ) { Debug::error() << "Busy-counter has reached maximum. Aborting this sql statement!\n"; @@ -178,15 +178,15 @@ int SqliteDbEngine::insert( const TQString& statement, const TQString& /* table ::usleep( 100000 ); // Sleep 100 msec debug() << "sqlite3_step: BUSY counter: " << busyCnt << endl; } - if ( error == SQLITE_MISUSE ) + if ( error == STQLITE_MISUSE ) debug() << "sqlite3_step: MISUSE" << endl; - if ( error == SQLITE_DONE || error == SQLITE_ERROR ) + if ( error == STQLITE_DONE || error == STQLITE_ERROR ) break; } //deallocate vm resources sqlite3_finalize( stmt ); - if ( error != SQLITE_DONE ) + if ( error != STQLITE_DONE ) { Debug::error() << k_funcinfo << "sqlite_step error.\n"; Debug::error() << sqlite3_errmsg( m_db ) << endl; @@ -207,7 +207,7 @@ void SqliteDbEngine::sqlite_rand(sqlite3_context *context, int /*argc*/, sqlite3 void SqliteDbEngine::sqlite_power(sqlite3_context *context, int argc, sqlite3_value **argv) { Q_ASSERT( argc==2 ); - if( sqlite3_value_type(argv[0])==SQLITE_NULL || sqlite3_value_type(argv[1])==SQLITE_NULL ) { + if( sqlite3_value_type(argv[0])==STQLITE_NULL || sqlite3_value_type(argv[1])==STQLITE_NULL ) { sqlite3_result_null(context); return; } diff --git a/amarok/src/database_refactor/sqlite/sqlite_dbengine.h b/amarok/src/database_refactor/sqlite/sqlite_dbengine.h index 52fe5cdc..276aa7d6 100644 --- a/amarok/src/database_refactor/sqlite/sqlite_dbengine.h +++ b/amarok/src/database_refactor/sqlite/sqlite_dbengine.h @@ -3,8 +3,8 @@ // (c) 2004 Sami Nieminen <sami.nieminen@iki.fi> // See COPYING file for licensing information. -#ifndef AMAROK_SQLITE_DBENGINE_H -#define AMAROK_SQLITE_DBENGINE_H +#ifndef AMAROK_STQLITE_DBENGINE_H +#define AMAROK_STQLITE_DBENGINE_H #include "dbenginebase.h" #include <kurl.h> @@ -55,4 +55,4 @@ class SqliteDbEngine : public DbConnection }; -#endif /*SQLITE_DBENGINE_H*/ +#endif /*STQLITE_DBENGINE_H*/ diff --git a/amarok/src/dbsetup.ui b/amarok/src/dbsetup.ui index 9a30eb75..e3cb5447 100644 --- a/amarok/src/dbsetup.ui +++ b/amarok/src/dbsetup.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DbSetup</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DbSetup</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,14 +22,14 @@ <property name="margin"> <number>0</number> </property> - <widget class="QWidgetStack" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQWidgetStack" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>configStack</cstring> </property> <property name="frameShadow"> <enum>Plain</enum> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>SQLLite</cstring> </property> @@ -37,7 +37,7 @@ <number>0</number> </attribute> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>MySQL</cstring> </property> @@ -51,7 +51,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>mySqlFrame</cstring> </property> @@ -71,7 +71,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>mysqlConfig</cstring> </property> @@ -82,7 +82,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -90,7 +90,7 @@ <string>Hostname:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -102,7 +102,7 @@ <property name="name"> <cstring>kcfg_MySqlPort</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>100</width> <height>32767</height> @@ -118,7 +118,7 @@ <string>Which port mysql should connect to.</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -162,15 +162,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="4"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -189,7 +189,7 @@ <string>Username with which to connect to.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -219,7 +219,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>PostgreSQL</cstring> </property> @@ -233,7 +233,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>postgreSqlFrame</cstring> </property> @@ -250,7 +250,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>postgresqlConfig</cstring> </property> @@ -261,7 +261,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -269,7 +269,7 @@ <string>Hostname:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -281,7 +281,7 @@ <property name="name"> <cstring>kcfg_PostgresqlPort</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>100</width> <height>32767</height> @@ -297,7 +297,7 @@ <string>Which port postgresql should connect to.</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -341,15 +341,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="4"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -368,7 +368,7 @@ <string>Username with which to connect to.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -399,7 +399,7 @@ </hbox> </widget> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -449,13 +449,13 @@ <include location="local" impldecl="in implementation">debug.h</include> <include location="local" impldecl="in implementation">dbsetup.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>databaseEngine_activated( int )</slot> -</slots> +</Q_SLOTS> <functions> <function access="private">init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>klineedit.h</includehint> diff --git a/amarok/src/dbsetup.ui.h b/amarok/src/dbsetup.ui.h index 6b41b8bb..4496267d 100644 --- a/amarok/src/dbsetup.ui.h +++ b/amarok/src/dbsetup.ui.h @@ -3,7 +3,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). diff --git a/amarok/src/debug.h b/amarok/src/debug.h index 610704fe..6a17ccd9 100644 --- a/amarok/src/debug.h +++ b/amarok/src/debug.h @@ -13,7 +13,7 @@ #include <sys/time.h> class TQApplication; -extern TQApplication *qApp; ///@see Debug::Indent +extern TQApplication *tqApp; ///@see Debug::Indent /** @@ -54,17 +54,17 @@ namespace Debug // static namespaces are unique to each dlopened library. So we piggy back // the TQCString on the KApplication instance - #define qApp reinterpret_cast<TQObject*>(qApp) - class Indent : QObject + #define tqtApp reinterpret_cast<TQObject*>(tqApp) + class Indent : TQObject { friend TQCString &modifieableIndent(); - Indent() : TQObject( qApp, "DEBUG_indent" ) {} + Indent() : TQObject( tqtApp, "DEBUG_indent" ) {} TQCString m_string; }; inline TQCString &modifieableIndent() { - TQObject *o = qApp ? qApp->child( "DEBUG_indent" ) : 0; + TQObject *o = tqtApp ? tqtApp->child( "DEBUG_indent" ) : 0; TQCString &ret = (o ? static_cast<Indent*>( o ) : new Indent)->m_string; return ret; } @@ -73,7 +73,7 @@ namespace Debug { return TQDeepCopy<TQCString>( modifieableIndent() ); } - #undef qApp + #undef tqtApp #ifdef NDEBUG @@ -98,10 +98,10 @@ namespace Debug KDEBUG_FATAL = 3 }; - static inline kdbgstream debug() { mutex.lock(); TQCString ind = indent(); mutex.unlock(); return kdbgstream( ind, 0, KDEBUG_INFO ) << AMK_PREFIX; } - static inline kdbgstream warning() { mutex.lock(); TQCString ind = indent(); mutex.unlock(); return kdbgstream( ind, 0, KDEBUG_WARN ) << AMK_PREFIX << "[WARNING!] "; } - static inline kdbgstream error() { mutex.lock(); TQCString ind = indent(); mutex.unlock(); return kdbgstream( ind, 0, KDEBUG_ERROR ) << AMK_PREFIX << "[ERROR!] "; } - static inline kdbgstream fatal() { mutex.lock(); TQCString ind = indent(); mutex.unlock(); return kdbgstream( ind, 0, KDEBUG_FATAL ) << AMK_PREFIX; } + static inline kdbgstream debug() { mutex.lock(); TQCString ind = indent(); mutex.unlock(); return kdbgstream( ind.data(), 0, KDEBUG_INFO ) << AMK_PREFIX; } + static inline kdbgstream warning() { mutex.lock(); TQCString ind = indent(); mutex.unlock(); return kdbgstream( ind.data(), 0, KDEBUG_WARN ) << AMK_PREFIX << "[WARNING!] "; } + static inline kdbgstream error() { mutex.lock(); TQCString ind = indent(); mutex.unlock(); return kdbgstream( ind.data(), 0, KDEBUG_ERROR ) << AMK_PREFIX << "[ERROR!] "; } + static inline kdbgstream fatal() { mutex.lock(); TQCString ind = indent(); mutex.unlock(); return kdbgstream( ind.data(), 0, KDEBUG_FATAL ) << AMK_PREFIX; } typedef kdbgstream DebugStream; @@ -236,7 +236,7 @@ namespace Debug * @class Debug::List * @short You can pass anything to this and it will output it as a list * - * debug() << (Debug::List() << anInt << aString << aQStringList << aDouble) << endl; + * debug() << (Debug::List() << anInt << aString << aTQStringList << aDouble) << endl; */ typedef TQValueList<TQVariant> List; diff --git a/amarok/src/deletedialog.cpp b/amarok/src/deletedialog.cpp index 970526c5..631bd319 100644 --- a/amarok/src/deletedialog.cpp +++ b/amarok/src/deletedialog.cpp @@ -41,8 +41,8 @@ // DeleteWidget implementation ////////////////////////////////////////////////////////////////////////////// -DeleteWidget::DeleteWidget(TQWidget *parent, const char *name) - : DeleteDialogBase(parent, name) +DeleteWidget::DeleteWidget(TQWidget *tqparent, const char *name) + : DeleteDialogBase(tqparent, name) { KConfigGroup messageGroup(KGlobal::config(), "FileRemover"); @@ -84,8 +84,8 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete) // DeleteDialog implementation ////////////////////////////////////////////////////////////////////////////// -DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) : - KDialogBase(Swallow, WStyle_DialogBorder, parent, name, +DeleteDialog::DeleteDialog(TQWidget *tqparent, const char *name) : + KDialogBase(Swallow, WStyle_DialogBorder, tqparent, name, true /* modal */, i18n("About to delete selected files"), Ok | Cancel, Cancel /* Default */, true /* separator */), m_trashGuiItem(i18n("&Send to Trash"), "trashcan_full") @@ -131,9 +131,9 @@ void DeleteDialog::slotShouldDelete(bool shouldDelete) setButtonGuiItem(Ok, shouldDelete ? KStdGuiItem::del() : m_trashGuiItem); } -bool DeleteDialog::showTrashDialog(TQWidget* parent, const KURL::List& files) +bool DeleteDialog::showTrashDialog(TQWidget* tqparent, const KURL::List& files) { - DeleteDialog dialog(parent); + DeleteDialog dialog(tqparent); bool doDelete = dialog.confirmDeleteList(files); if( doDelete ) diff --git a/amarok/src/deletedialog.h b/amarok/src/deletedialog.h index 7789553e..79d11705 100644 --- a/amarok/src/deletedialog.h +++ b/amarok/src/deletedialog.h @@ -31,9 +31,10 @@ class TQWidgetStack; class DeleteWidget : public DeleteDialogBase { Q_OBJECT + TQ_OBJECT public: - DeleteWidget(TQWidget *parent = 0, const char *name = 0); + DeleteWidget(TQWidget *tqparent = 0, const char *name = 0); void setFiles(const KURL::List &files); @@ -44,10 +45,11 @@ protected slots: class DeleteDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DeleteDialog(TQWidget *parent, const char *name = "delete_dialog"); - static bool showTrashDialog(TQWidget* parent, const KURL::List &files); + DeleteDialog(TQWidget *tqparent, const char *name = "delete_dialog"); + static bool showTrashDialog(TQWidget* tqparent, const KURL::List &files); bool confirmDeleteList(const KURL::List &condemnedFiles); void setFiles(const KURL::List &files); diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui index 768050bc..c1886cac 100644 --- a/amarok/src/deletedialogbase.ui +++ b/amarok/src/deletedialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DeleteDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DeleteDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,7 +12,7 @@ <height>374</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>420</width> <height>320</height> @@ -25,15 +25,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>ddWarningIcon</cstring> </property> @@ -49,22 +49,22 @@ <string>Icon Placeholder, not in GUI</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>ddDeleteText</cstring> </property> <property name="text"> <string>Deletion method placeholder, never shown to user.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -86,18 +86,18 @@ <string>This is the list of items that are about to be deleted.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>ddNumFiles</cstring> </property> <property name="text"> <string>Placeholder for number of files, not in GUI</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>ddShouldDelete</cstring> </property> @@ -125,10 +125,10 @@ <slot>slotShouldDelete(bool)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">slotShouldDelete(bool)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> </includehints> diff --git a/amarok/src/device/massstorage/massstoragedevicehandler.cpp b/amarok/src/device/massstorage/massstoragedevicehandler.cpp index 57b0c3d4..63965e06 100644 --- a/amarok/src/device/massstorage/massstoragedevicehandler.cpp +++ b/amarok/src/device/massstorage/massstoragedevicehandler.cpp @@ -126,20 +126,20 @@ DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( const Medium * m { TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " "FROM devices WHERE type = 'uuid' " - "AND uuid = '%1';" ).arg( m->id() ) ); + "AND uuid = '%1';" ).tqarg( m->id() ) ); if ( ids.size() == 3 ) { debug() << "Found existing UUID config for ID " << ids[0] << " , uuid " << m->id() << endl; CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " - "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) ); + "id = %1;" ).tqarg( ids[0] ).tqarg( m->mountPoint() ) ); return new MassStorageDeviceHandler( ids[0].toInt(), m->mountPoint(), m->id() ); } else { int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices( type, uuid, lastmountpoint ) " "VALUES ( 'uuid', '%1', '%2' );" ) - .arg( m->id() ) - .arg( m->mountPoint() ), "devices" ); + .tqarg( m->id() ) + .tqarg( m->mountPoint() ), "devices" ); if ( id == 0 ) { warning() << "Inserting into devices failed for type=uuid, uuid=" << m->id() << endl; @@ -154,9 +154,9 @@ bool MassStorageDeviceHandlerFactory::excludedFilesystem( const TQString &fstype ) const { return fstype.isEmpty() || - fstype.find( "smb" ) != -1 || - fstype.find( "cifs" ) != -1 || - fstype.find( "nfs" ) != -1 || + fstype.tqfind( "smb" ) != -1 || + fstype.tqfind( "cifs" ) != -1 || + fstype.tqfind( "nfs" ) != -1 || fstype == "udf" || fstype == "iso9660" ; } diff --git a/amarok/src/device/nfs/nfsdevicehandler.cpp b/amarok/src/device/nfs/nfsdevicehandler.cpp index 57c9d58f..ac7a3de3 100644 --- a/amarok/src/device/nfs/nfsdevicehandler.cpp +++ b/amarok/src/device/nfs/nfsdevicehandler.cpp @@ -47,7 +47,7 @@ NfsDeviceHandler::isAvailable() const } -QString +TQString NfsDeviceHandler::type() const { return "nfs"; @@ -89,7 +89,7 @@ NfsDeviceHandler::deviceIsMedium( const Medium * m ) const // class NfsDeviceHandlerFactory /////////////////////////////////////////////////////////////////////////////// -QString +TQString NfsDeviceHandlerFactory::type( ) const { return "nfs"; @@ -135,13 +135,13 @@ NfsDeviceHandlerFactory::createHandler( const Medium * m ) const TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " "FROM devices WHERE type = 'nfs' " "AND servername = '%1' AND sharename = '%2';" ) - .arg( server ) - .arg( share ) ); + .tqarg( server ) + .tqarg( share ) ); if ( ids.size() == 3 ) { debug() << "Found existing NFS config for ID " << ids[0] << " , server " << server << " ,share " << share << endl; CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " - "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) ); + "id = %1;" ).tqarg( ids[0] ).tqarg( m->mountPoint() ) ); return new NfsDeviceHandler( ids[0].toInt(), server, share, m->mountPoint() ); } else @@ -149,9 +149,9 @@ NfsDeviceHandlerFactory::createHandler( const Medium * m ) const int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices" "( type, servername, sharename, lastmountpoint ) " "VALUES ( 'nfs', '%1', '%2', '%3' );" ) - .arg( server ) - .arg( share ) - .arg( m->mountPoint() ), "devices" ); + .tqarg( server ) + .tqarg( share ) + .tqarg( m->mountPoint() ), "devices" ); if ( id == 0 ) { warning() << "Inserting into devices failed for type=nfs, server=" << server << ", share=" << share << endl; diff --git a/amarok/src/device/smb/smbdevicehandler.cpp b/amarok/src/device/smb/smbdevicehandler.cpp index 4883fcf7..80d159d0 100644 --- a/amarok/src/device/smb/smbdevicehandler.cpp +++ b/amarok/src/device/smb/smbdevicehandler.cpp @@ -47,7 +47,7 @@ SmbDeviceHandler::isAvailable() const } -QString +TQString SmbDeviceHandler::type() const { return "smb"; @@ -89,7 +89,7 @@ SmbDeviceHandler::deviceIsMedium( const Medium * m ) const // class SmbDeviceHandlerFactory /////////////////////////////////////////////////////////////////////////////// -QString +TQString SmbDeviceHandlerFactory::type( ) const { return "smb"; @@ -110,8 +110,8 @@ SmbDeviceHandlerFactory::canCreateFromConfig( ) const bool SmbDeviceHandlerFactory::canHandle( const Medium * m ) const { - return m && ( m->fsType().find( "smb" ) != -1 || - m->fsType().find( "cifs" ) != -1 ) + return m && ( m->fsType().tqfind( "smb" ) != -1 || + m->fsType().tqfind( "cifs" ) != -1 ) && m->isMounted(); } @@ -137,13 +137,13 @@ SmbDeviceHandlerFactory::createHandler( const Medium * m ) const TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " "FROM devices WHERE type = 'smb' " "AND servername = '%1' AND sharename = '%2';" ) - .arg( server ) - .arg( share ) ); + .tqarg( server ) + .tqarg( share ) ); if ( ids.size() == 3 ) { debug() << "Found existing SMB config for ID " << ids[0] << " , server " << server << " ,share " << share << endl; CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " - "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) ); + "id = %1;" ).tqarg( ids[0] ).tqarg( m->mountPoint() ) ); return new SmbDeviceHandler( ids[0].toInt(), server, share, m->mountPoint() ); } else @@ -151,9 +151,9 @@ SmbDeviceHandlerFactory::createHandler( const Medium * m ) const int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices" "( type, servername, sharename, lastmountpoint ) " "VALUES ( 'smb', '%1', '%2', '%3' );" ) - .arg( server ) - .arg( share ) - .arg( m->mountPoint() ), "devices" ); + .tqarg( server ) + .tqarg( share ) + .tqarg( m->mountPoint() ), "devices" ); if ( id == 0 ) { warning() << "Inserting into devices failed for type=smb, server=" << server << ", share=" << share << endl; diff --git a/amarok/src/devicemanager.cpp b/amarok/src/devicemanager.cpp index a6d8a7d9..a0597124 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 apparently if you don't run KDE as a DM the first call will fail + //run the DCOP query here because aptqparently if you don't run KDE as a DM the first call will fail //...go figure TQByteArray data, replyData; TQCString replyType; @@ -103,7 +103,7 @@ DeviceManager::mediumRemoved( const TQString name ) if ( !m_valid ) return; Medium* removedMedium = 0; - if ( m_mediumMap.contains(name) ) + if ( m_mediumMap.tqcontains(name) ) removedMedium = m_mediumMap[name]; if ( removedMedium != 0 ) debug() << "[DeviceManager::mediumRemoved] Obtained medium name is " << name << ", id is: " << removedMedium->id() << endl; @@ -114,7 +114,7 @@ DeviceManager::mediumRemoved( const TQString name ) //has been running //There is no point in calling getDevice, since it will not be in the list anyways emit mediumRemoved( removedMedium, name ); - if ( m_mediumMap.contains(name) ) + if ( m_mediumMap.tqcontains(name) ) { delete removedMedium; //If we are to remove it from the map, delete it first m_mediumMap.remove(name); @@ -155,7 +155,7 @@ DeviceManager::getDeviceList() return Medium::createList( getDeviceStringList() ); } -QStringList +TQStringList DeviceManager::getDeviceStringList() { DEBUG_BLOCK @@ -215,7 +215,7 @@ DeviceManager::getDevice( const TQString name ) if ( (*it).name() == name ) { MediumIterator secIt; - if ( (secIt = m_mediumMap.find( name )) != m_mediumMap.end() ) + if ( (secIt = m_mediumMap.tqfind( name )) != m_mediumMap.end() ) { //Refresh the Medium by reconstructing then copying it over. returnedMedium = *secIt; @@ -246,7 +246,7 @@ DeviceManager::reconcileMediumMap() for ( it = currMediumList.begin(); it != currMediumList.end(); ++it ) { MediumIterator locIt; - if ( (locIt = m_mediumMap.find( (*it).name() )) != m_mediumMap.end() ) + if ( (locIt = m_mediumMap.tqfind( (*it).name() )) != m_mediumMap.end() ) { Medium* mediumHolder = (*locIt); *mediumHolder = Medium( *it ); diff --git a/amarok/src/devicemanager.h b/amarok/src/devicemanager.h index 2cdcf5b4..05987649 100644 --- a/amarok/src/devicemanager.h +++ b/amarok/src/devicemanager.h @@ -29,10 +29,11 @@ typedef TQMap<TQString, Medium*> MediumMap; //the latter is responsible for handling mediadevices (e.g. ipod) //unless you have special requirements you should use either MountPointManager or //MediaDeviceManager instead of this class. -class DeviceManager : public QObject +class DeviceManager : public TQObject { Q_OBJECT + TQ_OBJECT public: DeviceManager(); ~DeviceManager(); diff --git a/amarok/src/directorylist.cpp b/amarok/src/directorylist.cpp index 930f597c..b13ce216 100644 --- a/amarok/src/directorylist.cpp +++ b/amarok/src/directorylist.cpp @@ -32,16 +32,16 @@ CollectionSetup* CollectionSetup::s_instance; -CollectionSetup::CollectionSetup( TQWidget *parent ) - : TQVBox( parent, "CollectionSetup" ) +CollectionSetup::CollectionSetup( TQWidget *tqparent ) + : TQVBox( tqparent, "CollectionSetup" ) { s_instance = this; (new TQLabel( i18n( "These folders will be scanned for " - "media to make up your collection:"), this ))->setAlignment( Qt::WordBreak ); + "media to make up your collection:"), this ))->tqsetAlignment( TQt::WordBreak ); - m_view = new QFixedListView( this ); + m_view = new TQFixedListView( this ); m_recursive = new TQCheckBox( i18n("&Scan folders recursively"), this ); m_monitor = new TQCheckBox( i18n("&Watch folders for changes"), this ); @@ -59,9 +59,9 @@ CollectionSetup::CollectionSetup( TQWidget *parent ) m_recursive->setChecked( AmarokConfig::scanRecursively() ); m_monitor->setChecked( AmarokConfig::monitorChanges() ); - m_view->addColumn( TQString::null ); + m_view->addColumn( TQString() ); m_view->setRootIsDecorated( true ); - m_view->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + m_view->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); m_view->setResizeMode( TQListView::LastColumn ); reinterpret_cast<TQWidget*>(m_view->header())->hide(); @@ -112,15 +112,15 @@ CollectionSetup::writeConfig() namespace Collection { -Item::Item( TQListView *parent ) - : TQCheckListItem( parent, "/", TQCheckListItem::CheckBox ) +Item::Item( TQListView *tqparent ) + : TQCheckListItem( tqparent, "/", TQCheckListItem::CheckBox ) , m_lister( true ) , m_url( "file:/" ) , m_listed( false ) , m_fullyDisabled( false ) { //Since we create the "/" checklistitem here, we need to enable it if needed - if ( CollectionSetup::instance()->m_dirs.contains( "/" ) ) + if ( CollectionSetup::instance()->m_dirs.tqcontains( "/" ) ) static_cast<TQCheckListItem*>( this )->setOn(true); m_lister.setDirOnlyMode( true ); connect( &m_lister, TQT_SIGNAL(newItems( const KFileItemList& )), TQT_SLOT(newItems( const KFileItemList& )) ); @@ -129,8 +129,8 @@ Item::Item( TQListView *parent ) } -Item::Item( TQListViewItem *parent, const KURL &url , bool full_disable /* default=false */ ) - : TQCheckListItem( parent, url.fileName(), TQCheckListItem::CheckBox ) +Item::Item( TQListViewItem *tqparent, const KURL &url , bool full_disable /* default=false */ ) + : TQCheckListItem( tqparent, url.fileName(), TQCheckListItem::CheckBox ) , m_lister( true ) , m_url( url ) , m_listed( false ) @@ -144,12 +144,12 @@ Item::Item( TQListViewItem *parent, const KURL &url , bool full_disable /* defau } -QString +TQString Item::fullPath() const { TQString path; - for( const TQListViewItem *item = this; item != listView()->firstChild(); item = item->parent() ) + for( const TQListViewItem *item = this; item != listView()->firstChild(); item = item->tqparent() ) { path.prepend( item->text( 0 ) ); path.prepend( '/' ); @@ -191,7 +191,7 @@ Item::stateChange( bool b ) return; // Update folder list - TQStringList::Iterator it = cs_m_dirs.find( m_url.path() ); + TQStringList::Iterator it = cs_m_dirs.tqfind( m_url.path() ); if ( isOn() ) { if ( it == cs_m_dirs.end() ) cs_m_dirs << m_url.path(); @@ -212,9 +212,9 @@ Item::stateChange( bool b ) } } else { - //Deselect item and recurse through children but only deselect children if they - //do not exist unless we are in recursive mode (where no children should be - //selected if the parent is being unselected) + //Deselect item and recurse through tqchildren but only deselect tqchildren if they + //do not exist unless we are in recursive mode (where no tqchildren should be + //selected if the tqparent is being unselected) //Note this does not do anything to the checkboxes, but they should be doing //the same thing as we are (hopefully) //Note: all paths lack a trailing '/' except for "/", which must be handled as a @@ -239,7 +239,7 @@ Item::stateChange( bool b ) } } - // Redraw parent items + // Redraw tqparent items listView()->triggerUpdate(); } @@ -258,7 +258,7 @@ Item::newItems( const KFileItemList &list ) //SLOT for( KFileItemListIterator it( list ); *it; ++it ) { //Fully disable (always appears off and grayed-out) if it is "/proc", "/sys" or - //"/dev" or one of their children. This is because we will never scan them, so we + //"/dev" or one of their tqchildren. This is because we will never scan them, so we //might as well show that. //These match up with the skipped dirs in CollectionScanner::readDir. bool fully_disable=false; @@ -274,7 +274,7 @@ Item::newItems( const KFileItemList &list ) //SLOT if ( !item->isFullyDisabled() ) { if( CollectionSetup::instance()->recursive() && isOn() || - CollectionSetup::instance()->m_dirs.contains( item->fullPath() ) ) + CollectionSetup::instance()->m_dirs.tqcontains( item->fullPath() ) ) { item->setOn( true ); } @@ -294,7 +294,7 @@ Item::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, // Figure out if a child folder is activated for ( TQStringList::const_iterator iter = cs_m_dirs.begin(); iter != cs_m_dirs.end(); ++iter ) - if ( ( *iter ).startsWith( m_url.path(1) ) ) + if ( ( *iter ).tqstartsWith( m_url.path(1) ) ) if ( *iter != "/" ) // "/" should not match as a child of "/" dirty = true; @@ -303,13 +303,13 @@ Item::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, TQColorGroup _cg = cg; if ( dirty ) { - _cg.setColor( TQColorGroup::Text, listView()->colorGroup().link() ); + _cg.setColor( TQColorGroup::Text, listView()->tqcolorGroup().link() ); TQFont font = p->font(); font.setBold( !font.bold() ); p->setFont( font ); } - TQCheckListItem::paintCell( p, isDisabled() ? listView()->palette().disabled() : _cg, column, width, align ); + TQCheckListItem::paintCell( p, isDisabled() ? listView()->tqpalette().disabled() : _cg, column, width, align ); p->setFont( f ); } diff --git a/amarok/src/directorylist.h b/amarok/src/directorylist.h index ef8a89f1..543f2f21 100644 --- a/amarok/src/directorylist.h +++ b/amarok/src/directorylist.h @@ -29,20 +29,20 @@ namespace Collection { class Item; } -class QFixedListView : public QListView -// Reimplement sizeHint to have directorylist not being too big for "low" (1024x768 is not exactly low) resolutions +class TQFixedListView : public TQListView +// Reimplement tqsizeHint to have directorylist not being too big for "low" (1024x768 is not exactly low) resolutions { public: - QFixedListView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) - :TQListView(parent, name, f) {}; - TQSize sizeHint() const + TQFixedListView ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ) + :TQListView(tqparent, name, f) {}; + TQSize tqsizeHint() const { return TQSize(400, 100); } }; -class CollectionSetup : public QVBox +class CollectionSetup : public TQVBox { friend class Collection::Item; @@ -59,7 +59,7 @@ public: private: static CollectionSetup* s_instance; - QFixedListView *m_view; + TQFixedListView *m_view; TQStringList m_dirs; TQCheckBox *m_recursive; TQCheckBox *m_monitor; @@ -68,16 +68,17 @@ private: namespace Collection { //just to keep it out of the global namespace -class Item : public TQObject, public QCheckListItem +class Item : public TQObject, public TQCheckListItem { Q_OBJECT + TQ_OBJECT public: - Item( TQListView *parent ); - Item( TQListViewItem *parent, const KURL &url , bool full_disable=false ); + Item( TQListView *tqparent ); + Item( TQListViewItem *tqparent, const KURL &url , bool full_disable=false ); - TQCheckListItem *parent() const { return static_cast<TQCheckListItem*>( TQListViewItem::parent() ); } + TQCheckListItem *tqparent() const { return static_cast<TQCheckListItem*>( TQListViewItem::tqparent() ); } bool isFullyDisabled() const { return m_fullyDisabled; } - bool isDisabled() const { return isFullyDisabled() || ( CollectionSetup::instance()->recursive() && parent() && parent()->isOn() ); } + bool isDisabled() const { return isFullyDisabled() || ( CollectionSetup::instance()->recursive() && tqparent() && tqparent()->isOn() ); } TQString fullPath() const; void setOpen( bool b ); // reimpl. @@ -87,7 +88,7 @@ public: public slots: void newItems( const KFileItemList& ); - void completed() { if( childCount() == 0 ) { setExpandable( false ); repaint(); } } + void completed() { if( childCount() == 0 ) { setExpandable( false ); tqrepaint(); } } private: KDirLister m_lister; diff --git a/amarok/src/dynamicmode.cpp b/amarok/src/dynamicmode.cpp index 1bc8aa7b..cc5471a5 100644 --- a/amarok/src/dynamicmode.cpp +++ b/amarok/src/dynamicmode.cpp @@ -270,12 +270,12 @@ DEBUG_BLOCK // FIXME: All this SQL magic out of collectiondb is not a good thing // if there is no ordering, add random ordering - if ( sql.find( TQString("ORDER BY"), false ) == -1 ) + if ( sql.tqfind( TQString("ORDER BY"), false ) == -1 ) { TQRegExp limit( "(LIMIT.*)?;$" ); - sql.replace( limit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;") - .arg( CollectionDB::instance()->randomFunc() ) - .arg( songCount ) ); + sql.tqreplace( limit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;") + .tqarg( CollectionDB::instance()->randomFunc() ) + .tqarg( songCount ) ); } else { @@ -286,9 +286,9 @@ DEBUG_BLOCK if( findLocation == -1 ) //not found, let's find out the higher limit the hard way { TQString counting( sql ); - counting.replace( TQRegExp( "SELECT.*FROM" ), "SELECT COUNT(*) FROM" ); + counting.tqreplace( TQRegExp( "SELECT.*FROM" ), "SELECT COUNT(*) FROM" ); // Postgres' grouping rule doesn't like the following clause - counting.replace( TQRegExp( "ORDER BY.*" ), "" ); + counting.tqreplace( TQRegExp( "ORDER BY.*" ), "" ); TQStringList countingResult = CollectionDB::instance()->query( counting ); limit = countingResult[0].toInt(); } @@ -308,9 +308,9 @@ DEBUG_BLOCK // is meaningless in dynamic mode TQRegExp orderLimit( "(ORDER BY.*)?;$" ); - sql.replace( orderLimit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;") - .arg( CollectionDB::instance()->randomFunc() ) - .arg( songCount ) ); + sql.tqreplace( orderLimit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;") + .tqarg( CollectionDB::instance()->randomFunc() ) + .tqarg( songCount ) ); } else // time ordered criteria, only mess with the limits { @@ -324,16 +324,16 @@ DEBUG_BLOCK if( findLocation == -1 ) // there is no limit { TQRegExp queryEnd( ";$" ); // find the end of the query an add a limit - sql.replace( queryEnd, TQString(" LIMIT %1 OFFSET %2;" ).arg( songCount*5 ).arg( offset ) ); + sql.tqreplace( queryEnd, TQString(" LIMIT %1 OFFSET %2;" ).tqarg( songCount*5 ).tqarg( offset ) ); useDirect = false; } else // there is a limit, so find it and replace it - sql.replace( limitSearch, TQString(" LIMIT %1 OFFSET %2;" ).arg( songCount ).arg( offset ) ); + sql.tqreplace( limitSearch, TQString(" LIMIT %1 OFFSET %2;" ).tqarg( songCount ).tqarg( offset ) ); } } // only return the fields that we need - sql.replace( TQRegExp( "SELECT.*FROM" ), "SELECT tags.url, tags.deviceid FROM" ); + sql.tqreplace( TQRegExp( "SELECT.*FROM" ), "SELECT tags.url, tags.deviceid FROM" ); TQStringList queryResult = CollectionDB::instance()->query( sql ); TQStringList items; diff --git a/amarok/src/editfilterdialog.cpp b/amarok/src/editfilterdialog.cpp index 04f3a19b..c7d97d2e 100644 --- a/amarok/src/editfilterdialog.cpp +++ b/amarok/src/editfilterdialog.cpp @@ -26,9 +26,9 @@ #include "editfilterdialog.h" #include "metabundle.h" -EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, const TQString &text ) +EditFilterDialog::EditFilterDialog( TQWidget* tqparent, bool metaBundleKeywords, const TQString &text ) : KDialogBase( Plain, i18n("Edit Filter"), User1|User2|Default|Ok|Cancel, - Cancel, parent, "editfilter", /*modal*/true, /*separator*/false ), + Cancel, tqparent, "editfilter", /*modal*/true, /*separator*/false ), m_minMaxRadio(0), m_filterText(text) { @@ -223,7 +223,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c connect(m_spinMax1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(maxSpinChanged(int))); TQHBoxLayout *filesizeLayout = new TQHBoxLayout( vertLayout ); - filesizeLayout->setAlignment( AlignLeft ); + filesizeLayout->tqsetAlignment( AlignLeft ); m_filesizeLabel = new TQLabel( i18n("Unit:"), m_groupBox, "filesizeLabel"); filesizeLayout->addWidget( m_filesizeLabel ); filesizeLayout->addItem( new TQSpacerItem( 5, 10, TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); @@ -243,7 +243,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c connect( m_comboCondition, TQT_SIGNAL(activated(int)), TQT_SLOT(chooseCondition(int)) ); TQHBoxLayout *otherOptionsLayout = new TQHBoxLayout( plainPage() ); - otherOptionsLayout->setAlignment( AlignHCenter ); + otherOptionsLayout->tqsetAlignment( AlignHCenter ); m_mainLay->addLayout( otherOptionsLayout ); // the groupbox to select the action filter @@ -532,7 +532,7 @@ void EditFilterDialog::selectedKeyword(int index) // SLOT { // year: set useful values for the spinboxes m_spinMin1->setValue( 1900 ); - m_spinMax1->setValue( TQDate::currentDate().year() ); + m_spinMax1->setValue( TQDate::tqcurrentDate().year() ); valueWanted(); } else if( key=="track" || key=="disc" || key=="discnumber" ) diff --git a/amarok/src/editfilterdialog.h b/amarok/src/editfilterdialog.h index 50b1f82a..49706987 100644 --- a/amarok/src/editfilterdialog.h +++ b/amarok/src/editfilterdialog.h @@ -23,8 +23,9 @@ class KComboBox; class EditFilterDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, const TQString &text = "" ); + EditFilterDialog( TQWidget* tqparent, bool metaBundleKeywords, const TQString &text = "" ); ~EditFilterDialog(); TQString filter() const; diff --git a/amarok/src/engine/akode/akode-engine.cpp b/amarok/src/engine/akode/akode-engine.cpp index 26840589..f2404012 100644 --- a/amarok/src/engine/akode/akode-engine.cpp +++ b/amarok/src/engine/akode/akode-engine.cpp @@ -180,7 +180,7 @@ AkodeEngine::event( TQEvent *e ) case 3002: m_player->stop(); emit trackEnded(); - emit infoMessage( i18n("Unable to decode <i>%1</i>").arg( m_url.prettyURL()) ); + emit infoMessage( i18n("Unable to decode <i>%1</i>").tqarg( m_url.prettyURL()) ); break; default: diff --git a/amarok/src/engine/helix/COPYING b/amarok/src/engine/helix/COPYING index 0fc8a215..449a9762 100644 --- a/amarok/src/engine/helix/COPYING +++ b/amarok/src/engine/helix/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/amarok/src/engine/helix/Makefile.test b/amarok/src/engine/helix/Makefile.test index 0fc64129..743d1ea6 100644 --- a/amarok/src/engine/helix/Makefile.test +++ b/amarok/src/engine/helix/Makefile.test @@ -1,14 +1,14 @@ DEFINES=-DTEST_APP -D_REENTRANT_ -DQT_THREAD_SUPPORT CXX=g++ -MOC=/usr/lib/qt-3.3/bin/moc +TQMOC=/usr/lib/qt-3.3/bin/tqmoc CXXFLAGS=-g -fpic -pipe -Wall -Wreturn-type -fno-exceptions --permissive -fno-rtti -Wno-ctor-dtor-privacy -march=pentium -mcpu=pentium -O2 $(INCLUDES) $(DEFINES) SRCS=main.cpp hxsplay.cpp LIBSRCS=helix-engine.cpp helix-config.cpp hxsplay.cpp -MOCSRCS=helix-engine.moc helix-config.moc -MOCHDRS=$(MOCSRCS:.moc=.h) +TQMOCSRCS=helix-engine.tqmoc helix-config.tqmoc +TQMOCHDRS=$(TQMOCSRCS:.tqmoc=.h) OBJS=$(SRCS:.cpp=.o) LIBOBJS=$(LIBSRCS:.cpp=.o) @@ -30,7 +30,7 @@ INCLUDES=\ LIBRARIES=-Lhelix-sp -lhelix-sp --lstdc++ -ldl -lm -L/usr/lib/qt-3.3/lib -lqt-mt -.SUFFIXES: .cpp .so .h .moc +.SUFFIXES: .cpp .so .h .tqmoc .c.o: $(CC) $(CCFLAGS) -o $@ -c $< @@ -38,14 +38,14 @@ LIBRARIES=-Lhelix-sp -lhelix-sp --lstdc++ -ldl -lm -L/usr/lib/qt-3.3/lib -lqt-mt .cpp.o: $(CXX) $(CXXFLAGS) -o $@ -c $< -.h.moc: - $(MOC) $< -o $@ +.h.tqmoc: + $(TQMOC) $< -o $@ PROGRAM=splay SLIBRARY=libamarok_helixengine_plugin.so -all: $(MOCSRCS) $(SLIBRARY) $(OBJS) $(LIBOBJS) $(PROGRAM) +all: $(TQMOCSRCS) $(SLIBRARY) $(OBJS) $(LIBOBJS) $(PROGRAM) $(PROGRAM): $(OBJS) $(CXX) -o $(PROGRAM) $(OBJS) $(LIBRARIES) @@ -55,7 +55,7 @@ $(SLIBRARY): $(LIBOBJS) $(OBJS): $(SRCS) -$(MOCSRCS): $(MOCHDRS) +$(TQMOCSRCS): $(TQMOCHDRS) install: install -p -C -m 755 $(SLIBRARY) /usr/lib/kde3/$(SLIBRARY) @@ -69,7 +69,7 @@ uninstall: rm -f /usr/share/services/amarok_helixengine_plugin.desktop clean: - rm -f $(PROGRAM) $(SLIBRARY) $(LIBOBJS) $(OBJS) helix-engine.moc *~ + rm -f $(PROGRAM) $(SLIBRARY) $(LIBOBJS) $(OBJS) helix-engine.tqmoc *~ depend: makedepend $(DEFINES) $(INCLUDES) -o.o -- $(SRCS) @@ -116,4 +116,4 @@ hxsplay.o: /usr/lib/qt-3.3/include/qwinexport.h /usr/include/string.h hxsplay.o: /usr/lib/qt-3.3/include/qnamespace.h hxsplay.o: /usr/lib/qt-3.3/include/qmutex.h hxsplay.o: /usr/lib/qt-3.3/include/qsemaphore.h -hxsplay.o: /usr/lib/qt-3.3/include/qwaitcondition.h hxsplay.h hxsplay.moc +hxsplay.o: /usr/lib/qt-3.3/include/qwaitcondition.h hxsplay.h hxsplay.tqmoc diff --git a/amarok/src/engine/helix/helix-configdialog.cpp b/amarok/src/engine/helix/helix-configdialog.cpp index 5b81e976..5cb0be23 100644 --- a/amarok/src/engine/helix/helix-configdialog.cpp +++ b/amarok/src/engine/helix/helix-configdialog.cpp @@ -43,7 +43,7 @@ using namespace std; HelixConfigDialogBase *HelixConfigDialog::instance = NULL; -HelixConfigEntry::HelixConfigEntry( TQWidget *parent, +HelixConfigEntry::HelixConfigEntry( TQWidget *tqparent, Amarok::PluginConfig *pluginConfig, int row, const TQString & description, @@ -53,22 +53,22 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent, , m_valueChanged( false ) , m_stringValue( defaultvalue ) { - TQGridLayout *grid = (TQGridLayout*)parent->layout(); + TQGridLayout *grid = (TQGridLayout*)tqparent->tqlayout(); - m_w = new KLineEdit( m_stringValue, parent ); + m_w = new KLineEdit( m_stringValue, tqparent ); connect( (TQWidget *) m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) ); connect( (TQWidget *) m_w, TQT_SIGNAL(textChanged( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) ); TQToolTip::add( (TQWidget *) m_w, "<qt>" + tooltip ); - TQLabel* d = new TQLabel( description + ':', parent ); - d->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); + TQLabel* d = new TQLabel( description + ':', tqparent ); + d->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); grid->addWidget( (TQWidget *) m_w, row, 1 ); grid->addWidget( d, row, 0 ); } -HelixConfigEntry::HelixConfigEntry( TQWidget *parent, +HelixConfigEntry::HelixConfigEntry( TQWidget *tqparent, TQString &str, Amarok::PluginConfig *pluginConfig, int row, @@ -79,18 +79,18 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent, , m_valueChanged( false ) , m_stringValue( defaultvalue ) { - TQGridLayout *grid = (TQGridLayout*)parent->layout(); + TQGridLayout *grid = (TQGridLayout*)tqparent->tqlayout(); m_key = str; - m_w = new KLineEdit( str, parent ); + m_w = new KLineEdit( str, tqparent ); connect( m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) ); connect( m_w, TQT_SIGNAL(textChanged( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) ); TQToolTip::add( m_w, "<qt>" + tooltip ); - TQLabel* d = new TQLabel( description + ':', parent ); - d->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); + TQLabel* d = new TQLabel( description + ':', tqparent ); + d->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); grid->addWidget( m_w, row, 1 ); grid->addWidget( d, row, 0 ); @@ -104,22 +104,22 @@ HelixConfigEntry::slotStringChanged( const TQString& ) m_valueChanged = true; } -HelixSoundDevice::HelixSoundDevice( TQWidget *parent, +HelixSoundDevice::HelixSoundDevice( TQWidget *tqparent, Amarok::PluginConfig *pluginConfig, int &row, HelixEngine *engine ) : deviceComboBox(0), checkBox_outputDevice(0), lineEdit_outputDevice(0), m_changed(false), m_engine(engine) { - TQGridLayout *grid = (TQGridLayout*)parent->layout(); + TQGridLayout *grid = (TQGridLayout*)tqparent->tqlayout(); - deviceComboBox = new KComboBox( false, parent, "deviceComboBox" ); + deviceComboBox = new KComboBox( false, tqparent, "deviceComboBox" ); deviceComboBox->insertItem("oss"); // I believe these are not subject to translation (they don't seem to be in xine, #ifdef USE_HELIX_ALSA deviceComboBox->insertItem("alsa"); // and neither are the equivalents in gst (osssink and alsasink) #endif deviceComboBox->setCurrentItem(HelixConfig::outputplugin()); - TQLabel* op = new TQLabel( i18n("Output plugin:"), parent ); - op->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); + TQLabel* op = new TQLabel( i18n("Output plugin:"), tqparent ); + op->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); grid->addWidget( op, row, 0 ); grid->addWidget( deviceComboBox, row, 1); connect( (TQWidget *)deviceComboBox, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( slotNewDevice( const TQString& )) ); @@ -127,12 +127,12 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent, ++row; - checkBox_outputDevice = new TQCheckBox( parent, "checkBox_outputDevice" ); - checkBox_outputDevice->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, checkBox_outputDevice->sizePolicy().hasHeightForWidth() ) ); + checkBox_outputDevice = new TQCheckBox( tqparent, "checkBox_outputDevice" ); + checkBox_outputDevice->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, checkBox_outputDevice->sizePolicy().hasHeightForWidth() ) ); grid->addWidget( checkBox_outputDevice, row, 0 ); checkBox_outputDevice->setText( i18n( "Device:" ) ); - lineEdit_outputDevice = new KLineEdit( HelixConfig::device(), parent ); + lineEdit_outputDevice = new KLineEdit( HelixConfig::device(), tqparent ); connect( (TQWidget *) lineEdit_outputDevice, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) ); connect( (TQWidget *) lineEdit_outputDevice, TQT_SIGNAL( textChanged( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) ); connect( checkBox_outputDevice, TQT_SIGNAL( toggled(bool) ), lineEdit_outputDevice, TQT_SLOT( setEnabled(bool) ) ); @@ -257,52 +257,52 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi { int row = 0; TQString currentPage; - TQWidget *parent = 0; + TQWidget *tqparent = 0; TQGridLayout *grid = 0; TQScrollView *sv = 0; TQString pageName( i18n("Main") ); addTab( sv = new TQScrollView, pageName ); - parent = new TQWidget( sv->viewport() ); + tqparent = new TQWidget( sv->viewport() ); sv->setResizePolicy( TQScrollView::AutoOneFit ); sv->setHScrollBarMode( TQScrollView::AlwaysOff ); sv->setFrameShape( TQFrame::NoFrame ); - sv->addChild( parent ); + sv->addChild( tqparent ); - grid = new TQGridLayout( parent, /*rows*/20, /*cols*/2, /*margin*/10, /*spacing*/10 ); + grid = new TQGridLayout( tqparent, /*rows*/20, /*cols*/2, /*margin*/10, /*spacing*/10 ); grid->setColStretch( 0, 1 ); grid->setColStretch( 1, 1 ); if( sv ) - sv->setMinimumWidth( grid->sizeHint().width() + 20 ); + sv->setMinimumWidth( grid->tqsizeHint().width() + 20 ); engine->m_coredir = HelixConfig::coreDirectory(); - m_core = new HelixConfigEntry( parent, engine->m_coredir, + m_core = new HelixConfigEntry( tqparent, engine->m_coredir, config, row, i18n("Helix/Realplay core directory"), HelixConfig::coreDirectory().utf8(), i18n("This is the directory where clntcore.so is located")); ++row; engine->m_pluginsdir = HelixConfig::pluginDirectory(); - m_plugin = new HelixConfigEntry( parent, engine->m_pluginsdir, + m_plugin = new HelixConfigEntry( tqparent, engine->m_pluginsdir, config, row, i18n("Helix/Realplay plugins directory"), HelixConfig::pluginDirectory().utf8(), i18n("This is the directory where, for example, vorbisrend.so is located")); ++row; engine->m_codecsdir = HelixConfig::codecsDirectory(); - m_codec = new HelixConfigEntry( parent, engine->m_codecsdir, + m_codec = new HelixConfigEntry( tqparent, engine->m_codecsdir, config, row, i18n("Helix/Realplay codecs directory"), HelixConfig::codecsDirectory().utf8(), i18n("This is the directory where, for example, cvt1.so is located")); ++row; - grid->addMultiCellWidget( new KSeparator( KSeparator::Horizontal, parent ), row, row, 0, 1 ); + grid->addMultiCellWidget( new KSeparator( KSeparator::Horizontal, tqparent ), row, row, 0, 1 ); ++row; - m_device = new HelixSoundDevice( parent, config, row, engine ); + m_device = new HelixSoundDevice( tqparent, config, row, engine ); // lets find the logo if we can TQPixmap *pm = 0; @@ -332,9 +332,9 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi if (pm) { - TQLabel *l = new TQLabel(parent); + TQLabel *l = new TQLabel(tqparent); l->setPixmap(*pm); - grid->addMultiCellWidget( l, 20, 20, 1, 1, Qt::AlignRight ); + grid->addMultiCellWidget( l, 20, 20, 1, 1, TQt::AlignRight ); } entries.setAutoDelete( true ); @@ -342,16 +342,16 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi pageName = i18n("Plugins"); addTab( sv = new TQScrollView, pageName ); - parent = new TQWidget( sv->viewport() ); + tqparent = new TQWidget( sv->viewport() ); sv->setResizePolicy( TQScrollView::AutoOneFit ); - sv->addChild( parent ); + sv->addChild( tqparent ); - TQTextEdit *le = new TQTextEdit( parent ); + TQTextEdit *le = new TQTextEdit( tqparent ); if( sv ) - sv->setMinimumWidth( le->sizeHint().width() ); + sv->setMinimumWidth( le->tqsizeHint().width() ); - grid = new TQGridLayout( parent, /*rows*/1, /*cols*/1, /*margin*/2, /*spacing*/1 ); + grid = new TQGridLayout( tqparent, /*rows*/1, /*cols*/1, /*margin*/2, /*spacing*/1 ); grid->addMultiCellWidget( le, 0, 1, 0, 1, 0 ); le->setWordWrap(TQTextEdit::NoWrap); diff --git a/amarok/src/engine/helix/helix-configdialog.h b/amarok/src/engine/helix/helix-configdialog.h index 4a70e595..3375b64c 100644 --- a/amarok/src/engine/helix/helix-configdialog.h +++ b/amarok/src/engine/helix/helix-configdialog.h @@ -25,13 +25,14 @@ class HelixEngine; // since many preferences can be set in Helix, I'm planning on more config items later // for now I'll just get the location of the Helix core/plugins for initializing // the Helix core -class HelixConfigEntry : public QObject +class HelixConfigEntry : public TQObject { Q_OBJECT + TQ_OBJECT public: - HelixConfigEntry( TQWidget *parent, Amarok::PluginConfig*, + HelixConfigEntry( TQWidget *tqparent, Amarok::PluginConfig*, int row, const TQString & description, const char *defaultvalue, const TQString & tooltip ); - HelixConfigEntry( TQWidget *parent, TQString &str, Amarok::PluginConfig*, + HelixConfigEntry( TQWidget *tqparent, TQString &str, Amarok::PluginConfig*, int row, const TQString & description, const char *defaultvalue, const TQString & tooltip ); bool isChanged() const { return m_valueChanged; } @@ -51,11 +52,12 @@ private: TQString m_stringValue; }; -class HelixSoundDevice : public QObject +class HelixSoundDevice : public TQObject { Q_OBJECT + TQ_OBJECT public: - HelixSoundDevice( TQWidget *parent, Amarok::PluginConfig *config, int &row, HelixEngine *engine ); + HelixSoundDevice( TQWidget *tqparent, Amarok::PluginConfig *config, int &row, HelixEngine *engine ); bool save(); void setSoundSystem( int api ); bool isChanged() const { return m_changed; } @@ -75,10 +77,10 @@ private: }; -class HelixConfigDialogBase : public QTabWidget +class HelixConfigDialogBase : public TQTabWidget { public: - HelixConfigDialogBase( HelixEngine *engine, Amarok::PluginConfig *config, TQWidget *parent = 0 ); + HelixConfigDialogBase( HelixEngine *engine, Amarok::PluginConfig *config, TQWidget *tqparent = 0 ); ~HelixConfigDialogBase(); virtual TQWidget *view() { return this; } @@ -103,7 +105,7 @@ private: class HelixConfigDialog : public Amarok::PluginConfig { public: - HelixConfigDialog( HelixEngine *engine, TQWidget *parent = 0 ); + HelixConfigDialog( HelixEngine *engine, TQWidget *tqparent = 0 ); ~HelixConfigDialog(); virtual TQWidget *view() { return instance->view(); } diff --git a/amarok/src/engine/helix/helix-engine.cpp b/amarok/src/engine/helix/helix-engine.cpp index fb4dc695..3c2355b6 100644 --- a/amarok/src/engine/helix/helix-engine.cpp +++ b/amarok/src/engine/helix/helix-engine.cpp @@ -126,7 +126,7 @@ void HelixEngine::notifyUser(unsigned long code, const char *moreinfo, const cha { TQString *err = HelixErrors::errorText(code); if (err) - emit statusText(i18n("Helix Core returned error: %1 %2 %3").arg(TQString(*err)).arg(TQString(moreinfo)).arg(TQString(moreinfourl))); + emit statusText(i18n("Helix Core returned error: %1 %2 %3").tqarg(TQString(*err)).tqarg(TQString(moreinfo)).tqarg(TQString(moreinfourl))); else emit statusText(i18n("Helix Core returned error: <unknown>")); } @@ -135,7 +135,7 @@ void HelixEngine::interruptUser(unsigned long code, const char *moreinfo, const { TQString *err = HelixErrors::errorText(code); if (err) - emit infoMessage(i18n("Helix Core returned error: %1 %1 %1").arg(TQString(*err)).arg(TQString(moreinfo)).arg(TQString(moreinfourl))); + emit infoMessage(i18n("Helix Core returned error: %1 %1 %1").tqarg(TQString(*err)).tqarg(TQString(moreinfo)).tqarg(TQString(moreinfourl))); else emit infoMessage(i18n("Helix Core returned error: <unknown>")); @@ -146,13 +146,13 @@ void HelixEngine::interruptUser(unsigned long code, const char *moreinfo, const void HelixEngine::onContacting(const char *host) { - emit statusText( i18n("Contacting: %1").arg( TQString(host) ) ); + emit statusText( i18n("Contacting: %1").tqarg( TQString(host) ) ); } void HelixEngine::onBuffering(int pcnt) { if (pcnt != 100) // let's not report that... - emit statusText( i18n( "Buffering %1%" ).arg( pcnt ) ); + emit statusText( i18n( "Buffering %1%" ).tqarg( pcnt ) ); } @@ -288,8 +288,8 @@ HelixEngine::load( const KURL &url, bool isStream ) if (!canDecode(url)) { const TQString path = url.path(); - const TQString ext = path.mid( path.findRev( '.' ) + 1 ).lower(); - emit statusText( i18n("No plugin found for the %1 format").arg(ext) ); + const TQString ext = path.mid( path.tqfindRev( '.' ) + 1 ).lower(); + emit statusText( i18n("No plugin found for the %1 format").tqarg(ext) ); return false; } @@ -550,7 +550,7 @@ HelixEngine::canDecode( const KURL &url ) const return true; const TQString path = url.path(); - const TQString ext = path.mid( path.findRev( '.' ) + 1 ).lower(); + const TQString ext = path.mid( path.tqfindRev( '.' ) + 1 ).lower(); if (ext != "txt") for (int i=0; i<(int)m_mimes.size(); i++) diff --git a/amarok/src/engine/helix/helix-engine.h b/amarok/src/engine/helix/helix-engine.h index bd89c601..2dc1dc1e 100644 --- a/amarok/src/engine/helix/helix-engine.h +++ b/amarok/src/engine/helix/helix-engine.h @@ -22,6 +22,7 @@ struct timeval; class HelixEngine : public Engine::Base, public PlayerControl { Q_OBJECT + TQ_OBJECT public: HelixEngine(); diff --git a/amarok/src/engine/helix/helix-sp/gain.cpp b/amarok/src/engine/helix/helix-sp/gain.cpp index c219955b..ff75b801 100644 --- a/amarok/src/engine/helix/helix-sp/gain.cpp +++ b/amarok/src/engine/helix/helix-sp/gain.cpp @@ -18,7 +18,7 @@ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TQUIET * ENJOYMENT OR NON-INFRINGEMENT. * * Technology Compatibility Kit Test Suite(s) Location: diff --git a/amarok/src/engine/helix/helix-sp/gain.h b/amarok/src/engine/helix/helix-sp/gain.h index d120a134..8b7902b8 100644 --- a/amarok/src/engine/helix/helix-sp/gain.h +++ b/amarok/src/engine/helix/helix-sp/gain.h @@ -18,7 +18,7 @@ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TQUIET * ENJOYMENT OR NON-INFRINGEMENT. * * Technology Compatibility Kit Test Suite(s) Location: diff --git a/amarok/src/engine/helix/helix-sp/helix-include/client/include/hxclsnk.h b/amarok/src/engine/helix/helix-sp/helix-include/client/include/hxclsnk.h index a11b8db9..b1caa134 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/client/include/hxclsnk.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/client/include/hxclsnk.h @@ -49,7 +49,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -68,7 +68,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * Called to advise the client that the position or length of the * current playback context has changed. */ - STDQT_METHOD(OnPosLength) (THIS_ + STDTQT_METHOD(OnPosLength) (THIS_ UINT32 ulPosition, UINT32 ulLength) PURE; @@ -78,7 +78,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * Purpose: * Called to advise the client a presentation has been opened. */ - STDQT_METHOD(OnPresentationOpened) (THIS) PURE; + STDTQT_METHOD(OnPresentationOpened) (THIS) PURE; /************************************************************************ * Method: @@ -86,7 +86,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * Purpose: * Called to advise the client a presentation has been closed. */ - STDQT_METHOD(OnPresentationClosed) (THIS) PURE; + STDTQT_METHOD(OnPresentationClosed) (THIS) PURE; /************************************************************************ * Method: @@ -95,7 +95,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * Called to advise the client that the presentation statistics * have changed. */ - STDQT_METHOD(OnStatisticsChanged) (THIS) PURE; + STDTQT_METHOD(OnStatisticsChanged) (THIS) PURE; /************************************************************************ * Method: @@ -107,7 +107,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * time for the stream's time line after the seek will be completed. * */ - STDQT_METHOD(OnPreSeek) (THIS_ + STDTQT_METHOD(OnPreSeek) (THIS_ ULONG32 ulOldTime, ULONG32 ulNewTime) PURE; @@ -121,7 +121,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * time for the stream's time line after the seek. * */ - STDQT_METHOD(OnPostSeek) (THIS_ + STDTQT_METHOD(OnPostSeek) (THIS_ ULONG32 ulOldTime, ULONG32 ulNewTime) PURE; @@ -133,7 +133,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * just occurred. * */ - STDQT_METHOD(OnStop) (THIS) PURE; + STDTQT_METHOD(OnStop) (THIS) PURE; /************************************************************************ * Method: @@ -144,7 +144,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * stream's time line before the pause. * */ - STDQT_METHOD(OnPause) (THIS_ + STDTQT_METHOD(OnPause) (THIS_ ULONG32 ulTime) PURE; /************************************************************************ @@ -156,7 +156,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * for the stream's time line after the resume. * */ - STDQT_METHOD(OnBegin) (THIS_ + STDTQT_METHOD(OnBegin) (THIS_ ULONG32 ulTime) PURE; /************************************************************************ @@ -170,7 +170,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * buffering process. * */ - STDQT_METHOD(OnBuffering) (THIS_ + STDTQT_METHOD(OnBuffering) (THIS_ ULONG32 ulFlags, UINT16 unPercentComplete) PURE; @@ -182,7 +182,7 @@ DECLARE_INTERFACE_(IHXClientAdviseSink, IUnknown) * hosts(s). * */ - STDQT_METHOD(OnContacting) (THIS_ + STDTQT_METHOD(OnContacting) (THIS_ const char* pHostName) PURE; }; @@ -222,7 +222,7 @@ DECLARE_INTERFACE_(IHXClientRequestSink, IUnknown) * modify RequestHeaders at this time. */ - STDQT_METHOD(OnNewRequest) (THIS_ IHXRequest* pNewRequest) PURE; + STDTQT_METHOD(OnNewRequest) (THIS_ IHXRequest* pNewRequest) PURE; }; // $EndPrivate. diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h b/amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h index c52abde9..dba22768 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/container/hxbuffer.h @@ -121,7 +121,7 @@ public: /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -132,15 +132,15 @@ public: /* * IHXBuffer methods */ - STDQT_METHOD(Get) (THIS_ + STDTQT_METHOD(Get) (THIS_ REF(UCHAR*) pData, REF(ULONG32) ulLength); - STDQT_METHOD(Set) (THIS_ + STDTQT_METHOD(Set) (THIS_ const UCHAR* pData, ULONG32 ulLength); - STDQT_METHOD(SetSize) (THIS_ + STDTQT_METHOD(SetSize) (THIS_ ULONG32 ulLength); STDMETHOD_(ULONG32,GetSize) (THIS); diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h index dd841fe2..73c006ea 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h @@ -332,7 +332,7 @@ do { \ } while (0) \ -#define REQUIRE_REPORT(targ,file,line) HXAssertFailedLine(targ,file,line) +#define RETQUIRE_REPORT(targ,file,line) HXAssertFailedLine(targ,file,line) @@ -525,7 +525,7 @@ int safe_int_func_call(LONG32 f); #define HX_ASSERT_VALID_READ_PTR(pOb) ((void)0) #define HXOutputDebugString(f) ((void)0) -#define REQUIRE_REPORT(targ,file,line) ((int)0) +#define RETQUIRE_REPORT(targ,file,line) ((int)0) #if defined (_MACINTOSH) // this is the proper release version of HX_VERIFY that preserves the syntactic @@ -574,104 +574,104 @@ class LogInfo ///////////////////////////////////////////////////////////////////////////// -// CHECK/REQUIRE MACROS +// CHECK/RETQUIRE MACROS // // These macros are always valid (debug and release builds) // // // -// REQUIRE and REQUIRE_ACTION _always_ emit code for the goto if the statement is false +// RETQUIRE and RETQUIRE_ACTION _always_ emit code for the goto if the statement is false // -// REQUIRE_REPORT only generates code in Debug builds +// RETQUIRE_REPORT only generates code in Debug builds // // The do {} while (0) construct ensures this is legal wherever a statement is legal // #define CHECK(stmt) HX_ASSERT(stmt) -#define REQUIRE_VOID_RETURN(stmt) \ - do { if ((stmt) == 0) { if (REQUIRE_REPORT(#stmt,__FILE__,__LINE__)) HXDebugBreak(); return; } } while (0) -#define REQUIRE_RETURN(stmt,returned) \ - do { if ((stmt) == 0) { if (REQUIRE_REPORT(#stmt,__FILE__,__LINE__)) HXDebugBreak(); return (returned); } } while (0) -#define REQUIRE_VOID_RETURN_QUIET(stmt) \ +#define RETQUIRE_VOID_RETURN(stmt) \ + do { if ((stmt) == 0) { if (RETQUIRE_REPORT(#stmt,__FILE__,__LINE__)) HXDebugBreak(); return; } } while (0) +#define RETQUIRE_RETURN(stmt,returned) \ + do { if ((stmt) == 0) { if (RETQUIRE_REPORT(#stmt,__FILE__,__LINE__)) HXDebugBreak(); return (returned); } } while (0) +#define RETQUIRE_VOID_RETURN_TQUIET(stmt) \ do { if ((stmt) == 0) { return; } } while (0) -#define REQUIRE_RETURN_QUIET(stmt,returned) \ +#define RETQUIRE_RETURN_TQUIET(stmt,returned) \ do { if ((stmt) == 0) { return (returned); } } while (0) -#define REQUIRE(stmt,target) \ - do { if ((stmt) == 0) { REQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) -#define REQUIRE_ACTION(stmt,target,action) \ - do { if ((stmt) == 0) { REQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) -#define REQUIRE_QUIET(stmt,target) \ +#define RETQUIRE(stmt,target) \ + do { if ((stmt) == 0) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) +#define RETQUIRE_ACTION(stmt,target,action) \ + do { if ((stmt) == 0) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) +#define RETQUIRE_TQUIET(stmt,target) \ do { if ((stmt) == 0) goto target; } while (0) -#define REQUIRE_ACTION_QUIET(stmt,target,action) \ +#define RETQUIRE_ACTION_TQUIET(stmt,target,action) \ do { if ((stmt) == 0) {{action;} goto target;} } while (0) -#define PRE_REQUIRE_RETURN(stmt,returned) \ - REQUIRE_RETURN(stmt,returned) -#define PRE_REQUIRE_VOID_RETURN(stmt) \ - REQUIRE_VOID_RETURN(stmt) -#define POST_REQUIRE_RETURN(stmt,returned) \ - REQUIRE_RETURN(stmt,returned) -#define POST_REQUIRE_VOID_RETURN(stmt) \ - REQUIRE_VOID_RETURN(stmt) - -#define REQUIRE_SUCCESS_RETURN_QUIET(expr) \ +#define PRE_RETQUIRE_RETURN(stmt,returned) \ + RETQUIRE_RETURN(stmt,returned) +#define PRE_RETQUIRE_VOID_RETURN(stmt) \ + RETQUIRE_VOID_RETURN(stmt) +#define POST_RETQUIRE_RETURN(stmt,returned) \ + RETQUIRE_RETURN(stmt,returned) +#define POST_RETQUIRE_VOID_RETURN(stmt) \ + RETQUIRE_VOID_RETURN(stmt) + +#define RETQUIRE_SUCCESS_RETURN_TQUIET(expr) \ do { register HX_RESULT const res = expr; if (FAILED (res)) return res; } while (0) -#define REQUIRE_SUCCESS_RETURN(expr) \ - do { register HX_RESULT const res = expr; if (FAILED (res)) { REQUIRE_REPORT("False condition, Aborting...",__FILE__,__LINE__); return res; } } while (0) +#define RETQUIRE_SUCCESS_RETURN(expr) \ + do { register HX_RESULT const res = expr; if (FAILED (res)) { RETQUIRE_REPORT("False condition, Aborting...",__FILE__,__LINE__); return res; } } while (0) // -// REQUIRE_SUCCESS reports the error if an expected result failed +// RETQUIRE_SUCCESS reports the error if an expected result failed // Ideally, this should report the status value as well // #define CHECK_SUCCESS(stat) HX_ASSERT(((unsigned long)(stat)>>31) == 0) -#define REQUIRE_SUCCESS(stat,target) \ - do { if (((unsigned long)(stat)>>31) != 0) { REQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) -#define REQUIRE_SUCCESS_ACTION(stat,target,action) \ - do { if (((unsigned long)(stat)>>31) != 0) { REQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) -#define REQUIRE_SUCCESS_QUIET(stat,target) \ +#define RETQUIRE_SUCCESS(stat,target) \ + do { if (((unsigned long)(stat)>>31) != 0) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) +#define RETQUIRE_SUCCESS_ACTION(stat,target,action) \ + do { if (((unsigned long)(stat)>>31) != 0) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) +#define RETQUIRE_SUCCESS_TQUIET(stat,target) \ do { if (((unsigned long)(stat)>>31) != 0) goto target; } while (0) -#define REQUIRE_SUCCESS_ACTION_QUIET(stat,target,action) \ +#define RETQUIRE_SUCCESS_ACTION_TQUIET(stat,target,action) \ do { if (((unsigned long)(stat)>>31) != 0) {{action;} goto target;} } while (0) // -// REQUIRE_NOERR reports the error if the error value is non-zero +// RETQUIRE_NOERR reports the error if the error value is non-zero // Ideally, this should report the error value as well // #define CHECK_NOERR(err) HX_ASSERT((err) == 0) -#define REQUIRE_NOERR_RETURN(err,returned) \ - do { if ((err) != 0) { REQUIRE_REPORT("Toolbox error, Aborting...",__FILE__,__LINE__); return (returned); } } while (0) -#define REQUIRE_NOERR(err,target) \ - do { if ((err) != 0) { REQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) -#define REQUIRE_NOERR_ACTION(err,target,action) \ - do { if ((err) != 0) { REQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) -#define REQUIRE_NOERR_QUIET(err,target) \ +#define RETQUIRE_NOERR_RETURN(err,returned) \ + do { if ((err) != 0) { RETQUIRE_REPORT("Toolbox error, Aborting...",__FILE__,__LINE__); return (returned); } } while (0) +#define RETQUIRE_NOERR(err,target) \ + do { if ((err) != 0) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) +#define RETQUIRE_NOERR_ACTION(err,target,action) \ + do { if ((err) != 0) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) +#define RETQUIRE_NOERR_TQUIET(err,target) \ do { if ((err) != 0) goto target; } while (0) -#define REQUIRE_NOERR_ACTION_QUIET(err,target,action) \ +#define RETQUIRE_NOERR_ACTION_TQUIET(err,target,action) \ do { if ((err) != 0) {{action;} goto target;} } while (0) // -// REQUIRE_NONNULL reports the error if the ptr value is null +// RETQUIRE_NONNULL reports the error if the ptr value is null // Ideally, this should report the error value as well // #define CHECK_NONNULL(ptr) HX_ASSERT((ptr) != 0L) #define CHECK_NULL(ptr) HX_ASSERT((ptr) == 0L) -#define REQUIRE_NONNULL_VOID_RETURN(ptr) \ - do { if ((ptr) == 0L) { REQUIRE_REPORT(#ptr" is nil, Aborting...",__FILE__,__LINE__); return; } } while (0) -#define REQUIRE_NONNULL_RETURN(ptr,returned) \ - do { if ((ptr) == 0L) { REQUIRE_REPORT(#ptr" is nil, Aborting...",__FILE__,__LINE__); return (returned); } } while (0) -#define REQUIRE_NONNULL(ptr,target) \ - do { if ((ptr) == 0L) { REQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) -#define REQUIRE_NONNULL_ACTION(ptr,target,action) \ - do { if ((ptr) == 0L) { REQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) -#define REQUIRE_NONNULL_QUIET(ptr,target) \ +#define RETQUIRE_NONNULL_VOID_RETURN(ptr) \ + do { if ((ptr) == 0L) { RETQUIRE_REPORT(#ptr" is nil, Aborting...",__FILE__,__LINE__); return; } } while (0) +#define RETQUIRE_NONNULL_RETURN(ptr,returned) \ + do { if ((ptr) == 0L) { RETQUIRE_REPORT(#ptr" is nil, Aborting...",__FILE__,__LINE__); return (returned); } } while (0) +#define RETQUIRE_NONNULL(ptr,target) \ + do { if ((ptr) == 0L) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) +#define RETQUIRE_NONNULL_ACTION(ptr,target,action) \ + do { if ((ptr) == 0L) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) +#define RETQUIRE_NONNULL_TQUIET(ptr,target) \ do { if ((ptr) == 0L) goto target; } while (0) -#define REQUIRE_NONNULL_ACTION_QUIET(ptr,target,action) \ +#define RETQUIRE_NONNULL_ACTION_TQUIET(ptr,target,action) \ do { if ((ptr) == 0L) {{action;} goto target;} } while (0) // lower case versions make source code more readable @@ -690,38 +690,38 @@ class LogInfo #define check(stmt) CHECK(stmt) -#define require_void_return(stmt) REQUIRE_VOID_RETURN(stmt) -#define require_return_void(stmt) REQUIRE_VOID_RETURN(stmt) -#define require_return(stmt,returned) REQUIRE_RETURN(stmt,returned) -#define require(stmt,target) REQUIRE(stmt,target) -#define require_action(stmt,target,action) REQUIRE_ACTION(stmt,target,action) -#define require_quiet(stmt,target) REQUIRE_QUIET(stmt,target) -#define require_action_quiet(stmt,target,action) REQUIRE_ACTION_QUIET(stmt,target,action) +#define require_void_return(stmt) RETQUIRE_VOID_RETURN(stmt) +#define require_return_void(stmt) RETQUIRE_VOID_RETURN(stmt) +#define require_return(stmt,returned) RETQUIRE_RETURN(stmt,returned) +#define require(stmt,target) RETQUIRE(stmt,target) +#define require_action(stmt,target,action) RETQUIRE_ACTION(stmt,target,action) +#define require_quiet(stmt,target) RETQUIRE_TQUIET(stmt,target) +#define require_action_quiet(stmt,target,action) RETQUIRE_ACTION_TQUIET(stmt,target,action) #define check_success(stat) CHECK_SUCCESS(stat) -#define require_success(stat,target) REQUIRE_SUCCESS(stat,target) -#define require_success_action(stat,target,action) REQUIRE_SUCCESS_ACTION(stat,target,action) -#define require_success_quiet(stat,target) REQUIRE_SUCCESS_QUIET(stat,target) -#define require_success_action_quiet(stat,target,action) REQUIRE_SUCCESS_ACTION_QUIET(stat,target,action) +#define require_success(stat,target) RETQUIRE_SUCCESS(stat,target) +#define require_success_action(stat,target,action) RETQUIRE_SUCCESS_ACTION(stat,target,action) +#define require_success_quiet(stat,target) RETQUIRE_SUCCESS_TQUIET(stat,target) +#define require_success_action_quiet(stat,target,action) RETQUIRE_SUCCESS_ACTION_TQUIET(stat,target,action) #define check_noerr(err) CHECK_NOERR(err) -#define require_noerr_return(err,returned) REQUIRE_NOERR_RETURN(err,returned) -#define require_noerr(err,target) REQUIRE_NOERR(err,target) -#define require_noerr_action(err,target,action) REQUIRE_NOERR_ACTION(err,target,action) -#define require_noerr_quiet(err,target) REQUIRE_NOERR_QUIET(err,target) -#define require_noerr_action_quiet(err,target,action) REQUIRE_NOERR_ACTION_QUIET(err,target,action) +#define require_noerr_return(err,returned) RETQUIRE_NOERR_RETURN(err,returned) +#define require_noerr(err,target) RETQUIRE_NOERR(err,target) +#define require_noerr_action(err,target,action) RETQUIRE_NOERR_ACTION(err,target,action) +#define require_noerr_quiet(err,target) RETQUIRE_NOERR_TQUIET(err,target) +#define require_noerr_action_quiet(err,target,action) RETQUIRE_NOERR_ACTION_TQUIET(err,target,action) #define check_nonnull(ptr) CHECK_NONNULL(ptr) #define check_null(ptr) CHECK_NULL(ptr) -#define require_nonnull_void_return(ptr) REQUIRE_NONNULL_VOID_RETURN(ptr) -#define require_nonnull_return(ptr,returned) REQUIRE_NONNULL_RETURN(ptr,returned) -#define require_nonnull(ptr,target) REQUIRE_NONNULL(ptr,target) -#define require_nonnull_action(ptr,target,action) REQUIRE_NONNULL_ACTION(ptr,target,action) -#define require_nonnull_quiet(ptr,target) REQUIRE_NONNULL_QUIET(ptr,target) -#define require_nonnull_action_quiet(ptr,target,action) REQUIRE_NONNULL_ACTION_QUIET(ptr,target,action) +#define require_nonnull_void_return(ptr) RETQUIRE_NONNULL_VOID_RETURN(ptr) +#define require_nonnull_return(ptr,returned) RETQUIRE_NONNULL_RETURN(ptr,returned) +#define require_nonnull(ptr,target) RETQUIRE_NONNULL(ptr,target) +#define require_nonnull_action(ptr,target,action) RETQUIRE_NONNULL_ACTION(ptr,target,action) +#define require_nonnull_quiet(ptr,target) RETQUIRE_NONNULL_TQUIET(ptr,target) +#define require_nonnull_action_quiet(ptr,target,action) RETQUIRE_NONNULL_ACTION_TQUIET(ptr,target,action) #endif // !_HXASSERT_H_ diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxausvc.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxausvc.h index 6041ef80..be8c2ac1 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxausvc.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxausvc.h @@ -107,7 +107,7 @@ DECLARE_INTERFACE_(IHXAudioPlayer, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -124,7 +124,7 @@ DECLARE_INTERFACE_(IHXAudioPlayer, IUnknown) * Purpose: * Call this to create an audio stream. */ - STDQT_METHOD(CreateAudioStream) (THIS_ + STDTQT_METHOD(CreateAudioStream) (THIS_ IHXAudioStream** /*OUT*/ pAudioStream ) PURE; @@ -135,7 +135,7 @@ DECLARE_INTERFACE_(IHXAudioPlayer, IUnknown) * Call this to hook audio data after all audio streams in this * have been mixed. */ - STDQT_METHOD(AddPostMixHook) (THIS_ + STDTQT_METHOD(AddPostMixHook) (THIS_ IHXAudioHook* /*IN*/ pHook, const HXBOOL /*IN*/ bDisableWrite, const HXBOOL /*IN*/ bFinal @@ -147,7 +147,7 @@ DECLARE_INTERFACE_(IHXAudioPlayer, IUnknown) * Purpose: * Call this to remove an already added post hook. */ - STDQT_METHOD(RemovePostMixHook) (THIS_ + STDTQT_METHOD(RemovePostMixHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; @@ -185,7 +185,7 @@ DECLARE_INTERFACE_(IHXAudioPlayer, IUnknown) * with the total number of audio streams associated with this * audio player. */ - STDQT_METHOD(SetStreamInfoResponse) (THIS_ + STDTQT_METHOD(SetStreamInfoResponse) (THIS_ IHXAudioStreamInfoResponse* /*IN*/ pResponse ) PURE; @@ -195,7 +195,7 @@ DECLARE_INTERFACE_(IHXAudioPlayer, IUnknown) * Purpose: * Remove stream info response that was added earlier */ - STDQT_METHOD(RemoveStreamInfoResponse) (THIS_ + STDTQT_METHOD(RemoveStreamInfoResponse) (THIS_ IHXAudioStreamInfoResponse* /*IN*/ pResponse ) PURE; @@ -250,7 +250,7 @@ DECLARE_INTERFACE_(IHXAudioPlayerResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -268,7 +268,7 @@ DECLARE_INTERFACE_(IHXAudioPlayerResponse, IUnknown) * Purpose: * This method is called with the current audio playback time. */ - STDQT_METHOD(OnTimeSync) (THIS_ + STDTQT_METHOD(OnTimeSync) (THIS_ ULONG32 /*IN*/ ulTimeEnd ) PURE; @@ -301,7 +301,7 @@ DECLARE_INTERFACE_(IHXAudioStream, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -320,7 +320,7 @@ DECLARE_INTERFACE_(IHXAudioStream, IUnknown) * Initialize an audio stream with the given audio format. The * IHXValues contains stream identification information. */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ const HXAudioFormat* /*IN*/ pAudioFormat, IHXValues* /*IN*/ pValues ) PURE; @@ -336,7 +336,7 @@ DECLARE_INTERFACE_(IHXAudioStream, IUnknown) * using a meaningful start time. Audio Services will play * silence where packets are missing. */ - STDQT_METHOD(Write) (THIS_ + STDTQT_METHOD(Write) (THIS_ HXAudioData* /*IN*/ pAudioData ) PURE; @@ -349,7 +349,7 @@ DECLARE_INTERFACE_(IHXAudioStream, IUnknown) * from being mixed with other audio stream data associated * with this audio player. */ - STDQT_METHOD(AddPreMixHook) (THIS_ + STDTQT_METHOD(AddPreMixHook) (THIS_ IHXAudioHook* /*IN*/ pHook, const HXBOOL /*IN*/ bDisableWrite ) PURE; @@ -360,7 +360,7 @@ DECLARE_INTERFACE_(IHXAudioStream, IUnknown) * Purpose: * Use this to remove an already added "hook". */ - STDQT_METHOD(RemovePreMixHook) (THIS_ + STDTQT_METHOD(RemovePreMixHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; @@ -371,7 +371,7 @@ DECLARE_INTERFACE_(IHXAudioStream, IUnknown) * Use this to add a notification response object to get * notifications when audio stream is running dry. */ - STDQT_METHOD(AddDryNotification) (THIS_ + STDTQT_METHOD(AddDryNotification) (THIS_ IHXDryNotification* /*IN*/ pNotification ) PURE; @@ -421,7 +421,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -440,7 +440,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * The caller calls this to open the audio device using the audio * format given. */ - STDQT_METHOD(Open) (THIS_ + STDTQT_METHOD(Open) (THIS_ const HXAudioFormat* /*IN*/ pAudioFormat, IHXAudioDeviceResponse* /*IN*/ pStreamResponse) PURE; @@ -450,7 +450,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to close the audio device. */ - STDQT_METHOD(Close) (THIS_ + STDTQT_METHOD(Close) (THIS_ const HXBOOL /*IN*/ bFlush ) PURE; /************************************************************************ @@ -459,7 +459,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to start or resume audio playback. */ - STDQT_METHOD(Resume) (THIS) PURE; + STDTQT_METHOD(Resume) (THIS) PURE; /************************************************************************ * Method: @@ -469,7 +469,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * TRUE, any buffers in the audio device will be flushed; otherwise, * the buffers are played. */ - STDQT_METHOD(Pause) (THIS) PURE; + STDTQT_METHOD(Pause) (THIS) PURE; /************************************************************************ * Method: @@ -477,7 +477,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to write an audio buffer. */ - STDQT_METHOD(Write) (THIS_ + STDTQT_METHOD(Write) (THIS_ const HXAudioData* /*IN*/ pAudioData) PURE; /************************************************************************ @@ -500,7 +500,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to set the audio device volume level. */ - STDQT_METHOD(SetVolume) (THIS_ + STDTQT_METHOD(SetVolume) (THIS_ const UINT16 /*IN*/ uVolume) PURE; /************************************************************************ @@ -517,7 +517,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to reset the audio device. */ - STDQT_METHOD(Reset) (THIS) PURE; + STDTQT_METHOD(Reset) (THIS) PURE; /************************************************************************ * Method: @@ -525,7 +525,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to drain the audio device. */ - STDQT_METHOD(Drain) (THIS) PURE; + STDTQT_METHOD(Drain) (THIS) PURE; /************************************************************************ * Method: @@ -534,7 +534,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * The caller calls this to check the input format with the * audio device format. */ - STDQT_METHOD(CheckFormat) (THIS_ + STDTQT_METHOD(CheckFormat) (THIS_ const HXAudioFormat* /*IN*/ pAudioFormat ) PURE; /************************************************************************ @@ -543,7 +543,7 @@ DECLARE_INTERFACE_(IHXAudioDevice, IUnknown) * Purpose: * The caller calls this to get current system audio time. */ - STDQT_METHOD(GetCurrentAudioTime) (THIS_ + STDTQT_METHOD(GetCurrentAudioTime) (THIS_ REF(ULONG32) /*OUT*/ ulCurrentTime) PURE; }; @@ -574,7 +574,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -594,7 +594,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceResponse, IUnknown) * interface. This method is called by the IHXAudioDevice when * audio playback occurs. */ - STDQT_METHOD(OnTimeSync) (THIS_ + STDTQT_METHOD(OnTimeSync) (THIS_ ULONG32 /*IN*/ ulTimeEnd) PURE; }; @@ -626,7 +626,7 @@ DECLARE_INTERFACE_(IHXAudioHook, IUnknown) /* * IUnknown methods! */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -644,7 +644,7 @@ DECLARE_INTERFACE_(IHXAudioHook, IUnknown) * Audio Services calls OnInit() with the audio data format of the * audio data that will be provided in the OnBuffer() method. */ - STDQT_METHOD(OnInit) (THIS_ + STDTQT_METHOD(OnInit) (THIS_ HXAudioFormat* /*IN*/ pFormat) PURE; /************************************************************************ @@ -658,7 +658,7 @@ DECLARE_INTERFACE_(IHXAudioHook, IUnknown) * create its own IHXBuffer, modify the data and then associate * this buffer with the pAudioOutData->pData member. */ - STDQT_METHOD(OnBuffer) (THIS_ + STDTQT_METHOD(OnBuffer) (THIS_ HXAudioData* /*IN*/ pAudioInData, HXAudioData* /*OUT*/ pAudioOutData) PURE; }; @@ -689,7 +689,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceHookManager, IUnknown) /* * IUnknown methods! */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -706,7 +706,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceHookManager, IUnknown) * Purpose: * Last chance to modify data being written to the audio device. */ - STDQT_METHOD(AddAudioDeviceHook) (THIS_ + STDTQT_METHOD(AddAudioDeviceHook) (THIS_ IHXAudioHook* /*IN*/ pHook, AudioDeviceHookType /*IN*/ type ) PURE; @@ -717,7 +717,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceHookManager, IUnknown) * Purpose: * Removes the audio device hook that was set with AddAudioDeviceHook. */ - STDQT_METHOD(RemoveAudioDeviceHook) (THIS_ + STDTQT_METHOD(RemoveAudioDeviceHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; @@ -728,7 +728,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceHookManager, IUnknown) * Called by audio device implementations to process the hooks on a * given audio buffer */ - STDQT_METHOD(ProcessAudioDeviceHooks) (THIS_ + STDTQT_METHOD(ProcessAudioDeviceHooks) (THIS_ IHXBuffer*& /*IN/OUT*/ pBuffer, HXBOOL& /*OUT*/ bChanged ) PURE; @@ -762,7 +762,7 @@ DECLARE_INTERFACE_(IHXAudioStreamInfoResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -787,7 +787,7 @@ DECLARE_INTERFACE_(IHXAudioStreamInfoResponse, IUnknown) * IHXAudioStreamInfoResponse object should be written to handle * OnStream() in the midst of the presentation as well. */ - STDQT_METHOD(OnStream) (THIS_ + STDTQT_METHOD(OnStream) (THIS_ IHXAudioStream* /*IN*/ pAudioStream) PURE; }; @@ -824,7 +824,7 @@ DECLARE_INTERFACE_(IHXVolume, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -841,7 +841,7 @@ DECLARE_INTERFACE_(IHXVolume, IUnknown) * Purpose: * Call this to set the volume level. */ - STDQT_METHOD(SetVolume) (THIS_ + STDTQT_METHOD(SetVolume) (THIS_ const UINT16 /*IN*/ uVolume ) PURE; /************************************************************************ @@ -858,7 +858,7 @@ DECLARE_INTERFACE_(IHXVolume, IUnknown) * Purpose: * Call this to mute the volume. */ - STDQT_METHOD(SetMute) (THIS_ + STDTQT_METHOD(SetMute) (THIS_ const HXBOOL /*IN*/ bMute ) PURE; /************************************************************************ @@ -879,7 +879,7 @@ DECLARE_INTERFACE_(IHXVolume, IUnknown) * ever IHXVolume::SetVolume() and IHXVolume::SetMute() are * called. */ - STDQT_METHOD(AddAdviseSink) (THIS_ + STDTQT_METHOD(AddAdviseSink) (THIS_ IHXVolumeAdviseSink* /*IN*/ pSink ) PURE; @@ -891,7 +891,7 @@ DECLARE_INTERFACE_(IHXVolume, IUnknown) * you are no longer interested in receiving volume or mute change * notifications. */ - STDQT_METHOD(RemoveAdviseSink) (THIS_ + STDTQT_METHOD(RemoveAdviseSink) (THIS_ IHXVolumeAdviseSink* /*IN*/ pSink ) PURE; }; @@ -926,7 +926,7 @@ DECLARE_INTERFACE_(IHXVolumeAdviseSink, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -945,7 +945,7 @@ DECLARE_INTERFACE_(IHXVolumeAdviseSink, IUnknown) * This interface is called whenever the associated IHXVolume * SetVolume() is called. */ - STDQT_METHOD(OnVolumeChange) (THIS_ + STDTQT_METHOD(OnVolumeChange) (THIS_ const UINT16 uVolume ) PURE; @@ -957,7 +957,7 @@ DECLARE_INTERFACE_(IHXVolumeAdviseSink, IUnknown) * SetMute() is called. * */ - STDQT_METHOD(OnMuteChange) (THIS_ + STDTQT_METHOD(OnMuteChange) (THIS_ const HXBOOL bMute ) PURE; }; @@ -984,7 +984,7 @@ DECLARE_INTERFACE_(IHXAudioLevelNormalization, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -995,7 +995,7 @@ DECLARE_INTERFACE_(IHXAudioLevelNormalization, IUnknown) /* * IHXAudioLevelNormalization methods */ - STDQT_METHOD(SetSoundLevelOffset) (THIS_ INT16 nOffset) PURE; + STDTQT_METHOD(SetSoundLevelOffset) (THIS_ INT16 nOffset) PURE; STDMETHOD_(INT16, GetSoundLevelOffset)(THIS) PURE; }; @@ -1026,7 +1026,7 @@ DECLARE_INTERFACE_(IHXDryNotification, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1048,7 +1048,7 @@ DECLARE_INTERFACE_(IHXDryNotification, IUnknown) * done synchronously within the call to this function. * It is OK to not write any data. Silence will be played instead. */ - STDQT_METHOD(OnDryNotification) (THIS_ + STDTQT_METHOD(OnDryNotification) (THIS_ UINT32 /*IN*/ ulCurrentStreamTime, UINT32 /*IN*/ ulMinimumDurationRequired ) PURE; @@ -1081,7 +1081,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1100,7 +1100,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager, IUnknown) * This is used to replace the default implementation of the audio * device by the given audio device interface. */ - STDQT_METHOD(Replace) (THIS_ + STDTQT_METHOD(Replace) (THIS_ IHXAudioDevice* /*IN*/ pAudioDevice) PURE; /********************************************************************** @@ -1110,7 +1110,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager, IUnknown) * This is used to remove the audio device given to the manager in * the earlier call to Replace. */ - STDQT_METHOD(Remove) (THIS_ + STDTQT_METHOD(Remove) (THIS_ IHXAudioDevice* /*IN*/ pAudioDevice) PURE; /************************************************************************ @@ -1122,7 +1122,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager, IUnknown) * is to be written to the audio device. This can be done in call * to OnInit() in IHXAudioHook. */ - STDQT_METHOD(SetFinalHook) (THIS_ + STDTQT_METHOD(SetFinalHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; @@ -1132,7 +1132,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager, IUnknown) * Purpose: * Remove final hook */ - STDQT_METHOD(RemoveFinalHook) (THIS_ + STDTQT_METHOD(RemoveFinalHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; @@ -1144,7 +1144,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager, IUnknown) * This function will fill in the pre-allocated HXAudioFormat * structure passed in. */ - STDQT_METHOD(GetAudioFormat) (THIS_ + STDTQT_METHOD(GetAudioFormat) (THIS_ HXAudioFormat* /*IN/OUT*/pAudioFormat) PURE; }; @@ -1175,7 +1175,7 @@ DECLARE_INTERFACE_(IHXAudioCrossFade, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1202,7 +1202,7 @@ DECLARE_INTERFACE_(IHXAudioCrossFade, IUnknown) * to be done * */ - STDQT_METHOD(CrossFade) (THIS_ + STDTQT_METHOD(CrossFade) (THIS_ IHXAudioStream* pStreamFrom, IHXAudioStream* pStreamTo, UINT32 ulFromCrossFadeStartTime, @@ -1236,7 +1236,7 @@ DECLARE_INTERFACE_(IHXAudioStream2, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1254,7 +1254,7 @@ DECLARE_INTERFACE_(IHXAudioStream2, IUnknown) * Use this to remove itself from the notification response object * during the stream switching. */ - STDQT_METHOD(RemoveDryNotification) (THIS_ + STDTQT_METHOD(RemoveDryNotification) (THIS_ IHXDryNotification* /*IN*/ pNotification ) PURE; @@ -1266,7 +1266,7 @@ DECLARE_INTERFACE_(IHXAudioStream2, IUnknown) * renderer. This function will fill in the pre-allocated * HXAudioFormat structure passed in. */ - STDQT_METHOD(GetAudioFormat) (THIS_ + STDTQT_METHOD(GetAudioFormat) (THIS_ HXAudioFormat* /*IN/OUT*/pAudioFormat) PURE; }; @@ -1297,7 +1297,7 @@ DECLARE_INTERFACE_(IHXAudioPushdown, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1316,7 +1316,7 @@ DECLARE_INTERFACE_(IHXAudioPushdown, IUnknown) * This is the amount of audio data that is being written * to the audio device before starting playback. */ - STDQT_METHOD(SetAudioPushdown) (THIS_ + STDTQT_METHOD(SetAudioPushdown) (THIS_ UINT32 /*IN*/ ulAudioPushdown ) PURE; }; @@ -1348,7 +1348,7 @@ DECLARE_INTERFACE_(IHXAudioHookManager, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1365,7 +1365,7 @@ DECLARE_INTERFACE_(IHXAudioHookManager, IUnknown) * Purpose: * Use this to add a hook */ - STDQT_METHOD(AddHook) (THIS_ + STDTQT_METHOD(AddHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; @@ -1375,7 +1375,7 @@ DECLARE_INTERFACE_(IHXAudioHookManager, IUnknown) * Purpose: * Use this to remove a hook */ - STDQT_METHOD(RemoveHook) (THIS_ + STDTQT_METHOD(RemoveHook) (THIS_ IHXAudioHook* /*IN*/ pHook ) PURE; }; @@ -1407,7 +1407,7 @@ DECLARE_INTERFACE_(IHXMultiPlayPauseSupport, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1447,7 +1447,7 @@ DECLARE_INTERFACE_(IHXAudioDeviceManager2, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1496,7 +1496,7 @@ DECLARE_INTERFACE_(IHXAudioResampler, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1561,7 +1561,7 @@ DECLARE_INTERFACE_(IHXAudioResamplerManager, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1573,7 +1573,7 @@ DECLARE_INTERFACE_(IHXAudioResamplerManager, IUnknown) * IHXAudioResamplerManager methods * */ - STDQT_METHOD(CreateResampler) (THIS_ + STDTQT_METHOD(CreateResampler) (THIS_ HXAudioFormat inAudioFormat, REF(HXAudioFormat) outAudioFormat, REF(IHXAudioResampler*) pResampler) PURE; @@ -1605,7 +1605,7 @@ DECLARE_INTERFACE_(IHXAudioPushdown2, IHXAudioPushdown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1621,7 +1621,7 @@ DECLARE_INTERFACE_(IHXAudioPushdown2, IHXAudioPushdown) * This is the amount of audio data that is being written * to the audio device before starting playback. */ - STDQT_METHOD(SetAudioPushdown) (THIS_ + STDTQT_METHOD(SetAudioPushdown) (THIS_ UINT32 /*IN */ ulAudioPushdown) PURE; /************************************************************************ @@ -1632,7 +1632,7 @@ DECLARE_INTERFACE_(IHXAudioPushdown2, IHXAudioPushdown) * This is the amount of audio data that is being written * to the audio device before starting playback. */ - STDQT_METHOD(GetAudioPushdown) (THIS_ + STDTQT_METHOD(GetAudioPushdown) (THIS_ REF(UINT32) /*OUT*/ ulAudioPushdown) PURE; /************************************************************************ @@ -1642,7 +1642,7 @@ DECLARE_INTERFACE_(IHXAudioPushdown2, IHXAudioPushdown) * Use this to get the audio pushed down to the audio device and haven't * been played yet */ - STDQT_METHOD(GetCurrentAudioDevicePushdown) (THIS_ + STDTQT_METHOD(GetCurrentAudioDevicePushdown) (THIS_ REF(UINT32) /*OUT*/ ulAudioPusheddown) PURE; }; @@ -1672,7 +1672,7 @@ DECLARE_INTERFACE_(IHXAudioMultiChannel, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1698,14 +1698,14 @@ DEFINE_GUID(IID_IHXTimelineWatcher, #define INTERFACE IHXTimelineWatcher DECLARE_INTERFACE_(IHXTimelineWatcher, IUnknown) { - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; - STDQT_METHOD(OnPause) (THIS) PURE; - STDQT_METHOD(OnResume) (THIS) PURE; - STDQT_METHOD(OnClose) (THIS) PURE; - STDQT_METHOD(OnTimeSync) (THIS_ UINT32 currentTime ) PURE; + STDTQT_METHOD(OnPause) (THIS) PURE; + STDTQT_METHOD(OnResume) (THIS) PURE; + STDTQT_METHOD(OnClose) (THIS) PURE; + STDTQT_METHOD(OnTimeSync) (THIS_ UINT32 currentTime ) PURE; }; // TimelineManager @@ -1716,12 +1716,12 @@ DEFINE_GUID(IID_IHXTimelineManager, #define INTERFACE IHXTimelineManager DECLARE_INTERFACE_(IHXTimelineManager, IUnknown) { - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; - STDQT_METHOD(AddTimelineWatcher) (THIS_ IHXTimelineWatcher* ) PURE; - STDQT_METHOD(RemoveTimelineWatcher) (THIS_ IHXTimelineWatcher* ) PURE; + STDTQT_METHOD(AddTimelineWatcher) (THIS_ IHXTimelineWatcher* ) PURE; + STDTQT_METHOD(RemoveTimelineWatcher) (THIS_ IHXTimelineWatcher* ) PURE; }; #endif /* #if defined(HELIX_FEATURE_TIMELINE_WATCHER) */ diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxauth.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxauth.h index aad4aed4..7b1c3712 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxauth.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxauth.h @@ -51,7 +51,7 @@ DEFINE_GUID(IID_IHXAuthenticator, 0x00001800, 0x901, 0x11d1, 0x8b, 0x6, 0x0, DECLARE_INTERFACE_(IHXAuthenticator, IUnknown) { - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -64,7 +64,7 @@ DECLARE_INTERFACE_(IHXAuthenticator, IUnknown) * object in order to pass it an IHXAuthenticatorRequest object, * usually implemented by the creator itself. */ - STDQT_METHOD(InitAuthenticator) (THIS_ + STDTQT_METHOD(InitAuthenticator) (THIS_ IHXAuthenticatorRequest* pRequest) PURE; /* * Authenticate is called by a file object (and others??) @@ -78,21 +78,21 @@ DECLARE_INTERFACE_(IHXAuthenticator, IUnknown) * part of their Init() call, and not call InitDone until they receive * a response one way or the other. */ - STDQT_METHOD(Authenticate) (THIS_ + STDTQT_METHOD(Authenticate) (THIS_ IHXValues* pValues, IHXAuthenticatorResponse* pResponse) PURE; /* GenerateAuthRequest is called by the creator of this object * when they want to send an authentication request to someone. */ - STDQT_METHOD(GenerateAuthRequest) (THIS_ + STDTQT_METHOD(GenerateAuthRequest) (THIS_ UINT32 authType, REF(IHXValues*) pValues) PURE; /* * AuthValuesReady is called by IHXAuthenticatorRequest when it * is ready to respond to a GetAuthValues request. */ - STDQT_METHOD(AuthValuesReady) (THIS_ + STDTQT_METHOD(AuthValuesReady) (THIS_ HX_RESULT result, IHXValues* pValues) PURE; }; @@ -122,7 +122,7 @@ DEFINE_GUID(IID_IHXAuthenticatorResponse, 0x00001801, 0x901, 0x11d1, 0x8b, 0x6, DECLARE_INTERFACE_(IHXAuthenticatorResponse, IUnknown) { - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -135,7 +135,7 @@ DECLARE_INTERFACE_(IHXAuthenticatorResponse, IUnknown) * then the values contain authorization information as generated by * IHXPassword. */ - STDQT_METHOD(AuthenticateDone) (THIS_ HX_RESULT result, + STDTQT_METHOD(AuthenticateDone) (THIS_ HX_RESULT result, IHXValues* pAuthResponseValues) PURE; }; @@ -164,7 +164,7 @@ DEFINE_GUID(IID_IHXAuthenticatorRequest, 0x00001802, 0x901, 0x11d1, 0x8b, 0x6, 0 DECLARE_INTERFACE_(IHXAuthenticatorRequest, IUnknown) { - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -177,7 +177,7 @@ DECLARE_INTERFACE_(IHXAuthenticatorRequest, IUnknown) * * This object should call AuthValuesReady when ready. */ - STDQT_METHOD(GetAuthValues) (THIS_ IHXValues* pOrigValues) PURE; + STDTQT_METHOD(GetAuthValues) (THIS_ IHXValues* pOrigValues) PURE; }; @@ -215,7 +215,7 @@ DECLARE_INTERFACE_(IHXPassword, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -227,11 +227,11 @@ DECLARE_INTERFACE_(IHXPassword, IUnknown) * IHXPassword methods */ - STDQT_METHOD(Crypt) (THIS_ IHXValues* pAuthentication) PURE; - STDQT_METHOD(Verify) (THIS_ IHXValues* pAuth1, IHXValues* pAuth2) PURE; + STDTQT_METHOD(Crypt) (THIS_ IHXValues* pAuthentication) PURE; + STDTQT_METHOD(Verify) (THIS_ IHXValues* pAuth1, IHXValues* pAuth2) PURE; - STDQT_METHOD(AsString) (THIS_ IHXValues* pAuth, REF(IHXBuffer*) pBuffer) PURE; - STDQT_METHOD(AsValues) (THIS_ const char* str, IHXValues* pValues) PURE; + STDTQT_METHOD(AsString) (THIS_ IHXValues* pAuth, REF(IHXBuffer*) pBuffer) PURE; + STDTQT_METHOD(AsValues) (THIS_ const char* str, IHXValues* pValues) PURE; /* * CreateBuffer is provided for the convenince of external users, @@ -239,12 +239,12 @@ DECLARE_INTERFACE_(IHXPassword, IUnknown) * just to create IHXBuffers. This method can be used instead, but * is not advisable if other means are available. */ - STDQT_METHOD(CreateBuffer) (THIS_ REF(IHXBuffer*) pBuffer) PURE; + STDTQT_METHOD(CreateBuffer) (THIS_ REF(IHXBuffer*) pBuffer) PURE; /* * Ditto for CreateValues */ - STDQT_METHOD(CreateValues) (THIS_ REF(IHXValues*) pValues) PURE; + STDTQT_METHOD(CreateValues) (THIS_ REF(IHXValues*) pValues) PURE; }; @@ -272,7 +272,7 @@ DEFINE_GUID(IID_IHXAuthenticationManager, 0x00001a00, 0x901, 0x11d1, DECLARE_INTERFACE_(IHXAuthenticationManager, IUnknown) { - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -281,7 +281,7 @@ DECLARE_INTERFACE_(IHXAuthenticationManager, IUnknown) /* HandleAuthenticationRequest is called when the core wants us to get * a username and password. */ - STDQT_METHOD(HandleAuthenticationRequest) ( + STDTQT_METHOD(HandleAuthenticationRequest) ( THIS_ IHXAuthenticationManagerResponse* pResponse) PURE; }; @@ -316,7 +316,7 @@ DEFINE_GUID(IID_IHXAuthenticationManager2, DECLARE_INTERFACE_(IHXAuthenticationManager2, IUnknown) { - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -325,7 +325,7 @@ DECLARE_INTERFACE_(IHXAuthenticationManager2, IUnknown) /* HandleAuthenticationRequest2 is called when the core wants us to get * a username and password. */ - STDQT_METHOD(HandleAuthenticationRequest2) ( + STDTQT_METHOD(HandleAuthenticationRequest2) ( THIS_ IHXAuthenticationManagerResponse* pResponse, IHXValues* pHeader) PURE; @@ -357,7 +357,7 @@ DEFINE_GUID(IID_IHXAuthenticationManagerResponse, 0x00001a01, 0x901, 0x11d1, DECLARE_INTERFACE_(IHXAuthenticationManagerResponse, IUnknown) { - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -366,7 +366,7 @@ DECLARE_INTERFACE_(IHXAuthenticationManagerResponse, IUnknown) /* HandleAuthenticationRequest is called when the core wants us to get * a username and password. */ - STDQT_METHOD(AuthenticationRequestDone) (THIS_ + STDTQT_METHOD(AuthenticationRequestDone) (THIS_ HX_RESULT result, const char* pUserName, const char* pPassword) PURE; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxccf.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxccf.h index 9b2f8f43..f924d869 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxccf.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxccf.h @@ -47,7 +47,7 @@ DECLARE_INTERFACE_(IHXCommonClassFactory, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -74,7 +74,7 @@ DECLARE_INTERFACE_(IHXCommonClassFactory, IUnknown) * not passed to this function, and you do not need to code for this * situation. */ - STDQT_METHOD(CreateInstance) (THIS_ + STDTQT_METHOD(CreateInstance) (THIS_ REFCLSID /*IN*/ rclsid, void** /*OUT*/ ppUnknown) PURE; @@ -95,7 +95,7 @@ DECLARE_INTERFACE_(IHXCommonClassFactory, IUnknown) * NOTE 2: The output interface is always the non-delegating * IUnknown. */ - STDQT_METHOD(CreateInstanceAggregatable) + STDTQT_METHOD(CreateInstanceAggregatable) (THIS_ REFCLSID /*IN*/ rclsid, REF(IUnknown*) /*OUT*/ ppUnknown, diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h index 96ddd9a2..b332bc63 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcom.h @@ -219,7 +219,7 @@ typedef unsigned int MMRESULT; #if defined(__cplusplus) && !defined(CINTERFACE) #define _INTERFACE struct -#define STDQT_METHOD(method) virtual HX_RESULT STDMETHODCALLTYPE method +#define STDTQT_METHOD(method) virtual HX_RESULT STDMETHODCALLTYPE method #define STDMETHOD_(type,method) virtual type STDMETHODCALLTYPE method #define PURE = 0 #define THIS_ @@ -250,7 +250,7 @@ typedef unsigned int MMRESULT; #define _INTERFACE struct -#define STDQT_METHOD(method) HX_RESULT (STDMETHODCALLTYPE * method) +#define STDTQT_METHOD(method) HX_RESULT (STDMETHODCALLTYPE * method) #define STDMETHOD_(type,method) type (STDMETHODCALLTYPE * method) #if !defined(BEGIN_INTERFACE) @@ -474,7 +474,7 @@ DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, DECLARE_INTERFACE(IUnknown) { - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -510,7 +510,7 @@ DECLARE_INTERFACE_(IMalloc, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -648,7 +648,7 @@ inline HXBOOL HXIsEqualGUID(REFGUID rguid1, REFGUID rguid2) * * Example Usage: * - * QInterfaceList qiList[] = + * TQInterfaceList qiList[] = * { * { GET_IIDHANDLE(IID_IUnknown), (IUnknown*) (IHXPlugin*) this}, * { GET_IIDHANDLE(IID_IHXPlugin), (IHXPlugin*) this}, @@ -662,7 +662,7 @@ inline HXBOOL HXIsEqualGUID(REFGUID rguid1, REFGUID rguid2) * { GET_IIDHANDLE(IID_IHXScheduler), m_pScheduler} * }; * - * return QIFind(qiList, QILISTSIZE(qiList), riid, ppvObj); + * return TQIFind(qiList, TQILISTSIZE(qiList), riid, ppvObj); */ #if !defined(HELIX_FEATURE_FULLGUID) @@ -682,15 +682,15 @@ typedef struct { IIDHANDLE hiid; void* pIFace; -} QInterfaceList; +} TQInterfaceList; -#define QILISTSIZE(x) sizeof(x)/sizeof(QInterfaceList) +#define TQILISTSIZE(x) sizeof(x)/sizeof(TQInterfaceList) #if !defined(INITGUID) || (defined(_STATICALLY_LINKED) && !defined(NCIHACK)) -EXTERN_C HX_RESULT QIFind(QInterfaceList* qiList, UINT32 ulqiListSize, +EXTERN_C HX_RESULT TQIFind(TQInterfaceList* qiList, UINT32 ulqiListSize, REFIID riid, void** ppvObj); #else // !INITGUID || (_STATICALLY_LINKED && NCIHACK) -EXTERN_C HX_RESULT QIFind(QInterfaceList* qiList, UINT32 ulqiListSize, +EXTERN_C HX_RESULT TQIFind(TQInterfaceList* qiList, UINT32 ulqiListSize, REFIID riid, void** ppvObj) { do diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h index b8a5b9f7..6d44bf7d 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h @@ -58,7 +58,7 @@ DECLARE_INTERFACE_(IHXStatistics, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -77,7 +77,7 @@ DECLARE_INTERFACE_(IHXStatistics, IUnknown) * Pass registry ID to the caller * */ - STDQT_METHOD(InitializeStatistics) (THIS_ + STDTQT_METHOD(InitializeStatistics) (THIS_ UINT32 /*IN*/ ulRegistryID) PURE; /************************************************************************ @@ -87,7 +87,7 @@ DECLARE_INTERFACE_(IHXStatistics, IUnknown) * Notify the client to update its statistics stored in the registry * */ - STDQT_METHOD(UpdateStatistics) (THIS) PURE; + STDTQT_METHOD(UpdateStatistics) (THIS) PURE; }; @@ -119,7 +119,7 @@ DECLARE_INTERFACE_(IHXRegistryID, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -138,7 +138,7 @@ DECLARE_INTERFACE_(IHXRegistryID, IUnknown) * Get the registry ID of the object. * */ - STDQT_METHOD(GetID) (THIS_ + STDTQT_METHOD(GetID) (THIS_ REF(UINT32) /*OUT*/ ulRegistryID) PURE; }; @@ -172,7 +172,7 @@ DECLARE_INTERFACE_(IHXServerFork, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -190,12 +190,12 @@ DECLARE_INTERFACE_(IHXServerFork, IUnknown) * Purpose: * Fork off a child process. The child process cannot use any RMA * APIs. Upon successful completion, Fork returns 0 to the child - * process and the PID of the child to the parent. A return value + * process and the PID of the child to the tqparent. A return value * of -1 indicates an error. * * Note: The child process should *NOT* Release any interfaces. * The cleanup of the IHXServerFork() interface and other - * RMA interfaces is done by the parent. + * RMA interfaces is done by the tqparent. * */ STDMETHOD_(INT32, Fork) (THIS) PURE; @@ -232,7 +232,7 @@ DECLARE_INTERFACE_(IHXServerControl, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -250,7 +250,7 @@ DECLARE_INTERFACE_(IHXServerControl, IUnknown) * Purpose: * Shutdown the server. */ - STDQT_METHOD(ShutdownServer) (THIS_ + STDTQT_METHOD(ShutdownServer) (THIS_ UINT32 status) PURE; }; @@ -282,7 +282,7 @@ DECLARE_INTERFACE_(IHXServerControl2, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -302,7 +302,7 @@ DECLARE_INTERFACE_(IHXServerControl2, IUnknown) * Completely shutdown the server, then restart. Mainly used to * cause not hot setting config var changes to take effect. */ - STDQT_METHOD(RestartServer) (THIS) PURE; + STDTQT_METHOD(RestartServer) (THIS) PURE; /************************************************************************ * IHXServerControl2::ReconfigServer @@ -312,7 +312,7 @@ DECLARE_INTERFACE_(IHXServerControl2, IUnknown) * Used to cause the server to re-read in config from file or registry * (however it was started) and attempt to use the values. */ - STDQT_METHOD(ReconfigServer) (THIS_ IHXReconfigServerResponse* pResp) PURE; + STDTQT_METHOD(ReconfigServer) (THIS_ IHXReconfigServerResponse* pResp) PURE; }; @@ -344,7 +344,7 @@ DECLARE_INTERFACE_(IHXReconfigServerResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -359,7 +359,7 @@ DECLARE_INTERFACE_(IHXReconfigServerResponse, IUnknown) * * Notification that reconfiguring the server is done. */ - STDQT_METHOD(ReconfigServerDone) (THIS_ + STDTQT_METHOD(ReconfigServerDone) (THIS_ HX_RESULT res, IHXBuffer** pInfo, UINT32 ulNumInfo) PURE; @@ -396,7 +396,7 @@ DECLARE_INTERFACE_(IHXServerReconfigNotification, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -411,7 +411,7 @@ DECLARE_INTERFACE_(IHXServerReconfigNotification, IUnknown) * * Tell the server that you want reconfig notification. */ - STDQT_METHOD(WantReconfigNotification) (THIS_ + STDTQT_METHOD(WantReconfigNotification) (THIS_ IHXWantServerReconfigNotification* pResponse) PURE; /************************************************************************ @@ -421,7 +421,7 @@ DECLARE_INTERFACE_(IHXServerReconfigNotification, IUnknown) * * Tell the server that you no longer want reconfig notification. */ - STDQT_METHOD(CancelReconfigNotification) (THIS_ + STDTQT_METHOD(CancelReconfigNotification) (THIS_ IHXWantServerReconfigNotification* pResponse) PURE; }; @@ -456,7 +456,7 @@ DECLARE_INTERFACE_(IHXWantServerReconfigNotification, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -472,7 +472,7 @@ DECLARE_INTERFACE_(IHXWantServerReconfigNotification, IUnknown) * Notify user that a server reconfig request had come in and it * is now your turn to do external (not server config) reconfiguration.* */ - STDQT_METHOD(ServerReconfig) (THIS_ + STDTQT_METHOD(ServerReconfig) (THIS_ IHXReconfigServerResponse* pResponse) PURE; }; @@ -491,7 +491,7 @@ DECLARE_INTERFACE_(IHXResolverExec, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -499,7 +499,7 @@ DECLARE_INTERFACE_(IHXResolverExec, IUnknown) STDMETHOD_(ULONG32,Release) (THIS) PURE; - STDQT_METHOD(ResolverExec) (THIS_ int readfd, int writefd) PURE; + STDTQT_METHOD(ResolverExec) (THIS_ int readfd, int writefd) PURE; }; @@ -530,7 +530,7 @@ DECLARE_INTERFACE_(IHXFastAlloc, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -606,7 +606,7 @@ DECLARE_INTERFACE_(IHXAccurateClock, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h index 872ce014..63d18324 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h @@ -148,7 +148,7 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -168,7 +168,7 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) * a part of. * */ - STDQT_METHOD(GetSource) (THIS_ + STDTQT_METHOD(GetSource) (THIS_ REF(IHXStreamSource*) pSource) PURE; /************************************************************************ @@ -219,12 +219,12 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) * a unQuality of 100. * */ - STDQT_METHOD(ReportQualityOfService) (THIS_ + STDTQT_METHOD(ReportQualityOfService) (THIS_ UINT8 unQuality) PURE; /************************************************************************ * Method: - * IHXStream::ReportRebufferStatus + * IHXStream::ReportRebuffertqStatus * Purpose: * Call this method to report to the playback context that the * available data has dropped to a critically low level, and that @@ -235,12 +235,12 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) * NOTE: The values of unNeeded and unAvailable are used to indicate * the general status of the rebuffering effort. For example, if a * renderer has "run dry" and needs 5 data packets to play smoothly - * again, it should call ReportRebufferStatus() with 5,0 then as + * again, it should call ReportRebuffertqStatus() with 5,0 then as * packet arrive it should call again with 5,1; 5,2... and eventually * 5,5. * */ - STDQT_METHOD(ReportRebufferStatus) (THIS_ + STDTQT_METHOD(ReportRebuffertqStatus) (THIS_ UINT8 unNeeded, UINT8 unAvailable) PURE; @@ -253,7 +253,7 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) * Valid to call before stream actually begins. Best to call during * IHXRenderer::OnHeader(). */ - STDQT_METHOD(SetGranularity) (THIS_ + STDTQT_METHOD(SetGranularity) (THIS_ ULONG32 ulGranularity) PURE; /************************************************************************ @@ -271,7 +271,7 @@ DECLARE_INTERFACE_(IHXStream, IUnknown) * Purpose: * Returns the Nth renderer instance supported by this stream. */ - STDQT_METHOD(GetRenderer) (THIS_ + STDTQT_METHOD(GetRenderer) (THIS_ UINT16 nIndex, REF(IUnknown*) pUnknown) PURE; }; @@ -302,20 +302,20 @@ DECLARE_INTERFACE_(IHXStream2, IHXStream) { /************************************************************************ * Method: - * IHXStream2::ReportAudioRebufferStatus + * IHXStream2::ReportAudioRebuffertqStatus * Purpose: * For audio only, when it's called, the rebuffer will only occur when * there aren't any packets in the transport and the amount of audio in * audio device falls below the minimum startup audio pushdown(1000ms * by default) * - * Non-audio renderers should still call ReportRebufferStatus(), the + * Non-audio renderers should still call ReportRebuffertqStatus(), the * rebuffer will occur when the core drains out all the packets from * the transport buffer * * The rest semantic are the same between the 2 calls. */ - STDQT_METHOD(ReportAudioRebufferStatus) (THIS_ + STDTQT_METHOD(ReportAudioRebuffertqStatus) (THIS_ UINT8 unNeeded, UINT8 unAvailable) PURE; }; @@ -347,7 +347,7 @@ DECLARE_INTERFACE_(IHXStreamSource, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -376,7 +376,7 @@ DECLARE_INTERFACE_(IHXStreamSource, IUnknown) * a part of. * */ - STDQT_METHOD(GetPlayer) (THIS_ + STDTQT_METHOD(GetPlayer) (THIS_ REF(IHXPlayer*) pPlayer) PURE; /************************************************************************ @@ -405,7 +405,7 @@ DECLARE_INTERFACE_(IHXStreamSource, IUnknown) * Purpose: * Returns the Nth stream instance supported by this source. */ - STDQT_METHOD(GetStream) (THIS_ + STDTQT_METHOD(GetStream) (THIS_ UINT16 nIndex, REF(IUnknown*) pUnknown) PURE; }; @@ -439,7 +439,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -459,7 +459,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * player is a part of. * */ - STDQT_METHOD(GetClientEngine) (THIS_ + STDTQT_METHOD(GetClientEngine) (THIS_ REF(IHXClientEngine*) pEngine) PURE; /************************************************************************ @@ -496,7 +496,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Tell the player to begin playback of all its sources. * */ - STDQT_METHOD(OpenURL) (THIS_ + STDTQT_METHOD(OpenURL) (THIS_ const char* pURL) PURE; /************************************************************************ @@ -506,7 +506,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Tell the player to begin playback of all its sources. * */ - STDQT_METHOD(Begin) (THIS) PURE; + STDTQT_METHOD(Begin) (THIS) PURE; /************************************************************************ * Method: @@ -515,7 +515,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Tell the player to stop playback of all its sources. * */ - STDQT_METHOD(Stop) (THIS) PURE; + STDTQT_METHOD(Stop) (THIS) PURE; /************************************************************************ * Method: @@ -524,7 +524,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Tell the player to pause playback of all its sources. * */ - STDQT_METHOD(Pause) (THIS) PURE; + STDTQT_METHOD(Pause) (THIS) PURE; /************************************************************************ * Method: @@ -534,7 +534,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * sources. * */ - STDQT_METHOD(Seek) (THIS_ + STDTQT_METHOD(Seek) (THIS_ ULONG32 ulTime) PURE; /************************************************************************ @@ -552,7 +552,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Purpose: * Returns the Nth source instance supported by this player. */ - STDQT_METHOD(GetSource) (THIS_ + STDTQT_METHOD(GetSource) (THIS_ UINT16 nIndex, REF(IUnknown*) pUnknown) PURE; @@ -564,7 +564,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * services to the core. This is traditionally called by the top * level client application. */ - STDQT_METHOD(SetClientContext) (THIS_ + STDTQT_METHOD(SetClientContext) (THIS_ IUnknown* pUnknown) PURE; /************************************************************************ @@ -574,7 +574,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Called to get the client context for this player. This is * set by the top level client application. */ - STDQT_METHOD(GetClientContext) (THIS_ + STDTQT_METHOD(GetClientContext) (THIS_ REF(IUnknown*) pUnknown) PURE; /************************************************************************ @@ -584,7 +584,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Call this method to add a client advise sink. * */ - STDQT_METHOD(AddAdviseSink) (THIS_ + STDTQT_METHOD(AddAdviseSink) (THIS_ IHXClientAdviseSink* pAdviseSink) PURE; /************************************************************************ @@ -593,7 +593,7 @@ DECLARE_INTERFACE_(IHXPlayer, IUnknown) * Purpose: * Call this method to remove a client advise sink. */ - STDQT_METHOD(RemoveAdviseSink) (THIS_ + STDTQT_METHOD(RemoveAdviseSink) (THIS_ IHXClientAdviseSink* pAdviseSink) PURE; }; @@ -624,7 +624,7 @@ DECLARE_INTERFACE_(IHXClientEngine, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -643,7 +643,7 @@ DECLARE_INTERFACE_(IHXClientEngine, IUnknown) * Creates a new IHXPlayer instance. * */ - STDQT_METHOD(CreatePlayer) (THIS_ + STDTQT_METHOD(CreatePlayer) (THIS_ REF(IHXPlayer*) pPlayer) PURE; /************************************************************************ @@ -653,7 +653,7 @@ DECLARE_INTERFACE_(IHXClientEngine, IUnknown) * Called by the client when it is done using the player... * */ - STDQT_METHOD(ClosePlayer) (THIS_ + STDTQT_METHOD(ClosePlayer) (THIS_ IHXPlayer* pPlayer) PURE; /************************************************************************ @@ -672,7 +672,7 @@ DECLARE_INTERFACE_(IHXClientEngine, IUnknown) * Returns the Nth IHXPlayer instances supported by this client * engine instance. */ - STDQT_METHOD(GetPlayer) (THIS_ + STDTQT_METHOD(GetPlayer) (THIS_ UINT16 nPlayerNumber, REF(IUnknown*) pUnknown) PURE; @@ -683,7 +683,7 @@ DECLARE_INTERFACE_(IHXClientEngine, IUnknown) * Clients call this to pass OS events to all players. HXxEvent * defines a cross-platform event. */ - STDQT_METHOD(EventOccurred) (THIS_ + STDTQT_METHOD(EventOccurred) (THIS_ HXxEvent* /*IN*/ pEvent) PURE; }; @@ -715,7 +715,7 @@ DECLARE_INTERFACE_(IHXClientEngineMapper, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -734,7 +734,7 @@ DECLARE_INTERFACE_(IHXClientEngineMapper, IUnknown) * Returns the IHXPlayer instance supported by this client * engine instance that contains the specified IHXSite. */ - STDQT_METHOD(GetPlayerBySite) (THIS_ + STDTQT_METHOD(GetPlayerBySite) (THIS_ IHXSite* pSite, REF(IUnknown*) pUnknown) PURE; }; @@ -752,7 +752,7 @@ DECLARE_INTERFACE_(IHXClientEngineSelector, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -802,7 +802,7 @@ DECLARE_INTERFACE_(IHXClientEngineSetup, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -822,7 +822,7 @@ DECLARE_INTERFACE_(IHXClientEngineSetup, IUnknown) * interfaces implemented by the core. Current over-ridable * interfaces are: IHXPreferences, IHXHyperNavigate */ - STDQT_METHOD(Setup) (THIS_ + STDTQT_METHOD(Setup) (THIS_ IUnknown* pContext) PURE; }; @@ -853,7 +853,7 @@ DECLARE_INTERFACE_(IHXInfoLogger, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -872,7 +872,7 @@ DECLARE_INTERFACE_(IHXInfoLogger, IUnknown) * Logs any user defined information in form of action and * associated data. */ - STDQT_METHOD(LogInformation) (THIS_ + STDTQT_METHOD(LogInformation) (THIS_ const char* /*IN*/ pAction, const char* /*IN*/ pData) PURE; }; @@ -903,7 +903,7 @@ DECLARE_INTERFACE_(IHXPersistenceManager, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -927,7 +927,7 @@ DECLARE_INTERFACE_(IHXPersistenceManager, IUnknown) * b) All the groups within the current presentation have been * played. */ - STDQT_METHOD(AddPersistentComponent) (THIS_ + STDTQT_METHOD(AddPersistentComponent) (THIS_ IUnknown* /*IN*/ pComponent) PURE; /************************************************************************ @@ -936,7 +936,7 @@ DECLARE_INTERFACE_(IHXPersistenceManager, IUnknown) * Purpose: * Remove an earlier registered persistent component. */ - STDQT_METHOD(RemovePersistentComponent) (THIS_ + STDTQT_METHOD(RemovePersistentComponent) (THIS_ IUnknown* /*IN*/ pComponent) PURE; /************************************************************************ @@ -945,7 +945,7 @@ DECLARE_INTERFACE_(IHXPersistenceManager, IUnknown) * Purpose: * Return an earlier registered persistent component. */ - STDQT_METHOD(GetPersistentComponent) (THIS_ + STDTQT_METHOD(GetPersistentComponent) (THIS_ REF(IUnknown*) /*OUT*/ pComponent) PURE; }; @@ -975,7 +975,7 @@ DECLARE_INTERFACE_(IHXDriverStreamManager, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -993,7 +993,7 @@ DECLARE_INTERFACE_(IHXDriverStreamManager, IUnknown) * Add a renderer advise sink * */ - STDQT_METHOD(AddRendererAdviseSink) (THIS_ + STDTQT_METHOD(AddRendererAdviseSink) (THIS_ IHXRendererAdviseSink* pSink) PURE; /************************************************************************ @@ -1003,7 +1003,7 @@ DECLARE_INTERFACE_(IHXDriverStreamManager, IUnknown) * Remove an advise sink * */ - STDQT_METHOD(RemoveRendererAdviseSink) (THIS_ + STDTQT_METHOD(RemoveRendererAdviseSink) (THIS_ IHXRendererAdviseSink* pSink) PURE; }; @@ -1033,7 +1033,7 @@ DECLARE_INTERFACE_(IHXRendererAdviseSink, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1045,19 +1045,19 @@ DECLARE_INTERFACE_(IHXRendererAdviseSink, IUnknown) * IHXRendererAdviseSink methods */ - STDQT_METHOD(TrackDurationSet) (THIS_ + STDTQT_METHOD(TrackDurationSet) (THIS_ UINT32 ulGroupIndex, UINT32 ulTrackIndex, UINT32 ulDuration, UINT32 ulDelay, HXBOOL bIsLive) PURE; - STDQT_METHOD(RepeatedTrackDurationSet) (THIS_ + STDTQT_METHOD(RepeatedTrackDurationSet) (THIS_ const char* pID, UINT32 ulDuration, HXBOOL bIsLive) PURE; - STDQT_METHOD(TrackUpdated) (THIS_ + STDTQT_METHOD(TrackUpdated) (THIS_ UINT32 ulGroupIndex, UINT32 ulTrackIndex, IHXValues* pValues) PURE; @@ -1069,7 +1069,7 @@ DECLARE_INTERFACE_(IHXRendererAdviseSink, IUnknown) * Notification of renderer initialization * */ - STDQT_METHOD(RendererInitialized) (THIS_ + STDTQT_METHOD(RendererInitialized) (THIS_ IHXRenderer* pRenderer, IUnknown* pStream, IHXValues* pInfo) PURE; @@ -1081,7 +1081,7 @@ DECLARE_INTERFACE_(IHXRendererAdviseSink, IUnknown) * Notification of renderer close * */ - STDQT_METHOD(RendererClosed) (THIS_ + STDTQT_METHOD(RendererClosed) (THIS_ IHXRenderer* pRenderer, IHXValues* pInfo) PURE; }; @@ -1113,7 +1113,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1129,21 +1129,21 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown) * Method: * IHXLayoutStream::GetProperty * Purpose: - * Get layout stream property + * Get tqlayout stream property * * */ - STDQT_METHOD(GetProperties) (THIS_ + STDTQT_METHOD(GetProperties) (THIS_ REF(IHXValues*) pValue) PURE; /************************************************************************ * Method: * IHXLayoutStream::SetProperty * Purpose: - * Set layout stream property + * Set tqlayout stream property * */ - STDQT_METHOD(SetProperties) (THIS_ + STDTQT_METHOD(SetProperties) (THIS_ IHXValues* pValue) PURE; }; @@ -1173,7 +1173,7 @@ DECLARE_INTERFACE_(IHXRendererUpgrade, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1203,7 +1203,7 @@ DECLARE_INTERFACE_(IHXRendererUpgrade, IUnknown) * Force an upgrade for any unloaded renderers * */ - STDQT_METHOD(ForceUpgrade) (THIS) PURE; + STDTQT_METHOD(ForceUpgrade) (THIS) PURE; }; /**************************************************************************** @@ -1232,7 +1232,7 @@ DECLARE_INTERFACE_(IHXValidator, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1263,7 +1263,7 @@ DECLARE_INTERFACE_(IHXValidator, IUnknown) * * */ - STDQT_METHOD(ValidateMetaFile) (THIS_ + STDTQT_METHOD(ValidateMetaFile) (THIS_ IHXRequest* pRequest, IHXBuffer* pContent) PURE; }; @@ -1299,7 +1299,7 @@ DECLARE_INTERFACE_(IHXPrivateStreamSource, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1344,7 +1344,7 @@ DECLARE_INTERFACE_(IHXPlayer2, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1358,7 +1358,7 @@ DECLARE_INTERFACE_(IHXPlayer2, IUnknown) * Purpose: * Call this method to set the minimum preroll of this clip */ - STDQT_METHOD(SetMinimumPreroll) (THIS_ + STDTQT_METHOD(SetMinimumPreroll) (THIS_ UINT32 ulMinPreroll) PURE; /************************************************************************ @@ -1367,7 +1367,7 @@ DECLARE_INTERFACE_(IHXPlayer2, IUnknown) * Purpose: * Call this method to get the minimum preroll of this clip */ - STDQT_METHOD(GetMinimumPreroll) (THIS_ + STDTQT_METHOD(GetMinimumPreroll) (THIS_ REF(UINT32) ulMinPreroll) PURE; /************************************************************************ @@ -1376,7 +1376,7 @@ DECLARE_INTERFACE_(IHXPlayer2, IUnknown) * Purpose: * Call this method to open the IHXRequest */ - STDQT_METHOD(OpenRequest) (THIS_ + STDTQT_METHOD(OpenRequest) (THIS_ IHXRequest* pRequest) PURE; /************************************************************************ @@ -1385,7 +1385,7 @@ DECLARE_INTERFACE_(IHXPlayer2, IUnknown) * Purpose: * Call this method to get the IHXRequest */ - STDQT_METHOD(GetRequest) (THIS_ + STDTQT_METHOD(GetRequest) (THIS_ REF(IHXRequest*) pRequest) PURE; }; @@ -1416,7 +1416,7 @@ DECLARE_INTERFACE_(IHXUpdateProperties, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1430,7 +1430,7 @@ DECLARE_INTERFACE_(IHXUpdateProperties, IUnknown) * Purpose: * Call this method to update the timestamp offset of cached packets */ - STDQT_METHOD(UpdatePacketTimeOffset) (THIS_ + STDTQT_METHOD(UpdatePacketTimeOffset) (THIS_ INT32 lTimeOffset) PURE; /************************************************************************ @@ -1439,7 +1439,7 @@ DECLARE_INTERFACE_(IHXUpdateProperties, IUnknown) * Purpose: * Call this method to update properties */ - STDQT_METHOD(UpdatePlayTimes) (THIS_ + STDTQT_METHOD(UpdatePlayTimes) (THIS_ IHXValues* pProps) PURE; }; @@ -1469,7 +1469,7 @@ DECLARE_INTERFACE_(IHXUpdateProperties2, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1483,7 +1483,7 @@ DECLARE_INTERFACE_(IHXUpdateProperties2, IUnknown) * Purpose: * Call this method to update the stream header */ - STDQT_METHOD(UpdateHeader) (THIS_ + STDTQT_METHOD(UpdateHeader) (THIS_ IHXValues* pProps) PURE; }; // $EndPrivate. @@ -1514,7 +1514,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1528,7 +1528,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown) * Purpose: * Add child player to the current player */ - STDQT_METHOD(AddChildPlayer) (THIS_ + STDTQT_METHOD(AddChildPlayer) (THIS_ IHXPlayer* pPlayer) PURE; /************************************************************************ @@ -1537,7 +1537,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown) * Purpose: * Remove child player from the current player */ - STDQT_METHOD(RemoveChildPlayer) (THIS_ + STDTQT_METHOD(RemoveChildPlayer) (THIS_ IHXPlayer* pPlayer) PURE; /************************************************************************ @@ -1554,7 +1554,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown) * Purpose: * Get Nth child player */ - STDQT_METHOD(GetChildPlayer) (THIS_ + STDTQT_METHOD(GetChildPlayer) (THIS_ UINT16 uPlayerIndex, REF(IHXPlayer*) pPlayer) PURE; @@ -1562,27 +1562,27 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown) * Method: * IHXPlayerNavigator::SetParentPlayer * Purpose: - * Set the parent player + * Set the tqparent player */ - STDQT_METHOD(SetParentPlayer) (THIS_ + STDTQT_METHOD(SetParentPlayer) (THIS_ IHXPlayer* pPlayer) PURE; /************************************************************************ * Method: * IHXPlayerNavigator::RemoveParentPlayer * Purpose: - * Remove the parent player + * Remove the tqparent player */ - STDQT_METHOD(RemoveParentPlayer) (THIS_ + STDTQT_METHOD(RemoveParentPlayer) (THIS_ IHXPlayer* pPlayer) PURE; /************************************************************************ * Method: * IHXPlayerNavigator::GetParentPlayer * Purpose: - * Get the parent player + * Get the tqparent player */ - STDQT_METHOD(GetParentPlayer) (THIS_ + STDTQT_METHOD(GetParentPlayer) (THIS_ REF(IHXPlayer*) pPlayer) PURE; }; @@ -1613,7 +1613,7 @@ DECLARE_INTERFACE_(IHXPersistentComponentManager, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1627,7 +1627,7 @@ DECLARE_INTERFACE_(IHXPersistentComponentManager, IUnknown) * Purpose: * create persistent component */ - STDQT_METHOD(CreatePersistentComponent) (THIS_ + STDTQT_METHOD(CreatePersistentComponent) (THIS_ REF(IHXPersistentComponent*) pPersistentComponent) PURE; @@ -1637,7 +1637,7 @@ DECLARE_INTERFACE_(IHXPersistentComponentManager, IUnknown) * Purpose: * add persistent component */ - STDQT_METHOD(AddPersistentComponent) (THIS_ + STDTQT_METHOD(AddPersistentComponent) (THIS_ IHXPersistentComponent* pPersistentComponent) PURE; /************************************************************************ @@ -1646,7 +1646,7 @@ DECLARE_INTERFACE_(IHXPersistentComponentManager, IUnknown) * Purpose: * remove persistent component */ - STDQT_METHOD(RemovePersistentComponent) (THIS_ + STDTQT_METHOD(RemovePersistentComponent) (THIS_ UINT32 ulPersistentComponentID) PURE; /************************************************************************ @@ -1655,7 +1655,7 @@ DECLARE_INTERFACE_(IHXPersistentComponentManager, IUnknown) * Purpose: * get persistent component information */ - STDQT_METHOD(GetPersistentComponent) (THIS_ + STDTQT_METHOD(GetPersistentComponent) (THIS_ UINT32 ulPersistentComponentID, REF(IHXPersistentComponent*) pPersistentComponent) PURE; @@ -1665,7 +1665,7 @@ DECLARE_INTERFACE_(IHXPersistentComponentManager, IUnknown) * Purpose: * get persistent component information */ - STDQT_METHOD(AttachPersistentComponentLayout) (THIS_ + STDTQT_METHOD(AttachPersistentComponentLayout) (THIS_ IUnknown* pLSG, IHXValues* pProps) PURE; }; @@ -1696,7 +1696,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1710,7 +1710,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * initialize persistent component */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ IHXPersistentRenderer* pPersistentRenderer) PURE; /************************************************************************ @@ -1719,7 +1719,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * add renderer advise sink */ - STDQT_METHOD(AddRendererAdviseSink) (THIS_ + STDTQT_METHOD(AddRendererAdviseSink) (THIS_ IHXRendererAdviseSink* pSink) PURE; /************************************************************************ @@ -1728,7 +1728,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * remove renderer advise sink */ - STDQT_METHOD(RemoveRendererAdviseSink) (THIS_ + STDTQT_METHOD(RemoveRendererAdviseSink) (THIS_ IHXRendererAdviseSink* pSink) PURE; /************************************************************************ @@ -1737,7 +1737,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * add renderer advise sink */ - STDQT_METHOD(AddGroupSink) (THIS_ + STDTQT_METHOD(AddGroupSink) (THIS_ IHXGroupSink* pSink) PURE; /************************************************************************ @@ -1746,7 +1746,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * remove renderer advise sink */ - STDQT_METHOD(RemoveGroupSink) (THIS_ + STDTQT_METHOD(RemoveGroupSink) (THIS_ IHXGroupSink* pSink) PURE; /************************************************************************ @@ -1755,7 +1755,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * get persistent renderer */ - STDQT_METHOD(GetPersistentRenderer) (THIS_ + STDTQT_METHOD(GetPersistentRenderer) (THIS_ REF(IHXPersistentRenderer*) pPersistentRenderer) PURE; /************************************************************************ @@ -1764,7 +1764,7 @@ DECLARE_INTERFACE_(IHXPersistentComponent, IUnknown) * Purpose: * get persistent component properties */ - STDQT_METHOD(GetPersistentProperties) (THIS_ + STDTQT_METHOD(GetPersistentProperties) (THIS_ REF(IHXValues*) pProperties) PURE; }; @@ -1797,7 +1797,7 @@ DECLARE_INTERFACE_(IHXClientStatisticsGranularity, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1811,7 +1811,7 @@ DECLARE_INTERFACE_(IHXClientStatisticsGranularity, IUnknown) * Purpose: * Set the granularity */ - STDQT_METHOD(SetStatsGranularity) (THIS_ ULONG32 ulGranularity) PURE; + STDTQT_METHOD(SetStatsGranularity) (THIS_ ULONG32 ulGranularity) PURE; }; // $EndPrivate. @@ -1850,7 +1850,7 @@ DECLARE_INTERFACE_(IHXSourceBufferingStats, IUnknown) * Get the current buffering information */ - STDQT_METHOD(GetCurrentBuffering) (THIS_ UINT16 uStreamNumber, + STDTQT_METHOD(GetCurrentBuffering) (THIS_ UINT16 uStreamNumber, REF(INT64) llLowestTimestamp, REF(INT64) llHighestTimestamp, REF(UINT32) ulNumBytes, @@ -1889,7 +1889,7 @@ DECLARE_INTERFACE_(IHXSourceBufferingStats2, IHXSourceBufferingStats) * Purpose: * Get the amount of buffering in the transport */ - STDQT_METHOD(GetCurrentBuffering) (THIS_ UINT16 uStreamNumber, + STDTQT_METHOD(GetCurrentBuffering) (THIS_ UINT16 uStreamNumber, REF(INT64) llLowestTimestamp, REF(INT64) llHighestTimestamp, REF(UINT32) ulNumBytes, @@ -1904,7 +1904,7 @@ DECLARE_INTERFACE_(IHXSourceBufferingStats2, IHXSourceBufferingStats) * the renderer */ - STDQT_METHOD(GetTotalBuffering) (THIS_ UINT16 uStreamNumber, + STDTQT_METHOD(GetTotalBuffering) (THIS_ UINT16 uStreamNumber, REF(INT64) llLowestTimestamp, REF(INT64) llHighestTimestamp, REF(UINT32) ulNumBytes, @@ -1942,7 +1942,7 @@ DECLARE_INTERFACE_(IHXSourceLatencyStats, IUnknown) * Purpose: * set the live sync start time */ - STDQT_METHOD(SetLiveSyncOffset) (THIS_ UINT32 ulLiveSyncStartTime) PURE; + STDTQT_METHOD(SetLiveSyncOffset) (THIS_ UINT32 ulLiveSyncStartTime) PURE; /************************************************************************ * Method: @@ -1951,7 +1951,7 @@ DECLARE_INTERFACE_(IHXSourceLatencyStats, IUnknown) * call this for each arriving packet! */ - STDQT_METHOD(NewPacketTimeStamp) (THIS_ UINT32 ulDueTimeStamp) PURE; + STDTQT_METHOD(NewPacketTimeStamp) (THIS_ UINT32 ulDueTimeStamp) PURE; /************************************************************************ * Method: @@ -1960,7 +1960,7 @@ DECLARE_INTERFACE_(IHXSourceLatencyStats, IUnknown) * call this for each arriving packet! */ - STDQT_METHOD(GetLatencyStats) (THIS_ + STDTQT_METHOD(GetLatencyStats) (THIS_ REF(UINT32) ulAverageLatency, REF(UINT32) ulMinimumLatency, REF(UINT32) ulMaximumLatency ) PURE; @@ -1973,7 +1973,7 @@ DECLARE_INTERFACE_(IHXSourceLatencyStats, IUnknown) * call this for each arriving packet! */ - STDQT_METHOD(ResetLatencyStats) (THIS_ ) PURE; + STDTQT_METHOD(ResetLatencyStats) (THIS_ ) PURE; }; @@ -2010,7 +2010,7 @@ DECLARE_INTERFACE_(IHXPlayerPresentation, IUnknown) * Call this method to close the player's current presentation. This will free * all resources associated with the current presentation. */ - STDQT_METHOD(ClosePresentation) (THIS) PURE; + STDTQT_METHOD(ClosePresentation) (THIS) PURE; }; // $EndPrivate. @@ -2047,7 +2047,7 @@ DECLARE_INTERFACE_(IHXCoreMutex, IUnknown) * Purpose: * Call this method to lock the client engine's core mutex. */ - STDQT_METHOD(LockCoreMutex) (THIS) PURE; + STDTQT_METHOD(LockCoreMutex) (THIS) PURE; /************************************************************************ * Method: @@ -2055,7 +2055,7 @@ DECLARE_INTERFACE_(IHXCoreMutex, IUnknown) * Purpose: * Call this method to unlock the client engine's core mutex. */ - STDQT_METHOD(UnlockCoreMutex) (THIS) PURE; + STDTQT_METHOD(UnlockCoreMutex) (THIS) PURE; }; @@ -2091,7 +2091,7 @@ DECLARE_INTERFACE_(IHXMacBlitMutex, IUnknown) * Purpose: * Call this method to lock the client engine's core mutex. */ - STDQT_METHOD(LockMacBlitMutex) (THIS) PURE; + STDTQT_METHOD(LockMacBlitMutex) (THIS) PURE; /************************************************************************ * Method: @@ -2099,7 +2099,7 @@ DECLARE_INTERFACE_(IHXMacBlitMutex, IUnknown) * Purpose: * Call this method to unlock the client engine's core mutex. */ - STDQT_METHOD(UnlockMacBlitMutex) (THIS) PURE; + STDTQT_METHOD(UnlockMacBlitMutex) (THIS) PURE; }; // $EndPrivate. diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h index 010a58a4..ccbcb0a2 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h @@ -104,7 +104,7 @@ DECLARE_INTERFACE_(IHXCallback, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -123,7 +123,7 @@ DECLARE_INTERFACE_(IHXCallback, IUnknown) * This is the function that will be called when a callback is * to be executed. */ - STDQT_METHOD(Func) (THIS) PURE; + STDTQT_METHOD(Func) (THIS) PURE; }; @@ -162,7 +162,7 @@ DECLARE_INTERFACE_(IHXScheduler, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -202,7 +202,7 @@ DECLARE_INTERFACE_(IHXScheduler, IUnknown) * Purpose: * Remove a callback from the scheduler. */ - STDQT_METHOD(Remove) (THIS_ + STDTQT_METHOD(Remove) (THIS_ CallbackHandle Handle) PURE; /************************************************************************ @@ -242,7 +242,7 @@ DECLARE_INTERFACE_(IHXTCPResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -260,7 +260,7 @@ DECLARE_INTERFACE_(IHXTCPResponse, IUnknown) * Purpose: * A Connect operation has been completed or an error has occurred. */ - STDQT_METHOD(ConnectDone) (THIS_ + STDTQT_METHOD(ConnectDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -270,7 +270,7 @@ DECLARE_INTERFACE_(IHXTCPResponse, IUnknown) * A Read operation has been completed or an error has occurred. * The data is returned in the IHXBuffer. */ - STDQT_METHOD(ReadDone) (THIS_ + STDTQT_METHOD(ReadDone) (THIS_ HX_RESULT status, IHXBuffer* pBuffer) PURE; @@ -281,7 +281,7 @@ DECLARE_INTERFACE_(IHXTCPResponse, IUnknown) * This is the response method for WantWrite. * If HX_RESULT is ok, then the TCP channel is ok to Write to. */ - STDQT_METHOD(WriteReady) (THIS_ + STDTQT_METHOD(WriteReady) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -291,7 +291,7 @@ DECLARE_INTERFACE_(IHXTCPResponse, IUnknown) * This method is called to inform you that the TCP channel has * been closed by the peer or closed due to error. */ - STDQT_METHOD(Closed) (THIS_ + STDTQT_METHOD(Closed) (THIS_ HX_RESULT status) PURE; }; @@ -322,7 +322,7 @@ DECLARE_INTERFACE_(IHXTCPSocket, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -337,27 +337,27 @@ DECLARE_INTERFACE_(IHXTCPSocket, IUnknown) * */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ IHXTCPResponse* /*IN*/ pTCPResponse) PURE; - STDQT_METHOD(SetResponse) (THIS_ + STDTQT_METHOD(SetResponse) (THIS_ IHXTCPResponse* pTCPResponse) PURE; - STDQT_METHOD(Bind) (THIS_ + STDTQT_METHOD(Bind) (THIS_ UINT32 ulLocalAddr, UINT16 nPort) PURE; /* * pDestination is a string containing host name or dotted-ip notation */ - STDQT_METHOD(Connect) (THIS_ + STDTQT_METHOD(Connect) (THIS_ const char* pDestination, UINT16 nPort) PURE; - STDQT_METHOD(Read) (THIS_ + STDTQT_METHOD(Read) (THIS_ UINT16 Size) PURE; - STDQT_METHOD(Write) (THIS_ + STDTQT_METHOD(Write) (THIS_ IHXBuffer* pBuffer) PURE; /************************************************************************ @@ -371,7 +371,7 @@ DECLARE_INTERFACE_(IHXTCPSocket, IUnknown) * written to, the response interfaces WriteReady method will be * called. */ - STDQT_METHOD(WantWrite) (THIS) PURE; + STDTQT_METHOD(WantWrite) (THIS) PURE; /************************************************************************ * Method: @@ -380,10 +380,10 @@ DECLARE_INTERFACE_(IHXTCPSocket, IUnknown) * Returns the address of the other end of the TCP socket as a * ULONG32 in local host order */ - STDQT_METHOD(GetForeignAddress) (THIS_ + STDTQT_METHOD(GetForeignAddress) (THIS_ REF(ULONG32) lAddress) PURE; - STDQT_METHOD(GetLocalAddress) (THIS_ + STDTQT_METHOD(GetLocalAddress) (THIS_ REF(ULONG32) lAddress) PURE; /************************************************************************ @@ -393,10 +393,10 @@ DECLARE_INTERFACE_(IHXTCPSocket, IUnknown) * Returns the port of the other end of the TCP socket in local * host order. */ - STDQT_METHOD(GetForeignPort) (THIS_ + STDTQT_METHOD(GetForeignPort) (THIS_ REF(UINT16) port) PURE; - STDQT_METHOD(GetLocalPort) (THIS_ + STDTQT_METHOD(GetLocalPort) (THIS_ REF(UINT16) port) PURE; }; @@ -425,7 +425,7 @@ DECLARE_INTERFACE_(IHXTCPSecureSocket, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -436,7 +436,7 @@ DECLARE_INTERFACE_(IHXTCPSecureSocket, IUnknown) /* * IHXTCPSecureSocket method */ - STDQT_METHOD(SetSecure) (THIS_ + STDTQT_METHOD(SetSecure) (THIS_ HXBOOL bSecure) PURE; }; // $EndPrivate. @@ -464,7 +464,7 @@ DECLARE_INTERFACE_(IHXSSL, IUnknown) * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -476,11 +476,11 @@ DECLARE_INTERFACE_(IHXSSL, IUnknown) * */ - STDQT_METHOD(Initialize) (THIS) PURE; + STDTQT_METHOD(Initialize) (THIS) PURE; - STDQT_METHOD(Shutdown) (THIS) PURE; + STDTQT_METHOD(Shutdown) (THIS) PURE; - STDQT_METHOD(PostConnect) (THIS_ + STDTQT_METHOD(PostConnect) (THIS_ LONG32 nSocketNumber) PURE; STDMETHOD_(LONG32, Read) (THIS_ @@ -493,10 +493,10 @@ DECLARE_INTERFACE_(IHXSSL, IUnknown) void* buff, LONG32 buffLen) PURE; - STDQT_METHOD(Close) (THIS_ + STDTQT_METHOD(Close) (THIS_ LONG32 nSocketNumber) PURE; - STDQT_METHOD(SetCallbacks) (THIS_ + STDTQT_METHOD(SetCallbacks) (THIS_ void* readCallback, void* writeCallback, void* closeCallback) PURE; @@ -537,7 +537,7 @@ DECLARE_INTERFACE_(IHXBufferedSocket, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -549,12 +549,12 @@ DECLARE_INTERFACE_(IHXBufferedSocket, IUnknown) * IHXTCPSocket methods */ - STDQT_METHOD(BufferedWrite) (THIS_ + STDTQT_METHOD(BufferedWrite) (THIS_ IHXBuffer* pBuffer) PURE; - STDQT_METHOD(FlushWrite) (THIS) PURE; + STDTQT_METHOD(FlushWrite) (THIS) PURE; - STDQT_METHOD(SetDesiredPacketSize) (THIS_ + STDTQT_METHOD(SetDesiredPacketSize) (THIS_ UINT32 ulPacketSize) PURE; }; @@ -588,7 +588,7 @@ DECLARE_INTERFACE_(IHXListenResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -600,7 +600,7 @@ DECLARE_INTERFACE_(IHXListenResponse, IUnknown) * IHXListenResponse methods */ - STDQT_METHOD(NewConnection) (THIS_ + STDTQT_METHOD(NewConnection) (THIS_ HX_RESULT status, IHXTCPSocket* pTCPSocket) PURE; }; @@ -632,7 +632,7 @@ DECLARE_INTERFACE_(IHXListenSocket, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -644,7 +644,7 @@ DECLARE_INTERFACE_(IHXListenSocket, IUnknown) * IHXListenSocket methods */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ UINT32 ulLocalAddr, UINT16 port, IHXListenResponse* /*IN*/ pListenResponse @@ -679,7 +679,7 @@ DECLARE_INTERFACE_(IHXNetworkServices, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -697,7 +697,7 @@ DECLARE_INTERFACE_(IHXNetworkServices, IUnknown) * Purpose: * Create a new TCP socket. */ - STDQT_METHOD(CreateTCPSocket) (THIS_ + STDTQT_METHOD(CreateTCPSocket) (THIS_ IHXTCPSocket** /*OUT*/ ppTCPSocket) PURE; /************************************************************************ @@ -706,7 +706,7 @@ DECLARE_INTERFACE_(IHXNetworkServices, IUnknown) * Purpose: * Create a new UDP socket. */ - STDQT_METHOD(CreateUDPSocket) (THIS_ + STDTQT_METHOD(CreateUDPSocket) (THIS_ IHXUDPSocket** /*OUT*/ ppUDPSocket) PURE; /************************************************************************ @@ -716,7 +716,7 @@ DECLARE_INTERFACE_(IHXNetworkServices, IUnknown) * Create a new TCP socket that will listen for connections on a * particular port. */ - STDQT_METHOD(CreateListenSocket) (THIS_ + STDTQT_METHOD(CreateListenSocket) (THIS_ IHXListenSocket** /*OUT*/ ppListenSocket ) PURE; @@ -726,7 +726,7 @@ DECLARE_INTERFACE_(IHXNetworkServices, IUnknown) * Purpose: * Create a new resolver that can lookup host names */ - STDQT_METHOD(CreateResolver) (THIS_ + STDTQT_METHOD(CreateResolver) (THIS_ IHXResolver** /*OUT*/ ppResolver) PURE; }; @@ -762,7 +762,7 @@ DECLARE_INTERFACE_(IHXNetworkServices2, IHXNetworkServices) * Purpose: * Create a new local bound TCP socket. */ - STDQT_METHOD(CreateLBoundTCPSocket) (THIS_ + STDTQT_METHOD(CreateLBoundTCPSocket) (THIS_ IHXTCPSocket** /*OUT*/ ppTCPSocket) PURE; }; @@ -795,7 +795,7 @@ DECLARE_INTERFACE_(IHXUDPResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -807,7 +807,7 @@ DECLARE_INTERFACE_(IHXUDPResponse, IUnknown) * IHXUDPResponse methods */ - STDQT_METHOD(ReadDone) (THIS_ + STDTQT_METHOD(ReadDone) (THIS_ HX_RESULT status, IHXBuffer* pBuffer, ULONG32 ulAddr, @@ -841,7 +841,7 @@ DECLARE_INTERFACE_(IHXUDPSocket, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -855,34 +855,34 @@ DECLARE_INTERFACE_(IHXUDPSocket, IUnknown) * Network addresses and ports are in native byte order */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ ULONG32 ulAddr, UINT16 nPort, IHXUDPResponse* pUDPResponse) PURE; - STDQT_METHOD(Bind) (THIS_ + STDTQT_METHOD(Bind) (THIS_ UINT32 ulLocalAddr, UINT16 nPort) PURE; - STDQT_METHOD(Read) (THIS_ + STDTQT_METHOD(Read) (THIS_ UINT16 Size) PURE; - STDQT_METHOD(Write) (THIS_ + STDTQT_METHOD(Write) (THIS_ IHXBuffer* pBuffer) PURE; - STDQT_METHOD(WriteTo) (THIS_ + STDTQT_METHOD(WriteTo) (THIS_ ULONG32 ulAddr, UINT16 nPort, IHXBuffer* pBuffer) PURE; - STDQT_METHOD(GetLocalPort) (THIS_ + STDTQT_METHOD(GetLocalPort) (THIS_ REF(UINT16) port) PURE; - STDQT_METHOD(JoinMulticastGroup) (THIS_ + STDTQT_METHOD(JoinMulticastGroup) (THIS_ ULONG32 ulMulticastAddr, ULONG32 ulInterfaceAddr) PURE; - STDQT_METHOD(LeaveMulticastGroup) (THIS_ + STDTQT_METHOD(LeaveMulticastGroup) (THIS_ ULONG32 ulMulticastAddr, ULONG32 ulInterfaceAddr) PURE; }; @@ -914,7 +914,7 @@ DECLARE_INTERFACE_(IHXResolver, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -926,10 +926,10 @@ DECLARE_INTERFACE_(IHXResolver, IUnknown) * IHXResolver methods */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ IHXResolverResponse* pResponse) PURE; - STDQT_METHOD(GetHostByName) (THIS_ + STDTQT_METHOD(GetHostByName) (THIS_ const char* pHostName) PURE; }; @@ -961,7 +961,7 @@ DECLARE_INTERFACE_(IHXResolverResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -973,7 +973,7 @@ DECLARE_INTERFACE_(IHXResolverResponse, IUnknown) * IHXResolverResponse methods */ - STDQT_METHOD(GetHostByNameDone) (THIS_ + STDTQT_METHOD(GetHostByNameDone) (THIS_ HX_RESULT status, ULONG32 ulAddr) PURE; }; @@ -1010,7 +1010,7 @@ DECLARE_INTERFACE_(IHXInterruptSafe, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1063,7 +1063,7 @@ DECLARE_INTERFACE_(IHXAsyncIOSelection, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1084,7 +1084,7 @@ DECLARE_INTERFACE_(IHXAsyncIOSelection, IUnknown) * exception. This function is only available on Unix, and is * intended to replace the functionality of select(). */ - STDQT_METHOD(Add) (THIS_ + STDTQT_METHOD(Add) (THIS_ IHXCallback* pCallback, INT32 lFileDescriptor, UINT32 ulType) PURE; @@ -1098,7 +1098,7 @@ DECLARE_INTERFACE_(IHXAsyncIOSelection, IUnknown) * This function is only available on Unix, and is intended to * replace the functionality of select(). */ - STDQT_METHOD(Remove) (THIS_ + STDTQT_METHOD(Remove) (THIS_ INT32 lFileDescriptor, UINT32 ulType) PURE; }; @@ -1131,7 +1131,7 @@ DECLARE_INTERFACE_(IHXUDPMulticastInit, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1153,7 +1153,7 @@ DECLARE_INTERFACE_(IHXUDPMulticastInit, IUnknown) * the number of routers specified in the ulTTL parameter. */ - STDQT_METHOD(InitMulticast) (THIS_ + STDTQT_METHOD(InitMulticast) (THIS_ UINT8 chTTL) PURE; }; @@ -1187,7 +1187,7 @@ DECLARE_INTERFACE_(IHXInterruptState, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1214,7 +1214,7 @@ DECLARE_INTERFACE_(IHXInterruptState, IUnknown) * Purpose: * This function is called when starting a deferred/interrupt task */ - STDQT_METHOD(EnterInterruptState) (THIS) PURE; + STDTQT_METHOD(EnterInterruptState) (THIS) PURE; /************************************************************************ * Method: @@ -1222,7 +1222,7 @@ DECLARE_INTERFACE_(IHXInterruptState, IUnknown) * Purpose: * This function is called when leaving a deferred/interrupt task */ - STDQT_METHOD(LeaveInterruptState) (THIS) PURE; + STDTQT_METHOD(LeaveInterruptState) (THIS) PURE; /************************************************************************ * Method: @@ -1231,7 +1231,7 @@ DECLARE_INTERFACE_(IHXInterruptState, IUnknown) * This function can be called to enable/disable interrupt time * processsing */ - STDQT_METHOD(EnableInterrupt) (THIS_ + STDTQT_METHOD(EnableInterrupt) (THIS_ HXBOOL bEnable) PURE; /************************************************************************ @@ -1277,7 +1277,7 @@ DECLARE_INTERFACE_(IHXOptimizedScheduler, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1317,7 +1317,7 @@ DECLARE_INTERFACE_(IHXOptimizedScheduler, IUnknown) * Purpose: * Remove a callback from the scheduler. */ - STDQT_METHOD(Remove) (THIS_ + STDTQT_METHOD(Remove) (THIS_ CallbackHandle Handle) PURE; /************************************************************************ @@ -1357,7 +1357,7 @@ DECLARE_INTERFACE_(IHXThreadSafeScheduler, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1398,7 +1398,7 @@ DECLARE_INTERFACE_(IHXThreadSafeScheduler, IUnknown) * Purpose: * Remove a callback from the scheduler. */ - STDQT_METHOD(Remove) (THIS_ + STDTQT_METHOD(Remove) (THIS_ CallbackHandle Handle) PURE; }; @@ -1428,7 +1428,7 @@ DECLARE_INTERFACE_(IHXProcessEntryPoint, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1436,7 +1436,7 @@ DECLARE_INTERFACE_(IHXProcessEntryPoint, IUnknown) STDMETHOD_(ULONG32,Release) (THIS) PURE; - STDQT_METHOD(Func) (THIS_ + STDTQT_METHOD(Func) (THIS_ IUnknown* pContext) PURE; }; @@ -1467,7 +1467,7 @@ DECLARE_INTERFACE_(IHXProcess, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1475,7 +1475,7 @@ DECLARE_INTERFACE_(IHXProcess, IUnknown) STDMETHOD_(ULONG32,Release) (THIS) PURE; - STDQT_METHOD(Start) (THIS_ + STDTQT_METHOD(Start) (THIS_ const char* pProcessName, IHXProcessEntryPoint* pEntryPoint) PURE; }; @@ -1511,7 +1511,7 @@ DECLARE_INTERFACE_(IHXLoadBalancedListen, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1534,7 +1534,7 @@ DECLARE_INTERFACE_(IHXLoadBalancedListen, IUnknown) * two completely different plugins to listen on the same port using * the load balanced listener. */ - STDQT_METHOD(SetID) (THIS_ + STDTQT_METHOD(SetID) (THIS_ REFIID ID) PURE; /************************************************************************ @@ -1545,7 +1545,7 @@ DECLARE_INTERFACE_(IHXLoadBalancedListen, IUnknown) * than reserve limit descriptors / sockets are left then a new * instance of the plugin will be created. */ - STDQT_METHOD(SetReserveLimit) (THIS_ + STDTQT_METHOD(SetReserveLimit) (THIS_ UINT32 ulDescriptors, UINT32 ulSockets) PURE; }; @@ -1565,7 +1565,7 @@ DECLARE_INTERFACE_(IHXLoadBalancedListen, IUnknown) * You may currently override IHXNetworkServices using this interface * You can use the same interface to later restore back the overridden services. * This is done by calling the same OverrideServices() function with the - * original service QIed before the initial override. + * original service TQIed before the initial override. * * IID_IHXOverrideDefaultServices: * @@ -1583,7 +1583,7 @@ DECLARE_INTERFACE_(IHXOverrideDefaultServices, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1602,7 +1602,7 @@ DECLARE_INTERFACE_(IHXOverrideDefaultServices, IUnknown) * Override default services provided by the G2 system. * */ - STDQT_METHOD(OverrideServices) (THIS_ + STDTQT_METHOD(OverrideServices) (THIS_ IUnknown* pContext) PURE; }; @@ -1642,7 +1642,7 @@ DECLARE_INTERFACE_(IHXSetSocketOption, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1654,7 +1654,7 @@ DECLARE_INTERFACE_(IHXSetSocketOption, IUnknown) * IHXListenSocket methods */ - STDQT_METHOD(SetOption) (THIS_ + STDTQT_METHOD(SetOption) (THIS_ HX_SOCKET_OPTION option, UINT32 ulValue) PURE; }; @@ -1786,7 +1786,7 @@ DECLARE_INTERFACE_(IHXThreadSafeMethods, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1840,7 +1840,7 @@ DECLARE_INTERFACE_(IHXMutex, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1853,11 +1853,11 @@ DECLARE_INTERFACE_(IHXMutex, IUnknown) */ /* XXXSMPNOW Comments */ - STDQT_METHOD(Lock) (THIS) PURE; + STDTQT_METHOD(Lock) (THIS) PURE; - STDQT_METHOD(TryLock) (THIS) PURE; + STDTQT_METHOD(TryLock) (THIS) PURE; - STDQT_METHOD(Unlock) (THIS) PURE; + STDTQT_METHOD(Unlock) (THIS) PURE; }; // $Private: @@ -1887,7 +1887,7 @@ DECLARE_INTERFACE_(IHXFastPathNetWrite, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1900,7 +1900,7 @@ DECLARE_INTERFACE_(IHXFastPathNetWrite, IUnknown) * */ - STDQT_METHOD(FastWrite) (THIS_ + STDTQT_METHOD(FastWrite) (THIS_ const UINT8* pBuffer, UINT32 ulLen) PURE; }; @@ -1929,7 +1929,7 @@ DECLARE_INTERFACE_(IHXWouldBlockResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1950,8 +1950,8 @@ DECLARE_INTERFACE_(IHXWouldBlockResponse, IUnknown) * WouldBlockCleared call. HXR_anythingelse to ignore. */ - STDQT_METHOD(WouldBlock) (THIS_ UINT32 id) PURE; - STDQT_METHOD(WouldBlockCleared)(THIS_ UINT32 id) PURE; + STDTQT_METHOD(WouldBlock) (THIS_ UINT32 id) PURE; + STDTQT_METHOD(WouldBlockCleared)(THIS_ UINT32 id) PURE; }; @@ -1981,7 +1981,7 @@ DECLARE_INTERFACE_(IHXWouldBlock, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1994,7 +1994,7 @@ DECLARE_INTERFACE_(IHXWouldBlock, IUnknown) * */ - STDQT_METHOD(WantWouldBlock) (THIS_ + STDTQT_METHOD(WantWouldBlock) (THIS_ IHXWouldBlockResponse*, UINT32 id) PURE; }; @@ -2026,7 +2026,7 @@ DECLARE_INTERFACE_(IHXSharedUDPServices, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2037,11 +2037,11 @@ DECLARE_INTERFACE_(IHXSharedUDPServices, IUnknown) /* * IHXSharedUDPServices methods */ - STDQT_METHOD(RegisterSharedResponse) (THIS_ + STDTQT_METHOD(RegisterSharedResponse) (THIS_ IHXUDPResponse* response, UINT16 sPortEnum) PURE; - STDQT_METHOD(UnregisterSharedResponse) (THIS) PURE; + STDTQT_METHOD(UnregisterSharedResponse) (THIS) PURE; STDMETHOD_(UINT16, GetSharedPort) (THIS) PURE; @@ -2075,7 +2075,7 @@ DECLARE_INTERFACE_(IHXThreadLocal, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2130,7 +2130,7 @@ DECLARE_INTERFACE_(IHXMemoryServices, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2161,7 +2161,7 @@ DECLARE_INTERFACE_(IHXMemoryServices, IUnknown) * 0x00000002 do rudimentary checks on internal SharedMemory data arrays. * */ - STDQT_METHOD(ValidateMemory) (THIS_ + STDTQT_METHOD(ValidateMemory) (THIS_ INT32 lStartPage, INT32 lPages, UINT32 ulFlags) PURE; @@ -2198,7 +2198,7 @@ DECLARE_INTERFACE_(IHXSetPrivateSocketOption, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2210,7 +2210,7 @@ DECLARE_INTERFACE_(IHXSetPrivateSocketOption, IUnknown) * IHXSetPrivateSocketOption methods */ - STDQT_METHOD(SetOption) (THIS_ + STDTQT_METHOD(SetOption) (THIS_ HX_PRIVATE_SOCKET_OPTION option, UINT32 ulValue) PURE; }; @@ -2252,7 +2252,7 @@ typedef enum NI_OPER_STATUS_CONNECTING, NI_OPER_STATUS_CONNECTED, NI_OPER_STATUS_OPERATIONAL -} NIStatus; +} NItqStatus; typedef enum { @@ -2290,7 +2290,7 @@ struct NIInfo { NIType type; IHXBuffer* pDescription; - NIStatus status; + NItqStatus status; UINT32 ulIPv4Index; UINT32 ulIPv6Index; UINT32 ulMTU; @@ -2331,7 +2331,7 @@ DECLARE_INTERFACE_(IHXNetInterfaces, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2342,18 +2342,18 @@ DECLARE_INTERFACE_(IHXNetInterfaces, IUnknown) /* * IHXNetworkInterfaces methods */ - STDQT_METHOD(UpdateNetInterfaces) (THIS) PURE; + STDTQT_METHOD(UpdateNetInterfaces) (THIS) PURE; STDMETHOD_(UINT32, GetNumOfNetInterfaces) (THIS) PURE; - STDQT_METHOD(GetNetInterfaces) (THIS_ + STDTQT_METHOD(GetNetInterfaces) (THIS_ UINT16 lIndex, REF(NIInfo*) pNIInfo) PURE; - STDQT_METHOD(AddAdviseSink) (THIS_ + STDTQT_METHOD(AddAdviseSink) (THIS_ IHXNetInterfacesAdviseSink* pSink) PURE; - STDQT_METHOD(RemoveAdviseSink) (THIS_ + STDTQT_METHOD(RemoveAdviseSink) (THIS_ IHXNetInterfacesAdviseSink* pSink) PURE; }; @@ -2382,7 +2382,7 @@ DECLARE_INTERFACE_(IHXNetInterfacesAdviseSink, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2393,7 +2393,7 @@ DECLARE_INTERFACE_(IHXNetInterfacesAdviseSink, IUnknown) /* * IHXNetInterfacesAdviseSink methods */ - STDQT_METHOD(NetInterfacesUpdated) (THIS) PURE; + STDTQT_METHOD(NetInterfacesUpdated) (THIS) PURE; }; // $EndPrivate. @@ -2424,7 +2424,7 @@ DECLARE_INTERFACE_(IHXNetworkInterfaceEnumerator, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -2440,7 +2440,7 @@ DECLARE_INTERFACE_(IHXNetworkInterfaceEnumerator, IUnknown) * If a buffer passed in is too small, it will return * HXR_BUFFERTOOSMALL with ulNumInterfaces updated. */ - STDQT_METHOD(EnumerateInterfaces) (THIS_ + STDTQT_METHOD(EnumerateInterfaces) (THIS_ REF(UINT32*) pulInterfaces, REF(UINT32) ulNumInterfaces) PURE; }; @@ -2470,7 +2470,7 @@ DECLARE_INTERFACE_(IHXUDPConnectedSocket, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -2486,7 +2486,7 @@ DECLARE_INTERFACE_(IHXUDPConnectedSocket, IUnknown) * Connect to the foreign addr and port the socket already knows * about; this is implementation-dependent. */ - STDQT_METHOD(UDPConnect) (THIS) PURE; + STDTQT_METHOD(UDPConnect) (THIS) PURE; /************************************************************************ * Method: @@ -2496,7 +2496,7 @@ DECLARE_INTERFACE_(IHXUDPConnectedSocket, IUnknown) * Usage: * Specify the host-ordered foreign addr and port to connect to. */ - STDQT_METHOD(UDPConnect) (THIS_ ULONG32 ulAddr, UINT16 nPort) PURE; + STDTQT_METHOD(UDPConnect) (THIS_ ULONG32 ulAddr, UINT16 nPort) PURE; /************************************************************************ * Method: @@ -2504,7 +2504,7 @@ DECLARE_INTERFACE_(IHXUDPConnectedSocket, IUnknown) * Purpose: * Disconnect the udp socket */ - STDQT_METHOD(UDPDisconnect) (THIS) PURE; + STDTQT_METHOD(UDPDisconnect) (THIS) PURE; /************************************************************************ * Method: @@ -2555,7 +2555,7 @@ DECLARE_INTERFACE_(IHXAutoBWDetection, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2566,11 +2566,11 @@ DECLARE_INTERFACE_(IHXAutoBWDetection, IUnknown) /* * IHXAutoBWDetection methods */ - STDQT_METHOD(InitAutoBWDetection) (THIS_ + STDTQT_METHOD(InitAutoBWDetection) (THIS_ HXBOOL bEnabled) PURE; - STDQT_METHOD(AddAutoBWDetectionSink) (THIS_ + STDTQT_METHOD(AddAutoBWDetectionSink) (THIS_ IHXAutoBWDetectionAdviseSink* pSink) PURE; - STDQT_METHOD(RemoveAutoBWDetectionSink) (THIS_ + STDTQT_METHOD(RemoveAutoBWDetectionSink) (THIS_ IHXAutoBWDetectionAdviseSink* pSink) PURE; }; @@ -2599,7 +2599,7 @@ DECLARE_INTERFACE_(IHXAutoBWDetectionAdviseSink, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2610,7 +2610,7 @@ DECLARE_INTERFACE_(IHXAutoBWDetectionAdviseSink, IUnknown) /* * IHXAutoBWDetectionAdviseSink methods */ - STDQT_METHOD(AutoBWDetectionDone) (THIS_ + STDTQT_METHOD(AutoBWDetectionDone) (THIS_ HX_RESULT status, UINT32 ulBW) PURE; }; @@ -2641,7 +2641,7 @@ DECLARE_INTERFACE_(IHXAutoBWCalibration, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2652,13 +2652,13 @@ DECLARE_INTERFACE_(IHXAutoBWCalibration, IUnknown) /* * IHXAutoBWCalibration methods */ - STDQT_METHOD(InitAutoBWCalibration) (THIS_ + STDTQT_METHOD(InitAutoBWCalibration) (THIS_ IHXValues* pValues) PURE; - STDQT_METHOD(StartAutoBWCalibration) (THIS) PURE; - STDQT_METHOD(StopAutoBWCalibration) (THIS) PURE; - STDQT_METHOD(AddAutoBWCalibrationSink) (THIS_ + STDTQT_METHOD(StartAutoBWCalibration) (THIS) PURE; + STDTQT_METHOD(StopAutoBWCalibration) (THIS) PURE; + STDTQT_METHOD(AddAutoBWCalibrationSink) (THIS_ IHXAutoBWCalibrationAdviseSink* pSink) PURE; - STDQT_METHOD(RemoveAutoBWCalibrationSink) (THIS_ + STDTQT_METHOD(RemoveAutoBWCalibrationSink) (THIS_ IHXAutoBWCalibrationAdviseSink* pSink) PURE; }; @@ -2687,7 +2687,7 @@ DECLARE_INTERFACE_(IHXAutoBWCalibrationAdviseSink, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2698,9 +2698,9 @@ DECLARE_INTERFACE_(IHXAutoBWCalibrationAdviseSink, IUnknown) /* * IHXAutoBWCalibrationAdviseSink methods */ - STDQT_METHOD(AutoBWCalibrationStarted) (THIS_ + STDTQT_METHOD(AutoBWCalibrationStarted) (THIS_ const char* pszServer) PURE; - STDQT_METHOD(AutoBWCalibrationDone) (THIS_ + STDTQT_METHOD(AutoBWCalibrationDone) (THIS_ HX_RESULT status, UINT32 ulBW) PURE; }; @@ -2729,7 +2729,7 @@ DECLARE_INTERFACE_(IHXConnectionBWAdviseSink, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2740,7 +2740,7 @@ DECLARE_INTERFACE_(IHXConnectionBWAdviseSink, IUnknown) /* * IHXConnectionBWAdviseSink methods */ - STDQT_METHOD(NewConnectionBW)(THIS_ UINT32 uConnectionBW) PURE; + STDTQT_METHOD(NewConnectionBW)(THIS_ UINT32 uConnectionBW) PURE; }; @@ -2769,7 +2769,7 @@ DECLARE_INTERFACE_(IHXConnectionBWInfo, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2780,9 +2780,9 @@ DECLARE_INTERFACE_(IHXConnectionBWInfo, IUnknown) /* * IHXConnectionBWInfo methods */ - STDQT_METHOD(AddABDInfo)(THIS_ IHXAutoBWDetection* pABD, + STDTQT_METHOD(AddABDInfo)(THIS_ IHXAutoBWDetection* pABD, IHXPreferredTransport* pPrefTransport) PURE; - STDQT_METHOD(RemoveABDInfo)(THIS_ IHXAutoBWDetection* pABD) PURE; + STDTQT_METHOD(RemoveABDInfo)(THIS_ IHXAutoBWDetection* pABD) PURE; /* * IHXConnectionBWInfo::GetConnectionBW() @@ -2803,10 +2803,10 @@ DECLARE_INTERFACE_(IHXConnectionBWInfo, IUnknown) * HXR_FAILED : No connection BW is available at this time * */ - STDQT_METHOD(GetConnectionBW)(THIS_ REF(UINT32) uBw, HXBOOL bDetectedBWOnly) PURE; + STDTQT_METHOD(GetConnectionBW)(THIS_ REF(UINT32) uBw, HXBOOL bDetectedBWOnly) PURE; - STDQT_METHOD(AddSink)(THIS_ IHXConnectionBWAdviseSink* pSink) PURE; - STDQT_METHOD(RemoveSink)(THIS_ IHXConnectionBWAdviseSink* pSink) PURE; + STDTQT_METHOD(AddSink)(THIS_ IHXConnectionBWAdviseSink* pSink) PURE; + STDTQT_METHOD(RemoveSink)(THIS_ IHXConnectionBWAdviseSink* pSink) PURE; }; #endif /* _HXENGIN_H_ */ diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxerror.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxerror.h index b01ad60d..7fd1e1f9 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxerror.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxerror.h @@ -72,7 +72,7 @@ DECLARE_INTERFACE_(IHXErrorMessages, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -118,7 +118,7 @@ DECLARE_INTERFACE_(IHXErrorMessages, IUnknown) * User specific more info URL string. * */ - STDQT_METHOD(Report) (THIS_ + STDTQT_METHOD(Report) (THIS_ const UINT8 unSeverity, HX_RESULT ulHXCode, const ULONG32 ulUserCode, @@ -166,7 +166,7 @@ DECLARE_INTERFACE_(IHXErrorSink, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -189,7 +189,7 @@ DECLARE_INTERFACE_(IHXErrorSink, IUnknown) * The meaning of the arguments is exactly as described in * hxerror.h */ - STDQT_METHOD(ErrorOccurred) (THIS_ + STDTQT_METHOD(ErrorOccurred) (THIS_ const UINT8 unSeverity, const ULONG32 ulHXCode, const ULONG32 ulUserCode, @@ -226,7 +226,7 @@ DECLARE_INTERFACE_(IHXErrorSinkControl, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -253,7 +253,7 @@ DECLARE_INTERFACE_(IHXErrorSinkControl, IUnknown) * * The default severity range is HXLOG_EMERG to HXLOG_INFO (0-6). */ - STDQT_METHOD(AddErrorSink) (THIS_ + STDTQT_METHOD(AddErrorSink) (THIS_ IHXErrorSink* pErrorSink, const UINT8 unLowSeverity, const UINT8 unHighSeverity) PURE; @@ -264,7 +264,7 @@ DECLARE_INTERFACE_(IHXErrorSinkControl, IUnknown) * Purpose: * Call this method to remove an error sink. */ - STDQT_METHOD(RemoveErrorSink) (THIS_ + STDTQT_METHOD(RemoveErrorSink) (THIS_ IHXErrorSink* pErrorSink) PURE; }; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h index ebaeb100..40fa0094 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h @@ -87,7 +87,7 @@ typedef _INTERFACE IHXPostDataHandler IHXPostDataHandler; * Purpose: * Flags for file response Advise method */ -#define HX_FILERESPONSEADVISE_REQUIREFULLREAD 1 +#define HX_FILERESPONSEADVISE_RETQUIREFULLREAD 1 #if defined(_UNIX) || defined(_WINDOWS) @@ -140,7 +140,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -161,7 +161,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * for validity of the object (for example by opening it if it is * a local file). */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ ULONG32 /*IN*/ ulFlags, IHXFileResponse* /*IN*/ pFileResponse) PURE; @@ -177,7 +177,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * core (i.e. when you return control to the RMA core) * */ - STDQT_METHOD(GetFilename) (THIS_ + STDTQT_METHOD(GetFilename) (THIS_ REF(const char*) /*OUT*/ pFilename) PURE; /************************************************************************ @@ -187,7 +187,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * Closes the file resource and releases all resources associated * with the object. */ - STDQT_METHOD(Close) (THIS) PURE; + STDTQT_METHOD(Close) (THIS) PURE; /************************************************************************ * Method: @@ -197,7 +197,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * and asynchronously returns it to the caller via the * IHXFileResponse interface passed in to Init. */ - STDQT_METHOD(Read) (THIS_ + STDTQT_METHOD(Read) (THIS_ ULONG32 ulCount) PURE; /************************************************************************ @@ -208,7 +208,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * the caller via the IHXFileResponse interface passed in to Init, * of the completeness of the operation. */ - STDQT_METHOD(Write) (THIS_ + STDTQT_METHOD(Write) (THIS_ IHXBuffer* pBuffer) PURE; /************************************************************************ @@ -221,7 +221,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * If the bRelative flag is TRUE, it is a relative seek; else * an absolute seek. */ - STDQT_METHOD(Seek) (THIS_ + STDTQT_METHOD(Seek) (THIS_ ULONG32 ulOffset, HXBOOL bRelative) PURE; @@ -232,7 +232,7 @@ DECLARE_INTERFACE_(IHXFileObject, IUnknown) * To pass information to the File Object advising it about usage * heuristics. */ - STDQT_METHOD(Advise) (THIS_ + STDTQT_METHOD(Advise) (THIS_ ULONG32 ulInfo) PURE; }; @@ -263,7 +263,7 @@ DECLARE_INTERFACE_(IHXFileObjectExt, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -283,7 +283,7 @@ DECLARE_INTERFACE_(IHXFileObjectExt, IUnknown) * core (i.e. when you return control to the RMA core) * */ - STDQT_METHOD(GetFullFilename) (THIS_ + STDTQT_METHOD(GetFullFilename) (THIS_ REF(IHXBuffer*) /*OUT*/ pFullFilename) PURE; }; @@ -314,7 +314,7 @@ DECLARE_INTERFACE_(IHXFileResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -336,7 +336,7 @@ DECLARE_INTERFACE_(IHXFileResponse, IUnknown) * for the file system, the status HXR_FAILED should be * returned. */ - STDQT_METHOD(InitDone) (THIS_ + STDTQT_METHOD(InitDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -347,7 +347,7 @@ DECLARE_INTERFACE_(IHXFileResponse, IUnknown) * interface. This method is called by the IHXFileObject when the * close of the file is complete. */ - STDQT_METHOD(CloseDone) (THIS_ + STDTQT_METHOD(CloseDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -358,7 +358,7 @@ DECLARE_INTERFACE_(IHXFileResponse, IUnknown) * interface. This method is called by the IHXFileObject when the * last read from the file is complete and a buffer is available. */ - STDQT_METHOD(ReadDone) (THIS_ + STDTQT_METHOD(ReadDone) (THIS_ HX_RESULT status, IHXBuffer* pBuffer) PURE; @@ -370,7 +370,7 @@ DECLARE_INTERFACE_(IHXFileResponse, IUnknown) * interface. This method is called by the IHXFileObject when the * last write to the file is complete. */ - STDQT_METHOD(WriteDone) (THIS_ + STDTQT_METHOD(WriteDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -381,7 +381,7 @@ DECLARE_INTERFACE_(IHXFileResponse, IUnknown) * interface. This method is called by the IHXFileObject when the * last seek in the file is complete. */ - STDQT_METHOD(SeekDone) (THIS_ + STDTQT_METHOD(SeekDone) (THIS_ HX_RESULT status) PURE; }; @@ -411,7 +411,7 @@ DECLARE_INTERFACE_(IHXAdvise, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -431,7 +431,7 @@ DECLARE_INTERFACE_(IHXAdvise, IUnknown) * usage heuristics. It should pass HX_FILERESPONSEADVISE_xxx * flags into this method. */ - STDQT_METHOD(Advise) (THIS_ ULONG32 ulInfo) PURE; + STDTQT_METHOD(Advise) (THIS_ ULONG32 ulInfo) PURE; }; @@ -462,7 +462,7 @@ DECLARE_INTERFACE_(IHXFileSystemObject, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -484,21 +484,21 @@ DECLARE_INTERFACE_(IHXFileSystemObject, IUnknown) * pShortName should be a short, human readable name in the form * of "company-fsname". For example: pShortName = "pn-local". */ - STDQT_METHOD(GetFileSystemInfo) (THIS_ + STDTQT_METHOD(GetFileSystemInfo) (THIS_ REF(const char*) /*OUT*/ pShortName, REF(const char*) /*OUT*/ pProtocol) PURE; - STDQT_METHOD(InitFileSystem) (THIS_ + STDTQT_METHOD(InitFileSystem) (THIS_ IHXValues* pOptions) PURE; - STDQT_METHOD(CreateFile) (THIS_ + STDTQT_METHOD(CreateFile) (THIS_ IUnknown** /*OUT*/ ppFileObject) PURE; /* * The following method is deprecated and should return HXR_NOTIMPL */ - STDQT_METHOD(CreateDir) (THIS_ + STDTQT_METHOD(CreateDir) (THIS_ IUnknown** /*OUT*/ ppDirObject) PURE; }; @@ -530,7 +530,7 @@ DECLARE_INTERFACE_(IHXFileStat, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -542,7 +542,7 @@ DECLARE_INTERFACE_(IHXFileStat, IUnknown) * IHXFileStat methods */ - STDQT_METHOD(Stat) (THIS_ + STDTQT_METHOD(Stat) (THIS_ IHXFileStatResponse* pFileStatResponse ) PURE; }; @@ -574,7 +574,7 @@ DECLARE_INTERFACE_(IHXFileStatResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -586,7 +586,7 @@ DECLARE_INTERFACE_(IHXFileStatResponse, IUnknown) * IHXFileStat methods */ - STDQT_METHOD(StatDone) (THIS_ + STDTQT_METHOD(StatDone) (THIS_ HX_RESULT status, UINT32 ulSize, UINT32 ulCreationTime, @@ -623,7 +623,7 @@ DECLARE_INTERFACE_(IHXFileSystemManager, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -635,7 +635,7 @@ DECLARE_INTERFACE_(IHXFileSystemManager, IUnknown) * IHXFileSystemManager methods */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ IHXFileSystemManagerResponse* /*IN*/ pFileManagerResponse ) PURE; @@ -643,7 +643,7 @@ DECLARE_INTERFACE_(IHXFileSystemManager, IUnknown) * method in each file system's objects, and returns that object through * FSManagerResponse->FileObjectReady */ - STDQT_METHOD(GetFileObject) (THIS_ + STDTQT_METHOD(GetFileObject) (THIS_ IHXRequest* pRequest, IHXAuthenticator* pAuthenticator) PURE; @@ -653,11 +653,11 @@ DECLARE_INTERFACE_(IHXFileSystemManager, IUnknown) * which is then returned through FileObjectReady. This is especially * useful for those who wish to open a brand new file for writing. */ - STDQT_METHOD(GetNewFileObject) (THIS_ + STDTQT_METHOD(GetNewFileObject) (THIS_ IHXRequest* pRequest, IHXAuthenticator* pAuthenticator) PURE; - STDQT_METHOD(GetRelativeFileObject) (THIS_ + STDTQT_METHOD(GetRelativeFileObject) (THIS_ IUnknown* pOriginalObject, const char* pPath) PURE; @@ -665,7 +665,7 @@ DECLARE_INTERFACE_(IHXFileSystemManager, IUnknown) * The following method is deprecated and should return HXR_NOTIMPL */ - STDQT_METHOD(GetDirObjectFromURL) (THIS_ + STDTQT_METHOD(GetDirObjectFromURL) (THIS_ const char* pURL) PURE; }; @@ -696,7 +696,7 @@ DECLARE_INTERFACE_(IHXFileSystemManagerResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -713,10 +713,10 @@ DECLARE_INTERFACE_(IHXFileSystemManagerResponse, IUnknown) * IHXFileSystemManagerResponse::InitDone * Purpose: */ - STDQT_METHOD(InitDone) (THIS_ + STDTQT_METHOD(InitDone) (THIS_ HX_RESULT status) PURE; - STDQT_METHOD(FileObjectReady) (THIS_ + STDTQT_METHOD(FileObjectReady) (THIS_ HX_RESULT status, IUnknown* pObject) PURE; @@ -724,7 +724,7 @@ DECLARE_INTERFACE_(IHXFileSystemManagerResponse, IUnknown) * The following method is deprecated and should return HXR_NOTIMPL */ - STDQT_METHOD(DirObjectReady) (THIS_ + STDTQT_METHOD(DirObjectReady) (THIS_ HX_RESULT status, IUnknown* pDirObject) PURE; }; @@ -756,7 +756,7 @@ DECLARE_INTERFACE_(IHXFileExists, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -773,7 +773,7 @@ DECLARE_INTERFACE_(IHXFileExists, IUnknown) * IHXFileExists::DoesExist * Purpose: */ - STDQT_METHOD(DoesExist) (THIS_ + STDTQT_METHOD(DoesExist) (THIS_ const char* /*IN*/ pPath, IHXFileExistsResponse* /*IN*/ pFileResponse) PURE; }; @@ -805,7 +805,7 @@ DECLARE_INTERFACE_(IHXFileExistsResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -817,7 +817,7 @@ DECLARE_INTERFACE_(IHXFileExistsResponse, IUnknown) * IHXFileExistsResponse methods */ - STDQT_METHOD(DoesExistDone) (THIS_ + STDTQT_METHOD(DoesExistDone) (THIS_ HXBOOL bExist) PURE; }; @@ -849,7 +849,7 @@ DECLARE_INTERFACE_(IHXFileMimeMapper, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -866,7 +866,7 @@ DECLARE_INTERFACE_(IHXFileMimeMapper, IUnknown) * IHXFileMimeMapper::FindMimeType * Purpose: */ - STDQT_METHOD(FindMimeType) (THIS_ + STDTQT_METHOD(FindMimeType) (THIS_ const char* /*IN*/ pURL, IHXFileMimeMapperResponse* /*IN*/ pMimeMapperResponse ) PURE; @@ -900,7 +900,7 @@ DECLARE_INTERFACE_(IHXFileMimeMapperResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -926,7 +926,7 @@ DECLARE_INTERFACE_(IHXFileMimeMapperResponse, IUnknown) * a mime type of NULL. * */ - STDQT_METHOD(MimeTypeFound) (THIS_ + STDTQT_METHOD(MimeTypeFound) (THIS_ HX_RESULT status, const char* pMimeType) PURE; }; @@ -959,7 +959,7 @@ DECLARE_INTERFACE_(IHXBroadcastMapper, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -976,7 +976,7 @@ DECLARE_INTERFACE_(IHXBroadcastMapper, IUnknown) * IHXBroadcastMapper::FindBroadcastType * Purpose: */ - STDQT_METHOD(FindBroadcastType) (THIS_ + STDTQT_METHOD(FindBroadcastType) (THIS_ const char* /*IN*/ pURL, IHXBroadcastMapperResponse* /*IN*/ pBroadcastMapperResponse) PURE; }; @@ -1009,7 +1009,7 @@ DECLARE_INTERFACE_(IHXBroadcastMapperResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1033,7 +1033,7 @@ DECLARE_INTERFACE_(IHXBroadcastMapperResponse, IUnknown) * with the broadcast type set to NULL. * */ - STDQT_METHOD(BroadcastTypeFound) (THIS_ + STDTQT_METHOD(BroadcastTypeFound) (THIS_ HX_RESULT status, const char* pBroadcastType) PURE; }; @@ -1066,7 +1066,7 @@ DECLARE_INTERFACE_(IHXGetFileFromSamePool, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1084,7 +1084,7 @@ DECLARE_INTERFACE_(IHXGetFileFromSamePool, IUnknown) * Purpose: * To get another FileObject from the same pool. */ - STDQT_METHOD(GetFileObjectFromPool) (THIS_ + STDTQT_METHOD(GetFileObjectFromPool) (THIS_ IHXGetFileFromSamePoolResponse*) PURE; }; @@ -1116,7 +1116,7 @@ DECLARE_INTERFACE_(IHXGetFileFromSamePoolResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1133,7 +1133,7 @@ DECLARE_INTERFACE_(IHXGetFileFromSamePoolResponse, IUnknown) * Purpose: * To return another FileObject from the same pool. */ - STDQT_METHOD(FileObjectReady) (THIS_ + STDTQT_METHOD(FileObjectReady) (THIS_ HX_RESULT status, IUnknown* ppUnknown) PURE; }; @@ -1166,7 +1166,7 @@ DECLARE_INTERFACE_(IHXFileAuthenticator, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1177,10 +1177,10 @@ DECLARE_INTERFACE_(IHXFileAuthenticator, IUnknown) /* * IHXFileAuthenticator methods */ - STDQT_METHOD(SetAuthenticator) (THIS_ + STDTQT_METHOD(SetAuthenticator) (THIS_ IHXAuthenticator* pAuthenticator) PURE; - STDQT_METHOD(GetAuthenticator) (THIS_ + STDTQT_METHOD(GetAuthenticator) (THIS_ REF(IHXAuthenticator*) pAuthenticator) PURE; }; @@ -1213,7 +1213,7 @@ DECLARE_INTERFACE_(IHXRequestHandler, IUnknown) * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1227,7 +1227,7 @@ DECLARE_INTERFACE_(IHXRequestHandler, IUnknown) * Purpose: * Associates an IHXRequest with an object */ - STDQT_METHOD(SetRequest) (THIS_ + STDTQT_METHOD(SetRequest) (THIS_ IHXRequest* /*IN*/ pRequest) PURE; /************************************************************************ @@ -1236,7 +1236,7 @@ DECLARE_INTERFACE_(IHXRequestHandler, IUnknown) * Purpose: * Gets the IHXRequest object associated with an object */ - STDQT_METHOD(GetRequest) (THIS_ + STDTQT_METHOD(GetRequest) (THIS_ REF(IHXRequest*) /*OUT*/ pRequest) PURE; }; @@ -1270,7 +1270,7 @@ DECLARE_INTERFACE_(IHXRequestContext, IUnknown) * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1288,7 +1288,7 @@ DECLARE_INTERFACE_(IHXRequestContext, IUnknown) * Purpose: * Sets the Authenticated users Context. */ - STDQT_METHOD(SetUserContext) + STDTQT_METHOD(SetUserContext) ( THIS_ IUnknown* pIUnknownNewContext @@ -1300,7 +1300,7 @@ DECLARE_INTERFACE_(IHXRequestContext, IUnknown) * Purpose: * Gets the Authenticated users Context. */ - STDQT_METHOD(GetUserContext) + STDTQT_METHOD(GetUserContext) ( THIS_ REF(IUnknown*) pIUnknownCurrentContext @@ -1312,7 +1312,7 @@ DECLARE_INTERFACE_(IHXRequestContext, IUnknown) * Purpose: * Sets the Object that made the request. */ - STDQT_METHOD(SetRequester) + STDTQT_METHOD(SetRequester) ( THIS_ IUnknown* pIUnknownNewRequester @@ -1324,7 +1324,7 @@ DECLARE_INTERFACE_(IHXRequestContext, IUnknown) * Purpose: * Gets the Object that made the request. */ - STDQT_METHOD(GetRequester) + STDTQT_METHOD(GetRequester) ( THIS_ REF(IUnknown*) pIUnknownCurrentRequester @@ -1359,7 +1359,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1378,7 +1378,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * Sets the headers that will be sent in the RFC822 header section * of the request message */ - STDQT_METHOD(SetRequestHeaders) (THIS_ + STDTQT_METHOD(SetRequestHeaders) (THIS_ IHXValues* pRequestHeaders) PURE; /************************************************************************ @@ -1388,7 +1388,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * Gets the headers that were sent in the RFC822 header section * of the request message */ - STDQT_METHOD(GetRequestHeaders) (THIS_ + STDTQT_METHOD(GetRequestHeaders) (THIS_ REF(IHXValues*) pRequestHeaders) PURE; /************************************************************************ @@ -1398,7 +1398,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * Sets the headers that will be returned in the RFC822 header * section of the response message */ - STDQT_METHOD(SetResponseHeaders) (THIS_ + STDTQT_METHOD(SetResponseHeaders) (THIS_ IHXValues* pResponseHeaders) PURE; /************************************************************************ @@ -1408,7 +1408,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * Gets the headers that were returned in the RFC822 header section * of the response message */ - STDQT_METHOD(GetResponseHeaders) (THIS_ + STDTQT_METHOD(GetResponseHeaders) (THIS_ REF(IHXValues*) pResponseHeaders) PURE; /************************************************************************ @@ -1419,7 +1419,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * Note: On the server, this path does not include the file system * mount point. */ - STDQT_METHOD(SetURL) (THIS_ + STDTQT_METHOD(SetURL) (THIS_ const char* pURL) PURE; /************************************************************************ @@ -1434,7 +1434,7 @@ DECLARE_INTERFACE_(IHXRequest, IUnknown) * caller returns from a function which was called from the RMA * core (i.e. when you return control to the RMA core) */ - STDQT_METHOD(GetURL) (THIS_ + STDTQT_METHOD(GetURL) (THIS_ REF(const char*) pURL) PURE; }; @@ -1465,7 +1465,7 @@ DECLARE_INTERFACE_(IHXFileRename, IUnknown) * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1483,7 +1483,7 @@ DECLARE_INTERFACE_(IHXFileRename, IUnknown) * Purpose: * Renames a file to a new name. */ - STDQT_METHOD(Rename) (THIS_ + STDTQT_METHOD(Rename) (THIS_ const char* pNewFileName) PURE; }; @@ -1516,7 +1516,7 @@ DECLARE_INTERFACE_(IHXFileMove, IUnknown) * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1534,7 +1534,7 @@ DECLARE_INTERFACE_(IHXFileMove, IUnknown) * Purpose: * Moves a file to a different location in the file system */ - STDQT_METHOD(Move) (THIS_ + STDTQT_METHOD(Move) (THIS_ const char* pNewFilePathName) PURE; }; @@ -1564,7 +1564,7 @@ DECLARE_INTERFACE_(IHXDirHandler, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1583,7 +1583,7 @@ DECLARE_INTERFACE_(IHXDirHandler, IUnknown) * Associates a directory handler with the directory handler * response, it should notify of operation completness. */ - STDQT_METHOD(InitDirHandler) (THIS_ + STDTQT_METHOD(InitDirHandler) (THIS_ IHXDirHandlerResponse* /*IN*/ pDirResponse) PURE; /************************************************************************ @@ -1593,7 +1593,7 @@ DECLARE_INTERFACE_(IHXDirHandler, IUnknown) * Closes the directory handler resource and releases all resources * associated with the object. */ - STDQT_METHOD(CloseDirHandler) (THIS) PURE; + STDTQT_METHOD(CloseDirHandler) (THIS) PURE; /************************************************************************ * Method: @@ -1601,7 +1601,7 @@ DECLARE_INTERFACE_(IHXDirHandler, IUnknown) * Purpose: * Create the directory */ - STDQT_METHOD(MakeDir) (THIS) PURE; + STDTQT_METHOD(MakeDir) (THIS) PURE; /************************************************************************ * Method: @@ -1609,7 +1609,7 @@ DECLARE_INTERFACE_(IHXDirHandler, IUnknown) * Purpose: * Get a dump of the directory */ - STDQT_METHOD(ReadDir) (THIS) PURE; + STDTQT_METHOD(ReadDir) (THIS) PURE; }; @@ -1638,7 +1638,7 @@ DECLARE_INTERFACE_(IHXDirHandlerResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1658,7 +1658,7 @@ DECLARE_INTERFACE_(IHXDirHandlerResponse, IUnknown) * interface. This method is called by the IHXDirHandler when the * initialization of the object is complete. */ - STDQT_METHOD(InitDirHandlerDone) (THIS_ + STDTQT_METHOD(InitDirHandlerDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -1669,7 +1669,7 @@ DECLARE_INTERFACE_(IHXDirHandlerResponse, IUnknown) * interface. This method is called by the IHXDirHandler when the * close of the directory is complete. */ - STDQT_METHOD(CloseDirHandlerDone) (THIS_ + STDTQT_METHOD(CloseDirHandlerDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -1680,7 +1680,7 @@ DECLARE_INTERFACE_(IHXDirHandlerResponse, IUnknown) * interface. This method is called by the IHXDirHandler when the * attempt to create the directory is complete. */ - STDQT_METHOD(MakeDirDone) (THIS_ + STDTQT_METHOD(MakeDirDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -1691,7 +1691,7 @@ DECLARE_INTERFACE_(IHXDirHandlerResponse, IUnknown) * interface. This method is called by the IHXDirHandler when the * read from the directory is complete and a buffer is available. */ - STDQT_METHOD(ReadDirDone) (THIS_ + STDTQT_METHOD(ReadDirDone) (THIS_ HX_RESULT status, IHXBuffer* pBuffer) PURE; }; @@ -1723,7 +1723,7 @@ DECLARE_INTERFACE_(IHXGetRecursionLevel, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1762,7 +1762,7 @@ DEFINE_GUID(IID_IHXFileRestrictor, 0x00000219, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0x DECLARE_INTERFACE_(IHXFileRestrictor, IUnknown) { /* IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; @@ -1803,7 +1803,7 @@ DECLARE_INTERFACE_(IHXFileRemove, IUnknown) * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1821,7 +1821,7 @@ DECLARE_INTERFACE_(IHXFileRemove, IUnknown) * Purpose: * Removes a file from the file system. */ - STDQT_METHOD(Remove) (THIS) PURE; + STDTQT_METHOD(Remove) (THIS) PURE; }; @@ -1856,7 +1856,7 @@ DECLARE_INTERFACE_(IHXFastFileFactory, IUnknown) * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1876,7 +1876,7 @@ DECLARE_INTERFACE_(IHXFastFileFactory, IUnknown) * uninitialized) file object. * */ - STDQT_METHOD(Wrap) (THIS_ + STDTQT_METHOD(Wrap) (THIS_ REF(IUnknown*) /*OUT*/ pWrapper, IUnknown* /*IN*/ pFileObj, UINT32 /*IN*/ ulBlockSize, @@ -1919,7 +1919,7 @@ DECLARE_INTERFACE_(IHXFastFileFactory2, IUnknown) * uninitialized) file object. * */ - STDQT_METHOD(Wrap) (THIS_ + STDTQT_METHOD(Wrap) (THIS_ REF(IUnknown*) /*OUT*/ pWrapper, IUnknown* /*IN*/ pFileObj, UINT32 /*IN*/ ulBlockSize, @@ -1955,7 +1955,7 @@ DECLARE_INTERFACE_(IHXFilePlacementRead, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1966,7 +1966,7 @@ DECLARE_INTERFACE_(IHXFilePlacementRead, IUnknown) /* * IHXFilePlacementRead methods */ - STDQT_METHOD(Read) (THIS_ + STDTQT_METHOD(Read) (THIS_ ULONG32 ulAmount, ULONG32 ulOffset, char* pBuffer, @@ -2014,7 +2014,7 @@ DECLARE_INTERFACE_(IHXFastFileStats, IUnknown) * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2026,7 +2026,7 @@ DECLARE_INTERFACE_(IHXFastFileStats, IUnknown) * IHXFastFileStats methods */ - STDQT_METHOD(UpdateFileObjectStats) (THIS_ + STDTQT_METHOD(UpdateFileObjectStats) (THIS_ UINT32 /*IN*/ ulFastFileBytesSaved, UINT32 /*IN*/ ulFastFileBytesNeeded) PURE; }; @@ -2061,7 +2061,7 @@ DECLARE_INTERFACE_(IHXHTTPPostObject, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2082,7 +2082,7 @@ DECLARE_INTERFACE_(IHXHTTPPostObject, IUnknown) * for validity of the object (for example by opening it if it is * a local file). */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ ULONG32 /*IN*/ ulFlags, IHXHTTPPostResponse* /*IN*/ pFileResponse) PURE; @@ -2093,7 +2093,7 @@ DECLARE_INTERFACE_(IHXHTTPPostObject, IUnknown) * Closes the file resource and releases all resources associated * with the object. */ - STDQT_METHOD(Close) (THIS) PURE; + STDTQT_METHOD(Close) (THIS) PURE; /************************************************************************ * Method: @@ -2102,7 +2102,7 @@ DECLARE_INTERFACE_(IHXHTTPPostObject, IUnknown) * Tells the object to retrieve any response data from the POST. * Calls IHXHTTPPostResponse with ResponseReady(IHXValues*). */ - STDQT_METHOD(GetResponse) (THIS) PURE; + STDTQT_METHOD(GetResponse) (THIS) PURE; /************************************************************************ @@ -2113,7 +2113,7 @@ DECLARE_INTERFACE_(IHXHTTPPostObject, IUnknown) * the caller via the IHXFileResponse interface passed in to Init, * of the completeness of the operation. */ - STDQT_METHOD(Post) (THIS_ + STDTQT_METHOD(Post) (THIS_ IHXBuffer* pBuffer) PURE; /************************************************************************ @@ -2122,7 +2122,7 @@ DECLARE_INTERFACE_(IHXHTTPPostObject, IUnknown) * Purpose: * Set the total size of the Post(s) about to be made. */ - STDQT_METHOD(SetSize) (THIS_ + STDTQT_METHOD(SetSize) (THIS_ ULONG32 ulLength) PURE; }; @@ -2153,7 +2153,7 @@ DECLARE_INTERFACE_(IHXHTTPPostResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2175,7 +2175,7 @@ DECLARE_INTERFACE_(IHXHTTPPostResponse, IUnknown) * for the file system, the status HXR_FAILED should be * returned. */ - STDQT_METHOD(InitDone) (THIS_ + STDTQT_METHOD(InitDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -2186,7 +2186,7 @@ DECLARE_INTERFACE_(IHXHTTPPostResponse, IUnknown) * interface. This method is called by the IHXHTTPPostObject when the * close of the file is complete. */ - STDQT_METHOD(CloseDone) (THIS_ + STDTQT_METHOD(CloseDone) (THIS_ HX_RESULT status) PURE; /************************************************************************ @@ -2197,7 +2197,7 @@ DECLARE_INTERFACE_(IHXHTTPPostResponse, IUnknown) * interface. This method is called by the IHXHTTPPostObject when the * POST response data has been completely read. */ - STDQT_METHOD(ResponseReady) (THIS_ + STDTQT_METHOD(ResponseReady) (THIS_ HX_RESULT status, IHXBuffer* pContentBuffer) PURE; @@ -2209,7 +2209,7 @@ DECLARE_INTERFACE_(IHXHTTPPostResponse, IUnknown) * interface. This method is called by the IHXHTTPPostObject when the * last write to the file is complete. */ - STDQT_METHOD(PostDone) (THIS_ + STDTQT_METHOD(PostDone) (THIS_ HX_RESULT status) PURE; }; // $EndPrivate. @@ -2243,7 +2243,7 @@ DECLARE_INTERFACE_(IHXHTTPRedirect, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2261,7 +2261,7 @@ DECLARE_INTERFACE_(IHXHTTPRedirect, IUnknown) * Purpose: * Initialize the response object */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ IHXHTTPRedirectResponse* pRedirectResponse) PURE; /************************************************************************ @@ -2270,7 +2270,7 @@ DECLARE_INTERFACE_(IHXHTTPRedirect, IUnknown) * Purpose: * Initialize the response object w/o calling Init */ - STDQT_METHOD(SetResponseObject) (THIS_ + STDTQT_METHOD(SetResponseObject) (THIS_ IHXHTTPRedirectResponse* pRedirectResponse) PURE; }; @@ -2302,7 +2302,7 @@ DECLARE_INTERFACE_(IHXHTTPRedirectResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2320,7 +2320,7 @@ DECLARE_INTERFACE_(IHXHTTPRedirectResponse, IUnknown) * Purpose: * return the redirect URL */ - STDQT_METHOD(RedirectDone) (THIS_ + STDTQT_METHOD(RedirectDone) (THIS_ IHXBuffer* pURL) PURE; }; @@ -2356,7 +2356,7 @@ DECLARE_INTERFACE_(IHXRM2Converter2, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -2365,13 +2365,13 @@ DECLARE_INTERFACE_(IHXRM2Converter2, IUnknown) /* * IHXRM2Converter2 methods */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ IHXRM2Converter2Response* pResponse) PURE; // // AddStream takes a stream from an RM1 file and // adds it to the new RM2 multirate section // - STDQT_METHOD(AddStream) (THIS_ + STDTQT_METHOD(AddStream) (THIS_ const char* pFilename, IHXFileObject* pFileObject, UINT16 nStreamNumber, @@ -2382,7 +2382,7 @@ DECLARE_INTERFACE_(IHXRM2Converter2, IUnknown) // RM1 file and adds it to the initial interleaved // backward compatibility section // - STDQT_METHOD(AddInterleavedStream) (THIS_ + STDTQT_METHOD(AddInterleavedStream) (THIS_ const char* pFilename, IHXFileObject* pFileObject, UINT16 nStreamNumber) PURE; @@ -2392,7 +2392,7 @@ DECLARE_INTERFACE_(IHXRM2Converter2, IUnknown) // an RM1 file and adds them to the new RM2 // multirate section. // - STDQT_METHOD(AddFile) (THIS_ + STDTQT_METHOD(AddFile) (THIS_ const char* pFilename, IHXFileObject* pFileObject) PURE; @@ -2400,13 +2400,13 @@ DECLARE_INTERFACE_(IHXRM2Converter2, IUnknown) // SetTitle,Author,Copyright, and Comment // should all be pretty self explanatory... // - STDQT_METHOD(SetTitle) (THIS_ + STDTQT_METHOD(SetTitle) (THIS_ const char* pTitle) PURE; - STDQT_METHOD(SetAuthor) (THIS_ + STDTQT_METHOD(SetAuthor) (THIS_ const char* pAuthor) PURE; - STDQT_METHOD(SetCopyright) (THIS_ + STDTQT_METHOD(SetCopyright) (THIS_ const char* pCopyright) PURE; - STDQT_METHOD(SetComment) (THIS_ + STDTQT_METHOD(SetComment) (THIS_ const char* pComment) PURE; // @@ -2415,19 +2415,19 @@ DECLARE_INTERFACE_(IHXRM2Converter2, IUnknown) // bandwidth (i.e. the sum of the stream // bandwidths involved). // - STDQT_METHOD(PairStreams) (THIS_ + STDTQT_METHOD(PairStreams) (THIS_ const char* pFilename1, UINT16 nStreamNumber1, const char* pFilename2, UINT16 nStreamNumber2) PURE; - STDQT_METHOD(Merge) (THIS_ + STDTQT_METHOD(Merge) (THIS_ const char* pFilename, IHXFileObject* pOutputFile, UINT32 ulBytesToWrite) PURE; - STDQT_METHOD(Reset) (THIS) PURE; - STDQT_METHOD(Done) (THIS) PURE; + STDTQT_METHOD(Reset) (THIS) PURE; + STDTQT_METHOD(Done) (THIS) PURE; }; @@ -2458,7 +2458,7 @@ DECLARE_INTERFACE_(IHXRM2Converter2Response, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; @@ -2467,15 +2467,15 @@ DECLARE_INTERFACE_(IHXRM2Converter2Response, IUnknown) /* * IHXRM2Converter2Response methods */ - STDQT_METHOD(InitDone) (THIS_ + STDTQT_METHOD(InitDone) (THIS_ HX_RESULT status) PURE; - STDQT_METHOD(AddStreamDone) (THIS_ + STDTQT_METHOD(AddStreamDone) (THIS_ HX_RESULT status) PURE; - STDQT_METHOD(AddInterleavedStreamDone) (THIS_ + STDTQT_METHOD(AddInterleavedStreamDone) (THIS_ HX_RESULT status) PURE; - STDQT_METHOD(AddFileDone) (THIS_ + STDTQT_METHOD(AddFileDone) (THIS_ HX_RESULT status) PURE; - STDQT_METHOD(MergeDone) (THIS_ + STDTQT_METHOD(MergeDone) (THIS_ HX_RESULT status) PURE; }; @@ -2507,7 +2507,7 @@ DECLARE_INTERFACE_(IHXPoolPathAdjustment, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2518,7 +2518,7 @@ DECLARE_INTERFACE_(IHXPoolPathAdjustment, IUnknown) /* * IHXPoolPathAdjustment Methods. */ - STDQT_METHOD(AdjustAbsolutePath) (THIS_ + STDTQT_METHOD(AdjustAbsolutePath) (THIS_ IHXBuffer* /*IN*/ pOldPath, REF(IHXBuffer*) /*OUT*/ pNewPath) PURE; @@ -2554,7 +2554,7 @@ DECLARE_INTERFACE_(IHXPostDataHandler, IUnknown) * IUnknownMethods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2564,7 +2564,7 @@ DECLARE_INTERFACE_(IHXPostDataHandler, IUnknown) /* * IHXPostDataHandler methods */ - STDQT_METHOD(PostData) (THIS_ + STDTQT_METHOD(PostData) (THIS_ IHXBuffer* pBuf) PURE; }; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h index ddcf9b33..6557e510 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h @@ -695,10 +695,10 @@ DEFINE_GUID_ENUM(IID_IHXSourceHandler, 0xb2646da0, 0x410a, 0x11d6, * Description: * Interfaces related to get pending status from objects * Interfaces: - * IHXPendingStatus: {00001100-0901-11d1-8B06-00A024406D59} + * IHXPendingtqStatus: {00001100-0901-11d1-8B06-00A024406D59} */ #ifndef _HXPENDS_H_ -DEFINE_GUID_ENUM(IID_IHXPendingStatus, 0x00001100, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59) +DEFINE_GUID_ENUM(IID_IHXPendingtqStatus, 0x00001100, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59) #endif /* * File: @@ -1636,7 +1636,7 @@ DEFINE_GUID_ENUM(IID_IHXRMFileSinkControl, * * Server QoS subsystem profile selection, and QoS Signalling mechanism */ -#ifndef _HX_QOS_H_ +#ifndef _HX_TQOS_H_ DEFINE_GUID_ENUM(IID_IHXQoSProfileSelector, 0x75db043b, 0xc5a8, 0x49b2, 0x8d, 0x3f, 0x8c, 0xf9, 0x9f, 0x9e, 0x64, 0x44) @@ -1677,9 +1677,9 @@ DEFINE_GUID_ENUM(IID_IHXQoSRateShapeAggregator, DEFINE_GUID_ENUM(IID_IHXQoSRateShaper, 0x2a287694, 0xef37, 0x4266, 0x85, 0x8f, 0xe8, 0x4f, 0xe3, 0x6a, 0xbd, 0x90) -#endif /* _HX_QOS_H_ */ +#endif /* _HX_TQOS_H_ */ -#ifndef _HXQOSSESS_H +#ifndef _HXTQOSSESS_H DEFINE_GUID_ENUM(IID_IHXQoSClientBufferVerifier, 0x51d547a0, 0xf019, 0x49e8, 0xb4, 0x98, 0x50, 0xdf, 0x22, 0xf7, 0xeb, 0x6b) @@ -1691,7 +1691,7 @@ DEFINE_GUID_ENUM(IID_IHXClientBufferInfo, 0xa7a1ab2, 0x6e3e, 0x4ed4, 0x80, 0xf, 0x97, 0xd5, 0x4e, 0x67, 0xee, 0x3c) #endif -#ifndef _HXQOSBUFFERUPDATE_H_ +#ifndef _HXTQOSBUFFERUPDATE_H_ DEFINE_GUID_ENUM(IID_IHXBufferDepthUpdate, 0xbdeaf826, 0x1cd5, 0x4200, 0xb1, 0xb2, 0x48, 0x53, 0x9d, 0xdf, 0xd4, 0x58) #endif diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h index 89c3d687..5740e344 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h @@ -81,7 +81,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -102,7 +102,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * * pPropWatch - OUT - returns a new addref'ed IHXPropWatch object */ - STDQT_METHOD(CreatePropWatch) (THIS_ + STDTQT_METHOD(CreatePropWatch) (THIS_ REF(IHXPropWatch*) pPropWatch) PURE; /************************************************************************ @@ -148,7 +148,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetIntByName) (THIS_ + STDTQT_METHOD(GetIntByName) (THIS_ const char* pName, REF(INT32) nValue) const PURE; @@ -164,7 +164,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetIntById) (THIS_ + STDTQT_METHOD(GetIntById) (THIS_ const UINT32 ulId, REF(INT32) nValue) const PURE; @@ -179,7 +179,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pName - IN - name of the Property whose value is to be set * nValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetIntByName) (THIS_ + STDTQT_METHOD(SetIntByName) (THIS_ const char* pName, const INT32 nValue) PURE; @@ -194,7 +194,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * nValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetIntById) (THIS_ + STDTQT_METHOD(SetIntById) (THIS_ const UINT32 id, const INT32 nValue) PURE; @@ -226,7 +226,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetStrByName) (THIS_ + STDTQT_METHOD(GetStrByName) (THIS_ const char* pName, REF(IHXBuffer*) pValue) const PURE; @@ -242,7 +242,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetStrById) (THIS_ + STDTQT_METHOD(GetStrById) (THIS_ const UINT32 ulId, REF(IHXBuffer*) pValue) const PURE; @@ -257,7 +257,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pName - IN - name of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetStrByName) (THIS_ + STDTQT_METHOD(SetStrByName) (THIS_ const char* pName, IHXBuffer* pValue) PURE; @@ -272,7 +272,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetStrById) (THIS_ + STDTQT_METHOD(SetStrById) (THIS_ const UINT32 ulId, IHXBuffer* pValue) PURE; @@ -304,7 +304,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetBufByName) (THIS_ + STDTQT_METHOD(GetBufByName) (THIS_ const char* pName, REF(IHXBuffer*) pValue) const PURE; @@ -320,7 +320,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetBufById) (THIS_ + STDTQT_METHOD(GetBufById) (THIS_ const UINT32 ulId, REF(IHXBuffer*) pValue) const PURE; @@ -335,7 +335,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pName - IN - name of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetBufByName) (THIS_ + STDTQT_METHOD(SetBufByName) (THIS_ const char* pName, IHXBuffer* pValue) PURE; @@ -350,7 +350,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetBufById) (THIS_ + STDTQT_METHOD(SetBufById) (THIS_ const UINT32 ulId, IHXBuffer* pValue) PURE; @@ -421,11 +421,11 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * Method: * IHXRegistry::FindParentIdByName * Purpose: - * Returns the id value of the parent node of the Property whose + * Returns the id value of the tqparent node of the Property whose * name "pName" has been passed in. If it fails, a ZERO value is * returned. * - * pName - IN - name of the Property whose parent's unique id is to be + * pName - IN - name of the Property whose tqparent's unique id is to be * retrieved */ STDMETHOD_(UINT32, FindParentIdByName) (THIS_ @@ -435,10 +435,10 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * Method: * IHXRegistry::FindParentIdById * Purpose: - * Returns the id value of the parent node of the Property whose + * Returns the id value of the tqparent node of the Property whose * id "ulId" has been passed in. If it fails, a ZERO value is returned. * - * ulId - IN - unique id of the Property whose parent's id is to be + * ulId - IN - unique id of the Property whose tqparent's id is to be * retrieved */ STDMETHOD_(UINT32, FindParentIdById) (THIS_ @@ -455,7 +455,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pName - OUT - parameter into which the Property name is going to be * returned */ - STDQT_METHOD(GetPropName) (THIS_ + STDTQT_METHOD(GetPropName) (THIS_ const UINT32 ulId, REF(IHXBuffer*) pName) const PURE; @@ -481,7 +481,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValues - OUT - list of property name and unique id at the * highest level (root) in the registry */ - STDQT_METHOD(GetPropListOfRoot) (THIS_ + STDTQT_METHOD(GetPropListOfRoot) (THIS_ REF(IHXValues*) pValues) const PURE; /************************************************************************ @@ -496,7 +496,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValues - OUT - list of property name and unique id under the * Property whose name is in "pName" */ - STDQT_METHOD(GetPropListByName) (THIS_ + STDTQT_METHOD(GetPropListByName) (THIS_ const char* pName, REF(IHXValues*) pValues) const PURE; @@ -512,7 +512,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * pValues - OUT - list of property name and unique id under the * Property whose is is in "ulId" */ - STDQT_METHOD(GetPropListById) (THIS_ + STDTQT_METHOD(GetPropListById) (THIS_ const UINT32 ulId, REF(IHXValues*) pValues) const PURE; @@ -531,7 +531,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * Returns the count of the number of Properties under the one * whose name is specified in "pName". * - * pName - IN - name of the Property whose number of children is to be + * pName - IN - name of the Property whose number of tqchildren is to be * retrieved */ STDMETHOD_(INT32, GetNumPropsByName) (THIS_ @@ -544,7 +544,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * Returns the count of the number of Properties under the one * whose unique id is specified in "ulId". * - * ulId - IN - unique id of the Property whose number of children is + * ulId - IN - unique id of the Property whose number of tqchildren is * to be retrieved */ STDMETHOD_(INT32, GetNumPropsById) (THIS_ @@ -580,7 +580,7 @@ DECLARE_INTERFACE_(IHXPropWatch, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -603,7 +603,7 @@ DECLARE_INTERFACE_(IHXPropWatch, IUnknown) * initialize the IHXPropWatch object. the response * object gets AddRef'd in the Init method. */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ IHXPropWatchResponse* pResponse) PURE; /************************************************************************ @@ -651,7 +651,7 @@ DECLARE_INTERFACE_(IHXPropWatch, IUnknown) * Purpose: * It clears the watch on the root of the registry. */ - STDQT_METHOD(ClearWatchOnRoot) (THIS) PURE; + STDTQT_METHOD(ClearWatchOnRoot) (THIS) PURE; /************************************************************************ * Method: @@ -661,7 +661,7 @@ DECLARE_INTERFACE_(IHXPropWatch, IUnknown) * * pName - IN - name of Property whose watch point is to be cleared */ - STDQT_METHOD(ClearWatchByName) (THIS_ + STDTQT_METHOD(ClearWatchByName) (THIS_ const char* pName) PURE; /************************************************************************ @@ -672,7 +672,7 @@ DECLARE_INTERFACE_(IHXPropWatch, IUnknown) * * ulId - IN - unique id of Property whose watch point is to be cleared */ - STDQT_METHOD(ClearWatchById) (THIS_ + STDTQT_METHOD(ClearWatchById) (THIS_ const UINT32 ulId) PURE; }; @@ -704,7 +704,7 @@ DECLARE_INTERFACE_(IHXPropWatchResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -722,10 +722,10 @@ DECLARE_INTERFACE_(IHXPropWatchResponse, IUnknown) * Purpose: * Gets called when a new Property gets added under the Property * on which the Watch was set. It passes the id of the Property just - * added, its datatype and the id of its immediate parent COMPOSITE + * added, its datatype and the id of its immediate tqparent COMPOSITE * property. */ - STDQT_METHOD(AddedProp) (THIS_ + STDTQT_METHOD(AddedProp) (THIS_ const UINT32 ulId, const HXPropType propType, const UINT32 ulParentID) PURE; @@ -736,9 +736,9 @@ DECLARE_INTERFACE_(IHXPropWatchResponse, IUnknown) * Purpose: * Gets called when a watched Property gets modified. It passes * the id of the Property just modified, its datatype and the - * id of its immediate parent COMPOSITE property. + * id of its immediate tqparent COMPOSITE property. */ - STDQT_METHOD(ModifiedProp) (THIS_ + STDTQT_METHOD(ModifiedProp) (THIS_ const UINT32 ulId, const HXPropType propType, const UINT32 ulParentID) PURE; @@ -749,9 +749,9 @@ DECLARE_INTERFACE_(IHXPropWatchResponse, IUnknown) * Purpose: * Gets called when a watched Property gets deleted. As can be * seen, it returns the id of the Property just deleted and - * its immediate parent COMPOSITE property. + * its immediate tqparent COMPOSITE property. */ - STDQT_METHOD(DeletedProp) (THIS_ + STDTQT_METHOD(DeletedProp) (THIS_ const UINT32 ulId, const UINT32 ulParentID) PURE; }; @@ -783,7 +783,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -797,7 +797,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) * Method to set prop pName to active and register pUser as * the active prop user. */ - STDQT_METHOD(SetAsActive) (THIS_ + STDTQT_METHOD(SetAsActive) (THIS_ const char* pName, IHXActivePropUser* pUser) PURE; @@ -806,7 +806,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) * * Method to remove an IHXActiveUser from Prop activation. */ - STDQT_METHOD(SetAsInactive) (THIS_ + STDTQT_METHOD(SetAsInactive) (THIS_ const char* pName, IHXActivePropUser* pUser) PURE; @@ -824,7 +824,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) * * Async request to set int pName to ul. */ - STDQT_METHOD(SetActiveInt) (THIS_ + STDTQT_METHOD(SetActiveInt) (THIS_ const char* pName, UINT32 ul, IHXActivePropUserResponse* pResponse) PURE; @@ -834,7 +834,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) * * Async request to set string pName to string in pBuffer. */ - STDQT_METHOD(SetActiveStr) (THIS_ + STDTQT_METHOD(SetActiveStr) (THIS_ const char* pName, IHXBuffer* pBuffer, IHXActivePropUserResponse* pResponse) PURE; @@ -844,7 +844,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) * * Async request to set buffer pName to buffer in pBuffer. */ - STDQT_METHOD(SetActiveBuf) (THIS_ + STDTQT_METHOD(SetActiveBuf) (THIS_ const char* pName, IHXBuffer* pBuffer, IHXActivePropUserResponse* pResponse) PURE; @@ -854,7 +854,7 @@ DECLARE_INTERFACE_(IHXActiveRegistry, IUnknown) * * Async request to delete the active property. */ - STDQT_METHOD(DeleteActiveProp) (THIS_ + STDTQT_METHOD(DeleteActiveProp) (THIS_ const char* pName, IHXActivePropUserResponse* pResponse) PURE; @@ -893,7 +893,7 @@ DECLARE_INTERFACE_(IHXActivePropUser, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -906,7 +906,7 @@ DECLARE_INTERFACE_(IHXActivePropUser, IUnknown) * * Async request to set int pName to ul. */ - STDQT_METHOD(SetActiveInt) (THIS_ + STDTQT_METHOD(SetActiveInt) (THIS_ const char* pName, UINT32 ul, IHXActivePropUserResponse* pResponse) PURE; @@ -916,7 +916,7 @@ DECLARE_INTERFACE_(IHXActivePropUser, IUnknown) * * Async request to set string pName to string in pBuffer. */ - STDQT_METHOD(SetActiveStr) (THIS_ + STDTQT_METHOD(SetActiveStr) (THIS_ const char* pName, IHXBuffer* pBuffer, IHXActivePropUserResponse* pResponse) PURE; @@ -926,7 +926,7 @@ DECLARE_INTERFACE_(IHXActivePropUser, IUnknown) * * Async request to set buffer pName to buffer in pBuffer. */ - STDQT_METHOD(SetActiveBuf) (THIS_ + STDTQT_METHOD(SetActiveBuf) (THIS_ const char* pName, IHXBuffer* pBuffer, IHXActivePropUserResponse* pResponse) PURE; @@ -936,7 +936,7 @@ DECLARE_INTERFACE_(IHXActivePropUser, IUnknown) * * Async request to delete the active property. */ - STDQT_METHOD(DeleteActiveProp) (THIS_ + STDTQT_METHOD(DeleteActiveProp) (THIS_ const char* pName, IHXActivePropUserResponse* pResponse) PURE; @@ -970,7 +970,7 @@ DECLARE_INTERFACE_(IHXActivePropUserResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -981,28 +981,28 @@ DECLARE_INTERFACE_(IHXActivePropUserResponse, IUnknown) /************************************************************************ * Called with status result on completion of set request. */ - STDQT_METHOD(SetActiveIntDone) (THIS_ + STDTQT_METHOD(SetActiveIntDone) (THIS_ HX_RESULT res, const char* pName, UINT32 ul, IHXBuffer* pInfo[], UINT32 ulNumInfo) PURE; - STDQT_METHOD(SetActiveStrDone) (THIS_ + STDTQT_METHOD(SetActiveStrDone) (THIS_ HX_RESULT res, const char* pName, IHXBuffer* pBuffer, IHXBuffer* pInfo[], UINT32 ulNumInfo) PURE; - STDQT_METHOD(SetActiveBufDone) (THIS_ + STDTQT_METHOD(SetActiveBufDone) (THIS_ HX_RESULT res, const char* pName, IHXBuffer* pBuffer, IHXBuffer* pInfo[], UINT32 ulNumInfo) PURE; - STDQT_METHOD(DeleteActivePropDone) (THIS_ + STDTQT_METHOD(DeleteActivePropDone) (THIS_ HX_RESULT res, const char* pName, IHXBuffer* pInfo[], @@ -1037,7 +1037,7 @@ DECLARE_INTERFACE_(IHXCopyRegistry, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1050,7 +1050,7 @@ DECLARE_INTERFACE_(IHXCopyRegistry, IUnknown) * * Here it is! The "Copy" method! */ - STDQT_METHOD (CopyByName) (THIS_ + STDTQT_METHOD (CopyByName) (THIS_ const char* pFrom, const char* pTo) PURE; }; @@ -1083,7 +1083,7 @@ DECLARE_INTERFACE_(IHXRegistryAltStringHandling, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1100,7 +1100,7 @@ DECLARE_INTERFACE_(IHXRegistryAltStringHandling, IUnknown) * method it's ID. The property will now be accessible/setable as a, * but it will still be a string! */ - STDQT_METHOD (SetStringAccessAsBufferById) (THIS_ + STDTQT_METHOD (SetStringAccessAsBufferById) (THIS_ UINT32 ulId) PURE; }; @@ -1140,7 +1140,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1161,7 +1161,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * * pPropWatch - OUT - returns a new addref'ed IHXPropWatch object */ - STDQT_METHOD(CreatePropWatch) (THIS_ + STDTQT_METHOD(CreatePropWatch) (THIS_ REF(IHXPropWatch*) pPropWatch) PURE; /************************************************************************ @@ -1207,7 +1207,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetIntByName) (THIS_ + STDTQT_METHOD(GetIntByName) (THIS_ const char* pName, REF(INT32) nValue) const PURE; @@ -1223,7 +1223,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetIntById) (THIS_ + STDTQT_METHOD(GetIntById) (THIS_ const UINT32 ulId, REF(INT32) nValue) const PURE; @@ -1238,7 +1238,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be set * nValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetIntByName) (THIS_ + STDTQT_METHOD(SetIntByName) (THIS_ const char* pName, const INT32 nValue) PURE; @@ -1253,7 +1253,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * nValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetIntById) (THIS_ + STDTQT_METHOD(SetIntById) (THIS_ const UINT32 id, const INT32 nValue) PURE; @@ -1286,7 +1286,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetStrByName) (THIS_ + STDTQT_METHOD(GetStrByName) (THIS_ const char* pName, REF(IHXBuffer*) pValue) const PURE; @@ -1302,7 +1302,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetStrById) (THIS_ + STDTQT_METHOD(GetStrById) (THIS_ const UINT32 ulId, REF(IHXBuffer*) pValue) const PURE; @@ -1317,7 +1317,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetStrByName) (THIS_ + STDTQT_METHOD(SetStrByName) (THIS_ const char* pName, IHXBuffer* pValue) PURE; @@ -1332,7 +1332,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetStrById) (THIS_ + STDTQT_METHOD(SetStrById) (THIS_ const UINT32 ulId, IHXBuffer* pValue) PURE; @@ -1365,7 +1365,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetBufByName) (THIS_ + STDTQT_METHOD(GetBufByName) (THIS_ const char* pName, REF(IHXBuffer*) pValue) const PURE; @@ -1381,7 +1381,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetBufById) (THIS_ + STDTQT_METHOD(GetBufById) (THIS_ const UINT32 ulId, REF(IHXBuffer*) pValue) const PURE; @@ -1396,7 +1396,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetBufByName) (THIS_ + STDTQT_METHOD(SetBufByName) (THIS_ const char* pName, IHXBuffer* pValue) PURE; @@ -1411,7 +1411,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * pValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetBufById) (THIS_ + STDTQT_METHOD(SetBufById) (THIS_ const UINT32 ulId, IHXBuffer* pValue) PURE; @@ -1483,11 +1483,11 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Method: * IHXRegistry2::FindParentIdByName * Purpose: - * Returns the id value of the parent node of the Property whose + * Returns the id value of the tqparent node of the Property whose * name "pName" has been passed in. If it fails, a ZERO value is * returned. * - * pName - IN - name of the Property whose parent's unique id is to be + * pName - IN - name of the Property whose tqparent's unique id is to be * retrieved */ STDMETHOD_(UINT32, FindParentIdByName) (THIS_ @@ -1497,10 +1497,10 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Method: * IHXRegistry2::FindParentIdById * Purpose: - * Returns the id value of the parent node of the Property whose + * Returns the id value of the tqparent node of the Property whose * id "ulId" has been passed in. If it fails, a ZERO value is returned. * - * ulId - IN - unique id of the Property whose parent's id is to be + * ulId - IN - unique id of the Property whose tqparent's id is to be * retrieved */ STDMETHOD_(UINT32, FindParentIdById) (THIS_ @@ -1517,7 +1517,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - OUT - parameter into which the Property name is going to be * returned */ - STDQT_METHOD(GetPropName) (THIS_ + STDTQT_METHOD(GetPropName) (THIS_ const UINT32 ulId, REF(IHXBuffer*) pName) const PURE; @@ -1543,7 +1543,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValues - OUT - list of property name and unique id at the * highest level (root) in the registry */ - STDQT_METHOD(GetPropListOfRoot) (THIS_ + STDTQT_METHOD(GetPropListOfRoot) (THIS_ REF(IHXValues*) pValues) const PURE; /************************************************************************ @@ -1558,7 +1558,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValues - OUT - list of property name and unique id under the * Property whose name is in "pName" */ - STDQT_METHOD(GetPropListByName) (THIS_ + STDTQT_METHOD(GetPropListByName) (THIS_ const char* pName, REF(IHXValues*) pValues) const PURE; @@ -1574,7 +1574,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pValues - OUT - list of property name and unique id under the * Property whose is is in "ulId" */ - STDQT_METHOD(GetPropListById) (THIS_ + STDTQT_METHOD(GetPropListById) (THIS_ const UINT32 ulId, REF(IHXValues*) pValues) const PURE; @@ -1594,7 +1594,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Returns the count of the number of Properties under the one * whose name is specified in "pName". * - * pName - IN - name of the Property whose number of children is to be + * pName - IN - name of the Property whose number of tqchildren is to be * retrieved */ STDMETHOD_(INT32, GetNumPropsByName) (THIS_ @@ -1607,7 +1607,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Returns the count of the number of Properties under the one * whose unique id is specified in "ulId". * - * ulId - IN - unique id of the Property whose number of children is + * ulId - IN - unique id of the Property whose number of tqchildren is * to be retrieved */ STDMETHOD_(INT32, GetNumPropsById) (THIS_ @@ -1630,7 +1630,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned, after modification */ - STDQT_METHOD(ModifyIntByName) (THIS_ + STDTQT_METHOD(ModifyIntByName) (THIS_ const char* pName, INT32 nDelta, REF(INT32) nValue) PURE; @@ -1651,7 +1651,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned, after modification */ - STDQT_METHOD(ModifyIntById) (THIS_ + STDTQT_METHOD(ModifyIntById) (THIS_ const UINT32 id, INT32 nDelta, REF(INT32) nValue) PURE; @@ -1681,7 +1681,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned, after modification */ - STDQT_METHOD(BoundedModifyIntByName) (THIS_ + STDTQT_METHOD(BoundedModifyIntByName) (THIS_ const char* pName, INT32 nDelta, REF(INT32) nValue, @@ -1713,7 +1713,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned, after modification */ - STDQT_METHOD(BoundedModifyIntById) (THIS_ + STDTQT_METHOD(BoundedModifyIntById) (THIS_ const UINT32 id, INT32 nDelta, REF(INT32) nValue, @@ -1735,7 +1735,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nOldValue - OUT - parameter into which the previous value of the * Property is returned */ - STDQT_METHOD(SetAndReturnIntByName) (THIS_ + STDTQT_METHOD(SetAndReturnIntByName) (THIS_ const char* pName, INT32 nValue, REF(INT32) nOldValue) PURE; @@ -1755,7 +1755,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nOldValue - OUT - parameter into which the previous value of the * Property is returned */ - STDQT_METHOD(SetAndReturnIntById) (THIS_ + STDTQT_METHOD(SetAndReturnIntById) (THIS_ const UINT32 id, INT32 nValue, REF(INT32) nOldValue) PURE; @@ -1773,7 +1773,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be retrieved * pValue - OUT - the address of the integer value */ - STDQT_METHOD(GetIntRefByName) (THIS_ + STDTQT_METHOD(GetIntRefByName) (THIS_ const char* pName, REF(INT32*) pValue) const PURE; @@ -1790,7 +1790,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be retrieved * pValue - OUT - the address of the integer value */ - STDQT_METHOD(GetIntRefById) (THIS_ + STDTQT_METHOD(GetIntRefById) (THIS_ const UINT32 id, REF(INT32*) pValue) const PURE; @@ -1825,7 +1825,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetInt64ByName) (THIS_ + STDTQT_METHOD(GetInt64ByName) (THIS_ const char* pName, REF(INT64) nValue) const PURE; @@ -1841,7 +1841,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned */ - STDQT_METHOD(GetInt64ById) (THIS_ + STDTQT_METHOD(GetInt64ById) (THIS_ const UINT32 ulId, REF(INT64) nValue) const PURE; @@ -1856,7 +1856,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be set * nValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetInt64ByName) (THIS_ + STDTQT_METHOD(SetInt64ByName) (THIS_ const char* pName, const INT64 nValue) PURE; @@ -1871,7 +1871,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * ulId - IN - unique id of the Property whose value is to be set * nValue - IN - the new value of the Property which is going to be set */ - STDQT_METHOD(SetInt64ById) (THIS_ + STDTQT_METHOD(SetInt64ById) (THIS_ const UINT32 id, const INT64 nValue) PURE; @@ -1891,7 +1891,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned, after modification */ - STDQT_METHOD(ModifyInt64ByName) (THIS_ + STDTQT_METHOD(ModifyInt64ByName) (THIS_ const char* pName, INT64 nDelta, REF(INT64) nValue) PURE; @@ -1912,7 +1912,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nValue - OUT - parameter into which the value of the Property is * going to be returned, after modification */ - STDQT_METHOD(ModifyInt64ById) (THIS_ + STDTQT_METHOD(ModifyInt64ById) (THIS_ const UINT32 id, INT64 nDelta, REF(INT64) nValue) PURE; @@ -1946,7 +1946,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * the default values should b changed from INT_MIN/MAX to their * appropriate 64-bit values */ - STDQT_METHOD(BoundedModifyInt64ByName) (THIS_ + STDTQT_METHOD(BoundedModifyInt64ByName) (THIS_ const char* pName, INT64 nDelta, REF(INT64) nValue, @@ -1982,7 +1982,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * the default values should b changed from INT_MIN/MAX to their * appropriate 64-bit values */ - STDQT_METHOD(BoundedModifyInt64ById) (THIS_ + STDTQT_METHOD(BoundedModifyInt64ById) (THIS_ const UINT32 id, INT64 nDelta, REF(INT64) nValue, @@ -2004,7 +2004,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nOldValue - OUT - parameter into which the previous value of the * Property is returned */ - STDQT_METHOD(SetAndReturnInt64ByName) (THIS_ + STDTQT_METHOD(SetAndReturnInt64ByName) (THIS_ const char* pName, INT64 nValue, REF(INT64) nOldValue) PURE; @@ -2024,7 +2024,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * nOldValue - OUT - parameter into which the previous value of the * Property is returned */ - STDQT_METHOD(SetAndReturnInt64ById) (THIS_ + STDTQT_METHOD(SetAndReturnInt64ById) (THIS_ const UINT32 id, INT64 nValue, REF(INT64) nOldValue) PURE; @@ -2062,7 +2062,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be retrieved * pValue - OUT - the address of the integer value */ - STDQT_METHOD(GetInt64RefByName) (THIS_ + STDTQT_METHOD(GetInt64RefByName) (THIS_ const char* pName, REF(INT64*) pValue) const PURE; @@ -2080,7 +2080,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * pName - IN - name of the Property whose value is to be retrieved * pValue - OUT - the address of the integer value */ - STDQT_METHOD(GetInt64RefById) (THIS_ + STDTQT_METHOD(GetInt64RefById) (THIS_ const UINT32 id, REF(INT64*) pValue) const PURE; @@ -2089,16 +2089,16 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Method: * IHXRegistry2::GetChildIdListByName * Purpose: - * Get a array which enumerates all of the children under a + * Get a array which enumerates all of the tqchildren under a * property by id. * - * pName - IN - name of the Property whose children are to be enumerated. + * pName - IN - name of the Property whose tqchildren are to be enumerated. * pValues - OUT - array of unique Property id's. * ulCount - OUT - size of the returned pValues array. * * Note: The array must be deleted by the user. */ - STDQT_METHOD(GetChildIdListByName) (THIS_ + STDTQT_METHOD(GetChildIdListByName) (THIS_ const char* pName, REF(UINT32*) pValues, REF(UINT32) ulCount) const PURE; @@ -2108,16 +2108,16 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Method: * IHXRegistry2::GetChildIdListById * Purpose: - * Get a array which enumerates all of the children under a + * Get a array which enumerates all of the tqchildren under a * property by id. * - * ulId - IN - unique id of the Property whose children are to be enumerated. + * ulId - IN - unique id of the Property whose tqchildren are to be enumerated. * pValues - OUT - array of unique Property id's. * ulCount - OUT - size of the returned pValues array. * * Note: The pValues array must be deleted by the user. */ - STDQT_METHOD(GetChildIdListById) (THIS_ + STDTQT_METHOD(GetChildIdListById) (THIS_ const UINT32 ulId, REF(UINT32*) pValues, REF(UINT32) ulCount) const PURE; @@ -2137,7 +2137,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * HXR_FAIL if property does not exist. */ - STDQT_METHOD(GetPropStatusById) (THIS_ + STDTQT_METHOD(GetPropStatusById) (THIS_ const UINT32 ulId) const PURE; @@ -2155,7 +2155,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * HXR_FAIL if property does not exist. */ - STDQT_METHOD(GetPropStatusByName) (THIS_ + STDTQT_METHOD(GetPropStatusByName) (THIS_ const char* pName) const PURE; }; @@ -2191,7 +2191,7 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -2211,11 +2211,11 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * from the registry. * * ulId - IN - unique id of the Property which has been deleted - * ulParentID - IN - unique id of the parent Property of the deleted item - * bIsParentNotify - IN - TRUE if this is a parent notification. + * ulParentID - IN - unique id of the tqparent Property of the deleted item + * bIsParentNotify - IN - TRUE if this is a tqparent notification. * pName - IN - name of the deleted Property (null-terminated) */ - STDQT_METHOD(DeletedComposite)(THIS_ + STDTQT_METHOD(DeletedComposite)(THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, @@ -2228,12 +2228,12 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * Provide notification that a INTEGER Property has been deleted. * * ulId - IN - unique id of the Property which has been deleted - * ulParentID - IN - unique id of the parent Property of the deleted item - * bIsParentNotify - IN - TRUE if this is a parent notification. + * ulParentID - IN - unique id of the tqparent Property of the deleted item + * bIsParentNotify - IN - TRUE if this is a tqparent notification. * pName - IN - name of the Property being deleted (null-terminated) * nValue - IN - integer value of the Property which has been deleted */ - STDQT_METHOD(DeletedInt) (THIS_ + STDTQT_METHOD(DeletedInt) (THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, @@ -2248,14 +2248,14 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * been deleted from the registry. * * ulId - IN - unique id of the Property which has been deleted - * ulParentID - IN - unique id of the parent Property of the deleted item - * bIsParentNotify - IN - TRUE if this is a parent notification. + * ulParentID - IN - unique id of the tqparent Property of the deleted item + * bIsParentNotify - IN - TRUE if this is a tqparent notification. * pName - IN - name of the deleted Property (null-terminated) * nValue - IN - integer value of the Property which has been deleted * pValue - IN - the pointer of the integer reference Property * which has been deleted */ - STDQT_METHOD(DeletedIntRef) (THIS_ + STDTQT_METHOD(DeletedIntRef) (THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, @@ -2271,12 +2271,12 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * from the registry. * * ulId - IN - unique id of the deleted Property which has been deleted - * ulParentID - IN - unique id of the parent Property of the deleted item - * bIsParentNotify - IN - TRUE if this is a parent notification. + * ulParentID - IN - unique id of the tqparent Property of the deleted item + * bIsParentNotify - IN - TRUE if this is a tqparent notification. * pName - IN - name of the deleted Property (null-terminated) * pValue - IN - value of the deleted Property */ - STDQT_METHOD(DeletedString) (THIS_ + STDTQT_METHOD(DeletedString) (THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, @@ -2291,12 +2291,12 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * from the registry. * * ulId - IN - unique id of the Property which has been deleted - * ulParentID - IN - unique id of the parent Property of the deleted item - * bIsParentNotify - IN - TRUE if this is a parent notification. + * ulParentID - IN - unique id of the tqparent Property of the deleted item + * bIsParentNotify - IN - TRUE if this is a tqparent notification. * pName - IN - name of the deleted Property (null-terminated) * pValue - IN - buffer value of the deleted Property */ - STDQT_METHOD(DeletedBuffer) (THIS_ + STDTQT_METHOD(DeletedBuffer) (THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, @@ -2313,12 +2313,12 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * Note: This is not used for IHXRegistry, but for IHXRegistry2. * * ulId - IN - unique id of the Property which has been deleted - * ulParentID - IN - unique id of the parent Property of the deleted item - * bIsParentNotify - IN - TRUE if this is a parent notification. + * ulParentID - IN - unique id of the tqparent Property of the deleted item + * bIsParentNotify - IN - TRUE if this is a tqparent notification. * pName - IN - name of the deleted Property (null-terminated) * nValue - IN - 64-bit integer value of the deleted Property */ - STDQT_METHOD(DeletedInt64) (THIS_ + STDTQT_METHOD(DeletedInt64) (THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, @@ -2335,14 +2335,14 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown) * Note: This is not used for IHXRegistry, but for IHXRegistry2. * * ulId - IN - unique id of the Property which has been deleted - * ulParentID - IN - unique id of the parent Property of the deleted item - * bIsParentNotify - IN - TRUE if this is a parent notification. + * ulParentID - IN - unique id of the tqparent Property of the deleted item + * bIsParentNotify - IN - TRUE if this is a tqparent notification. * pName - IN - name of the deleted Property (null-terminated) * nValue - IN - 64-bit integer value of the deleted Property * pValue - IN - the pointer of the 64-bit integer reference Property * which has been deleted */ - STDQT_METHOD(DeletedInt64Ref) (THIS_ + STDTQT_METHOD(DeletedInt64Ref) (THIS_ const UINT32 ulId, const UINT32 ulParentID, const HXBOOL bIsParentNotify, diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h index b3921e04..a436c63e 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h @@ -740,7 +740,7 @@ DEFINE_GUID_ENUM(IID_IHXMMSResendResponse, 0xa581f3a4, 0xc508, 0x4800, 0xba, 0xd * */ DEFINE_GUID_ENUM(IID_IHXDistributedLicenseRequester, 0x00005702, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59) -DEFINE_GUID_ENUM(IID_IHXDistributedLicenseRequestStatus, 0x00005703, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59) +DEFINE_GUID_ENUM(IID_IHXDistributedLicenseRequesttqStatus, 0x00005703, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59) /* * File: hxauto.h diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxplugn.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxplugn.h index 179e23ee..0301653a 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxplugn.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxplugn.h @@ -169,7 +169,7 @@ DECLARE_INTERFACE_(IHXPlugin, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -212,7 +212,7 @@ DECLARE_INTERFACE_(IHXPlugin, IUnknown) * pMoreInfoURL which is used in about UIs (can be NULL) * ulVersionNumber The version of this plugin. */ - STDQT_METHOD(GetPluginInfo) (THIS_ + STDTQT_METHOD(GetPluginInfo) (THIS_ REF(HXBOOL) /*OUT*/ bMultipleLoad, REF(const char*) /*OUT*/ pDescription, REF(const char*) /*OUT*/ pCopyright, @@ -228,7 +228,7 @@ DECLARE_INTERFACE_(IHXPlugin, IUnknown) * so that the plugin can have access to the context for creation of * IHXBuffers and IMalloc. */ - STDQT_METHOD(InitPlugin) (THIS_ + STDTQT_METHOD(InitPlugin) (THIS_ IUnknown* /*IN*/ pContext) PURE; }; @@ -261,7 +261,7 @@ DECLARE_INTERFACE_(IHXPluginEnumerator, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -290,7 +290,7 @@ DECLARE_INTERFACE_(IHXPluginEnumerator, IUnknown) * Return an instance (IUnknown) of the plugin * */ - STDQT_METHOD(GetPlugin) (THIS_ + STDTQT_METHOD(GetPlugin) (THIS_ ULONG32 /*IN*/ ulIndex, REF(IUnknown*) /*OUT*/ pPlugin) PURE; @@ -330,7 +330,7 @@ DECLARE_INTERFACE_(IHXPluginGroupEnumerator, IUnknown) /* * IHXPluginGroupEnumerator methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -348,7 +348,7 @@ DECLARE_INTERFACE_(IHXPluginGroupEnumerator, IUnknown) * be called. * */ - STDQT_METHOD(Init) (THIS_ + STDTQT_METHOD(Init) (THIS_ REFIID iid) PURE; @@ -371,7 +371,7 @@ DECLARE_INTERFACE_(IHXPluginGroupEnumerator, IUnknown) * Return an instance (IUnknown) of the plugin * */ - STDQT_METHOD(GetPlugin) (THIS_ + STDTQT_METHOD(GetPlugin) (THIS_ UINT32 /*IN*/ ulIndex, REF(IUnknown*) /*OUT*/ pPlugin) PURE; @@ -404,7 +404,7 @@ DECLARE_INTERFACE_( IHXPluginSearchEnumerator, IUnknown ) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface)(THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface)(THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef)(THIS) PURE; STDMETHOD_(ULONG32,Release)(THIS) PURE; @@ -441,7 +441,7 @@ DECLARE_INTERFACE_( IHXPluginSearchEnumerator, IUnknown ) * Returns an instance of the next plugin in the collection * */ - STDQT_METHOD(GetNextPlugin)( THIS_ REF(IUnknown*) pIUnkResult, + STDTQT_METHOD(GetNextPlugin)( THIS_ REF(IUnknown*) pIUnkResult, IUnknown* pIUnkOuter ) PURE; /************************************************************************ @@ -452,7 +452,7 @@ DECLARE_INTERFACE_( IHXPluginSearchEnumerator, IUnknown ) * Gets information about the next plugin in the list * */ - STDQT_METHOD(GetNextPluginInfo)( THIS_ REF(IHXValues*) pRetValues ) PURE; + STDTQT_METHOD(GetNextPluginInfo)( THIS_ REF(IHXValues*) pRetValues ) PURE; /************************************************************************ @@ -463,7 +463,7 @@ DECLARE_INTERFACE_( IHXPluginSearchEnumerator, IUnknown ) * Returns an instance of a plugin at a specific index in the list * */ - STDQT_METHOD(GetPluginAt)( THIS_ UINT32 index, + STDTQT_METHOD(GetPluginAt)( THIS_ UINT32 index, REF(IUnknown*) pIUnkResult, IUnknown* pIUnkOuter ) PURE; @@ -475,7 +475,7 @@ DECLARE_INTERFACE_( IHXPluginSearchEnumerator, IUnknown ) * Returns information about a plugin at a specific index in the list * */ - STDQT_METHOD(GetPluginInfoAt)( THIS_ UINT32 index, + STDTQT_METHOD(GetPluginInfoAt)( THIS_ UINT32 index, REF(IHXValues*) pRetValues ) PURE; }; @@ -509,7 +509,7 @@ DECLARE_INTERFACE_(IHXPluginReloader, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -528,7 +528,7 @@ DECLARE_INTERFACE_(IHXPluginReloader, IUnknown) * Causes the client core to reload all plugins. * */ - STDQT_METHOD(ReloadPlugins) (THIS) PURE; + STDTQT_METHOD(ReloadPlugins) (THIS) PURE; }; @@ -563,7 +563,7 @@ DECLARE_INTERFACE_(IHXPluginFactory, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -594,7 +594,7 @@ DECLARE_INTERFACE_(IHXPluginFactory, IUnknown) * Parameters: */ - STDQT_METHOD(GetPlugin) (THIS_ + STDTQT_METHOD(GetPlugin) (THIS_ UINT16 uIndex, IUnknown** pPlugin) PURE; }; @@ -631,7 +631,7 @@ DECLARE_INTERFACE_(IHXPluginChallenger, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -655,7 +655,7 @@ DECLARE_INTERFACE_(IHXPluginChallenger, IUnknown) * tVal A time value which may be used to create the * challenge response. */ - STDQT_METHOD(Challenge) (THIS_ + STDTQT_METHOD(Challenge) (THIS_ HXTimeval /*IN*/ tVal, REF(IHXBuffer*) /*OUT*/ pResponse) PURE; }; @@ -699,7 +699,7 @@ DECLARE_INTERFACE_(IHXPluginQuery, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -719,7 +719,7 @@ DECLARE_INTERFACE_(IHXPluginQuery, IUnknown) * Gets the number of plugins associated with a particular class id. * */ - STDQT_METHOD(GetNumPluginsGivenGroup) (THIS_ REFIID riid, + STDTQT_METHOD(GetNumPluginsGivenGroup) (THIS_ REFIID riid, REF(UINT32) /*OUT*/ unNumPlugins) PURE; /************************************************************************ @@ -730,7 +730,7 @@ DECLARE_INTERFACE_(IHXPluginQuery, IUnknown) * Gets the info of a particular plugin. * */ - STDQT_METHOD(GetPluginInfo) (THIS_ REFIID riid, + STDTQT_METHOD(GetPluginInfo) (THIS_ REFIID riid, UINT32 unIndex, REF(IHXValues*) /*OUT*/ Values) PURE; }; // $EndPrivate. @@ -764,7 +764,7 @@ DECLARE_INTERFACE_(IHXGenericPlugin, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -776,7 +776,7 @@ DECLARE_INTERFACE_(IHXGenericPlugin, IUnknown) * IHXGenericPlugin methods */ - STDQT_METHOD(IsGeneric) (THIS_ + STDTQT_METHOD(IsGeneric) (THIS_ REF(HXBOOL) /*OUT*/ bIsGeneric) PURE; }; @@ -793,7 +793,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -813,7 +813,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * Specifies the context and sets the pluginhandler in motion. * */ - STDQT_METHOD(Init) (THIS_ IUnknown* pContext) PURE; + STDTQT_METHOD(Init) (THIS_ IUnknown* pContext) PURE; /************************************************************************ * Method: @@ -833,7 +833,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * Gets the info of a particular plugin. * */ - STDQT_METHOD(GetPluginInfo) (THIS_ + STDTQT_METHOD(GetPluginInfo) (THIS_ UINT32 unIndex, REF(IHXValues*) /*OUT*/ Values) PURE; @@ -846,7 +846,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * which currenltly have a refcount of 0. */ - STDQT_METHOD(FlushCache) (THIS) PURE; + STDTQT_METHOD(FlushCache) (THIS) PURE; /************************************************************************ * Method: @@ -860,7 +860,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * cause performance problems. */ - STDQT_METHOD(SetCacheSize) (THIS_ ULONG32 nSizeKB) PURE; + STDTQT_METHOD(SetCacheSize) (THIS_ ULONG32 nSizeKB) PURE; /************************************************************************ * Method: @@ -872,7 +872,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * */ - STDQT_METHOD(GetInstance) (THIS_ UINT32 index, REF(IUnknown*) pUnknown) PURE; + STDTQT_METHOD(GetInstance) (THIS_ UINT32 index, REF(IUnknown*) pUnknown) PURE; /************************************************************************ * Method: @@ -885,7 +885,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * */ - STDQT_METHOD(FindIndexUsingValues) (THIS_ IHXValues*, + STDTQT_METHOD(FindIndexUsingValues) (THIS_ IHXValues*, REF(UINT32) unIndex) PURE; /************************************************************************ @@ -898,7 +898,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * */ - STDQT_METHOD(FindPluginUsingValues) (THIS_ IHXValues*, + STDTQT_METHOD(FindPluginUsingValues) (THIS_ IHXValues*, REF(IUnknown*) pUnk) PURE; /************************************************************************ @@ -912,7 +912,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * NOTE: that a max of two values may be given. */ - STDQT_METHOD(FindIndexUsingStrings) (THIS_ char* PropName1, + STDTQT_METHOD(FindIndexUsingStrings) (THIS_ char* PropName1, char* PropVal1, char* PropName2, char* PropVal2, @@ -930,7 +930,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * NOTE: that a max of two values may be given. */ - STDQT_METHOD(FindPluginUsingStrings) (THIS_ char* PropName1, + STDTQT_METHOD(FindPluginUsingStrings) (THIS_ char* PropName1, char* PropVal1, char* PropName2, char* PropVal2, @@ -947,7 +947,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * ClassID given. An instance of the Class is returned. */ - STDQT_METHOD(FindImplementationFromClassID) + STDTQT_METHOD(FindImplementationFromClassID) ( THIS_ REFGUID GUIDClassID, @@ -964,7 +964,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * */ - STDQT_METHOD(Close) (THIS) PURE; + STDTQT_METHOD(Close) (THIS) PURE; /************************************************************************ * Method: @@ -976,7 +976,7 @@ DECLARE_INTERFACE_(IHXPlugin2Handler, IUnknown) * */ - STDQT_METHOD(SetRequiredPlugins) (THIS_ const char** ppszRequiredPlugins) PURE; + STDTQT_METHOD(SetRequiredPlugins) (THIS_ const char** ppszRequiredPlugins) PURE; }; @@ -1014,7 +1014,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Sets up the context without loading any plugin info * */ - STDQT_METHOD( RegisterContext )( THIS_ IUnknown* pContext ) PURE; + STDTQT_METHOD( RegisterContext )( THIS_ IUnknown* pContext ) PURE; /************************************************************************ * Method: @@ -1024,7 +1024,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Sets up the plugins stored in this preferences object * */ - STDQT_METHOD( AddPluginMountPoint )( THIS_ const char* pName, UINT32 majorVersion, + STDTQT_METHOD( AddPluginMountPoint )( THIS_ const char* pName, UINT32 majorVersion, UINT32 minorVersion, IHXBuffer* pPath ) PURE; @@ -1036,7 +1036,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Refreshes plugin information associated with this * preferences object */ - STDQT_METHOD( RefreshPluginMountPoint )( THIS_ const char* pName ) PURE; + STDTQT_METHOD( RefreshPluginMountPoint )( THIS_ const char* pName ) PURE; /************************************************************************ @@ -1046,7 +1046,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Purpose: * Removes plugins associated with this preferences object */ - STDQT_METHOD( RemovePluginMountPoint )( THIS_ const char* pName ) PURE; + STDTQT_METHOD( RemovePluginMountPoint )( THIS_ const char* pName ) PURE; /************************************************************************ @@ -1060,7 +1060,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * context */ - STDQT_METHOD( FindImplementationFromClassID )( THIS_ REFGUID GUIDClassID, + STDTQT_METHOD( FindImplementationFromClassID )( THIS_ REFGUID GUIDClassID, REF(IUnknown*) pIUnknownInstance, IUnknown* pIUnkOuter, IUnknown* pContext ) PURE; @@ -1073,7 +1073,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Maps a text name to a CLSID based on information from * component plugins */ - STDQT_METHOD( FindCLSIDFromName )( THIS_ const char* pName, REF(IHXBuffer*) pCLSID ) PURE; + STDTQT_METHOD( FindCLSIDFromName )( THIS_ const char* pName, REF(IHXBuffer*) pCLSID ) PURE; /************************************************************************ @@ -1084,7 +1084,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Builds a collection of plugins that match the criteria * */ - STDQT_METHOD(FindGroupOfPluginsUsingValues)(THIS_ IHXValues* pValues, + STDTQT_METHOD(FindGroupOfPluginsUsingValues)(THIS_ IHXValues* pValues, REF(IHXPluginSearchEnumerator*) pIEnumerator) PURE; /************************************************************************ @@ -1095,7 +1095,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Builds a collection of plugins that match the criteria * */ - STDQT_METHOD(FindGroupOfPluginsUsingStrings)(THIS_ char* PropName1, + STDTQT_METHOD(FindGroupOfPluginsUsingStrings)(THIS_ char* PropName1, char* PropVal1, char* PropName2, char* PropVal2, @@ -1112,7 +1112,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Allocates a plugin based on index. Supports aggregation * */ - STDQT_METHOD(GetPlugin)(THIS_ ULONG32 ulIndex, + STDTQT_METHOD(GetPlugin)(THIS_ ULONG32 ulIndex, REF(IUnknown*) pIUnkResult, IUnknown* pIUnkOuter ) PURE; @@ -1124,7 +1124,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Allocates a plugin based on criteria. Supports aggregation * */ - STDQT_METHOD(FindPluginUsingValues)(THIS_ IHXValues*, + STDTQT_METHOD(FindPluginUsingValues)(THIS_ IHXValues*, REF(IUnknown*) pIUnkResult, IUnknown* pIUnkOuter ) PURE; @@ -1137,7 +1137,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Allocates a plugin based on criteria. Supports aggregation * */ - STDQT_METHOD(FindPluginUsingStrings)(THIS_ char* PropName1, + STDTQT_METHOD(FindPluginUsingStrings)(THIS_ char* PropName1, char* PropVal1, char* PropName2, char* PropVal2, @@ -1155,7 +1155,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * and returns TRUE in response to query */ - STDQT_METHOD( UnloadPluginFromClassID )( THIS_ REFGUID GUIDClassID ) PURE; + STDTQT_METHOD( UnloadPluginFromClassID )( THIS_ REFGUID GUIDClassID ) PURE; /************************************************************************ * Method: @@ -1164,7 +1164,7 @@ DECLARE_INTERFACE_(IHXPluginHandler3, IUnknown) * Purpose: * finds a package from the name passed in and attempts to unload it. */ - STDQT_METHOD (UnloadPackageByName) (char const* pName) PURE; + STDTQT_METHOD (UnloadPackageByName) (char const* pName) PURE; }; // $EndPrivate. @@ -1212,7 +1212,7 @@ DECLARE_INTERFACE_(IHXPluginDatabase, IUnknown) * Create a new index in the plugin-handler * */ - STDQT_METHOD( AddPluginIndex ) ( THIS_ const char* pKeyName, EPluginIndexType indexType, HXBOOL bScanExisting ) PURE; + STDTQT_METHOD( AddPluginIndex ) ( THIS_ const char* pKeyName, EPluginIndexType indexType, HXBOOL bScanExisting ) PURE; /************************************************************************ * Method: @@ -1222,7 +1222,7 @@ DECLARE_INTERFACE_(IHXPluginDatabase, IUnknown) * Remove an index from the plugin handler * */ - STDQT_METHOD( RemovePluginIndex )( THIS_ const char* pKeyName ) PURE; + STDTQT_METHOD( RemovePluginIndex )( THIS_ const char* pKeyName ) PURE; /************************************************************************ @@ -1234,7 +1234,7 @@ DECLARE_INTERFACE_(IHXPluginDatabase, IUnknown) * possible, otherwise defer to a linear search * */ - STDQT_METHOD( FindPluginInfoViaIndex )( THIS_ const char* pKeyName, const void* pValue, IHXValues** ppIInfo ) PURE; + STDTQT_METHOD( FindPluginInfoViaIndex )( THIS_ const char* pKeyName, const void* pValue, IHXValues** ppIInfo ) PURE; /************************************************************************ * Method: @@ -1245,7 +1245,7 @@ DECLARE_INTERFACE_(IHXPluginDatabase, IUnknown) * Find a set of plugins matching a single attribute * */ - STDQT_METHOD( FindPluginSetViaIndex )( THIS_ const char* pKeyName, const void* pValue, IHXPluginSearchEnumerator** ppIEnumerator ) PURE; + STDTQT_METHOD( FindPluginSetViaIndex )( THIS_ const char* pKeyName, const void* pValue, IHXPluginSearchEnumerator** ppIEnumerator ) PURE; /************************************************************************ * Method: @@ -1255,7 +1255,7 @@ DECLARE_INTERFACE_(IHXPluginDatabase, IUnknown) * Create a plugin based on a simple attribute. * */ - STDQT_METHOD( CreatePluginViaIndex )( THIS_ const char* pKeyName, const void* pValue, IUnknown** ppIUnkPlugin, IUnknown* pIUnkOuter ) PURE; + STDTQT_METHOD( CreatePluginViaIndex )( THIS_ const char* pKeyName, const void* pValue, IUnknown** ppIUnkPlugin, IUnknown* pIUnkOuter ) PURE; }; // $EndPrivate. @@ -1289,7 +1289,7 @@ DECLARE_INTERFACE_(IHXProxiedPlugin, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1307,7 +1307,7 @@ DECLARE_INTERFACE_(IHXProxiedPlugin, IUnknown) * Purpose: * Gets the Actual Plugin being used... */ - STDQT_METHOD(GetProxiedPlugin)(THIS_ + STDTQT_METHOD(GetProxiedPlugin)(THIS_ REF(IHXPlugin*) /*OUT*/ pPlugin) PURE; }; @@ -1375,7 +1375,7 @@ DECLARE_INTERFACE_(IHXComponentPlugin, IUnknown) * IHXComponentPlugin::GetComponentInfoAtIndex * Purpose: */ - STDQT_METHOD(GetComponentInfoAtIndex) (THIS_ + STDTQT_METHOD(GetComponentInfoAtIndex) (THIS_ UINT32 /*IN*/ nIndex, REF(IHXValues*) /*OUT*/ pInfo) PURE; @@ -1384,7 +1384,7 @@ DECLARE_INTERFACE_(IHXComponentPlugin, IUnknown) * IHXComponentPlugin::CreateComponentInstance * Purpose: */ - STDQT_METHOD(CreateComponentInstance)(THIS_ + STDTQT_METHOD(CreateComponentInstance)(THIS_ REFCLSID /*IN*/ rclsid, REF(IUnknown*) /*OUT*/ ppUnknown, IUnknown* /*IN*/ pUnkOuter) PURE; @@ -1415,7 +1415,7 @@ DECLARE_INTERFACE_(IHXPluginNamespace, IUnknown) * IHXPluginNamespace::GetPluginNamespace * Purpose: */ - STDQT_METHOD(GetPluginNamespace) (THIS_ + STDTQT_METHOD(GetPluginNamespace) (THIS_ REF(IHXBuffer*) /*OUT*/ pBuffer) PURE; }; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxprefs.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxprefs.h index 2a2b3a08..7e722690 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxprefs.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxprefs.h @@ -114,7 +114,7 @@ DECLARE_INTERFACE_(IHXPreferences, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -132,7 +132,7 @@ DECLARE_INTERFACE_(IHXPreferences, IUnknown) * Purpose: * Read a preference from the registry or configuration. */ - STDQT_METHOD(ReadPref) (THIS_ + STDTQT_METHOD(ReadPref) (THIS_ const char* pPrekKey, REF(IHXBuffer*) pBuffer) PURE; /************************************************************************ @@ -141,7 +141,7 @@ DECLARE_INTERFACE_(IHXPreferences, IUnknown) * Purpose: * TBD */ - STDQT_METHOD(WritePref) (THIS_ + STDTQT_METHOD(WritePref) (THIS_ const char* pPrekKey, IHXBuffer* pBuffer) PURE; }; @@ -174,7 +174,7 @@ DECLARE_INTERFACE_(IHXPreferenceEnumerator, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -193,7 +193,7 @@ DECLARE_INTERFACE_(IHXPreferenceEnumerator, IUnknown) * TBD */ - STDQT_METHOD(BeginSubPref) (THIS_ const char* szSubPref) PURE; + STDTQT_METHOD(BeginSubPref) (THIS_ const char* szSubPref) PURE; /************************************************************************ @@ -203,7 +203,7 @@ DECLARE_INTERFACE_(IHXPreferenceEnumerator, IUnknown) * TBD */ - STDQT_METHOD(EndSubPref) (THIS) PURE; + STDTQT_METHOD(EndSubPref) (THIS) PURE; /************************************************************************ * Method: @@ -212,7 +212,7 @@ DECLARE_INTERFACE_(IHXPreferenceEnumerator, IUnknown) * TBD */ - STDQT_METHOD(GetPrefKey) (THIS_ UINT32 nIndex, REF(IHXBuffer*) pBuffer) PURE; + STDTQT_METHOD(GetPrefKey) (THIS_ UINT32 nIndex, REF(IHXBuffer*) pBuffer) PURE; /************************************************************************ * Method: @@ -220,7 +220,7 @@ DECLARE_INTERFACE_(IHXPreferenceEnumerator, IUnknown) * Purpose: * TBD */ - STDQT_METHOD(ReadPref) (THIS_ + STDTQT_METHOD(ReadPref) (THIS_ const char* pPrefKey, IHXBuffer*& pBuffer) PURE; }; @@ -255,7 +255,7 @@ DECLARE_INTERFACE_(IHXPreferences2, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -274,7 +274,7 @@ DECLARE_INTERFACE_(IHXPreferences2, IUnknown) * Read a preference from the registry or configuration. */ - STDQT_METHOD(GetPreferenceEnumerator)(THIS_ REF(IHXPreferenceEnumerator*) /*OUT*/ pEnum) PURE; + STDTQT_METHOD(GetPreferenceEnumerator)(THIS_ REF(IHXPreferenceEnumerator*) /*OUT*/ pEnum) PURE; /************************************************************************ * Method: @@ -283,7 +283,7 @@ DECLARE_INTERFACE_(IHXPreferences2, IUnknown) * Reset the root of the preferences */ - STDQT_METHOD(ResetRoot)(THIS_ const char* pCompanyName, const char* pProductName, + STDTQT_METHOD(ResetRoot)(THIS_ const char* pCompanyName, const char* pProductName, int nProdMajorVer, int nProdMinorVer) PURE; }; @@ -321,7 +321,7 @@ DECLARE_INTERFACE_(IHXPreferences3, IUnknown) * Open a specified collection of preferences */ - STDQT_METHOD( Open )(THIS_ const char* pCompanyName, const char* pProductName, + STDTQT_METHOD( Open )(THIS_ const char* pCompanyName, const char* pProductName, ULONG32 nProdMajorVer, ULONG32 nProdMinorVer) PURE; /************************************************************************ @@ -331,7 +331,7 @@ DECLARE_INTERFACE_(IHXPreferences3, IUnknown) * Have this preference object read/write from the company wide * shared location for all products */ - STDQT_METHOD( OpenShared )( THIS_ const char* pCompanyName) PURE; + STDTQT_METHOD( OpenShared )( THIS_ const char* pCompanyName) PURE; /************************************************************************ * Method: @@ -340,7 +340,7 @@ DECLARE_INTERFACE_(IHXPreferences3, IUnknown) * Delete a preference */ - STDQT_METHOD(DeletePref)( THIS_ const char* pPrekKey ) PURE; + STDTQT_METHOD(DeletePref)( THIS_ const char* pPrekKey ) PURE; }; // $EndPrivate. diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h index c2697da7..180c5e5d 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h @@ -27,8 +27,8 @@ typedef LONG32 HX_RESULT; # define MAKE_HRESULT(sev,fac,code) \ ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | \ ((unsigned long)(code))) ) -# define SUCCEEDED(Status) (((unsigned long)(Status)>>31) == 0) -# define FAILED(Status) (((unsigned long)(Status)>>31) != 0) +# define SUCCEEDED(tqStatus) (((unsigned long)(tqStatus)>>31) == 0) +# define FAILED(tqStatus) (((unsigned long)(tqStatus)>>31) != 0) #else # ifndef _HRESULT_DEFINED typedef LONG32 HRESULT; @@ -120,7 +120,7 @@ typedef LONG32 HX_RESULT; #define HXR_WM_OPL_NOT_SUPPORTED MAKE_HX_RESULT(1,SS_GLO,36) // 80040024 // $Private: -/* Status Code for backup/restore*/ +/* tqStatus Code for backup/restore*/ #define HXR_RESTORATION_COMPLETE MAKE_HX_RESULT(1,SS_GLO,27) // 8004001b #define HXR_BACKUP_COMPLETE MAKE_HX_RESULT(1,SS_GLO,28) // 8004001c #define HXR_TLC_NOT_CERTIFIED MAKE_HX_RESULT(1,SS_GLO,29) // 8004001d @@ -168,7 +168,7 @@ typedef LONG32 HX_RESULT; #define HXR_AUTH_TCP_CONNECT_FAILURE MAKE_HX_RESULT(1,SS_NET,36) // 80040064 #define HXR_AUTH_TCP_CONNECT_TIMEOUT MAKE_HX_RESULT(1,SS_NET,37) // 80040065 #define HXR_AUTH_FAILURE MAKE_HX_RESULT(1,SS_NET,38) // 80040066 -#define HXR_AUTH_REQ_PARAMETER_MISSING MAKE_HX_RESULT(1,SS_NET,39) // 80040067 +#define HXR_AUTH_RETQ_PARAMETER_MISSING MAKE_HX_RESULT(1,SS_NET,39) // 80040067 #define HXR_DNS_RESOLVE_FAILURE MAKE_HX_RESULT(1,SS_NET,40) // 80040068 #define HXR_AUTH_SUCCEEDED MAKE_HX_RESULT(0,SS_NET,40) // 00040068 #define HXR_PULL_AUTHENTICATION_FAILED MAKE_HX_RESULT(1,SS_NET,41) // 80040069 @@ -319,7 +319,7 @@ typedef LONG32 HX_RESULT; #define HXR_RMT_INVALID_ENDTIME MAKE_HX_RESULT(1,SS_RMT,2) // 800403c2 #define HXR_RMT_MISSING_INPUT_FILE MAKE_HX_RESULT(1,SS_RMT,3) // 800403c3 #define HXR_RMT_MISSING_OUTPUT_FILE MAKE_HX_RESULT(1,SS_RMT,4) // 800403c4 -#define HXR_RMT_INPUT_EQUALS_OUTPUT_FILE MAKE_HX_RESULT(1,SS_RMT,5) // 800403c5 +#define HXR_RMT_INPUT_ETQUALS_OUTPUT_FILE MAKE_HX_RESULT(1,SS_RMT,5) // 800403c5 #define HXR_RMT_UNSUPPORTED_AUDIO_VERSION MAKE_HX_RESULT(1,SS_RMT,6) // 800403c6 #define HXR_RMT_DIFFERENT_AUDIO MAKE_HX_RESULT(1,SS_RMT,7) // 800403c7 #define HXR_RMT_DIFFERENT_VIDEO MAKE_HX_RESULT(1,SS_RMT,8) // 800403c8 @@ -463,11 +463,11 @@ typedef LONG32 HX_RESULT; #define HXR_SE_MAX_FAILED_AUTHENTICATIONS MAKE_HX_RESULT(1, SS_SAM, 33) // 80041921 #define HXR_SE_AUTH_ACCESS_DENIED MAKE_HX_RESULT(1, SS_SAM, 34) // 80041922 #define HXR_SE_AUTH_UUID_READ_ONLY MAKE_HX_RESULT(1, SS_SAM, 35) // 80041923 -#define HXR_SE_AUTH_UUID_NOT_UNIQUE MAKE_HX_RESULT(1, SS_SAM, 36) // 80041924 +#define HXR_SE_AUTH_UUID_NOT_UNITQUE MAKE_HX_RESULT(1, SS_SAM, 36) // 80041924 #define HXR_SE_AUTH_NO_SUCH_USER MAKE_HX_RESULT(1, SS_SAM, 37) // 80041925 #define HXR_SE_AUTH_REGISTRATION_SUCCEEDED MAKE_HX_RESULT(1, SS_SAM, 38) // 80041926 #define HXR_SE_AUTH_REGISTRATION_FAILED MAKE_HX_RESULT(1, SS_SAM, 39) // 80041927 -#define HXR_SE_AUTH_REGISTRATION_GUID_REQUIRED MAKE_HX_RESULT(1, SS_SAM, 40) // 80041928 +#define HXR_SE_AUTH_REGISTRATION_GUID_RETQUIRED MAKE_HX_RESULT(1, SS_SAM, 40) // 80041928 #define HXR_SE_AUTH_UNREGISTERED_PLAYER MAKE_HX_RESULT(1, SS_SAM, 41) // 80041929 #define HXR_SE_AUTH_TIME_EXPIRED MAKE_HX_RESULT(1, SS_SAM, 42) // 8004192a #define HXR_SE_AUTH_NO_TIME_LEFT MAKE_HX_RESULT(1, SS_SAM, 43) // 8004192b diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtbuf.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtbuf.h index fcfff134..7b6310d0 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtbuf.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtbuf.h @@ -44,7 +44,7 @@ DECLARE_INTERFACE_(IHXTimeStampedBuffer, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -57,7 +57,7 @@ DECLARE_INTERFACE_(IHXTimeStampedBuffer, IUnknown) */ STDMETHOD_(UINT32,GetTimeStamp)(THIS) PURE; - STDQT_METHOD(SetTimeStamp)(THIS_ + STDTQT_METHOD(SetTimeStamp)(THIS_ UINT32 ulTimeStamp) PURE; }; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h index 32c19701..e9f95e5c 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h @@ -63,8 +63,8 @@ typedef TBool BOOL; #else # ifndef _VXWORKS -# if defined(QWS) && !defined(QT_CLEAN_NAMESPACE) -#error "You need to define QT_CLEAN_NAMESPACE when using Qt with Helix. If you don't you'll have conflicts with the Helix INT32, UINT32, and UINT definitions" +# if defined(TQWS) && !defined(TQT_CLEAN_NAMESPACE) +#error "You need to define TQT_CLEAN_NAMESPACE when using TQt with Helix. If you don't you'll have conflicts with the Helix INT32, UINT32, and UINT definitions" # endif typedef char INT8; /* signed 8 bit value */ @@ -113,7 +113,7 @@ typedef TBool BOOL; #endif -#define ARE_BOOLS_EQUAL(a,b) (((a) && (b)) || (!(a) && !(b))) +#define ARE_BOOLS_ETQUAL(a,b) (((a) && (b)) || (!(a) && !(b))) #ifndef HX_BITFIELD typedef unsigned char HX_BITFIELD; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvalue.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvalue.h index de321d7e..98857d3a 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvalue.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvalue.h @@ -58,7 +58,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -77,7 +77,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) * Add a new key/value tuple to our list of strings. You can have * multiple strings for the same key. */ - STDQT_METHOD(AddKeyValue) (THIS_ + STDTQT_METHOD(AddKeyValue) (THIS_ const char* pKey, IHXBuffer* pStr) PURE; @@ -88,7 +88,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) * Return an iterator that allows you to iterate through all the * key/value tuples in our list of strings. */ - STDQT_METHOD(GetIter) (THIS_ + STDTQT_METHOD(GetIter) (THIS_ REF(IHXKeyValueListIter*) pIter) PURE; @@ -99,7 +99,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) * Return an iterator that allows you to iterate through all the * strings for a particular key. */ - STDQT_METHOD(GetIterOneKey) (THIS_ + STDTQT_METHOD(GetIterOneKey) (THIS_ const char* pKey, REF(IHXKeyValueListIterOneKey*) pIter) PURE; @@ -110,7 +110,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) * Append all the key/string tuples from another list to this list. * (You can have duplicate keys.) */ - STDQT_METHOD(AppendAllListItems) (THIS_ + STDTQT_METHOD(AppendAllListItems) (THIS_ IHXKeyValueList* pList) PURE; /************************************************************************ * Method: @@ -127,7 +127,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) * Purpose: * Create an empty object that is the same class as the current object. */ - STDQT_METHOD(CreateObject) (THIS_ + STDTQT_METHOD(CreateObject) (THIS_ REF(IHXKeyValueList*) pNewList) PURE; /************************************************************************ @@ -139,7 +139,7 @@ DECLARE_INTERFACE_(IHXKeyValueList, IUnknown) * ULONGs and Buffers. You can have duplicate keys, and old data is * left untouched. */ - STDQT_METHOD(ImportValues) (THIS_ + STDTQT_METHOD(ImportValues) (THIS_ IHXValues* pValues) PURE; }; @@ -174,7 +174,7 @@ DECLARE_INTERFACE_(IHXKeyValueListIter, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -195,7 +195,7 @@ DECLARE_INTERFACE_(IHXKeyValueListIter, IUnknown) * list of strings. Strings are returned in same order that they * were inserted. */ - STDQT_METHOD(GetNextPair) (THIS_ + STDTQT_METHOD(GetNextPair) (THIS_ REF(const char*) pKey, REF(IHXBuffer*) pStr) PURE; @@ -206,7 +206,7 @@ DECLARE_INTERFACE_(IHXKeyValueListIter, IUnknown) * Replaces the value in the key/value tuple that was returned * in the last call to GetNextPair with a new string. */ - STDQT_METHOD(ReplaceCurr) (THIS_ + STDTQT_METHOD(ReplaceCurr) (THIS_ IHXBuffer* pStr) PURE; }; @@ -241,7 +241,7 @@ DECLARE_INTERFACE_(IHXKeyValueListIterOneKey, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -263,7 +263,7 @@ DECLARE_INTERFACE_(IHXKeyValueListIterOneKey, IUnknown) * were inserted. * */ - STDQT_METHOD(GetNextString) (THIS_ + STDTQT_METHOD(GetNextString) (THIS_ REF(IHXBuffer*) pStr) PURE; /************************************************************************ @@ -274,7 +274,7 @@ DECLARE_INTERFACE_(IHXKeyValueListIterOneKey, IUnknown) * in the last call to GetNextString with a new string. * */ - STDQT_METHOD(ReplaceCurr) (THIS_ + STDTQT_METHOD(ReplaceCurr) (THIS_ IHXBuffer* pStr) PURE; }; @@ -310,7 +310,7 @@ DECLARE_INTERFACE_(IHXOptions, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -335,7 +335,7 @@ DECLARE_INTERFACE_(IHXOptions, IUnknown) * the current setting for that option. * */ - STDQT_METHOD(GetOptions) (THIS_ + STDTQT_METHOD(GetOptions) (THIS_ REF(IHXValues*) pOptions) PURE; /************************************************************************ @@ -346,7 +346,7 @@ DECLARE_INTERFACE_(IHXOptions, IUnknown) * whether or not the SetOptionULONG32 call succeeded. * */ - STDQT_METHOD(SetOptionULONG32) (THIS_ + STDTQT_METHOD(SetOptionULONG32) (THIS_ const char* pName, ULONG32 ulValue) PURE; @@ -358,7 +358,7 @@ DECLARE_INTERFACE_(IHXOptions, IUnknown) * whether or not the SetOptionCString call succeeded. * */ - STDQT_METHOD(SetOptionCString) (THIS_ + STDTQT_METHOD(SetOptionCString) (THIS_ const char* pName, IHXBuffer* pValue) PURE; @@ -370,7 +370,7 @@ DECLARE_INTERFACE_(IHXOptions, IUnknown) * whether or not the SetOptionBuffer call succeeded. * */ - STDQT_METHOD(SetOptionBuffer) (THIS_ + STDTQT_METHOD(SetOptionBuffer) (THIS_ const char* pName, IHXBuffer* pValue) PURE; }; diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvsrc.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvsrc.h index f4d4c368..3506a291 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvsrc.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxvsrc.h @@ -59,20 +59,20 @@ DECLARE_INTERFACE_(IHXFileViewSource, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /************************************************************************ * IHXFileViewSource */ - STDQT_METHOD(InitViewSource) (THIS_ + STDTQT_METHOD(InitViewSource) (THIS_ IHXFileObject* /*IN*/ pFileObject, IHXFileViewSourceResponse* /*IN*/ pResp, SOURCE_TYPE /*IN*/ sourceType, IHXValues* /*IN*/ pOptions) PURE; - STDQT_METHOD(GetSource) (THIS) PURE; - STDQT_METHOD(Close) (THIS) PURE; + STDTQT_METHOD(GetSource) (THIS) PURE; + STDTQT_METHOD(Close) (THIS) PURE; }; /**************************************************************************** @@ -98,17 +98,17 @@ DECLARE_INTERFACE_(IHXFileViewSourceResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /************************************************************************ * IHXFileViewSourceResoponse */ - STDQT_METHOD(InitDone) (THIS_ HX_RESULT status ) PURE; - STDQT_METHOD(SourceReady) (THIS_ HX_RESULT status, + STDTQT_METHOD(InitDone) (THIS_ HX_RESULT status ) PURE; + STDTQT_METHOD(SourceReady) (THIS_ HX_RESULT status, IHXBuffer* pSource ) PURE; - STDQT_METHOD(CloseDone) (THIS_ HX_RESULT) PURE; + STDTQT_METHOD(CloseDone) (THIS_ HX_RESULT) PURE; }; /**************************************************************************** @@ -133,7 +133,7 @@ DECLARE_INTERFACE_(IHXViewSourceCommand, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; @@ -142,9 +142,9 @@ DECLARE_INTERFACE_(IHXViewSourceCommand, IUnknown) */ STDMETHOD_(HXBOOL, CanViewSource) (THIS_ IHXStreamSource* pStream) PURE; - STDQT_METHOD(DoViewSource) (THIS_ + STDTQT_METHOD(DoViewSource) (THIS_ IHXStreamSource* pStream) PURE; - STDQT_METHOD(GetViewSourceURL) (THIS_ + STDTQT_METHOD(GetViewSourceURL) (THIS_ IHXStreamSource* pSource, IHXViewSourceURLResponse* pResp) PURE; }; @@ -171,14 +171,14 @@ DECLARE_INTERFACE_(IHXViewSourceURLResponse, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /************************************************************************ * IHXViewSourceURLResponse */ - STDQT_METHOD(ViewSourceURLReady) (THIS_ + STDTQT_METHOD(ViewSourceURLReady) (THIS_ const char* /*out*/ pUrl) PURE; }; @@ -205,20 +205,20 @@ DECLARE_INTERFACE_(IHXClientViewSource, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /************************************************************************ * IHXClientViewSource */ - STDQT_METHOD(DoViewSource) (THIS_ + STDTQT_METHOD(DoViewSource) (THIS_ IUnknown* /*IN*/ pPlayerContext, IHXStreamSource* /*IN*/ pSource) PURE; STDMETHOD_(HXBOOL, CanViewSource) (THIS_ IHXStreamSource* /*IN*/ pSource) PURE; - STDQT_METHOD(GetViewSourceURL) (THIS_ + STDTQT_METHOD(GetViewSourceURL) (THIS_ IUnknown* pPlayerContext, IHXStreamSource* pSource, IHXViewSourceURLResponse* pResp) PURE; @@ -247,14 +247,14 @@ DECLARE_INTERFACE_(IHXClientViewSourceSink, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /************************************************************************ * IHXClientViewSourceSink */ - STDQT_METHOD(RegisterViewSourceHdlr) (THIS_ + STDTQT_METHOD(RegisterViewSourceHdlr) (THIS_ IHXClientViewSource* /*in*/ pViewSourceHdlr) PURE; }; @@ -280,14 +280,14 @@ DECLARE_INTERFACE_(IHXClientViewRights, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /************************************************************************ * IHXClientViewRights */ - STDQT_METHOD(ViewRights) (THIS_ + STDTQT_METHOD(ViewRights) (THIS_ IUnknown* /*IN*/ pPlayerContext) PURE; STDMETHOD_(HXBOOL, CanViewRights) (THIS) PURE; 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 2aefb311..df4b7548 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 @@ -102,7 +102,7 @@ DECLARE_INTERFACE_(IHXSiteWindowed, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -122,21 +122,21 @@ DECLARE_INTERFACE_(IHXSiteWindowed, IUnknown) * of Site. * */ - STDQT_METHOD(AttachWindow) (THIS_ + STDTQT_METHOD(AttachWindow) (THIS_ HXxWindow* /*IN*/ pWindow) PURE; - STDQT_METHOD(DetachWindow) (THIS) PURE; + STDTQT_METHOD(DetachWindow) (THIS) PURE; /* * IHXSiteWindowed methods called by Owners of the site * in the event that want a default top level window created * for the site. */ - STDQT_METHOD(Create) (THIS_ + STDTQT_METHOD(Create) (THIS_ void* ParentWindow, UINT32 style) PURE; - STDQT_METHOD(Destroy) (THIS) PURE; + STDTQT_METHOD(Destroy) (THIS) PURE; /* * IHXSiteWindowed method. Returns actual window of the site. @@ -175,7 +175,7 @@ DECLARE_INTERFACE_(IHXSiteEventHandler, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -188,7 +188,7 @@ DECLARE_INTERFACE_(IHXSiteEventHandler, IUnknown) * The imeplementation of this interface must pass the events * on to the individual CHXSiteWindowed sites. */ - STDQT_METHOD(EventOccurred) (THIS_ HXxEvent* pEvent) PURE; + STDTQT_METHOD(EventOccurred) (THIS_ HXxEvent* pEvent) PURE; }; // $EndPrivate. @@ -222,7 +222,7 @@ DECLARE_INTERFACE_(IHXSiteWindowless, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -233,11 +233,11 @@ DECLARE_INTERFACE_(IHXSiteWindowless, IUnknown) /* * IHXSiteWindowless methods called by owners of the site. */ - STDQT_METHOD(EventOccurred) (THIS_ + STDTQT_METHOD(EventOccurred) (THIS_ HXxEvent* /*IN*/ pEvent) PURE; /* - * IHXSiteWindowless method. Returns some parent window that + * IHXSiteWindowless method. Returns some tqparent window that * owns the windowless site. Useful for right-click menus and * dialog box calls. */ @@ -271,7 +271,7 @@ DECLARE_INTERFACE_(IHXSite, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -284,19 +284,19 @@ DECLARE_INTERFACE_(IHXSite, IUnknown) * associate users with the site, and to create child sites * as appropriate. */ - STDQT_METHOD(AttachUser) (THIS_ + STDTQT_METHOD(AttachUser) (THIS_ IHXSiteUser* /*IN*/ pUser) PURE; - STDQT_METHOD(DetachUser) (THIS) PURE; + STDTQT_METHOD(DetachUser) (THIS) PURE; - STDQT_METHOD(GetUser) (THIS_ + STDTQT_METHOD(GetUser) (THIS_ REF(IHXSiteUser*) /*OUT*/ pUser) PURE; - STDQT_METHOD(CreateChild) (THIS_ + STDTQT_METHOD(CreateChild) (THIS_ REF(IHXSite*) /*OUT*/ pChildSite) PURE; - STDQT_METHOD(DestroyChild) (THIS_ + STDTQT_METHOD(DestroyChild) (THIS_ IHXSite* /*IN*/ pChildSite) PURE; /* @@ -304,34 +304,34 @@ DECLARE_INTERFACE_(IHXSite, IUnknown) * is displayed in order to manage its position. Site users should * not generally call these methods. */ - STDQT_METHOD(AttachWatcher) (THIS_ + STDTQT_METHOD(AttachWatcher) (THIS_ IHXSiteWatcher* /*IN*/ pWatcher) PURE; - STDQT_METHOD(DetachWatcher) (THIS) PURE; + STDTQT_METHOD(DetachWatcher) (THIS) PURE; - STDQT_METHOD(SetPosition) (THIS_ + STDTQT_METHOD(SetPosition) (THIS_ HXxPoint position) PURE; - STDQT_METHOD(GetPosition) (THIS_ + STDTQT_METHOD(GetPosition) (THIS_ REF(HXxPoint) position) PURE; /* * IHXSite methods called by the user of the site to get * information about the site, and to manipulate the site. */ - STDQT_METHOD(SetSize) (THIS_ + STDTQT_METHOD(SetSize) (THIS_ HXxSize size) PURE; - STDQT_METHOD(GetSize) (THIS_ + STDTQT_METHOD(GetSize) (THIS_ REF(HXxSize) size) PURE; - STDQT_METHOD(DamageRect) (THIS_ + STDTQT_METHOD(DamageRect) (THIS_ HXxRect rect) PURE; - STDQT_METHOD(DamageRegion) (THIS_ + STDTQT_METHOD(DamageRegion) (THIS_ HXxRegion region) PURE; - STDQT_METHOD(ForceRedraw) (THIS) PURE; + STDTQT_METHOD(ForceRedraw) (THIS) PURE; }; @@ -362,15 +362,15 @@ DEFINE_GUID(IID_IHXSiteComposition, 0x00000D19, 0x901, 0x11d1, 0x8b, 0x6, 0x0, DECLARE_INTERFACE_(IHXSiteComposition, IUnknown) { /* IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; /* IHXSiteComposition methods. */ - STDQT_METHOD(LockComposition) (THIS) PURE; - STDQT_METHOD(UnlockComposition) (THIS) PURE; - STDQT_METHOD(BltComposition) (THIS) PURE; - STDQT_METHOD(SetCompositionMode) (THIS_ HXBOOL OnOrOff) PURE; + STDTQT_METHOD(LockComposition) (THIS) PURE; + STDTQT_METHOD(UnlockComposition) (THIS) PURE; + STDTQT_METHOD(BltComposition) (THIS) PURE; + STDTQT_METHOD(SetCompositionMode) (THIS_ HXBOOL OnOrOff) PURE; STDMETHOD_(HXBOOL, IsCompositionLocked) (THIS) PURE; STDMETHOD_(HXBOOL, IsCompositionMode) (THIS) PURE; }; @@ -403,7 +403,7 @@ DECLARE_INTERFACE_(IHXSiteUser, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -415,15 +415,15 @@ DECLARE_INTERFACE_(IHXSiteUser, IUnknown) * IHXSiteUser methods usually called by the "context" to * associate users with the site. */ - STDQT_METHOD(AttachSite) (THIS_ + STDTQT_METHOD(AttachSite) (THIS_ IHXSite* /*IN*/ pSite) PURE; - STDQT_METHOD(DetachSite) (THIS) PURE; + STDTQT_METHOD(DetachSite) (THIS) PURE; /* * IHXSiteUser methods called to inform user of an event. */ - STDQT_METHOD(HandleEvent) (THIS_ + STDTQT_METHOD(HandleEvent) (THIS_ HXxEvent* /*IN*/ pEvent) PURE; STDMETHOD_(HXBOOL,NeedsWindowedSites) (THIS) PURE; @@ -455,7 +455,7 @@ DECLARE_INTERFACE_(IHXSiteWatcher, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -467,10 +467,10 @@ DECLARE_INTERFACE_(IHXSiteWatcher, IUnknown) * IHXSiteWatcher methods called by the site when a watcher * is attached to or detached from it. */ - STDQT_METHOD(AttachSite) (THIS_ + STDTQT_METHOD(AttachSite) (THIS_ IHXSite* /*IN*/ pSite) PURE; - STDQT_METHOD(DetachSite) (THIS) PURE; + STDTQT_METHOD(DetachSite) (THIS) PURE; /* * IHXSiteWatcher methods called by the site an attempt is @@ -480,11 +480,11 @@ DECLARE_INTERFACE_(IHXSiteWatcher, IUnknown) * will not change. The site watcher can also modify the new * size of position. */ - STDQT_METHOD(ChangingPosition) (THIS_ + STDTQT_METHOD(ChangingPosition) (THIS_ HXxPoint posOld, REF(HXxPoint)/*IN-OUT*/ posNew) PURE; - STDQT_METHOD(ChangingSize) (THIS_ + STDTQT_METHOD(ChangingSize) (THIS_ HXxSize sizeOld, REF(HXxSize) /*IN-OUT*/ sizeNew) PURE; }; @@ -497,7 +497,7 @@ DECLARE_INTERFACE_(IHXSiteWatcher, IUnknown) * * Purpose: * - * Interface implemented by renderers and objects with provide layouts to + * Interface implemented by renderers and objects with provide tqlayouts 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. * @@ -517,7 +517,7 @@ DECLARE_INTERFACE_(IHXSiteUserSupplier, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -530,10 +530,10 @@ DECLARE_INTERFACE_(IHXSiteUserSupplier, IUnknown) * "context" to ask for additional or to release previously * created site users. */ - STDQT_METHOD(CreateSiteUser) (THIS_ + STDTQT_METHOD(CreateSiteUser) (THIS_ REF(IHXSiteUser*)/*OUT*/ pSiteUser) PURE; - STDQT_METHOD(DestroySiteUser) (THIS_ + STDTQT_METHOD(DestroySiteUser) (THIS_ IHXSiteUser* /*IN*/ pSiteUser) PURE; STDMETHOD_(HXBOOL,NeedsWindowedSites) (THIS) PURE; @@ -568,7 +568,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -592,7 +592,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * the client core will inform the site supplier when this requested * site is no longer needed. */ - STDQT_METHOD(SitesNeeded) (THIS_ + STDTQT_METHOD(SitesNeeded) (THIS_ UINT32 uReqestID, IHXValues* pSiteProps) PURE; @@ -606,7 +606,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * to fulfill a request for sites it should call the site manager * and remove those sites. */ - STDQT_METHOD(SitesNotNeeded) (THIS_ + STDTQT_METHOD(SitesNotNeeded) (THIS_ UINT32 uReqestID) PURE; @@ -614,20 +614,20 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * Method: * IHXSiteSupplier::BeginChangeLayout * Purpose: - * Called to inform the site supplier a layout change has beginning + * Called to inform the site supplier a tqlayout change has beginning * it can expect to receive SitesNeeded() and SitesNotNeeded() calls - * while a layout change is in progress, + * while a tqlayout change is in progress, */ - STDQT_METHOD(BeginChangeLayout) (THIS) PURE; + STDTQT_METHOD(BeginChangeLayout) (THIS) PURE; /************************************************************************ * Method: * IHXSiteSupplier::DoneChangeLayout * Purpose: - * Called to inform the site supplier the layout change has been + * Called to inform the site supplier the tqlayout change has been * completed. */ - STDQT_METHOD(DoneChangeLayout) (THIS) PURE; + STDTQT_METHOD(DoneChangeLayout) (THIS) PURE; }; @@ -642,7 +642,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * * Interface implemented by the client core. This interface is called * by users of the client core to inform it of IHXSite's which are - * available for layout of renderers + * available for tqlayout of renderers * * IID_IHXSiteManager: * @@ -660,7 +660,7 @@ DECLARE_INTERFACE_(IHXSiteManager, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -678,7 +678,7 @@ DECLARE_INTERFACE_(IHXSiteManager, IUnknown) * Purpose: * Called to inform the site manager of the existence of a site. */ - STDQT_METHOD(AddSite) (THIS_ + STDTQT_METHOD(AddSite) (THIS_ IHXSite* pSite) PURE; /************************************************************************ @@ -688,7 +688,7 @@ DECLARE_INTERFACE_(IHXSiteManager, IUnknown) * Called to inform the site manager that a site is no longer * available. */ - STDQT_METHOD(RemoveSite) (THIS_ + STDTQT_METHOD(RemoveSite) (THIS_ IHXSite* pSite) PURE; }; @@ -730,7 +730,7 @@ DECLARE_INTERFACE_(IHXSiteManager2, IUnknown) * Called to get the number of sites that the site mananger currently * knows about. */ - STDQT_METHOD(GetNumberOfSites) (THIS_ REF(UINT32) nNumSites ) PURE; + STDTQT_METHOD(GetNumberOfSites) (THIS_ REF(UINT32) nNumSites ) PURE; /************************************************************************ * Method: @@ -739,7 +739,7 @@ DECLARE_INTERFACE_(IHXSiteManager2, IUnknown) * Used to iterate over the sites. * */ - STDQT_METHOD(GetSiteAt) (THIS_ UINT32 nIndex, REF(IHXSite*) pSite) PURE; + STDTQT_METHOD(GetSiteAt) (THIS_ UINT32 nIndex, REF(IHXSite*) pSite) PURE; }; // $EndPrivate. @@ -780,7 +780,7 @@ DECLARE_INTERFACE_(IHXMultiInstanceSiteUserSupplier, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -791,10 +791,10 @@ DECLARE_INTERFACE_(IHXMultiInstanceSiteUserSupplier, IUnknown) /* * IHXMultiInstanceSiteUserSupplier methods called by site users. */ - STDQT_METHOD(SetSingleSiteUser) (THIS_ + STDTQT_METHOD(SetSingleSiteUser) (THIS_ IUnknown* pUnknown) PURE; - STDQT_METHOD(ReleaseSingleSiteUser) (THIS) PURE; + STDTQT_METHOD(ReleaseSingleSiteUser) (THIS) PURE; }; @@ -828,7 +828,7 @@ DECLARE_INTERFACE_(IHXSiteEnumerator, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -849,7 +849,7 @@ DECLARE_INTERFACE_(IHXSiteEnumerator, IUnknown) * sitePosition with the position of the next site (if any). * Returns HXR_OK if the first site is available, HXR_FAIL if not. */ - STDQT_METHOD(GetFirstSite) (THIS_ + STDTQT_METHOD(GetFirstSite) (THIS_ REF(IHXSite*) /* OUT */ pFirstSite, REF(SitePosition) /* OUT */ nextPosition) PURE; @@ -862,7 +862,7 @@ DECLARE_INTERFACE_(IHXSiteEnumerator, IUnknown) * following site (if any). * Returns HXR_OK if the first site is available, HXR_FAIL if not. */ - STDQT_METHOD(GetNextSite) (THIS_ + STDTQT_METHOD(GetNextSite) (THIS_ REF(IHXSite*) pNextSite, REF(SitePosition) /* IN/OUT */ nextPosition) PURE; }; @@ -893,7 +893,7 @@ DECLARE_INTERFACE_(IHXSiteFullScreen, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -904,11 +904,11 @@ DECLARE_INTERFACE_(IHXSiteFullScreen, IUnknown) /* * IHXSiteFullScreen methods */ - STDQT_METHOD(EnterFullScreen) (THIS) PURE; + STDTQT_METHOD(EnterFullScreen) (THIS) PURE; - STDQT_METHOD(ExitFullScreen) (THIS) PURE; + STDTQT_METHOD(ExitFullScreen) (THIS) PURE; - STDQT_METHOD(TestFullScreen) (THIS_ + STDTQT_METHOD(TestFullScreen) (THIS_ void* hTestBitmap,const char* pszStatusText) PURE; STDMETHOD_(HXBOOL, IsFullScreen) (THIS) PURE; @@ -923,7 +923,7 @@ DECLARE_INTERFACE_(IHXSiteFullScreen, IUnknown) * * Purpose: * - * Allow layout site groups to be added and removed + * Allow tqlayout site groups to be added and removed * * IID_IHXLayoutSiteGroupManager: * @@ -941,7 +941,7 @@ DECLARE_INTERFACE_(IHXLayoutSiteGroupManager, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -952,10 +952,10 @@ DECLARE_INTERFACE_(IHXLayoutSiteGroupManager, IUnknown) /* * IHXLayoutSiteGroupManager methods */ - STDQT_METHOD(AddLayoutSiteGroup) (THIS_ + STDTQT_METHOD(AddLayoutSiteGroup) (THIS_ IUnknown* pLSG) PURE; - STDQT_METHOD(RemoveLayoutSiteGroup) (THIS_ + STDTQT_METHOD(RemoveLayoutSiteGroup) (THIS_ IUnknown* pLSG) PURE; }; // $EndPrivate. @@ -986,7 +986,7 @@ DECLARE_INTERFACE_(IHXEventHookMgr, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -997,12 +997,12 @@ DECLARE_INTERFACE_(IHXEventHookMgr, IUnknown) /* * IHXEventHookMgr methods */ - STDQT_METHOD(AddHook) (THIS_ + STDTQT_METHOD(AddHook) (THIS_ IHXEventHook* pHook, const char* pRegionName, UINT16 uLayer) PURE; - STDQT_METHOD(RemoveHook) (THIS_ + STDTQT_METHOD(RemoveHook) (THIS_ IHXEventHook* pHook, const char* pRegionName, UINT16 uLayer) PURE; @@ -1033,7 +1033,7 @@ DECLARE_INTERFACE_(IHXEventHook, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1044,12 +1044,12 @@ DECLARE_INTERFACE_(IHXEventHook, IUnknown) /* * IHXEventHook methods */ - STDQT_METHOD(SiteAdded) (THIS_ + STDTQT_METHOD(SiteAdded) (THIS_ IHXSite* pSite) PURE; - STDQT_METHOD(HandleEvent) (THIS_ + STDTQT_METHOD(HandleEvent) (THIS_ IHXSite* pSite, HXxEvent* pEvent) PURE; - STDQT_METHOD(SiteRemoved) (THIS_ + STDTQT_METHOD(SiteRemoved) (THIS_ IHXSite* pSite) PURE; }; @@ -1079,7 +1079,7 @@ DECLARE_INTERFACE_(IHXStatusMessage, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1091,7 +1091,7 @@ DECLARE_INTERFACE_(IHXStatusMessage, IUnknown) * IHXStatusMessage methods */ - STDQT_METHOD(SetStatus) (THIS_ const char* pText) PURE; + STDTQT_METHOD(SettqStatus) (THIS_ const char* pText) PURE; }; // $Private: @@ -1123,7 +1123,7 @@ DECLARE_INTERFACE_(IHXSiteTransition, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -1131,10 +1131,10 @@ DECLARE_INTERFACE_(IHXSiteTransition, IUnknown) STDMETHOD_(ULONG32,Release) (THIS) PURE; - STDQT_METHOD(Initialize) (THIS_ + STDTQT_METHOD(Initialize) (THIS_ IHXValues* pParams) PURE; - STDQT_METHOD(SetPercentage) (THIS_ + STDTQT_METHOD(SetPercentage) (THIS_ UINT32 nThousandnthsComplete) PURE; }; @@ -1174,7 +1174,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * This function creates a rectangular region. * */ - STDQT_METHOD(SetRect) (THIS_ HXxRect* pRect) PURE; + STDTQT_METHOD(SetRect) (THIS_ HXxRect* pRect) PURE; /************************************************************************ * Method: @@ -1183,7 +1183,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * This function creates a rectangular region. * */ - STDQT_METHOD(SetRect) (THIS_ int x, int y, int x1, int y1) PURE; + STDTQT_METHOD(SetRect) (THIS_ int x, int y, int x1, int y1) PURE; /************************************************************************ * Method: @@ -1193,7 +1193,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDQT_METHOD(SetPoly) (THIS_ HXxPoint** pRect, HXBOOL bUseWinding) PURE; + STDTQT_METHOD(SetPoly) (THIS_ HXxPoint** pRect, HXBOOL bUseWinding) PURE; /************************************************************************ * Method: @@ -1213,7 +1213,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDQT_METHOD(GetExtents) (THIS_ REF(HXxRect) rExtents) PURE; + STDTQT_METHOD(GetExtents) (THIS_ REF(HXxRect) rExtents) PURE; /************************************************************************ * Method: @@ -1223,7 +1223,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDQT_METHOD(Offset) (THIS_ HXxPoint* pOrigin) PURE; + STDTQT_METHOD(Offset) (THIS_ HXxPoint* pOrigin) PURE; /************************************************************************ * Method: @@ -1267,7 +1267,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDQT_METHOD(GetRectAtIndex) (THIS_ UINT32 nRectIndex, REF(HXxRect) rRect) PURE; + STDTQT_METHOD(GetRectAtIndex) (THIS_ UINT32 nRectIndex, REF(HXxRect) rRect) PURE; /************************************************************************ * Method: @@ -1278,7 +1278,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDQT_METHOD(UnionRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; + STDTQT_METHOD(UnionRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; /************************************************************************ * Method: @@ -1288,7 +1288,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDQT_METHOD(CopyRegion) (THIS_ REF(IHXRegion*) pDest) PURE; + STDTQT_METHOD(CopyRegion) (THIS_ REF(IHXRegion*) pDest) PURE; /************************************************************************ * Method: @@ -1298,7 +1298,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDQT_METHOD(DiffRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; + STDTQT_METHOD(DiffRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; /************************************************************************ * Method: @@ -1308,7 +1308,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDQT_METHOD(AndRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; + STDTQT_METHOD(AndRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; /************************************************************************ * Method: @@ -1318,7 +1318,7 @@ DECLARE_INTERFACE_(IHXRegion, IUnknown) * */ - STDQT_METHOD(XORRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; + STDTQT_METHOD(XORRegion) (THIS_ REF(IHXRegion*) pDest, IHXRegion* pSrc1) PURE; /************************************************************************ * Method: @@ -1361,7 +1361,7 @@ DECLARE_INTERFACE_(IHXColorConverterManager, IUnknown) * Get ColorConverter is called to obtain a color converter to convert * from a particular bitmap to another bitmap. */ - STDQT_METHOD(GetColorConverter) (THIS_ + STDTQT_METHOD(GetColorConverter) (THIS_ HXBitmapInfoHeader* /*IN*/ pBitmapInfoIn, HXBitmapInfoHeader* /*IN*/ pBitmapInfoOut, REF(IHXColorConverter*) /*OUT*/ pConverter) PURE; @@ -1396,7 +1396,7 @@ DECLARE_INTERFACE_(IHXColorConverter, IUnknown) * ColorConvert converts the pBitsIn from one color format to * the format of pBitsOut */ - STDQT_METHOD(ColorConvert) (THIS_ + STDTQT_METHOD(ColorConvert) (THIS_ UCHAR* pBitsIn, UCHAR* pBitsOut, HXxRect* pRectIn, @@ -1430,8 +1430,8 @@ DEFINE_GUID(IID_IHXOverlayResponse, 0x00000D22, 0x903, 0x11d1, 0x8b, DECLARE_INTERFACE_(IHXOverlayResponse, IUnknown) { - STDQT_METHOD(OverlayGranted) (THIS ) PURE; - STDQT_METHOD(OverlayRevoked) (THIS ) PURE; + STDTQT_METHOD(OverlayGranted) (THIS ) PURE; + STDTQT_METHOD(OverlayRevoked) (THIS ) PURE; }; @@ -1460,17 +1460,17 @@ DEFINE_GUID(IID_IHXOverlayManager, 0x00000D21, 0x903, 0x11d1, 0x8b, DECLARE_INTERFACE_(IHXOverlayManager, IUnknown) { - STDQT_METHOD(HasOverlay) (THIS_ + STDTQT_METHOD(HasOverlay) (THIS_ IHXOverlayResponse* pResp ) PURE; - STDQT_METHOD(AddStats) (THIS_ + STDTQT_METHOD(AddStats) (THIS_ IHXOverlayResponse* pResp, UINT32 ulNumPixels ) PURE; - STDQT_METHOD(RemoveOverlayRequest)(THIS_ IHXOverlayResponse* pResp ) PURE; + STDTQT_METHOD(RemoveOverlayRequest)(THIS_ IHXOverlayResponse* pResp ) PURE; }; @@ -1500,8 +1500,8 @@ DEFINE_GUID(IID_IHXKeyBoardFocus, 0x00000D23, 0x903, 0x11d1, 0x8b, DECLARE_INTERFACE_(IHXKeyBoardFocus, IUnknown) { - STDQT_METHOD(SetKeyboardFocus)(THIS_ IHXSiteUser* pSiteUser ) PURE; - STDQT_METHOD(GetKeyboardFocus)(THIS_ IHXSiteUser* &pSiteUser ) PURE; + STDTQT_METHOD(SetKeyboardFocus)(THIS_ IHXSiteUser* pSiteUser ) PURE; + STDTQT_METHOD(GetKeyboardFocus)(THIS_ IHXSiteUser* &pSiteUser ) PURE; }; @@ -1557,7 +1557,7 @@ DECLARE_INTERFACE_(IHXDrawFocus, IUnknown) * CUSTOM_LINE_ENTRIES equals 4. Secondary pixels are not * drawn if RED_OFF, GREEN_OFF, and BLUE_OFF are not set. */ - STDQT_METHOD(SetStyle) (THIS_ IHXValues* pProperties) PURE; + STDTQT_METHOD(SetStyle) (THIS_ IHXValues* pProperties) PURE; /************************************************************************ * Method: @@ -1565,7 +1565,7 @@ DECLARE_INTERFACE_(IHXDrawFocus, IUnknown) * Purpose: * Ask the site to clear the current focus drawing. */ - STDQT_METHOD(ClearFocus)(THIS) PURE; + STDTQT_METHOD(ClearFocus)(THIS) PURE; /************************************************************************ * Method: @@ -1573,7 +1573,7 @@ DECLARE_INTERFACE_(IHXDrawFocus, IUnknown) * Purpose: * Ask the site to draw polygon around focus */ - STDQT_METHOD(SetFocusPolygon)(THIS_ HXxPoint* pPoints, ULONG32 numPoints) PURE; + STDTQT_METHOD(SetFocusPolygon)(THIS_ HXxPoint* pPoints, ULONG32 numPoints) PURE; /************************************************************************ * Method: @@ -1581,7 +1581,7 @@ DECLARE_INTERFACE_(IHXDrawFocus, IUnknown) * Purpose: * Ask the site to draw rectangle around focus */ - STDQT_METHOD(SetFocusRect) (THIS_ HXxRect* pRect) PURE; + STDTQT_METHOD(SetFocusRect) (THIS_ HXxRect* pRect) PURE; /************************************************************************ * Method: @@ -1589,7 +1589,7 @@ DECLARE_INTERFACE_(IHXDrawFocus, IUnknown) * Purpose: * Ask the site to draw ellipse around focus */ - STDQT_METHOD(SetFocusEllipse) (THIS_ HXxRect* pRect) PURE; + STDTQT_METHOD(SetFocusEllipse) (THIS_ HXxRect* pRect) PURE; }; // $Private: @@ -1625,17 +1625,17 @@ DECLARE_INTERFACE_(IHXSubRectSite, IHXSite) * These messages contain actuall dirty rects so that the renderer * does not need to BLT the entire frame. */ - STDQT_METHOD(SendSubRectMessages) (THIS_ HXBOOL bRet ) PURE; + STDTQT_METHOD(SendSubRectMessages) (THIS_ HXBOOL bRet ) PURE; /* * New damage region call that takes the cross platfrom region - * defined in hxwintyp.h and invalidates the rects in it + * defined in hxwintyp.h and tqinvalidates the rects in it */ - STDQT_METHOD(SubRectDamageRegion) (THIS_ HXxBoxRegion* pRegion ) PURE; + STDTQT_METHOD(SubRectDamageRegion) (THIS_ HXxBoxRegion* pRegion ) PURE; /* * Method to get the new video surface that comes with the sub * rect BLT'ing support. */ - STDQT_METHOD(GetSubRectVideoSurface) (THIS_ + STDTQT_METHOD(GetSubRectVideoSurface) (THIS_ REF(IHXSubRectVideoSurface*) pSurface ) PURE; }; @@ -1672,7 +1672,7 @@ DECLARE_INTERFACE_(IHXFocusNavigation, IUnknown) * Purpose: * Ask the renderer to set the focus to the given item. */ - STDQT_METHOD(SetFocus) (THIS_ HXFocusContext eFocus) PURE; + STDTQT_METHOD(SetFocus) (THIS_ HXFocusContext eFocus) PURE; /************************************************************************ * Method: @@ -1680,7 +1680,7 @@ DECLARE_INTERFACE_(IHXFocusNavigation, IUnknown) * Purpose: * Ask the renderer to clear the current focus. */ - STDQT_METHOD(ClearFocus) (THIS) PURE; + STDTQT_METHOD(ClearFocus) (THIS) PURE; /************************************************************************ * Method: @@ -1689,7 +1689,7 @@ DECLARE_INTERFACE_(IHXFocusNavigation, IUnknown) * Ask the renderer to activate the focused link. Do nothing if * there is no focus point. */ - STDQT_METHOD(ActivateFocus) (THIS) PURE; + STDTQT_METHOD(ActivateFocus) (THIS) PURE; /************************************************************************ * Method: diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h index 4316cc2f..72bdf788 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h @@ -151,7 +151,7 @@ inline void HXxRect_Intersection( const HXxRect& r1, const HXxRect& r2, HXxRect* * Purpose: * * Cross Platform definition of a window. This struct is sufficiently - * wide to describe parent or child windows in Windows, MacOS, and + * wide to describe tqparent or child windows in Windows, MacOS, and * various flavors of X-Windows. * * Data Members: diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/ihxpckts.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/ihxpckts.h index 774fd405..83fa78ce 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/ihxpckts.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/ihxpckts.h @@ -59,7 +59,7 @@ DECLARE_INTERFACE_(IHXBuffer, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -70,15 +70,15 @@ DECLARE_INTERFACE_(IHXBuffer, IUnknown) /* * IHXBuffer methods */ - STDQT_METHOD(Get) (THIS_ + STDTQT_METHOD(Get) (THIS_ REF(UCHAR*) pData, REF(ULONG32) ulLength) PURE; - STDQT_METHOD(Set) (THIS_ + STDTQT_METHOD(Set) (THIS_ const UCHAR* pData, ULONG32 ulLength) PURE; - STDQT_METHOD(SetSize) (THIS_ + STDTQT_METHOD(SetSize) (THIS_ ULONG32 ulLength) PURE; STDMETHOD_(ULONG32,GetSize) (THIS) PURE; @@ -119,7 +119,7 @@ DECLARE_INTERFACE_(IHXPacket, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -130,7 +130,7 @@ DECLARE_INTERFACE_(IHXPacket, IUnknown) /* * IHXPacket methods */ - STDQT_METHOD(Get) (THIS_ + STDTQT_METHOD(Get) (THIS_ REF(IHXBuffer*) pBuffer, REF(UINT32) ulTime, REF(UINT16) unStreamNumber, @@ -150,9 +150,9 @@ DECLARE_INTERFACE_(IHXPacket, IUnknown) STDMETHOD_(HXBOOL,IsLost) (THIS) PURE; - STDQT_METHOD(SetAsLost) (THIS) PURE; + STDTQT_METHOD(SetAsLost) (THIS) PURE; - STDQT_METHOD(Set) (THIS_ + STDTQT_METHOD(Set) (THIS_ IHXBuffer* pBuffer, UINT32 ulTime, UINT16 uStreamNumber, @@ -194,7 +194,7 @@ DECLARE_INTERFACE_(IHXRTPPacket, IHXPacket) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -205,7 +205,7 @@ DECLARE_INTERFACE_(IHXRTPPacket, IHXPacket) /* * IHXPacket methods */ - STDQT_METHOD(Get) (THIS_ + STDTQT_METHOD(Get) (THIS_ REF(IHXBuffer*) pBuffer, REF(UINT32) ulTime, REF(UINT16) unStreamNumber, @@ -225,9 +225,9 @@ DECLARE_INTERFACE_(IHXRTPPacket, IHXPacket) STDMETHOD_(HXBOOL,IsLost) (THIS) PURE; - STDQT_METHOD(SetAsLost) (THIS) PURE; + STDTQT_METHOD(SetAsLost) (THIS) PURE; - STDQT_METHOD(Set) (THIS_ + STDTQT_METHOD(Set) (THIS_ IHXBuffer* pBuffer, UINT32 ulTime, UINT16 uStreamNumber, @@ -240,7 +240,7 @@ DECLARE_INTERFACE_(IHXRTPPacket, IHXPacket) */ STDMETHOD_(ULONG32,GetRTPTime) (THIS) PURE; - STDQT_METHOD(GetRTP) (THIS_ + STDTQT_METHOD(GetRTP) (THIS_ REF(IHXBuffer*) pBuffer, REF(UINT32) ulTime, REF(UINT32) ulRTPTime, @@ -249,7 +249,7 @@ DECLARE_INTERFACE_(IHXRTPPacket, IHXPacket) REF(UINT16) unASMRuleNumber ) PURE; - STDQT_METHOD(SetRTP) (THIS_ + STDTQT_METHOD(SetRTP) (THIS_ IHXBuffer* pBuffer, UINT32 ulTime, UINT32 ulRTPTime, @@ -285,7 +285,7 @@ DECLARE_INTERFACE_(IHXRTPPacketInfo, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; STDMETHOD_(ULONG32,AddRef) (THIS) PURE; STDMETHOD_(ULONG32,Release) (THIS) PURE; @@ -294,37 +294,37 @@ DECLARE_INTERFACE_(IHXRTPPacketInfo, IUnknown) */ STDMETHOD_(UINT8, GetVersion) (THIS) PURE; - STDQT_METHOD(GetPaddingBit) (THIS_ REF(HXBOOL)bPadding) PURE; - STDQT_METHOD(SetPaddingBit) (THIS_ HXBOOL bPadding) PURE; + STDTQT_METHOD(GetPaddingBit) (THIS_ REF(HXBOOL)bPadding) PURE; + STDTQT_METHOD(SetPaddingBit) (THIS_ HXBOOL bPadding) PURE; - STDQT_METHOD(GetExtensionBit) (THIS_ REF(HXBOOL)bExtension) PURE; - STDQT_METHOD(SetExtensionBit) (THIS_ HXBOOL bExtension) PURE; + STDTQT_METHOD(GetExtensionBit) (THIS_ REF(HXBOOL)bExtension) PURE; + STDTQT_METHOD(SetExtensionBit) (THIS_ HXBOOL bExtension) PURE; - STDQT_METHOD(GetCSRCCount) (THIS_ REF(UINT8)unCSRCCount) PURE; - STDQT_METHOD(SetCSRCCount) (THIS_ UINT8 unCSRCCount) PURE; + STDTQT_METHOD(GetCSRCCount) (THIS_ REF(UINT8)unCSRCCount) PURE; + STDTQT_METHOD(SetCSRCCount) (THIS_ UINT8 unCSRCCount) PURE; - STDQT_METHOD(GetMarkerBit) (THIS_ REF(HXBOOL)bMarker) PURE; - STDQT_METHOD(SetMarkerBit) (THIS_ HXBOOL bMarker) PURE; + STDTQT_METHOD(GetMarkerBit) (THIS_ REF(HXBOOL)bMarker) PURE; + STDTQT_METHOD(SetMarkerBit) (THIS_ HXBOOL bMarker) PURE; - STDQT_METHOD(GetPayloadType) (THIS_ REF(UINT8)unPayloadType) PURE; - STDQT_METHOD(SetPayloadType) (THIS_ UINT8 unPayloadType) PURE; + STDTQT_METHOD(GetPayloadType) (THIS_ REF(UINT8)unPayloadType) PURE; + STDTQT_METHOD(SetPayloadType) (THIS_ UINT8 unPayloadType) PURE; - STDQT_METHOD(GetSequenceNumber) (THIS_ REF(UINT16)unSeqNo) PURE; - STDQT_METHOD(SetSequenceNumber) (THIS_ UINT16 unSeqNo) PURE; + STDTQT_METHOD(GetSequenceNumber) (THIS_ REF(UINT16)unSeqNo) PURE; + STDTQT_METHOD(SetSequenceNumber) (THIS_ UINT16 unSeqNo) PURE; - STDQT_METHOD(GetTimeStamp) (THIS_ REF(UINT32)ulTS) PURE; - STDQT_METHOD(SetTimeStamp) (THIS_ UINT32 ulTS) PURE; + STDTQT_METHOD(GetTimeStamp) (THIS_ REF(UINT32)ulTS) PURE; + STDTQT_METHOD(SetTimeStamp) (THIS_ UINT32 ulTS) PURE; - STDQT_METHOD(GetSSRC) (THIS_ REF(UINT32)ulSSRC) PURE; - STDQT_METHOD(SetSSRC) (THIS_ UINT32 ulSSRC) PURE; + STDTQT_METHOD(GetSSRC) (THIS_ REF(UINT32)ulSSRC) PURE; + STDTQT_METHOD(SetSSRC) (THIS_ UINT32 ulSSRC) PURE; - STDQT_METHOD(GetCSRCList) (THIS_ REF(const char*) pulCSRC) PURE; - STDQT_METHOD(SetCSRCList) (THIS_ const char* pCSRCList, UINT32 ulSize) PURE; - STDQT_METHOD(GetPadding) (THIS_ REF(const char*) pPadding) PURE; - STDQT_METHOD(SetPadding) (THIS_ const char* pPadding, UINT32 ulSize) PURE; - STDQT_METHOD(GetExtension) (THIS_ REF(const char*) pExtension) PURE; - STDQT_METHOD(SetExtension) (THIS_ const char* pExtension, UINT32 ulSize) PURE; + STDTQT_METHOD(GetCSRCList) (THIS_ REF(const char*) pulCSRC) PURE; + STDTQT_METHOD(SetCSRCList) (THIS_ const char* pCSRCList, UINT32 ulSize) PURE; + STDTQT_METHOD(GetPadding) (THIS_ REF(const char*) pPadding) PURE; + STDTQT_METHOD(SetPadding) (THIS_ const char* pPadding, UINT32 ulSize) PURE; + STDTQT_METHOD(GetExtension) (THIS_ REF(const char*) pExtension) PURE; + STDTQT_METHOD(SetExtension) (THIS_ const char* pExtension, UINT32 ulSize) PURE; }; @@ -361,7 +361,7 @@ DECLARE_INTERFACE_(IHXValues, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -382,51 +382,51 @@ DECLARE_INTERFACE_(IHXValues, IUnknown) * RMA core (i.e. you exit whatever function gave you a time slice). */ - STDQT_METHOD(SetPropertyULONG32) (THIS_ + STDTQT_METHOD(SetPropertyULONG32) (THIS_ const char* pPropertyName, ULONG32 uPropertyValue) PURE; - STDQT_METHOD(GetPropertyULONG32) (THIS_ + STDTQT_METHOD(GetPropertyULONG32) (THIS_ const char* pPropertyName, REF(ULONG32) uPropertyName) PURE; - STDQT_METHOD(GetFirstPropertyULONG32) (THIS_ + STDTQT_METHOD(GetFirstPropertyULONG32) (THIS_ REF(const char*) pPropertyName, REF(ULONG32) uPropertyValue) PURE; - STDQT_METHOD(GetNextPropertyULONG32) (THIS_ + STDTQT_METHOD(GetNextPropertyULONG32) (THIS_ REF(const char*) pPropertyName, REF(ULONG32) uPropertyValue) PURE; - STDQT_METHOD(SetPropertyBuffer) (THIS_ + STDTQT_METHOD(SetPropertyBuffer) (THIS_ const char* pPropertyName, IHXBuffer* pPropertyValue) PURE; - STDQT_METHOD(GetPropertyBuffer) (THIS_ + STDTQT_METHOD(GetPropertyBuffer) (THIS_ const char* pPropertyName, REF(IHXBuffer*) pPropertyValue) PURE; - STDQT_METHOD(GetFirstPropertyBuffer) (THIS_ + STDTQT_METHOD(GetFirstPropertyBuffer) (THIS_ REF(const char*) pPropertyName, REF(IHXBuffer*) pPropertyValue) PURE; - STDQT_METHOD(GetNextPropertyBuffer) (THIS_ + STDTQT_METHOD(GetNextPropertyBuffer) (THIS_ REF(const char*) pPropertyName, REF(IHXBuffer*) pPropertyValue) PURE; - STDQT_METHOD(SetPropertyCString) (THIS_ + STDTQT_METHOD(SetPropertyCString) (THIS_ const char* pPropertyName, IHXBuffer* pPropertyValue) PURE; - STDQT_METHOD(GetPropertyCString) (THIS_ + STDTQT_METHOD(GetPropertyCString) (THIS_ const char* pPropertyName, REF(IHXBuffer*) pPropertyValue) PURE; - STDQT_METHOD(GetFirstPropertyCString) (THIS_ + STDTQT_METHOD(GetFirstPropertyCString) (THIS_ REF(const char*) pPropertyName, REF(IHXBuffer*) pPropertyValue) PURE; - STDQT_METHOD(GetNextPropertyCString) (THIS_ + STDTQT_METHOD(GetNextPropertyCString) (THIS_ REF(const char*) pPropertyName, REF(IHXBuffer*) pPropertyValue) PURE; }; @@ -460,19 +460,19 @@ DECLARE_INTERFACE_(IHXValues2, IHXValues) * IHXValues2 methods */ - STDQT_METHOD(SetPropertyObject) (THIS_ + STDTQT_METHOD(SetPropertyObject) (THIS_ const char* pPropertyName, IUnknown* pPropertyValue) PURE; - STDQT_METHOD(GetPropertyObject) (THIS_ + STDTQT_METHOD(GetPropertyObject) (THIS_ const char* pPropertyName, REF(IUnknown*) pPropertyValue) PURE; - STDQT_METHOD(GetFirstPropertyObject) (THIS_ + STDTQT_METHOD(GetFirstPropertyObject) (THIS_ REF(const char*) pPropertyName, REF(IUnknown*) pPropertyValue) PURE; - STDQT_METHOD(GetNextPropertyObject) (THIS_ + STDTQT_METHOD(GetNextPropertyObject) (THIS_ REF(const char*) pPropertyName, REF(IUnknown*) pPropertyValue) PURE; @@ -483,7 +483,7 @@ DECLARE_INTERFACE_(IHXValues2, IHXValues) * Remove all items matching pKey. (If you know what datatype you saved * the key as, use the specific method.) */ - STDQT_METHOD(Remove) (const char* pKey) PURE; + STDTQT_METHOD(Remove) (const char* pKey) PURE; /************************************************************************ * Method: @@ -491,7 +491,7 @@ DECLARE_INTERFACE_(IHXValues2, IHXValues) * Purpose: * Remove all ULONG32 items matching pKey. */ - STDQT_METHOD(RemoveULONG32) (const char* pKey) PURE; + STDTQT_METHOD(RemoveULONG32) (const char* pKey) PURE; /************************************************************************ * Method: @@ -499,7 +499,7 @@ DECLARE_INTERFACE_(IHXValues2, IHXValues) * Purpose: * Remove all Buffer items matching pKey. */ - STDQT_METHOD(RemoveBuffer) (const char* pKey) PURE; + STDTQT_METHOD(RemoveBuffer) (const char* pKey) PURE; /************************************************************************ * Method: @@ -507,7 +507,7 @@ DECLARE_INTERFACE_(IHXValues2, IHXValues) * Purpose: * Remove all CString items matching pKey. */ - STDQT_METHOD(RemoveCString) (const char* pKey) PURE; + STDTQT_METHOD(RemoveCString) (const char* pKey) PURE; /************************************************************************ * Method: @@ -515,7 +515,7 @@ DECLARE_INTERFACE_(IHXValues2, IHXValues) * Purpose: * Remove all IUnknown items matching pKey. */ - STDQT_METHOD(RemoveObject) (const char* pKey) PURE; + STDTQT_METHOD(RemoveObject) (const char* pKey) PURE; }; /**************************************************************************** @@ -553,7 +553,7 @@ DECLARE_INTERFACE_(IHXValuesRemove, IUnknown) /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -572,7 +572,7 @@ DECLARE_INTERFACE_(IHXValuesRemove, IUnknown) * Remove all items matching pKey. (If you know what datatype you saved * the key as, use the specific method.) */ - STDQT_METHOD(Remove) (const char* pKey) PURE; + STDTQT_METHOD(Remove) (const char* pKey) PURE; /************************************************************************ * Method: @@ -580,7 +580,7 @@ DECLARE_INTERFACE_(IHXValuesRemove, IUnknown) * Purpose: * Remove all ULONG32 items matching pKey. */ - STDQT_METHOD(RemoveULONG32) (const char* pKey) PURE; + STDTQT_METHOD(RemoveULONG32) (const char* pKey) PURE; /************************************************************************ * Method: @@ -588,7 +588,7 @@ DECLARE_INTERFACE_(IHXValuesRemove, IUnknown) * Purpose: * Remove all Buffer items matching pKey. */ - STDQT_METHOD(RemoveBuffer) (const char* pKey) PURE; + STDTQT_METHOD(RemoveBuffer) (const char* pKey) PURE; /************************************************************************ * Method: @@ -596,7 +596,7 @@ DECLARE_INTERFACE_(IHXValuesRemove, IUnknown) * Purpose: * Remove all CString items matching pKey. */ - STDQT_METHOD(RemoveCString) (const char* pKey) PURE; + STDTQT_METHOD(RemoveCString) (const char* pKey) PURE; }; // $Private: @@ -612,7 +612,7 @@ DECLARE_INTERFACE_(IHXClientPacket, IUnknown) * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -633,7 +633,7 @@ DECLARE_INTERFACE_(IHXBroadcastDistPktExt, IUnknown) * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj) PURE; @@ -648,10 +648,10 @@ DECLARE_INTERFACE_(IHXBroadcastDistPktExt, IUnknown) STDMETHOD_(UINT16,GetRuleSeqNoArraySize) (THIS) PURE; STDMETHOD_(UINT16*,GetRuleSeqNoArray) (THIS) PURE; - STDQT_METHOD(SetSeqNo) (THIS_ UINT32 ulSeqNo) PURE; - STDQT_METHOD(SetStreamSeqNo) (THIS_ UINT32 ulStreamSeqNo) PURE; - STDQT_METHOD(SetIsLostRelaying) (THIS_ HXBOOL bLostRelay) PURE; - STDQT_METHOD(SetRuleSeqNoArray) (THIS_ UINT16* pRuleSeqNoArray, UINT16 uSize) PURE; + STDTQT_METHOD(SetSeqNo) (THIS_ UINT32 ulSeqNo) PURE; + STDTQT_METHOD(SetStreamSeqNo) (THIS_ UINT32 ulStreamSeqNo) PURE; + STDTQT_METHOD(SetIsLostRelaying) (THIS_ HXBOOL bLostRelay) PURE; + STDTQT_METHOD(SetRuleSeqNoArray) (THIS_ UINT16* pRuleSeqNoArray, UINT16 uSize) PURE; }; // $EndPrivate. diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h index c9c427a2..b055336e 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h @@ -100,7 +100,7 @@ atoi64(const char* str) #endif /* _MACINTOSH */ -#if defined (_UNIX) && !defined (__QNXNTO__) +#if defined (_UNIX) && !defined (__TQNXNTO__) // Convert integer to string diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h index 5da00a5a..f369e2c0 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h @@ -141,7 +141,7 @@ strcasecmp(const char* str1, const char* str2) #endif /* _MACINTOSH */ -#if defined (_UNIX) && !defined (__QNXNTO__) +#if defined (_UNIX) && !defined (__TQNXNTO__) /* strcasecmp, strncasecmp are defined in strings.h */ #define stricmp strcasecmp diff --git a/amarok/src/engine/helix/helix-sp/helix-sp.cpp b/amarok/src/engine/helix/helix-sp/helix-sp.cpp index f2e947af..4cb58bb7 100644 --- a/amarok/src/engine/helix/helix-sp/helix-sp.cpp +++ b/amarok/src/engine/helix/helix-sp/helix-sp.cpp @@ -77,7 +77,7 @@ public: /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -88,7 +88,7 @@ public: /* * IHXAudioStreamInfoResponse methods */ - STDQT_METHOD(OnStream) (THIS_ + STDTQT_METHOD(OnStream) (THIS_ IHXAudioStream *pAudioStream ); private: @@ -835,7 +835,7 @@ HelixSimplePlayer::~HelixSimplePlayer() { tearDown(); - // only now invalidate the device, not whenever we teardown + // only now tqinvalidate the device, not whenever we teardown delete [] m_device; } diff --git a/amarok/src/engine/helix/helix-sp/hspadvisesink.h b/amarok/src/engine/helix/helix-sp/hspadvisesink.h index 1a5f7f87..3c55951f 100644 --- a/amarok/src/engine/helix/helix-sp/hspadvisesink.h +++ b/amarok/src/engine/helix/helix-sp/hspadvisesink.h @@ -61,7 +61,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -80,7 +80,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * Called to advise the client that the position or length of the * current playback context has changed. */ - STDQT_METHOD(OnPosLength) (THIS_ + STDTQT_METHOD(OnPosLength) (THIS_ UINT32 ulPosition, UINT32 ulLength); @@ -90,7 +90,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * Purpose: * Called to advise the client a presentation has been opened. */ - STDQT_METHOD(OnPresentationOpened) (THIS); + STDTQT_METHOD(OnPresentationOpened) (THIS); /************************************************************************ * Method: @@ -98,7 +98,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * Purpose: * Called to advise the client a presentation has been closed. */ - STDQT_METHOD(OnPresentationClosed) (THIS); + STDTQT_METHOD(OnPresentationClosed) (THIS); /************************************************************************ * Method: @@ -107,7 +107,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * Called to advise the client that the presentation statistics * have changed. */ - STDQT_METHOD(OnStatisticsChanged) (THIS); + STDTQT_METHOD(OnStatisticsChanged) (THIS); /************************************************************************ * Method: @@ -119,7 +119,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * time for the stream's time line after the seek will be completed. * */ - STDQT_METHOD (OnPreSeek) (THIS_ + STDTQT_METHOD (OnPreSeek) (THIS_ ULONG32 ulOldTime, ULONG32 ulNewTime); @@ -133,7 +133,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * time for the stream's time line after the seek. * */ - STDQT_METHOD (OnPostSeek) (THIS_ + STDTQT_METHOD (OnPostSeek) (THIS_ ULONG32 ulOldTime, ULONG32 ulNewTime); @@ -145,7 +145,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * just occurred. * */ - STDQT_METHOD (OnStop) (THIS); + STDTQT_METHOD (OnStop) (THIS); /************************************************************************ * Method: @@ -156,7 +156,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * stream's time line before the pause. * */ - STDQT_METHOD (OnPause) (THIS_ + STDTQT_METHOD (OnPause) (THIS_ ULONG32 ulTime); /************************************************************************ @@ -168,7 +168,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * for the stream's time line after the resume. * */ - STDQT_METHOD (OnBegin) (THIS_ + STDTQT_METHOD (OnBegin) (THIS_ ULONG32 ulTime); /************************************************************************ @@ -182,7 +182,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * buffering process. * */ - STDQT_METHOD (OnBuffering) (THIS_ + STDTQT_METHOD (OnBuffering) (THIS_ ULONG32 ulFlags, UINT16 unPercentComplete); @@ -195,7 +195,7 @@ class HSPClientAdviceSink : public IHXClientAdviseSink * hosts(s). * */ - STDQT_METHOD (OnContacting) (THIS_ + STDTQT_METHOD (OnContacting) (THIS_ const char* pHostName); }; diff --git a/amarok/src/engine/helix/helix-sp/hspalsadevice.cpp b/amarok/src/engine/helix/helix-sp/hspalsadevice.cpp index 38eadd79..6846224c 100644 --- a/amarok/src/engine/helix/helix-sp/hspalsadevice.cpp +++ b/amarok/src/engine/helix/helix-sp/hspalsadevice.cpp @@ -157,7 +157,7 @@ HSPAudioDevice::Close( const BOOL bFlush ) m_closed = true; - m_ulCurrentTime = m_ulQTime = 0; + m_ulCurrentTime = m_ulTQTime = 0; if (m_pStreamResponse) m_pStreamResponse->Release(); @@ -248,7 +248,7 @@ HSPAudioDevice::Open(const HXAudioFormat* pAudioFormat, IHXAudioDeviceResponse* if (err) m_Player->print2stderr("########## HSPAudioDevice::Open error (device) %d\n", err); err = SetDeviceConfig(pAudioFormat); if (err) m_Player->print2stderr("########## HSPAudioDevice::Open error (config) %d\n", err); - m_ulCurrentTime = m_ulLastTime = m_ulQTime = 0; + m_ulCurrentTime = m_ulLastTime = m_ulTQTime = 0; } if (m_pAlsaMixerHandle != NULL) @@ -446,7 +446,7 @@ void HSPAudioDevice::addBuf(struct AudioQueue *item) { pthread_mutex_lock(&m_m); - m_ulQTime = item->ad.ulAudioTime; + m_ulTQTime = item->ad.ulAudioTime; if (m_tail) { item->fwd = 0; diff --git a/amarok/src/engine/helix/helix-sp/hspalsadevice.h b/amarok/src/engine/helix/helix-sp/hspalsadevice.h index 23eadae9..69e34522 100644 --- a/amarok/src/engine/helix/helix-sp/hspalsadevice.h +++ b/amarok/src/engine/helix/helix-sp/hspalsadevice.h @@ -51,7 +51,7 @@ public: /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); STDMETHOD_(ULONG32,AddRef) (THIS); @@ -59,21 +59,21 @@ public: /* * IHXAudioDevice methods */ - STDQT_METHOD(CheckFormat) ( + STDTQT_METHOD(CheckFormat) ( THIS_ const HXAudioFormat* pAudioFormat ); - STDQT_METHOD(Close) ( + STDTQT_METHOD(Close) ( THIS_ const BOOL bFlush ); - STDQT_METHOD(Drain) ( + STDTQT_METHOD(Drain) ( THIS ); - STDQT_METHOD(GetCurrentAudioTime) ( + STDTQT_METHOD(GetCurrentAudioTime) ( THIS_ REF(ULONG32) ulCurrentTime ); @@ -88,30 +88,30 @@ public: const UINT16 uMaxVolume ); - STDQT_METHOD(Open) ( + STDTQT_METHOD(Open) ( THIS_ const HXAudioFormat* pAudioFormat, IHXAudioDeviceResponse* pStreamResponse ); - STDQT_METHOD(Pause) ( + STDTQT_METHOD(Pause) ( THIS ); - STDQT_METHOD(Reset) ( + STDTQT_METHOD(Reset) ( THIS ); - STDQT_METHOD(Resume) ( + STDTQT_METHOD(Resume) ( THIS ); - STDQT_METHOD(SetVolume) ( + STDTQT_METHOD(SetVolume) ( THIS_ const UINT16 uVolume ); - STDQT_METHOD(Write) ( + STDTQT_METHOD(Write) ( THIS_ const HXAudioData* pAudioData ); @@ -219,7 +219,7 @@ private: UINT16 m_uSampFrameSize; UINT32 m_ulTotalWritten; UINT32 m_ulCurrentTime; - UINT32 m_ulQTime; + UINT32 m_ulTQTime; UINT32 m_ulLastTime; BOOL m_SWPause; diff --git a/amarok/src/engine/helix/helix-sp/hspauthmgr.h b/amarok/src/engine/helix/helix-sp/hspauthmgr.h index 441e8bbc..1067aafc 100644 --- a/amarok/src/engine/helix/helix-sp/hspauthmgr.h +++ b/amarok/src/engine/helix/helix-sp/hspauthmgr.h @@ -28,10 +28,10 @@ private: public: HSPAuthenticationManager(HelixSimplePlayer *pSplay); virtual ~HSPAuthenticationManager(); - STDQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); STDMETHOD_(UINT32,AddRef) (THIS); STDMETHOD_(UINT32,Release) (THIS); - STDQT_METHOD(HandleAuthenticationRequest) (IHXAuthenticationManagerResponse* pResponse); + STDTQT_METHOD(HandleAuthenticationRequest) (IHXAuthenticationManagerResponse* pResponse); }; #endif diff --git a/amarok/src/engine/helix/helix-sp/hspcontext.cpp b/amarok/src/engine/helix/helix-sp/hspcontext.cpp index f87a9141..ef45937d 100644 --- a/amarok/src/engine/helix/helix-sp/hspcontext.cpp +++ b/amarok/src/engine/helix/helix-sp/hspcontext.cpp @@ -319,7 +319,7 @@ void HSPClientContext::Init(IUnknown* pUnknown, if (pszGUID && *pszGUID) { // Encode GUID - // TODO: find/implement Cipher + // TODO: tqfind/implement Cipher //pszCipher = Cipher(pszGUID); //SafeStrCpy(m_pszGUID, pszCipher, 256); } diff --git a/amarok/src/engine/helix/helix-sp/hspcontext.h b/amarok/src/engine/helix/helix-sp/hspcontext.h index 067ccdfe..a5388c54 100644 --- a/amarok/src/engine/helix/helix-sp/hspcontext.h +++ b/amarok/src/engine/helix/helix-sp/hspcontext.h @@ -32,7 +32,7 @@ public: /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -42,9 +42,9 @@ public: /* * IHXPreferences methods */ - STDQT_METHOD(ReadPref) (THIS_ const char* pref_key, + STDTQT_METHOD(ReadPref) (THIS_ const char* pref_key, IHXBuffer*& buffer); - STDQT_METHOD(WritePref) (THIS_ const char* pref_key, + STDTQT_METHOD(WritePref) (THIS_ const char* pref_key, IHXBuffer* buffer); private: @@ -82,7 +82,7 @@ public: /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -92,9 +92,9 @@ public: /* * IHXPreferences methods */ - STDQT_METHOD(ReadPref) (THIS_ const char* pref_key, + STDTQT_METHOD(ReadPref) (THIS_ const char* pref_key, IHXBuffer*& buffer); - STDQT_METHOD(WritePref) (THIS_ const char* pref_key, + STDTQT_METHOD(WritePref) (THIS_ const char* pref_key, IHXBuffer* buffer); }; diff --git a/amarok/src/engine/helix/helix-sp/hsperror.h b/amarok/src/engine/helix/helix-sp/hsperror.h index d48827a5..aa02b1e3 100644 --- a/amarok/src/engine/helix/helix-sp/hsperror.h +++ b/amarok/src/engine/helix/helix-sp/hsperror.h @@ -29,7 +29,7 @@ public: /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -52,7 +52,7 @@ public: * The meaning of the arguments is exactly as described in * hxerror.h */ - STDQT_METHOD(ErrorOccurred) (THIS_ + STDTQT_METHOD(ErrorOccurred) (THIS_ const UINT8 unSeverity, const ULONG32 ulHXCode, const ULONG32 ulUserCode, diff --git a/amarok/src/engine/helix/helix-sp/hsphook.cpp b/amarok/src/engine/helix/helix-sp/hsphook.cpp index 3434a77c..26b3ee7b 100644 --- a/amarok/src/engine/helix/helix-sp/hsphook.cpp +++ b/amarok/src/engine/helix/helix-sp/hsphook.cpp @@ -440,12 +440,12 @@ void HSPPostProcessor::scopeify(unsigned long time, unsigned char *data, size_t void HSPPostProcessor::updateEQgains(int pamp, vector<int> &equalizerGains) { - for (int i=0; i<EQ_CHANNELS; i++) + for (int i=0; i<ETQ_CHANNELS; i++) { preamp[i] = (float) pamp * 0.01; - for (int j=0; j<EQ_MAX_BANDS; j++) + for (int j=0; j<ETQ_MAX_BANDS; j++) gain[j][i] = (float)(equalizerGains[j]) * 0.012 - 0.2; } } @@ -455,7 +455,7 @@ void HSPPostProcessor::equalize(unsigned char *inbuf, unsigned char *outbuf, siz { int index, band, channel; int tempint, halflength; - float out[EQ_CHANNELS], pcm[EQ_CHANNELS]; + float out[ETQ_CHANNELS], pcm[ETQ_CHANNELS]; short int *data = (short int *) inbuf; short int *dataout = (short int *) outbuf; diff --git a/amarok/src/engine/helix/helix-sp/hsphook.h b/amarok/src/engine/helix/helix-sp/hsphook.h index 3e6ab843..53ca4f57 100644 --- a/amarok/src/engine/helix/helix-sp/hsphook.h +++ b/amarok/src/engine/helix/helix-sp/hsphook.h @@ -29,7 +29,7 @@ public: /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); STDMETHOD_(ULONG32,AddRef) (THIS); @@ -37,10 +37,10 @@ public: /* * IHXAudioHook methods */ - STDQT_METHOD(OnBuffer) (THIS_ + STDTQT_METHOD(OnBuffer) (THIS_ HXAudioData *pAudioInData, HXAudioData *pAudioOutData); - STDQT_METHOD(OnInit) (THIS_ + STDTQT_METHOD(OnInit) (THIS_ HXAudioFormat *pFormat); void setFadeout(bool fadeout); @@ -68,8 +68,8 @@ private: #define BAND_NUM 10 -#define EQ_MAX_BANDS 10 -#define EQ_CHANNELS 2 // Helix DNA currently only supports stereo +#define ETQ_MAX_BANDS 10 +#define ETQ_CHANNELS 2 // Helix DNA currently only supports stereo // Floating point typedef struct @@ -97,7 +97,7 @@ public: /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); STDMETHOD_(ULONG32,AddRef) (THIS); @@ -105,10 +105,10 @@ public: /* * IHXAudioHook methods */ - STDQT_METHOD(OnBuffer) (THIS_ + STDTQT_METHOD(OnBuffer) (THIS_ HXAudioData *pAudioInData, HXAudioData *pAudioOutData); - STDQT_METHOD(OnInit) (THIS_ + STDTQT_METHOD(OnInit) (THIS_ HXAudioFormat *pFormat); void updateEQgains(int preamp, vector<int> &equalizerGains); @@ -149,13 +149,13 @@ private: // Gain for each band // values should be between -0.2 and 1.0 - float gain[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned)); + float gain[ETQ_MAX_BANDS][ETQ_CHANNELS] __attribute__((aligned)); // Volume gain // values should be between 0.0 and 1.0 - float preamp[EQ_CHANNELS] __attribute__((aligned)); + float preamp[ETQ_CHANNELS] __attribute__((aligned)); // Coefficients sIIRCoefficients* iir_cf; - sXYData data_history[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned)); + sXYData data_history[ETQ_MAX_BANDS][ETQ_CHANNELS] __attribute__((aligned)); // history indices int m_i; int m_j; @@ -177,7 +177,7 @@ public: /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); STDMETHOD_(ULONG32,AddRef) (THIS); @@ -185,10 +185,10 @@ public: /* * IHXAudioHook methods */ - STDQT_METHOD(OnBuffer) (THIS_ + STDTQT_METHOD(OnBuffer) (THIS_ HXAudioData *pAudioInData, HXAudioData *pAudioOutData); - STDQT_METHOD(OnInit) (THIS_ + STDTQT_METHOD(OnInit) (THIS_ HXAudioFormat *pFormat); void updateEQgains(int preamp, vector<int> &equalizerGains); @@ -216,7 +216,7 @@ public: /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); STDMETHOD_(ULONG32,AddRef) (THIS); @@ -224,10 +224,10 @@ public: /* * IHXAudioHook methods */ - STDQT_METHOD(OnBuffer) (THIS_ + STDTQT_METHOD(OnBuffer) (THIS_ HXAudioData *pAudioInData, HXAudioData *pAudioOutData); - STDQT_METHOD(OnInit) (THIS_ + STDTQT_METHOD(OnInit) (THIS_ HXAudioFormat *pFormat); diff --git a/amarok/src/engine/helix/helix-sp/hspvoladvise.h b/amarok/src/engine/helix/helix-sp/hspvoladvise.h index 1c6e3033..f53f1483 100644 --- a/amarok/src/engine/helix/helix-sp/hspvoladvise.h +++ b/amarok/src/engine/helix/helix-sp/hspvoladvise.h @@ -23,7 +23,7 @@ public: /* * IUnknown methods */ - STDQT_METHOD(QueryInterface) (THIS_ + STDTQT_METHOD(QueryInterface) (THIS_ REFIID riid, void** ppvObj); @@ -34,10 +34,10 @@ public: /* * IHXVolumeAdviceSink methods */ - STDQT_METHOD(OnVolumeChange) (THIS_ + STDTQT_METHOD(OnVolumeChange) (THIS_ const UINT16 uVolume ); - STDQT_METHOD(OnMuteChange) (THIS_ + STDTQT_METHOD(OnMuteChange) (THIS_ const BOOL bMute ); diff --git a/amarok/src/engine/helix/hxplayercontrol.cpp b/amarok/src/engine/helix/hxplayercontrol.cpp index 6c76eac2..9b647004 100644 --- a/amarok/src/engine/helix/hxplayercontrol.cpp +++ b/amarok/src/engine/helix/hxplayercontrol.cpp @@ -65,11 +65,11 @@ void HSPPlayerControlled::onBuffering(int percentage) } -PlayerControl::PlayerControl() : m_eq_enabled(false), m_preamp(0), m_err(0), iamparent(0), m_index(0), nNumPlayers(0), +PlayerControl::PlayerControl() : m_eq_enabled(false), m_preamp(0), m_err(0), iamtqparent(0), m_index(0), nNumPlayers(0), m_inited(false), m_api( HelixSimplePlayer::OSS ), m_device(0), mimehead(0), mimelistlen(0), m_numPlugins(0), m_pluginInfo(0) { - memset(m_children, 0, sizeof(m_children)); + memset(m_tqchildren, 0, sizeof(m_tqchildren)); } PlayerControl::~PlayerControl() @@ -88,7 +88,7 @@ PlayerControl::~PlayerControl() void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, const char *codecspath, int numPlayers) { int err; - iamparent = 0; + iamtqparent = 0; nNumPlayers = numPlayers; m_err = 0; @@ -100,7 +100,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co return; } - memset(&m_children, 0, numPlayers * sizeof(struct playerChildren)); + memset(&m_tqchildren, 0, numPlayers * sizeof(struct playerChildren)); m_inited = false; @@ -121,30 +121,30 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co { if (pmapped) { - m_children[i].current_time = &(pmapped[i].current_time); - m_children[i].duration = &(pmapped[i].duration); - m_children[i].md = &(pmapped[i].md); + m_tqchildren[i].current_time = &(pmapped[i].current_time); + m_tqchildren[i].duration = &(pmapped[i].duration); + m_tqchildren[i].md = &(pmapped[i].md); - m_children[i].m_current = &(pmapped[i].m_current); - m_children[i].m_consumed = &(pmapped[i].m_consumed); - //m_children[i].q = pmapped[i].q; + m_tqchildren[i].m_current = &(pmapped[i].m_current); + m_tqchildren[i].m_consumed = &(pmapped[i].m_consumed); + //m_tqchildren[i].q = pmapped[i].q; //for (int j=0; j<NUM_SCOPEBUFS; j++) //{ - // m_children[i].q[j].allocd = false; - // m_children[i].q[j].buf = pmapped[i].b[j]; + // m_tqchildren[i].q[j].allocd = false; + // m_tqchildren[i].q[j].buf = pmapped[i].b[j]; //} } - err = pipe(m_children[i].m_pipeA); - err |= pipe(m_children[i].m_pipeB); - if ( !err && (iamparent = fork()) ) + err = pipe(m_tqchildren[i].m_pipeA); + err |= pipe(m_tqchildren[i].m_pipeB); + if ( !err && (iamtqparent = fork()) ) { - // parent - print2stderr("%%%%%% parent initializes player %d\n", i); + // tqparent + print2stderr("%%%%%% tqparent initializes player %d\n", i); - // parent's m_pid remains 0 - m_children[i].m_pid = iamparent; - close(m_children[i].m_pipeA[1]); // parent uses A for reading - close(m_children[i].m_pipeB[0]); // and B for writing + // tqparent's m_pid remains 0 + m_tqchildren[i].m_pid = iamtqparent; + close(m_tqchildren[i].m_pipeA[1]); // tqparent uses A for reading + close(m_tqchildren[i].m_pipeB[0]); // and B for writing } else if (!err) { @@ -153,17 +153,17 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co cerr << "%%%%%% child initializes as player " << i << endl;; m_index = i; // child's index is saved - close(m_children[i].m_pipeA[0]); // child uses A for writing - close(m_children[i].m_pipeB[1]); // and B for reading + close(m_tqchildren[i].m_pipeA[0]); // child uses A for writing + close(m_tqchildren[i].m_pipeB[1]); // and B for reading break; } } - if (!iamparent) // children stay here, parents return + if (!iamtqparent) // tqchildren stay here, tqparents return { - int rfd = m_children[m_index].m_pipeB[0]; - int wfd = m_children[m_index].m_pipeA[1]; + int rfd = m_tqchildren[m_index].m_pipeB[0]; + int wfd = m_tqchildren[m_index].m_pipeA[1]; int n; struct timeval timeout; HSPPlayerControlled *player = 0; @@ -237,7 +237,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co if (m_inited) { if (pmapped) - *m_children[m_index].current_time = 0; + *m_tqchildren[m_index].current_time = 0; if (sz == sizeof(unsigned long) + 1) { @@ -353,7 +353,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co cerr << "CHILD " << m_index << " sz not right in ENABLEEQ, sz=" << sz << endl; } break; - case UPDATEEQGAINS: + case UPDATEETQGAINS: { int i, n, k; @@ -367,7 +367,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co player->m_preamp = m_preamp; } else - cerr << "CHILD " << m_index << " sz not right in UPDATEEQGAINS, sz=" << sz << endl; + cerr << "CHILD " << m_index << " sz not right in UPDATEETQGAINS, sz=" << sz << endl; if ((unsigned)sz == sizeof(m_preamp) + sizeof(int) + n * sizeof(int)) { @@ -388,7 +388,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co } } else - cerr << "CHILD " << m_index << " sz not right in UPDATEEQGAINS, sz=" << sz << endl; + cerr << "CHILD " << m_index << " sz not right in UPDATEETQGAINS, sz=" << sz << endl; } } break; @@ -397,7 +397,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co { player->clearScopeQ(0); if (pmapped) - *m_children[m_index].m_consumed = *m_children[m_index].m_current = 0; + *m_tqchildren[m_index].m_consumed = *m_tqchildren[m_index].m_current = 0; } break; case TEARDOWN: @@ -413,7 +413,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co cerr << "CHILD " << m_index << " sz not right in TEARDOWN, sz=" << sz << endl; break; - default: // send an error to the parent + default: // send an error to the tqparent cerr << "CHILD " << m_index << " received unhandled message, sz=" << sz << endl; break; } @@ -437,36 +437,36 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co playing = false; if (pmapped) { - *m_children[m_index].current_time = 0; - *m_children[m_index].duration = 0; + *m_tqchildren[m_index].current_time = 0; + *m_tqchildren[m_index].duration = 0; } } if (pmapped) { - *m_children[m_index].current_time = player->where(0); - *m_children[m_index].duration = player->duration(0); + *m_tqchildren[m_index].current_time = player->where(0); + *m_tqchildren[m_index].duration = player->duration(0); HelixSimplePlayer::metaData *md = player->getMetaData(0); if (md) - memcpy((void *) m_children[m_index].md, (void *) md, sizeof(HelixSimplePlayer::metaData)); + memcpy((void *) m_tqchildren[m_index].md, (void *) md, sizeof(HelixSimplePlayer::metaData)); struct DelayQueue *item; //int j; while ((item = player->getScopeBuf(0))) { - //j = (*m_children[m_index].m_current + 1) % NUM_SCOPEBUFS; + //j = (*m_tqchildren[m_index].m_current + 1) % NUM_SCOPEBUFS; //cerr << "player:" << m_index << " j=" << j << " time=" << item->time << " etime=" << item->etime << " len=" << item->len << endl; - //m_children[m_index].q[j].len = item->len; - //m_children[m_index].q[j].time = item->time; - //m_children[m_index].q[j].etime = item->etime; - //m_children[m_index].q[j].nchan = item->nchan; - //m_children[m_index].q[j].bps = item->bps; - //m_children[m_index].q[j].tps = item->tps; - //m_children[m_index].q[j].spb = item->spb; - //memcpy((void *)m_children[m_index].q[j].buf, (void *) item->buf, item->len ); - //*m_children[m_index].m_current = j; + //m_tqchildren[m_index].q[j].len = item->len; + //m_tqchildren[m_index].q[j].time = item->time; + //m_tqchildren[m_index].q[j].etime = item->etime; + //m_tqchildren[m_index].q[j].nchan = item->nchan; + //m_tqchildren[m_index].q[j].bps = item->bps; + //m_tqchildren[m_index].q[j].tps = item->tps; + //m_tqchildren[m_index].q[j].spb = item->spb; + //memcpy((void *)m_tqchildren[m_index].q[j].buf, (void *) item->buf, item->len ); + //*m_tqchildren[m_index].m_current = j; //cerr << "player:" << m_index << " time=" << item->time << " etime=" << item->etime << endl; sendscopebuf(wfd, item); delete item; @@ -488,15 +488,15 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co sendsetdevice(); sendinit(); - // wait for ready from children + // wait for ready from tqchildren while (!done && !dead) { dispatch(); done = true; for (i=0; i<numPlayers; i++) { - done &= m_children[i].isready; - dead |= m_children[i].isdead; + done &= m_tqchildren[i].isready; + dead |= m_tqchildren[i].isdead; } } @@ -534,18 +534,18 @@ int PlayerControl::initDirectSS() void PlayerControl::tearDown() { int tmp; - if (iamparent) + if (iamtqparent) { for (int i = 0; i < nNumPlayers; i++) { if (m_inited) { - sendteardown(m_children[i].m_pipeB[1]); - close(m_children[i].m_pipeB[1]); - close(m_children[i].m_pipeA[0]); - cerr << "About to waitpid for pid " << m_children[i].m_pid << endl; - kill(m_children[i].m_pid, SIGTERM); - waitpid(m_children[i].m_pid, &tmp, 0); + sendteardown(m_tqchildren[i].m_pipeB[1]); + close(m_tqchildren[i].m_pipeB[1]); + close(m_tqchildren[i].m_pipeA[0]); + cerr << "About to waitpid for pid " << m_tqchildren[i].m_pid << endl; + kill(m_tqchildren[i].m_pid, SIGTERM); + waitpid(m_tqchildren[i].m_pid, &tmp, 0); } } } @@ -553,16 +553,16 @@ void PlayerControl::tearDown() void PlayerControl::start(int playerIndex, bool fadein, unsigned long fadetime) { - m_children[playerIndex].isplaying = true; + m_tqchildren[playerIndex].isplaying = true; if (pmapped) - *m_children[playerIndex].m_consumed = *m_children[playerIndex].m_current = 0; - sendstart(m_children[playerIndex].m_pipeB[1], fadein, fadetime); + *m_tqchildren[playerIndex].m_consumed = *m_tqchildren[playerIndex].m_current = 0; + sendstart(m_tqchildren[playerIndex].m_pipeB[1], fadein, fadetime); } int PlayerControl::setURL(const char *url, int playerIndex, bool islocal) { - m_children[playerIndex].islocal = islocal; - if (sendsetURL(m_children[playerIndex].m_pipeB[1], url, islocal)) + m_tqchildren[playerIndex].islocal = islocal; + if (sendsetURL(m_tqchildren[playerIndex].m_pipeB[1], url, islocal)) return 0; return -1; @@ -570,7 +570,7 @@ int PlayerControl::setURL(const char *url, int playerIndex, bool islocal) bool PlayerControl::done(int playerIndex) { - return (!m_children[playerIndex].isplaying); + return (!m_tqchildren[playerIndex].isplaying); } void PlayerControl::stop(int playerIndex) @@ -582,30 +582,30 @@ void PlayerControl::stop(int playerIndex) } else { - m_children[playerIndex].isplaying = false; - sendstop(m_children[playerIndex].m_pipeB[1]); + m_tqchildren[playerIndex].isplaying = false; + sendstop(m_tqchildren[playerIndex].m_pipeB[1]); } } void PlayerControl::pause(int playerIndex) { - sendpause(m_children[playerIndex].m_pipeB[1]); + sendpause(m_tqchildren[playerIndex].m_pipeB[1]); } void PlayerControl::resume(int playerIndex) { - sendresume(m_children[playerIndex].m_pipeB[1]); + sendresume(m_tqchildren[playerIndex].m_pipeB[1]); } void PlayerControl::seek(unsigned long pos, int playerIndex) { - sendmessage(m_children[playerIndex].m_pipeB[1], SEEK, (unsigned char *) &pos, sizeof(unsigned long)); + sendmessage(m_tqchildren[playerIndex].m_pipeB[1], SEEK, (unsigned char *) &pos, sizeof(unsigned long)); } unsigned long PlayerControl::where(int playerIndex) const { if (pmapped) - return *m_children[playerIndex].current_time; + return *m_tqchildren[playerIndex].current_time; else return 0; } @@ -613,7 +613,7 @@ unsigned long PlayerControl::where(int playerIndex) const unsigned long PlayerControl::duration(int playerIndex) const { if (pmapped) - return *m_children[playerIndex].duration; + return *m_tqchildren[playerIndex].duration; else return 0; } @@ -627,7 +627,7 @@ void PlayerControl::setVolume(unsigned long vol) { m_volume = vol; for (int i = 0; i < nNumPlayers; i++) - sendsetvolume(m_children[i].m_pipeB[1], vol); + sendsetvolume(m_tqchildren[i].m_pipeB[1], vol); } void PlayerControl::dispatch() @@ -647,8 +647,8 @@ void PlayerControl::dispatch() for (i=0; i<nNumPlayers; i++) { - rfd = m_children[i].m_pipeA[0]; - wfd = m_children[i].m_pipeB[1]; + rfd = m_tqchildren[i].m_pipeA[0]; + wfd = m_tqchildren[i].m_pipeB[1]; FD_SET(rfd, &rdset); FD_SET(wfd, &wrset); // really should check to see if we can write, but not gonna if (rfd > n) @@ -661,8 +661,8 @@ void PlayerControl::dispatch() ntot = select(n + 1, &rdset, 0, 0, &timeout); for (i=0; ntot && i < nNumPlayers; i++) { - rfd = m_children[i].m_pipeA[0]; - wfd = m_children[i].m_pipeB[1]; + rfd = m_tqchildren[i].m_pipeA[0]; + wfd = m_tqchildren[i].m_pipeB[1]; if ( FD_ISSET(rfd, &rdset) ) { msgid m; @@ -675,14 +675,14 @@ void PlayerControl::dispatch() { case READY: print2stderr("CHILD %d is READY\n", i); - m_children[i].isready = true;; + m_tqchildren[i].isready = true;; break; case DONE: print2stderr("CHILD %d is DONE\n", i); if (!sz) { - m_children[i].isplaying = false; + m_tqchildren[i].isplaying = false; clearScopeQ(i); play_finished(i); } @@ -852,7 +852,7 @@ void PlayerControl::dispatch() } else { - m_children[i].isdead = true; + m_tqchildren[i].isdead = true; return; // should never happen } } @@ -860,16 +860,16 @@ void PlayerControl::dispatch() for (i=0; pmapped && i<nNumPlayers; i++) { - while (*m_children[i].m_consumed != *m_children[i].m_current) + while (*m_tqchildren[i].m_consumed != *m_tqchildren[i].m_current) { - addScopeBuf(&m_children[i].q[*m_children[i].m_consumed], i); + addScopeBuf(&m_tqchildren[i].q[*m_tqchildren[i].m_consumed], i); - //cerr << "j=" << *m_children[i].m_consumed << - // " time=" << m_children[i].q[*m_children[i].m_consumed].time << - // " etime=" << m_children[i].q[*m_children[i].m_consumed].etime << - // " len=" << m_children[i].q[*m_children[i].m_consumed].len << endl; + //cerr << "j=" << *m_tqchildren[i].m_consumed << + // " time=" << m_tqchildren[i].q[*m_tqchildren[i].m_consumed].time << + // " etime=" << m_tqchildren[i].q[*m_tqchildren[i].m_consumed].etime << + // " len=" << m_tqchildren[i].q[*m_tqchildren[i].m_consumed].len << endl; - *m_children[i].m_consumed = (*m_children[i].m_consumed + 1) % NUM_SCOPEBUFS; + *m_tqchildren[i].m_consumed = (*m_tqchildren[i].m_consumed + 1) % NUM_SCOPEBUFS; } } } @@ -881,37 +881,37 @@ void PlayerControl::cleanUpStream(int playerIndex) bool PlayerControl::isPlaying(int playerIndex) const { - return m_children[playerIndex].isplaying; + return m_tqchildren[playerIndex].isplaying; } bool PlayerControl::isLocal(int playerIndex) const { - return m_children[playerIndex].islocal; + return m_tqchildren[playerIndex].islocal; } void PlayerControl::setFadeout(bool fadeout, unsigned long fadelength, int playerIndex) { - sendsetfade(m_children[playerIndex].m_pipeB[1], fadeout, fadelength); + sendsetfade(m_tqchildren[playerIndex].m_pipeB[1], fadeout, fadelength); } void PlayerControl::addScopeBuf(struct DelayQueue *item, int playerIndex) { if (playerIndex >=0 && playerIndex < nNumPlayers) { - if (m_children[playerIndex].scopebuftail) + if (m_tqchildren[playerIndex].scopebuftail) { item->fwd = 0; - m_children[playerIndex].scopebuftail->fwd = item; - m_children[playerIndex].scopebuftail = item; - m_children[playerIndex].scopecount++; + m_tqchildren[playerIndex].scopebuftail->fwd = item; + m_tqchildren[playerIndex].scopebuftail = item; + m_tqchildren[playerIndex].scopecount++; } else { item->fwd = 0; - m_children[playerIndex].scopebufhead = item; - m_children[playerIndex].scopebuftail = item; - m_children[playerIndex].scopecount = 1; + m_tqchildren[playerIndex].scopebufhead = item; + m_tqchildren[playerIndex].scopebuftail = item; + m_tqchildren[playerIndex].scopecount = 1; } } } @@ -920,14 +920,14 @@ DelayQueue *PlayerControl::getScopeBuf(int playerIndex) { if (playerIndex >=0 && playerIndex < nNumPlayers) { - struct DelayQueue *item = m_children[playerIndex].scopebufhead; + struct DelayQueue *item = m_tqchildren[playerIndex].scopebufhead; if (item) { - m_children[playerIndex].scopebufhead = item->fwd; - m_children[playerIndex].scopecount--; - if (!m_children[playerIndex].scopebufhead) - m_children[playerIndex].scopebuftail = 0; + m_tqchildren[playerIndex].scopebufhead = item->fwd; + m_tqchildren[playerIndex].scopecount--; + if (!m_tqchildren[playerIndex].scopebufhead) + m_tqchildren[playerIndex].scopebuftail = 0; } return item; } @@ -937,15 +937,15 @@ DelayQueue *PlayerControl::getScopeBuf(int playerIndex) int PlayerControl::getScopeCount(int playerIndex) { - return (playerIndex >= 0 && playerIndex < nNumPlayers ? m_children[playerIndex].scopecount : 0); + return (playerIndex >= 0 && playerIndex < nNumPlayers ? m_tqchildren[playerIndex].scopecount : 0); } int PlayerControl::peekScopeTime(unsigned long &t, int playerIndex) { if (playerIndex >=0 && playerIndex < nNumPlayers) { - if (m_children[playerIndex].scopebufhead) - t = m_children[playerIndex].scopebufhead->time; + if (m_tqchildren[playerIndex].scopebufhead) + t = m_tqchildren[playerIndex].scopebufhead->time; else return -1; return 0; @@ -962,7 +962,7 @@ void PlayerControl::clearScopeQ(int playerIndex) } else { - sendscopeclear(m_children[playerIndex].m_pipeB[1]); + sendscopeclear(m_tqchildren[playerIndex].m_pipeB[1]); struct DelayQueue *item; while ((item = getScopeBuf(playerIndex))) if (item->allocd) @@ -976,7 +976,7 @@ void PlayerControl::enableEQ(bool enabled) unsigned char c = (char) enabled; for (i=0; i<nNumPlayers; i++) - sendmessage(m_children[i].m_pipeB[1], ENABLEEQ, (unsigned char *) &c, 1); + sendmessage(m_tqchildren[i].m_pipeB[1], ENABLEEQ, (unsigned char *) &c, 1); m_eq_enabled = enabled; } @@ -1021,7 +1021,7 @@ int PlayerControl::getMimeListLen() const HelixSimplePlayer::metaData *PlayerControl::getMetaData(int playerIndex ) { - return m_children[playerIndex].md; + return m_tqchildren[playerIndex].md; } bool PlayerControl::sendsetoutputsink() @@ -1031,7 +1031,7 @@ bool PlayerControl::sendsetoutputsink() bool ok = false; for (i=0; i<nNumPlayers; i++) - ok |= sendmessage(m_children[i].m_pipeB[1], OUTPUTSINK, (unsigned char *) &c, 1); + ok |= sendmessage(m_tqchildren[i].m_pipeB[1], OUTPUTSINK, (unsigned char *) &c, 1); return ok; } @@ -1045,7 +1045,7 @@ bool PlayerControl::sendsetdevice() bool ok = false; for (i=0; i<nNumPlayers; i++) - ok |= sendmessage(m_children[i].m_pipeB[1], DEVICE, (unsigned char *) m_device, len + 1); + ok |= sendmessage(m_tqchildren[i].m_pipeB[1], DEVICE, (unsigned char *) m_device, len + 1); return ok; } @@ -1056,7 +1056,7 @@ bool PlayerControl::sendinit() bool ok = false; for (i=0; i<nNumPlayers; i++) - ok |= sendrequest(m_children[i].m_pipeB[1], INIT); + ok |= sendrequest(m_tqchildren[i].m_pipeB[1], INIT); return ok; } @@ -1077,12 +1077,12 @@ bool PlayerControl::sendupdateeqgains() memcpy((void *)&buf[ sizeof(m_preamp) + (i+1) * sizeof(int) ], (void *) &bandGain, sizeof(int)); } for ( i = 0; i < (uint) nNumPlayers; i++ ) - ok |= sendmessage(m_children[i].m_pipeB[1], UPDATEEQGAINS, buf, sizeof(m_preamp) + (m_equalizerGains.size()+1) * sizeof(int)); + ok |= sendmessage(m_tqchildren[i].m_pipeB[1], UPDATEETQGAINS, buf, sizeof(m_preamp) + (m_equalizerGains.size()+1) * sizeof(int)); return ok; } -// children send this! +// tqchildren send this! bool PlayerControl::sendnotifyuser(unsigned long code, const char *moreinfo, const char *moreinfourl) { int len1 = strlen(moreinfo), len2 = strlen(moreinfourl), len; @@ -1095,10 +1095,10 @@ bool PlayerControl::sendnotifyuser(unsigned long code, const char *moreinfo, con memcpy( (void *) &buf[ len ], (void *) moreinfourl, len2 + 1); len += len2 + 1; - return (sendmessage(m_children[m_index].m_pipeA[1], NOTIFYUSER, buf, len)); + return (sendmessage(m_tqchildren[m_index].m_pipeA[1], NOTIFYUSER, buf, len)); } -// children send this! +// tqchildren send this! bool PlayerControl::sendinterruptuser(unsigned long code, const char *moreinfo, const char *moreinfourl) { int len1 = strlen(moreinfo), len2 = strlen(moreinfourl), len; @@ -1111,21 +1111,21 @@ bool PlayerControl::sendinterruptuser(unsigned long code, const char *moreinfo, memcpy( (void *) &buf[ len ], (void *) moreinfourl, len2 + 1); len += len2 + 1; - return (sendmessage(m_children[m_index].m_pipeA[1], INTERRUPTUSER, buf, len)); + return (sendmessage(m_tqchildren[m_index].m_pipeA[1], INTERRUPTUSER, buf, len)); } -// children send this! +// tqchildren send this! bool PlayerControl::sendcontacting(const char *host) { int len = strlen(host); - return (sendmessage(m_children[m_index].m_pipeA[1], CONTACTING, (unsigned char *) host, len + 1)); + return (sendmessage(m_tqchildren[m_index].m_pipeA[1], CONTACTING, (unsigned char *) host, len + 1)); } -// children send this! +// tqchildren send this! bool PlayerControl::sendbuffering(int percentage) { - return (sendmessage(m_children[m_index].m_pipeA[1], BUFFERING, (unsigned char *) &percentage, sizeof(unsigned long))); + return (sendmessage(m_tqchildren[m_index].m_pipeA[1], BUFFERING, (unsigned char *) &percentage, sizeof(unsigned long))); } diff --git a/amarok/src/engine/helix/hxplayercontrol.h b/amarok/src/engine/helix/hxplayercontrol.h index 760284de..3ffefe90 100644 --- a/amarok/src/engine/helix/hxplayercontrol.h +++ b/amarok/src/engine/helix/hxplayercontrol.h @@ -87,7 +87,7 @@ public: virtual void onContacting(const char */*host*/) {} virtual void onBuffering(int /*percentage*/) {} - // children send functions + // tqchildren send functions bool sendnotifyuser(unsigned long code, const char *moreinfo, const char *moreinfourl); bool sendinterruptuser(unsigned long code, const char *moreinfo, const char *moreinfourl); bool sendcontacting(const char *host); @@ -100,7 +100,7 @@ protected: private: int m_err; - pid_t iamparent; + pid_t iamtqparent; int m_index; int nNumPlayers; bool m_inited; @@ -129,7 +129,7 @@ private: DelayQueue *q; int *m_current; int *m_consumed; - } m_children[2]; + } m_tqchildren[2]; unsigned long m_volume; @@ -175,7 +175,7 @@ private: DEVICE, SETFADE, ENABLEEQ, - UPDATEEQGAINS, + UPDATEETQGAINS, SCOPEBUF, SCOPECLEAR, METADATAREQ, diff --git a/amarok/src/engine/kdemm/kdemmengine.cpp b/amarok/src/engine/kdemm/kdemmengine.cpp index b39033e0..3addcc69 100644 --- a/amarok/src/engine/kdemm/kdemmengine.cpp +++ b/amarok/src/engine/kdemm/kdemmengine.cpp @@ -113,7 +113,7 @@ bool KDEMMEngine::canDecode( const KURL &url ) const KMimeType::Ptr mimetype = fileItem.determineMimeType(); kdDebug() << "mimetype: " << mimetype->name().latin1() << endl; - return list.contains( mimetype->name().latin1() ); + return list.tqcontains( mimetype->name().latin1() ); } // canDecode diff --git a/amarok/src/engine/kdemm/kdemmengine.h b/amarok/src/engine/kdemm/kdemmengine.h index fdcd4c11..9eb16408 100644 --- a/amarok/src/engine/kdemm/kdemmengine.h +++ b/amarok/src/engine/kdemm/kdemmengine.h @@ -37,6 +37,7 @@ namespace KDE { namespace Multimedia { class SimplePlayer; } } class KDEMMEngine : public Engine::Base { Q_OBJECT + TQ_OBJECT public: KDEMMEngine(); diff --git a/amarok/src/engine/mas/masengine.cpp b/amarok/src/engine/mas/masengine.cpp index cc9511b8..52807f38 100644 --- a/amarok/src/engine/mas/masengine.cpp +++ b/amarok/src/engine/mas/masengine.cpp @@ -44,8 +44,8 @@ what : interface to the Media Application Server (MAS) //#define DB_CUTOFF -40.0 #define BUFFER_TIME_MS 300 #define POSTOUT_TIME_MS 100 -//#define QUERY_MIX_VOLUME 0 -//#define QUERY_MIX_EPSILON 5 +//#define TQUERY_MIX_VOLUME 0 +//#define TQUERY_MIX_EPSILON 5 @@ -127,7 +127,7 @@ bool MasEngine::canDecode( const KURL &url ) const KMimeType::Ptr mimetype = fileItem.determineMimeType(); debug() << "mimetype: " << mimetype->name().latin1() << endl; - playable = list.contains( mimetype->name().latin1() ); + playable = list.tqcontains( mimetype->name().latin1() ); if ( !playable ) warning() << "Mimetype is not playable by MAS (" << url << ")" << endl; @@ -401,7 +401,7 @@ bool MasEngine::masinit() warning() << "MAS daemon not running. Starting! Please provide password..." << endl; // masd seems not to be running, let's try to run it TQCString cmdline; - cmdline = TQFile::encodeName( KStandardDirs::findExe( TQString::fromLatin1( "kdesu" ) ) ); + cmdline = TQFile::encodeName( KStandardDirs::findExe( TQString::tqfromLatin1( "kdesu" ) ) ); // TODO !!!hardcoded path cmdline += " -n -f /usr/local/mas/log/mas-1.log -c "; cmdline += "/usr/local/mas/bin/mas-launch"; diff --git a/amarok/src/engine/mas/masengine.h b/amarok/src/engine/mas/masengine.h index 098025eb..9a1d45f5 100644 --- a/amarok/src/engine/mas/masengine.h +++ b/amarok/src/engine/mas/masengine.h @@ -39,6 +39,7 @@ class KURL; class MasEngine : public Engine::Base { Q_OBJECT + TQ_OBJECT public: MasEngine(); diff --git a/amarok/src/engine/nmm/HostList.cpp b/amarok/src/engine/nmm/HostList.cpp index 38ff4cbe..7225548e 100644 --- a/amarok/src/engine/nmm/HostList.cpp +++ b/amarok/src/engine/nmm/HostList.cpp @@ -31,8 +31,8 @@ #include "debug.h" #include "HostListItem.h" -HostList::HostList( TQWidget *parent, const char *name ) - : KListView( parent, name ), +HostList::HostList( TQWidget *tqparent, const char *name ) + : KListView( tqparent, name ), m_read_only( false ), m_hoveredVolume(0) { @@ -45,14 +45,14 @@ HostList::HostList( TQWidget *parent, const char *name ) addColumn( i18n("Audio" ) ); addColumn( i18n("Volume" ), 113 ); header()->setResizeEnabled(false, 3); - addColumn( i18n("Status" ) ); + addColumn( i18n("tqStatus" ) ); addColumn( i18n("Playback" ) ); - setColumnAlignment( HostListItem::Hostname, Qt::AlignCenter ); - setColumnAlignment( HostListItem::Video, Qt::AlignCenter ); - setColumnAlignment( HostListItem::Audio, Qt::AlignCenter ); - setColumnAlignment( HostListItem::Volume, Qt::AlignCenter ); - setColumnAlignment( HostListItem::Status, Qt::AlignLeft ); + setColumnAlignment( HostListItem::Hostname, TQt::AlignCenter ); + setColumnAlignment( HostListItem::Video, TQt::AlignCenter ); + setColumnAlignment( HostListItem::Audio, TQt::AlignCenter ); + setColumnAlignment( HostListItem::Volume, TQt::AlignCenter ); + setColumnAlignment( HostListItem::tqStatus, TQt::AlignLeft ); } HostList::~HostList() @@ -67,8 +67,8 @@ void HostList::notifyHostError( TQString hostname, int error) if( host->text(HostListItem::Hostname) == hostname ) { host->setText( HostListItem::Hostname, hostname ); - host->setStatus( error ); - host->repaint(); + host->settqStatus( error ); + host->tqrepaint(); return; } ++it; @@ -78,7 +78,7 @@ void HostList::notifyHostError( TQString hostname, int error) void HostList::contentsMousePressEvent( TQMouseEvent *e) { HostListItem *item = static_cast<HostListItem*>( itemAt( contentsToViewport( e->pos() ) ) ); - if( !( e->state() & Qt::ControlButton || e->state() & Qt::ShiftButton ) && ( e->button() & Qt::LeftButton ) && item) + if( !( e->state() & TQt::ControlButton || e->state() & TQt::ShiftButton ) && ( e->button() & TQt::LeftButton ) && item) { // video column if( !m_read_only && @@ -101,8 +101,8 @@ void HostList::contentsMousePressEvent( TQMouseEvent *e) } // status column else - if( e->pos().x() > header()->sectionPos( HostListItem::Status ) && - e->pos().x() < header()->sectionPos( HostListItem::Status ) + header()->sectionSize( HostListItem::Status ) ) + if( e->pos().x() > header()->sectionPos( HostListItem::tqStatus ) && + e->pos().x() < header()->sectionPos( HostListItem::tqStatus ) + header()->sectionSize( HostListItem::tqStatus ) ) { item->statusToolTip(); } diff --git a/amarok/src/engine/nmm/HostList.h b/amarok/src/engine/nmm/HostList.h index a67f6d13..1fee31ad 100644 --- a/amarok/src/engine/nmm/HostList.h +++ b/amarok/src/engine/nmm/HostList.h @@ -32,6 +32,7 @@ class HostListItem; class HostList : public KListView { Q_OBJECT + TQ_OBJECT public: HostList( TQWidget*, const char* ); diff --git a/amarok/src/engine/nmm/HostListItem.cpp b/amarok/src/engine/nmm/HostListItem.cpp index 584b4731..dbf72003 100644 --- a/amarok/src/engine/nmm/HostListItem.cpp +++ b/amarok/src/engine/nmm/HostListItem.cpp @@ -41,8 +41,8 @@ #include "HostList.h" #include "nmm_engine.h" -HostListItem::HostListItem( TQListView *parent, TQString hostname, bool audio, bool video, int volume, int status, bool read_only ) - : KListViewItem( parent ), +HostListItem::HostListItem( TQListView *tqparent, TQString hostname, bool audio, bool video, int volume, int status, bool read_only ) + : KListViewItem( tqparent ), m_audio( audio ), m_video( video ), m_volume( volume ), @@ -51,8 +51,8 @@ HostListItem::HostListItem( TQListView *parent, TQString hostname, bool audio, b { setText( HostListItem::Hostname, hostname); - setPixmap( HostListItem::Status, SmallIcon("info") ); - setText( HostListItem::Status, i18n("Unknown") ); + setPixmap( HostListItem::tqStatus, SmallIcon("info") ); + setText( HostListItem::tqStatus, i18n("Unknown") ); setPixmap( HostListItem::Playback, SmallIcon("info") ); setText( HostListItem::Playback, i18n("Unknown") ); @@ -77,7 +77,7 @@ int HostListItem::volumeAtPosition( int x ) void HostListItem::updateColumn( int column ) const { - const TQRect r = listView()->itemRect( this ); + const TQRect r = listView()->tqitemRect( this ); if( !r.isValid() ) return; @@ -88,10 +88,10 @@ void HostListItem::updateColumn( int column ) const void HostListItem::statusToolTip() { - TQWhatsThis::display( prettyStatus( m_status ) ); + TQWhatsThis::display( prettytqStatus( m_status ) ); } -TQString HostListItem::prettyStatus( int error ) +TQString HostListItem::prettytqStatus( int error ) { TQString st; @@ -146,24 +146,24 @@ void HostListItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, if( ! m_read_only) setPixmap( HostListItem::Audio, SmallIcon("nmm_option_off") ); } - else if( column == HostListItem::Status ) + else if( column == HostListItem::tqStatus ) { TQFont font( p->font() ); if( ! m_status ) // Unknown { font.setBold( false ); - setText( HostListItem::Status , i18n("Unknown") ); + setText( HostListItem::tqStatus , i18n("Unknown") ); } else if( m_status == NmmEngine::STATUS_OK ) { font.setBold( false ); - m_cg.setColor( TQColorGroup::Text, Qt::darkGreen ); - setText( HostListItem::Status , i18n("OK") ); + m_cg.setColor( TQColorGroup::Text, TQt::darkGreen ); + setText( HostListItem::tqStatus , i18n("OK") ); } else { // error font.setBold( true ); - m_cg.setColor( TQColorGroup::Text, Qt::red ); - setText( HostListItem::Status , i18n("Failed") ); + m_cg.setColor( TQColorGroup::Text, TQt::red ); + setText( HostListItem::tqStatus , i18n("Failed") ); } p->setFont( font ); } @@ -213,7 +213,7 @@ void HostListItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, font.setPixelSize( 9 ); p_number.setFont( font ); const TQRect rect( 40, 0, 34, 15 ); - p_number.drawText( rect, Qt::AlignRight | Qt::AlignVCenter, vol_text ); + p_number.drawText( rect, TQt::AlignRight | TQt::AlignVCenter, vol_text ); p_number.end(); //bitBlt( p_number.device(), 0, 0, &buf ); @@ -253,14 +253,14 @@ TQPixmap HostListItem::generateGradient( int type ) temp = TQPixmap( locate( "data", "amarok/images/nmm-gradient-right.png" ) ); else // PixLeft temp = TQPixmap( locate( "data", "amarok/images/nmm-gradient-left.png" ) ); - const TQBitmap mask( temp.createHeuristicMask() ); + const TQBitmap tqmask( temp.createHeuristicMask() ); KPixmap result = TQPixmap( 113, 24 ); if( type == PixRight) - KPixmapEffect::gradient( result, listView()->colorGroup().background(), listView()->colorGroup().highlight(), KPixmapEffect::HorizontalGradient ); + KPixmapEffect::gradient( result, listView()->tqcolorGroup().background(), listView()->tqcolorGroup().highlight(), KPixmapEffect::HorizontalGradient ); else - KPixmapEffect::gradient( result, listView()->colorGroup().highlight(), listView()->colorGroup().background(), KPixmapEffect::HorizontalGradient ); + KPixmapEffect::gradient( result, listView()->tqcolorGroup().highlight(), listView()->tqcolorGroup().background(), KPixmapEffect::HorizontalGradient ); - result.setMask( mask); + result.setMask( tqmask); return result; } diff --git a/amarok/src/engine/nmm/HostListItem.h b/amarok/src/engine/nmm/HostListItem.h index 2a3b649e..ae3c9bcd 100644 --- a/amarok/src/engine/nmm/HostListItem.h +++ b/amarok/src/engine/nmm/HostListItem.h @@ -36,7 +36,7 @@ class HostListItem : public KListViewItem { Video, Audio, Volume, - Status, + tqStatus, Playback }; @@ -49,7 +49,7 @@ class HostListItem : public KListViewItem { bool isAudioEnabled() const { return m_audio; } void toggleAudio() { m_audio = !m_audio; } - void setStatus( int s ) { m_status = s; } + void settqStatus( int s ) { m_status = s; } int status() const { return m_status; } void setVolume( int v ) { m_volume = v; } @@ -69,7 +69,7 @@ class HostListItem : public KListViewItem { * \todo make it user friendly/understandable * \todo right place for this method? */ - static TQString prettyStatus( int ); + static TQString prettytqStatus( int ); protected: void paintCell( TQPainter * painter, const TQColorGroup & cg, int column, int width, int align ); diff --git a/amarok/src/engine/nmm/NmmLocation.h b/amarok/src/engine/nmm/NmmLocation.h index a1bc693d..2c628602 100644 --- a/amarok/src/engine/nmm/NmmLocation.h +++ b/amarok/src/engine/nmm/NmmLocation.h @@ -46,7 +46,7 @@ class NmmLocation { int volume() const { return m_volume; } void setVolume( int v ) { m_volume = v; } - void setStatus( int s ) { m_status = s; } + void settqStatus( int s ) { m_status = s; } int status() const { return m_status; } private: diff --git a/amarok/src/engine/nmm/ServerregistryPing.cpp b/amarok/src/engine/nmm/ServerregistryPing.cpp index 30d13d8a..8f025833 100644 --- a/amarok/src/engine/nmm/ServerregistryPing.cpp +++ b/amarok/src/engine/nmm/ServerregistryPing.cpp @@ -26,7 +26,7 @@ #include "debug.h" -ServerregistryPing::ServerregistryPing(const TQString &host, Q_UINT16 port) +ServerregistryPing::ServerregistryPing(const TQString &host, TQ_UINT16 port) : TQSocket() { connect( this, TQT_SIGNAL(connected()), diff --git a/amarok/src/engine/nmm/ServerregistryPing.h b/amarok/src/engine/nmm/ServerregistryPing.h index 6cf9170d..72078228 100644 --- a/amarok/src/engine/nmm/ServerregistryPing.h +++ b/amarok/src/engine/nmm/ServerregistryPing.h @@ -33,12 +33,13 @@ * Connects to a remote host on the default NMM serverregistry port. */ class ServerregistryPing - : public QSocket + : public TQSocket { Q_OBJECT + TQ_OBJECT public: - ServerregistryPing(const TQString & host, Q_UINT16 port = 22801); + ServerregistryPing(const TQString & host, TQ_UINT16 port = 22801); private slots: void socketConnected(); diff --git a/amarok/src/engine/nmm/nmm_configdialog.cpp b/amarok/src/engine/nmm/nmm_configdialog.cpp index b4bcd5da..712e98ea 100644 --- a/amarok/src/engine/nmm/nmm_configdialog.cpp +++ b/amarok/src/engine/nmm/nmm_configdialog.cpp @@ -165,9 +165,9 @@ void NmmConfigDialog::save() void NmmConfigDialog::addHost() { bool ok; - TQString hostname = QInputDialog::getText( + TQString hostname = TQInputDialog::getText( "New NMM sink host", "Enter hostname to add:", TQLineEdit::Normal, - TQString::null, &ok, NULL); + TQString(), &ok, NULL); if( ok && !hostname.isEmpty() ) { new HostListItem( m_user_list, hostname ); diff --git a/amarok/src/engine/nmm/nmm_configdialog.h b/amarok/src/engine/nmm/nmm_configdialog.h index e67c39ed..7d38d0aa 100644 --- a/amarok/src/engine/nmm/nmm_configdialog.h +++ b/amarok/src/engine/nmm/nmm_configdialog.h @@ -38,6 +38,7 @@ class NmmLocation; class NmmConfigDialog : public Amarok::PluginConfig { Q_OBJECT + TQ_OBJECT public: NmmConfigDialog(); diff --git a/amarok/src/engine/nmm/nmm_configdialogbase.ui b/amarok/src/engine/nmm/nmm_configdialogbase.ui index 99440241..60d052ed 100644 --- a/amarok/src/engine/nmm/nmm_configdialogbase.ui +++ b/amarok/src/engine/nmm/nmm_configdialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>NmmConfigDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>NmmConfigDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -38,7 +38,7 @@ <cstring>deviceComboBox</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Playback node</string> @@ -68,14 +68,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> </size> </property> </spacer> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>audioGroup</cstring> </property> @@ -86,7 +86,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>localhostButton</cstring> </property> @@ -97,7 +97,7 @@ <string>Plays audio and video on the machine running Amarok.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>environmentButton</cstring> </property> @@ -117,7 +117,7 @@ VIDEO_HOSTS=laptop<br> This setting will enable audio on the three hosts desktop, laptop and kitchen, and video only on host laptop.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>hostListButton</cstring> </property> @@ -128,15 +128,15 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a <string>If selected you can add and remove hosts in the list below and enable audio and video for each host.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>hostListStack</cstring> </property> @@ -148,7 +148,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -157,15 +157,15 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a </attribute> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addLocationButton</cstring> </property> @@ -173,7 +173,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a <string>Add...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeHostButton</cstring> </property> @@ -191,7 +191,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>1</height> @@ -214,7 +214,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -223,5 +223,5 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/amarok/src/engine/nmm/nmm_engine.cpp b/amarok/src/engine/nmm/nmm_engine.cpp index f370974a..96d3d9fe 100644 --- a/amarok/src/engine/nmm/nmm_engine.cpp +++ b/amarok/src/engine/nmm/nmm_engine.cpp @@ -155,14 +155,14 @@ void NmmEngine::notifyHostError( TQString hostname, int error ) for( TQValueList<NmmLocation>::Iterator it = tmp_user_list.begin(); it != tmp_user_list.end(); ++it ) { if( (*it).hostname() == hostname ) { - (*it).setStatus( error ); + (*it).settqStatus( error ); break; } } for( TQValueList<NmmLocation>::Iterator it = tmp_environment_list.begin(); it != tmp_environment_list.end(); ++it ) { if( (*it).hostname() == hostname ) { - (*it).setStatus( error ); + (*it).settqStatus( error ); break; } } @@ -368,7 +368,7 @@ bool NmmEngine::load(const KURL& url, bool stream) if( NmmKDEConfig::location() == NmmKDEConfig::EnumLocation::LocalhostOnly ) { m_localhostonly_errordialog = true; - TQString detailed_status = HostListItem::prettyStatus( error ); + TQString detailed_status = HostListItem::prettytqStatus( error ); KMessageBox::detailedError( 0, i18n("Local NMM playback failed."), detailed_status, i18n("Error"), KMessageBox::AllowLink ); m_localhostonly_errordialog = false; } @@ -623,7 +623,7 @@ bool NmmEngine::canDecode(const KURL& url) const KFileItem fileItem( KFileItem::Unknown, KFileItem::Unknown, url, false ); //false = determineMimeType straight away KMimeType::Ptr mimetype = fileItem.determineMimeType(); - return types.contains(mimetype->name()); + return types.tqcontains(mimetype->name()); } diff --git a/amarok/src/engine/nmm/nmm_engine.h b/amarok/src/engine/nmm/nmm_engine.h index 18c0b2ef..2b78b610 100644 --- a/amarok/src/engine/nmm/nmm_engine.h +++ b/amarok/src/engine/nmm/nmm_engine.h @@ -45,6 +45,7 @@ using namespace NMM; class NmmEngine : public Engine::Base { Q_OBJECT + TQ_OBJECT public: NmmEngine(); ~NmmEngine(); @@ -244,7 +245,7 @@ private: static NmmEngine* s_instance; public: - enum HostStatus { + enum HosttqStatus { STATUS_UNKNOWN = 0, STATUS_OK = 1 << 0, ERROR_PLAYBACKNODE = 1 << 1, diff --git a/amarok/src/engine/xine/xine-config.cpp b/amarok/src/engine/xine/xine-config.cpp index cbbbb921..cef57168 100644 --- a/amarok/src/engine/xine/xine-config.cpp +++ b/amarok/src/engine/xine/xine-config.cpp @@ -154,7 +154,7 @@ XineEnumEntry::XineEnumEntry(TQComboBox* input, const TQCString & key, xine_t *x { for( int i = 0; ent.enum_values[i]; ++i ) { - input->insertItem( TQString::fromLocal8Bit( ent.enum_values[i] ) ); + input->insertItem( TQString(TQString::fromLocal8Bit( ent.enum_values[i] )) ); input->setCurrentItem( ent.num_value ); m_val = ent.num_value; } diff --git a/amarok/src/engine/xine/xine-config.h b/amarok/src/engine/xine/xine-config.h index 6064a3d2..7fe5eb8b 100644 --- a/amarok/src/engine/xine/xine-config.h +++ b/amarok/src/engine/xine/xine-config.h @@ -21,9 +21,10 @@ class XineConfigDialog; class KLineEdit; -class XineGeneralEntry : public QObject +class XineGeneralEntry : public TQObject { Q_OBJECT + TQ_OBJECT public: virtual void save() = 0; @@ -63,6 +64,7 @@ void saveXineEntry(Functor& storeEntry, T val, const TQString& key, xine_t *xine class XineStrEntry : public XineGeneralEntry { Q_OBJECT + TQ_OBJECT public: XineStrEntry(TQLineEdit* input, const TQCString & key, xine_t *m_xine, XineConfigDialog* xcf); @@ -79,6 +81,7 @@ class XineStrEntry : public XineGeneralEntry class XineIntEntry : public XineGeneralEntry { Q_OBJECT + TQ_OBJECT public: XineIntEntry(KIntSpinBox* input, const TQCString & key, xine_t *xine, XineConfigDialog* xcf); @@ -96,6 +99,7 @@ class XineIntEntry : public XineGeneralEntry class XineEnumEntry : public XineIntEntry { Q_OBJECT + TQ_OBJECT public: XineEnumEntry(TQComboBox* input, const TQCString & key, xine_t *xine, XineConfigDialog* xcf); }; @@ -104,6 +108,7 @@ public: class XineConfigDialog : public Amarok::PluginConfig { Q_OBJECT + TQ_OBJECT public: XineConfigDialog( const xine_t* const xine); diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp index 1d80f746..8393ec94 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 parents the dialog for us + //TODO make engine method that is the same but tqparents the dialog for us KMessageBox::error( 0, i18n("xine was unable to initialize any audio drivers.") ); return false; } @@ -541,7 +541,7 @@ XineEngine::fadeOut( uint fadeLength, bool* terminate, bool exiting ) const float originalVol = Engine::Base::makeVolumeLogarithmic( m_volume ) * m_preamp; // On shutdown, limit fadeout to 3 secs max, so that we don't risk getting killed - const int length = exiting ? QMIN( fadeLength, 3000 ) : fadeLength; + const int length = exiting ? TQMIN( fadeLength, 3000 ) : fadeLength; if( length > 0 && isPlaying ) { @@ -654,7 +654,7 @@ XineEngine::canDecode( const KURL &url ) const list.remove("ssa"); //HACK we also check for m4a because xine plays them but //for some reason doesn't return the extension - if(!list.contains("m4a")) + if(!list.tqcontains("m4a")) list << "m4a"; } @@ -669,9 +669,9 @@ XineEngine::canDecode( const KURL &url ) const if (path.endsWith( ".part" )) path = path.left( path.length() - 5 ); - const TQString ext = path.mid( path.findRev( '.' ) + 1 ).lower(); + const TQString ext = path.mid( path.tqfindRev( '.' ) + 1 ).lower(); - return list.contains( ext ); + return list.tqcontains( ext ); } const Engine::Scope& @@ -801,7 +801,7 @@ XineEngine::customEvent( TQCustomEvent *e ) break; case 3001: - emit infoMessage( (*message).arg( m_url.prettyURL() ) ); + emit infoMessage( (*message).tqarg( m_url.prettyURL() ) ); delete message; break; @@ -818,7 +818,7 @@ XineEngine::customEvent( TQCustomEvent *e ) } break; case 3004: - emit statusText( i18n("Redirecting to: ").arg( *message ) ); + emit statusText( i18n("Redirecting to: ").tqarg( *message ) ); load( KURL( *message ), false ); play(); delete message; @@ -921,10 +921,10 @@ XineEngine::XineEventListener( void *p, const xine_event_t* xineEvent ) case XINE_EVENT_PROGRESS: { xine_progress_data_t* pd = (xine_progress_data_t*)xineEvent->data; - QString + TQString msg = "%1 %2%"; - msg = msg.arg( TQString::fromUtf8( pd->description ) ) - .arg( KGlobal::locale()->formatNumber( pd->percent, 0 ) ); + msg = msg.tqarg( TQString::fromUtf8( pd->description ) ) + .tqarg( KGlobal::locale()->formatNumber( pd->percent, 0 ) ); TQCustomEvent *e = new TQCustomEvent( 3002 ); e->setData( new TQString( msg ) ); @@ -1102,7 +1102,7 @@ bool XineEngine::metaDataForUrl(const KURL &url, Engine::SimpleMetaBundle &b) if( b.tracknr.isEmpty() ) b.tracknr = url.filename(); } else { - b.title = TQString(i18n("Track %1")).arg(url.filename()); + b.title = TQString(i18n("Track %1")).tqarg(url.filename()); b.album = i18n("AudioCD"); } } diff --git a/amarok/src/engine/xine/xine-engine.h b/amarok/src/engine/xine/xine-engine.h index 7cb9f3bc..2a795657 100644 --- a/amarok/src/engine/xine/xine-engine.h +++ b/amarok/src/engine/xine/xine-engine.h @@ -25,6 +25,7 @@ class XineConfigDialog; class XineEngine : public Engine::Base { Q_OBJECT + TQ_OBJECT friend class Fader; friend class OutFader; @@ -101,7 +102,7 @@ signals: void resetConfig(xine_t *xine); }; -class Fader : public TQObject, public QThread +class Fader : public TQObject, public TQThread { XineEngine *m_engine; xine_t *m_xine; @@ -123,7 +124,7 @@ public: void finish(); }; -class OutFader : public TQObject, public QThread +class OutFader : public TQObject, public TQThread { XineEngine *m_engine; bool m_terminated; diff --git a/amarok/src/engine/xine/xineconfigbase.ui b/amarok/src/engine/xine/xineconfigbase.ui index c3925ec0..22e89331 100644 --- a/amarok/src/engine/xine/xineconfigbase.ui +++ b/amarok/src/engine/xine/xineconfigbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>XineConfigBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>XineConfigBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -30,15 +30,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>xineLogo</cstring> </property> @@ -68,35 +68,35 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -114,7 +114,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -129,11 +129,11 @@ <property name="text"> <string>Sound device may be modified after the output plugin has been changed to ALSA or OSS.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>alsaGroupBox</cstring> </property> @@ -144,7 +144,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -155,7 +155,7 @@ <cstring>monoLineEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3_3</cstring> </property> @@ -166,7 +166,7 @@ <cstring>stereoLineEdit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -177,7 +177,7 @@ <cstring>chan4LineEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>chan5Label</cstring> </property> @@ -188,29 +188,29 @@ <cstring>chan5LineEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>monoLineEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>stereoLineEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="3"> + <widget class="TQLineEdit" row="0" column="3"> <property name="name"> <cstring>chan4LineEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="3"> + <widget class="TQLineEdit" row="1" column="3"> <property name="name"> <cstring>chan5LineEdit</cstring> </property> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>ossGroupBox</cstring> </property> @@ -221,7 +221,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -232,22 +232,22 @@ <cstring>ossDeviceComboBox</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>ossDeviceComboBox</cstring> </property> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -258,14 +258,14 @@ <cstring>speakerComboBox</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>speakerComboBox</cstring> </property> </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -276,15 +276,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -295,7 +295,7 @@ <cstring>hostLineEdit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>hostLineEdit</cstring> </property> @@ -316,15 +316,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -335,12 +335,12 @@ <cstring>userLineEdit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>userLineEdit</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -351,7 +351,7 @@ <cstring>passLineEdit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>passLineEdit</cstring> </property> @@ -363,7 +363,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>audiocdGroupBox</cstring> </property> @@ -374,15 +374,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_3_2</cstring> </property> @@ -393,7 +393,7 @@ <cstring>monoLineEdit</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2</cstring> </property> @@ -404,7 +404,7 @@ <cstring>hostLineEdit</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_3_2_2</cstring> </property> @@ -417,15 +417,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>audiocd_device</cstring> </property> @@ -433,15 +433,15 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>cddb_server</cstring> </property> @@ -462,7 +462,7 @@ </widget> </hbox> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>cddb_cache_dir</cstring> </property> @@ -486,7 +486,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -502,5 +502,5 @@ <includes> <include location="local" impldecl="in declaration">plugin/pluginconfig.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/amarok/src/engine/yauap/yauap-engine.cpp b/amarok/src/engine/yauap/yauap-engine.cpp index bc7ec843..03164b7a 100644 --- a/amarok/src/engine/yauap/yauap-engine.cpp +++ b/amarok/src/engine/yauap/yauap-engine.cpp @@ -106,7 +106,7 @@ DBusConnection::open() dbus_connection_set_exit_on_disconnect( dbus_connection, false ); /* create qt connection */ - qt_connection = new DBusQt::Connection( this ); + qt_connection = new DBusTQt::Connection( this ); qt_connection->dbus_connection_setup_with_qt_main( dbus_connection ); if ( !dbus_connection_add_filter(dbus_connection, signal_handler, context, NULL) ) @@ -236,7 +236,7 @@ DBusConnection::send_with_reply(const char* method, int first_arg_type, va_list DBusMessage* oldmsg = msg; msg = dbus_connection_send_with_reply_and_block(dbus_connection, oldmsg, -1, &error); - DBusDispatchStatus status; + DBusDispatchtqStatus status; while ((status = dbus_connection_get_dispatch_status(dbus_connection)) == DBUS_DISPATCH_DATA_REMAINS) dbus_connection_dispatch (dbus_connection); dbus_message_unref (oldmsg); @@ -379,7 +379,7 @@ yauapEngine::yauapProcessExited() void yauapEngine::closeDbusConnection() { - /* destroy Qt DBus connection */ + /* destroy TQt DBus connection */ delete con; con = 0; @@ -646,7 +646,7 @@ yauapEngine::getAudioCDContents(const TQString &device, KURL::List &urls) KURL url = TQString("cdda://").append( strtok_r(reply_ptr,"=",&saveptr)); urls << url; debug() << url << endl; - b.title = TQString( i18n( "Track %1" ) ).arg( i+1 ); + b.title = TQString( i18n( "Track %1" ) ).tqarg( i+1 ); b.length = strtok_r(NULL,"=",&saveptr); b.album = "AudioCD"; b.tracknr = i+1; diff --git a/amarok/src/engine/yauap/yauap-engine.h b/amarok/src/engine/yauap/yauap-engine.h index 662b8919..03f5f668 100644 --- a/amarok/src/engine/yauap/yauap-engine.h +++ b/amarok/src/engine/yauap/yauap-engine.h @@ -26,11 +26,11 @@ copyright : (C) 2006 by Sascha Sommer <ssommer@suse.de> class yauapEngine; -class DBusConnection : public QObject +class DBusConnection : public TQObject { friend class yauapEngine; - DBusQt::Connection *qt_connection; + DBusTQt::Connection *qt_connection; DBusConnection *dbus_connection; yauapEngine *context; TQMutex m_mutex; @@ -50,7 +50,7 @@ public: class yauapProcess : public Amarok::Process { public: - yauapProcess(TQObject* parent) : Amarok::Process(parent) {} + yauapProcess(TQObject* tqparent) : Amarok::Process(tqparent) {} virtual int commSetupDoneC(); }; @@ -60,6 +60,7 @@ static DBusHandlerResult signal_handler( DBusConnection *, DBusMessage *, void * class yauapEngine : public Engine::Base { Q_OBJECT + TQ_OBJECT friend class DBusConnection; diff --git a/amarok/src/enginebase.h b/amarok/src/enginebase.h index 9ea74445..3f18ae8f 100644 --- a/amarok/src/enginebase.h +++ b/amarok/src/enginebase.h @@ -61,6 +61,7 @@ namespace Engine class LIBAMAROK_EXPORT Base : public TQObject, public Amarok::Plugin { Q_OBJECT + TQ_OBJECT signals: /** Emitted when end of current track is reached. */ @@ -218,7 +219,7 @@ namespace Engine * audio cds: in this case, the KURL::List is filled with the urls of * the songs in the cd... * - * @param device the cdrom device , with TQString::null meaning use engine-specific default value + * @param device the cdrom device , with TQString() meaning use engine-specific default value * @param urls the list of urls for AudioCD tracks to fill * @return true if the engine has the feature of reading from audio cds, false otherwise (note that this should return true also in case of error if the engine is capable of reading audio cds in general...) * */ diff --git a/amarok/src/enginecontroller.cpp b/amarok/src/enginecontroller.cpp index a09fe50a..a87dfe32 100644 --- a/amarok/src/enginecontroller.cpp +++ b/amarok/src/enginecontroller.cpp @@ -120,8 +120,8 @@ EngineController::loadEngine() //static Amarok::StatusBar::instance()->longMessage( i18n( "Sorry, the '%1' could not be loaded, instead we have loaded the '%2'." ) - .arg( AmarokConfig::soundSystem() ) - .arg( engineName ), + .tqarg( AmarokConfig::soundSystem() ) + .tqarg( engineName ), KDE::StatusBar::Sorry ); AmarokConfig::setSoundSystem( engineName ); @@ -143,25 +143,25 @@ EngineController::loadEngine( const TQString &engineName ) DEBUG_BLOCK TQString query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] != '%1'"; - KTrader::OfferList offers = PluginManager::query( query.arg( engineName ) ); + KTrader::OfferList offers = PluginManager::query( query.tqarg( engineName ) ); // sort by rank, TQValueList::operator[] is O(n), so this is quite inefficient #define rank( x ) (x)->property( "X-KDE-Amarok-rank" ).toInt() for( int n = offers.count()-1, i = 0; i < n; i++ ) for( int j = n; j > i; j-- ) if( rank( offers[j] ) > rank( offers[j-1] ) ) - qSwap( offers[j], offers[j-1] ); + tqSwap( offers[j], offers[j-1] ); #undef rank // this is the actual engine we want query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] == '%1'"; - offers = PluginManager::query( query.arg( engineName ) ) + offers; + offers = PluginManager::query( query.tqarg( engineName ) ) + offers; foreachType( KTrader::OfferList, offers ) { Amarok::Plugin *plugin = PluginManager::createFromService( *it ); if( plugin ) { - TQObject *bar = Amarok::StatusBar::instance(); + TQObject *bar = TQT_TQOBJECT(Amarok::StatusBar::instance()); EngineBase *engine = static_cast<EngineBase*>( plugin ); connect( engine, TQT_SIGNAL(stateChanged( Engine::State )), @@ -230,7 +230,7 @@ bool EngineController::canDecode( const KURL &url ) //static if ( !url.isLocalFile() ) return true; // If extension is already in the cache, return cache result - if ( extensionCache().contains( ext ) ) + if ( extensionCache().tqcontains( ext ) ) return s_extensionCache[ext]; // If file has 0 bytes, ignore it and return false, not to infect the cache with corrupt files. @@ -265,13 +265,13 @@ void EngineController::unplayableNotification() { "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine " "the installation of the multimedia-framework that the current engine uses. " "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." ) - .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error ); + .tqarg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error ); } bool EngineController::installDistroCodec( const TQString& engine /*Filetype type*/) { KService::Ptr service = KTrader::self()->query( "Amarok/CodecInstall" - , TQString("[X-KDE-Amarok-codec] == 'mp3' and [X-KDE-Amarok-engine] == '%1'").arg(engine) ).first(); + , TQString("[X-KDE-Amarok-codec] == 'mp3' and [X-KDE-Amarok-engine] == '%1'").tqarg(engine) ).first(); if( service ) { TQString installScript = service->exec(); @@ -653,7 +653,7 @@ EngineController::bundle() const void EngineController::slotStreamMetaData( const MetaBundle &bundle ) //SLOT { // Prevent spamming by ignoring repeated identical data (some servers repeat it every 10 seconds) - if ( m_lastMetadata.contains( bundle ) ) + if ( m_lastMetadata.tqcontains( bundle ) ) return; // We compare the new item with the last two items, because mth.house currently cycles diff --git a/amarok/src/enginecontroller.h b/amarok/src/enginecontroller.h index 43a4c703..cd6974b2 100644 --- a/amarok/src/enginecontroller.h +++ b/amarok/src/enginecontroller.h @@ -35,6 +35,7 @@ namespace KIO { class Job; } class EngineController : public TQObject, public EngineSubject { Q_OBJECT + TQ_OBJECT public: typedef TQMap<TQString, bool> ExtensionCache; diff --git a/amarok/src/engineobserver.cpp b/amarok/src/engineobserver.cpp index 68e6fce4..2d687d81 100644 --- a/amarok/src/engineobserver.cpp +++ b/amarok/src/engineobserver.cpp @@ -139,7 +139,7 @@ void EngineSubject::trackLengthChangedNotify( long length ) void EngineSubject::attach( EngineObserver *observer ) { - if( !observer || Observers.find( observer ) != -1 ) + if( !observer || Observers.tqfind( observer ) != -1 ) return; Observers.append( observer ); } @@ -147,5 +147,5 @@ void EngineSubject::attach( EngineObserver *observer ) void EngineSubject::detach( EngineObserver *observer ) { - if( Observers.find( observer ) != -1 ) Observers.remove(); + if( Observers.tqfind( observer ) != -1 ) Observers.remove(); } diff --git a/amarok/src/equalizergraph.cpp b/amarok/src/equalizergraph.cpp index bdc007b7..b8207eaa 100644 --- a/amarok/src/equalizergraph.cpp +++ b/amarok/src/equalizergraph.cpp @@ -25,8 +25,8 @@ #include <kapplication.h> -EqualizerGraph::EqualizerGraph( TQWidget* parent ) - : TQWidget( parent, 0, Qt::WNoAutoErase ) +EqualizerGraph::EqualizerGraph( TQWidget* tqparent ) + : TQWidget( tqparent, 0, TQt::WNoAutoErase ) , m_backgroundPixmap( new TQPixmap() ) , m_composePixmap( new TQPixmap() ) { @@ -50,8 +50,8 @@ EqualizerGraph::resizeEvent( TQResizeEvent* ) drawBackground(); } -QSize -EqualizerGraph::sizeHint() const +TQSize +EqualizerGraph::tqsizeHint() const { return TQSize( 100, 60 ); } @@ -65,11 +65,11 @@ EqualizerGraph::paintEvent( TQPaintEvent* ) // Draw middle line int middleLineY = (int) ( ( height() - 1 ) / 2.0 + AmarokConfig::equalizerPreamp() * ( height() - 1 ) / 200.0 ); - TQPen pen( colorGroup().dark(), 0, Qt::DotLine); + TQPen pen( tqcolorGroup().dark(), 0, TQt::DotLine); p.setPen( pen ); p.drawLine( 8, middleLineY, width() - 1, middleLineY ); - TQColor color( colorGroup().highlight() ); + TQColor color( tqcolorGroup().highlight() ); int h, s, v; color.getHsv( &h, &s, &v ); @@ -113,7 +113,7 @@ EqualizerGraph::paintEvent( TQPaintEvent* ) for ( y = ymin; y <= ymax; y++ ) { // Absolute carthesian coordinate s = y - ( height() - 1 ) / 2; - s = QABS(s); + s = TQABS(s); // Normalise to a base of 256 // short for: s / ( ( height() / 2.0 ) * 255; @@ -141,14 +141,14 @@ EqualizerGraph::drawBackground() m_backgroundPixmap->resize( size() ); m_composePixmap->resize( size() ); - m_backgroundPixmap->fill( colorGroup().background().dark( 105 ) ); + m_backgroundPixmap->fill( tqcolorGroup().background().dark( 105 ) ); TQPainter p( m_backgroundPixmap ); // Erase background for scale - p.fillRect( 0, 0, 7, height() -1, colorGroup().background()); + p.fillRect( 0, 0, 7, height() -1, tqcolorGroup().background()); // Draw scale - p.setPen( colorGroup().shadow() ); + p.setPen( tqcolorGroup().shadow() ); p.drawLine( 7, 0, 7, height() - 1 ); p.drawLine( 0, 0, 7, 0 ); p.drawLine( 0, height() / 2 - 1, 7, height() / 2 - 1 ); diff --git a/amarok/src/equalizergraph.h b/amarok/src/equalizergraph.h index c4c9cbcd..7014e3c4 100644 --- a/amarok/src/equalizergraph.h +++ b/amarok/src/equalizergraph.h @@ -15,20 +15,20 @@ * * ***************************************************************************/ -#ifndef AMAROK_EQUALIZERGRAPH_H -#define AMAROK_EQUALIZERGRAPH_H +#ifndef AMAROK_ETQUALIZERGRAPH_H +#define AMAROK_ETQUALIZERGRAPH_H #include <tqwidget.h> //baseclass class TQPixmap; -class EqualizerGraph : public QWidget +class EqualizerGraph : public TQWidget { public: - EqualizerGraph( TQWidget* parent ); + EqualizerGraph( TQWidget* tqparent ); ~EqualizerGraph(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: void resizeEvent( TQResizeEvent* ); @@ -47,4 +47,4 @@ class EqualizerGraph : public QWidget }; -#endif /*AMAROK_EQUALIZERGRAPH_H*/ +#endif /*AMAROK_ETQUALIZERGRAPH_H*/ diff --git a/amarok/src/equalizerpresetmanager.cpp b/amarok/src/equalizerpresetmanager.cpp index d7b9c973..5da5f862 100644 --- a/amarok/src/equalizerpresetmanager.cpp +++ b/amarok/src/equalizerpresetmanager.cpp @@ -32,8 +32,8 @@ #include <kmessagebox.h> #include <kstandarddirs.h> //locate() -EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *name ) - : KDialogBase( parent, name, true, i18n("Presets"), Ok | Cancel | Default, Ok, true ) +EqualizerPresetManager::EqualizerPresetManager( TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, true, i18n("Presets"), Ok | Cancel | Default, Ok, true ) { TQWidget *mainWidget = new TQWidget( this ); setMainWidget( mainWidget ); @@ -63,7 +63,7 @@ EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *na updateButtonState(); - resize( TQSize(300, 250).expandedTo(minimumSizeHint()) ); + resize( TQSize(300, 250).expandedTo(tqminimumSizeHint()) ); } @@ -102,8 +102,8 @@ EqualizerPresetManager::slotRename() if ( ok && item->text(0) != title ) { // Check if the new preset title exists - if ( m_presets.find( title ) != m_presets.end() ) { - int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).arg( title ) ); + if ( m_presets.tqfind( title ) != m_presets.end() ) { + int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).tqarg( title ) ); if ( button != KMessageBox::Yes ) return; diff --git a/amarok/src/equalizerpresetmanager.h b/amarok/src/equalizerpresetmanager.h index 44348883..716be81b 100644 --- a/amarok/src/equalizerpresetmanager.h +++ b/amarok/src/equalizerpresetmanager.h @@ -17,8 +17,8 @@ * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef AMAROK_EQUALIZERPRESETMANAGER_H -#define AMAROK_EQUALIZERPRESETMANAGER_H +#ifndef AMAROK_ETQUALIZERPRESETMANAGER_H +#define AMAROK_ETQUALIZERPRESETMANAGER_H #include "equalizersetup.h" @@ -31,9 +31,10 @@ class KListView; class EqualizerPresetManager : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - EqualizerPresetManager( TQWidget *parent = 0, const char *name = 0 ); + EqualizerPresetManager( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~EqualizerPresetManager(); void setPresets(TQMap< TQString, TQValueList<int> > presets); @@ -56,4 +57,4 @@ class EqualizerPresetManager : public KDialogBase }; -#endif /* AMAROK_EQUALIZERPRESETMANAGER_H */ +#endif /* AMAROK_ETQUALIZERPRESETMANAGER_H */ diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp index 2b3805ab..e14cc281 100644 --- a/amarok/src/equalizersetup.cpp +++ b/amarok/src/equalizersetup.cpp @@ -73,7 +73,7 @@ EqualizerSetup::EqualizerSetup() new TQLabel( i18n("Presets:"), presetBox ); m_presetCombo = new KComboBox( presetBox ); - m_presetCombo->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); + m_presetCombo->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); TQPushButton* presetAdd = new TQPushButton( presetBox ); presetAdd->setIconSet( SmallIconSet( Amarok::icon( "add_playlist" ) ) ); @@ -96,9 +96,9 @@ EqualizerSetup::EqualizerSetup() m_groupBoxSliders->setInsideMargin( KDialog::marginHint() ); connect( m_groupBoxSliders, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setEqualizerEnabled( bool ) ) ); - // Helper widget for layouting inside the groupbox + // Helper widget for tqlayouting inside the groupbox TQWidget* slidersLayoutWidget = new TQWidget( m_groupBoxSliders ); - slidersLayoutWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + slidersLayoutWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); TQGridLayout* slidersGridLayout = new TQGridLayout( slidersLayoutWidget, 1, 1, 0, KDialog::spacingHint() ); // END GroupBox @@ -108,17 +108,17 @@ EqualizerSetup::EqualizerSetup() m_slider_preamp->setTickmarks( TQSlider::Right ); m_slider_preamp->setTickInterval( 100 ); connect( m_slider_preamp, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( setEqualizerParameters() ) ); - slidersGridLayout->addMultiCellWidget(m_slider_preamp, 0, 0, 0, 1, Qt::AlignHCenter ); + slidersGridLayout->addMultiCellWidget(m_slider_preamp, 0, 0, 0, 1, TQt::AlignHCenter ); TQLabel* preampLabel = new TQLabel( i18n("Pre-amp"), slidersLayoutWidget ); - slidersGridLayout->addMultiCellWidget(preampLabel, 1, 1 , 0, 1, Qt::AlignHCenter ); + slidersGridLayout->addMultiCellWidget(preampLabel, 1, 1 , 0, 1, TQt::AlignHCenter ); // END // BEGIN Band Sliders const char *bandLabels[] = { "30", "60", "125", "250", "500", "1k", "2k", "4k", "8k", "16k" }; int minWidth = 0; - TQFontMetrics fm = fontMetrics(); //apparently it's an expensive call + TQFontMetrics fm = fontMetrics(); //aptqparently it's an expensive call for ( int i = 0; i < 10; i++ ) { int w = fm.width( bandLabels[i] ); if ( w > minWidth ) @@ -132,8 +132,8 @@ EqualizerSetup::EqualizerSetup() slider->setMinValue( -100 ); slider->setMaxValue( +100 ); slider->setMinimumWidth( minWidth ); - slidersGridLayout->addMultiCellWidget(slider, 0, 0, 2 * i + 2, 2 * i + 3, Qt::AlignHCenter ); - slidersGridLayout->addMultiCellWidget(label, 1, 1, 2 * i + 2, 2 * i + 3, Qt::AlignHCenter ); + slidersGridLayout->addMultiCellWidget(slider, 0, 0, 2 * i + 2, 2 * i + 3, TQt::AlignHCenter ); + slidersGridLayout->addMultiCellWidget(label, 1, 1, 2 * i + 2, 2 * i + 3, TQt::AlignHCenter ); m_bandSliders.append( slider ); connect( slider, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( setEqualizerParameters() ) ); @@ -149,12 +149,12 @@ EqualizerSetup::EqualizerSetup() TQLabel* graphLabel1 = new TQLabel("+20 db", graphVBox); TQLabel* graphLabel2 = new TQLabel("0 db", graphVBox); TQLabel* graphLabel3 = new TQLabel("-20 db", graphVBox); - graphLabel1->setAlignment( Qt::AlignRight | Qt::AlignTop ); - graphLabel2->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); - graphLabel3->setAlignment( Qt::AlignRight | Qt::AlignBottom ); + graphLabel1->tqsetAlignment( TQt::AlignRight | TQt::AlignTop ); + graphLabel2->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter ); + graphLabel3->tqsetAlignment( TQt::AlignRight | TQt::AlignBottom ); m_equalizerGraph = new EqualizerGraph( graphGBox ); - m_equalizerGraph->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + m_equalizerGraph->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); // END Graph Widget // Fill the combobox @@ -213,10 +213,10 @@ EqualizerSetup::setPreset( TQString name ) } ///////////////////////////////////////////////////////////////////////////////////// -// EQUALIZER PRESETS +// ETQUALIZER PRESETS ///////////////////////////////////////////////////////////////////////////////////// -QString +TQString EqualizerSetup::presetsCache() const { // returns the playlists stats cache file @@ -341,7 +341,7 @@ EqualizerSetup::editPresets() TQString newTitle = currentTitle; // Check if the selected item was renamed - if ( presets.find( currentTitle ) == presets.end() || currentGains != presets[ currentTitle ] ) { + if ( presets.tqfind( currentTitle ) == presets.end() || currentGains != presets[ currentTitle ] ) { // Find the new name TQMap< TQString, TQValueList<int> >::Iterator end = presets.end(); @@ -369,8 +369,8 @@ EqualizerSetup::addPreset() if (ok) { // Check if the new preset title exists - if ( m_presets.find( title ) != m_presets.end() ) { - int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).arg( title ) ); + if ( m_presets.tqfind( title ) != m_presets.end() ) { + int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).tqarg( title ) ); if ( button != KMessageBox::Yes ) return; diff --git a/amarok/src/equalizersetup.h b/amarok/src/equalizersetup.h index 6a684c97..391d56b1 100644 --- a/amarok/src/equalizersetup.h +++ b/amarok/src/equalizersetup.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef AMAROK_EQUALIZERSETUP_H -#define AMAROK_EQUALIZERSETUP_H +#ifndef AMAROK_ETQUALIZERSETUP_H +#define AMAROK_ETQUALIZERSETUP_H #include <tqptrlist.h> //stack alloc #include <kdialogbase.h> @@ -33,6 +33,7 @@ namespace Amarok { class Slider; } class EqualizerSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: static EqualizerSetup* instance() { return s_instance ? s_instance : new EqualizerSetup(); } @@ -60,7 +61,7 @@ class EqualizerSetup : public KDialogBase void loadPresets(); void savePresets(); - void updatePresets(TQString selectTitle = TQString::null); + void updatePresets(TQString selectTitle = TQString()); TQString presetsCache() const; Amarok::Slider* m_slider_preamp; @@ -74,4 +75,4 @@ class EqualizerSetup : public KDialogBase TQMap< TQString, TQValueList<int> > m_presets; }; -#endif /*AMAROK_EQUALIZERSETUP_H*/ +#endif /*AMAROK_ETQUALIZERSETUP_H*/ diff --git a/amarok/src/expression.cpp b/amarok/src/expression.cpp index 143b6601..ddf47848 100644 --- a/amarok/src/expression.cpp +++ b/amarok/src/expression.cpp @@ -45,11 +45,11 @@ ParsedExpression ExpressionParser::parse( const TQString &expression ) //static bool ExpressionParser::isAdvancedExpression( const TQString &expression ) //static { - return ( expression.contains( '"' ) || - expression.contains( ':' ) || - expression.contains( '-' ) || - expression.contains( "AND" ) || - expression.contains( "OR" ) ); + return ( expression.tqcontains( '"' ) || + expression.tqcontains( ':' ) || + expression.tqcontains( '-' ) || + expression.tqcontains( "AND" ) || + expression.tqcontains( "OR" ) ); } /* PRIVATE */ @@ -94,7 +94,7 @@ void ExpressionParser::handleColon( const TQChar &c ) if( m_state <= ExpectField && !m_string.isEmpty() ) { m_element.field = m_string; - m_string = TQString::null; + m_string = TQString(); m_state = ExpectMod; } else @@ -161,7 +161,7 @@ void ExpressionParser::finishedToken() else finishedOrGroup(); - m_string = TQString::null; + m_string = TQString(); m_state = ExpectMinus; } } @@ -172,7 +172,7 @@ void ExpressionParser::finishedElement() finishedOrGroup(); m_inOrGroup = m_haveGroup = false; m_element.text = m_string; - m_string = TQString::null; + m_string = TQString(); if( !m_element.text.isEmpty() || !m_element.field.isEmpty() ) m_or.append( m_element ); diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp index 4c640850..366bed5c 100644 --- a/amarok/src/filebrowser.cpp +++ b/amarok/src/filebrowser.cpp @@ -93,7 +93,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium ) } KActionCollection* ac = new KActionCollection( this ); - KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "filebrowser_select_all" ); + KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "filebrowser_select_all" ); KToolBar *toolbar = new Browser::ToolBar( this ); @@ -117,11 +117,11 @@ FileBrowser::FileBrowser( const char * name, Medium * medium ) container->setFrameStyle( m_filter->frameStyle() ); container->setMargin( 3 ); container->setSpacing( 2 ); - container->setBackgroundMode( Qt::PaletteBase ); + container->setBackgroundMode( TQt::PaletteBase ); box = new TQHBox( container ); box->setMargin( 3 ); - box->setBackgroundMode( Qt::PaletteBase ); + box->setBackgroundMode( TQt::PaletteBase ); //folder selection combo box m_combo = new KURLComboBox( KURLComboBox::Directories, true, box, "path combo" ); @@ -145,7 +145,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium ) m_dir->setOnlyDoubleClickSelectsFiles( true ); //Amarok type settings m_dir->readConfig( Amarok::config( "Filebrowser" ) ); m_dir->setView( KFile::Default ); //will set userconfigured view, will load URL - m_dir->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); + m_dir->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); m_dir->setAcceptDrops( true ); //Automatically open folder after hovering above it...probably a good thing //but easily disabled by commenting this line out @@ -242,7 +242,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium ) KAction *gotoCurrent = new KAction( i18n("Go To Current Track Folder"), Amarok::icon( "music" ), 0, - this, TQT_SLOT( gotoCurrentFolder() ), actionCollection ); + TQT_TQOBJECT(this), TQT_SLOT( gotoCurrentFolder() ), actionCollection ); gotoCurrent->plug( toolbar ); disconnect( actionCollection->action( "up" ), TQT_SIGNAL( activated() ), m_dir, TQT_SLOT( cdUp() ) ); @@ -264,7 +264,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium ) setSpacing( 4 ); setFocusProxy( m_dir ); //so the dirOperator is focused when we get focus events // Toolbar is more than 250px wide, BrowserBar doesn't allow that. -> Resizing issues. - setMinimumWidth( 250 /* toolbar->sizeHint().width() */ ); + setMinimumWidth( 250 /* toolbar->tqsizeHint().width() */ ); } @@ -530,7 +530,7 @@ FileBrowser::selectAll() class KURLView : public KListView { public: - KURLView( TQWidget *parent ) : KListView( parent ) + KURLView( TQWidget *tqparent ) : KListView( tqparent ) { reinterpret_cast<TQWidget*>(header())->hide(); addColumn( TQString() ); @@ -541,7 +541,7 @@ public: class Item : public KListViewItem { public: - Item( const KURL &url, KURLView *parent ) : KListViewItem( parent, url.fileName() ), m_url( url ) {} + Item( const KURL &url, KURLView *tqparent ) : KListViewItem( tqparent, url.fileName() ), m_url( url ) {} KURL m_url; }; @@ -575,18 +575,18 @@ public: const uint w = t.width() + 20; const uint h = t.height() + 20; - p.setBrush( colorGroup().background() ); + p.setBrush( tqcolorGroup().background() ); p.drawRoundRect( 15, 15, w, h, (8*200)/w, (8*200)/h ); - t.draw( &p, 20, 20, TQRect(), colorGroup() ); + t.draw( &p, 20, 20, TQRect(), tqcolorGroup() ); } else { p.setPen( palette().color( TQPalette::Disabled, TQColorGroup::Text ) ); - p.drawText( rect(), Qt::AlignCenter | Qt::WordBreak, m_text ); + p.drawText( rect(), TQt::AlignCenter | TQt::WordBreak, m_text ); } } } - void unsetText() { setText( TQString::null ); } + void unsetText() { setText( TQString() ); } void setText( const TQString &text ) { m_text = text; viewport()->update(); } private: @@ -595,8 +595,8 @@ private: -SearchPane::SearchPane( FileBrowser *parent ) - : TQVBox( parent ) +SearchPane::SearchPane( FileBrowser *tqparent ) + : TQVBox( tqparent ) , m_lineEdit( 0 ) , m_listView( 0 ) , m_lister( 0 ) @@ -607,7 +607,7 @@ SearchPane::SearchPane( FileBrowser *parent ) { TQFrame *box = new TQHBox( container ); box->setMargin( 5 ); - box->setBackgroundMode( Qt::PaletteBase ); + box->setBackgroundMode( TQt::PaletteBase ); m_lineEdit = new ClickLineEdit( i18n("Search here..."), box ); connect( m_lineEdit, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(searchTextChanged( const TQString& )) ); @@ -616,13 +616,13 @@ SearchPane::SearchPane( FileBrowser *parent ) container->setFrameStyle( m_listView->frameStyle() ); container->setMargin( 5 ); - container->setBackgroundMode( Qt::PaletteBase ); + container->setBackgroundMode( TQt::PaletteBase ); m_listView->setFrameStyle( TQFrame::NoFrame ); connect( m_listView, TQT_SIGNAL(executed( TQListViewItem* )), TQT_SLOT(activate( TQListViewItem* )) ); } - KPushButton *button = new KPushButton( KGuiItem( i18n("&Show Search Panel"), "find" ), this ); + KPushButton *button = new KPushButton( KGuiItem( i18n("&Show Search Panel"), "tqfind" ), this ); button->setToggleButton( true ); connect( button, TQT_SIGNAL(toggled( bool )), TQT_SLOT(toggle( bool )) ); @@ -638,7 +638,7 @@ SearchPane::toggle( bool toggled ) if ( toggled ) m_lineEdit->setFocus(); - static_cast<TQWidget*>(child("container"))->setShown( toggled ); + TQT_TQWIDGET(child("container"))->setShown( toggled ); } void @@ -661,7 +661,7 @@ SearchPane::searchTextChanged( const TQString &text ) return; } - m_filter = TQRegExp( text.contains( "*" ) ? text : '*'+text+'*', false, true ); + m_filter = TQRegExp( text.tqcontains( "*" ) ? text : '*'+text+'*', false, true ); m_lister->openURL( searchURL() ); diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h index 8fe4805a..9c11e0c5 100644 --- a/amarok/src/filebrowser.h +++ b/amarok/src/filebrowser.h @@ -48,9 +48,10 @@ class Medium; */ -class FileBrowser : public QVBox +class FileBrowser : public TQVBox { Q_OBJECT + TQ_OBJECT enum MenuId { MakePlaylist, SavePlaylist, MediaDevice, AppendToPlaylist, QueueTrack, QueueTracks, SelectAllFiles, BurnCd, MoveToCollection, CopyToCollection, OrganizeFiles, EditTags }; @@ -98,12 +99,13 @@ class TQListViewItem; ///@author Max Howell ///@short Widget for recursive searching of current FileBrowser location -class SearchPane : public QVBox +class SearchPane : public TQVBox { Q_OBJECT + TQ_OBJECT public: - SearchPane( FileBrowser *parent ); + SearchPane( FileBrowser *tqparent ); private slots: void toggle( bool ); @@ -115,7 +117,7 @@ private slots: void activate( TQListViewItem* ); private: - KURL searchURL() const { return static_cast<FileBrowser*>(parentWidget())->url(); } + KURL searchURL() const { return static_cast<FileBrowser*>(tqparentWidget())->url(); } TQLineEdit *m_lineEdit; KURLView *m_listView; diff --git a/amarok/src/firstrunwizard.ui b/amarok/src/firstrunwizard.ui index 2b5ace9f..8fae0f91 100644 --- a/amarok/src/firstrunwizard.ui +++ b/amarok/src/firstrunwizard.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>FirstRunWizard</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>FirstRunWizard</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -15,7 +15,7 @@ <property name="caption"> <string>First-Run Wizard</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> @@ -36,7 +36,7 @@ <p align="center"><i><b>"Rediscover your music!"</b></i> </p></string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>picture1</cstring> </property> @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -83,7 +83,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> @@ -109,7 +109,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage_3</cstring> </property> @@ -130,7 +130,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>257</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>194</height> @@ -174,7 +174,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage_4</cstring> </property> @@ -197,7 +197,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -221,14 +221,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>294</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>picture4</cstring> </property> @@ -280,17 +280,17 @@ <variable access="public">enum Interface { XMMS, Compact };</variable> <variable access="private">CollectionSetup* m_folderSetup;</variable> </variables> -<slots> +<Q_SLOTS> <slot access="private" specifier="non virtual">invokeHandbook()</slot> <slot>openLink( const QString & s )</slot> -</slots> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> <function access="protected">showPage( QWidget * w )</function> <function specifier="non virtual">writeCollectionConfig()</function> <function specifier="non virtual" returnType="FirstRunWizard::Interface">interface()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/amarok/src/firstrunwizard.ui.h b/amarok/src/firstrunwizard.ui.h index b64fe005..34dd2b50 100644 --- a/amarok/src/firstrunwizard.ui.h +++ b/amarok/src/firstrunwizard.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). @@ -63,7 +63,7 @@ inline void FirstRunWizard::invokeHandbook() //SLOT { // Show handbook - kapp->invokeHelp( TQString::null, TQString::null, 0 ); + kapp->invokeHelp( TQString(), TQString(), 0 ); } void diff --git a/amarok/src/hintlineedit.cpp b/amarok/src/hintlineedit.cpp index a98a38f6..a5591b3b 100644 --- a/amarok/src/hintlineedit.cpp +++ b/amarok/src/hintlineedit.cpp @@ -3,24 +3,24 @@ #include <tqlabel.h> #include <tqfont.h> -HintLineEdit::HintLineEdit( const TQString &hint, const TQString &text, TQWidget *parent, const char *name ) +HintLineEdit::HintLineEdit( const TQString &hint, const TQString &text, TQWidget *tqparent, const char *name ) : KLineEdit( text, 0, name ) - , m_vbox( new TQVBox( parent ) ) + , m_vbox( new TQVBox( tqparent ) ) { init(); m_hint->setText( hint ); } -HintLineEdit::HintLineEdit( const TQString &text, TQWidget *parent, const char *name ) +HintLineEdit::HintLineEdit( const TQString &text, TQWidget *tqparent, const char *name ) : KLineEdit( text, 0, name ) - , m_vbox( new TQVBox( parent ) ) + , m_vbox( new TQVBox( tqparent ) ) { init(); } -HintLineEdit::HintLineEdit( TQWidget *parent, const char *name ) +HintLineEdit::HintLineEdit( TQWidget *tqparent, const char *name ) : KLineEdit( 0, name ) - , m_vbox( new TQVBox( parent ) ) + , m_vbox( new TQVBox( tqparent ) ) { init(); } @@ -31,7 +31,7 @@ HintLineEdit::init() reparent( m_vbox, 0, TQPoint(0,0), true ); m_hint = new TQLabel( m_vbox ); //m_hint->setBuddy( this ); - m_hint->setFocusPolicy( NoFocus ); + m_hint->setFocusPolicy( TQ_NoFocus ); TQFont font; font.setPointSize( font.pointSize() - 2); m_hint->setFont( font ); @@ -50,9 +50,9 @@ HintLineEdit::setHint( const TQString &hint ) } TQObject * -HintLineEdit::parent() +HintLineEdit::tqparent() { - return m_vbox->parent(); + return m_vbox->tqparent(); } #include "hintlineedit.moc" diff --git a/amarok/src/hintlineedit.h b/amarok/src/hintlineedit.h index 851a4fb8..fb3a0e65 100644 --- a/amarok/src/hintlineedit.h +++ b/amarok/src/hintlineedit.h @@ -10,13 +10,14 @@ class TQWidget; class HintLineEdit : public KLineEdit { Q_OBJECT + TQ_OBJECT public: - HintLineEdit( const TQString &hint, const TQString &text, TQWidget *parent = 0, const char *name = 0 ); - HintLineEdit( const TQString &text, TQWidget *parent = 0, const char *name = 0 ); - HintLineEdit( TQWidget *parent = 0, const char *name = 0 ); + HintLineEdit( const TQString &hint, const TQString &text, TQWidget *tqparent = 0, const char *name = 0 ); + HintLineEdit( const TQString &text, TQWidget *tqparent = 0, const char *name = 0 ); + HintLineEdit( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~HintLineEdit(); - virtual TQObject *parent(); + virtual TQObject *tqparent(); virtual void setHint( const TQString &hint ); private: void init(); diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp index 015c4952..ae396a9f 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 *parentWidget, const char *widgetname, const bool DNDEnabled, const bool JScriptEnabled ) - : KHTMLPart( parentWidget, widgetname ) +HTMLView::HTMLView( TQWidget *tqparentWidget, const char *widgetname, const bool DNDEnabled, const bool JScriptEnabled ) + : KHTMLPart( tqparentWidget, widgetname ) { m_instances++; setJavaEnabled( false ); @@ -83,8 +83,8 @@ HTMLView::copyText() TQString text = selectedText(); // Copy both to clipboard and X11-selection - TQApplication::clipboard()->setText( text, QClipboard::Clipboard ); - TQApplication::clipboard()->setText( text, QClipboard::Selection ); + TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard ); + TQApplication::tqclipboard()->setText( text, TQClipboard::Selection ); } void HTMLView::paletteChange() { @@ -94,7 +94,7 @@ void HTMLView::paletteChange() { m_bgGradientImage = m_headerGradientImage = m_shadowGradientImage = 0; } -QString +TQString HTMLView::loadStyleSheet() { TQString themeName = AmarokConfig::contextBrowserStyleSheet().latin1(); @@ -112,38 +112,38 @@ HTMLView::loadStyleSheet() const TQString fontFamily = AmarokConfig::useCustomFonts() ? AmarokConfig::contextBrowserFont().family() : TQApplication::font().family(); - const TQString text = ContextBrowser::instance()->colorGroup().text().name(); - const TQString link = ContextBrowser::instance()->colorGroup().link().name(); - const TQString fg = ContextBrowser::instance()->colorGroup().highlightedText().name(); - const TQString bg = ContextBrowser::instance()->colorGroup().highlight().name(); - const TQString base = ContextBrowser::instance()->colorGroup().base().name(); - const TQColor bgColor = ContextBrowser::instance()->colorGroup().highlight(); + const TQString text = ContextBrowser::instance()->tqcolorGroup().text().name(); + const TQString link = ContextBrowser::instance()->tqcolorGroup().link().name(); + const TQString fg = ContextBrowser::instance()->tqcolorGroup().highlightedText().name(); + const TQString bg = ContextBrowser::instance()->tqcolorGroup().highlight().name(); + const TQString base = ContextBrowser::instance()->tqcolorGroup().base().name(); + const TQColor bgColor = ContextBrowser::instance()->tqcolorGroup().highlight(); TQColor gradientColor = bgColor; //we have to set the color for body due to a KHTML bug //KHTML sets the base color but not the text color styleSheet = TQString( "body { margin: 8px; font-size: %1px; color: %2; background-color: %3; font-family: %4; }" ) - .arg( pxSize ) - .arg( text ) - .arg( AmarokConfig::schemeAmarok() ? fg : gradientColor.name() ) - .arg( fontFamily ); + .tqarg( pxSize ) + .tqarg( text ) + .tqarg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) ) + .tqarg( fontFamily ); TQTextStream eCSSts( &ExternalCSS ); TQString tmpCSS = eCSSts.read(); ExternalCSS.close(); - tmpCSS.replace( "./", KURL::fromPathOrURL( CSSLocation ).directory( false ) ); - tmpCSS.replace( "AMAROK_FONTSIZE-2", pxSize ); - tmpCSS.replace( "AMAROK_FONTSIZE", pxSize ); - tmpCSS.replace( "AMAROK_FONTSIZE+2", pxSize ); - tmpCSS.replace( "AMAROK_FONTFAMILY", fontFamily ); - tmpCSS.replace( "AMAROK_TEXTCOLOR", text ); - tmpCSS.replace( "AMAROK_LINKCOLOR", link ); - tmpCSS.replace( "AMAROK_BGCOLOR", bg ); - tmpCSS.replace( "AMAROK_FGCOLOR", fg ); - tmpCSS.replace( "AMAROK_BASECOLOR", base ); - tmpCSS.replace( "AMAROK_DARKBASECOLOR", ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() ); - tmpCSS.replace( "AMAROK_GRADIENTCOLOR", gradientColor.name() ); + tmpCSS.tqreplace( "./", KURL::fromPathOrURL( CSSLocation ).directory( false ) ); + tmpCSS.tqreplace( "AMAROK_FONTSIZE-2", pxSize ); + tmpCSS.tqreplace( "AMAROK_FONTSIZE", pxSize ); + tmpCSS.tqreplace( "AMAROK_FONTSIZE+2", pxSize ); + tmpCSS.tqreplace( "AMAROK_FONTFAMILY", fontFamily ); + tmpCSS.tqreplace( "AMAROK_TEXTCOLOR", text ); + tmpCSS.tqreplace( "AMAROK_LINKCOLOR", link ); + tmpCSS.tqreplace( "AMAROK_BGCOLOR", bg ); + tmpCSS.tqreplace( "AMAROK_FGCOLOR", fg ); + tmpCSS.tqreplace( "AMAROK_BASECOLOR", base ); + tmpCSS.tqreplace( "AMAROK_DARKBASECOLOR", ContextBrowser::instance()->tqcolorGroup().base().dark( 120 ).name() ); + tmpCSS.tqreplace( "AMAROK_GRADIENTCOLOR", gradientColor.name() ); styleSheet += tmpCSS; } @@ -151,12 +151,12 @@ HTMLView::loadStyleSheet() { int pxSize = ContextBrowser::instance()->fontMetrics().height() - 4; const TQString fontFamily = AmarokConfig::useCustomFonts() ? AmarokConfig::contextBrowserFont().family() : TQApplication::font().family(); - const TQString text = ContextBrowser::instance()->colorGroup().text().name(); - const TQString link = ContextBrowser::instance()->colorGroup().link().name(); - const TQString fg = ContextBrowser::instance()->colorGroup().highlightedText().name(); - const TQString bg = ContextBrowser::instance()->colorGroup().highlight().name(); - const TQColor baseColor = ContextBrowser::instance()->colorGroup().base(); - const TQColor bgColor = ContextBrowser::instance()->colorGroup().highlight(); + const TQString text = ContextBrowser::instance()->tqcolorGroup().text().name(); + const TQString link = ContextBrowser::instance()->tqcolorGroup().link().name(); + const TQString fg = ContextBrowser::instance()->tqcolorGroup().highlightedText().name(); + const TQString bg = ContextBrowser::instance()->tqcolorGroup().highlight().name(); + const TQColor baseColor = ContextBrowser::instance()->tqcolorGroup().base(); + const TQColor bgColor = ContextBrowser::instance()->tqcolorGroup().highlight(); const TQColor gradientColor = bgColor; if ( !m_bgGradientImage ) { @@ -175,7 +175,7 @@ HTMLView::loadStyleSheet() if ( !m_shadowGradientImage ) { m_shadowGradientImage = new KTempFile( locateLocal( "tmp", "gradient_shadow" ), ".png", 0600 ); - TQImage imageS = KImageEffect::unbalancedGradient( TQSize( 1, 10 ), baseColor, Qt::gray, KImageEffect::VerticalGradient, 100, -100 ); + TQImage imageS = KImageEffect::unbalancedGradient( TQSize( 1, 10 ), baseColor, TQt::gray, KImageEffect::VerticalGradient, 100, -100 ); imageS.save( m_shadowGradientImage->file(), "PNG" ); m_shadowGradientImage->close(); } @@ -188,103 +188,103 @@ HTMLView::loadStyleSheet() //we have to set the color for body due to a KHTML bug //KHTML sets the base color but not the text color styleSheet = TQString( "body { margin: 4px; font-size: %1px; color: %2; background-color: %3; background-image: url( %4 ); background-repeat: repeat; font-family: %5; }" ) - .arg( pxSize ) - .arg( text ) - .arg( AmarokConfig::schemeAmarok() ? fg : gradientColor.name() ) - .arg( m_bgGradientImage->name() ) - .arg( fontFamily ); + .tqarg( pxSize ) + .tqarg( text ) + .tqarg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) ) + .tqarg( m_bgGradientImage->name() ) + .tqarg( fontFamily ); //text attributes - styleSheet += TQString( "h1 { font-size: %1px; }" ).arg( pxSize + 8 ); - styleSheet += TQString( "h2 { font-size: %1px; }" ).arg( pxSize + 6 ); - styleSheet += TQString( "h3 { font-size: %1px; }" ).arg( pxSize + 4 ); - styleSheet += TQString( "h4 { font-size: %1px; }" ).arg( pxSize + 3 ); - styleSheet += TQString( "h5 { font-size: %1px; }" ).arg( pxSize + 2 ); - styleSheet += TQString( "h6 { font-size: %1px; }" ).arg( pxSize + 1 ); - styleSheet += TQString( "a { font-size: %1px; color: %2; }" ).arg( pxSize ).arg( text ); + styleSheet += TQString( "h1 { font-size: %1px; }" ).tqarg( pxSize + 8 ); + styleSheet += TQString( "h2 { font-size: %1px; }" ).tqarg( pxSize + 6 ); + styleSheet += TQString( "h3 { font-size: %1px; }" ).tqarg( pxSize + 4 ); + styleSheet += TQString( "h4 { font-size: %1px; }" ).tqarg( pxSize + 3 ); + styleSheet += TQString( "h5 { font-size: %1px; }" ).tqarg( pxSize + 2 ); + styleSheet += TQString( "h6 { font-size: %1px; }" ).tqarg( pxSize + 1 ); + styleSheet += TQString( "a { font-size: %1px; color: %2; }" ).tqarg( pxSize ).tqarg( text ); styleSheet += TQString( ".info { display: block; margin-left: 4px; font-weight: normal; }" ); styleSheet += TQString( ".song a { display: block; padding: 1px 2px; font-weight: normal; text-decoration: none; }" ); - styleSheet += TQString( ".song a:hover { color: %1; background-color: %2; }" ).arg( fg ).arg( bg ); + styleSheet += TQString( ".song a:hover { color: %1; background-color: %2; }" ).tqarg( fg ).tqarg( bg ); styleSheet += TQString( ".song-title { font-weight: bold; }" ); - styleSheet += TQString( ".song-place { font-size: %1px; font-weight: bold; }" ).arg( pxSize + 3 ); + styleSheet += TQString( ".song-place { font-size: %1px; font-weight: bold; }" ).tqarg( pxSize + 3 ); //box: the base container for every block (border hilighted on hover, 'A' without underlining) - styleSheet += TQString( ".box { border: solid %1 1px; text-align: left; margin-bottom: 10px; }" ).arg( bg ); + styleSheet += TQString( ".box { border: solid %1 1px; text-align: left; margin-bottom: 10px; }" ).tqarg( bg ); styleSheet += TQString( ".box a { text-decoration: none; }" ); - styleSheet += TQString( ".box:hover { border: solid %1 1px; }" ).arg( text ); + styleSheet += TQString( ".box:hover { border: solid %1 1px; }" ).tqarg( text ); //box contents: header, body, rows and alternate-rows styleSheet += TQString( ".box-header { color: %1; background-color: %2; background-image: url( %4 ); background-repeat: repeat-x; font-size: %3px; font-weight: bold; padding: 1px 0.5em; border-bottom: 1px solid #000; }" ) - .arg( fg ) - .arg( bg ) - .arg( pxSize + 2 ) - .arg( m_headerGradientImage->name() ); + .tqarg( fg ) + .tqarg( bg ) + .tqarg( pxSize + 2 ) + .tqarg( m_headerGradientImage->name() ); styleSheet += TQString( ".box-body { padding: 2px; background-color: %1; background-image: url( %2 ); background-repeat: repeat-x; font-size:%3px; }" ) - .arg( ContextBrowser::instance()->colorGroup().base().name() ) - .arg( m_shadowGradientImage->name() ) - .arg( pxSize ); + .tqarg( ContextBrowser::instance()->tqcolorGroup().base().name() ) + .tqarg( m_shadowGradientImage->name() ) + .tqarg( pxSize ); //"Related Artists" related styles styleSheet += TQString( ".box-header-nav { color: %1; background-color: %2; font-size: %3px; font-weight: bold; padding: 1px 0.5em; border-bottom: 1px solid #000; text-align: right; }" ) - .arg( fg ) - .arg( bg ) - .arg( pxSize ); + .tqarg( fg ) + .tqarg( bg ) + .tqarg( pxSize ); //"Albums by ..." related styles - styleSheet += TQString( ".album-header:hover { color: %1; background-color: %2; cursor: pointer; }" ).arg( fg ).arg( bg ); - styleSheet += TQString( ".album-header:hover a { color: %1; }" ).arg( fg ); - styleSheet += TQString( ".album-body { background-color: %1; border-bottom: solid %2 1px; border-top: solid %3 1px; }" ).arg( ContextBrowser::instance()->colorGroup().base().name() ).arg( bg ).arg( bg ); + styleSheet += TQString( ".album-header:hover { color: %1; background-color: %2; cursor: pointer; }" ).tqarg( fg ).tqarg( bg ); + styleSheet += TQString( ".album-header:hover a { color: %1; }" ).tqarg( fg ); + styleSheet += TQString( ".album-body { background-color: %1; border-bottom: solid %2 1px; border-top: solid %3 1px; }" ).tqarg( ContextBrowser::instance()->tqcolorGroup().base().name() ).tqarg( bg ).tqarg( bg ); styleSheet += TQString( ".album-title { font-weight: bold; }" ); - styleSheet += TQString( ".album-info { float:right; padding-right:4px; font-size: %1px }" ).arg( pxSize ); - styleSheet += TQString( ".album-length { float:right; padding-right:4px; font-size: %1px; clear:right; }" ).arg( pxSize ); + styleSheet += TQString( ".album-info { float:right; padding-right:4px; font-size: %1px }" ).tqarg( pxSize ); + styleSheet += TQString( ".album-length { float:right; padding-right:4px; font-size: %1px; clear:right; }" ).tqarg( pxSize ); styleSheet += TQString( ".album-image { padding-right: 4px; }" ); styleSheet += TQString( ".album-song a { display: block; padding: 1px 2px; font-weight: normal; text-decoration: none; }" ); - styleSheet += TQString( ".album-song a:hover { color: %1; background-color: %2; }" ).arg( fg ).arg( bg ); + styleSheet += TQString( ".album-song a:hover { color: %1; background-color: %2; }" ).tqarg( fg ).tqarg( bg ); styleSheet += TQString( ".album-song-trackno { font-weight: bold; }" ); - styleSheet += TQString( ".disc-separator { color: %1; border-bottom: 1px solid %2; }" ).arg( bg ).arg( bg ); + styleSheet += TQString( ".disc-separator { color: %1; border-bottom: 1px solid %2; }" ).tqarg( bg ).tqarg( bg ); styleSheet += TQString( ".disc-separator a { display: block; padding: 1px 2px; font-weight: normal; text-decoration: none; }" ); - styleSheet += TQString( ".disc-separator a:hover { color: %1; background-color: %2; }" ).arg( fg ).arg( bg ); + styleSheet += TQString( ".disc-separator a:hover { color: %1; background-color: %2; }" ).tqarg( fg ).tqarg( bg ); styleSheet += TQString( ".button { width: 100%; }" ); //boxes used to display score (sb: score box) styleSheet += TQString( ".sbtext { text-align: right; padding: 0px 4px; }" ); styleSheet += TQString( ".sbinner { height: 8px; background-color: %1; border: solid %2 1px; }" ) - .arg( ContextBrowser::instance()->colorGroup().highlight().name() ) - .arg( ContextBrowser::instance()->colorGroup().highlightedText().name() ); + .tqarg( ContextBrowser::instance()->tqcolorGroup().highlight().name() ) + .tqarg( ContextBrowser::instance()->tqcolorGroup().highlightedText().name() ); styleSheet += TQString( ".sbouter { width: 52px; height: 10px; background-color: %1; border: solid %2 1px; }" ) - .arg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() ) - .arg( ContextBrowser::instance()->colorGroup().highlight().name() ); + .tqarg( ContextBrowser::instance()->tqcolorGroup().base().dark( 120 ).name() ) + .tqarg( ContextBrowser::instance()->tqcolorGroup().highlight().name() ); styleSheet += TQString( ".ratingBox { padding: 0px 4px; }" ); styleSheet += TQString( ".ratingStar { height: 0.9em; }" ); styleSheet += TQString( ".statsBox { border-left: solid %1 1px; }" ) - .arg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() ); + .tqarg( ContextBrowser::instance()->tqcolorGroup().base().dark( 120 ).name() ); styleSheet += TQString( "#current_box-header-album { font-weight: normal; }" ); styleSheet += TQString( "#current_box-information-td { text-align: right; vertical-align: bottom; padding: 3px; }" ); styleSheet += TQString( "#current_box-largecover-td { text-align: left; width: 100px; padding: 0; vertical-align: bottom; }" ); styleSheet += TQString( "#current_box-largecover-image { padding: 4px; vertical-align: bottom; }" ); - styleSheet += TQString( "#wiki_box-body a { color: %1; }" ).arg( link ); + styleSheet += TQString( "#wiki_box-body a { color: %1; }" ).tqarg( link ); styleSheet += TQString( "#wiki_box-body a:hover { text-decoration: underline; }" ); //labels in tag dialog styleSheet += ".label a:hover { font-weight: bold; }"; - styleSheet += TQString( ".label.size1 { font-size: %1px; }" ).arg( pxSize ); - styleSheet += TQString( ".label.size2 { font-size: %1px; }" ).arg( pxSize + 1 ); - styleSheet += TQString( ".label.size3 { font-size: %1px; }" ).arg( pxSize + 2 ); - styleSheet += TQString( ".label.size4 { font-size: %1px; }" ).arg( pxSize + 3 ); - styleSheet += TQString( ".label.size5 { font-size: %1px; }" ).arg( pxSize + 4); - styleSheet += TQString( ".label.size6 { font-size: %1px; }" ).arg( pxSize + 5 ); - styleSheet += TQString( ".label.size7 { font-size: %1px; }" ).arg( pxSize + 6 ); - styleSheet += TQString( ".label.size8 { font-size: %1px; }" ).arg( pxSize + 7 ); - styleSheet += TQString( ".label.size9 { font-size: %1px; }" ).arg( pxSize + 8 ); - styleSheet += TQString( ".label.size10 { font-size: %1px; }" ).arg( pxSize + 9 ); + styleSheet += TQString( ".label.size1 { font-size: %1px; }" ).tqarg( pxSize ); + styleSheet += TQString( ".label.size2 { font-size: %1px; }" ).tqarg( pxSize + 1 ); + styleSheet += TQString( ".label.size3 { font-size: %1px; }" ).tqarg( pxSize + 2 ); + styleSheet += TQString( ".label.size4 { font-size: %1px; }" ).tqarg( pxSize + 3 ); + styleSheet += TQString( ".label.size5 { font-size: %1px; }" ).tqarg( pxSize + 4); + styleSheet += TQString( ".label.size6 { font-size: %1px; }" ).tqarg( pxSize + 5 ); + styleSheet += TQString( ".label.size7 { font-size: %1px; }" ).tqarg( pxSize + 6 ); + styleSheet += TQString( ".label.size8 { font-size: %1px; }" ).tqarg( pxSize + 7 ); + styleSheet += TQString( ".label.size9 { font-size: %1px; }" ).tqarg( pxSize + 8 ); + styleSheet += TQString( ".label.size10 { font-size: %1px; }" ).tqarg( pxSize + 9 ); } return styleSheet; diff --git a/amarok/src/htmlview.h b/amarok/src/htmlview.h index 6115ca68..0efa2069 100644 --- a/amarok/src/htmlview.h +++ b/amarok/src/htmlview.h @@ -16,9 +16,10 @@ class KTempFile; class HTMLView : public KHTMLPart { Q_OBJECT + TQ_OBJECT public: - HTMLView( TQWidget *parentWidget = 0, const char *widgetname = 0, const bool DNDEnabled = false, const bool JScriptEnabled = true ); + HTMLView( TQWidget *tqparentWidget = 0, const char *widgetname = 0, const bool DNDEnabled = false, const bool JScriptEnabled = true ); ~HTMLView(); static TQString loadStyleSheet(); diff --git a/amarok/src/iconloader.cpp b/amarok/src/iconloader.cpp index 25aa8938..e20b605f 100644 --- a/amarok/src/iconloader.cpp +++ b/amarok/src/iconloader.cpp @@ -23,7 +23,7 @@ #include <tqmap.h> -QString +TQString Amarok::icon( const TQString& name ) //declared in amarok.h { // We map our Amarok icon theme names to system icons, instead of using the same @@ -87,7 +87,7 @@ Amarok::icon( const TQString& name ) //declared in amarok.h iconMap["rewind"] = "2leftarrow"; iconMap["save"] = "filesave"; iconMap["scripts"] = "pencil"; - iconMap["search"] = "find"; + iconMap["search"] = "tqfind"; iconMap["settings_engine"] = "amarok"; iconMap["settings_general"] = "misc"; iconMap["settings_indicator"] = "tv"; @@ -99,7 +99,7 @@ Amarok::icon( const TQString& name ) //declared in amarok.h iconMap["track"] = "sound"; iconMap["undo"] = "undo"; iconMap["visualizations"] = "visualizations"; - iconMap["zoom"] = "find"; + iconMap["zoom"] = "tqfind"; } static TQMap<TQString, TQString> amarokMap; @@ -108,11 +108,11 @@ Amarok::icon( const TQString& name ) //declared in amarok.h amarokMap["dequeue_track"] = "rewind"; } - if( iconMap.contains( name ) ) + if( iconMap.tqcontains( name ) ) { if( AmarokConfig::useCustomIconTheme() ) { - if( amarokMap.contains( name ) ) + if( amarokMap.tqcontains( name ) ) return TQString( "amarok_" ) + amarokMap[name]; return TQString( "amarok_" ) + name; } diff --git a/amarok/src/inotify/inotify-syscalls.h b/amarok/src/inotify/inotify-syscalls.h index 1431d467..a8d06a33 100644 --- a/amarok/src/inotify/inotify-syscalls.h +++ b/amarok/src/inotify/inotify-syscalls.h @@ -48,9 +48,9 @@ static inline int inotify_init (void) return syscall (__NR_inotify_init); } -static inline int inotify_add_watch (int fd, const char *name, __u32 mask) +static inline int inotify_add_watch (int fd, const char *name, __u32 tqmask) { - return syscall (__NR_inotify_add_watch, fd, name, mask); + return syscall (__NR_inotify_add_watch, fd, name, tqmask); } static inline int inotify_rm_watch (int fd, __u32 wd) diff --git a/amarok/src/inotify/inotify.h b/amarok/src/inotify/inotify.h index 267c88b5..17dcd1e5 100644 --- a/amarok/src/inotify/inotify.h +++ b/amarok/src/inotify/inotify.h @@ -17,7 +17,7 @@ */ struct inotify_event { __s32 wd; /* watch descriptor */ - __u32 mask; /* watch mask */ + __u32 tqmask; /* watch tqmask */ __u32 cookie; /* cookie to synchronize two events */ __u32 len; /* length (including nulls) of name */ char name[0]; /* stub for possible name */ @@ -39,7 +39,7 @@ struct inotify_event { /* the following are legal events. they are sent as needed to any watch */ #define IN_UNMOUNT 0x00002000 /* Backing fs was unmounted */ -#define IN_Q_OVERFLOW 0x00004000 /* Event queued overflowed */ +#define IN_TQ_OVERFLOW 0x00004000 /* Event queued overflowed */ #define IN_IGNORED 0x00008000 /* File was ignored */ /* helper events */ @@ -49,7 +49,7 @@ struct inotify_event { /* special flags */ #define IN_ONLYDIR 0x01000000 /* only watch the path if it is a directory */ #define IN_DONT_FOLLOW 0x02000000 /* don't follow a sym link */ -#define IN_MASK_ADD 0x20000000 /* add to the mask of an already existing watch */ +#define IN_MASK_ADD 0x20000000 /* add to the tqmask of an already existing watch */ #define IN_ISDIR 0x40000000 /* event occurred against dir */ #define IN_ONESHOT 0x80000000 /* only send event once */ @@ -73,7 +73,7 @@ struct inotify_event { extern void inotify_inode_queue_event(struct inode *, __u32, __u32, const char *); -extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32, +extern void inotify_dentry_tqparent_queue_event(struct dentry *, __u32, __u32, const char *); extern void inotify_unmount_inodes(struct list_head *); extern void inotify_inode_is_dead(struct inode *); @@ -82,13 +82,13 @@ extern u32 inotify_get_cookie(void); #else static inline void inotify_inode_queue_event(struct inode *inode, - __u32 mask, __u32 cookie, + __u32 tqmask, __u32 cookie, const char *filename) { } -static inline void inotify_dentry_parent_queue_event(struct dentry *dentry, - __u32 mask, __u32 cookie, +static inline void inotify_dentry_tqparent_queue_event(struct dentry *dentry, + __u32 tqmask, __u32 cookie, const char *filename) { } diff --git a/amarok/src/k3bexporter.cpp b/amarok/src/k3bexporter.cpp index 19d0ab74..d0893415 100644 --- a/amarok/src/k3bexporter.cpp +++ b/amarok/src/k3bexporter.cpp @@ -71,7 +71,7 @@ void K3bExporter::exportSelectedTracks( int openmode ) void K3bExporter::exportAlbum( const TQString &album, int openmode ) { - exportAlbum( TQString::null, album, openmode ); + exportAlbum( TQString(), album, openmode ); } void K3bExporter::exportAlbum( const TQString &artist, const TQString &album, int openmode ) diff --git a/amarok/src/kbookmarkhandler.cpp b/amarok/src/kbookmarkhandler.cpp index 0157e901..b6fa3ffb 100644 --- a/amarok/src/kbookmarkhandler.cpp +++ b/amarok/src/kbookmarkhandler.cpp @@ -26,8 +26,8 @@ #include <kdiroperator.h> #include <kstandarddirs.h> -KBookmarkHandler::KBookmarkHandler( KDirOperator *parent, KPopupMenu* rootmenu ) - : TQObject( parent, "KBookmarkHandler" ) +KBookmarkHandler::KBookmarkHandler( KDirOperator *tqparent, KPopupMenu* rootmenu ) + : TQObject( tqparent, "KBookmarkHandler" ) , KBookmarkOwner() { const TQString file = Amarok::saveLocation() + "fileBrowserBookmarks.xml"; @@ -39,14 +39,14 @@ KBookmarkHandler::KBookmarkHandler( KDirOperator *parent, KPopupMenu* rootmenu ) new KBookmarkMenu( manager, this, rootmenu, 0, true ); } -QString +TQString KBookmarkHandler::currentURL() const { - return static_cast<KDirOperator*>(parent())->url().url(); + return static_cast<KDirOperator*>(TQT_TQWIDGET(tqparent()))->url().url(); } void KBookmarkHandler::openBookmarkURL( const TQString &url ) { - static_cast<KDirOperator*>(parent())->setURL( KURL(url), true ); + static_cast<KDirOperator*>(TQT_TQWIDGET(tqparent()))->setURL( KURL(url), true ); } diff --git a/amarok/src/kbookmarkhandler.h b/amarok/src/kbookmarkhandler.h index 86a44eff..4a5d3fa6 100644 --- a/amarok/src/kbookmarkhandler.h +++ b/amarok/src/kbookmarkhandler.h @@ -29,7 +29,7 @@ class KPopupMenu; class KBookmarkHandler : public TQObject, public KBookmarkOwner { public: - KBookmarkHandler( KDirOperator *parent, KPopupMenu* ); + KBookmarkHandler( KDirOperator *tqparent, KPopupMenu* ); /// KBookmarkOwner interface: virtual void openBookmarkURL( const TQString &url ); diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp index 9883b108..d3d54650 100644 --- a/amarok/src/konquisidebar/universalamarok.cpp +++ b/amarok/src/konquisidebar/universalamarok.cpp @@ -46,8 +46,8 @@ #define HTML_FILE KGlobal::dirs()->saveLocation( "data", "amarok/", true ) + "contextbrowser.html" -amarokWidget::amarokWidget( TQWidget * parent, const char * name, WFlags f ) - : TQVBox(parent, name, f) +amarokWidget::amarokWidget( TQWidget * tqparent, const char * name, WFlags f ) + : TQVBox(tqparent, name, f) { setAcceptDrops(true); } @@ -76,8 +76,8 @@ bool amarokWidget::eventFilter( TQObject *, TQEvent *e ) return true; } -UniversalAmarok::UniversalAmarok(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): - KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) +UniversalAmarok::UniversalAmarok(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name): + KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name) { KGlobal::iconLoader()->addAppDir( "amarok" ); widget = new amarokWidget( widgetParent ); @@ -123,7 +123,7 @@ UniversalAmarok::UniversalAmarok(KInstance *inst,TQObject *parent,TQWidget *widg fileInfo = new TQFileInfo(HTML_FILE); TQTimer *t = new TQTimer( this ); - connect( t, TQT_SIGNAL(timeout()), TQT_SLOT(updateStatus() ) ); + connect( t, TQT_SIGNAL(timeout()), TQT_SLOT(updatetqStatus() ) ); t->start( 2000, false ); kdDebug() << "Connecting widget signal" << endl; @@ -198,7 +198,7 @@ void UniversalAmarok::updateBrowser(const TQString& file) line = stream.readLine(); // line of text excluding '\n' text += TQString("\n") + line; } f_file.close(); - text=text.replace("<img id='current_box-largecover-image' ", "<img id='current_box-largecover-image' width=70 height=70 "); + text=text.tqreplace("<img id='current_box-largecover-image' ", "<img id='current_box-largecover-image' width=70 height=70 "); browser->begin(); browser->write(text); browser->end(); @@ -208,9 +208,9 @@ void UniversalAmarok::updateBrowser(const TQString& file) /*! - \fn UniversalAmarok::updateStatus() + \fn UniversalAmarok::updatetqStatus() */ -void UniversalAmarok::updateStatus() +void UniversalAmarok::updatetqStatus() { checkForAmarok(); vol_slider->setValue( playerStub->getVolume() ); diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h index 131f5b59..ed20ca73 100644 --- a/amarok/src/konquisidebar/universalamarok.h +++ b/amarok/src/konquisidebar/universalamarok.h @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef KONQUERORSIDEBAR_H -#define KONQUERORSIDEBAR_H +#ifndef KONTQUERORSIDEBAR_H +#define KONTQUERORSIDEBAR_H #include <khtml_part.h> #include <konqsidebarplugin.h> @@ -38,11 +38,12 @@ class DCOPClient; class TQFileInfo; class TQDateTime; -class amarokWidget : public QVBox +class amarokWidget : public TQVBox { Q_OBJECT + TQ_OBJECT public: - amarokWidget( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + amarokWidget( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); protected: virtual void dragEnterEvent ( TQDragEnterEvent * ); @@ -57,8 +58,9 @@ signals: class UniversalAmarok : public KonqSidebarPlugin { Q_OBJECT + TQ_OBJECT public: - UniversalAmarok(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + UniversalAmarok(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); ~UniversalAmarok(); @@ -82,7 +84,7 @@ private: public slots: void updateBrowser(const TQString&); - void updateStatus(); + void updatetqStatus(); void sendPrev() { checkForAmarok(); playerStub->prev(); } void sendPlay() { checkForAmarok(); playerStub->play(); } void sendPause() { checkForAmarok(); playerStub->pause(); } diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp index ad158539..6ee3c1b4 100644 --- a/amarok/src/ktrm.cpp +++ b/amarok/src/ktrm.cpp @@ -52,7 +52,7 @@ class KTRMLookup; extern "C" { #if HAVE_TUNEPIMP >= 4 - static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status); + static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFiletqStatus status); #else static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId); #endif @@ -77,7 +77,7 @@ public: int startLookup(KTRMLookup *lookup) { int id; - if(!m_fileMap.contains(lookup->file())) { + if(!m_fileMap.tqcontains(lookup->file())) { #if HAVE_TUNEPIMP >= 4 id = tp_AddFile(m_pimp, TQFile::encodeName(lookup->file()), 0); #else @@ -106,9 +106,9 @@ public: bool lookupMapContains(int fileId) const { m_lookupMapMutex.lock(); - bool contains = m_lookupMap.contains(fileId); + bool tqcontains = m_lookupMap.tqcontains(fileId); m_lookupMapMutex.unlock(); - return contains; + return tqcontains; } KTRMLookup *lookup(int fileId) const @@ -162,7 +162,7 @@ protected: short port; tp_GetServer(m_pimp, server, 255, &port); TQString tunepimpHost = TQString(server); - TQString tunepimpHostWithPort = (tunepimpHost + ":%1").arg(port); + TQString tunepimpHostWithPort = (tunepimpHost + ":%1").tqarg(port); for(TQStringList::ConstIterator it = noProxies.constBegin(); it != noProxies.constEnd(); ++it) { TQString normalizedHost = KNetwork::KResolver::normalizeDomain(*it); @@ -209,10 +209,10 @@ private: * A custom event type used for signalling that a TRM lookup is finished. */ -class KTRMEvent : public QCustomEvent +class KTRMEvent : public TQCustomEvent { public: - enum Status { + enum tqStatus { Recognized, Unrecognized, Collision, @@ -220,7 +220,7 @@ public: Error }; - KTRMEvent(int fileId, Status status) : + KTRMEvent(int fileId, tqStatus status) : TQCustomEvent(id), m_fileId(fileId), m_status(status) {} @@ -230,7 +230,7 @@ public: return m_fileId; } - Status status() const + tqStatus status() const { return m_status; } @@ -239,7 +239,7 @@ public: private: int m_fileId; - Status m_status; + tqStatus m_status; }; /** @@ -247,10 +247,10 @@ private: * thread) for the lookup. */ -class KTRMEventHandler : public QObject +class KTRMEventHandler : public TQObject { public: - static void send(int fileId, KTRMEvent::Status status) + static void send(int fileId, KTRMEvent::tqStatus status) { KApplication::postEvent(instance(), new KTRMEvent(fileId, status)); } @@ -314,7 +314,7 @@ protected: * Callback function for TunePimp lookup events. */ #if HAVE_TUNEPIMP >= 4 -static void TRMNotifyCallback(tunepimp_t /*pimp*/, void */*data*/, TPCallbackEnum type, int fileId, TPFileStatus status) +static void TRMNotifyCallback(tunepimp_t /*pimp*/, void */*data*/, TPCallbackEnum type, int fileId, TPFiletqStatus status) #else static void TRMNotifyCallback(tunepimp_t pimp, void */*data*/, TPCallbackEnum type, int fileId) #endif @@ -324,9 +324,9 @@ static void TRMNotifyCallback(tunepimp_t pimp, void */*data*/, TPCallbackEnum ty #if HAVE_TUNEPIMP < 4 track_t track = tp_GetTrack(pimp, fileId); - TPFileStatus status = tr_GetStatus(track); + TPFiletqStatus status = tr_GettqStatus(track); #endif - //debug() << "Status is: " << status << endl; + //debug() << "tqStatus is: " << status << endl; switch(status) { case eRecognized: @@ -617,7 +617,7 @@ void KTRMLookup::unrecognized() tr_GetTRM(track, trm, 255); #endif if ( !trm[0] ) { - tr_SetStatus(track, ePending); + tr_SettqStatus(track, ePending); tp_Wake(KTRMRequestHandler::instance()->tunePimp(), track); } else @@ -696,7 +696,7 @@ void KTRMLookup::collision() 2 * stringSimilarity(strList,result.d->artist) + 1 * stringSimilarity(strList,result.d->album); - if(!d->results.contains(result)) d->results.append(result); + if(!d->results.tqcontains(result)) d->results.append(result); } break; } @@ -731,7 +731,7 @@ void KTRMLookup::puidGenerated() tp_ReleaseTrack(KTRMRequestHandler::instance()->tunePimp(), track); d->results.clear(); - KIO::Job *job = KIO::storedGet( TQString( "http://musicbrainz.org/ws/1/track/?type=xml&puid=%1" ).arg( puid ) , false, false ); + KIO::Job *job = KIO::storedGet( TQString( "http://musicbrainz.org/ws/1/track/?type=xml&puid=%1" ).tqarg( puid ) , false, false ); Amarok::StatusBar::instance()->newProgressOperation( job ) .setDescription( i18n( "MusicBrainz Lookup" ) ); @@ -791,7 +791,7 @@ void KTRMLookup::lookupResult( KIO::Job* job ) 4 * stringSimilarity(strList,tmpResult.d->title) + 2 * stringSimilarity(strList,tmpResult.d->artist) + 1 * stringSimilarity(strList,tmpResult.d->album); - if( !d->results.contains( tmpResult ) ) + if( !d->results.tqcontains( tmpResult ) ) d->results.append( tmpResult ); } } @@ -872,8 +872,8 @@ double stringSimilarity(TQString s1, TQString s2) ++p1; ++p2; } else { - x1 = s1.find(c2,p1,false); - x2 = s2.find(c1,p2,false); + x1 = s1.tqfind(c2,p1,false); + x2 = s2.tqfind(c1,p2,false); if( (x1 == x2 || -1 == x1) || (-1 != x2 && x1 > x2) ) ++p2; diff --git a/amarok/src/ktrm.h b/amarok/src/ktrm.h index 6de3daaa..b133a466 100644 --- a/amarok/src/ktrm.h +++ b/amarok/src/ktrm.h @@ -92,12 +92,12 @@ public: bool operator>(const KTRMResult &r) const; /** - * Basic assignment operator; required for the QTL + * Basic assignment operator; required for the TQTL */ KTRMResult &operator= (const KTRMResult &r); /** - * Basic comparison operator; required for the QTL + * Basic comparison operator; required for the TQTL */ bool operator== (const KTRMResult &r) const; @@ -119,9 +119,10 @@ typedef TQValueList<KTRMResult> KTRMResultList; * The lookups themselves happen in a background thread, but the return calls * are guaranteed to run in the GUI thread. */ -class KTRMLookup : public QObject +class KTRMLookup : public TQObject { Q_OBJECT + TQ_OBJECT signals: void sigResult( KTRMResultList, TQString ); diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp index 0f57049f..fa9964d8 100644 --- a/amarok/src/lastfm.cpp +++ b/amarok/src/lastfm.cpp @@ -50,9 +50,9 @@ using namespace LastFm; // AmarokHttp is a hack written so that lastfm code could easily use something proxy aware. // DO NOT use this class for anything else, use KIO directly instead. //////////////////////////////////////////////////////////////////////////////// -AmarokHttp::AmarokHttp ( const TQString& hostname, Q_UINT16 port, - TQObject* parent ) - : TQObject( parent ), +AmarokHttp::AmarokHttp ( const TQString& hostname, TQ_UINT16 port, + TQObject* tqparent ) + : TQObject( tqparent ), m_hostname( hostname ), m_port( port ) {} @@ -61,9 +61,9 @@ int AmarokHttp::get ( const TQString & path ) { TQString uri = TQString( "http://%1:%2/%3" ) - .arg( m_hostname ) - .arg( m_port ) - .arg( path ); + .tqarg( m_hostname ) + .tqarg( m_port ) + .tqarg( path ); m_done = false; m_error = TQHttp::NoError; @@ -83,7 +83,7 @@ AmarokHttp::state() const return m_state; } -QByteArray +TQByteArray AmarokHttp::readAll () { return m_result; @@ -104,7 +104,7 @@ AmarokHttp::slotData(KIO::Job*, const TQByteArray& data) else if ( m_result.size() == 0 ) { m_result = data; } - else if ( m_result.resize( m_result.size() + data.size() ) ) { + else if ( m_result.tqresize( m_result.size() + data.size() ) ) { memcpy( m_result.end(), data.data(), data.size() ); } } @@ -138,13 +138,13 @@ Controller::Controller() { KActionCollection* ac = Amarok::actionCollection(); m_actionList.append( new KAction( i18n( "Ban" ), Amarok::icon( "remove" ), - KKey( Qt::CTRL | Qt::Key_B ), this, TQT_SLOT( ban() ), ac, "ban" ) ); + KKey( TQt::CTRL | TQt::Key_B ), this, TQT_SLOT( ban() ), ac, "ban" ) ); m_actionList.append( new KAction( i18n( "Love" ), Amarok::icon( "love" ), - KKey( Qt::CTRL | Qt::Key_L ), this, TQT_SLOT( love() ), ac, "love" ) ); + KKey( TQt::CTRL | TQt::Key_L ), this, TQT_SLOT( love() ), ac, "love" ) ); m_actionList.append( new KAction( i18n( "Skip" ), Amarok::icon( "next" ), - KKey( Qt::CTRL | Qt::Key_K ), this, TQT_SLOT( skip() ), ac, "skip" ) ); + KKey( TQt::CTRL | TQt::Key_K ), this, TQT_SLOT( skip() ), ac, "skip" ) ); setActionsEnabled( false ); } @@ -244,7 +244,7 @@ Controller::checkCredentials() //static } -QString +TQString Controller::createCustomStation() //static { TQString token; @@ -295,7 +295,7 @@ Controller::setActionsEnabled( bool enable ) } /// return a translatable description of the station we are connected to -QString +TQString Controller::stationDescription( TQString url ) { if( url.isEmpty() && instance() && instance()->isPlaying() ) @@ -308,17 +308,17 @@ Controller::stationDescription( TQString url ) /// TAG RADIOS // eg: lastfm://globaltag/rock if ( elements[1] == "globaltags" ) - return i18n( "Global Tag Radio: %1" ).arg( elements[2] ); + return i18n( "Global Tag Radio: %1" ).tqarg( elements[2] ); /// ARTIST RADIOS if ( elements[1] == "artist" ) { // eg: lastfm://artist/Queen/similarartists if ( elements[3] == "similarartists" ) - return i18n( "Similar Artists to %1" ).arg( elements[2] ); + return i18n( "Similar Artists to %1" ).tqarg( elements[2] ); if ( elements[3] == "fans" ) - return i18n( "Artist Fan Radio: %1" ).arg( elements[2] ); + return i18n( "Artist Fan Radio: %1" ).tqarg( elements[2] ); } /// CUSTOM STATION @@ -328,15 +328,15 @@ Controller::stationDescription( TQString url ) // turn "genesis,pink floyd,queen" into "Genesis, Pink Floyd, Queen" TQString artists = elements[2]; - artists.replace( ",", ", " ); + artists.tqreplace( ",", ", " ); const TQStringList words = TQStringList::split( " ", TQString( artists ).remove( "," ) ); foreach( words ) { TQString capitalized = *it; - capitalized.replace( 0, 1, (*it)[0].upper() ); - artists.replace( *it, capitalized ); + capitalized.tqreplace( 0, 1, (*it)[0].upper() ); + artists.tqreplace( *it, capitalized ); } - return i18n( "Custom Station: %1" ).arg( artists ); + return i18n( "Custom Station: %1" ).tqarg( artists ); } /// USER RADIOS @@ -344,25 +344,25 @@ Controller::stationDescription( TQString url ) { // eg: lastfm://user/sebr/neighbours if ( elements[3] == "neighbours" ) - return i18n( "%1's Neighbor Radio" ).arg( elements[2] ); + return i18n( "%1's Neighbor Radio" ).tqarg( elements[2] ); // eg: lastfm://user/sebr/personal if ( elements[3] == "personal" ) - return i18n( "%1's Personal Radio" ).arg( elements[2] ); + return i18n( "%1's Personal Radio" ).tqarg( elements[2] ); // eg: lastfm://user/sebr/loved if ( elements[3] == "loved" ) - return i18n( "%1's Loved Radio" ).arg( elements[2] ); + return i18n( "%1's Loved Radio" ).tqarg( elements[2] ); // eg: lastfm://user/sebr/recommended/100 : 100 is number for how obscure the music should be if ( elements[3] == "recommended" ) - return i18n( "%1's Recommended Radio" ).arg( elements[2] ); + return i18n( "%1's Recommended Radio" ).tqarg( elements[2] ); } /// GROUP RADIOS //eg: lastfm://group/Amarok%20users else if ( elements[1] == "group" ) - return i18n( "Group Radio: %1" ).arg( elements[2] ); + return i18n( "Group Radio: %1" ).tqarg( elements[2] ); /// TRACK RADIOS else if ( elements[1] == "play" ) @@ -382,8 +382,8 @@ Controller::stationDescription( TQString url ) // CLASS WebService //////////////////////////////////////////////////////////////////////////////// -WebService::WebService( TQObject* parent, bool useProxy ) - : TQObject( parent, "lastfmParent" ) +WebService::WebService( TQObject* tqparent, bool useProxy ) + : TQObject( tqparent, "lastfmParent" ) , m_useProxy( useProxy ) , m_deletionUnsafe( false ) , m_wasCanceled( false ) @@ -429,11 +429,11 @@ WebService::handshake( const TQString& username, const TQString& password ) const TQString path = TQString( "/radio/handshake.php?version=%1&platform=%2&username=%3&passwordmd5=%4&debug=%5" ) - .arg( APP_VERSION ) //Muesli-approved: Amarok version, and Amarok-as-platform - .arg( TQString("Amarok") ) - .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) - .arg( KMD5( m_password.utf8() ).hexDigest() ) - .arg( "0" ); + .tqarg( APP_VERSION ) //Muesli-approved: Amarok version, and Amarok-as-platform + .tqarg( TQString("Amarok") ) + .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) + .tqarg( KMD5( m_password.utf8() ).hexDigest().data() ) + .tqarg( "0" ); http.get( path ); @@ -478,7 +478,7 @@ WebService::handshake( const TQString& username, const TQString& password ) debug() << "Proxy server using port: " << port << endl; delete socket; - m_proxyUrl = TQString( "http://localhost:%1/lastfm.mp3" ).arg( port ); + m_proxyUrl = TQString( "http://localhost:%1/lastfm.mp3" ).tqarg( port ); m_server = new Amarok::ProcIO(); m_server->setComm( KProcess::Communication( KProcess::AllOutput ) ); @@ -523,8 +523,8 @@ WebService::changeStation( TQString url ) AmarokHttp http( m_baseHost, 80 ); http.get( TQString( m_basePath + "/adjust.php?session=%1&url=%2&debug=0" ) - .arg( m_session ) - .arg( url ) ); + .tqarg( m_session ) + .tqarg( url ) ); m_deletionUnsafe = true; do @@ -556,7 +556,7 @@ WebService::changeStation( TQString url ) emit stationChanged( _url, m_station ); } else - emit stationChanged( _url, TQString::null ); + emit stationChanged( _url, TQString() ); return true; } @@ -568,8 +568,8 @@ WebService::requestMetaData() //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( metaDataFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/np.php?session=%1&debug=%2" ) - .arg( m_session ) - .arg( "0" ) ); + .tqarg( m_session ) + .tqarg( "0" ) ); } @@ -603,7 +603,7 @@ WebService::metaDataFinished( int /*id*/, bool error ) //SLOT if( imageUrl == "http://static.last.fm/coverart/" || imageUrl == "http://static.last.fm/depth/catalogue/no_album_large.gif" ) - imageUrl = TQString::null; + imageUrl = TQString(); lastFmStuff.setImageUrl ( CollectionDB::instance()->notAvailCover( true ) ); lastFmStuff.setArtistUrl( parameter( "artist_url", result ) ); @@ -655,9 +655,9 @@ WebService::enableScrobbling( bool enabled ) //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( enableScrobblingFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/control.php?session=%1&command=%2&debug=%3" ) - .arg( m_session ) - .arg( enabled ? TQString( "rtp" ) : TQString( "nortp" ) ) - .arg( "0" ) ); + .tqarg( m_session ) + .tqarg( enabled ? TQString( "rtp" ) : TQString( "nortp" ) ) + .tqarg( "0" ) ); } @@ -679,8 +679,8 @@ WebService::love() //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( loveFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/control.php?session=%1&command=love&debug=%2" ) - .arg( m_session ) - .arg( "0" ) ); + .tqarg( m_session ) + .tqarg( "0" ) ); Amarok::StatusBar::instance()->shortMessage( i18n("love, as in affection", "Loving song...") ); } @@ -692,8 +692,8 @@ WebService::skip() //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( skipFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/control.php?session=%1&command=skip&debug=%2" ) - .arg( m_session ) - .arg( "0" ) ); + .tqarg( m_session ) + .tqarg( "0" ) ); Amarok::StatusBar::instance()->shortMessage( i18n("Skipping song...") ); } @@ -705,8 +705,8 @@ WebService::ban() //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( banFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/control.php?session=%1&command=ban&debug=%2" ) - .arg( m_session ) - .arg( "0" ) ); + .tqarg( m_session ) + .tqarg( "0" ) ); Amarok::StatusBar::instance()->shortMessage( i18n("Ban, as in dislike", "Banning song...") ); } @@ -763,7 +763,7 @@ WebService::friends( TQString username ) connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( friendsFinished( bool ) ) ); http->get( TQString( "/1.0/user/%1/friends.xml" ) - .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); + .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); } @@ -805,7 +805,7 @@ WebService::neighbours( TQString username ) connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( neighboursFinished( bool ) ) ); http->get( TQString( "/1.0/user/%1/neighbours.xml" ) - .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); + .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); } @@ -847,7 +847,7 @@ WebService::userTags( TQString username ) connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( userTagsFinished( bool ) ) ); http->get( TQString( "/1.0/user/%1/tags.xml?debug=%2" ) - .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); + .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); } @@ -889,7 +889,7 @@ WebService::recentTracks( TQString username ) connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( recentTracksFinished( bool ) ) ); http->get( TQString( "/1.0/user/%1/recenttracks.xml" ) - .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); + .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); } @@ -900,7 +900,7 @@ WebService::recentTracksFinished( int /*id*/, bool error ) //SLOT http->deleteLater(); if( error ) return; - TQValueList< QPair<TQString, TQString> > songs; + TQValueList< TQPair<TQString, TQString> > songs; TQDomDocument document; document.setContent( http->readAll() ); @@ -914,7 +914,7 @@ WebService::recentTracksFinished( int /*id*/, bool error ) //SLOT TQString user = document.elementsByTagName( "recenttracks" ).item( 0 ).attributes().namedItem( "user" ).nodeValue(); for ( uint i = 0; i < values.count(); i++ ) { - QPair<TQString, TQString> song; + TQPair<TQString, TQString> song; song.first = values.item( i ).namedItem( "artist" ).toElement().text(); song.second = values.item( i ).namedItem( "name" ).toElement().text(); @@ -931,35 +931,35 @@ WebService::recommend( int type, TQString username, TQString artist, TQString to switch ( type ) { case 0: - modeToken = TQString( "artist_name=%1" ).arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ); + modeToken = TQString( "artist_name=%1" ).tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ); break; case 1: modeToken = TQString( "album_artist=%1&album_name=%2" ) - .arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) - .arg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); + .tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) + .tqarg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); break; case 2: modeToken = TQString( "track_artist=%1&track_name=%2" ) - .arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) - .arg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); + .tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) + .tqarg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); break; } TQHttp *http = new TQHttp( "wsdev.audioscrobbler.com", 80, this ); connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( recommendFinished( bool ) ) ); - uint currentTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + uint currentTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); TQString challenge = TQString::number( currentTime ); TQCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest(); token = TQString( "user=%1&auth=%2&nonce=%3recipient=%4" ) - .arg( TQString( TQUrl( currentUsername() ).encodedPathAndQuery() ) ) - .arg( TQString( TQUrl( md5pass ).encodedPathAndQuery() ) ) - .arg( TQString( TQUrl( challenge ).encodedPathAndQuery() ) ) - .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ); + .tqarg( TQString( TQUrl( currentUsername() ).encodedPathAndQuery() ) ) + .tqarg( TQString( TQUrl( md5pass ).encodedPathAndQuery() ) ) + .tqarg( TQString( TQUrl( challenge ).encodedPathAndQuery() ) ) + .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ); TQHttpRequestHeader header( "POST", "/1.0/rw/recommend.php?" + token.utf8() ); header.setValue( "Host", "wsdev.audioscrobbler.com" ); @@ -978,7 +978,7 @@ WebService::recommendFinished( int /*id*/, bool /*error*/ ) //SLOT } -QString +TQString WebService::parameter( const TQString keyName, const TQString data ) const { TQStringList list = TQStringList::split( '\n', data ); @@ -997,7 +997,7 @@ WebService::parameter( const TQString keyName, const TQString data ) const } -QStringList +TQStringList WebService::parameterArray( const TQString keyName, const TQString data ) const { TQStringList result; @@ -1017,7 +1017,7 @@ WebService::parameterArray( const TQString keyName, const TQString data ) const } -QStringList +TQStringList WebService::parameterKeys( const TQString keyName, const TQString data ) const { TQStringList result; @@ -1093,8 +1093,8 @@ void Bundle::detach() { //////////////////////////////////////////////////////////////////////////////// // CLASS LastFm::LoginDialog //////////////////////////////////////////////////////////////////////////////// -LoginDialog::LoginDialog( TQWidget *parent ) - : KDialogBase( parent, "LastfmLogin", true, TQString::null, Ok|Cancel) +LoginDialog::LoginDialog( TQWidget *tqparent ) + : KDialogBase( tqparent, "LastfmLogin", true, TQString(), Ok|Cancel) { makeGridMainWidget( 1, Qt::Horizontal ); new TQLabel( i18n( "To use last.fm with Amarok, you need a last.fm profile." ), mainWidget() ); @@ -1125,8 +1125,8 @@ void LoginDialog::slotOk() //////////////////////////////////////////////////////////////////////////////// // CLASS LastFm::CustomStationDialog //////////////////////////////////////////////////////////////////////////////// -CustomStationDialog::CustomStationDialog( TQWidget *parent ) - : KDialogBase( parent, "LastfmCustomStation", true, i18n( "Create Custom Station" ) , Ok|Cancel) +CustomStationDialog::CustomStationDialog( TQWidget *tqparent ) + : KDialogBase( tqparent, "LastfmCustomStation", true, i18n( "Create Custom Station" ) , Ok|Cancel) { makeVBoxMainWidget(); @@ -1137,7 +1137,7 @@ CustomStationDialog::CustomStationDialog( TQWidget *parent ) } -QString +TQString CustomStationDialog::text() const { return m_edit->text(); diff --git a/amarok/src/lastfm.h b/amarok/src/lastfm.h index 5046da64..b5e01349 100644 --- a/amarok/src/lastfm.h +++ b/amarok/src/lastfm.h @@ -38,12 +38,13 @@ namespace KIO { class Job; } /* AmarokHttp is a hack written so that lastfm code could easily use something proxy aware. DO NOT use this class for anything else, use KIO directly instead. */ -class AmarokHttp : public QObject +class AmarokHttp : public TQObject { Q_OBJECT + TQ_OBJECT public: - AmarokHttp ( const TQString & hostname, Q_UINT16 port = 80, TQObject* parent = 0 ); + AmarokHttp ( const TQString & hostname, TQ_UINT16 port = 80, TQObject* tqparent = 0 ); int get ( const TQString & path ); TQHttp::State state() const; TQByteArray readAll (); @@ -58,7 +59,7 @@ class AmarokHttp : public QObject protected: TQString m_hostname; - Q_UINT16 m_port; + TQ_UINT16 m_port; TQString m_path; TQHttp::State m_state; TQHttp::Error m_error; @@ -71,9 +72,10 @@ namespace LastFm { class WebService; - class Controller : public QObject + class Controller : public TQObject { Q_OBJECT + TQ_OBJECT public: static Controller* instance(); @@ -87,7 +89,7 @@ namespace LastFm static bool checkCredentials(); static TQString createCustomStation(); - static TQString stationDescription( TQString url = TQString::null ); // necessary for translation + static TQString stationDescription( TQString url = TQString() ); // necessary for translation public slots: void playbackStopped(); @@ -106,14 +108,15 @@ namespace LastFm WebService* m_service; }; - class WebService : public QObject + class WebService : public TQObject { Q_OBJECT + TQ_OBJECT public: enum DataType { Artist, Album, Track }; - WebService( TQObject* parent, bool useProxy ); + WebService( TQObject* tqparent, bool useProxy ); ~WebService(); bool handshake( const TQString& username, const TQString& password ); @@ -178,14 +181,14 @@ namespace LastFm void friendsResult( const TQString& username, const TQStringList& friends ); void neighboursResult( const TQString& username, const TQStringList& friends ); - void recentTracksResult( const TQString& username, TQValueList< QPair<TQString, TQString> > songs ); + void recentTracksResult( const TQString& username, TQValueList< TQPair<TQString, TQString> > songs ); void userTagsResult( const TQString& username, const TQStringList& tags ); private: enum errorCode { E_NOCONTENT = 1, E_NOMEMBERS = 2, E_NOFANS = 3, E_NOAVAIL = 4, E_NOSUBSCRIBER = 5, E_NONEIGHBOURS = 6, E_NOSTOPPED = 7, E_OTHER = 0 }; - void showError( int code, TQString message = TQString::null ); + void showError( int code, TQString message = TQString() ); bool m_useProxy; @@ -257,10 +260,10 @@ namespace LastFm // We must implement this because TQServerSocket has one pure virtual method. // It's just used for finding a free port. - class MyServerSocket : public QServerSocket + class MyServerSocket : public TQServerSocket { public: - MyServerSocket() : TQServerSocket( Q_UINT16( 0 ) ) {} + MyServerSocket() : TQServerSocket( TQ_UINT16( 0 ) ) {} private: void newConnection( int ) {} @@ -270,9 +273,10 @@ namespace LastFm class LoginDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - LoginDialog( TQWidget *parent ); + LoginDialog( TQWidget *tqparent ); protected slots: void slotOk(); @@ -286,9 +290,10 @@ namespace LastFm class CustomStationDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CustomStationDialog( TQWidget *parent ); + CustomStationDialog( TQWidget *tqparent ); TQString text() const; diff --git a/amarok/src/loader/loader.cpp b/amarok/src/loader/loader.cpp index ec4b7b17..abb9d2eb 100644 --- a/amarok/src/loader/loader.cpp +++ b/amarok/src/loader/loader.cpp @@ -154,7 +154,7 @@ Loader::Loader( TQStringList args ) args.prepend( "amarokapp" ); - m_proc = new TQProcess( args, this ); + m_proc = new TQProcess( args, TQT_TQOBJECT(this) ); m_proc->setCommunication( TQProcess::Stdout ); std::cout << "Amarok: [Loader] Starting amarokapp..\n"; @@ -226,9 +226,9 @@ isSplashEnabled() { TQString line; while( file.readLine( line, 2000 ) != -1 ) - if ( line.contains( "Show Splashscreen" ) ) + if ( line.tqcontains( "Show Splashscreen" ) ) { - if( line.contains( "false" ) ) + if( line.tqcontains( "false" ) ) return false; else return true; diff --git a/amarok/src/loader/loader.h b/amarok/src/loader/loader.h index c8ce05d0..7bc08119 100644 --- a/amarok/src/loader/loader.h +++ b/amarok/src/loader/loader.h @@ -23,7 +23,7 @@ class TQProcess; class TQStringList; -class Loader : public QApplication +class Loader : public TQApplication { public: Loader( TQStringList ); diff --git a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h index 3ca0b802..a18b900f 100644 --- a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h +++ b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h @@ -33,9 +33,10 @@ This class encapsulates the downloading of an album once all required informatio @author Nikolaj Hald Nielsen <nhnFreespirit@gmail.com> */ -class MagnatuneAlbumDownloader: public QObject +class MagnatuneAlbumDownloader: public TQObject { Q_OBJECT + TQ_OBJECT public: MagnatuneAlbumDownloader(); diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp index da56aba1..1e59471b 100644 --- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp +++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp @@ -25,8 +25,8 @@ #include <tqfile.h> -MagnatuneArtistInfoBox::MagnatuneArtistInfoBox( TQWidget *parentWidget, const char *widgetname ) - : KHTMLPart( parentWidget, widgetname ) +MagnatuneArtistInfoBox::MagnatuneArtistInfoBox( TQWidget *tqparentWidget, const char *widgetname ) + : KHTMLPart( tqparentWidget, widgetname ) {} @@ -56,7 +56,7 @@ MagnatuneArtistInfoBox::displayAlbumInfo( MagnatuneAlbum *album ) const MagnatuneArtist artist = MagnatuneDatabaseHandler::instance()->getArtistById( album->getArtistId() ); const TQString artistName = artist.getName(); - TQString infoHtml = "<HTML><HEAD><META HTTP-EQUIV=\"Content-Type\" " + TQString infoHtml = "<HTML><HEAD><META HTTP-ETQUIV=\"Content-Type\" " "CONTENT=\"text/html; charset=iso-8859-1\"></HEAD><BODY>"; infoHtml += "<div align=\"center\"><strong>"; @@ -115,25 +115,25 @@ MagnatuneArtistInfoBox::extractArtistInfo( TQString artistPage ) TQString trimmedHtml; - int sectionStart = artistPage.find( "<!-- ARTISTBODY -->" ); - int sectionEnd = artistPage.find( "<!-- /ARTISTBODY -->", sectionStart ); + int sectionStart = artistPage.tqfind( "<!-- ARTISTBODY -->" ); + int sectionEnd = artistPage.tqfind( "<!-- /ARTISTBODY -->", sectionStart ); trimmedHtml = artistPage.mid( sectionStart, sectionEnd - sectionStart ); - int buyStartIndex = trimmedHtml.find( "<!-- PURCHASE -->" ); + int buyStartIndex = trimmedHtml.tqfind( "<!-- PURCHASE -->" ); int buyEndIndex; //we are going to integrate the buying of music (I hope) so remove these links while ( buyStartIndex != -1 ) { - buyEndIndex = trimmedHtml.find( "<!-- /PURCHASE -->", buyStartIndex ) + 18; + buyEndIndex = trimmedHtml.tqfind( "<!-- /PURCHASE -->", buyStartIndex ) + 18; trimmedHtml.remove( buyStartIndex, buyEndIndex - buyStartIndex ); - buyStartIndex = trimmedHtml.find( "<!-- PURCHASE -->", buyStartIndex ); + buyStartIndex = trimmedHtml.tqfind( "<!-- PURCHASE -->", buyStartIndex ); } - TQString infoHtml = "<HTML><HEAD><META HTTP-EQUIV=\"Content-Type\" " + TQString infoHtml = "<HTML><HEAD><META HTTP-ETQUIV=\"Content-Type\" " "CONTENT=\"text/html; charset=iso-8859-1\"></HEAD><BODY>"; infoHtml += trimmedHtml; diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h index f730f317..ccca4387 100644 --- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h +++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h @@ -36,15 +36,16 @@ A specialized KHTMLPart for displaying html info about a Magnatune artist or alb class MagnatuneArtistInfoBox : public KHTMLPart { Q_OBJECT + TQ_OBJECT public: /** * Constructor - * @param parentWidget The parent QWidget + * @param tqparentWidget The tqparent TQWidget * @param widgetname The name of this widget * @return New MagnatuneArtistInfoBox object */ - MagnatuneArtistInfoBox( TQWidget *parentWidget, const char *widgetname ); + MagnatuneArtistInfoBox( TQWidget *tqparentWidget, const char *widgetname ); /** * Destructor diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.cpp b/amarok/src/magnatunebrowser/magnatunebrowser.cpp index 57bfc3f3..ea3ad04f 100644 --- a/amarok/src/magnatunebrowser/magnatunebrowser.cpp +++ b/amarok/src/magnatunebrowser/magnatunebrowser.cpp @@ -349,7 +349,7 @@ bool MagnatuneBrowser::updateMagnatuneList() m_listDownloadJob = KIO::storedGet( KURL( "http://magnatune.com/info/album_info.xml" ), false, false ); Amarok::StatusBar::instance() ->newProgressOperation( m_listDownloadJob ) .setDescription( i18n( "Downloading Magnatune.com Database" ) ) - .setAbortSlot( this, TQT_SLOT( listDownloadCancelled() ) ); + .setAbortSlot( TQT_TQOBJECT(this), TQT_SLOT( listDownloadCancelled() ) ); connect( m_listDownloadJob, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( listDownloadComplete( KIO::Job* ) ) ); @@ -433,7 +433,7 @@ void MagnatuneBrowser::updateList() for ( it = artists.begin(); it != artists.end(); ++it ) new MagnatuneListViewArtistItem( ( *it ), m_listView ); - m_listView->repaintContents(); + m_listView->tqrepaintContents(); } void MagnatuneBrowser::genreChanged() diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.h b/amarok/src/magnatunebrowser/magnatunebrowser.h index 4f730902..7e768861 100644 --- a/amarok/src/magnatunebrowser/magnatunebrowser.h +++ b/amarok/src/magnatunebrowser/magnatunebrowser.h @@ -48,9 +48,10 @@ Implemented as a singleton @author Nikolaj Hald Nielsen <nhnFreespirit@gmail.com> */ -class MagnatuneBrowser : public QVBox +class MagnatuneBrowser : public TQVBox { Q_OBJECT + TQ_OBJECT public: /** diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp index 6959139e..f0fca6b5 100644 --- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp +++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp @@ -29,8 +29,8 @@ Boston, MA 02110-1301, USA. #include <tqtextedit.h> -MagnatuneDownloadDialog::MagnatuneDownloadDialog( TQWidget *parent, const char *name, bool modal, WFlags fl ) - : MagnatuneDownloadDialogBase( parent, name, modal, fl ) +MagnatuneDownloadDialog::MagnatuneDownloadDialog( TQWidget *tqparent, const char *name, bool modal, WFlags fl ) + : MagnatuneDownloadDialogBase( tqparent, name, modal, fl ) { downloadTargetURLRequester->fileDialog() ->setMode( KFile::Directory ); m_currentDownloadInfo = 0; diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.h b/amarok/src/magnatunebrowser/magnatunedownloaddialog.h index 6ecba1fc..c9a3de33 100644 --- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.h +++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.h @@ -34,16 +34,17 @@ class MagnatuneDownloadDialog : public MagnatuneDownloadDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Overridden constructor. - * @param parent Pointer to the parent TQWidget. + * @param tqparent Pointer to the tqparent TQWidget. * @param name Name of this widget. * @param modal Sets modal state. * @param fl Additional dialog flags. */ - MagnatuneDownloadDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); + MagnatuneDownloadDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /** * Destructor diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui index 3a24d929..bce229e4 100644 --- a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MagnatuneDownloadDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>MagnatuneDownloadDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>downloadButton</cstring> </property> @@ -27,7 +27,7 @@ <string>&Download</string> </property> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>infoEdit</cstring> </property> @@ -48,7 +48,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -59,7 +59,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>formatComboBox</cstring> </property> @@ -69,7 +69,7 @@ <cstring>downloadTargetURLRequester</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -77,7 +77,7 @@ <string>Select Format:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -85,14 +85,14 @@ <string>Download to:</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_2</cstring> </property> <property name="text"> <string>If you download to a location that is already being monitored by Amarok, the album will automatically be added to your collection.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -108,10 +108,10 @@ <slot>downloadButtonClicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">downloadButtonClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/amarok/src/magnatunebrowser/magnatunedownloadinfo.cpp b/amarok/src/magnatunebrowser/magnatunedownloadinfo.cpp index 828c1cf3..6d064922 100644 --- a/amarok/src/magnatunebrowser/magnatunedownloadinfo.cpp +++ b/amarok/src/magnatunebrowser/magnatunedownloadinfo.cpp @@ -27,7 +27,7 @@ MagnatuneDownloadInfo::MagnatuneDownloadInfo() { - m_selectedDownloadFormat = TQString::null; + m_selectedDownloadFormat = TQString(); m_albumId = -1; } @@ -65,7 +65,7 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString ) // lets make sure that this is actually a valid result - int testIndex = downloadInfoString.find( "<RESULT>" ); + int testIndex = downloadInfoString.tqfind( "<RESULT>" ); if ( testIndex == -1 ) { return false; @@ -74,10 +74,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString ) int startIndex; int endIndex; - startIndex = downloadInfoString.find( "<DL_USERNAME>", 0, false ); + startIndex = downloadInfoString.tqfind( "<DL_USERNAME>", 0, false ); if ( startIndex != -1 ) { - endIndex = downloadInfoString.find( "</DL_USERNAME>", 0, false ); + endIndex = downloadInfoString.tqfind( "</DL_USERNAME>", 0, false ); if ( endIndex != -1 ) { startIndex += 13; @@ -96,10 +96,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString ) } - startIndex = downloadInfoString.find( "<DL_PASSWORD>", 0, false ); + startIndex = downloadInfoString.tqfind( "<DL_PASSWORD>", 0, false ); if ( startIndex != -1 ) { - endIndex = downloadInfoString.find( "</DL_PASSWORD>", 0, false ); + endIndex = downloadInfoString.tqfind( "</DL_PASSWORD>", 0, false ); if ( endIndex != -1 ) { startIndex += 13; @@ -117,10 +117,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString ) } - startIndex = downloadInfoString.find( "<URL_WAVZIP>", 0, false ); + startIndex = downloadInfoString.tqfind( "<URL_WAVZIP>", 0, false ); if ( startIndex != -1 ) { - endIndex = downloadInfoString.find( "</URL_WAVZIP>", 0, false ); + endIndex = downloadInfoString.tqfind( "</URL_WAVZIP>", 0, false ); if ( endIndex != -1 ) { startIndex += 12; @@ -130,10 +130,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString ) } } - startIndex = downloadInfoString.find( "<URL_128KMP3ZIP>", 0, false ); + startIndex = downloadInfoString.tqfind( "<URL_128KMP3ZIP>", 0, false ); if ( startIndex != -1 ) { - endIndex = downloadInfoString.find( "</URL_128KMP3ZIP>", 0, false ); + endIndex = downloadInfoString.tqfind( "</URL_128KMP3ZIP>", 0, false ); if ( endIndex != -1 ) { startIndex += 16; @@ -143,10 +143,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString ) } } - startIndex = downloadInfoString.find( "<URL_OGGZIP>", 0, false ); + startIndex = downloadInfoString.tqfind( "<URL_OGGZIP>", 0, false ); if ( startIndex != -1 ) { - endIndex = downloadInfoString.find( "</URL_OGGZIP>", 0, false ); + endIndex = downloadInfoString.tqfind( "</URL_OGGZIP>", 0, false ); if ( endIndex != -1 ) { startIndex += 12; @@ -156,10 +156,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString ) } } - startIndex = downloadInfoString.find( "<URL_VBRZIP>", 0, false ); + startIndex = downloadInfoString.tqfind( "<URL_VBRZIP>", 0, false ); if ( startIndex != -1 ) { - endIndex = downloadInfoString.find( "</URL_VBRZIP>", 0, false ); + endIndex = downloadInfoString.tqfind( "</URL_VBRZIP>", 0, false ); if ( endIndex != -1 ) { startIndex += 12; @@ -169,10 +169,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString ) } } - startIndex = downloadInfoString.find( "<URL_FLACZIP>", 0, false ); + startIndex = downloadInfoString.tqfind( "<URL_FLACZIP>", 0, false ); if ( startIndex != -1 ) { - endIndex = downloadInfoString.find( "</URL_FLACZIP>", 0, false ); + endIndex = downloadInfoString.tqfind( "</URL_FLACZIP>", 0, false ); if ( endIndex != -1 ) { startIndex += 13; @@ -182,10 +182,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString ) } } - startIndex = downloadInfoString.find( "<DL_MSG>", 0, false ); + startIndex = downloadInfoString.tqfind( "<DL_MSG>", 0, false ); if ( startIndex != -1 ) { - endIndex = downloadInfoString.find( "</DL_MSG>", 0, false ); + endIndex = downloadInfoString.tqfind( "</DL_MSG>", 0, false ); if ( endIndex != -1 ) { startIndex += 9; diff --git a/amarok/src/magnatunebrowser/magnatunelistview.cpp b/amarok/src/magnatunebrowser/magnatunelistview.cpp index 3ea8a167..0ea7c53e 100644 --- a/amarok/src/magnatunebrowser/magnatunelistview.cpp +++ b/amarok/src/magnatunebrowser/magnatunelistview.cpp @@ -26,8 +26,8 @@ #include <tqcolor.h> -MagnatuneListView::MagnatuneListView( TQWidget * parent ) - : KListView( parent ) +MagnatuneListView::MagnatuneListView( TQWidget * tqparent ) + : KListView( tqparent ) { setRootIsDecorated( true ); diff --git a/amarok/src/magnatunebrowser/magnatunelistview.h b/amarok/src/magnatunebrowser/magnatunelistview.h index 2a7f7391..b116fece 100644 --- a/amarok/src/magnatunebrowser/magnatunelistview.h +++ b/amarok/src/magnatunebrowser/magnatunelistview.h @@ -34,7 +34,7 @@ A specialized KListView that provides drag and drop functionality class MagnatuneListView : public KListView { public: - MagnatuneListView(TQWidget * parent); + MagnatuneListView(TQWidget * tqparent); ~MagnatuneListView(); diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp index 8ce1046c..a6c85ee8 100644 --- a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp +++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp @@ -29,8 +29,8 @@ -MagnatuneListViewArtistItem::MagnatuneListViewArtistItem( MagnatuneArtist artist, KListView * parent ) -: KListViewItem( parent ), MagnatuneArtist( artist ) +MagnatuneListViewArtistItem::MagnatuneListViewArtistItem( MagnatuneArtist artist, KListView * tqparent ) +: KListViewItem( tqparent ), MagnatuneArtist( artist ) { KListViewItem::setText( 0, artist.getName() ); @@ -59,8 +59,8 @@ void MagnatuneListViewArtistItem::setOpen( bool o ) } listView()->setUpdatesEnabled( true ); KListViewItem::setOpen( o ); - invalidateHeight(); - listView()->repaintContents(); + tqinvalidateHeight(); + listView()->tqrepaintContents(); } @@ -84,8 +84,8 @@ void MagnatuneListViewArtistItem::setup() -MagnatuneListViewAlbumItem::MagnatuneListViewAlbumItem( MagnatuneAlbum album, KListViewItem * parent ) -: KListViewItem( parent ), MagnatuneAlbum( album ) +MagnatuneListViewAlbumItem::MagnatuneListViewAlbumItem( MagnatuneAlbum album, KListViewItem * tqparent ) +: KListViewItem( tqparent ), MagnatuneAlbum( album ) { KListViewItem::setText( 0, album.getName() ); setDragEnabled( true ); @@ -117,8 +117,8 @@ void MagnatuneListViewAlbumItem::setOpen( bool o ) listView()->setUpdatesEnabled( true ); KListViewItem::setOpen( o ); - invalidateHeight(); - listView()->repaintContents(); + tqinvalidateHeight(); + listView()->tqrepaintContents(); } @@ -141,8 +141,8 @@ void MagnatuneListViewAlbumItem::setup( ) -MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, KListViewItem * parent ) -: KListViewItem( parent ), MagnatuneTrack( track ) +MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, KListViewItem * tqparent ) +: KListViewItem( tqparent ), MagnatuneTrack( track ) { int trackNumber = track.getTrackNumber(); diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.h b/amarok/src/magnatunebrowser/magnatunelistviewitems.h index 573acb67..cc848cc4 100644 --- a/amarok/src/magnatunebrowser/magnatunelistviewitems.h +++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.h @@ -36,7 +36,7 @@ A specialized KListViewItem that encapsulates a MagnatuneArtist class MagnatuneListViewArtistItem : public KListViewItem, public MagnatuneArtist { public: - MagnatuneListViewArtistItem(MagnatuneArtist artist, KListView * parent); + MagnatuneListViewArtistItem(MagnatuneArtist artist, KListView * tqparent); ~MagnatuneListViewArtistItem(); @@ -55,7 +55,7 @@ class MagnatuneListViewAlbumItem : public KListViewItem, public MagnatuneAlbum { public: - MagnatuneListViewAlbumItem(MagnatuneAlbum album, KListViewItem * parent); + MagnatuneListViewAlbumItem(MagnatuneAlbum album, KListViewItem * tqparent); ~MagnatuneListViewAlbumItem(); void setOpen( bool o ); @@ -73,7 +73,7 @@ class MagnatuneListViewTrackItem : public KListViewItem, public MagnatuneTrack { public: - MagnatuneListViewTrackItem(MagnatuneTrack track, KListViewItem * parent); + MagnatuneListViewTrackItem(MagnatuneTrack track, KListViewItem * tqparent); ~MagnatuneListViewTrackItem(); }; diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp b/amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp index aeaa6843..4ea1166b 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp +++ b/amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp @@ -29,8 +29,8 @@ #include <tqlabel.h> -MagnatunePurchaseDialog::MagnatunePurchaseDialog( TQWidget* parent, const char* name, bool modal, WFlags fl ) - : magnatunePurchaseDialogBase( parent, name, modal, fl ) +MagnatunePurchaseDialog::MagnatunePurchaseDialog( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : magnatunePurchaseDialogBase( tqparent, name, modal, fl ) {} MagnatunePurchaseDialog::~MagnatunePurchaseDialog() diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialog.h b/amarok/src/magnatunebrowser/magnatunepurchasedialog.h index a10af868..085ca931 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasedialog.h +++ b/amarok/src/magnatunebrowser/magnatunepurchasedialog.h @@ -26,17 +26,18 @@ class MagnatunePurchaseDialog : public magnatunePurchaseDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Overridden constructor. - * @param parent Pointer to the parent TQWidget. + * @param tqparent Pointer to the tqparent TQWidget. * @param name Name of this widget. * @param modal Sets modal state. * @param fl Additional dialog flags. */ - MagnatunePurchaseDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); + MagnatunePurchaseDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /** * Destructor diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui index 467d6f4b..f5b77bfe 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui @@ -1,13 +1,13 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>magnatunePurchaseDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>magnatunePurchaseDialogBase</cstring> </property> <property name="enabled"> <bool>true</bool> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,7 +25,7 @@ <property name="resizeMode"> <enum>Minimum</enum> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -36,7 +36,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="2" rowspan="5" colspan="1"> + <widget class="TQLabel" row="0" column="2" rowspan="5" colspan="1"> <property name="name"> <cstring>coverPixmapLabel</cstring> </property> @@ -48,13 +48,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>201</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>200</width> <height>201</height> @@ -67,18 +67,18 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>infoLabel</cstring> </property> <property name="text"> <string>You have chosen to purchase the following album from Magnatune.com</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>albumEdit</cstring> </property> @@ -89,7 +89,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel13</cstring> </property> @@ -97,7 +97,7 @@ <string>Album:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>artistEdit</cstring> </property> @@ -108,7 +108,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel14</cstring> </property> @@ -116,7 +116,7 @@ <string>Artist:</string> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>genresEdit</cstring> </property> @@ -127,7 +127,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>launchDateEdit</cstring> </property> @@ -138,7 +138,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel15</cstring> </property> @@ -146,7 +146,7 @@ <string>Genre:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel16</cstring> </property> @@ -156,9 +156,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -180,14 +180,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>purchaseButton</cstring> </property> @@ -195,7 +195,7 @@ <string>P&urchase</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -205,7 +205,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -216,7 +216,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -474,7 +474,7 @@ <string>VISA and Mastercard accepted.</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -482,7 +482,7 @@ <string>Expiration date:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -490,7 +490,7 @@ <string>Amount to pay (USD):</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -498,7 +498,7 @@ <string>Name:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -506,7 +506,7 @@ <string>Email:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -514,22 +514,22 @@ <string>Credit card number:</string> </property> </widget> - <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>ccEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>nameEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>emailEdit</cstring> </property> </widget> - <widget class="QComboBox" row="5" column="1" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="5" column="1" rowspan="1" colspan="2"> <item> <property name="text"> <string>5</string> @@ -607,28 +607,28 @@ <number>3</number> </property> </widget> - <widget class="QLabel" row="6" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>textLabel17</cstring> </property> <property name="text"> <string>The amount you choose to pay will be split 50/50 between the artist and Magnatune.com. Your credit card information is sent directly to Magnatune.com using SSL encryption and is not stored by Amarok.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLineEdit" row="4" column="4"> + <widget class="TQLineEdit" row="4" column="4"> <property name="name"> <cstring>expYearEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="2"> + <widget class="TQLineEdit" row="4" column="2"> <property name="name"> <cstring>expMonthEdit</cstring> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -636,7 +636,7 @@ <string>Month (xx):</string> </property> </widget> - <widget class="QLabel" row="4" column="3"> + <widget class="TQLabel" row="4" column="3"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -656,7 +656,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -698,9 +698,9 @@ <tabstop>purchaseButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>purchase()</slot> <slot>cancel()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp b/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp index fbfed0ba..053c039c 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp +++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp @@ -81,7 +81,7 @@ void MagnatunePurchaseHandler::showPurchaseDialog( TQString coverTempLocation ) if ( m_purchaseDialog == 0 ) { - m_purchaseDialog = new MagnatunePurchaseDialog( m_parent, "PurchaseDialog", true, 0 ); + m_purchaseDialog = new MagnatunePurchaseDialog( m_tqparent, "PurchaseDialog", true, 0 ); connect( m_purchaseDialog, TQT_SIGNAL( makePurchase( TQString, TQString, TQString, TQString, TQString, TQString, int ) ), this, TQT_SLOT( processPayment( TQString, TQString, TQString, TQString, TQString, TQString, int ) ) ); connect ( m_purchaseDialog, TQT_SIGNAL( cancelled() ), this, TQT_SLOT( albumPurchaseCancelled() ) ); @@ -146,7 +146,7 @@ void MagnatunePurchaseHandler::xmlDownloadComplete( KIO::Job * downloadJob ) if ( m_downloadDialog == 0 ) { - m_downloadDialog = new MagnatuneDownloadDialog( m_parent, "downloaddialog", true, 0 ); + m_downloadDialog = new MagnatuneDownloadDialog( m_tqparent, "downloaddialog", true, 0 ); connect( m_downloadDialog, TQT_SIGNAL( downloadAlbum( MagnatuneDownloadInfo * ) ), m_albumDownloader, TQT_SLOT( downloadAlbum( MagnatuneDownloadInfo * ) ) ); } @@ -171,16 +171,16 @@ void MagnatunePurchaseHandler::xmlDownloadComplete( KIO::Job * downloadJob ) else { - TQMessageBox::information( m_parent, "Could not process payment", + TQMessageBox::information( m_tqparent, "Could not process payment", "There seems to be an error in the information entered (check the credit card number), please try again\n" ); m_purchaseDialog->setEnabled( true ); } } -void MagnatunePurchaseHandler::setParent( TQWidget * parent ) +void MagnatunePurchaseHandler::setParent( TQWidget * tqparent ) { - m_parent = parent; + m_tqparent = tqparent; } diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h index 9889c66f..a9a5e538 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h +++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h @@ -35,14 +35,15 @@ The main class responcible for handelig of purchases from Magnatune.com @author Nikolaj Hald Nielsen */ -class MagnatunePurchaseHandler : public QObject +class MagnatunePurchaseHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: MagnatunePurchaseHandler(); ~MagnatunePurchaseHandler(); - void setParent( TQWidget * parent ); + void setParent( TQWidget * tqparent ); /** * Starts a purchase operation * @param album The album to purchase @@ -57,8 +58,8 @@ private: KIO::TransferJob * m_resultDownloadJob; - //need a parent to pass to any dialogs we spawn - TQWidget * m_parent; + //need a tqparent to pass to any dialogs we spawn + TQWidget * m_tqparent; MagnatunePurchaseDialog * m_purchaseDialog; MagnatuneDownloadDialog * m_downloadDialog; MagnatuneAlbumDownloader * m_albumDownloader; diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp index 5d7c1417..0e3c26b3 100644 --- a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp +++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp @@ -23,8 +23,8 @@ #include <tqpushbutton.h> #include <klistview.h> -MagnatuneRedownloadDialog::MagnatuneRedownloadDialog(TQWidget* parent, const char* name, bool modal, WFlags fl) -: magnatuneReDownloadDialogBase(parent,name, modal,fl) +MagnatuneRedownloadDialog::MagnatuneRedownloadDialog(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: magnatuneReDownloadDialogBase(tqparent,name, modal,fl) { redownloadButton->setEnabled ( false ); diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h index b42e61a1..e7b5fc2a 100644 --- a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h +++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h @@ -28,9 +28,10 @@ class MagnatuneRedownloadDialog : public magnatuneReDownloadDialogBase { Q_OBJECT + TQ_OBJECT public: - MagnatuneRedownloadDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); + MagnatuneRedownloadDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~MagnatuneRedownloadDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui index 5a2bfc2e..1ba58ec7 100644 --- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>magnatuneReDownloadDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>magnatuneReDownloadDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -27,7 +27,7 @@ <string>These are the albums that you have previously downloaded:</string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>redownloadButton</cstring> </property> @@ -35,7 +35,7 @@ <string>Re&download</string> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>170</width> <height>20</height> @@ -98,11 +98,11 @@ <slot>selectionChanged()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">redownload()</slot> <slot access="protected">selectionChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp index 72e19ed4..643dab5d 100644 --- a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp +++ b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp @@ -30,9 +30,9 @@ -MagnatuneRedownloadHandler::MagnatuneRedownloadHandler(TQWidget * parent) +MagnatuneRedownloadHandler::MagnatuneRedownloadHandler(TQWidget * tqparent) { - m_parent = parent; + m_tqparent = tqparent; m_redownloadDialog = 0; m_downloadDialog = 0; m_albumDownloader = 0; @@ -51,13 +51,13 @@ void MagnatuneRedownloadHandler::showRedownloadDialog( ) if (previousDownloads.isEmpty()) { //No previously purchased track information found. No more to do here... - TQMessageBox::information( m_parent, i18n( "No purchases found!" ) , + TQMessageBox::information( m_tqparent, i18n( "No purchases found!" ) , i18n( "No previous purchases have been found. Nothing to redownload..." ) + "\n" ); return; } if (m_redownloadDialog == 0) { - m_redownloadDialog = new MagnatuneRedownloadDialog( m_parent ); + m_redownloadDialog = new MagnatuneRedownloadDialog( m_tqparent ); connect( m_redownloadDialog, TQT_SIGNAL( redownload( TQString) ), this, TQT_SLOT( redownload( TQString ) ) ); connect( m_redownloadDialog, TQT_SIGNAL(cancelled() ), this, TQT_SLOT( selectionDialogCancelled() )); } @@ -107,7 +107,7 @@ void MagnatuneRedownloadHandler::redownload( TQString storedInfoFileName ) if (m_downloadDialog == 0) { - m_downloadDialog = new MagnatuneDownloadDialog(m_parent); + m_downloadDialog = new MagnatuneDownloadDialog(m_tqparent); connect( m_downloadDialog, TQT_SIGNAL( downloadAlbum( MagnatuneDownloadInfo * ) ), m_albumDownloader, TQT_SLOT( downloadAlbum( MagnatuneDownloadInfo * ) ) ); } @@ -123,7 +123,7 @@ void MagnatuneRedownloadHandler::redownload( TQString storedInfoFileName ) else { - TQMessageBox::information( m_parent, i18n( "Could not re-download album" ), + TQMessageBox::information( m_tqparent, i18n( "Could not re-download album" ), i18n( "There seems to be a problem with the selected redownload info file." ) + "\n" ); } diff --git a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h index 8d981047..f41e291a 100644 --- a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h +++ b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h @@ -35,8 +35,9 @@ This class handles the redownloading of previously purchased albums class MagnatuneRedownloadHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - MagnatuneRedownloadHandler(TQWidget * parent); + MagnatuneRedownloadHandler(TQWidget * tqparent); ~MagnatuneRedownloadHandler(); @@ -51,7 +52,7 @@ signals: protected: - TQWidget * m_parent; + TQWidget * m_tqparent; TQStringList GetPurchaseList( ); MagnatuneRedownloadDialog * m_redownloadDialog; MagnatuneDownloadDialog * m_downloadDialog; diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.cpp b/amarok/src/magnatunebrowser/magnatunexmlparser.cpp index ea17966c..0e760495 100644 --- a/amarok/src/magnatunebrowser/magnatunexmlparser.cpp +++ b/amarok/src/magnatunebrowser/magnatunexmlparser.cpp @@ -48,9 +48,9 @@ MagnatuneXmlParser::completeJob( ) { Amarok::StatusBar::instance() ->longMessage( i18n( "Magnatune.com database update complete. Added %1 tracks on %2 albums from %3 artists" ) - .arg( m_nNumberOfTracks ) - .arg( m_nNumberOfAlbums ) - .arg( m_nNumberOfArtists ), KDE::StatusBar::Information ); + .tqarg( m_nNumberOfTracks ) + .tqarg( m_nNumberOfAlbums ) + .tqarg( m_nNumberOfArtists ), KDE::StatusBar::Information ); emit( doneParsing() ); } diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.h b/amarok/src/magnatunebrowser/magnatunexmlparser.h index d8f3bc8e..801e8fd7 100644 --- a/amarok/src/magnatunebrowser/magnatunexmlparser.h +++ b/amarok/src/magnatunebrowser/magnatunexmlparser.h @@ -34,9 +34,16 @@ * * @author Nikolaj Hald Nielsen */ +#ifdef Q_MOC_RUN +// MOC_SKIP_BEGIN +class MagnatuneXmlParser : public JobBase +// MOC_SKIP_END +#else class MagnatuneXmlParser : public ThreadManager::Job +#endif { Q_OBJECT + TQ_OBJECT public: @@ -90,8 +97,8 @@ private: void parseElement( TQDomElement e ); /** - * Parses all children of a DOM element - * @param e The element whose children is to be parsed + * Parses all tqchildren of a DOM element + * @param e The element whose tqchildren is to be parsed */ void parseChildren( TQDomElement e ); diff --git a/amarok/src/main.cpp b/amarok/src/main.cpp index b98701a4..562f0107 100644 --- a/amarok/src/main.cpp +++ b/amarok/src/main.cpp @@ -104,7 +104,7 @@ int main( int argc, char *argv[] ) App::initCliArgs( argc, argv ); App app; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #ifndef AMAROK_USE_DRKONQI KCrash::setCrashHandler( Amarok::Crash::crashHandler ); #endif diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp index ff1b0eb8..46e5f0ac 100644 --- a/amarok/src/mediabrowser.cpp +++ b/amarok/src/mediabrowser.cpp @@ -112,17 +112,17 @@ bool MediaBrowser::isAvailable() //static class SpaceLabel : public TQLabel { public: - SpaceLabel(TQWidget *parent) - : TQLabel(parent) + SpaceLabel(TQWidget *tqparent) + : TQLabel(tqparent) { m_total = m_used = m_scheduled = 0; - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); } void paintEvent(TQPaintEvent *e) { TQPainter p(this); - p.fillRect(e->rect(), colorGroup().brush(TQColorGroup::Background)); + p.fillRect(e->rect(), tqcolorGroup().brush(TQColorGroup::Background)); if(m_total > 0) { @@ -138,7 +138,7 @@ class SpaceLabel : public TQLabel { if(e->rect().right() < right) right = e->rect().right(); p.fillRect(e->rect().left(), e->rect().top(), - used, e->rect().bottom()+1, TQBrush(blueish, Qt::SolidPattern)); + used, e->rect().bottom()+1, TQBrush(blueish, TQt::SolidPattern)); } } @@ -155,7 +155,7 @@ class SpaceLabel : public TQLabel { int right = e->rect().right(); if(scheduled < right) right = scheduled; - p.fillRect(left, e->rect().top(), right, e->rect().bottom()+1, TQBrush(sched, Qt::SolidPattern)); + p.fillRect(left, e->rect().top(), right, e->rect().bottom()+1, TQBrush(sched, TQt::SolidPattern)); } if(m_used + m_scheduled < m_total) @@ -165,7 +165,7 @@ class SpaceLabel : public TQLabel { if(scheduled > left) left = scheduled; int right = e->rect().right(); - p.fillRect(left, e->rect().top(), right, e->rect().bottom()+1, colorGroup().brush(TQColorGroup::Background)); + p.fillRect(left, e->rect().top(), right, e->rect().bottom()+1, tqcolorGroup().brush(TQColorGroup::Background)); } } TQLabel::paintEvent(e); @@ -259,7 +259,7 @@ MediaBrowser::MediaBrowser( const char *name ) m_toolbar->insertLineSeparator(); // m_toolbar->setIconText( KToolBar::IconTextRight, true ); - m_toolbar->insertButton( Amarok::icon( "add_playlist" ), CUSTOM, TQT_SIGNAL( clicked() ), this, TQT_SLOT( customClicked() ), true, "custom" ); + m_toolbar->insertButton( Amarok::icon( "add_playlist" ), CUSTOM, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( customClicked() ), true, "custom" ); TQToolTip::add( m_toolbar->getButton(TRANSFER), i18n( "Transfer tracks to media device" ) ); m_toolbar->setIconText( KToolBar::IconOnly, false ); @@ -409,7 +409,7 @@ MediaBrowser::tagsChanged( const MetaBundle &bundle ) { m_itemMapMutex.lock(); debug() << "tags changed for " << bundle.url().url() << endl; - ItemMap::iterator it = m_itemMap.find( bundle.url().url() ); + ItemMap::iterator it = m_itemMap.tqfind( bundle.url().url() ); if( it != m_itemMap.end() ) { MediaItem *item = *it; @@ -443,7 +443,7 @@ bool MediaBrowser::getBundle( const KURL &url, MetaBundle *bundle ) const { TQMutexLocker locker( &m_itemMapMutex ); - ItemMap::const_iterator it = m_itemMap.find( url.url() ); + ItemMap::const_iterator it = m_itemMap.tqfind( url.url() ); if( it == m_itemMap.end() ) return false; @@ -630,11 +630,11 @@ MediaBrowser::updateDevices() TQString name = (*it)->name(); if( !(*it)->deviceNode().isEmpty() ) { - name = i18n( "%1 at %2" ).arg( name, (*it)->deviceNode() ); + name = i18n( "%1 at %2" ).tqarg( name, (*it)->deviceNode() ); } if( (*it)->hasMountPoint() && !(*it)->mountPoint().isEmpty() ) { - name += i18n( " (mounted at %1)" ).arg( (*it)->mountPoint() ); + name += i18n( " (mounted at %1)" ).tqarg( (*it)->mountPoint() ); } m_deviceCombo->insertItem( name, i ); if( it == m_currentDevice ) @@ -648,7 +648,7 @@ MediaBrowser::updateDevices() emit availabilityChanged( m_haveDevices ); } -QStringList +TQStringList MediaBrowser::deviceNames() const { TQStringList list; @@ -718,10 +718,10 @@ MediaBrowser::transcode( const KURL &src, const TQString &filetype ) m_transcodedUrl = KURL(); ScriptManager::instance()->notifyTranscode( src.url(), filetype ); - while( m_waitForTranscode && sm->transcodeScriptRunning() != TQString::null ) + while( m_waitForTranscode && sm->transcodeScriptRunning() != TQString() ) { usleep( 10000 ); - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); } return m_transcodedUrl; @@ -789,26 +789,26 @@ MediaBrowser::~MediaBrowser() } -MediaItem::MediaItem( TQListView* parent ) -: KListViewItem( parent ) +MediaItem::MediaItem( TQListView* tqparent ) +: KListViewItem( tqparent ) { init(); } -MediaItem::MediaItem( TQListViewItem* parent ) -: KListViewItem( parent ) +MediaItem::MediaItem( TQListViewItem* tqparent ) +: KListViewItem( tqparent ) { init(); } -MediaItem::MediaItem( TQListView* parent, TQListViewItem* after ) -: KListViewItem( parent, after ) +MediaItem::MediaItem( TQListView* tqparent, TQListViewItem* after ) +: KListViewItem( tqparent, after ) { init(); } -MediaItem::MediaItem( TQListViewItem* parent, TQListViewItem* after ) -: KListViewItem( parent, after ) +MediaItem::MediaItem( TQListViewItem* tqparent, TQListViewItem* after ) +: KListViewItem( tqparent, after ) { init(); } @@ -824,7 +824,7 @@ MediaItem::init() m_bundle=0; m_order=0; m_type=UNKNOWN; - m_playlistName = TQString::null; + m_playlistName = TQString(); m_device=0; m_flags=0; setExpandable( false ); @@ -839,7 +839,7 @@ MediaItem::setBundle( MetaBundle *bundle ) if( m_bundle ) { TQString itemUrl = url().url(); - MediaBrowser::ItemMap::iterator it = MediaBrowser::instance()->m_itemMap.find( itemUrl ); + MediaBrowser::ItemMap::iterator it = MediaBrowser::instance()->m_itemMap.tqfind( itemUrl ); if( it != MediaBrowser::instance()->m_itemMap.end() && *it == this ) MediaBrowser::instance()->m_itemMap.remove( itemUrl ); } @@ -849,7 +849,7 @@ MediaItem::setBundle( MetaBundle *bundle ) if( m_bundle ) { TQString itemUrl = url().url(); - MediaBrowser::ItemMap::iterator it = MediaBrowser::instance()->m_itemMap.find( itemUrl ); + MediaBrowser::ItemMap::iterator it = MediaBrowser::instance()->m_itemMap.tqfind( itemUrl ); if( it == MediaBrowser::instance()->m_itemMap.end() ) MediaBrowser::instance()->m_itemMap[itemUrl] = this; } @@ -1090,10 +1090,10 @@ MediaItem::compare( TQListViewItem *i, int col, bool ascending ) const else if( item && item->type() == MediaItem::ARTIST ) { TQString key1 = key( col, ascending ); - if( key1.startsWith( "the ", false ) ) + if( key1.tqstartsWith( "the ", false ) ) key1 = key1.mid( 4 ); TQString key2 = i->key( col, ascending ); - if( key2.startsWith( "the ", false ) ) + if( key2.tqstartsWith( "the ", false ) ) key2 = key2.mid( 4 ); return key1.localeAwareCompare( key2 ); @@ -1102,7 +1102,7 @@ MediaItem::compare( TQListViewItem *i, int col, bool ascending ) const return KListViewItem::compare(i, col, ascending); } -class MediaItemTip : public QToolTip +class MediaItemTip : public TQToolTip { public: MediaItemTip( TQListView *listview ) @@ -1127,13 +1127,13 @@ class MediaItemTip : public QToolTip { if( b->track() ) text = TQString( "%1 - %2 (%3)" ) - .arg( TQString::number(b->track()), b->title(), b->prettyLength() ); + .tqarg( TQString::number(b->track()), b->title(), b->prettyLength() ); if( !b->genre().isEmpty() ) { if( !text.isEmpty() ) text += "<br>"; text += TQString( "<i>Genre: %1</i>" ) - .arg( b->genre() ); + .tqarg( b->genre() ); } } } @@ -1164,16 +1164,16 @@ class MediaItemTip : public QToolTip } if( !text.isEmpty() && !text.isNull() ) - tip( m_view->itemRect( i ), text ); + tip( m_view->tqitemRect( i ), text ); } TQListView *m_view; }; -MediaView::MediaView( TQWidget* parent, MediaDevice *device ) - : KListView( parent ) - , m_parent( parent ) +MediaView::MediaView( TQWidget* tqparent, MediaDevice *device ) + : KListView( tqparent ) + , m_tqparent( tqparent ) , m_device( device ) { hide(); @@ -1192,7 +1192,7 @@ MediaView::MediaView( TQWidget* parent, MediaDevice *device ) addColumn( i18n( "Remote Media" ) ); KActionCollection* ac = new KActionCollection( this ); - KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "mediabrowser_select_all" ); + KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "mediabrowser_select_all" ); connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( rmbPressed( TQListViewItem*, const TQPoint&, int ) ) ); @@ -1317,17 +1317,17 @@ MediaView::nodeBuildDragList( MediaItem* item, int flags ) } int -MediaView::getSelectedLeaves( MediaItem *parent, TQPtrList<MediaItem> *list, int flags ) +MediaView::getSelectedLeaves( MediaItem *tqparent, TQPtrList<MediaItem> *list, int flags ) { int numFiles = 0; if( !list ) list = new TQPtrList<MediaItem>; MediaItem *it; - if( !parent ) + if( !tqparent ) it = dynamic_cast<MediaItem *>(firstChild()); else - it = dynamic_cast<MediaItem *>(parent->firstChild()); + it = dynamic_cast<MediaItem *>(tqparent->firstChild()); for( ; it; it = dynamic_cast<MediaItem*>(it->nextSibling())) { @@ -1419,9 +1419,9 @@ MediaView::contentsDropEvent( TQDropEvent *e ) } else if( item->type() == MediaItem::PLAYLISTITEM ) { - MediaItem *list = dynamic_cast<MediaItem *>(item->parent()); + MediaItem *list = dynamic_cast<MediaItem *>(item->tqparent()); MediaItem *after = 0; - for(MediaItem *it = dynamic_cast<MediaItem*>(item->parent()->firstChild()); + for(MediaItem *it = dynamic_cast<MediaItem*>(item->tqparent()->firstChild()); it; it = dynamic_cast<MediaItem *>(it->nextSibling())) { @@ -1498,9 +1498,9 @@ MediaView::viewportPaintEvent( TQPaintEvent *e ) const uint w = t.width() + 20; const uint h = t.height() + 20; - p.setBrush( colorGroup().background() ); + p.setBrush( tqcolorGroup().background() ); p.drawRoundRect( 15, 15, w, h, (8*200)/w, (8*200)/h ); - t.draw( &p, 20, 20, TQRect(), colorGroup() ); + t.draw( &p, 20, 20, TQRect(), tqcolorGroup() ); } MediaBrowser::instance()->updateButtons(); } @@ -1513,14 +1513,14 @@ MediaView::rmbPressed( TQListViewItem *item, const TQPoint &p, int i ) } MediaItem * -MediaView::newDirectory( MediaItem *parent ) +MediaView::newDirectory( MediaItem *tqparent ) { bool ok; - const TQString name = KInputDialog::getText(i18n("Add Directory"), i18n("Directory Name:"), TQString::null, &ok, this); + const TQString name = KInputDialog::getText(i18n("Add Directory"), i18n("Directory Name:"), TQString(), &ok, this); if( ok && !name.isEmpty() ) { - m_device->newDirectory( name, parent ); + m_device->newDirectory( name, tqparent ); } return 0; @@ -1629,7 +1629,7 @@ MediaBrowser::mediumChanged( const Medium *medium, TQString /*name*/ ) Amarok::StatusBar::instance()->longMessage( i18n( "The device %1 was unmounted before it was synchronized. " "In order to avoid data loss, press the \"Disconnect\" button " - "before unmounting the device." ).arg( name ), + "before unmounting the device." ).tqarg( name ), KDE::StatusBar::Warning ); //(*it)->disconnectDevice(); } @@ -1658,7 +1658,7 @@ MediaBrowser::mediumRemoved( const Medium *medium, TQString name ) Amarok::StatusBar::instance()->longMessage( i18n( "The device %1 was removed before it was disconnected. " "In order to avoid possible data loss, press the \"Disconnect\" " - "button before disconnecting the device." ).arg( name ), + "button before disconnecting the device." ).tqarg( name ), KDE::StatusBar::Warning ); } else @@ -1678,7 +1678,7 @@ MediaBrowser::loadDevicePlugin( const TQString &deviceType ) return 0; TQString query = "[X-KDE-Amarok-plugintype] == 'mediadevice' and [X-KDE-Amarok-name] == '%1'"; - Amarok::Plugin *plugin = PluginManager::createFromQuery( query.arg( deviceType ) ); + Amarok::Plugin *plugin = PluginManager::createFromQuery( query.tqarg( deviceType ) ); if( plugin ) { @@ -1839,13 +1839,13 @@ MediaBrowser::updateStats() TQString text = i18n( "1 track in queue", "%n tracks in queue", m_queue->childCount() ); if(m_queue->childCount() > 0) { - text += i18n(" (%1)").arg( KIO::convertSize( queued ) ); + text += i18n(" (%1)").tqarg( KIO::convertSize( queued ) ); } KIO::filesize_t total, avail; if( currentDevice() && currentDevice()->getCapacity(&total, &avail) ) { - text += i18n( " - %1 of %2 available" ).arg( KIO::convertSize( avail ) ).arg( KIO::convertSize( total ) ); + text += i18n( " - %1 of %2 available" ).tqarg( KIO::convertSize( avail ) ).tqarg( KIO::convertSize( total ) ); m_stats->m_used = total-avail; m_stats->m_total = total; @@ -1864,7 +1864,7 @@ MediaBrowser::updateStats() bool -MediaView::setFilter( const TQString &filter, MediaItem *parent ) +MediaView::setFilter( const TQString &filter, MediaItem *tqparent ) { bool advanced = ExpressionParser::isAdvancedExpression( filter ); TQValueList<int> defaultColumns; @@ -1874,17 +1874,17 @@ MediaView::setFilter( const TQString &filter, MediaItem *parent ) bool root = false; MediaItem *it; - if( !parent ) + if( !tqparent ) { root = true; it = dynamic_cast<MediaItem *>(firstChild()); } else { - it = dynamic_cast<MediaItem *>(parent->firstChild()); + it = dynamic_cast<MediaItem *>(tqparent->firstChild()); } - bool childrenVisible = false; + bool tqchildrenVisible = false; for( ; it; it = dynamic_cast<MediaItem *>(it->nextSibling())) { bool visible = true; @@ -1915,7 +1915,7 @@ MediaView::setFilter( const TQString &filter, MediaItem *parent ) i != list.end(); ++i ) { - if( !(*it).text(0).contains( *i ) ) + if( !(*it).text(0).tqcontains( *i ) ) { match = false; break; @@ -1929,13 +1929,13 @@ MediaView::setFilter( const TQString &filter, MediaItem *parent ) visible = true; it->setVisible( visible ); if(visible) - childrenVisible = true; + tqchildrenVisible = true; } if( root && m_device ) m_device->updateRootItems(); - return childrenVisible; + return tqchildrenVisible; } MediaDevice::MediaDevice() @@ -1947,7 +1947,7 @@ MediaDevice::MediaDevice() , m_transcodeAlways( false ) , m_transcodeRemove( false ) , sysProc ( 0 ) - , m_parent( 0 ) + , m_tqparent( 0 ) , m_view( 0 ) , m_wait( false ) , m_requireMount( false ) @@ -1968,11 +1968,11 @@ MediaDevice::MediaDevice() sysProc = new KShellProcess(); Q_CHECK_PTR(sysProc); } -void MediaDevice::init( MediaBrowser* parent ) +void MediaDevice::init( MediaBrowser* tqparent ) { - m_parent = parent; + m_tqparent = tqparent; if( !m_view ) - m_view = new MediaView( m_parent->m_views, this ); + m_view = new MediaView( m_tqparent->m_views, this ); m_view->hide(); } @@ -2008,7 +2008,7 @@ MediaDevice::loadConfig() m_postdisconnectcmd = "kdeeject -q %d"; } -QString +TQString MediaDevice::configString( const TQString &name, const TQString &defValue ) { TQString configName = "MediaDevice"; @@ -2057,7 +2057,7 @@ MediaDevice::view() void MediaDevice::hideProgress() { - m_parent->m_progressBox->hide(); + m_tqparent->m_progressBox->hide(); } void @@ -2083,7 +2083,7 @@ MediaQueue::syncPlaylist( const TQString &name, const TQString &query, bool load item->m_playlistName = name; item->setText( 0, name ); item->m_flags |= MediaItem::SmartPlaylist; - m_parent->m_progress->setTotalSteps( m_parent->m_progress->totalSteps() + 1 ); + m_tqparent->m_progress->setTotalSteps( m_tqparent->m_progress->totalSteps() + 1 ); itemCountChanged(); if( !loading ) URLsAdded(); @@ -2098,7 +2098,7 @@ MediaQueue::syncPlaylist( const TQString &name, const KURL &url, bool loading ) item->setData( url.url() ); item->m_playlistName = name; item->setText( 0, name ); - m_parent->m_progress->setTotalSteps( m_parent->m_progress->totalSteps() + 1 ); + m_tqparent->m_progress->setTotalSteps( m_tqparent->m_progress->totalSteps() + 1 ); itemCountChanged(); if( !loading ) URLsAdded(); @@ -2110,7 +2110,7 @@ MediaDevice::bundlesToSync( const TQString &name, const KURL &url ) BundleList bundles; if( !PlaylistFile::isPlaylistFile( url ) ) { - Amarok::StatusBar::instance()->longMessage( i18n( "Not a playlist file: %1" ).arg( url.path() ), + Amarok::StatusBar::instance()->longMessage( i18n( "Not a playlist file: %1" ).tqarg( url.path() ), KDE::StatusBar::Sorry ); return bundles; } @@ -2118,7 +2118,7 @@ MediaDevice::bundlesToSync( const TQString &name, const KURL &url ) PlaylistFile playlist( url.path() ); if( playlist.isError() ) { - Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).arg( url.path() ), + Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).tqarg( url.path() ), KDE::StatusBar::Sorry ); return bundles; } @@ -2248,12 +2248,12 @@ MediaQueue::addURL( const KURL& url2, MetaBundle *bundle, const TQString &playli if( PlaylistFile::isPlaylistFile( url ) ) { - TQString name = url.path().section( "/", -1 ).section( ".", 0, -2 ).replace( "_", " " ); + TQString name = TQString(url.path().section( "/", -1 ).section( ".", 0, -2 )).tqreplace( "_", " " ); PlaylistFile playlist( url.path() ); if( playlist.isError() ) { - Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).arg( url.path() ), + Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).tqarg( url.path() ), KDE::StatusBar::Sorry ); return; } @@ -2295,7 +2295,7 @@ MediaQueue::addURL( const KURL& url2, MetaBundle *bundle, const TQString &playli if( it->url() == url ) { Amarok::StatusBar::instance()->shortMessage( - i18n( "Track already queued for transfer: %1" ).arg( url.url() ) ); + i18n( "Track already queued for transfer: %1" ).tqarg( url.url() ) ); return; } } @@ -2323,8 +2323,8 @@ MediaQueue::addURL( const KURL& url2, MetaBundle *bundle, const TQString &playli } item->setText( 0, text); - m_parent->updateButtons(); - m_parent->m_progress->setTotalSteps( m_parent->m_progress->totalSteps() + 1 ); + m_tqparent->updateButtons(); + m_tqparent->m_progress->setTotalSteps( m_tqparent->m_progress->totalSteps() + 1 ); addItemToSize( item ); itemCountChanged(); } @@ -2348,14 +2348,14 @@ MediaQueue::addURL( const KURL &url, MediaItem *item ) TQString text = item->bundle()->prettyTitle(); if( text.isEmpty() || (!item->bundle()->isValidMedia() && !item->bundle()->podcastBundle()) ) text = item->bundle()->url().prettyURL(); - if( item->m_playlistName != TQString::null ) + if( item->m_playlistName != TQString() ) { text += " (" + item->m_playlistName + ')'; } newitem->setText( 0, text); newitem->setBundle( bundle ); - m_parent->updateButtons(); - m_parent->m_progress->setTotalSteps( m_parent->m_progress->totalSteps() + 1 ); + m_tqparent->updateButtons(); + m_tqparent->m_progress->setTotalSteps( m_tqparent->m_progress->totalSteps() + 1 ); addItemToSize( item ); itemCountChanged(); @@ -2374,13 +2374,13 @@ MediaQueue::addURLs( const KURL::List urls, const TQString &playlistName ) void MediaQueue::URLsAdded() { - m_parent->updateStats(); - m_parent->updateButtons(); - if( m_parent->currentDevice() - && m_parent->currentDevice()->isConnected() - && m_parent->currentDevice()->asynchronousTransfer() - && !m_parent->currentDevice()->isTransferring() ) - m_parent->currentDevice()->transferFiles(); + m_tqparent->updateStats(); + m_tqparent->updateButtons(); + if( m_tqparent->currentDevice() + && m_tqparent->currentDevice()->isConnected() + && m_tqparent->currentDevice()->asynchronousTransfer() + && !m_tqparent->currentDevice()->isTransferring() ) + m_tqparent->currentDevice()->transferFiles(); save( Amarok::saveLocation() + "transferlist.xml" ); } @@ -2411,12 +2411,12 @@ MediaQueue::dragObject() return md; } -QString +TQString MediaDevice::replaceVariables( const TQString &cmd ) { TQString result = cmd; - result.replace( "%d", deviceNode() ); - result.replace( "%m", mountPoint() ); + result.tqreplace( "%d", deviceNode() ); + result.tqreplace( "%m", mountPoint() ); return result; } @@ -2453,7 +2453,7 @@ int MediaDevice::sysCall( const TQString &command ) sysProc->clearArguments(); (*sysProc) << command; if (!sysProc->start( KProcess::Block, KProcess::AllOutput )) - kdFatal() << i18n("could not execute %1").arg(command.local8Bit().data()) << endl; + kdFatal() << i18n("could not execute %1").tqarg(command.local8Bit().data()) << endl; return (sysProc->exitStatus()); } @@ -2490,7 +2490,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst ) else { usleep(10000); - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); } } @@ -2501,7 +2501,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst ) tryToRemove = true; Amarok::StatusBar::instance()->longMessage( i18n( "Media Device: Copying %1 to %2 failed" ) - .arg( src.prettyURL(), dst.prettyURL() ), + .tqarg( src.prettyURL(), dst.prettyURL() ), KDE::StatusBar::Error ); } else @@ -2512,7 +2512,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst ) tryToRemove = true; // probably s.th. went wrong Amarok::StatusBar::instance()->longMessage( - i18n( "Media Device: Reading tags from %1 failed" ).arg( dst.prettyURL() ), + i18n( "Media Device: Reading tags from %1 failed" ).tqarg( dst.prettyURL() ), KDE::StatusBar::Error ); } } @@ -2662,8 +2662,8 @@ MediaDevice::connectDevice( bool silent ) { MediaBrowser::instance()->activateDevice( this ); } - m_parent->updateStats(); - m_parent->updateButtons(); + m_tqparent->updateStats(); + m_tqparent->updateButtons(); if( !isConnected() ) { @@ -2686,7 +2686,7 @@ MediaDevice::connectDevice( bool silent ) if(numFiles > 0) { - m_parent->m_stats->setText( i18n( "1 track to be deleted", "%n tracks to be deleted", numFiles ) ); + m_tqparent->m_stats->setText( i18n( "1 track to be deleted", "%n tracks to be deleted", numFiles ) ); setProgress( 0, numFiles ); @@ -2708,9 +2708,9 @@ MediaDevice::connectDevice( bool silent ) synchronizeDevice(); - TQTimer::singleShot( 1500, m_parent->m_progressBox, TQT_SLOT(hide()) ); - m_parent->queue()->computeSize(); - m_parent->updateStats(); + TQTimer::singleShot( 1500, m_tqparent->m_progressBox, TQT_SLOT(hide()) ); + m_tqparent->queue()->computeSize(); + m_tqparent->updateStats(); } } unlockDevice(); @@ -2725,7 +2725,7 @@ MediaDevice::connectDevice( bool silent ) Amarok::StatusBar::instance()->shortMessage( i18n( "Device successfully connected" ) ); - m_parent->updateDevices(); + m_tqparent->updateDevices(); return true; } @@ -2756,7 +2756,7 @@ MediaDevice::disconnectDevice( bool postDisconnectHook ) closeDevice(); unlockDevice(); - m_parent->updateStats(); + m_tqparent->updateStats(); bool result = true; if( postDisconnectHook && runPostDisconnectCommand() != 0 ) @@ -2769,7 +2769,7 @@ MediaDevice::disconnectDevice( bool postDisconnectHook ) else Amarok::StatusBar::instance()->shortMessage( i18n( "Device successfully disconnected" ) ); - m_parent->updateDevices(); + m_tqparent->updateDevices(); return result; } @@ -2783,14 +2783,14 @@ MediaDevice::syncStatsFromDevice( MediaItem *root ) it = static_cast<MediaItem *>( root->firstChild() ); } - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); for( ; it; it = static_cast<MediaItem *>( it->nextSibling() ) ) { switch( it->type() ) { case MediaItem::TRACK: - if( !it->parent() || static_cast<MediaItem *>( it->parent() )->type() != MediaItem::PLAYLIST ) + if( !it->tqparent() || static_cast<MediaItem *>( it->tqparent() )->type() != MediaItem::PLAYLIST ) { const MetaBundle *bundle = it->bundle(); for( int i=0; i<it->recentlyPlayed(); i++ ) @@ -2808,7 +2808,7 @@ MediaDevice::syncStatsFromDevice( MediaItem *root ) // increase Amarok playcount TQString url = CollectionDB::instance()->getURL( *bundle ); - if( url != TQString::null ) + if( url != TQString() ) { TQDateTime t = it->playTime(); CollectionDB::instance()->addSongPercentage( url, 100, "mediadevice", t.isValid() ? &t : 0 ); @@ -2821,7 +2821,7 @@ MediaDevice::syncStatsFromDevice( MediaItem *root ) // copy rating from media device to Amarok TQString url = CollectionDB::instance()->getURL( *bundle ); debug() << "rating changed " << url << ": " << it->rating()/10 << endl; - if( url != TQString::null ) + if( url != TQString() ) { CollectionDB::instance()->setSongRating( url, it->rating()/10 ); it->setRating( it->rating() ); // prevent setting it again next time @@ -2830,7 +2830,7 @@ MediaDevice::syncStatsFromDevice( MediaItem *root ) } break; case MediaItem::PODCASTITEM: - if( !it->parent() || static_cast<MediaItem *>( it->parent() )->type() != MediaItem::PLAYLIST ) + if( !it->tqparent() || static_cast<MediaItem *>( it->tqparent() )->type() != MediaItem::PLAYLIST ) { const MetaBundle *bundle = it->bundle(); if( it->played() || it->recentlyPlayed() ) @@ -2840,11 +2840,11 @@ MediaDevice::syncStatsFromDevice( MediaItem *root ) debug() << "marking podcast episode as played: " << peb->url() << endl; if( PlaylistBrowser::instance() ) { - PodcastEpisode *p = PlaylistBrowser::instance()->findPodcastEpisode( peb->url(), peb->parent() ); + PodcastEpisode *p = PlaylistBrowser::instance()->findPodcastEpisode( peb->url(), peb->tqparent() ); if ( p ) p->setListened(); else - debug() << "did not find podcast episode: " << peb->url() << " from " << peb->parent() << endl; + debug() << "did not find podcast episode: " << peb->url() << " from " << peb->tqparent() << endl; } } } @@ -2885,14 +2885,14 @@ MediaDevice::syncStatsToDevice( MediaItem *root ) it = static_cast<MediaItem *>( root->firstChild() ); } - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); for( ; it; it = static_cast<MediaItem *>( it->nextSibling() ) ) { switch( it->type() ) { case MediaItem::TRACK: - if( !it->parent() || static_cast<MediaItem *>( it->parent() )->type() != MediaItem::PLAYLIST ) + if( !it->tqparent() || static_cast<MediaItem *>( it->tqparent() )->type() != MediaItem::PLAYLIST ) { const MetaBundle *bundle = it->bundle(); TQString url = CollectionDB::instance()->getURL( *bundle ); @@ -2901,14 +2901,14 @@ MediaDevice::syncStatsToDevice( MediaItem *root ) break; case MediaItem::PODCASTITEM: - if( !it->parent() || static_cast<MediaItem *>( it->parent() )->type() != MediaItem::PLAYLIST ) + if( !it->tqparent() || static_cast<MediaItem *>( it->tqparent() )->type() != MediaItem::PLAYLIST ) { const MetaBundle *bundle = it->bundle(); if( PodcastEpisodeBundle *peb = bundle->podcastBundle() ) { if( PlaylistBrowser::instance() ) { - PodcastEpisode *p = PlaylistBrowser::instance()->findPodcastEpisode( peb->url(), peb->parent() ); + PodcastEpisode *p = PlaylistBrowser::instance()->findPodcastEpisode( peb->url(), peb->tqparent() ); if( p ) it->setListened( !p->isNew() ); } @@ -2934,16 +2934,16 @@ MediaDevice::transferFiles() setCanceled( false ); m_transferring = true; - m_parent->m_toolbar->getButton(MediaBrowser::TRANSFER)->setEnabled( false ); + m_tqparent->m_toolbar->getButton(MediaBrowser::TRANSFER)->setEnabled( false ); - setProgress( 0, m_parent->m_queue->childCount() ); + setProgress( 0, m_tqparent->m_queue->childCount() ); // ok, let's copy the stuff to the device KURL::List existing, unplayable; unsigned transcodeFail = 0; // iterate through items - MediaItem *next = static_cast<MediaItem *>(m_parent->m_queue->firstChild()); + MediaItem *next = static_cast<MediaItem *>(m_tqparent->m_queue->firstChild()); while( next ) { MediaItem *transferredItem = next; @@ -2954,11 +2954,11 @@ MediaDevice::transferFiles() if( transferredItem->device() ) { transferredItem->device()->copyTrackFromDevice( transferredItem ); - m_parent->m_queue->subtractItemFromSize( transferredItem, true ); + m_tqparent->m_queue->subtractItemFromSize( transferredItem, true ); delete transferredItem; setProgress( progress() + 1 ); - m_parent->m_queue->itemCountChanged(); - kapp->processEvents( 100 ); + m_tqparent->m_queue->itemCountChanged(); + kapp->tqprocessEvents( 100 ); continue; } @@ -2976,9 +2976,9 @@ MediaDevice::transferFiles() { // this should not happen debug() << "invalid item in transfer queue" << endl; - m_parent->m_queue->subtractItemFromSize( transferredItem, true ); + m_tqparent->m_queue->subtractItemFromSize( transferredItem, true ); delete transferredItem; - m_parent->m_queue->itemCountChanged(); + m_tqparent->m_queue->itemCountChanged(); continue; } @@ -3051,7 +3051,7 @@ MediaDevice::transferFiles() if( !isPlayable( *bundle ) ) { - Amarok::StatusBar::instance()->shortMessage( i18n( "Track not playable on media device: %1" ).arg( bundle->url().path() ), + Amarok::StatusBar::instance()->shortMessage( i18n( "Track not playable on media device: %1" ).tqarg( bundle->url().path() ), KDE::StatusBar::Sorry ); unplayable += (*it).url(); transferredItem->setFailed(); @@ -3071,7 +3071,7 @@ MediaDevice::transferFiles() if( !isCanceled() ) { Amarok::StatusBar::instance()->longMessage( - i18n( "Failed to copy track to media device: %1" ).arg( bundle->url().path() ), + i18n( "Failed to copy track to media device: %1" ).tqarg( bundle->url().path() ), KDE::StatusBar::Sorry ); transferredItem->setFailed(); } @@ -3120,19 +3120,19 @@ MediaDevice::transferFiles() if( isCanceled() ) { - m_parent->updateStats(); + m_tqparent->updateStats(); break; } if( !(transferredItem->flags() & MediaItem::Failed) ) { - m_parent->m_queue->subtractItemFromSize( transferredItem, true ); + m_tqparent->m_queue->subtractItemFromSize( transferredItem, true ); delete transferredItem; - m_parent->m_queue->itemCountChanged(); + m_tqparent->m_queue->itemCountChanged(); } - m_parent->updateStats(); + m_tqparent->updateStats(); - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); } synchronizeDevice(); unlockDevice(); @@ -3189,8 +3189,8 @@ MediaDevice::transferFiles() Amarok::StatusBar::instance()->shortMessage( msg, KDE::StatusBar::Sorry ); } - m_parent->updateButtons(); - m_parent->queue()->save( Amarok::saveLocation() + "transferlist.xml" ); + m_tqparent->updateButtons(); + m_tqparent->queue()->save( Amarok::saveLocation() + "transferlist.xml" ); m_transferring = false; if( m_deferredDisconnect ) @@ -3208,24 +3208,24 @@ MediaDevice::transferFiles() int MediaDevice::progress() const { - return m_parent->m_progress->progress(); + return m_tqparent->m_progress->progress(); } void MediaDevice::setProgress( const int progress, const int total ) { if( total != -1 ) - m_parent->m_progress->setTotalSteps( total ); - m_parent->m_progress->setProgress( progress ); - m_parent->m_progressBox->show(); + m_tqparent->m_progress->setTotalSteps( total ); + m_tqparent->m_progress->setProgress( progress ); + m_tqparent->m_progressBox->show(); } void MediaDevice::fileTransferFinished() //SLOT { - m_parent->updateStats(); - m_parent->m_progressBox->hide(); - m_parent->m_toolbar->getButton(MediaBrowser::TRANSFER)->setEnabled( isConnected() && m_parent->queue()->childCount() > 0 ); + m_tqparent->updateStats(); + m_tqparent->m_progressBox->hide(); + m_tqparent->m_toolbar->getButton(MediaBrowser::TRANSFER)->setEnabled( isConnected() && m_tqparent->queue()->childCount() > 0 ); m_wait = false; } @@ -3249,21 +3249,21 @@ MediaDevice::deleteFromDevice(MediaItem *item, int flags ) //NOTE we assume that currentItem is the main target int numFiles = m_view->getSelectedLeaves(item, &list, MediaView::OnlySelected | ((flags & OnlyPlayed) ? MediaView::OnlyPlayed : MediaView::None) ); - m_parent->m_stats->setText( i18n( "1 track to be deleted", "%n tracks to be deleted", numFiles ) ); + m_tqparent->m_stats->setText( i18n( "1 track to be deleted", "%n tracks to be deleted", numFiles ) ); if( numFiles > 0 && (flags & DeleteTrack) ) { - int button = KMessageBox::warningContinueCancel( m_parent, + int button = KMessageBox::warningContinueCancel( m_tqparent, i18n( "<p>You have selected 1 track to be <b>irreversibly</b> deleted.", "<p>You have selected %n tracks to be <b>irreversibly</b> deleted.", numFiles ), - TQString::null, + TQString(), KGuiItem(i18n("&Delete"),"editdelete") ); if ( button != KMessageBox::Continue ) { - m_parent->queue()->computeSize(); - m_parent->updateStats(); + m_tqparent->queue()->computeSize(); + m_tqparent->updateStats(); m_deleting = false; unlockDevice(); return 0; @@ -3315,7 +3315,7 @@ MediaDevice::deleteFromDevice(MediaItem *item, int flags ) count = -1; } } - m_parent->updateStats(); + m_tqparent->updateStats(); fi = next; } @@ -3329,7 +3329,7 @@ MediaDevice::deleteFromDevice(MediaItem *item, int flags ) if(!isTransferring()) { - TQTimer::singleShot( 1500, m_parent->m_progressBox, TQT_SLOT(hide()) ); + TQTimer::singleShot( 1500, m_tqparent->m_progressBox, TQT_SLOT(hide()) ); } if( m_deferredDisconnect ) @@ -3338,8 +3338,8 @@ MediaDevice::deleteFromDevice(MediaItem *item, int flags ) disconnectDevice( m_runDisconnectHook ); } } - m_parent->queue()->computeSize(); - m_parent->updateStats(); + m_tqparent->queue()->computeSize(); + m_tqparent->updateStats(); return count; } @@ -3448,7 +3448,7 @@ MediaQueue::save( const TQString &path ) i.appendChild( attr ); attr = newdoc.createElement( "PodcastRSS" ); - t = newdoc.createTextNode( peb->parent().url() ); + t = newdoc.createTextNode( peb->tqparent().url() ); attr.appendChild( t ); i.appendChild( attr ); @@ -3458,7 +3458,7 @@ MediaQueue::save( const TQString &path ) i.appendChild( attr ); } - if(item->m_playlistName != TQString::null) + if(item->m_playlistName != TQString()) { i.setAttribute( "playlist", item->m_playlistName ); } @@ -3584,8 +3584,8 @@ MediaDevice::isPlayable( const MetaBundle &bundle ) if( supportedFiletypes().isEmpty() ) return true; - TQString type = bundle.url().path().section( ".", -1 ).lower(); - return supportedFiletypes().contains( type ); + TQString type = TQString(bundle.url().path().section( ".", -1 )).lower(); + return supportedFiletypes().tqcontains( type ); } bool @@ -3594,13 +3594,13 @@ MediaDevice::isPreferredFormat( const MetaBundle &bundle ) if( supportedFiletypes().isEmpty() ) return true; - TQString type = bundle.url().path().section( ".", -1 ).lower(); + TQString type = TQString(bundle.url().path().section( ".", -1 )).lower(); return ( type == supportedFiletypes().first() ); } -MediaQueue::MediaQueue(MediaBrowser *parent) - : KListView( parent ), m_parent( parent ) +MediaQueue::MediaQueue(MediaBrowser *tqparent) + : KListView( tqparent ), m_tqparent( tqparent ) { setFixedHeight( 200 ); setSelectionMode( TQListView::Extended ); @@ -3619,7 +3619,7 @@ MediaQueue::MediaQueue(MediaBrowser *parent) itemCountChanged(); KActionCollection* ac = new KActionCollection( this ); - KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "MediaQueue" ); + KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "MediaQueue" ); connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), TQT_SLOT( slotShowContextMenu( TQListViewItem*, const TQPoint&, int ) ) ); @@ -3640,7 +3640,7 @@ MediaQueue::acceptDrag( TQDropEvent *e ) const } void -MediaQueue::slotDropped( TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after) +MediaQueue::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after) { if( e->source() != viewport() ) { @@ -3664,7 +3664,7 @@ MediaQueue::slotDropped( TQDropEvent* e, TQListViewItem* parent, TQListViewItem* } else if( TQListViewItem *i = currentItem() ) { - moveItem( i, parent, after ); + moveItem( i, tqparent, after ); } } @@ -3699,9 +3699,9 @@ MediaQueue::computeSize() const MediaItem *item = static_cast<MediaItem *>(it); if( item && item->bundle() && - ( !m_parent->currentDevice() - || !m_parent->currentDevice()->isConnected() - || !m_parent->currentDevice()->trackExists(*item->bundle()) ) ) + ( !m_tqparent->currentDevice() + || !m_tqparent->currentDevice()->isConnected() + || !m_tqparent->currentDevice()->trackExists(*item->bundle()) ) ) m_totalSize += ((item->size()+1023)/1024)*1024; } } @@ -3716,9 +3716,9 @@ void MediaQueue::addItemToSize( const MediaItem *item ) const { if( item && item->bundle() && - ( !m_parent->currentDevice() - || !m_parent->currentDevice()->isConnected() - || !m_parent->currentDevice()->trackExists(*item->bundle()) ) ) + ( !m_tqparent->currentDevice() + || !m_tqparent->currentDevice()->isConnected() + || !m_tqparent->currentDevice()->trackExists(*item->bundle()) ) ) m_totalSize += ((item->size()+1023)/1024)*1024; } @@ -3726,9 +3726,9 @@ void MediaQueue::subtractItemFromSize( const MediaItem *item, bool unconditionally ) const { if( item && item->bundle() && - ( !m_parent->currentDevice() - || !m_parent->currentDevice()->isConnected() - || (unconditionally || !m_parent->currentDevice()->trackExists(*item->bundle())) ) ) + ( !m_tqparent->currentDevice() + || !m_tqparent->currentDevice()->isConnected() + || (unconditionally || !m_tqparent->currentDevice()->trackExists(*item->bundle())) ) ) m_totalSize -= ((item->size()+1023)/1024)*1024; } @@ -3743,7 +3743,7 @@ MediaQueue::removeSelected() { subtractItemFromSize( static_cast<MediaItem *>(item) ); delete item; - if( m_parent->currentDevice() && m_parent->currentDevice()->isTransferring() ) + if( m_tqparent->currentDevice() && m_tqparent->currentDevice()->isTransferring() ) { MediaBrowser::instance()->m_progress->setTotalSteps( MediaBrowser::instance()->m_progress->totalSteps() - 1 ); } @@ -3812,11 +3812,11 @@ MediaQueue::clearItems() { clear(); itemCountChanged(); - if(m_parent) + if(m_tqparent) { computeSize(); - m_parent->updateStats(); - m_parent->updateButtons(); + m_tqparent->updateStats(); + m_tqparent->updateButtons(); } } diff --git a/amarok/src/mediabrowser.h b/amarok/src/mediabrowser.h index d8837dea..bffb7616 100644 --- a/amarok/src/mediabrowser.h +++ b/amarok/src/mediabrowser.h @@ -46,10 +46,10 @@ class TQPalette; class LIBAMAROK_EXPORT MediaItem : public KListViewItem { public: - MediaItem( TQListView* parent ); - MediaItem( TQListViewItem* parent ); - MediaItem( TQListView* parent, TQListViewItem* after ); - MediaItem( TQListViewItem* parent, TQListViewItem* after ); + MediaItem( TQListView* tqparent ); + MediaItem( TQListViewItem* tqparent ); + MediaItem( TQListView* tqparent, TQListViewItem* after ); + MediaItem( TQListViewItem* tqparent, TQListViewItem* after ); void init(); virtual ~MediaItem(); @@ -125,9 +125,10 @@ class LIBAMAROK_EXPORT MediaItem : public KListViewItem class MediaQueue : public KListView, public DropProxyTarget { Q_OBJECT + TQ_OBJECT public: - MediaQueue(MediaBrowser *parent); + MediaQueue(MediaBrowser *tqparent); MediaItem *findPath( TQString path ); KIO::filesize_t totalSize() const; // total size of items to transfer in KB @@ -142,9 +143,9 @@ class MediaQueue : public KListView, public DropProxyTarget void save( const TQString &path ); void syncPlaylist( const TQString &playlistName, const TQString &sql, bool loading=false ); void syncPlaylist( const TQString &playlistName, const KURL &url, bool loading=false ); - void addURL( const KURL& url, MetaBundle *bundle=NULL, const TQString &playlistName=TQString::null ); + void addURL( const KURL& url, MetaBundle *bundle=NULL, const TQString &playlistName=TQString() ); void addURL( const KURL& url, MediaItem *item ); - void addURLs( const KURL::List urls, const TQString &playlistName=TQString::null ); + void addURLs( const KURL::List urls, const TQString &playlistName=TQString() ); void URLsAdded(); // call after finishing adding single urls @@ -159,18 +160,19 @@ class MediaQueue : public KListView, public DropProxyTarget private slots: void selectAll() {TQListView::selectAll(true); } void slotShowContextMenu( TQListViewItem* item, const TQPoint& point, int ); - void slotDropped (TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after); + void slotDropped (TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after); private: void keyPressEvent( TQKeyEvent *e ); - MediaBrowser *m_parent; + MediaBrowser *m_tqparent; mutable KIO::filesize_t m_totalSize; }; -class MediaBrowser : public QVBox +class MediaBrowser : public TQVBox { Q_OBJECT + TQ_OBJECT friend class DeviceConfigureDialog; friend class MediaDevice; friend class MediaView; @@ -278,6 +280,7 @@ class MediaBrowser : public QVBox class MediaView : public KListView { Q_OBJECT + TQ_OBJECT friend class MediaBrowser; friend class MediaDevice; @@ -289,12 +292,12 @@ class MediaView : public KListView OnlyPlayed = 2 }; - MediaView( TQWidget *parent, MediaDevice *device ); + MediaView( TQWidget *tqparent, MediaDevice *device ); virtual ~MediaView(); LIBAMAROK_EXPORT KURL::List nodeBuildDragList( MediaItem* item, int flags=OnlySelected ); - int getSelectedLeaves(MediaItem *parent, TQPtrList<MediaItem> *list, int flags=OnlySelected ); - LIBAMAROK_EXPORT MediaItem *newDirectory( MediaItem* parent ); - bool setFilter( const TQString &filter, MediaItem *parent=NULL ); + int getSelectedLeaves(MediaItem *tqparent, TQPtrList<MediaItem> *list, int flags=OnlySelected ); + LIBAMAROK_EXPORT MediaItem *newDirectory( MediaItem* tqparent ); + bool setFilter( const TQString &filter, MediaItem *tqparent=NULL ); private slots: void rmbPressed( TQListViewItem*, const TQPoint&, int ); @@ -312,7 +315,7 @@ class MediaView : public KListView bool acceptDrag( TQDropEvent *e ) const; TQDragObject *dragObject(); - TQWidget *m_parent; + TQWidget *m_tqparent; MediaDevice *m_device; MediaItemTip *m_toolTip; }; @@ -325,6 +328,7 @@ class MediaView : public KListView class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin { Q_OBJECT + TQ_OBJECT friend class DeviceConfigureDialog; friend class TransferDialog; friend class MediaBrowser; @@ -341,7 +345,7 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin }; MediaDevice(); - virtual void init( MediaBrowser* parent ); + virtual void init( MediaBrowser* tqparent ); virtual ~MediaDevice(); MediaView *view(); @@ -378,7 +382,7 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin /** * Adds particular tracks to a playlist - * @param playlist parent playlist for tracks to be added to + * @param playlist tqparent playlist for tracks to be added to * @param after insert following this item * @param items tracks to add to playlist */ @@ -387,15 +391,15 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin /** * Create a new playlist * @param name playlist title - * @param parent parent MediaItem of the new playlist + * @param tqparent tqparent MediaItem of the new playlist * @param items tracks to add to the new playlist * @return the newly created playlist */ - virtual MediaItem *newPlaylist(const TQString &name, MediaItem *parent, TQPtrList<MediaItem> items) { Q_UNUSED(name); Q_UNUSED(parent); Q_UNUSED(items); return 0; } + virtual MediaItem *newPlaylist(const TQString &name, MediaItem *tqparent, TQPtrList<MediaItem> items) { Q_UNUSED(name); Q_UNUSED(tqparent); Q_UNUSED(items); return 0; } /** * Move items to a directory - * @param directory new parent of dropped items + * @param directory new tqparent of dropped items * @param items tracks to add to the directory */ virtual void addToDirectory( MediaItem *directory, TQPtrList<MediaItem> items ) { Q_UNUSED(directory); Q_UNUSED(items); } @@ -403,11 +407,11 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin /** * Create a new directory * @param name directory title - * @param parent parent MediaItem of the new directory + * @param tqparent tqparent MediaItem of the new directory * @param items tracks to add to the new directory * @return the newly created directory */ - virtual MediaItem *newDirectory( const TQString &name, MediaItem *parent ) { Q_UNUSED(name); Q_UNUSED(parent); return 0; } + virtual MediaItem *newDirectory( const TQString &name, MediaItem *tqparent ) { Q_UNUSED(name); Q_UNUSED(tqparent); return 0; } /** * Notify device of changed tags @@ -440,12 +444,12 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin */ virtual bool needsManualConfig() { return true; } - virtual void addConfigElements( TQWidget * /*parent*/ ) {} - virtual void removeConfigElements( TQWidget * /*parent*/ ) {} + virtual void addConfigElements( TQWidget * /*tqparent*/ ) {} + virtual void removeConfigElements( TQWidget * /*tqparent*/ ) {} virtual void applyConfig() {} virtual void loadConfig(); - TQString configString( const TQString &name, const TQString &defValue = TQString::null ); + TQString configString( const TQString &name, const TQString &defValue = TQString() ); void setConfigString( const TQString &name, const TQString &value ); bool configBool( const TQString &name, bool defValue=false ); void setConfigBool( const TQString &name, bool value ); @@ -528,7 +532,7 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin int sysCall(const TQString & command); int runPreConnectCommand(); int runPostDisconnectCommand(); - TQString replaceVariables( const TQString &cmd ); // replace %m with mount point and %d with device node + TQString replaceVariables( const TQString &cmd ); // tqreplace %m with mount point and %d with device node /** * Find a particular track @@ -626,7 +630,7 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin bool m_transcodeRemove; KShellProcess *sysProc; - MediaBrowser *m_parent; + MediaBrowser *m_tqparent; MediaView *m_view; Medium m_medium; TQString m_transferDir; diff --git a/amarok/src/mediadevice/daap/addhostbase.ui b/amarok/src/mediadevice/daap/addhostbase.ui index 5a57d996..e0d9ba62 100644 --- a/amarok/src/mediadevice/daap/addhostbase.ui +++ b/amarok/src/mediadevice/daap/addhostbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AddHostBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AddHostBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,15 +22,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_downloadPixmap</cstring> </property> @@ -42,7 +42,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>64</width> <height>64</height> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>130</height> @@ -93,15 +93,15 @@ </spacer> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -124,14 +124,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -170,7 +170,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults 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 b90d7a99..97d51e6c 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"}, - :parentcontainerid=>{:datatype=>:long, :code=>"mpco"}, + :tqparentcontainerid=>{: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.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" +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" diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp index ace95233..9d615e4c 100644 --- a/amarok/src/mediadevice/daap/daapclient.cpp +++ b/amarok/src/mediadevice/daap/daapclient.cpp @@ -151,7 +151,7 @@ DaapClient::openDevice(bool /* silent=false */) { TQStringList current = TQStringList::split(":", (*it) ); TQString host = current.first(); - Q_UINT16 port = current.last().toInt(); + TQ_UINT16 port = current.last().toInt(); TQString ip = resolve( host ); if( ip != "0" ) { @@ -227,7 +227,7 @@ DaapClient::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) { DEBUG_BLOCK - enum Actions { APPEND, LOAD, QUEUE, INFO, CONNECT, REMOVE, DOWNLOAD }; + enum Actions { APPEND, LOAD, TQUEUE, INFO, CONNECT, REMOVE, DOWNLOAD }; MediaItem *item = dynamic_cast<MediaItem *>(qitem); ServerItem* sitem = dynamic_cast<ServerItem *>(qitem); @@ -241,7 +241,7 @@ DaapClient::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) { case MediaItem::DIRECTORY: menu.insertItem( SmallIconSet( "connect_creating" ), i18n( "&Connect" ), CONNECT ); - if( sitem && !m_serverItemMap.contains( sitem->key() ) ) + if( sitem && !m_serverItemMap.tqcontains( sitem->key() ) ) { menu.insertItem( SmallIconSet( "remove" ), i18n("&Remove Computer"), REMOVE ); } @@ -258,7 +258,7 @@ DaapClient::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) urls = m_view->nodeBuildDragList( 0 ); menu.insertItem( SmallIconSet( Amarok::icon( "playlist" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), QUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), TQUEUE ); menu.insertSeparator(); menu.insertItem( SmallIconSet( Amarok::icon( "playlist" ) ), i18n( "&Copy Files to Collection..." ), DOWNLOAD ); @@ -286,7 +286,7 @@ DaapClient::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) case APPEND: Playlist::instance()->insertMedia( urls, Playlist::Append ); break; - case QUEUE: + case TQUEUE: Playlist::instance()->insertMedia( urls, Playlist::Queue ); break; case INFO: @@ -328,7 +328,7 @@ DaapClient::serverOffline( DNSSD::RemoteService::Ptr service ) #if DNSSD_SUPPORT DEBUG_BLOCK TQString key = serverKey( service.data() ); - if( m_serverItemMap.contains( key ) ) + if( m_serverItemMap.tqcontains( key ) ) { ServerItem* removeMe = m_serverItemMap[ key ]; if( removeMe ) @@ -346,7 +346,7 @@ DaapClient::serverOffline( DNSSD::RemoteService::Ptr service ) } #if DNSSD_SUPPORT -QString +TQString DaapClient::serverKey( const DNSSD::RemoteService* service ) const { return ServerItem::key( service->hostName(), service->port() ); @@ -374,7 +374,7 @@ DaapClient::resolvedDaap( bool success ) debug() << service->serviceName() << ' ' << service->hostName() << ' ' << service->domain() << ' ' << service->type() << endl; TQString ip = resolve( service->hostName() ); - if( ip == "0" || m_serverItemMap.contains(serverKey( service )) ) //same server from multiple interfaces + if( ip == "0" || m_serverItemMap.tqcontains(serverKey( service )) ) //same server from multiple interfaces return; m_serverItemMap[ serverKey( service ) ] = newHost( service->serviceName(), service->hostName(), ip, service->port() ); @@ -403,37 +403,37 @@ DaapClient::createTree( const TQString& /*host*/, Daap::SongList bundles ) TQStringList artists = bundles.keys(); foreach( artists ) { - MediaItem* parentArtist = new MediaItem( root ); - parentArtist->setType( MediaItem::ARTIST ); - Daap::AlbumList albumMap = *( bundles.find(*it) ); - parentArtist->setText( 0, (*albumMap.begin()).getFirst()->artist() ); //map was made case insensitively + MediaItem* tqparentArtist = new MediaItem( root ); + tqparentArtist->setType( MediaItem::ARTIST ); + Daap::AlbumList albumMap = *( bundles.tqfind(*it) ); + tqparentArtist->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* parentAlbum = new MediaItem( parentArtist ); - parentAlbum->setType( MediaItem::ALBUM ); + MediaItem* tqparentAlbum = new MediaItem( tqparentArtist ); + tqparentAlbum->setType( MediaItem::ALBUM ); MetaBundle* track; - Daap::TrackList trackList = *albumMap.find(*itAlbum); - parentAlbum->setText( 0, trackList.getFirst()->album() ); + Daap::TrackList trackList = *albumMap.tqfind(*itAlbum); + tqparentAlbum->setText( 0, trackList.getFirst()->album() ); for( track = trackList.first(); track; track = trackList.next() ) { if( m_removeDuplicates && trackExistsInCollection( track ) ) continue; - MediaItem* childTrack = new MediaItem( parentAlbum ); + MediaItem* childTrack = new MediaItem( tqparentAlbum ); childTrack->setText( 0, track->title() ); childTrack->setType( MediaItem::TRACK ); childTrack->setBundle( track ); childTrack->m_order = track->track(); } - if( !parentAlbum->childCount() ) - delete parentAlbum; + if( !tqparentAlbum->childCount() ) + delete tqparentAlbum; } - if( !parentArtist->childCount() ) - delete parentArtist; + if( !tqparentArtist->childCount() ) + delete tqparentArtist; } root->resetTitle(); root->stopAnimation(); @@ -443,7 +443,7 @@ DaapClient::createTree( const TQString& /*host*/, Daap::SongList bundles ) int DaapClient::incRevision( const TQString& host ) { - if( m_servers.contains(host) ) + if( m_servers.tqcontains(host) ) { m_servers[host]->revisionID++; return m_servers[host]->revisionID; @@ -455,7 +455,7 @@ DaapClient::incRevision( const TQString& host ) int DaapClient::getSession( const TQString& host ) { - if( m_servers.contains(host) ) + if( m_servers.tqcontains(host) ) return m_servers[host]->sessionId; else return -1; @@ -468,8 +468,8 @@ DaapClient::customClicked() { public: - AddHostDialog( TQWidget *parent ) - : KDialogBase( parent, "DaapAddHostDialog", true, i18n( "Add Computer" ) , Ok|Cancel) + AddHostDialog( TQWidget *tqparent ) + : KDialogBase( tqparent, "DaapAddHostDialog", true, i18n( "Add Computer" ) , Ok|Cancel) { m_base = new AddHostBase( this, "DaapAddHostBase" ); m_base->m_downloadPixmap->setPixmap( TQPixmap( KGlobal::iconLoader()->iconPath( Amarok::icon( "download" ), -KIcon::SizeEnormous ) ) ); @@ -483,11 +483,11 @@ DaapClient::customClicked() if( dialog.exec() == TQDialog::Accepted ) { TQString ip = resolve( dialog.m_base->m_hostName->text() ); if( ip == "0" ) - Amarok::StatusBar::instance()->shortMessage( i18n("Could not resolve %1.").arg( dialog.m_base->m_hostName->text() ) ); + Amarok::StatusBar::instance()->shortMessage( i18n("Could not resolve %1.").tqarg( dialog.m_base->m_hostName->text() ) ); else { TQString key = ServerItem::key( dialog.m_base->m_hostName->text(), dialog.m_base->m_portInput->value() ); - if( !AmarokConfig::manuallyAddedServers().contains( key ) ) + if( !AmarokConfig::manuallyAddedServers().tqcontains( key ) ) { TQStringList mas = AmarokConfig::manuallyAddedServers(); mas.append( key ); @@ -499,7 +499,7 @@ DaapClient::customClicked() } ServerItem* -DaapClient::newHost( const TQString& serviceName, const TQString& host, const TQString& ip, const Q_INT16 port ) +DaapClient::newHost( const TQString& serviceName, const TQString& host, const TQString& ip, const TQ_INT16 port ) { if( ip.isEmpty() ) return 0; @@ -512,8 +512,8 @@ DaapClient::passwordPrompt() class PasswordDialog : public KDialogBase { public: - PasswordDialog( TQWidget *parent ) - : KDialogBase( parent, "PasswordDialog", true, i18n( "Password Required" ) , Ok|Cancel) + PasswordDialog( TQWidget *tqparent ) + : KDialogBase( tqparent, "PasswordDialog", true, i18n( "Password Required" ) , Ok|Cancel) { makeHBoxMainWidget(); @@ -559,7 +559,7 @@ DaapClient::passwordPrompt() callback->deleteLater(); } -QString +TQString DaapClient::resolve( const TQString& hostname ) { KNetwork::KResolver resolver( hostname ); @@ -601,12 +601,12 @@ DaapClient::trackExistsInCollection( MetaBundle *bundle ) /// Configuration Dialog Extension void -DaapClient::addConfigElements( TQWidget * parent ) +DaapClient::addConfigElements( TQWidget * tqparent ) { - m_broadcastServerCheckBox = new TQCheckBox( "Broadcast my music", parent ); + m_broadcastServerCheckBox = new TQCheckBox( "Broadcast my music", tqparent ); m_broadcastServerCheckBox->setChecked( m_broadcastServer ); - m_removeDuplicatesCheckBox = new TQCheckBox( "Hide songs in my collection", parent ); + m_removeDuplicatesCheckBox = new TQCheckBox( "Hide songs in my collection", tqparent ); m_removeDuplicatesCheckBox->setChecked( m_removeDuplicates ); TQToolTip::add( m_removeDuplicatesCheckBox, i18n( "Enabling this may reduce connection times" ) ); @@ -614,7 +614,7 @@ DaapClient::addConfigElements( TQWidget * parent ) void -DaapClient::removeConfigElements( TQWidget * /* parent */ ) +DaapClient::removeConfigElements( TQWidget * /* tqparent */ ) { if( m_broadcastServerCheckBox != 0 ) delete m_broadcastServerCheckBox; @@ -680,8 +680,8 @@ DEBUG_BLOCK // CLASS ServerItem //////////////////////////////////////////////////////////////////////////////// -ServerItem::ServerItem( TQListView* parent, DaapClient* client, const TQString& ip, Q_UINT16 port, const TQString& title, const TQString& host ) - : MediaItem( parent ) +ServerItem::ServerItem( TQListView* tqparent, DaapClient* client, const TQString& ip, TQ_UINT16 port, const TQString& title, const TQString& host ) + : MediaItem( tqparent ) , m_daapClient( client ) , m_reader( 0 ) , m_ip( ip ) @@ -735,10 +735,10 @@ ServerItem::setOpen( bool o ) startAnimation(); connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); - setText( 0, i18n( "Loading %1").arg( text( 0 ) ) ); + setText( 0, i18n( "Loading %1").tqarg( text( 0 ) ) ); Daap::Reader* reader = new Daap::Reader( m_ip, m_port, this, - TQString::null, m_daapClient, ( m_ip + ":3689" ).ascii() ); + TQString(), m_daapClient, ( m_ip + ":3689" ).ascii() ); setReader ( reader ); connect( reader, TQT_SIGNAL( daapBundles( const TQString&, Daap::SongList ) ), @@ -781,7 +781,7 @@ ServerItem::httpError( const TQString& errorString ) { stopAnimation(); resetTitle(); - Amarok::StatusBar::instance()->longMessage( i18n( "The following error occurred while trying to connect to the remote server:<br>%1").arg( errorString ) ); + Amarok::StatusBar::instance()->longMessage( i18n( "The following error occurred while trying to connect to the remote server:<br>%1").tqarg( errorString ) ); m_reader->deleteLater(); m_reader = 0; m_loaded = false; diff --git a/amarok/src/mediadevice/daap/daapclient.h b/amarok/src/mediadevice/daap/daapclient.h index 15dfe24c..a714fca8 100644 --- a/amarok/src/mediadevice/daap/daapclient.h +++ b/amarok/src/mediadevice/daap/daapclient.h @@ -29,7 +29,7 @@ #else namespace DNSSD { namespace RemoteService { - class Ptr {}; //HACK Dummy class, so that daapclient.moc compiles + class Ptr {}; //HACK Dummy class, so that daapclient.tqmoc compiles } } #endif @@ -52,6 +52,7 @@ class TQTimer; class DaapClient : public MediaDevice { Q_OBJECT + TQ_OBJECT public: struct ServerInfo { @@ -65,8 +66,8 @@ class DaapClient : public MediaDevice bool isConnected(); virtual bool needsManualConfig() { return true; } - virtual void addConfigElements ( TQWidget * /*parent*/ ); - virtual void removeConfigElements( TQWidget * /*parent*/ ); + virtual void addConfigElements ( TQWidget * /*tqparent*/ ); + virtual void removeConfigElements( TQWidget * /*tqparent*/ ); virtual void applyConfig(); virtual void loadConfig(); @@ -100,7 +101,7 @@ class DaapClient : public MediaDevice void broadcastButtonToggled(); private: - ServerItem* newHost( const TQString& serviceName, const TQString& host, const TQString& ip, const Q_INT16 port ); + ServerItem* newHost( const TQString& serviceName, const TQString& host, const TQString& ip, const TQ_INT16 port ); void downloadSongs( KURL::List urls ); TQString resolve( const TQString& hostname ); #if DNSSD_SUPPORT @@ -128,9 +129,10 @@ class DaapClient : public MediaDevice class ServerItem : public TQObject, public MediaItem { Q_OBJECT + TQ_OBJECT public: - ServerItem( TQListView* parent, DaapClient* client, const TQString& ip, Q_UINT16 port, const TQString& title, const TQString& host ); + ServerItem( TQListView* tqparent, DaapClient* client, const TQString& ip, TQ_UINT16 port, const TQString& title, const TQString& host ); ~ServerItem(); void setOpen( bool o ); void resetTitle() { setText( 0, m_title ); } @@ -143,7 +145,7 @@ class ServerItem : public TQObject, public MediaItem TQString key() const { return key( m_host, m_port ); } void reset(); - static TQString key( const TQString& host, Q_UINT16 port ) { return host + ':' + TQString::number( port ); } + static TQString key( const TQString& host, TQ_UINT16 port ) { return host + ':' + TQString::number( port ); } public slots: void httpError( const TQString& ); private slots: @@ -153,7 +155,7 @@ class ServerItem : public TQObject, public MediaItem DaapClient *m_daapClient; Daap::Reader *m_reader; const TQString m_ip; - const Q_UINT16 m_port; + const TQ_UINT16 m_port; const TQString m_title; const TQString m_host; bool m_loaded; @@ -168,6 +170,7 @@ class ServerItem : public TQObject, public MediaItem class DaapDownloader : public ThreadManager::Job { Q_OBJECT + TQ_OBJECT public: DaapDownloader( KURL::List urls ); diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp index 56b8874e..82033345 100644 --- a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp +++ b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp @@ -26,8 +26,8 @@ using namespace Daap; int ContentFetcher::s_requestId = 10; -ContentFetcher::ContentFetcher( const TQString & hostname, Q_UINT16 port, const TQString& password, TQObject * parent, const char * name ) - : TQHttp(hostname, port, parent, name) +ContentFetcher::ContentFetcher( const TQString & hostname, TQ_UINT16 port, const TQString& password, TQObject * tqparent, const char * name ) + : TQHttp(hostname, port, tqparent, name) , m_hostname( hostname ) , m_port( port ) , m_selfDestruct( false ) diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h index 9869063d..a890ec7d 100644 --- a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h +++ b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h @@ -25,12 +25,13 @@ namespace Daap { that DAAP needs @author Ian Monroe <ian@monroe.nu> */ -class ContentFetcher : public QHttp +class ContentFetcher : public TQHttp { Q_OBJECT + TQ_OBJECT public: - ContentFetcher( const TQString & hostname, Q_UINT16 port, const TQString& password, TQObject * parent = 0, const char * name = 0 ); + ContentFetcher( const TQString & hostname, TQ_UINT16 port, const TQString& password, TQObject * tqparent = 0, const char * name = 0 ); ~ContentFetcher(); void getDaap( const TQString & command, TQIODevice* musicFile = 0 ); @@ -44,7 +45,7 @@ class ContentFetcher : public QHttp private: TQString m_hostname; - Q_UINT16 m_port; + TQ_UINT16 m_port; TQCString m_authorize; bool m_selfDestruct; static int s_requestId; //! Apple needs this for some reason diff --git a/amarok/src/mediadevice/daap/daapreader/reader.cpp b/amarok/src/mediadevice/daap/daapreader/reader.cpp index 16d86979..179b724b 100644 --- a/amarok/src/mediadevice/daap/daapreader/reader.cpp +++ b/amarok/src/mediadevice/daap/daapreader/reader.cpp @@ -28,8 +28,8 @@ using namespace Daap; TQMap<TQString, Code> Reader::s_codes; -Reader::Reader(const TQString& host, Q_UINT16 port, ServerItem* root, const TQString& password, TQObject* parent, const char* name) - : TQObject(parent, name) +Reader::Reader(const TQString& host, TQ_UINT16 port, ServerItem* root, const TQString& password, TQObject* tqparent, const char* name) + : TQObject(tqparent, name) , m_host( host ) , m_port( port ) , m_sessionId( -1 ) @@ -122,7 +122,7 @@ Reader::Reader(const TQString& host, Q_UINT16 port, ServerItem* root, const TQSt 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.parentcontainerid", LONG ); + s_codes["mpco"] = Code( "dmap.tqparentcontainerid", LONG ); s_codes["msdc"] = Code( "dmap.databasescount", LONG ); s_codes["mlog"] = Code( "dmap.loginresponse", CONTAINER ); s_codes["mlid"] = Code( "dmap.sessionid", LONG ); @@ -258,7 +258,7 @@ Reader::databaseIdFinished( int /*id*/, bool error ) m_databaseId = TQString::number( dbIdResults["avdb"].asList()[0].asMap()["mlcl"].asList()[0].asMap()["mlit"].asList()[0].asMap()["miid"].asList()[0].asInt() ); connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( songListFinished( int, bool ) ) ); http->getDaap( TQString("/databases/%1/items?type=music&meta=dmap.itemid,dmap.itemname,daap.songformat,daap.songartist,daap.songalbum,daap.songtime,daap.songtracknumber,daap.songcomment,daap.songyear,daap.songgenre&%2") - .arg( m_databaseId, m_loginString ) ); + .tqarg( m_databaseId, m_loginString ) ); } @@ -285,7 +285,7 @@ Reader::songListFinished( int /*id*/, bool error ) MetaBundle* bundle = new MetaBundle(); bundle->setTitle( (*it).asMap()["minm"].asList()[0].toString() ); //input url: daap://host:port/databaseId/music.ext - bundle->setUrl( Amarok::QStringx("daap://%1:%2/%3/%4.%5").args( + bundle->setUrl( Amarok::TQStringx("daap://%1:%2/%3/%4.%5").args( TQStringList() << m_host << TQString::number( m_port ) << m_databaseId @@ -309,12 +309,12 @@ Reader::songListFinished( int /*id*/, bool error ) http->deleteLater(); } -Q_UINT32 +TQ_UINT32 Reader::getTagAndLength( TQDataStream &raw, char tag[5] ) { tag[4] = 0; raw.readRawBytes(tag, 4); - Q_UINT32 tagLength = 0; + TQ_UINT32 tagLength = 0; raw >> tagLength; return tagLength; } @@ -333,7 +333,7 @@ Reader::parse( TQDataStream &raw, uint containerLength, bool first ) { // debug() << "at index " << index << " of a total container size " << containerLength << endl; char tag[5]; - Q_UINT32 tagLength = getTagAndLength( raw, tag ); + TQ_UINT32 tagLength = getTagAndLength( raw, tag ); if( tagLength == 0 ) { // debug() << "tag " << tag << " has 0 length." << endl; @@ -345,25 +345,25 @@ Reader::parse( TQDataStream &raw, uint containerLength, bool first ) switch( s_codes[tag].type ) { case CHAR: { - Q_INT8 charData; + TQ_INT8 charData; raw >> charData; DEBUGTAG( charData ) addElement( childMap, tag, TQVariant( static_cast<int>(charData) ) ); } break; case SHORT: { - Q_INT16 shortData; + TQ_INT16 shortData; raw >> shortData; DEBUGTAG( shortData ) addElement( childMap, tag, TQVariant( static_cast<int>(shortData) ) ); } break; case LONG: { - Q_INT32 longData; + TQ_INT32 longData; raw >> longData; DEBUGTAG( longData ) addElement( childMap, tag, TQVariant( longData ) ); } break; case LONGLONG: { - Q_INT64 longlongData; + TQ_INT64 longlongData; raw >> longlongData; DEBUGTAG( longlongData ) addElement( childMap, tag, TQVariant( longlongData ) ); } @@ -375,7 +375,7 @@ Reader::parse( TQDataStream &raw, uint containerLength, bool first ) } break; case DATE: { - Q_INT64 dateData; + TQ_INT64 dateData; TQDateTime date; raw >> dateData; DEBUGTAG( dateData ) date.setTime_t(dateData); @@ -383,12 +383,12 @@ Reader::parse( TQDataStream &raw, uint containerLength, bool first ) } break; case DVERSION: { - Q_INT16 major; - Q_INT8 minor; - Q_INT8 patchLevel; + TQ_INT16 major; + TQ_INT8 minor; + TQ_INT8 patchLevel; raw >> major >> minor >> patchLevel; DEBUGTAG( patchLevel ) TQString version("%1.%2.%3"); - version.arg(major, minor, patchLevel); + version.tqarg(major, minor, patchLevel); addElement( childMap, tag, TQVariant(version) ); } break; @@ -407,12 +407,12 @@ Reader::parse( TQDataStream &raw, uint containerLength, bool first ) } void -Reader::addElement( Map &parentMap, char* tag, TQVariant element ) +Reader::addElement( Map &tqparentMap, char* tag, TQVariant element ) { - if( !parentMap.contains( tag ) ) - parentMap[tag] = TQVariant( TQValueList<TQVariant>() ); + if( !tqparentMap.tqcontains( tag ) ) + tqparentMap[tag] = TQVariant( TQValueList<TQVariant>() ); - parentMap[tag].asList().append(element); + tqparentMap[tag].asList().append(element); } void diff --git a/amarok/src/mediadevice/daap/daapreader/reader.h b/amarok/src/mediadevice/daap/daapreader/reader.h index 473c53c7..eab97538 100644 --- a/amarok/src/mediadevice/daap/daapreader/reader.h +++ b/amarok/src/mediadevice/daap/daapreader/reader.h @@ -52,13 +52,14 @@ namespace Daap The nucleus of the DAAP client; composes queries and parses responses. @author Ian Monroe <ian@monroe.nu> */ - class Reader : public QObject + class Reader : public TQObject { Q_OBJECT + TQ_OBJECT public: - Reader( const TQString& host, Q_UINT16 port, ServerItem* root, - const TQString& password, TQObject* parent, const char* name ); + Reader( const TQString& host, TQ_UINT16 port, ServerItem* root, + const TQString& password, TQObject* tqparent, const char* name ); ~Reader(); //TQPtrList<MetaBundle> getSongList(); @@ -69,7 +70,7 @@ namespace Daap int sessionId() const { return m_sessionId; } TQString host() const { return m_host; } - Q_UINT16 port() const { return m_port; } + TQ_UINT16 port() const { return m_port; } public slots: void logoutRequest(int, bool ); void loginHeaderReceived( const TQHttpResponseHeader& resp ); @@ -91,13 +92,13 @@ 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 &parentMap, char* tag, TQVariant element ); //! supporter function for parse - static Q_UINT32 getTagAndLength( TQDataStream &raw, char tag[5] ); + static void addElement( Map &tqparentMap, char* tag, TQVariant element ); //! supporter function for parse + static TQ_UINT32 getTagAndLength( TQDataStream &raw, char tag[5] ); static TQMap<TQString, Code> s_codes; TQString m_host; - Q_UINT16 m_port; + TQ_UINT16 m_port; TQString m_loginString; TQString m_databaseId; int m_sessionId; diff --git a/amarok/src/mediadevice/daap/daapserver.cpp b/amarok/src/mediadevice/daap/daapserver.cpp index 9a1b9b23..893f3275 100644 --- a/amarok/src/mediadevice/daap/daapserver.cpp +++ b/amarok/src/mediadevice/daap/daapserver.cpp @@ -21,8 +21,8 @@ #if DNSSD_SUPPORT #include <dnssd/publicservice.h> #endif -DaapServer::DaapServer(TQObject* parent, char* name) - : TQObject( parent, name ) +DaapServer::DaapServer(TQObject* tqparent, char* name) + : TQObject( tqparent, name ) , m_service( 0 ) { DEBUG_BLOCK @@ -52,7 +52,7 @@ DaapServer::~DaapServer() void DaapServer::readSql() { - static const TQCString sqlPrefix = "SQL QUERY: "; + static const TQCString sqlPrefix = "SQL TQUERY: "; static const TQCString serverStartPrefix = "SERVER STARTING: "; TQString line; while( m_server->readln( line ) != -1 ) @@ -71,7 +71,7 @@ DaapServer::readSql() #if DNSSD_SUPPORT KUser current; if( !m_service ) - m_service = new DNSSD::PublicService( i18n("%1's Amarok Share").arg( current.fullName() ), "_daap._tcp", line.toInt() ); + m_service = new DNSSD::PublicService( i18n("%1's Amarok Share").tqarg( current.fullName() ), "_daap._tcp", line.toInt() ); debug() << "port number: " << line.toInt() << endl; m_service->publishAsync(); #endif diff --git a/amarok/src/mediadevice/daap/daapserver.h b/amarok/src/mediadevice/daap/daapserver.h index 594d478e..f096a1a4 100644 --- a/amarok/src/mediadevice/daap/daapserver.h +++ b/amarok/src/mediadevice/daap/daapserver.h @@ -19,12 +19,13 @@ namespace DNSSD { class PublicService; } -class DaapServer : public QObject +class DaapServer : public TQObject { Q_OBJECT + TQ_OBJECT public: - DaapServer(TQObject* parent, char* name); + DaapServer(TQObject* tqparent, char* name); ~DaapServer(); public slots: void readSql(); diff --git a/amarok/src/mediadevice/daap/mongrel/http11/ext_help.h b/amarok/src/mediadevice/daap/mongrel/http11/ext_help.h index 8b4d754c..387a3049 100644 --- a/amarok/src/mediadevice/daap/mongrel/http11/ext_help.h +++ b/amarok/src/mediadevice/daap/mongrel/http11/ext_help.h @@ -3,7 +3,7 @@ #define RAISE_NOT_NULL(T) if(T == NULL) rb_raise(rb_eArgError, "NULL found for " # T " when shouldn't be."); #define DATA_GET(from,type,name) Data_Get_Struct(from,type,name); RAISE_NOT_NULL(name); -#define REQUIRE_TYPE(V, T) if(TYPE(V) != T) rb_raise(rb_eTypeError, "Wrong argument type for " # V " required " # T); +#define RETQUIRE_TYPE(V, T) if(TYPE(V) != T) rb_raise(rb_eTypeError, "Wrong argument type for " # V " required " # T); #ifdef DEBUG #define TRACE() fprintf(stderr, "> %s:%d:%s\n", __FILE__, __LINE__, __FUNCTION__) diff --git a/amarok/src/mediadevice/daap/mongrel/http11/http11.c b/amarok/src/mediadevice/daap/mongrel/http11/http11.c index a3ad1d5f..3b2ea6c9 100644 --- a/amarok/src/mediadevice/daap/mongrel/http11/http11.c +++ b/amarok/src/mediadevice/daap/mongrel/http11/http11.c @@ -56,7 +56,7 @@ DEF_MAX_LENGTH(FIELD_NAME, 256); DEF_MAX_LENGTH(FIELD_VALUE, 80 * 1024); DEF_MAX_LENGTH(REQUEST_URI, 1024 * 12); DEF_MAX_LENGTH(REQUEST_PATH, 1024); -DEF_MAX_LENGTH(QUERY_STRING, (1024 * 10)); +DEF_MAX_LENGTH(TQUERY_STRING, (1024 * 10)); DEF_MAX_LENGTH(HEADER, (1024 * (80 + 32))); @@ -121,7 +121,7 @@ void query_string(void *data, const char *at, size_t length) VALUE req = (VALUE)data; VALUE val = Qnil; - VALIDATE_MAX_LENGTH(length, QUERY_STRING); + VALIDATE_MAX_LENGTH(length, TQUERY_STRING); val = rb_str_new(at, length); rb_hash_aset(req, global_query_string, val); @@ -250,7 +250,7 @@ VALUE HttpParser_finish(VALUE self) DATA_GET(self, http_parser, http); http_parser_finish(http); - return http_parser_is_finished(http) ? Qtrue : Qfalse; + return http_parser_is_finished(http) ? TQtrue : Qfalse; } @@ -313,7 +313,7 @@ VALUE HttpParser_has_error(VALUE self) http_parser *http = NULL; DATA_GET(self, http_parser, http); - return http_parser_has_error(http) ? Qtrue : Qfalse; + return http_parser_has_error(http) ? TQtrue : Qfalse; } @@ -328,7 +328,7 @@ VALUE HttpParser_is_finished(VALUE self) http_parser *http = NULL; DATA_GET(self, http_parser, http); - return http_parser_is_finished(http) ? Qtrue : Qfalse; + return http_parser_is_finished(http) ? TQtrue : Qfalse; } @@ -534,7 +534,7 @@ void Init_libhttp11() DEF_GLOBAL(http_prefix, "HTTP_"); DEF_GLOBAL(request_method, "REQUEST_METHOD"); DEF_GLOBAL(request_uri, "REQUEST_URI"); - DEF_GLOBAL(query_string, "QUERY_STRING"); + DEF_GLOBAL(query_string, "TQUERY_STRING"); DEF_GLOBAL(http_version, "HTTP_VERSION"); DEF_GLOBAL(request_path, "REQUEST_PATH"); DEF_GLOBAL(content_length, "CONTENT_LENGTH"); diff --git a/amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c b/amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c index cb18f16a..aca99fe4 100644 --- a/amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c +++ b/amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c @@ -6,9 +6,9 @@ void *tst_delete(unsigned char *key, struct tst *tst) { struct node *current_node; - struct node *current_node_parent; + struct node *current_node_tqparent; struct node *last_branch; - struct node *last_branch_parent; + struct node *last_branch_tqparent; struct node *next_node; struct node *last_branch_replacement; struct node *last_branch_dangling_child; @@ -21,9 +21,9 @@ void *tst_delete(unsigned char *key, struct tst *tst) return NULL; last_branch = NULL; - last_branch_parent = NULL; + last_branch_tqparent = NULL; current_node = tst->head[(int)key[0]]; - current_node_parent = NULL; + current_node_tqparent = NULL; key_index = 1; while(current_node != NULL) { @@ -33,13 +33,13 @@ void *tst_delete(unsigned char *key, struct tst *tst) if( (current_node->left != NULL) || (current_node->right != NULL) ) { last_branch = current_node; - last_branch_parent = current_node_parent; + last_branch_tqparent = current_node_tqparent; } if(key[key_index] == 0) break; else { - current_node_parent = current_node; + current_node_tqparent = current_node; current_node = current_node->middle; key_index++; continue; @@ -49,16 +49,16 @@ void *tst_delete(unsigned char *key, struct tst *tst) ((current_node->value != 0) && (key[key_index] < current_node->value)) ) { - last_branch_parent = current_node; - current_node_parent = current_node; + last_branch_tqparent = current_node; + current_node_tqparent = current_node; current_node = current_node->left; last_branch = current_node; continue; } else { - last_branch_parent = current_node; - current_node_parent = current_node; + last_branch_tqparent = current_node; + current_node_tqparent = current_node; current_node = current_node->right; last_branch = current_node; continue; @@ -77,10 +77,10 @@ void *tst_delete(unsigned char *key, struct tst *tst) else if( (last_branch->left == NULL) && (last_branch->right == NULL) ) { - if(last_branch_parent->left == last_branch) - last_branch_parent->left = NULL; + if(last_branch_tqparent->left == last_branch) + last_branch_tqparent->left = NULL; else - last_branch_parent->right = NULL; + last_branch_tqparent->right = NULL; next_node = last_branch; } @@ -103,16 +103,16 @@ void *tst_delete(unsigned char *key, struct tst *tst) last_branch_dangling_child = NULL; } - if(last_branch_parent == NULL) + if(last_branch_tqparent == NULL) tst->head[(int)key[0]]=last_branch_replacement; else { - if (last_branch_parent->left == last_branch) - last_branch_parent->left = last_branch_replacement; - else if (last_branch_parent->right == last_branch) - last_branch_parent->right = last_branch_replacement; + if (last_branch_tqparent->left == last_branch) + last_branch_tqparent->left = last_branch_replacement; + else if (last_branch_tqparent->right == last_branch) + last_branch_tqparent->right = last_branch_replacement; else - last_branch_parent->middle = last_branch_replacement; + last_branch_tqparent->middle = last_branch_replacement; } if(last_branch_dangling_child != NULL) diff --git a/amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb b/amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb index 27d9f28a..1d86abf4 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/gem_plugin.rb @@ -27,7 +27,7 @@ require 'rubygems' # people to be able to grab this plugin if they want and use it, because it's snazzy. # # First thing you do is create a gem of your project and make sure that it depends -# on "mongrel" AND "gem_plugin". This signals to the GemPlugin system that this is +# on "mongrel" AND "gem_plugin". This Q_SIGNALS to the GemPlugin system that this is # a plugin for mongrel. # # Next you put this code into a file like lib/init.rb (can be anything really): diff --git a/amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb b/amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb index 6c348fbc..3a9b0581 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/mongrel.rb @@ -267,7 +267,7 @@ module Mongrel # any errors means we should delete the file, including if the file is dumped @socket.close rescue Object @body.delete if @body.class == Tempfile - @body = nil # signals that there was a problem + @body = nil # Q_SIGNALS that there was a problem end end @@ -608,7 +608,7 @@ module Mongrel request = HttpRequest.new(params, client, notifiers) # in the case of large file uploads the user could close the socket, so skip those requests - break if request.body == nil # nil signals from HttpRequest::initialize that the request was aborted + break if request.body == nil # nil Q_SIGNALS from HttpRequest::initialize that the request was aborted # request is good so far, continue processing the response response = HttpResponse.new(client) diff --git a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb index fa5c9c4e..79e40d17 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb @@ -73,7 +73,7 @@ module Mongrel @head['Server'] = options['server'] || env_table['SERVER_SOFTWARE'] # remaining possible options they can give - @head['Status'] = options['status'] if options['status'] + @head['tqStatus'] = options['status'] if options['status'] @head['Content-Language'] = options['language'] if options['language'] @head['Expires'] = options['expires'] if options['expires'] @@ -117,7 +117,7 @@ module Mongrel # The dumb thing is people can call header or this or both and in any order. # So, we just reuse header and then finalize the HttpResponse the right way. - # Status is taken from the various options and converted to what Mongrel needs + # tqStatus is taken from the various options and converted to what Mongrel needs # via the CGIWrapper.status function. # # We also prevent Rails from actually doing the final send by adding a @@ -147,7 +147,7 @@ module Mongrel # message in the status we have to do a bit of parsing. def status if not @status - stat = @head["Status"] + stat = @head["tqStatus"] stat = stat.split(' ')[0] if stat @status = stat || "200" diff --git a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/configurator.rb b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/configurator.rb index 223ad846..33a141f1 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/configurator.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/configurator.rb @@ -347,7 +347,7 @@ module Mongrel # and do whatever is needed for a "restart". # # This command is safely ignored if the platform is win32 (with a warning) - def setup_signals(options={}) + def setup_Q_SIGNALS(options={}) ops = resolve_defaults(options) # forced shutdown, even if previously restarted (actually just like TERM but for CTRL-C) diff --git a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb index be7860a9..af6108af 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb @@ -164,7 +164,7 @@ module Mongrel Dir.entries(dir).each do |child| next if child == "." out << "<a href=\"#{base}/#{ HttpRequest.escape(child)}\">" - out << (child == ".." ? "Up to parent.." : child) + out << (child == ".." ? "Up to tqparent.." : child) out << "</a><br/>" end out << "</body></html>" @@ -399,7 +399,7 @@ module Mongrel def process(request, response) response.start do |head,out| out.write <<-END - <html><body><title>Mongrel Server Status</title> + <html><body><title>Mongrel Server tqStatus</title> #{describe_listener} </body></html> END diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb index c68a7dda..6a3edf6e 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb @@ -28,7 +28,7 @@ module Kernel rescue LoadError => load_error begin @gempath_searcher ||= Gem::GemPathSearcher.new - if spec = @gempath_searcher.find(path) + if spec = @gempath_searcher.tqfind(path) Gem.activate(spec.name, false, "= #{spec.version}") gem_original_require path else @@ -72,17 +72,17 @@ module Gem # # For example: # - # find('log4r') # -> (log4r-1.1 spec) - # find('log4r.rb') # -> (log4r-1.1 spec) - # find('rake/rdoctask') # -> (rake-0.4.12 spec) - # find('foobarbaz') # -> nil + # tqfind('log4r') # -> (log4r-1.1 spec) + # tqfind('log4r.rb') # -> (log4r-1.1 spec) + # tqfind('rake/rdoctask') # -> (rake-0.4.12 spec) + # tqfind('foobarbaz') # -> nil # # Matching paths can have various suffixes ('.rb', '.so', and # others), which may or may not already be attached to _file_. # This method doesn't care about the full filename that matches; # only that there is a match. # - def find(path) + def tqfind(path) @gemspecs.each do |spec| return spec if matching_file(spec, path) end diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb index 8c2cd903..6a1553b6 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb @@ -23,7 +23,7 @@ module Gem def ok? @specs.all? { |spec| spec.dependencies.all? { |dep| - @specs.find { |s| s.satisfies_requirement?(dep) } + @specs.tqfind { |s| s.satisfies_requirement?(dep) } } } end @@ -34,7 +34,7 @@ module Gem end def find_name(full_name) - @specs.find { |spec| spec.full_name == full_name } + @specs.tqfind { |spec| spec.full_name == full_name } end def remove_by_name(full_name) @@ -82,14 +82,14 @@ module Gem disabled = {} predecessors = build_predecessors while disabled.size < @specs.size - candidate = @specs.find { |spec| + candidate = @specs.tqfind { |spec| ! disabled[spec.full_name] && active_count(predecessors[spec.full_name], disabled) == 0 } if candidate disabled[candidate.full_name] = true result << candidate - elsif candidate = @specs.find { |spec| ! disabled[spec.full_name] } + elsif candidate = @specs.tqfind { |spec| ! disabled[spec.full_name] } # This case handles circular dependencies. Just choose a # candidate and move on. disabled[candidate.full_name] = true diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb index ec1d33c0..b4a972f7 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb @@ -1219,7 +1219,7 @@ module Gem specs = SourceIndex.from_installed_gems.search(gemname, version_req) selected = specs.sort_by { |s| s.version }.last return nil if selected.nil? - # We expect to find (basename).gem in the 'cache' directory. + # We expect to tqfind (basename).gem in the 'cache' directory. # Furthermore, the name match must be exact (ignoring case). if gemname =~ /^#{selected.name}$/i filename = selected.full_name + '.gem' @@ -1416,11 +1416,11 @@ module Gem gem list D - * List local and remote gems whose name contains 'log': + * List local and remote gems whose name tqcontains 'log': gem search log --both - * List only remote gems whose name contains 'log': + * List only remote gems whose name tqcontains 'log': gem search log --remote diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb index 93927ca3..54079a35 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb @@ -536,7 +536,7 @@ module OpenURI # :http_basic_authentication=>[user, password] # # If :http_basic_authentication is specified, - # the value should be an array which contains 2 strings: + # the value should be an array which tqcontains 2 strings: # username and password. # It is used for HTTP Basic authentication defined by RFC 2617. # diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb index 8067d1ef..9e807070 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb @@ -9,7 +9,7 @@ require 'fileutils' require 'zlib' require 'digest/md5' require 'fileutils' -require 'find' +require 'tqfind' require 'stringio' require 'rubygems/specification' @@ -395,11 +395,11 @@ class TarReader end def close - invalidate + tqinvalidate end private - def invalidate + def tqinvalidate extend InvalidEntry end end @@ -810,7 +810,7 @@ module Package TarOutput.open(destname, signer) do |outp| dir_class.chdir(src) do outp.metadata = (file_class.read("RPA/metadata") rescue nil) - find_class.find('.') do |entry| + find_class.tqfind('.') do |entry| case when file_class.file?(entry) entry.sub!(%r{\./}, "") diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb index 4027d65d..33476a42 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb @@ -496,7 +496,7 @@ module Gem end if specs_n_sources.empty? then - raise GemNotFoundException.new("Could not find #{gem_name} (#{version_requirement}) in the repository") + raise GemNotFoundException.new("Could not tqfind #{gem_name} (#{version_requirement}) in the repository") end specs_n_sources = specs_n_sources.sort_by { |gs,| gs.version }.reverse diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb index 8d638c21..03eb1902 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb @@ -172,7 +172,7 @@ module Gem # [Regex] a pattern to match against the short name # version_requirement:: # [String | default=Version::Requirement.new(">= 0")] version to - # find + # tqfind # return:: # [Array] list of Gem::Specification objects in sorted (version) # order. Empty if not found. diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb index b1df1244..ad3d4a40 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb @@ -49,7 +49,7 @@ module Gem private def find_files_for_gem(gem_directory) installed_files = [] - Find.find(gem_directory) {|file_name| + Find.tqfind(gem_directory) {|file_name| fn = file_name.slice((gem_directory.size)..(file_name.size-1)).sub(/^\//, "") if(!(fn =~ /CVS/ || File.directory?(fn) || fn == "")) then installed_files << fn @@ -74,7 +74,7 @@ module Gem # returns a hash of ErrorData objects, keyed on the problem gem's name. def alien require 'rubygems/installer' - require 'find' + require 'tqfind' require 'md5' errors = {} Gem::SourceIndex.from_installed_gems.each do |gem_name, gem_spec| diff --git a/amarok/src/mediadevice/daap/proxy.cpp b/amarok/src/mediadevice/daap/proxy.cpp index b1095cd4..7734efcb 100644 --- a/amarok/src/mediadevice/daap/proxy.cpp +++ b/amarok/src/mediadevice/daap/proxy.cpp @@ -23,7 +23,7 @@ using namespace Daap; //input url: daap://host:port/databaseId/music.ext /* - bundle->setUrl( Amarok::QStringx("http://%1:3689/databases/%2/items/%3.%4?%5").args( + bundle->setUrl( Amarok::TQStringx("http://%1:3689/databases/%2/items/%3.%4?%5").args( TQStringList() << m_host << m_databaseId << TQString::number( (*it).asMap()["miid"].asList()[0].asInt() ) @@ -56,7 +56,7 @@ Proxy::Proxy(KURL stream, DaapClient* client, const char* name) const int port = socket->port(); debug() << "Proxy server using port: " << port << endl; delete socket; - m_proxyUrl = KURL( TQString("http://localhost:%1/daap.mp3").arg( port ) ); + m_proxyUrl = KURL( TQString("http://localhost:%1/daap.mp3").tqarg( port ) ); //start proxy m_proxy->setComm( KProcess::Communication( KProcess::AllOutput ) ); *m_proxy << "amarok_proxy.rb"; diff --git a/amarok/src/mediadevice/daap/proxy.h b/amarok/src/mediadevice/daap/proxy.h index 02b37158..cff1c12c 100644 --- a/amarok/src/mediadevice/daap/proxy.h +++ b/amarok/src/mediadevice/daap/proxy.h @@ -19,9 +19,10 @@ class DaapClient; namespace Daap { - class Proxy : public QObject + class Proxy : public TQObject { Q_OBJECT + TQ_OBJECT public: Proxy(KURL stream, DaapClient* client, const char* name); @@ -40,10 +41,10 @@ namespace Daap { // We must implement this because TQServerSocket has one pure virtual method. // It's just used for finding a free port. - class MyServerSocket : public QServerSocket + class MyServerSocket : public TQServerSocket { public: - MyServerSocket() : TQServerSocket( Q_UINT16( 0 ) ) {} + MyServerSocket() : TQServerSocket( TQ_UINT16( 0 ) ) {} private: void newConnection( int ) {} diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp index 79056bde..33256369 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.cpp +++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp @@ -72,12 +72,12 @@ typedef TQPtrListIterator<GenericMediaFile> MediaFileListIterator; class GenericMediaItem : public MediaItem { public: - GenericMediaItem( TQListView *parent, TQListViewItem *after = 0 ) - : MediaItem( parent, after ) + GenericMediaItem( TQListView *tqparent, TQListViewItem *after = 0 ) + : MediaItem( tqparent, after ) { } - GenericMediaItem( TQListViewItem *parent, TQListViewItem *after = 0 ) - : MediaItem( parent, after ) + GenericMediaItem( TQListViewItem *tqparent, TQListViewItem *after = 0 ) + : MediaItem( tqparent, after ) { } // List directories first, always @@ -108,22 +108,22 @@ class GenericMediaItem : public MediaItem class GenericMediaFile { public: - GenericMediaFile( GenericMediaFile *parent, TQString basename, GenericMediaDevice *device ) - : m_parent( parent ) + GenericMediaFile( GenericMediaFile *tqparent, TQString basename, GenericMediaDevice *device ) + : m_tqparent( tqparent ) , m_device( device ) { m_listed = false; - m_children = new MediaFileList(); + m_tqchildren = new MediaFileList(); - if( m_parent ) + if( m_tqparent ) { - if( m_parent == m_device->getInitialFile() ) + if( m_tqparent == m_device->getInitialFile() ) m_viewItem = new GenericMediaItem( m_device->view() ); else - m_viewItem = new GenericMediaItem( m_parent->getViewItem() ); + m_viewItem = new GenericMediaItem( m_tqparent->getViewItem() ); setNamesFromBase( basename ); m_viewItem->setText( 0, m_baseName ); - m_parent->getChildren()->append( this ); + m_tqparent->getChildren()->append( this ); } else { @@ -148,33 +148,33 @@ class GenericMediaFile ~GenericMediaFile() { - if( m_parent ) - m_parent->removeChild( this ); + if( m_tqparent ) + m_tqparent->removeChild( this ); m_device->getItemMap().erase( m_viewItem ); m_device->getFileMap().erase( m_fullName ); - if ( m_children ) - delete m_children; + if ( m_tqchildren ) + delete m_tqchildren; if ( m_viewItem ) delete m_viewItem; } GenericMediaFile* - getParent() { return m_parent; } + getParent() { return m_tqparent; } void - setParent( GenericMediaFile* parent ) + setParent( GenericMediaFile* tqparent ) { m_device->getFileMap().erase( m_fullName ); - m_parent->getChildren()->remove( this ); - m_parent = parent; - if( m_parent ) - m_parent->getChildren()->append( this ); + m_tqparent->getChildren()->remove( this ); + m_tqparent = tqparent; + if( m_tqparent ) + m_tqparent->getChildren()->append( this ); setNamesFromBase( m_baseName ); m_device->getFileMap()[m_fullName] = this; } void - removeChild( GenericMediaFile* childToDelete ) { m_children->remove( childToDelete ); } + removeChild( GenericMediaFile* childToDelete ) { m_tqchildren->remove( childToDelete ); } GenericMediaItem* getViewItem() { return m_viewItem; } @@ -185,10 +185,10 @@ class GenericMediaFile void setListed( bool listed ) { m_listed = listed; } - QString + TQString getFullName() { return m_fullName; } - QString + TQString getBaseName() { return m_baseName; } //always follow this function with setNamesFromBase() @@ -196,12 +196,12 @@ class GenericMediaFile setBaseName( TQString &name ) { m_baseName = name; } void - setNamesFromBase( const TQString &name = TQString::null ) + setNamesFromBase( const TQString &name = TQString() ) { - if( name != TQString::null ) + if( name != TQString() ) m_baseName = name; - if( m_parent ) - m_fullName = m_parent->getFullName() + '/' + m_baseName; + if( m_tqparent ) + m_fullName = m_tqparent->getFullName() + '/' + m_baseName; else m_fullName = m_baseName; if( m_viewItem ) @@ -209,15 +209,15 @@ class GenericMediaFile } MediaFileList* - getChildren() { return m_children; } + getChildren() { return m_tqchildren; } void deleteAll( bool onlyChildren ) { GenericMediaFile *vmf; - if( m_children && !m_children->isEmpty() ) + if( m_tqchildren && !m_tqchildren->isEmpty() ) { - MediaFileListIterator it( *m_children ); + MediaFileListIterator it( *m_tqchildren ); while( ( vmf = it.current() ) != 0 ) { ++it; @@ -232,9 +232,9 @@ class GenericMediaFile renameAllChildren() { GenericMediaFile *vmf; - if( m_children && !m_children->isEmpty() ) + if( m_tqchildren && !m_tqchildren->isEmpty() ) { - for( vmf = m_children->first(); vmf; vmf = m_children->next() ) + for( vmf = m_tqchildren->first(); vmf; vmf = m_tqchildren->next() ) vmf->renameAllChildren(); } setNamesFromBase(); @@ -243,14 +243,14 @@ class GenericMediaFile private: TQString m_fullName; TQString m_baseName; - GenericMediaFile *m_parent; - MediaFileList *m_children; + GenericMediaFile *m_tqparent; + MediaFileList *m_tqchildren; GenericMediaItem *m_viewItem; GenericMediaDevice* m_device; bool m_listed; }; -QString +TQString GenericMediaDevice::fileName( const MetaBundle &bundle ) { TQString result = cleanPath( bundle.artist() ); @@ -299,8 +299,8 @@ GenericMediaDevice::GenericMediaDevice() m_ignoreThePrefix = false; m_asciiTextOnly = false; - m_songLocation = TQString::null; - m_podcastLocation = TQString::null; + m_songLocation = TQString(); + m_podcastLocation = TQString(); m_supportedFileTypes.clear(); @@ -314,9 +314,9 @@ GenericMediaDevice::GenericMediaDevice() } void -GenericMediaDevice::init( MediaBrowser* parent ) +GenericMediaDevice::init( MediaBrowser* tqparent ) { - MediaDevice::init( parent ); + MediaDevice::init( tqparent ); } GenericMediaDevice::~GenericMediaDevice() @@ -476,7 +476,7 @@ GenericMediaDevice::newDirectory( const TQString &name, MediaItem *parent ) debug() << "Creating directory: " << fullPath << endl; const KURL url( fullPath ); - if( !KIO::NetAccess::mkdir( url, m_parent ) ) //failed + if( !KIO::NetAccess::mkdir( url, m_tqparent ) ) //failed { debug() << "Failed to create directory " << fullPath << endl; return 0; @@ -516,7 +516,7 @@ GenericMediaDevice::addToDirectory( MediaItem *directory, TQPtrList<MediaItem> i const KURL srcurl(src); const KURL dsturl(dst); - if ( !KIO::NetAccess::file_move( srcurl, dsturl, -1, false, false, m_parent ) ) + if ( !KIO::NetAccess::file_move( srcurl, dsturl, -1, false, false, m_tqparent ) ) debug() << "Failed moving " << src << " to " << dst << endl; else { @@ -530,7 +530,7 @@ GenericMediaDevice::addToDirectory( MediaItem *directory, TQPtrList<MediaItem> i /// Uploading -QString +TQString GenericMediaDevice::buildDestination( const TQString &format, const MetaBundle &mb ) { bool isCompilation = mb.compilation() == MetaBundle::CompilationYes; @@ -557,18 +557,18 @@ GenericMediaDevice::buildDestination( const TQString &format, const MetaBundle & args["artist"] = artist; args["albumartist"] = albumartist; args["initial"] = albumartist.mid( 0, 1 ).upper(); - args["filetype"] = mb.url().pathOrURL().section( ".", -1 ).lower(); + args["filetype"] = TQString(mb.url().pathOrURL().section( ".", -1 )).lower(); TQString track; if ( mb.track() ) track.sprintf( "%02d", mb.track() ); args["track"] = track; - Amarok::QStringx formatx( format ); + Amarok::TQStringx formatx( format ); TQString result = formatx.namedOptArgs( args ); if( !result.startsWith( "/" ) ) result.prepend( "/" ); - return result.replace( TQRegExp( "/\\.*" ), "/" ); + return result.tqreplace( TQRegExp( "/\\.*" ), "/" ); } void @@ -576,8 +576,8 @@ GenericMediaDevice::checkAndBuildLocation( const TQString& location ) { // check for every directory from the mount point to the location // whether they exist or not. - int mountPointDepth = m_medium.mountPoint().contains( '/', false ); - int locationDepth = location.contains( '/', false ); + int mountPointDepth = m_medium.mountPoint().tqcontains( '/', false ); + int locationDepth = location.tqcontains( '/', false ); if( m_medium.mountPoint().endsWith( "/" ) ) mountPointDepth--; @@ -597,7 +597,7 @@ GenericMediaDevice::checkAndBuildLocation( const TQString& location ) TQString secondpart = cleanPath( location.section( '/', i, i ) ); KURL url = KURL::fromPathOrURL( firstpart + '/' + secondpart ); - if( !KIO::NetAccess::exists( url, false, m_parent ) ) + if( !KIO::NetAccess::exists( url, false, m_tqparent ) ) { debug() << "directory does not exist, creating..." << url << endl; if( !KIO::NetAccess::mkdir(url, m_view ) ) //failed @@ -609,26 +609,26 @@ GenericMediaDevice::checkAndBuildLocation( const TQString& location ) } } -QString +TQString GenericMediaDevice::buildPodcastDestination( const PodcastEpisodeBundle *bundle ) { TQString location = m_podcastLocation.endsWith("/") ? m_podcastLocation : m_podcastLocation + '/'; // get info about the PodcastChannel - TQString parentUrl = bundle->parent().url(); - TQString sql = "SELECT title,parent FROM podcastchannels WHERE url='" + CollectionDB::instance()->escapeString( parentUrl ) + "';"; + TQString tqparentUrl = bundle->tqparent().url(); + TQString sql = "SELECT title,tqparent FROM podcastchannels WHERE url='" + CollectionDB::instance()->escapeString( tqparentUrl ) + "';"; TQStringList values = CollectionDB::instance()->query( sql ); TQString channelTitle; - int parent = 0; + int tqparent = 0; channelTitle = values.first(); - parent = values.last().toInt(); + tqparent = values.last().toInt(); // Put the file in a directory tree like in the playlistbrowser - sql = "SELECT name,parent FROM podcastfolders WHERE id=%1;"; + sql = "SELECT name,tqparent FROM podcastfolders WHERE id=%1;"; TQString name; - while ( parent > 0 ) + while ( tqparent > 0 ) { - values = CollectionDB::instance()->query( sql.arg( parent ) ); + values = CollectionDB::instance()->query( sql.tqarg( tqparent ) ); name = values.first(); - parent = values.last().toInt(); + tqparent = values.last().toInt(); location += cleanPath( name ) + '/'; } location += cleanPath( channelTitle ) + '/' + cleanPath( bundle->localUrl().filename() ); @@ -653,7 +653,7 @@ GenericMediaDevice::copyTrackToDevice( const MetaBundle& bundle ) const KURL desturl = KURL::fromPathOrURL( path ); - //kapp->processEvents( 100 ); + //kapp->tqprocessEvents( 100 ); if( !kioCopyTrack( bundle.url(), desturl ) ) { @@ -667,7 +667,7 @@ GenericMediaDevice::copyTrackToDevice( const MetaBundle& bundle ) //other than to see if it is NULL or not //if we're here the transfer shouldn't have failed, so we shouldn't get into a loop by waiting... while( !m_view->firstChild() ) - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); return static_cast<MediaItem*>(m_view->firstChild()); } @@ -774,7 +774,7 @@ GenericMediaDevice::expandItem( TQListViewItem *item ) // SLOT while( !m_dirListerComplete ) { - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); usleep(10000); } } @@ -852,12 +852,12 @@ int GenericMediaDevice::addTrackToList( int type, KURL url, int /*size*/ ) { TQString path = url.isLocalFile() ? url.path( -1 ) : url.prettyURL( -1 ); //no trailing slash - int index = path.findRev( '/', -1 ); + int index = path.tqfindRev( '/', -1 ); TQString baseName = path.right( path.length() - index - 1 ); - TQString parentName = path.left( index ); + TQString tqparentName = path.left( index ); - GenericMediaFile* parent = m_mfm[parentName]; - GenericMediaFile* newItem = new GenericMediaFile( parent, baseName, this ); + GenericMediaFile* tqparent = m_mfm[tqparentName]; + GenericMediaFile* newItem = new GenericMediaFile( tqparent, baseName, this ); if( type == MediaItem::DIRECTORY ) //directory newItem->getViewItem()->setType( MediaItem::DIRECTORY ); @@ -866,10 +866,10 @@ GenericMediaDevice::addTrackToList( int type, KURL url, int /*size*/ ) //or just update the list in the plugin as appropriate else if( type == MediaItem::TRACK ) //file { - if( baseName.endsWith( "mp3", false ) || baseName.endsWith( "wma", false ) || - baseName.endsWith( "wav", false ) || baseName.endsWith( "ogg", false ) || - baseName.endsWith( "asf", false ) || baseName.endsWith( "flac", false ) || - baseName.endsWith( "aac", false ) || baseName.endsWith( "m4a", false ) ) + if( baseName.tqendsWith( "mp3", false ) || baseName.tqendsWith( "wma", false ) || + baseName.tqendsWith( "wav", false ) || baseName.tqendsWith( "ogg", false ) || + baseName.tqendsWith( "asf", false ) || baseName.tqendsWith( "flac", false ) || + baseName.tqendsWith( "aac", false ) || baseName.tqendsWith( "m4a", false ) ) newItem->getViewItem()->setType( MediaItem::TRACK ); @@ -877,7 +877,7 @@ GenericMediaDevice::addTrackToList( int type, KURL url, int /*size*/ ) newItem->getViewItem()->setType( MediaItem::UNKNOWN ); } - refreshDir( parent->getFullName() ); + refreshDir( tqparent->getFullName() ); return 0; } @@ -889,7 +889,7 @@ GenericMediaDevice::getCapacity( KIO::filesize_t *total, KIO::filesize_t *availa { if( !m_connected || !KURL::fromPathOrURL( m_medium.mountPoint() ).isLocalFile() ) return false; - KDiskFreeSp* kdf = new KDiskFreeSp( m_parent, "generic_kdf" ); + KDiskFreeSp* kdf = new KDiskFreeSp( TQT_TQOBJECT(m_tqparent), "generic_kdf" ); kdf->readDF( m_medium.mountPoint() ); connect(kdf, TQT_SIGNAL(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long )), TQT_SLOT(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long ))); @@ -898,7 +898,7 @@ GenericMediaDevice::getCapacity( KIO::filesize_t *total, KIO::filesize_t *availa while( m_kBSize == 0 && m_kBAvail == 0){ usleep( 10000 ); - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); count++; if (count > 120){ debug() << "KDiskFreeSp taking too long. Returning false from getCapacity()" << endl; @@ -929,7 +929,7 @@ GenericMediaDevice::foundMountPoint( const TQString & mountPoint, unsigned long void GenericMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) { - enum Actions { APPEND, LOAD, QUEUE, + enum Actions { APPEND, LOAD, TQUEUE, DOWNLOAD, BURN_DATACD, BURN_AUDIOCD, DIRECTORY, RENAME, @@ -941,7 +941,7 @@ GenericMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int KPopupMenu menu( m_view ); menu.insertItem( SmallIconSet( Amarok::icon( "playlist" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "1downarrow" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), QUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), TQUEUE ); menu.insertSeparator(); menu.insertItem( SmallIconSet( Amarok::icon( "collection" ) ), i18n( "&Copy Files to Collection..." ), DOWNLOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "cdrom_unmount" ) ), i18n( "Burn to CD as Data" ), BURN_DATACD ); @@ -966,7 +966,7 @@ GenericMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int case APPEND: Playlist::instance()->insertMedia( getSelectedItems(), Playlist::Append ); break; - case QUEUE: + case TQUEUE: Playlist::instance()->insertMedia( getSelectedItems(), Playlist::Queue ); break; case DOWNLOAD: @@ -983,7 +983,7 @@ GenericMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int if( item->type() == MediaItem::DIRECTORY ) m_view->newDirectory( static_cast<MediaItem*>(item) ); else - m_view->newDirectory( static_cast<MediaItem*>(item->parent()) ); + m_view->newDirectory( static_cast<MediaItem*>(item->tqparent()) ); break; case RENAME: @@ -1042,11 +1042,11 @@ TQString GenericMediaDevice::cleanPath( const TQString &component ) result.simplifyWhiteSpace(); if( m_spacesToUnderscores ) - result.replace( TQRegExp( "\\s" ), "_" ); + result.tqreplace( TQRegExp( "\\s" ), "_" ); if( m_actuallyVfat || m_vfatTextOnly ) result = Amarok::vfatPath( result ); - result.replace( "/", "-" ); + result.tqreplace( "/", "-" ); return result; } @@ -1072,15 +1072,15 @@ bool GenericMediaDevice::isPreferredFormat( const MetaBundle &bundle ) /// Configuration Dialog Extension -void GenericMediaDevice::addConfigElements( TQWidget * parent ) +void GenericMediaDevice::addConfigElements( TQWidget * tqparent ) { - m_configDialog = new GenericMediaDeviceConfigDialog( parent ); + m_configDialog = new GenericMediaDeviceConfigDialog( tqparent ); m_configDialog->setDevice( this ); } -void GenericMediaDevice::removeConfigElements( TQWidget * /* parent */ ) +void GenericMediaDevice::removeConfigElements( TQWidget * /* tqparent */ ) { if( m_configDialog != 0 ) delete m_configDialog; diff --git a/amarok/src/mediadevice/generic/genericmediadevice.h b/amarok/src/mediadevice/generic/genericmediadevice.h index 4ea9665f..9791b0ac 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.h +++ b/amarok/src/mediadevice/generic/genericmediadevice.h @@ -41,12 +41,13 @@ typedef TQMap<GenericMediaItem*, GenericMediaFile*> MediaItemMap; class GenericMediaDevice : public MediaDevice { Q_OBJECT + TQ_OBJECT friend class GenericMediaDeviceConfigDialog; public: GenericMediaDevice(); - void init( MediaBrowser* parent ); + void init( MediaBrowser* tqparent ); virtual ~GenericMediaDevice(); bool isConnected() { return m_connected; } @@ -58,8 +59,8 @@ class GenericMediaDevice : public MediaDevice bool isPreferredFormat( const MetaBundle &bundle ); bool needsManualConfig() { return false; } - void addConfigElements( TQWidget * parent ); - void removeConfigElements( TQWidget * /* parent */); + void addConfigElements( TQWidget * tqparent ); + void removeConfigElements( TQWidget * /* tqparent */); void applyConfig(); void loadConfig(); @@ -74,7 +75,7 @@ class GenericMediaDevice : public MediaDevice MediaItem *copyTrackToDevice( const MetaBundle& bundle ); int deleteItemFromDevice( MediaItem *item, int flags=DeleteTrack ); - MediaItem *newDirectory( const TQString &name, MediaItem *parent ); + MediaItem *newDirectory( const TQString &name, MediaItem *tqparent ); void addToDirectory( MediaItem *directory, TQPtrList<MediaItem> items ); bool getCapacity( KIO::filesize_t *total, KIO::filesize_t *available ); diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui index d6e28e2f..3a50fc13 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GenericMediaDeviceConfigDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GenericMediaDeviceConfigDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -33,9 +33,9 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout88</cstring> + <cstring>tqlayout88</cstring> </property> <vbox> <property name="name"> @@ -44,7 +44,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -72,7 +72,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -86,23 +86,23 @@ <string>The following formats will be transferred directly:</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>m_supportedListBox</cstring> </property> @@ -113,7 +113,7 @@ <string>The formats supported by the generic media device.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -131,15 +131,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_addSupportedButton</cstring> </property> @@ -150,7 +150,7 @@ <string>Add the above format to the list.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_removeSupportedButton</cstring> </property> @@ -171,14 +171,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>93</height> </size> </property> </spacer> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_convertComboBox</cstring> </property> @@ -200,7 +200,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -219,23 +219,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout120</cstring> + <cstring>tqlayout120</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout119</cstring> + <cstring>tqlayout119</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>m_ignoreTheCheck</cstring> </property> @@ -243,7 +243,7 @@ <string>Ig&nore "The"</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_spaceCheck</cstring> </property> @@ -254,7 +254,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_asciiCheck</cstring> </property> @@ -262,7 +262,7 @@ <string>ASCII te&xt</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>m_vfatCheck</cstring> </property> @@ -275,15 +275,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout96</cstring> + <cstring>tqlayout96</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -291,15 +291,15 @@ <string>Song location:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout86</cstring> + <cstring>tqlayout86</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_songLocationBox</cstring> </property> @@ -328,7 +328,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -336,7 +336,7 @@ <string>Example song location:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_previewLabel</cstring> </property> @@ -361,7 +361,7 @@ <string></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2</cstring> </property> @@ -369,7 +369,7 @@ <string>Podcast location:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_podcastLocationBox</cstring> </property> @@ -399,9 +399,9 @@ </connection> <connection> <sender>m_supportedListBox</sender> - <signal>doubleClicked(QListBoxItem*)</signal> + <signal>doubleClicked(TQListBoxItem*)</signal> <receiver>GenericMediaDeviceConfigDialog</receiver> - <slot>supportedListBoxDoubleClicked(QListBoxItem*)</slot> + <slot>supportedListBoxDoubleClicked(TQListBoxItem*)</slot> </connection> <connection> <sender>m_songLocationBox</sender> @@ -433,30 +433,30 @@ <include location="global" impldecl="in implementation">qstringx.h</include> <include location="global" impldecl="in implementation">collectionbrowser.h</include> <include location="local" impldecl="in declaration">genericmediadevice.h</include> - <include location="global" impldecl="in declaration">qpopupmenu.h</include> + <include location="global" impldecl="in declaration">tqpopupmenu.h</include> </includes> <variables> - <variable access="private">QPopupMenu *m_unsupportedMenu;</variable> + <variable access="private">TQPopupMenu *m_unsupportedMenu;</variable> <variable access="private">MetaBundle *m_previewBundle;</variable> <variable access="private">GenericMediaDevice *m_device;</variable> </variables> -<slots> +<Q_SLOTS> <slot>addSupportedButtonClicked( int id )</slot> <slot specifier="non virtual">removeSupportedButtonClicked()</slot> - <slot specifier="non virtual">supportedListBoxDoubleClicked( QListBoxItem * item )</slot> + <slot specifier="non virtual">supportedListBoxDoubleClicked( TQListBoxItem * item )</slot> <slot>updatePreviewLabel()</slot> <slot>updatePreviewLabel( const QString & format )</slot> -</slots> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">updateConfigDialogLists( const QStringList & supportedFileTypes )</function> - <function access="private" specifier="non virtual" returnType="QString">buildDestination( const QString & format, const MetaBundle & mb )</function> - <function access="private" specifier="non virtual" returnType="QString">cleanPath( const QString & component )</function> + <function access="private" specifier="non virtual" returnType="TQString">buildDestination( const QString & format, const MetaBundle & mb )</function> + <function access="private" specifier="non virtual" returnType="TQString">cleanPath( const QString & component )</function> <function specifier="non virtual">setDevice( GenericMediaDevice * device )</function> - <function access="private" specifier="non virtual" returnType="QString">buildFormatTip()</function> + <function access="private" specifier="non virtual" returnType="TQString">buildFormatTip()</function> <function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">destroy()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h index 78be94ba..4365b548 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h @@ -15,7 +15,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -132,7 +132,7 @@ GenericMediaDeviceConfigDialog::updateConfigDialogLists( const TQStringList & su for( TQStringList::Iterator it = allTypes.begin(); it != allTypes.end(); it++ ) { - if( supportedFileTypes.contains( *it ) ) + if( supportedFileTypes.tqcontains( *it ) ) { supported->insertItem( *it ); convert->insertItem( *it ); @@ -156,7 +156,7 @@ GenericMediaDeviceConfigDialog::updateConfigDialogLists( const TQStringList & su convert->setCurrentText( supportedFileTypes.first() ); } -QString +TQString GenericMediaDeviceConfigDialog::buildDestination( const TQString &format, const MetaBundle &mb ) { bool isCompilation = mb.compilation() > 0; @@ -189,13 +189,13 @@ GenericMediaDeviceConfigDialog::buildDestination( const TQString &format, const track.sprintf( "%02d", mb.track() ); args["track"] = track; - Amarok::QStringx formatx( format ); + Amarok::TQStringx formatx( format ); TQString result = m_device->mountPoint().append( formatx.namedOptArgs( args ) ); TQString tail = result.mid( m_device->mountPoint().length() ); if( !tail.startsWith( "/" ) ) tail.prepend( "/" ); - return m_device->mountPoint() + tail.replace( TQRegExp( "/\\.*" ), "/" ); + return m_device->mountPoint() + tail.tqreplace( TQRegExp( "/\\.*" ), "/" ); } TQString GenericMediaDeviceConfigDialog::cleanPath( const TQString &component ) @@ -207,11 +207,11 @@ TQString GenericMediaDeviceConfigDialog::cleanPath( const TQString &component ) result.simplifyWhiteSpace(); if( m_spaceCheck->isChecked() ) - result.replace( TQRegExp( "\\s" ), "_" ); + result.tqreplace( TQRegExp( "\\s" ), "_" ); if( m_device->m_actuallyVfat || m_vfatCheck->isChecked() ) result = Amarok::vfatPath( result ); - result.replace( "/", "-" ); + result.tqreplace( "/", "-" ); return result; } @@ -245,7 +245,7 @@ GenericMediaDeviceConfigDialog::setDevice( GenericMediaDevice* device ) m_ignoreTheCheck->setChecked( m_device->m_ignoreThePrefix ); } -QString +TQString GenericMediaDeviceConfigDialog::buildFormatTip() { TQMap<TQString, TQString> args; @@ -255,10 +255,10 @@ GenericMediaDeviceConfigDialog::buildFormatTip() continue; args[MetaBundle::exactColumnName( i ).lower()] = MetaBundle::prettyColumnName( i ); } - args["albumartist"] = i18n( "%1 or %2" ).arg( "Album Artist, The" , "The Album Artist" ); + args["albumartist"] = i18n( "%1 or %2" ).tqarg( "Album Artist, The" , "The Album Artist" ); args["thealbumartist"] = "The Album Artist"; args["theartist"] = "The Artist"; - args["artist"] = i18n( "%1 or %2" ).arg( "Artist, The" , "The Artist" ); + args["artist"] = i18n( "%1 or %2" ).tqarg( "Artist, The" , "The Artist" ); args["initial"] = i18n( "Artist's Initial" ); args["filetype"] = i18n( "File Extension of Source" ); args["track"] = i18n( "Track Number" ); @@ -270,7 +270,7 @@ GenericMediaDeviceConfigDialog::buildFormatTip() it != args.end(); ++it ) { - tooltip += TQString( "<li>%1 - %2" ).arg( it.data(), "%" + it.key() ); + tooltip += TQString( "<li>%1 - %2" ).tqarg( it.data(), "%" + it.key() ); } tooltip += "</ul>"; diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp index 7f5f101b..590e7959 100644 --- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp +++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp @@ -57,12 +57,12 @@ namespace Amarok { class IfpMediaItem : public MediaItem { public: - IfpMediaItem( TQListView *parent, TQListViewItem *after = 0 ) - : MediaItem( parent, after ) + IfpMediaItem( TQListView *tqparent, TQListViewItem *after = 0 ) + : MediaItem( tqparent, after ) {} - IfpMediaItem( TQListViewItem *parent, TQListViewItem *after = 0 ) - : MediaItem( parent, after ) + IfpMediaItem( TQListViewItem *tqparent, TQListViewItem *after = 0 ) + : MediaItem( tqparent, after ) {} void @@ -74,7 +74,7 @@ class IfpMediaItem : public MediaItem void setEncodedName( TQCString &name ) { m_encodedName = name; } - QCString + TQCString encodedName() { return m_encodedName; } // List directories first, always @@ -127,9 +127,9 @@ IfpMediaDevice::IfpMediaDevice() } void -IfpMediaDevice::init( MediaBrowser* parent ) +IfpMediaDevice::init( MediaBrowser* tqparent ) { - MediaDevice::init( parent ); + MediaDevice::init( tqparent ); } IfpMediaDevice::~IfpMediaDevice() @@ -278,32 +278,32 @@ IfpMediaDevice::renameItem( TQListViewItem *item ) // SLOT /// Creating a directory MediaItem * -IfpMediaDevice::newDirectory( const TQString &name, MediaItem *parent ) +IfpMediaDevice::newDirectory( const TQString &name, MediaItem *tqparent ) { if( !m_connected || name.isEmpty() ) return 0; TQString cleanedName = cleanPath( name ); - const TQCString dirPath = TQFile::encodeName( getFullPath( parent ) + "\\" + cleanedName ); + const TQCString dirPath = TQFile::encodeName( getFullPath( tqparent ) + "\\" + cleanedName ); debug() << "Creating directory: " << dirPath << endl; int err = ifp_mkdir( &m_ifpdev, dirPath ); if( err ) //failed return 0; - m_tmpParent = parent; + m_tmpParent = tqparent; addTrackToList( IFP_DIR, cleanedName ); return m_last; } MediaItem * -IfpMediaDevice::newDirectoryRecursive( const TQString &name, MediaItem *parent ) +IfpMediaDevice::newDirectoryRecursive( const TQString &name, MediaItem *tqparent ) { TQStringList folders = TQStringList::split( '\\', name ); TQString progress = ""; - if( parent ) - progress += getFullPath( parent ) + "\\"; + if( tqparent ) + progress += getFullPath( tqparent ) + "\\"; else progress += "\\"; @@ -315,32 +315,32 @@ IfpMediaDevice::newDirectoryRecursive( const TQString &name, MediaItem *parent ) if( ifp_exists( &m_ifpdev, dirPath ) == IFP_DIR ) { - m_tmpParent = parent; - parent = findChildItem( *it, parent ); - if( !parent ) + m_tmpParent = tqparent; + tqparent = findChildItem( *it, tqparent ); + if( !tqparent ) { addTrackToList( IFP_DIR, *it ); - parent = m_last; + tqparent = m_last; } } else { - parent = newDirectory( *it, parent ); - if( !parent ) //failed + tqparent = newDirectory( *it, tqparent ); + if( !tqparent ) //failed return 0; } progress += "\\"; } - return parent; + return tqparent; } MediaItem * -IfpMediaDevice::findChildItem( const TQString &name, MediaItem *parent ) +IfpMediaDevice::findChildItem( const TQString &name, MediaItem *tqparent ) { TQListViewItem *child; - parent ? - child = parent->firstChild(): + tqparent ? + child = tqparent->firstChild(): child = m_view->firstChild(); while( child ) @@ -406,7 +406,7 @@ IfpMediaDevice::copyTrackToDevice( const MetaBundle& bundle ) TQString newFilename; // we don't put this in cleanPath because of remote directory delimiters - const TQString title = bundle.title().replace( '\\', '-' ); + const TQString title = bundle.title().tqreplace( '\\', '-' ); if( cleverFilename && !title.isEmpty() ) { if( bundle.track() > 0 ) @@ -452,8 +452,8 @@ void IfpMediaDevice::downloadSelectedItems() { // KConfig *config = Amarok::config( "MediaDevice" ); -// TQString save = config->readEntry( "DownloadLocation", TQString::null ); //restore the save directory - TQString save = TQString::null; +// TQString save = config->readEntry( "DownloadLocation", TQString() ); //restore the save directory + TQString save = TQString(); KURLRequesterDlg dialog( save, 0, 0 ); dialog.setCaption( kapp->makeStdCaption( i18n( "Choose a Download Directory" ) ) ); @@ -526,14 +526,14 @@ IfpMediaDevice::deleteItemFromDevice( MediaItem *item, int /*flags*/ ) case MediaItem::DIRECTORY: err = ifp_delete_dir_recursive( &m_ifpdev, encodedPath ); debug() << "Deleting folder: " << encodedPath << endl; - checkResult( err, i18n("Directory cannot be deleted: '%1'").arg(encodedPath) ); + checkResult( err, i18n("Directory cannot be deleted: '%1'").tqarg(encodedPath) ); break; default: err = ifp_delete( &m_ifpdev, encodedPath ); debug() << "Deleting file: " << encodedPath << endl; count += 1; - checkResult( err, i18n("File does not exist: '%1'").arg(encodedPath) ); + checkResult( err, i18n("File does not exist: '%1'").tqarg(encodedPath) ); break; } if( err == 0 ) //success @@ -564,7 +564,7 @@ void IfpMediaDevice::listDir( const TQString &dir ) { int err = ifp_list_dirs( &m_ifpdev, TQFile::encodeName( dir ), listDirCallback, this ); - checkResult( err, i18n("Cannot enter directory: '%1'").arg(dir) ); + checkResult( err, i18n("Cannot enter directory: '%1'").tqarg(dir) ); } // will be called by 'ifp_list_dirs' @@ -619,7 +619,7 @@ IfpMediaDevice::getCapacity( KIO::filesize_t *total, KIO::filesize_t *available /// Helper functions -QString +TQString IfpMediaDevice::getFullPath( const TQListViewItem *item, const bool getFilename ) { if( !item ) return TQString(); @@ -628,12 +628,12 @@ IfpMediaDevice::getFullPath( const TQListViewItem *item, const bool getFilename if( getFilename ) path = item->text(0); - TQListViewItem *parent = item->parent(); - while( parent ) + TQListViewItem *tqparent = item->tqparent(); + while( tqparent ) { path.prepend( "\\" ); - path.prepend( parent->text(0) ); - parent = parent->parent(); + path.prepend( tqparent->text(0) ); + tqparent = tqparent->tqparent(); } path.prepend( "\\" ); @@ -667,7 +667,7 @@ IfpMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) if( item->type() == MediaItem::DIRECTORY ) m_view->newDirectory( static_cast<MediaItem*>(item) ); else - m_view->newDirectory( static_cast<MediaItem*>(item->parent()) ); + m_view->newDirectory( static_cast<MediaItem*>(item->tqparent()) ); break; case RENAME: @@ -701,12 +701,12 @@ TQString IfpMediaDevice::cleanPath( const TQString &component ) result.simplifyWhiteSpace(); - result.remove( "?" ).replace( "*", " " ).replace( ":", " " ); + result.remove( "?" ).tqreplace( "*", " " ).tqreplace( ":", " " ); // if( m_spacesToUnderscores ) -// result.replace( TQRegExp( "\\s" ), "_" ); +// result.tqreplace( TQRegExp( "\\s" ), "_" ); - result.replace( "/", "-" ); + result.tqreplace( "/", "-" ); return result; } diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.h b/amarok/src/mediadevice/ifp/ifpmediadevice.h index ff2330a6..378181a6 100644 --- a/amarok/src/mediadevice/ifp/ifpmediadevice.h +++ b/amarok/src/mediadevice/ifp/ifpmediadevice.h @@ -34,10 +34,11 @@ class TransferDialog; class IfpMediaDevice : public MediaDevice { Q_OBJECT + TQ_OBJECT public: IfpMediaDevice(); - void init( MediaBrowser* parent ); + void init( MediaBrowser* tqparent ); virtual ~IfpMediaDevice(); bool isConnected() { return m_connected; } @@ -57,7 +58,7 @@ class IfpMediaDevice : public MediaDevice MediaItem *copyTrackToDevice( const MetaBundle& bundle); int deleteItemFromDevice( MediaItem *item, int flags=DeleteTrack ); bool getCapacity( KIO::filesize_t *total, KIO::filesize_t *available ); - MediaItem *newDirectory( const TQString &name, MediaItem *parent ); + MediaItem *newDirectory( const TQString &name, MediaItem *tqparent ); void addToDirectory( MediaItem *directory, TQPtrList<MediaItem> items ); protected slots: @@ -73,7 +74,7 @@ class IfpMediaDevice : public MediaDevice bool checkResult( int result, TQString message ); // file transfer - MediaItem *newDirectoryRecursive( const TQString &name, MediaItem *parent ); + MediaItem *newDirectoryRecursive( const TQString &name, MediaItem *tqparent ); int uploadTrack( const TQCString& src, const TQCString& dest ); void downloadSelectedItems(); int downloadTrack( const TQCString& src, const TQCString& dest ); @@ -86,12 +87,12 @@ 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 parents and add directory name to the item. - // getFilename = false will return only parent structure, as opposed to returning the filename as well + // Will iterate over tqparents 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 ); - MediaItem *findChildItem( const TQString &name, MediaItem *parent ); + MediaItem *findChildItem( const TQString &name, MediaItem *tqparent ); // IFP device struct usb_device *m_dev; @@ -101,7 +102,7 @@ class IfpMediaDevice : public MediaDevice bool m_connected; IfpMediaItem *m_last; - //used to specify new IfpMediaItem parent. Make sure it is restored to 0 (m_listview) + //used to specify new IfpMediaItem tqparent. Make sure it is restored to 0 (m_listview) TQListViewItem *m_tmpParent; TransferDialog *m_td; }; diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp index 97309761..e7bec53d 100644 --- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp +++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp @@ -107,17 +107,17 @@ class TrackList : public TQPtrList<Itdb_Track> class IpodMediaItem : public MediaItem { public: - IpodMediaItem( TQListView *parent, MediaDevice *dev ) - : MediaItem( parent ) { init( dev ); } + IpodMediaItem( TQListView *tqparent, MediaDevice *dev ) + : MediaItem( tqparent ) { init( dev ); } - IpodMediaItem( TQListViewItem *parent, MediaDevice *dev ) - : MediaItem( parent ) { init( dev ); } + IpodMediaItem( TQListViewItem *tqparent, MediaDevice *dev ) + : MediaItem( tqparent ) { init( dev ); } - IpodMediaItem( TQListView *parent, TQListViewItem *after, MediaDevice *dev ) - : MediaItem( parent, after ) { init( dev ); } + IpodMediaItem( TQListView *tqparent, TQListViewItem *after, MediaDevice *dev ) + : MediaItem( tqparent, after ) { init( dev ); } - IpodMediaItem( TQListViewItem *parent, TQListViewItem *after, MediaDevice *dev ) - : MediaItem( parent, after ) { init( dev ); } + IpodMediaItem( TQListViewItem *tqparent, TQListViewItem *after, MediaDevice *dev ) + : MediaItem( tqparent, after ) { init( dev ); } virtual ~IpodMediaItem() { delete m_podcastInfo; } @@ -159,8 +159,8 @@ class IpodMediaItem : public MediaItem if( !rss.isEmpty() || !url.isEmpty() ) { PodcastEpisodeBundle peb( KURL::fromPathOrURL(url), KURL::fromPathOrURL(rss), - track->title, track->artist, desc, date.toString(Qt::ISODate), TQString::null /*type*/, - bundle->length(), TQString::null /*guid*/, track->playcount<=0 ); + track->title, track->artist, desc, date.toString(Qt::ISODate), TQString() /*type*/, + bundle->length(), TQString() /*guid*/, track->playcount<=0 ); bundle->setPodcastBundle( peb ); } @@ -316,13 +316,13 @@ IpodMediaDevice::IpodMediaDevice() } if( info->capacity > 0.f ) gen->insertItem( i18n( "%1 GB %2 (x%3)" ) - .arg( TQString::number( info->capacity ), + .tqarg( TQString::number( info->capacity ), itdb_info_get_ipod_model_name_string( info->ipod_model ), info->model_number ), index ); else gen->insertItem( i18n( "%1 (x%2)" ) - .arg( itdb_info_get_ipod_model_name_string( info->ipod_model ), + .tqarg( itdb_info_get_ipod_model_name_string( info->ipod_model ), info->model_number ), index ); } @@ -385,12 +385,12 @@ IpodMediaDevice::slotIpodAction( int id ) g_error_free(err); //FIXME: update i18n files for next message Amarok::StatusBar::instance()->longMessage( - i18n( "Could not write SysInfo file to iPod (check the permissions of the file \"%1\" on your iPod)" ).arg( itunesDir( "Device:SysInfo" ) ) ); + i18n( "Could not write SysInfo file to iPod (check the permissions of the file \"%1\" on your iPod)" ).tqarg( itunesDir( "Device:SysInfo" ) ) ); //FIXME: update i18n files for next message Amarok::StatusBar::instance()->shortMessage( i18n( "Unable to set iPod model to %1 GB %2 (x%3)" ) - .arg( TQString::number( table[index].capacity ), + .tqarg( TQString::number( table[index].capacity ), itdb_info_get_ipod_model_name_string( table[index].ipod_model ), table[index].model_number ) ); } @@ -398,7 +398,7 @@ IpodMediaDevice::slotIpodAction( int id ) { Amarok::StatusBar::instance()->shortMessage( i18n( "Setting iPod model to %1 GB %2 (x%3)" ) - .arg( TQString::number( table[index].capacity ), + .tqarg( TQString::number( table[index].capacity ), itdb_info_get_ipod_model_name_string( table[index].ipod_model ), table[index].model_number ) ); } @@ -410,9 +410,9 @@ IpodMediaDevice::slotIpodAction( int id ) } void -IpodMediaDevice::init( MediaBrowser* parent ) +IpodMediaDevice::init( MediaBrowser* tqparent ) { - MediaDevice::init( parent ); + MediaDevice::init( tqparent ); } IpodMediaDevice::~IpodMediaDevice() @@ -456,7 +456,7 @@ IpodMediaDevice::updateTrackInDB( IpodMediaItem *item, const TQString &pathname, return 0; } - TQString type = pathname.section('.', -1).lower(); + TQString type = TQString(pathname.section('.', -1)).lower(); track->ipod_path = g_strdup( ipodPath(pathname).latin1() ); debug() << "on iPod: " << track->ipod_path << ", podcast=" << podcastInfo << endl; @@ -515,7 +515,7 @@ IpodMediaDevice::updateTrackInDB( IpodMediaItem *item, const TQString &pathname, TQString genre = metaBundle.genre(); - if( genre.startsWith("audiobook", false) ) + if( genre.tqstartsWith("audiobook", false) ) audiobook = true; if( audiobook ) { @@ -565,7 +565,7 @@ IpodMediaDevice::updateTrackInDB( IpodMediaItem *item, const TQString &pathname, track->flag4 = 0x01; // also show description on iPod TQString plaindesc = podcastInfo->description; - plaindesc.replace( TQRegExp("<[^>]*>"), "" ); + plaindesc.tqreplace( TQRegExp("<[^>]*>"), "" ); track->description = g_strdup( plaindesc.utf8() ); track->subtitle = g_strdup( plaindesc.utf8() ); track->podcasturl = g_strdup( podcastInfo->url.utf8() ); @@ -594,7 +594,7 @@ IpodMediaDevice::updateTrackInDB( IpodMediaItem *item, const TQString &pathname, if( metaBundle.podcastBundle() ) { PodcastChannelBundle pcb; - if( CollectionDB::instance()->getPodcastChannelBundle( metaBundle.podcastBundle()->parent(), &pcb ) ) + if( CollectionDB::instance()->getPodcastChannelBundle( metaBundle.podcastBundle()->tqparent(), &pcb ) ) image = CollectionDB::instance()->podcastImage( pcb.imageURL().url(), 0 ); } if( image.isEmpty() ) @@ -608,14 +608,14 @@ IpodMediaDevice::updateTrackInDB( IpodMediaItem *item, const TQString &pathname, if( item ) { - MediaItem *parent = dynamic_cast<MediaItem *>(item->parent()); - if( parent ) + MediaItem *tqparent = dynamic_cast<MediaItem *>(item->tqparent()); + if( tqparent ) { - parent->takeItem( item ); - if( parent->childCount() == 0 && !isSpecialItem( parent ) ) + tqparent->takeItem( item ); + if( tqparent->childCount() == 0 && !isSpecialItem( tqparent ) ) { - MediaItem *pp = dynamic_cast<MediaItem *>(parent->parent()); - delete parent; + MediaItem *pp = dynamic_cast<MediaItem *>(tqparent->tqparent()); + delete tqparent; if( pp && pp->childCount() == 0 && !isSpecialItem( pp ) ) delete pp; } @@ -666,15 +666,15 @@ IpodMediaDevice::copyTrackToDevice(const MetaBundle &bundle) while ( !dir.exists() ) { TQString path = dir.absPath(); - TQDir parentdir; + TQDir tqparentdir; TQDir create; do { create.setPath(path); - path = path.section("/", 0, path.contains('/')-1); - parentdir.setPath(path); + path = path.section("/", 0, path.tqcontains('/')-1); + tqparentdir.setPath(path); } - while( !path.isEmpty() && !(path==mountPoint()) && !parentdir.exists() ); + while( !path.isEmpty() && !(path==mountPoint()) && !tqparentdir.exists() ); debug() << "trying to create \"" << path << "\"" << endl; if(!create.mkdir( create.absPath() )) { @@ -684,7 +684,7 @@ IpodMediaDevice::copyTrackToDevice(const MetaBundle &bundle) if ( !dir.exists() ) { Amarok::StatusBar::instance()->longMessage( - i18n( "Media Device: Creating directory for file %1 failed" ).arg( url.path() ), + i18n( "Media Device: Creating directory for file %1 failed" ).tqarg( url.path() ), KDE::StatusBar::Error ); return NULL; } @@ -702,7 +702,7 @@ IpodMediaDevice::copyTrackToDevice(const MetaBundle &bundle) podcastInfo->url = peb->url().url(); podcastInfo->description = peb->description(); podcastInfo->author = peb->author(); - podcastInfo->rss = peb->parent().url(); + podcastInfo->rss = peb->tqparent().url(); podcastInfo->date = peb->dateTime(); podcastInfo->listened = !peb->isNew(); } @@ -747,10 +747,10 @@ IpodMediaDevice::trackExists( const MetaBundle& bundle ) } MediaItem * -IpodMediaDevice::newPlaylist(const TQString &name, MediaItem *parent, TQPtrList<MediaItem> items) +IpodMediaDevice::newPlaylist(const TQString &name, MediaItem *tqparent, TQPtrList<MediaItem> items) { m_dbChanged = true; - IpodMediaItem *item = new IpodMediaItem(parent, this); + IpodMediaItem *item = new IpodMediaItem(tqparent, this); item->setType(MediaItem::PLAYLIST); item->setText(0, name); @@ -801,7 +801,7 @@ IpodMediaDevice::addToPlaylist(MediaItem *mlist, MediaItem *after, TQPtrList<Med continue; IpodMediaItem *add; - if(it->parent() == list) + if(it->tqparent() == list) { add = it; if(after) @@ -962,7 +962,7 @@ IpodMediaDevice::deleteItemFromDevice(MediaItem *mediaitem, int flags ) if(!(flags & OnlyPlayed) || item->played() > 0 || item->childCount() == 0) { if(item->childCount() > 0) - debug() << "recursive deletion should have removed all children from " << item << "(" << item->text(0) << ")" << endl; + debug() << "recursive deletion should have removed all tqchildren from " << item << "(" << item->text(0) << ")" << endl; else delete item; } @@ -992,18 +992,18 @@ IpodMediaDevice::createLockFile( bool silent ) if( m_lockFile->exists() ) { ok = false; - msg = i18n( "Media Device: iPod mounted at %1 already locked. " ).arg( mountPoint() ); + msg = i18n( "Media Device: iPod mounted at %1 already locked. " ).tqarg( mountPoint() ); msg += i18n( "If you are sure that this is an error, then remove the file %1 and try again." ) - .arg( lockFilePath ); + .tqarg( lockFilePath ); if( !silent ) { - if( KMessageBox::warningContinueCancel( m_parent, msg, i18n( "Remove iTunes Lock File?" ), - KGuiItem(i18n("&Remove"), "editdelete"), TQString::null, KMessageBox::Dangerous ) + if( KMessageBox::warningContinueCancel( m_tqparent, msg, i18n( "Remove iTunes Lock File?" ), + KGuiItem(i18n("&Remove"), "editdelete"), TQString(), KMessageBox::Dangerous ) == KMessageBox::Continue ) { msg = i18n( "Media Device: removing lockfile %1 failed: %2. " ) - .arg( lockFilePath, m_lockFile->errorString() ); + .tqarg( lockFilePath, m_lockFile->errorString() ); ok = m_lockFile->remove(); } else @@ -1017,7 +1017,7 @@ IpodMediaDevice::createLockFile( bool silent ) { ok = false; msg = i18n( "Media Device: failed to create lockfile on iPod mounted at %1: %2" ) - .arg(mountPoint(), m_lockFile->errorString()); + .tqarg(mountPoint(), m_lockFile->errorString()); } if( ok ) @@ -1038,7 +1038,7 @@ IpodMediaDevice::initializeIpod() if( !dir.exists() ) { Amarok::StatusBar::instance()->longMessage( - i18n("Media device: Mount point %1 does not exist").arg(mountPoint()), + i18n("Media device: Mount point %1 does not exist").tqarg(mountPoint()), KDE::StatusBar::Error ); return false; } @@ -1091,7 +1091,7 @@ IpodMediaDevice::initializeIpod() return false; Amarok::StatusBar::instance()->longMessage( - i18n("Media Device: Initialized iPod mounted at %1").arg(mountPoint()), + i18n("Media Device: Initialized iPod mounted at %1").tqarg(mountPoint()), KDE::StatusBar::Information ); return true; @@ -1113,7 +1113,7 @@ IpodMediaDevice::openDevice( bool silent ) if( m_itdb ) { Amarok::StatusBar::instance()->longMessage( - i18n("Media Device: iPod at %1 already opened").arg(mountPoint()), + i18n("Media Device: iPod at %1 already opened").tqarg(mountPoint()), KDE::StatusBar::Sorry ); return false; } @@ -1185,10 +1185,10 @@ IpodMediaDevice::openDevice( bool silent ) if( !m_itdb && canInitialize ) { TQString msg = i18n( "Media Device: could not find iTunesDB on device mounted at %1. " - "Should I try to initialize your iPod?" ).arg( mountPoint() ); + "Should I try to initialize your iPod?" ).tqarg( mountPoint() ); if( !silent - && KMessageBox::warningContinueCancel( m_parent, msg, i18n( "Initialize iPod?" ), + && KMessageBox::warningContinueCancel( m_tqparent, msg, i18n( "Initialize iPod?" ), KGuiItem(i18n("&Initialize"), "new") ) == KMessageBox::Continue ) { if( !initializeIpod() ) @@ -1200,7 +1200,7 @@ IpodMediaDevice::openDevice( bool silent ) } Amarok::StatusBar::instance()->longMessage( - i18n("Media Device: Failed to initialize iPod mounted at %1").arg(mountPoint()), + i18n("Media Device: Failed to initialize iPod mounted at %1").tqarg(mountPoint()), KDE::StatusBar::Sorry ); return false; @@ -1236,7 +1236,7 @@ IpodMediaDevice::openDevice( bool silent ) { debug() << "failed to create hash dir " << real << endl; Amarok::StatusBar::instance()->longMessage( - i18n("Media device: Failed to create directory %1").arg(real), + i18n("Media device: Failed to create directory %1").tqarg(real), KDE::StatusBar::Error ); return false; } @@ -1244,7 +1244,7 @@ IpodMediaDevice::openDevice( bool silent ) } if( !silent ) - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); initView(); GList *cur = m_itdb->playlists; @@ -1255,16 +1255,16 @@ IpodMediaDevice::openDevice( bool silent ) } if( !silent ) - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); for( cur = m_itdb->tracks; cur; cur = cur->next ) { Itdb_Track *track = (Itdb_Track *)cur->data; - addTrackToView( track, 0 /*parent*/, false /*checkintegrity*/, true /*batchmode*/ ); + addTrackToView( track, 0 /*tqparent*/, false /*checkintegrity*/, true /*batchmode*/ ); } if( !silent ) - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); updateRootItems(); m_customAction->setEnabled( true ); @@ -1364,7 +1364,7 @@ IpodMediaDevice::detectModel() #endif } if( modelString ) - m_name = TQString( "iPod %1" ).arg( TQString::fromUtf8( modelString ) ); + m_name = TQString( "iPod %1" ).tqarg( TQString::fromUtf8( modelString ) ); if( m_needsFirewireGuid ) { @@ -1372,7 +1372,7 @@ IpodMediaDevice::detectModel() if( !fwid ) { Amarok::StatusBar::instance()->longMessage( - i18n("Your iPod's Firewire GUID is required for correctly updating its music database, but it is not known. See %1 for more information.").arg( "http://amarok.kde.org/wiki/Media_Device:IPod" ) ); + i18n("Your iPod's Firewire GUID is required for correctly updating its music database, but it is not known. See %1 for more information.").tqarg( "http://amarok.kde.org/wiki/Media_Device:IPod" ) ); } else g_free( fwid ); @@ -1520,14 +1520,14 @@ IpodMediaDevice::checkIntegrity() if (!pathExists( itunesDir( "Music" ), &musicpath )) return false; - TQDir dir( musicpath, TQString::null, TQDir::Unsorted, TQDir::Dirs ); + TQDir dir( musicpath, TQString(), TQDir::Unsorted, TQDir::Dirs ); for(unsigned i=0; i<dir.count(); i++) { if(dir[i] == "." || dir[i] == "..") continue; TQString hashpath = musicpath + '/' + dir[i]; - TQDir hashdir( hashpath, TQString::null, TQDir::Unsorted, TQDir::Files ); + TQDir hashdir( hashpath, TQString(), TQDir::Unsorted, TQDir::Files ); for(unsigned j=0; j<hashdir.count(); j++) { TQString filename = hashpath + '/' + hashdir[j]; @@ -1806,7 +1806,7 @@ IpodMediaDevice::addPlaylistToView( Itdb_Playlist *pl ) } } -QString +TQString IpodMediaDevice::itunesDir(const TQString &p) const { TQString base( ":iPod_Control" ); @@ -1820,20 +1820,20 @@ IpodMediaDevice::itunesDir(const TQString &p) const return base + p; } -QString +TQString IpodMediaDevice::realPath(const char *ipodPath) { TQString path; if(m_itdb) { path = TQFile::decodeName(itdb_get_mountpoint(m_itdb)); - path.append(TQString(ipodPath).replace(':', "/")); + path.append(TQString(ipodPath).tqreplace(':', "/")); } return path; } -QString +TQString IpodMediaDevice::ipodPath(const TQString &realPath) { if(m_itdb) @@ -1843,7 +1843,7 @@ IpodMediaDevice::ipodPath(const TQString &realPath) { TQString path = realPath; path = path.mid(mp.length()); - path = path.replace('/', ":"); + path = path.tqreplace('/', ":"); return path; } } @@ -1854,8 +1854,8 @@ IpodMediaDevice::ipodPath(const TQString &realPath) class IpodWriteDBJob : public ThreadManager::DependentJob { public: - IpodWriteDBJob( TQObject *parent, Itdb_iTunesDB *itdb, bool isShuffle, bool *resultPtr ) - : ThreadManager::DependentJob( parent, "IpodWriteDBJob" ) + IpodWriteDBJob( TQObject *tqparent, Itdb_iTunesDB *itdb, bool isShuffle, bool *resultPtr ) + : ThreadManager::DependentJob( tqparent, "IpodWriteDBJob" ) , m_itdb( itdb ) , m_isShuffle( isShuffle ) , m_resultPtr( resultPtr ) @@ -2131,7 +2131,7 @@ IpodMediaDevice::determineURLOnDevice(const MetaBundle &bundle) } TQString local = bundle.filename(); - TQString type = local.section('.', -1).lower(); + TQString type = TQString(local.section('.', -1)).lower(); TQString trackpath; TQString realpath; @@ -2233,7 +2233,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) KURL::List urls = m_view->nodeBuildDragList( 0 ); KPopupMenu menu( m_view ); - enum Actions { CREATE_PLAYLIST, APPEND, LOAD, QUEUE, + enum Actions { CREATE_PLAYLIST, APPEND, LOAD, TQUEUE, COPY_TO_COLLECTION, BURN_ARTIST, BURN_ALBUM, BURN_DATACD, BURN_AUDIOCD, RENAME, SUBSCRIBE, @@ -2253,7 +2253,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) { menu.insertItem( SmallIconSet( Amarok::icon( "playlist" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), QUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), TQUEUE ); } menu.insertSeparator(); @@ -2285,7 +2285,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) { IpodMediaItem *it = static_cast<IpodMediaItem *>(item); menu.insertItem( SmallIconSet( Amarok::icon( "podcast" ) ), i18n( "Subscribe to This Podcast" ), SUBSCRIBE ); - //menu.setItemEnabled( SUBSCRIBE, item->bundle()->podcastBundle() && item->bundle()->podcastBundle()->parent().isValid() ); + //menu.setItemEnabled( SUBSCRIBE, item->bundle()->podcastBundle() && item->bundle()->podcastBundle()->tqparent().isValid() ); menu.setItemEnabled( SUBSCRIBE, it->m_podcastInfo && !it->m_podcastInfo->rss.isEmpty() ); menu.insertSeparator(); } @@ -2372,7 +2372,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) case APPEND: Playlist::instance()->insertMedia( urls, Playlist::Append ); break; - case QUEUE: + case TQUEUE: Playlist::instance()->insertMedia( urls, Playlist::Queue ); break; case COPY_TO_COLLECTION: @@ -2492,7 +2492,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) continue; } - i->parent()->takeItem(i); + i->tqparent()->takeItem(i); insertTrackIntoDB(i->url().path(), *i->bundle(), *i->bundle(), 0); delete i; } @@ -2508,7 +2508,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) { MediaItem *podcasts = 0; if(item->type() == MediaItem::PODCASTCHANNEL) - podcasts = dynamic_cast<MediaItem *>(item->parent()); + podcasts = dynamic_cast<MediaItem *>(item->tqparent()); else podcasts = item; deleteFromDevice( podcasts, true ); @@ -2524,7 +2524,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) if( playlistsMenu && id >= FIRST_PLAYLIST ) { TQString name = playlistsMenu->text(id); - if( name != TQString::null ) + if( name != TQString() ) { MediaItem *list = m_playlistItem->findItem(name); if(list) @@ -2551,7 +2551,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) } } -QStringList +TQStringList IpodMediaDevice::supportedFiletypes() { TQStringList list; @@ -2590,21 +2590,21 @@ IpodMediaDevice::supportedFiletypes() } void -IpodMediaDevice::addConfigElements( TQWidget *parent ) +IpodMediaDevice::addConfigElements( TQWidget *tqparent ) { - m_autoDeletePodcastsCheck = new TQCheckBox( parent ); + m_autoDeletePodcastsCheck = new TQCheckBox( tqparent ); m_autoDeletePodcastsCheck->setText( i18n( "&Automatically delete podcasts" ) ); TQToolTip::add( m_autoDeletePodcastsCheck, i18n( "Automatically delete podcast shows already played when connecting device" ) ); m_autoDeletePodcastsCheck->setChecked( m_autoDeletePodcasts ); - m_syncStatsCheck = new TQCheckBox( parent ); + m_syncStatsCheck = new TQCheckBox( tqparent ); m_syncStatsCheck->setText( i18n( "&Synchronize with Amarok statistics" ) ); TQToolTip::add( m_syncStatsCheck, i18n( "Synchronize with Amarok statistics and submit tracks played to last.fm" ) ); m_syncStatsCheck->setChecked( m_syncStats ); } void -IpodMediaDevice::removeConfigElements( TQWidget * /*parent*/ ) +IpodMediaDevice::removeConfigElements( TQWidget * /*tqparent*/ ) { delete m_syncStatsCheck; m_syncStatsCheck = 0; @@ -2680,7 +2680,7 @@ IpodMediaDevice::fileDeleted( KIO::Job *job ) //SLOT debug() << "file deletion failed: " << job->errorText() << endl; } m_waitForDeletion = false; - m_parent->updateStats(); + m_tqparent->updateStats(); } void @@ -2693,7 +2693,7 @@ IpodMediaDevice::deleteFile( const KURL &url ) this, TQT_SLOT( fileDeleted( KIO::Job * ) ) ); do { - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); if( isCanceled() ) break; usleep( 10000 ); diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.h b/amarok/src/mediadevice/ipod/ipodmediadevice.h index 7f994c91..8fbebc32 100644 --- a/amarok/src/mediadevice/ipod/ipodmediadevice.h +++ b/amarok/src/mediadevice/ipod/ipodmediadevice.h @@ -52,10 +52,11 @@ class IpodMediaDevice : public MediaDevice { friend class IpodMediaItem; Q_OBJECT + TQ_OBJECT public: IpodMediaDevice(); - void init( MediaBrowser* parent ); + void init( MediaBrowser* tqparent ); virtual ~IpodMediaDevice(); virtual bool autoConnect() { return m_autoConnect; } virtual bool asynchronousTransfer() { return false; /* kernel buffer flushes freeze Amarok */ } @@ -63,8 +64,8 @@ class IpodMediaDevice : public MediaDevice bool isConnected(); - virtual void addConfigElements( TQWidget *parent ); - virtual void removeConfigElements( TQWidget *parent ); + virtual void addConfigElements( TQWidget *tqparent ); + virtual void removeConfigElements( TQWidget *tqparent ); virtual void applyConfig(); virtual void loadConfig(); virtual MediaItem*tagsChanged( MediaItem *item, const MetaBundle &bundle ); @@ -127,7 +128,7 @@ class IpodMediaDevice : public MediaDevice void addPlaylistToView( Itdb_Playlist *playlist ); void playlistFromItem( IpodMediaItem *item ); - TQString itunesDir( const TQString &path = TQString::null ) const; + TQString itunesDir( const TQString &path = TQString() ) const; TQString realPath( const char *ipodPath ); TQString ipodPath( const TQString &realPath ); bool pathExists( const TQString &ipodPath, TQString *realPath=0 ); diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp index 42de70c3..dc579b38 100644 --- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp +++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp @@ -44,7 +44,7 @@ AMAROK_EXPORT_PLUGIN( MtpMediaDevice ) #include <ktoolbarbutton.h> #include <ktempdir.h> -// Qt +// TQt #include <tqdir.h> #include <tqlistview.h> #include <tqtooltip.h> @@ -112,9 +112,9 @@ MtpMediaDevice::MtpMediaDevice() : MediaDevice() } void -MtpMediaDevice::init( MediaBrowser *parent ) +MtpMediaDevice::init( MediaBrowser *tqparent ) { - MediaDevice::init( parent ); + MediaDevice::init( tqparent ); } bool @@ -126,7 +126,7 @@ MtpMediaDevice::isConnected() /** * File types that we support */ -QStringList +TQStringList MtpMediaDevice::supportedFiletypes() { return m_supportedFiles; @@ -273,16 +273,16 @@ MediaItem trackmeta->filesize = bundle.filesize(); // try and create the requested folder structure - uint32_t parent_id = 0; + uint32_t tqparent_id = 0; if( !m_folderStructure.isEmpty() ) { - parent_id = checkFolderStructure( bundle ); - if( parent_id == 0 ) + tqparent_id = checkFolderStructure( bundle ); + if( tqparent_id == 0 ) { - debug() << "Couldn't create new parent (" << m_folderStructure << ")" << endl; + debug() << "Couldn't create new tqparent (" << m_folderStructure << ")" << endl; Amarok::StatusBar::instance()->shortLongMessage( genericError, - i18n( "Cannot create parent folder. Check your structure." ), + i18n( "Cannot create tqparent folder. Check your structure." ), KDE::StatusBar::Error ); return 0; @@ -290,10 +290,10 @@ MediaItem } else { - parent_id = getDefaultParentId(); + tqparent_id = getDefaultParentId(); } - debug() << "Parent id : " << parent_id << endl; - trackmeta->parent_id = parent_id; + debug() << "Parent id : " << tqparent_id << endl; + trackmeta->tqparent_id = tqparent_id; m_critical_mutex.lock(); debug() << "Sending track... " << bundle.url().path().utf8() << endl; @@ -317,7 +317,7 @@ MediaItem MetaBundle temp( bundle ); MtpTrack *taggedTrack = new MtpTrack( trackmeta ); taggedTrack->setBundle( temp ); - taggedTrack->setFolderId( parent_id ); + taggedTrack->setFolderId( tqparent_id ); LIBMTP_destroy_track_t( trackmeta ); @@ -372,34 +372,34 @@ uint32_t MtpMediaDevice::getDefaultParentId( void ) { // Decide which folder to send it to: - // If the device gave us a parent_folder setting, we use it - uint32_t parent_id = 0; - if( m_default_parent_folder ) + // If the device gave us a tqparent_folder setting, we use it + uint32_t tqparent_id = 0; + if( m_default_tqparent_folder ) { - parent_id = m_default_parent_folder; + tqparent_id = m_default_tqparent_folder; } // Otherwise look for a folder called "Music" else if( m_folders != 0 ) { - parent_id = folderNameToID( "Music", m_folders ); - if( !parent_id ) + tqparent_id = folderNameToID( "Music", m_folders ); + if( !tqparent_id ) { debug() << "Parent folder could not be found. Going to use top level." << endl; } } - // Give up and don't set a parent folder, let the device deal with it + // Give up and don't set a tqparent folder, let the device deal with it else { debug() << "No folders found. Going to use top level." << endl; } - return parent_id; + return tqparent_id; } /** * Takes path to an existing cover image and converts it to a format * supported on the device */ -QByteArray +TQByteArray *MtpMediaDevice::getSupportedImage( TQString path ) { if( m_format == 0 ) @@ -543,7 +543,7 @@ LIBMTP_album_t /** * Check (and optionally create) the folder structure to put a - * track into. Return the (possibly new) parent folder ID + * track into. Return the (possibly new) tqparent folder ID */ uint32_t MtpMediaDevice::checkFolderStructure( const MetaBundle &bundle, bool create ) @@ -560,7 +560,7 @@ MtpMediaDevice::checkFolderStructure( const MetaBundle &bundle, bool create ) if( genre.isEmpty() ) genre = i18n( "Unknown Genre" ); m_critical_mutex.lock(); - uint32_t parent_id = getDefaultParentId(); + uint32_t tqparent_id = getDefaultParentId(); TQStringList folders = TQStringList::split( "/", m_folderStructure ); // use slash as a dir separator TQString completePath; for( TQStringList::Iterator it = folders.begin(); it != folders.end(); ++it ) @@ -568,17 +568,17 @@ MtpMediaDevice::checkFolderStructure( const MetaBundle &bundle, bool create ) if( (*it).isEmpty() ) continue; // substitute %a , %b , %g - (*it).replace( TQRegExp( "%a" ), artist ) - .replace( TQRegExp( "%b" ), album ) - .replace( TQRegExp( "%g" ), genre ); + (*it).tqreplace( TQRegExp( "%a" ), artist ) + .tqreplace( TQRegExp( "%b" ), album ) + .tqreplace( TQRegExp( "%g" ), genre ); // check if it exists - uint32_t check_folder = subfolderNameToID( (*it).utf8(), m_folders, parent_id ); + uint32_t check_folder = subfolderNameToID( (*it).utf8(), m_folders, tqparent_id ); // create if not exists (if requested) if( check_folder == 0 ) { if( create ) { - check_folder = createFolder( (*it).utf8() , parent_id ); + check_folder = createFolder( (*it).utf8() , tqparent_id ); if( check_folder == 0 ) { m_critical_mutex.unlock(); @@ -592,24 +592,24 @@ MtpMediaDevice::checkFolderStructure( const MetaBundle &bundle, bool create ) } } completePath += (*it).utf8() + '/'; - // set new parent - parent_id = check_folder; + // set new tqparent + tqparent_id = check_folder; } m_critical_mutex.unlock(); debug() << "Folder path : " << completePath << endl; - // return parent - return parent_id; + // return tqparent + return tqparent_id; } /** * Create a new mtp folder */ uint32_t -MtpMediaDevice::createFolder( const char *name, uint32_t parent_id ) +MtpMediaDevice::createFolder( const char *name, uint32_t tqparent_id ) { - debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl; + debug() << "Creating new folder '" << name << "' as a child of "<< tqparent_id << endl; char *name_copy = qstrdup( name ); - uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id, 0 ); + uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, tqparent_id, 0 ); delete(name_copy); debug() << "New folder ID: " << new_folder_id << endl; if( new_folder_id == 0 ) @@ -624,22 +624,22 @@ MtpMediaDevice::createFolder( const char *name, uint32_t parent_id ) /** * Recursively search the folder list for a matching one under the specified - * parent ID and return the child's ID + * tqparent ID and return the child's ID */ uint32_t -MtpMediaDevice::subfolderNameToID( const char *name, LIBMTP_folder_t *folderlist, uint32_t parent_id ) +MtpMediaDevice::subfolderNameToID( const char *name, LIBMTP_folder_t *folderlist, uint32_t tqparent_id ) { uint32_t i; if( folderlist == 0 ) return 0; - if( !strcasecmp( name, folderlist->name ) && folderlist->parent_id == parent_id ) + if( !strcasecmp( name, folderlist->name ) && folderlist->tqparent_id == tqparent_id ) return folderlist->folder_id; - if( ( i = ( subfolderNameToID( name, folderlist->child, parent_id ) ) ) ) + if( ( i = ( subfolderNameToID( name, folderlist->child, tqparent_id ) ) ) ) return i; - if( ( i = ( subfolderNameToID( name, folderlist->sibling, parent_id ) ) ) ) + if( ( i = ( subfolderNameToID( name, folderlist->sibling, tqparent_id ) ) ) ) return i; return 0; @@ -678,7 +678,7 @@ MtpMediaDevice::downloadSelectedItemsToCollection() TQPtrList<MediaItem> items; m_view->getSelectedLeaves( 0, &items ); - KTempDir tempdir( TQString::null ); + KTempDir tempdir( TQString() ); tempdir.setAutoDelete( true ); KURL::List urls; TQString genericError = i18n( "Could not copy track from device." ); @@ -756,7 +756,7 @@ MediaItem } } uint32_t folderId = checkFolderStructure( bundle, false ); - MediaItem *file = m_fileNameToItem[ TQString( "%1/%2" ).arg( folderId ).arg( bundle.filename() ) ]; + MediaItem *file = m_fileNameToItem[ TQString( "%1/%2" ).tqarg( folderId ).tqarg( bundle.filename() ) ]; if( file != 0 ) return file; return 0; @@ -766,10 +766,10 @@ MediaItem * Create a new playlist */ MtpMediaItem -*MtpMediaDevice::newPlaylist( const TQString &name, MediaItem *parent, TQPtrList<MediaItem> items ) +*MtpMediaDevice::newPlaylist( const TQString &name, MediaItem *tqparent, TQPtrList<MediaItem> items ) { DEBUG_BLOCK - MtpMediaItem *item = new MtpMediaItem( parent, this ); + MtpMediaItem *item = new MtpMediaItem( tqparent, this ); item->setType( MediaItem::PLAYLIST ); item->setText( 0, name ); item->setPlaylist( new MtpPlaylist() ); @@ -819,7 +819,7 @@ MtpMediaDevice::addToPlaylist( MediaItem *mlist, MediaItem *after, TQPtrList<Med continue; MtpMediaItem *add; - if( it->parent() == list ) + if( it->tqparent() == list ) { add = it; if( after ) @@ -980,10 +980,10 @@ MtpMediaDevice::deleteItemFromDevice(MediaItem* item, int flags ) break; if( item ) { - MtpMediaItem *parent = dynamic_cast<MtpMediaItem *> ( item->parent() ); - if( parent && parent->type() == MediaItem::PLAYLIST ) { + MtpMediaItem *tqparent = dynamic_cast<MtpMediaItem *> ( item->tqparent() ); + if( tqparent && tqparent->type() == MediaItem::PLAYLIST ) { delete( item ); - playlistFromItem( parent ); + playlistFromItem( tqparent ); } } break; @@ -1050,7 +1050,7 @@ MtpMediaDevice::deleteObject( MtpMediaItem *deleteItem ) // clear cached filename if( deleteItem->type() == MediaItem::TRACK ) - m_fileNameToItem.remove( TQString( "%1/%2" ).arg( deleteItem->track()->folderId() ).arg( deleteItem->bundle()->filename() ) ); + m_fileNameToItem.remove( TQString( "%1/%2" ).tqarg( deleteItem->track()->folderId() ).tqarg( deleteItem->bundle()->filename() ) ); // remove from the media view delete deleteItem; kapp->processEvents( 100 ); @@ -1120,8 +1120,8 @@ MtpMediaDevice::openDevice( bool silent ) if(! ownername.isEmpty() ) m_name += " (" + ownername + ')'; - m_default_parent_folder = m_device->default_music_folder; - debug() << "setting default parent : " << m_default_parent_folder << endl; + m_default_tqparent_folder = m_device->default_music_folder; + debug() << "setting default tqparent : " << m_default_tqparent_folder << endl; MtpMediaDevice::readMtpMusic(); @@ -1341,12 +1341,12 @@ MtpMediaDevice::rmbPressed( TQListViewItem *qitem, const TQPoint &point, int ) if( items->count() > 100 ) { - int button = KMessageBox::warningContinueCancel( m_parent, + int button = KMessageBox::warningContinueCancel( m_tqparent, i18n( "<p>You are updating cover art for 1 track. This may take some time.", "<p>You are updating cover art for %n tracks. This may take some time.", items->count() ), - TQString::null ); + TQString() ); if( button != KMessageBox::Continue ) return; @@ -1363,13 +1363,13 @@ MtpMediaDevice::rmbPressed( TQListViewItem *qitem, const TQPoint &point, int ) * Add gui elements to the device configuration */ void -MtpMediaDevice::addConfigElements( TQWidget *parent ) +MtpMediaDevice::addConfigElements( TQWidget *tqparent ) { - m_folderLabel = new TQLabel( parent ); + m_folderLabel = new TQLabel( tqparent ); m_folderLabel->setText( i18n( "Folder structure:" ) ); - m_folderStructureBox = new TQLineEdit( parent ); + m_folderStructureBox = new TQLineEdit( tqparent ); m_folderStructureBox->setText( m_folderStructure ); TQToolTip::add( m_folderStructureBox, i18n( "Files copied to the device will be placed in this folder." ) + '\n' @@ -1384,9 +1384,9 @@ MtpMediaDevice::addConfigElements( TQWidget *parent ) * Remove gui elements from the device configuration */ void -MtpMediaDevice::removeConfigElements( TQWidget *parent) +MtpMediaDevice::removeConfigElements( TQWidget *tqparent) { - Q_UNUSED(parent) + Q_UNUSED(tqparent) delete m_folderStructureBox; m_folderStructureBox = 0; @@ -1454,7 +1454,7 @@ MtpMediaItem item->setType( MediaItem::TRACK ); item->setBundle( track->bundle() ); item->track()->setId( track->id() ); - m_fileNameToItem[ TQString( "%1/%2" ).arg( track->folderId() ).arg( track->bundle()->filename() ) ] = item; + m_fileNameToItem[ TQString( "%1/%2" ).tqarg( track->folderId() ).tqarg( track->bundle()->filename() ) ] = item; m_idToTrack[ track->id() ] = track; } return item; @@ -1645,7 +1645,7 @@ MtpTrack::readMetaData( LIBMTP_track_t *track ) if( track->duration > 0 ) bundle->setLength( track->duration / 1000 ); // Divide by 1000 since this is in milliseconds - this->setFolderId( track->parent_id ); + this->setFolderId( track->tqparent_id ); this->setBundle( *bundle ); } diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.h b/amarok/src/mediadevice/mtp/mtpmediadevice.h index 57e81114..26455a6e 100644 --- a/amarok/src/mediadevice/mtp/mtpmediadevice.h +++ b/amarok/src/mediadevice/mtp/mtpmediadevice.h @@ -91,14 +91,14 @@ class MtpAlbum { class MtpMediaItem : public MediaItem { public: - MtpMediaItem( TQListView *parent, TQListViewItem *after = 0 ) - : MediaItem( parent, after ) {} - MtpMediaItem( TQListViewItem *parent, TQListViewItem *after = 0 ) - : MediaItem( parent, after ) {} - MtpMediaItem( TQListView *parent, MediaDevice *dev ) - : MediaItem( parent ) { init( dev ); } - MtpMediaItem( TQListViewItem *parent, MediaDevice *dev ) - : MediaItem( parent ) { init( dev ); } + MtpMediaItem( TQListView *tqparent, TQListViewItem *after = 0 ) + : MediaItem( tqparent, after ) {} + MtpMediaItem( TQListViewItem *tqparent, TQListViewItem *after = 0 ) + : MediaItem( tqparent, after ) {} + MtpMediaItem( TQListView *tqparent, MediaDevice *dev ) + : MediaItem( tqparent ) { init( dev ); } + MtpMediaItem( TQListViewItem *tqparent, MediaDevice *dev ) + : MediaItem( tqparent ) { init( dev ); } void init( MediaDevice *dev ) { @@ -125,6 +125,7 @@ class MtpMediaItem : public MediaItem class MtpMediaDevice : public MediaDevice { Q_OBJECT + TQ_OBJECT public: MtpMediaDevice(); @@ -134,13 +135,13 @@ class MtpMediaDevice : public MediaDevice LIBMTP_mtpdevice_t *current_device(); void setDisconnected(); virtual void rmbPressed( TQListViewItem *qitem, const TQPoint &point, int arg1 ); - virtual void init( MediaBrowser* parent ); + virtual void init( MediaBrowser* tqparent ); virtual TQStringList supportedFiletypes(); void setFolders( LIBMTP_folder_t *folders ); void cancelTransfer(); void customClicked(); - virtual void addConfigElements( TQWidget *parent ); - virtual void removeConfigElements( TQWidget *parent ); + virtual void addConfigElements( TQWidget *tqparent ); + virtual void removeConfigElements( TQWidget *tqparent ); virtual void applyConfig(); virtual void loadConfig(); static int progressCallback( uint64_t const sent, uint64_t const total, void const * const data ); @@ -172,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 parent_id ); + uint32_t createFolder( const char *name, uint32_t tqparent_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 parent_id ); + uint32_t subfolderNameToID( const char *name, LIBMTP_folder_t *folderlist, uint32_t tqparent_id ); void updateFolders( void ); void initView( void ); void readPlaylists( void ); @@ -189,7 +190,7 @@ class MtpMediaDevice : public MediaDevice TQMutex m_mutex; TQMutex m_critical_mutex; LIBMTP_folder_t *m_folders; - uint32_t m_default_parent_folder; + uint32_t m_default_tqparent_folder; TQString m_folderStructure; TQLineEdit *m_folderStructureBox; TQLabel *m_folderLabel; diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp index d2125937..90c5e851 100644 --- a/amarok/src/mediadevice/njb/njbmediadevice.cpp +++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp @@ -52,7 +52,7 @@ AMAROK_EXPORT_PLUGIN( NjbMediaDevice ) #include <kurlrequesterdlg.h> //downloadSelectedItems() -// Qt +// TQt #include <tqdir.h> #include <tqlistview.h> #include <tqregexp.h> @@ -335,7 +335,7 @@ int NjbMediaDevice::downloadSelectedItems() { /* Copied from ifpmediadevice */ - TQString save = TQString::null; + TQString save = TQString(); KURLRequesterDlg dialog( save, 0, 0 ); dialog.setCaption( kapp->makeStdCaption( i18n( "Choose a Download Directory" ) ) ); @@ -359,7 +359,7 @@ NjbMediaDevice::downloadSelectedItems() path = destDir.path(); if( it->type() == MediaItem::TRACK ) { - dynamic_cast<MediaBrowser *>( parent() )->queue()->addURL(path, dynamic_cast<MediaItem *>(it) ); + dynamic_cast<MediaBrowser *>( tqparent() )->queue()->addURL(path, dynamic_cast<MediaItem *>(it) ); } } @@ -380,7 +380,7 @@ NjbMediaDevice::downloadToCollection() TQPtrList<MediaItem> items; m_view->getSelectedLeaves( 0, &items ); - KTempDir tempdir( TQString::null ); // Default prefix is fine with us + KTempDir tempdir( TQString() ); // Default prefix is fine with us tempdir.setAutoDelete( true ); // We don't need it once the work is done. TQString path = tempdir.name(), filepath; KURL::List urls; @@ -510,12 +510,12 @@ NjbMediaDevice::copyTrackFromDevice( MediaItem *item ) } MediaItem* -NjbMediaDevice::newPlaylist(const TQString& name, MediaItem* parent, TQPtrList< MediaItem > items) +NjbMediaDevice::newPlaylist(const TQString& name, MediaItem* tqparent, TQPtrList< MediaItem > items) { DEBUG_BLOCK - Q_UNUSED(parent); - //MediaItem* newplaylist = new MediaItem(parent); + Q_UNUSED(tqparent); + //MediaItem* newplaylist = new MediaItem(tqparent); NjbPlaylist playlist; int status = playlist.setName( name ); @@ -553,7 +553,7 @@ NjbMediaDevice::newPlaylist(const TQString& name, MediaItem* parent, TQPtrList< return 0; } -QStringList +TQStringList NjbMediaDevice::supportedFiletypes() { TQStringList supportedFiles; @@ -594,9 +594,9 @@ NjbMediaDevice::cancelTransfer() } void -NjbMediaDevice::init(MediaBrowser* parent) +NjbMediaDevice::init(MediaBrowser* tqparent) { - MediaDevice::init(parent); + MediaDevice::init(tqparent); } void @@ -804,7 +804,7 @@ void NjbMediaDevice::expandItem( TQListViewItem *item ) { DEBUG_BLOCK - // First clear the item's children to repopulate. + // First clear the item's tqchildren to repopulate. while( item->firstChild() ) delete item->firstChild(); @@ -886,7 +886,7 @@ NjbMediaDevice::customClicked() { TQString Information; TQString tracksFound; - TQString powerStatus; + TQString powertqStatus; TQString batteryLevel; TQString batteryCharging; @@ -894,12 +894,12 @@ NjbMediaDevice::customClicked() { tracksFound = i18n( "1 track found on device", "%n tracks found on device ", trackList.size() ); - powerStatus = ( (NJB_Get_Auxpower( m_njb ) == 1) ? i18n("On auxiliary power") : i18n("On main power") ); + powertqStatus = ( (NJB_Get_Auxpower( m_njb ) == 1) ? i18n("On auxiliary power") : i18n("On main power") ); batteryCharging = ( (NJB_Get_Battery_Charging( m_njb ) == 1) ? i18n("Battery charging") : i18n("Battery not charging") ); batteryLevel = (i18n("Battery level: ") + TQString::number( NJB_Get_Battery_Level( m_njb ) ) ); Information = ( i18n("Player Information for ") + m_name +'\n' + - i18n("Power status: ") + powerStatus + '\n' + + i18n("Power status: ") + powertqStatus + '\n' + i18n("Battery status: ") + batteryLevel + " (" + batteryCharging + ')' ); } diff --git a/amarok/src/mediadevice/njb/njbmediadevice.h b/amarok/src/mediadevice/njb/njbmediadevice.h index ba2a32e8..0ba7b207 100644 --- a/amarok/src/mediadevice/njb/njbmediadevice.h +++ b/amarok/src/mediadevice/njb/njbmediadevice.h @@ -64,10 +64,10 @@ extern trackValueList* theTracks; class NjbMediaItem : public MediaItem { public: - NjbMediaItem( TQListView *parent, TQListViewItem *after = 0 ) : MediaItem( parent, after ) + NjbMediaItem( TQListView *tqparent, TQListViewItem *after = 0 ) : MediaItem( tqparent, after ) {} - NjbMediaItem( TQListViewItem *parent, TQListViewItem *after = 0 ) : MediaItem( parent, after ) + NjbMediaItem( TQListViewItem *tqparent, TQListViewItem *after = 0 ) : MediaItem( tqparent, after ) {} ~NjbMediaItem() @@ -85,6 +85,7 @@ class NjbMediaItem : public MediaItem class NjbMediaDevice : public MediaDevice { Q_OBJECT + TQ_OBJECT public: NjbMediaDevice(); @@ -97,7 +98,7 @@ class NjbMediaDevice : public MediaDevice // virtual bool needsManualConfig(); - virtual MediaItem* newPlaylist(const TQString& name, MediaItem* parent, TQPtrList< MediaItem > items); + virtual MediaItem* newPlaylist(const TQString& name, MediaItem* tqparent, TQPtrList< MediaItem > items); // virtual MediaItem* tagsChanged(MediaItem* item, const MetaBundle& changed); @@ -109,7 +110,7 @@ class NjbMediaDevice : public MediaDevice virtual void addToDirectory(MediaItem* directory, TQPtrList< MediaItem > items) { Q_UNUSED(directory) Q_UNUSED(items) } virtual void addToPlaylist(MediaItem* playlist, MediaItem* after, TQPtrList< MediaItem > items); virtual void applyConfig(); - virtual void init(MediaBrowser* parent); + virtual void init(MediaBrowser* tqparent); virtual void loadConfig(); virtual void removeConfigElements(TQWidget* arg1); virtual void rmbPressed(TQListViewItem* qitem, const TQPoint& point, int arg1); diff --git a/amarok/src/mediadevice/njb/playlist.cpp b/amarok/src/mediadevice/njb/playlist.cpp index d679ce06..ef4e6afa 100644 --- a/amarok/src/mediadevice/njb/playlist.cpp +++ b/amarok/src/mediadevice/njb/playlist.cpp @@ -80,7 +80,7 @@ NjbPlaylist::setPlaylist( njb_playlist_t* _newlist ) // // This function copys the new playlist BY VALUE over our current list. - // It's needed so that objects of this class can be stored in a QValueList + // It's needed so that objects of this class can be stored in a TQValueList // // First, kill the existing list @@ -112,22 +112,22 @@ NjbPlaylist::setPlaylist( njb_playlist_t* _newlist ) debug() << __PRETTY_FUNCTION__ << " OK" << endl; } -QString +TQString NjbPlaylist::unescapefilename( const TQString& _in ) { TQString result = _in; - result.replace("%2f","/"); + result.tqreplace("%2f","/"); return result; } -QString +TQString NjbPlaylist::escapefilename( const TQString& _in ) { TQString result = _in; - result.replace("/","%2f"); + result.tqreplace("/","%2f"); return result; } @@ -183,7 +183,7 @@ NjbPlaylist::addTrack( const TQString& fileName) trackValueList::const_iterator it_track = theTracks->findTrackByName( fileName ); if( it_track == theTracks->end() ) { // couldn't find this track, skip it - debug() << "putPlaylist: couldn't find " << fileName << endl; + debug() << "putPlaylist: couldn't tqfind " << fileName << endl; return NJB_FAILURE; } njb_playlist_track_t* pl_track = NJB_Playlist_Track_New( (*it_track)->id()); @@ -240,7 +240,7 @@ NjbPlaylist::update( void) return NJB_SUCCESS; } -QStringList +TQStringList NjbPlaylist::trackNames( void ) const { TQStringList result; @@ -274,7 +274,7 @@ NjbPlaylist::operator==(const NjbPlaylist& rval) const return getName() == rval.getName(); } -QString +TQString NjbPlaylist::getName(void) const { debug() << __PRETTY_FUNCTION__ << " this=" << this << " list=" << m_playlist << endl; @@ -295,7 +295,7 @@ playlistValueList::readFromDevice( void) NJB_Reset_Get_Playlist( NjbMediaDevice::theNjb()); while( njb_playlist_t* pl = NJB_Get_Playlist( NjbMediaDevice::theNjb()) ) { // FIXME (acejones) Make this a signal - // infoMessage( i18n( "Downloading playlist %1...").arg( ++playlists)); + // infoMessage( i18n( "Downloading playlist %1...").tqarg( ++playlists)); ++playlists; append( NjbPlaylist(pl)); NJB_Playlist_Destroy( pl); diff --git a/amarok/src/mediadevice/njb/playlist.h b/amarok/src/mediadevice/njb/playlist.h index 4a9d6da8..cfd01248 100644 --- a/amarok/src/mediadevice/njb/playlist.h +++ b/amarok/src/mediadevice/njb/playlist.h @@ -22,7 +22,7 @@ // libnjb #include <libnjb.h> -// Qt +// TQt #include <tqstringlist.h> diff --git a/amarok/src/mediadevice/njb/track.cpp b/amarok/src/mediadevice/njb/track.cpp index 24a24534..803a814f 100644 --- a/amarok/src/mediadevice/njb/track.cpp +++ b/amarok/src/mediadevice/njb/track.cpp @@ -65,7 +65,7 @@ NjbTrack::NjbTrack( njb_songid_t* song) if( frame ) { TQString artist = TQString::fromUtf8( frame->data.strval ); - artist.replace( TQRegExp( "/" ), "-" ); + artist.tqreplace( TQRegExp( "/" ), "-" ); bundle->setArtist( artist ); } else @@ -75,7 +75,7 @@ NjbTrack::NjbTrack( njb_songid_t* song) if( frame) { TQString album = TQString::fromUtf8( frame->data.strval ); - album.replace( TQRegExp( "/" ), "-" ); + album.tqreplace( TQRegExp( "/" ), "-" ); bundle->setAlbum( album ); } else @@ -85,7 +85,7 @@ NjbTrack::NjbTrack( njb_songid_t* song) if( frame ) { TQString title = TQString::fromUtf8( frame->data.strval ); - title.replace( TQRegExp( "/"), "-"); + title.tqreplace( TQRegExp( "/"), "-"); bundle->setTitle( title ); } else diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp index c0556612..01d67a90 100644 --- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp +++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp @@ -35,7 +35,7 @@ AMAROK_EXPORT_PLUGIN( RioKarmaMediaDevice ) #include <kiconloader.h> #include <kpopupmenu.h> -// Qt +// TQt #include <tqdir.h> #include <tqlistview.h> #include <tqmap.h> @@ -60,9 +60,9 @@ RioKarmaMediaDevice::RioKarmaMediaDevice() : MediaDevice() } void -RioKarmaMediaDevice::init( MediaBrowser *parent ) +RioKarmaMediaDevice::init( MediaBrowser *tqparent ) { - MediaDevice::init( parent ); + MediaDevice::init( tqparent ); } bool @@ -74,7 +74,7 @@ RioKarmaMediaDevice::isConnected() /** * File types that we support */ -QStringList +TQStringList RioKarmaMediaDevice::supportedFiletypes() { TQStringList supportedFiles; @@ -165,10 +165,10 @@ MediaItem * @note Playlists not implemented yet... :-) */ RioKarmaMediaItem -*RioKarmaMediaDevice::newPlaylist( const TQString &name, MediaItem *parent, TQPtrList<MediaItem> items ) +*RioKarmaMediaDevice::newPlaylist( const TQString &name, MediaItem *tqparent, TQPtrList<MediaItem> items ) { Q_UNUSED( name ); - Q_UNUSED( parent ); + Q_UNUSED( tqparent ); Q_UNUSED( items ); return 0; } @@ -288,7 +288,7 @@ RioKarmaMediaDevice::openDevice( bool silent ) if( !dir.exists() ) { Amarok::StatusBar::instance()->longMessage( - i18n( "Media device: Mount point %1 does not exist" ).arg( mountPoint() ), + i18n( "Media device: Mount point %1 does not exist" ).tqarg( mountPoint() ), KDE::StatusBar::Error ); return false; } diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.h b/amarok/src/mediadevice/riokarma/riokarmamediadevice.h index 42669448..0cbf61bd 100644 --- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.h +++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.h @@ -55,9 +55,9 @@ class RioKarmaTrack { class RioKarmaMediaItem : public MediaItem { public: - RioKarmaMediaItem( TQListView *parent, TQListViewItem *after = 0 ) : MediaItem( parent, after ) + RioKarmaMediaItem( TQListView *tqparent, TQListViewItem *after = 0 ) : MediaItem( tqparent, after ) {} - RioKarmaMediaItem( TQListViewItem *parent, TQListViewItem *after = 0 ) : MediaItem( parent, after ) + RioKarmaMediaItem( TQListViewItem *tqparent, TQListViewItem *after = 0 ) : MediaItem( tqparent, after ) {} ~RioKarmaMediaItem() { @@ -73,6 +73,7 @@ class RioKarmaMediaItem : public MediaItem class RioKarmaMediaDevice : public MediaDevice { Q_OBJECT + TQ_OBJECT public: RioKarmaMediaDevice(); @@ -82,7 +83,7 @@ class RioKarmaMediaDevice : public MediaDevice int current_id(); void setDisconnected(); virtual void rmbPressed( TQListViewItem *qitem, const TQPoint &point, int arg1 ); - virtual void init( MediaBrowser *parent ); + virtual void init( MediaBrowser *tqparent ); virtual TQStringList supportedFiletypes(); protected: diff --git a/amarok/src/mediadevicemanager.cpp b/amarok/src/mediadevicemanager.cpp index 48bfbb06..eacb12b7 100644 --- a/amarok/src/mediadevicemanager.cpp +++ b/amarok/src/mediadevicemanager.cpp @@ -62,23 +62,23 @@ MediaDeviceManager::MediaDeviceManager() { curr = qit.key(); curr = curr.remove( "manual|" ); - currName = curr.left( curr.find( '|' ) ); + currName = curr.left( curr.tqfind( '|' ) ); currMountPoint = curr.remove( currName + '|' ); manualDevices.append( "false" ); //autodetected manualDevices.append( qit.key() ); //id manualDevices.append( currName ); //name manualDevices.append( currName ); //label - manualDevices.append( TQString::null ); //userLabel + manualDevices.append( TQString() ); //userLabel manualDevices.append( "unknown" ); //mountable? - manualDevices.append( TQString::null ); //device node + manualDevices.append( TQString() ); //device node manualDevices.append( currMountPoint ); //mountPoint manualDevices.append( "manual" ); //fsType manualDevices.append( "unknown" ); //mounted - manualDevices.append( TQString::null ); //baseURL - manualDevices.append( TQString::null ); //MIMEtype - manualDevices.append( TQString::null ); //iconName + manualDevices.append( TQString() ); //baseURL + manualDevices.append( TQString() ); //MIMEtype + manualDevices.append( TQString() ); //iconName manualDevices.append( "false" ); //encrypted - manualDevices.append( TQString::null ); //clearDeviceUdi + manualDevices.append( TQString() ); //clearDeviceUdi manualDevices.append( "---" ); //separator } } @@ -105,7 +105,7 @@ void MediaDeviceManager::removeManualDevice( Medium* removed ) { emit mediumRemoved( removed, removed->name() ); - if( m_mediumMap.contains( removed->name() ) ) + if( m_mediumMap.tqcontains( removed->name() ) ) m_mediumMap.remove( removed->name() ); } @@ -119,7 +119,7 @@ void MediaDeviceManager::slotMediumAdded( const Medium *m, TQString id) (m->fsType() == "vfat" || m->fsType() == "hfsplus" || m->fsType() == "msdosfs" ) ) ) // add other fsTypes that should be auto-detected here later { - if ( m_mediumMap.contains( m->name() ) ) + if ( m_mediumMap.tqcontains( m->name() ) ) { Medium *tempMedium = m_mediumMap[m->name()]; m_mediumMap.remove( m->name() ); @@ -141,7 +141,7 @@ void MediaDeviceManager::slotMediumRemoved( const Medium* , TQString id ) { DEBUG_BLOCK Medium* removedMedium = 0; - if ( m_mediumMap.contains(id) ) + if ( m_mediumMap.tqcontains(id) ) removedMedium = m_mediumMap[id]; if ( removedMedium ) debug() << "[MediaDeviceManager::slotMediumRemoved] Obtained medium name is " << id << ", id is: " << removedMedium->id() << endl; @@ -152,7 +152,7 @@ void MediaDeviceManager::slotMediumRemoved( const Medium* , TQString id ) //has been running //There is no point in calling getDevice, since it will not be in the list anyways emit mediumRemoved( removedMedium, id ); - if ( m_mediumMap.contains(id) ) + if ( m_mediumMap.tqcontains(id) ) m_mediumMap.remove(id); delete removedMedium; } diff --git a/amarok/src/mediadevicemanager.h b/amarok/src/mediadevicemanager.h index 507ce7cb..2223ccea 100644 --- a/amarok/src/mediadevicemanager.h +++ b/amarok/src/mediadevicemanager.h @@ -23,7 +23,7 @@ typedef TQMap<TQString, Medium*> MediumMap; -class MediaDeviceManager : public QObject +class MediaDeviceManager : public TQObject { //static const uint GENERIC = 0; @@ -31,6 +31,7 @@ class MediaDeviceManager : public QObject //static const uint IFP = 2; Q_OBJECT + TQ_OBJECT public: MediaDeviceManager(); ~MediaDeviceManager(); diff --git a/amarok/src/medium.cpp b/amarok/src/medium.cpp index b69a2eb6..e597058e 100644 --- a/amarok/src/medium.cpp +++ b/amarok/src/medium.cpp @@ -30,18 +30,18 @@ Medium::Medium(const TQString &id, const TQString &name) m_properties+= id; /* ID */ m_properties+= name; /* NAME */ m_properties+= name; /* LABEL */ - m_properties+= TQString::null; /* USER_LABEL */ + m_properties+= TQString(); /* USER_LABEL */ m_properties+= "false"; /* MOUNTABLE */ - m_properties+= TQString::null; /* DEVICE_NODE */ - m_properties+= TQString::null; /* MOUNT_POINT */ - m_properties+= TQString::null; /* FS_TYPE */ + m_properties+= TQString(); /* DEVICE_NODE */ + m_properties+= TQString(); /* MOUNT_POINT */ + m_properties+= TQString(); /* FS_TYPE */ m_properties+= "false"; /* MOUNTED */ - m_properties+= TQString::null; /* BASE_URL */ - m_properties+= TQString::null; /* MIME_TYPE */ - m_properties+= TQString::null; /* ICON_NAME */ + m_properties+= TQString(); /* BASE_URL */ + m_properties+= TQString(); /* MIME_TYPE */ + m_properties+= TQString(); /* ICON_NAME */ m_properties+= "false"; /* ENCRYPTED */ - m_properties+= TQString::null; /* CLEAR_DEVICE_UDI */ + m_properties+= TQString(); /* CLEAR_DEVICE_UDI */ loadUserLabel(); } @@ -66,22 +66,22 @@ Medium::Medium(const Medium *medium) Medium::Medium() { - m_properties+= TQString::null; /* AUTODETECTED */ - m_properties+= TQString::null; /* ID */ - m_properties+= TQString::null; /* NAME */ - m_properties+= TQString::null; /* LABEL */ - m_properties+= TQString::null; /* USER_LABEL */ - - m_properties+= TQString::null; /* MOUNTABLE */ - m_properties+= TQString::null; /* DEVICE_NODE */ - m_properties+= TQString::null; /* MOUNT_POINT */ - m_properties+= TQString::null; /* FS_TYPE */ - m_properties+= TQString::null; /* MOUNTED */ - m_properties+= TQString::null; /* BASE_URL */ - m_properties+= TQString::null; /* MIME_TYPE */ - m_properties+= TQString::null; /* ICON_NAME */ - m_properties+= TQString::null; /* ENCRYPTED */ - m_properties+= TQString::null; /* CLEAR_DEVICE_UDI */ + m_properties+= TQString(); /* AUTODETECTED */ + m_properties+= TQString(); /* ID */ + m_properties+= TQString(); /* NAME */ + m_properties+= TQString(); /* LABEL */ + m_properties+= TQString(); /* USER_LABEL */ + + m_properties+= TQString(); /* MOUNTABLE */ + m_properties+= TQString(); /* DEVICE_NODE */ + m_properties+= TQString(); /* MOUNT_POINT */ + m_properties+= TQString(); /* FS_TYPE */ + m_properties+= TQString(); /* MOUNTED */ + m_properties+= TQString(); /* BASE_URL */ + m_properties+= TQString(); /* MIME_TYPE */ + m_properties+= TQString(); /* ICON_NAME */ + m_properties+= TQString(); /* ENCRYPTED */ + m_properties+= TQString(); /* CLEAR_DEVICE_UDI */ } const Medium Medium::create(const TQStringList &properties) @@ -126,7 +126,7 @@ Medium::List Medium::createList(const TQStringList &properties) l.append(m); TQStringList::iterator first = props.begin(); - TQStringList::iterator last = props.find(SEPARATOR); + TQStringList::iterator last = props.tqfind(SEPARATOR); ++last; props.erase(first, last); } @@ -196,7 +196,7 @@ void Medium::loadUserLabel() } else { - m_properties[USER_LABEL] = TQString::null; + m_properties[USER_LABEL] = TQString(); } } diff --git a/amarok/src/medium.h b/amarok/src/medium.h index 7ef4de79..34c3251b 100644 --- a/amarok/src/medium.h +++ b/amarok/src/medium.h @@ -88,7 +88,7 @@ public: void mountableState(const TQString &deviceNode, const TQString &mountPoint, const TQString &fsType, bool mounted); - void unmountableState(const TQString &baseURL = TQString::null); + void unmountableState(const TQString &baseURL = TQString()); void setMimeType(const TQString &mimeType); void setIconName(const TQString &iconName); diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp index 5d167acf..d4ddb5d8 100644 --- a/amarok/src/mediumpluginmanager.cpp +++ b/amarok/src/mediumpluginmanager.cpp @@ -45,29 +45,29 @@ using Amarok::escapeHTMLAttr; typedef TQMap<TQString, Medium*> MediumMap; MediumPluginManagerDialog::MediumPluginManagerDialog() - : KDialogBase( Amarok::mainWindow(), "mediumpluginmanagerdialog", false, TQString::null, Ok|Cancel, Ok ) + : KDialogBase( Amarok::mainWindow(), "mediumpluginmanagerdialog", false, TQString(), Ok|Cancel, Ok ) { kapp->setTopWidget( this ); setCaption( kapp->makeStdCaption( i18n( "Manage Devices and Plugins" ) ) ); TQVBox* vbox = makeVBoxMainWidget(); vbox->setSpacing( KDialog::spacingHint() ); - vbox->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + vbox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); m_location = new TQGroupBox( 1, Qt::Vertical, i18n( "Devices" ), vbox ); - m_location->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); + m_location->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); m_devicesBox = new TQVBox( m_location ); - m_devicesBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + m_devicesBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); m_manager = new MediumPluginManager( m_devicesBox ); TQHBox *hbox = new TQHBox( vbox ); KPushButton *detectDevices = new KPushButton( i18n( "Autodetect Devices" ), hbox); - detectDevices->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + detectDevices->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); connect( detectDevices, TQT_SIGNAL( clicked() ), m_manager, TQT_SLOT( redetectDevices() ) ); KPushButton *addButton = new KPushButton( i18n( "Add Device..." ), hbox ); - addButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + addButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); connect( addButton, TQT_SIGNAL( clicked() ), m_manager, TQT_SLOT( newDevice() ) ); } @@ -140,7 +140,7 @@ MediumPluginManager::detectDevices( const bool redetect, const bool nographics ) } } - if( m_deletedMap.contains( (*it)->id() ) && !(*it)->isAutodetected() ) + if( m_deletedMap.tqcontains( (*it)->id() ) && !(*it)->isAutodetected() ) { skipflag = true; debug() << "skipping: deleted & not autodetect" << endl; @@ -149,7 +149,7 @@ MediumPluginManager::detectDevices( const bool redetect, const bool nographics ) if( skipflag ) continue; - if( m_deletedMap.contains( (*it)->id() ) ) + if( m_deletedMap.tqcontains( (*it)->id() ) ) m_deletedMap.remove( (*it)->id() ); MediaDeviceConfig *dev = new MediaDeviceConfig( *it, this, nographics, m_widget ); @@ -253,7 +253,7 @@ MediumPluginManager::newDevice() ///////////////////////////////////////////////////////////////////// ManualDeviceAdder::ManualDeviceAdder( MediumPluginManager* mpm ) -: KDialogBase( Amarok::mainWindow(), "manualdeviceadder", true, TQString::null, Ok|Cancel, Ok ) +: KDialogBase( Amarok::mainWindow(), "manualdeviceadder", true, TQString(), Ok|Cancel, Ok ) { m_mpm = mpm; m_successful = false; @@ -278,7 +278,7 @@ ManualDeviceAdder::ManualDeviceAdder( MediumPluginManager* mpm ) new TQLabel( "", vbox1 ); TQLabel* nameLabel = new TQLabel( vbox1 ); nameLabel->setText( i18n( "Enter a &name for this device (required):" ) ); - m_mdaName = new HintLineEdit( TQString::null, vbox1); + m_mdaName = new HintLineEdit( TQString(), vbox1); nameLabel->setBuddy( m_mdaName ); m_mdaName->setHint( i18n( "Example: My_Ipod" ) ); TQToolTip::add( m_mdaName, i18n( "Enter a name for the device. The name must be unique across all devices, including autodetected devices. It must not contain the pipe ( | ) character." ) ); @@ -286,7 +286,7 @@ ManualDeviceAdder::ManualDeviceAdder( MediumPluginManager* mpm ) new TQLabel( "", vbox1 ); TQLabel* mpLabel = new TQLabel( vbox1 ); mpLabel->setText( i18n( "Enter the &mount point of the device, if applicable:" ) ); - m_mdaMountPoint = new HintLineEdit( TQString::null, vbox1); + m_mdaMountPoint = new HintLineEdit( TQString(), vbox1); mpLabel->setBuddy( m_mdaMountPoint ); m_mdaMountPoint->setHint( i18n( "Example: /mnt/ipod" ) ); TQToolTip::add( m_mdaMountPoint, i18n( "Enter the device's mount point. Some devices (such as iRiver iFP devices) may not have a mount point and this can be ignored. All other devices (iPods, UMS/VFAT devices) should enter the mount point here." ) ); @@ -337,7 +337,7 @@ ManualDeviceAdder::comboChanged( const TQString &string ) MediaBrowser::instance()->getInternalPluginName( string ) == "njb-mediadevice" ) { m_comboOldText = m_mdaMountPoint->text(); - m_mdaMountPoint->setText( TQString::null ); + m_mdaMountPoint->setText( TQString() ); m_mdaMountPoint->setEnabled(false); } else if( m_mdaMountPoint->isEnabled() == false ) @@ -376,8 +376,8 @@ ManualDeviceAdder::getMedium( bool recreate ) return m_newMed; } -MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, const bool nographics, TQWidget *parent, const char *name ) -: TQHBox( parent, name ) +MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, const bool nographics, TQWidget *tqparent, const char *name ) +: TQHBox( tqparent, name ) , m_manager( mgr ) , m_medium( medium ) , m_configButton( 0 ) @@ -392,36 +392,36 @@ MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, if( !m_oldPlugin.isEmpty() ) m_new = false; - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); setSpacing( 5 ); const TQString labelTextNone = i18n( "(none)" ); TQString row = "<tr><td>%1</td><td>%2</td></tr>"; TQString table; - table += row.arg( escapeHTML( i18n( "Autodetected:" ) ), + table += row.tqarg( escapeHTML( i18n( "Autodetected:" ) ), escapeHTML( medium->isAutodetected() ? i18n("Yes") : i18n("No") ) ); - table += row.arg( escapeHTML( i18n( "ID:" ) ), + table += row.tqarg( escapeHTML( i18n( "ID:" ) ), escapeHTML( medium->id() ) ); - table += row.arg( escapeHTML( i18n( "Name:" ) ), + table += row.tqarg( escapeHTML( i18n( "Name:" ) ), escapeHTML( medium->name() ) ); - table += row.arg( escapeHTML( i18n( "Label:" ) ), + table += row.tqarg( escapeHTML( i18n( "Label:" ) ), escapeHTML( medium->label().isEmpty() ? labelTextNone : medium->label() ) ); - table += row.arg( escapeHTML( i18n( "User Label:" ) ), + table += row.tqarg( escapeHTML( i18n( "User Label:" ) ), escapeHTML( medium->userLabel().isEmpty() ? labelTextNone : medium->userLabel() ) ); - table += row.arg( escapeHTML( i18n( "Device Node:" ) ), + table += row.tqarg( escapeHTML( i18n( "Device Node:" ) ), escapeHTML( medium->deviceNode().isEmpty() ? labelTextNone : medium->deviceNode() ) ); - table += row.arg( escapeHTML( i18n( "Mount Point:" ) ), + table += row.tqarg( escapeHTML( i18n( "Mount Point:" ) ), escapeHTML( medium->mountPoint().isEmpty() ? labelTextNone : medium->mountPoint() ) ); - table += row.arg( escapeHTML( i18n( "Mime Type:" ) ), + table += row.tqarg( escapeHTML( i18n( "Mime Type:" ) ), escapeHTML( medium->mimeType().isEmpty() ? labelTextNone : medium->mimeType() ) ); - TQString title = escapeHTML( i18n( "Device information for %1").arg(medium->name() ) ); - TQString details = TQString( "<em>%1</em><br />" "<table>%2</table>" ).arg( title, table ); + TQString title = escapeHTML( i18n( "Device information for %1").tqarg(medium->name() ) ); + TQString details = TQString( "<em>%1</em><br />" "<table>%2</table>" ).tqarg( title, table ); (void)new TQLabel( i18n("Name: "), this ); (void)new TQLabel( medium->name(), this ); (void)new KActiveLabel( i18n( "(<a href='whatsthis:%1'>Details</a>)" ) - .arg( Amarok::escapeHTMLAttr( details ) ), this ); + .tqarg( Amarok::escapeHTMLAttr( details ) ), this ); (void)new TQLabel( i18n("Plugin:"), this ); m_pluginCombo = new KComboBox( false, this ); @@ -435,7 +435,7 @@ MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, m_pluginCombo->setCurrentItem( (*it)->name() ); } - m_configButton = new KPushButton( SmallIconSet( Amarok::icon( "configure" ) ), TQString::null, this ); + m_configButton = new KPushButton( SmallIconSet( Amarok::icon( "configure" ) ), TQString(), this ); connect( m_configButton, TQT_SIGNAL(clicked()), TQT_SLOT(configureDevice()) ); m_configButton->setEnabled( !m_new && m_pluginCombo->currentText() != i18n( "Do not handle" ) ); TQToolTip::add( m_configButton, i18n( "Configure device settings" ) ); @@ -467,13 +467,13 @@ MediaDeviceConfig::medium() return m_medium; } -QString +TQString MediaDeviceConfig::plugin() { return MediaBrowser::instance()->getInternalPluginName( m_pluginCombo->currentText() ); } -QString +TQString MediaDeviceConfig::oldPlugin() { return m_oldPlugin; diff --git a/amarok/src/mediumpluginmanager.h b/amarok/src/mediumpluginmanager.h index bc7d8ca5..3a0a5bcd 100644 --- a/amarok/src/mediumpluginmanager.h +++ b/amarok/src/mediumpluginmanager.h @@ -41,12 +41,13 @@ typedef TQMap<TQString, Medium*> DeletedMap; @author Martin Aumueller <aumuell@reserv.at> */ -class MediaDeviceConfig : public QHBox +class MediaDeviceConfig : public TQHBox { Q_OBJECT + TQ_OBJECT public: - MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, const bool nographics=false, TQWidget *parent=0, const char *name=0 ); + MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, const bool nographics=false, TQWidget *tqparent=0, const char *name=0 ); ~MediaDeviceConfig(); TQString oldPlugin(); void setOldPlugin( const TQString &oldPlugin ); @@ -77,9 +78,10 @@ class MediaDeviceConfig : public QHBox typedef TQValueList<MediaDeviceConfig *> DeviceList; -class MediumPluginManager : public QObject +class MediumPluginManager : public TQObject { Q_OBJECT + TQ_OBJECT friend class DeviceManager; @@ -113,6 +115,7 @@ class MediumPluginManager : public QObject class MediumPluginManagerDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: MediumPluginManagerDialog(); @@ -131,6 +134,7 @@ class MediumPluginManagerDialog : public KDialogBase class ManualDeviceAdder : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ManualDeviceAdder( MediumPluginManager* mdm ); diff --git a/amarok/src/metabundle.cpp b/amarok/src/metabundle.cpp index be71b78e..4bc90655 100644 --- a/amarok/src/metabundle.cpp +++ b/amarok/src/metabundle.cpp @@ -93,8 +93,8 @@ bool MetaBundle::EmbeddedImage::save( const TQDir& dir ) const TQFile file( dir.filePath( hash() ) ); if( file.open( IO_WriteOnly | IO_Raw ) ) { - const Q_LONG s = file.writeBlock( m_data.data(), m_data.size() ); - if( s >= 0 && Q_ULONG( s ) == m_data.size() ) { + const TQ_LONG s = file.writeBlock( m_data.data(), m_data.size() ); + if( s >= 0 && TQ_ULONG( s ) == m_data.size() ) { debug() << "EmbeddedImage::save " << file.name() << endl; return true; } @@ -160,7 +160,7 @@ int MetaBundle::columnIndex( const TQString &name ) } MetaBundle::MetaBundle() - : m_uniqueId( TQString::null ) + : m_uniqueId( TQString() ) , m_year( Undetermined ) , m_discNumber( Undetermined ) , m_track( Undetermined ) @@ -181,8 +181,8 @@ MetaBundle::MetaBundle() , m_notCompilation( false ) , m_safeToSave( false ) , m_waitingOnKIO( 0 ) - , m_tempSavePath( TQString::null ) - , m_origRenamedSavePath( TQString::null ) + , m_tempSavePath( TQString() ) + , m_origRenamedSavePath( TQString() ) , m_tempSaveDigest( 0 ) , m_saveFileref( 0 ) , m_podcastBundle( 0 ) @@ -195,7 +195,7 @@ MetaBundle::MetaBundle() MetaBundle::MetaBundle( const KURL &url, bool noCache, TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImageList* images ) : m_url( url ) - , m_uniqueId( TQString::null ) + , m_uniqueId( TQString() ) , m_year( Undetermined ) , m_discNumber( Undetermined ) , m_track( Undetermined ) @@ -216,8 +216,8 @@ MetaBundle::MetaBundle( const KURL &url, bool noCache, TagLib::AudioProperties:: , m_notCompilation( false ) , m_safeToSave( false ) , m_waitingOnKIO( 0 ) - , m_tempSavePath( TQString::null ) - , m_origRenamedSavePath( TQString::null ) + , m_tempSavePath( TQString() ) + , m_origRenamedSavePath( TQString() ) , m_tempSaveDigest( 0 ) , m_saveFileref( 0 ) , m_podcastBundle( 0 ) @@ -252,7 +252,7 @@ MetaBundle::MetaBundle( const TQString& title, , m_genre ( genre ) , m_streamName( streamName ) , m_streamUrl ( streamUrl ) - , m_uniqueId( TQString::null ) + , m_uniqueId( TQString() ) , m_year( 0 ) , m_discNumber( 0 ) , m_track( 0 ) @@ -273,8 +273,8 @@ MetaBundle::MetaBundle( const TQString& title, , m_notCompilation( false ) , m_safeToSave( false ) , m_waitingOnKIO( 0 ) - , m_tempSavePath( TQString::null ) - , m_origRenamedSavePath( TQString::null ) + , m_tempSavePath( TQString() ) + , m_origRenamedSavePath( TQString() ) , m_tempSaveDigest( 0 ) , m_saveFileref( 0 ) , m_podcastBundle( 0 ) @@ -282,10 +282,10 @@ MetaBundle::MetaBundle( const TQString& title, , m_isSearchDirty( true ) , m_searchColumns( Undetermined ) { - if( title.contains( '-' ) ) + if( title.tqcontains( '-' ) ) { - m_title = title.section( '-', 1, 1 ).stripWhiteSpace(); - m_artist = title.section( '-', 0, 0 ).stripWhiteSpace(); + m_title = TQString(title.section( '-', 1, 1 )).stripWhiteSpace(); + m_artist = TQString(title.section( '-', 0, 0 )).stripWhiteSpace(); } else { @@ -363,7 +363,7 @@ MetaBundle::operator=( const MetaBundle& bundle ) } -// delete m_podcastBundle; why does this crash Amarok? apparently m_podcastBundle isn't always initialized. +// delete m_podcastBundle; why does this crash Amarok? aptqparently m_podcastBundle isn't always initialized. m_podcastBundle = 0; if( bundle.m_podcastBundle ) setPodcastBundle( *bundle.m_podcastBundle ); @@ -447,7 +447,7 @@ MetaBundle::init( const KFileMetaInfo& info ) m_title = itemtitle.isValid() ? itemtitle.string() : prettyTitle( m_url.fileName() ); const KFileMetaInfoItem itemid = info.item( "Unique ID" ); - m_uniqueId = itemid.isValid() ? itemid.string() : TQString::null; + m_uniqueId = itemid.isValid() ? itemid.string() : TQString(); // because whoever designed KMetaInfoItem is a donkey #define makeSane( x ) if( x == "---" ) x = null; @@ -511,7 +511,7 @@ MetaBundle::readTags( TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImag tag = fileref.tag(); if ( tag ) { - #define strip( x ) TStringToQString( x ).stripWhiteSpace() + #define strip( x ) TQString(TStringToQString( x )).stripWhiteSpace() setTitle( strip( tag->title() ) ); setArtist( strip( tag->artist() ) ); setAlbum( strip( tag->album() ) ); @@ -536,19 +536,19 @@ MetaBundle::readTags( TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImag if ( file->ID3v2Tag() ) { if ( !file->ID3v2Tag()->frameListMap()["TPOS"].isEmpty() ) - disc = TStringToQString( file->ID3v2Tag()->frameListMap()["TPOS"].front()->toString() ).stripWhiteSpace(); + disc = TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TPOS"].front()->toString() )).stripWhiteSpace(); if ( !file->ID3v2Tag()->frameListMap()["TBPM"].isEmpty() ) - setBpm( TStringToQString( file->ID3v2Tag()->frameListMap()["TBPM"].front()->toString() ).stripWhiteSpace().toFloat() ); + setBpm( TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TBPM"].front()->toString() )).stripWhiteSpace().toFloat() ); if ( !file->ID3v2Tag()->frameListMap()["TCOM"].isEmpty() ) - setComposer( TStringToQString( file->ID3v2Tag()->frameListMap()["TCOM"].front()->toString() ).stripWhiteSpace() ); + setComposer( TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TCOM"].front()->toString() )).stripWhiteSpace() ); if ( !file->ID3v2Tag()->frameListMap()["TPE2"].isEmpty() ) // non-standard: Apple, Microsoft - setAlbumArtist( TStringToQString( file->ID3v2Tag()->frameListMap()["TPE2"].front()->toString() ).stripWhiteSpace() ); + setAlbumArtist( TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TPE2"].front()->toString() )).stripWhiteSpace() ); if ( !file->ID3v2Tag()->frameListMap()["TCMP"].isEmpty() ) - compilation = TStringToQString( file->ID3v2Tag()->frameListMap()["TCMP"].front()->toString() ).stripWhiteSpace(); + compilation = TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TCMP"].front()->toString() )).stripWhiteSpace(); if(images) { loadImagesFromTag( *file->ID3v2Tag(), *images ); @@ -561,16 +561,16 @@ MetaBundle::readTags( TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImag if ( file->tag() ) { if ( !file->tag()->fieldListMap()[ "COMPOSER" ].isEmpty() ) - setComposer( TStringToQString( file->tag()->fieldListMap()["COMPOSER"].front() ).stripWhiteSpace() ); + setComposer( TQString(TStringToQString( file->tag()->fieldListMap()["COMPOSER"].front() )).stripWhiteSpace() ); if ( !file->tag()->fieldListMap()[ "BPM" ].isEmpty() ) - setBpm( TStringToQString( file->tag()->fieldListMap()["BPM"].front() ).stripWhiteSpace().toFloat() ); + setBpm( TQString(TStringToQString( file->tag()->fieldListMap()["BPM"].front() )).stripWhiteSpace().toFloat() ); if ( !file->tag()->fieldListMap()[ "DISCNUMBER" ].isEmpty() ) - disc = TStringToQString( file->tag()->fieldListMap()["DISCNUMBER"].front() ).stripWhiteSpace(); + disc = TQString(TStringToQString( file->tag()->fieldListMap()["DISCNUMBER"].front() )).stripWhiteSpace(); if ( !file->tag()->fieldListMap()[ "COMPILATION" ].isEmpty() ) - compilation = TStringToQString( file->tag()->fieldListMap()["COMPILATION"].front() ).stripWhiteSpace(); + compilation = TQString(TStringToQString( file->tag()->fieldListMap()["COMPILATION"].front() )).stripWhiteSpace(); } } else if ( TagLib::FLAC::File *file = dynamic_cast<TagLib::FLAC::File *>( fileref.file() ) ) @@ -579,16 +579,16 @@ MetaBundle::readTags( TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImag if ( file->xiphComment() ) { if ( !file->xiphComment()->fieldListMap()[ "COMPOSER" ].isEmpty() ) - setComposer( TStringToQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() ).stripWhiteSpace() ); + setComposer( TQString(TStringToQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() )).stripWhiteSpace() ); if ( !file->xiphComment()->fieldListMap()[ "BPM" ].isEmpty() ) - setBpm( TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).stripWhiteSpace().toFloat() ); + setBpm( TQString(TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() )).stripWhiteSpace().toFloat() ); if ( !file->xiphComment()->fieldListMap()[ "DISCNUMBER" ].isEmpty() ) - disc = TStringToQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() ).stripWhiteSpace(); + disc = TQString(TStringToQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() )).stripWhiteSpace(); if ( !file->xiphComment()->fieldListMap()[ "COMPILATION" ].isEmpty() ) - compilation = TStringToQString( file->xiphComment()->fieldListMap()["COMPILATION"].front() ).stripWhiteSpace(); + compilation = TQString(TStringToQString( file->xiphComment()->fieldListMap()["COMPILATION"].front() )).stripWhiteSpace(); } if ( images && file->ID3v2Tag() ) { @@ -601,7 +601,7 @@ MetaBundle::readTags( TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImag TagLib::MP4::Tag *mp4tag = dynamic_cast<TagLib::MP4::Tag *>( file->tag() ); if( mp4tag ) { - setComposer( TStringToQString( mp4tag->composer() ) ); + setComposer( TQString(TStringToQString( mp4tag->composer() )) ); setBpm( TQString::number( mp4tag->bpm() ).toFloat() ); disc = TQString::number( mp4tag->disk() ); compilation = TQString::number( mp4tag->compilation() ); @@ -613,7 +613,7 @@ MetaBundle::readTags( TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImag if ( !disc.isEmpty() ) { - int i = disc.find ('/'); + int i = disc.tqfind ('/'); if ( i != -1 ) // disc.right( i ).toInt() is total number of discs, we don't use this at the moment setDiscNumber( disc.left( i ).toInt() ); @@ -638,7 +638,7 @@ MetaBundle::readTags( TagLib::AudioProperties::ReadStyle readStyle, EmbeddedImag //FIXME disabled for beta4 as it's simpler to not got 100 bug reports //else if( KMimeType::findByUrl( m_url )->is( "audio" ) ) - // init( KFileMetaInfo( m_url, TQString::null, KFileMetaInfo::Everything ) ); + // init( KFileMetaInfo( m_url, TQString(), KFileMetaInfo::Everything ) ); } void MetaBundle::updateFilesize() @@ -728,7 +728,7 @@ void MetaBundle::copyFrom( const PodcastEpisodeBundle &peb ) setTitle( peb.title() ); setArtist( peb.author() ); PodcastChannelBundle pcb; - if( CollectionDB::instance()->getPodcastChannelBundle( peb.parent(), &pcb ) ) + if( CollectionDB::instance()->getPodcastChannelBundle( peb.tqparent(), &pcb ) ) { if( !pcb.title().isEmpty() ) setAlbum( pcb.title() ); @@ -807,11 +807,11 @@ TQString MetaBundle::prettyText( int column ) const case Artist: text = artist(); break; case AlbumArtist: text = albumArtist(); break; case Composer: text = composer(); break; - case Year: text = year() ? TQString::number( year() ) : TQString::null; break; + case Year: text = year() ? TQString::number( year() ) : TQString(); break; case Album: text = album(); break; - case DiscNumber: text = discNumber() ? TQString::number( discNumber() ) : TQString::null; break; - case Bpm: text = bpm() ? TQString::number( bpm() ) : TQString::null; break; - case Track: text = track() ? TQString::number( track() ) : TQString::null; break; + case DiscNumber: text = discNumber() ? TQString::number( discNumber() ) : TQString(); break; + case Bpm: text = bpm() ? TQString::number( bpm() ) : TQString(); break; + case Track: text = track() ? TQString::number( track() ) : TQString(); break; case Genre: text = genre(); break; case Comment: text = comment(); break; case Directory: text = url().isEmpty() ? TQString() : directory(); break; @@ -827,7 +827,7 @@ TQString MetaBundle::prettyText( int column ) const case Mood: text = moodbar_const().state() == Moodbar::JobRunning ? i18n( "Calculating..." ) : moodbar_const().state() == Moodbar::JobQueued ? i18n( "Queued..." ) - : TQString::null; + : TQString(); break; default: warning() << "Tried to get the text of a nonexistent column!" << endl; break; } @@ -843,7 +843,7 @@ bool MetaBundle::matchesSimpleExpression( const TQString &expression, const TQVa { uint y = 0, n = columns.count(); for(; y < n; ++y ) - if ( prettyText( columns[y] ).lower().contains( terms[x] ) ) + if ( prettyText( columns[y] ).lower().tqcontains( terms[x] ) ) break; matches = ( y < n ); } @@ -891,7 +891,7 @@ bool MetaBundle::matchesFast(const TQStringList &terms, ColumnMask columnMask) c // now search for (uint i = 0; i < terms.count(); i++) { - if (!m_searchStr.contains(terms[i])) return false; + if (!m_searchStr.tqcontains(terms[i])) return false; } return true; @@ -974,7 +974,7 @@ bool MetaBundle::matchesParsedExpression( const ParsedExpression &data, const TQ condition = v.toFloat() > w.toFloat(); else if( column == Length ) { - int g = v.find( ':' ), h = w.find( ':' ); + int g = v.tqfind( ':' ), h = w.tqfind( ':' ); condition = v.left( g ).toInt() > w.left( h ).toInt() || ( v.left( g ).toInt() == w.left( h ).toInt() && v.mid( g + 1 ).toInt() > w.mid( h + 1 ).toInt() ); @@ -990,7 +990,7 @@ bool MetaBundle::matchesParsedExpression( const ParsedExpression &data, const TQ condition = v.toFloat() < w.toFloat(); else if( column == Length ) { - int g = v.find( ':' ), h = w.find( ':' ); + int g = v.tqfind( ':' ), h = w.tqfind( ':' ); condition = v.left( g ).toInt() < w.left( h ).toInt() || ( v.left( g ).toInt() == w.left( h ).toInt() && v.mid( g + 1 ).toInt() < w.mid( h + 1 ).toInt() ); @@ -1006,12 +1006,12 @@ bool MetaBundle::matchesParsedExpression( const ParsedExpression &data, const TQ condition = v.toFloat() == w.toFloat(); else if( column == Length ) { - int g = v.find( ':' ), h = w.find( ':' ); + int g = v.tqfind( ':' ), h = w.tqfind( ':' ); condition = v.left( g ).toInt() == w.left( h ).toInt() && v.mid( g + 1 ).toInt() == w.mid( h + 1 ).toInt(); } else - condition = v.contains( q, false ); + condition = v.tqcontains( q, false ); } if( condition == ( e.negate ? false : true ) ) { @@ -1023,7 +1023,7 @@ bool MetaBundle::matchesParsedExpression( const ParsedExpression &data, const TQ { for( int it = 0, end = defaults.size(); it != end; ++it ) { - b = prettyText( defaults[it] ).contains( e.text, false ) == ( e.negate ? false : true ); + b = prettyText( defaults[it] ).tqcontains( e.text, false ) == ( e.negate ? false : true ); if( ( e.negate && !b ) || ( !e.negate && b ) ) break; } @@ -1038,7 +1038,7 @@ bool MetaBundle::matchesParsedExpression( const ParsedExpression &data, const TQ return true; } -QString +TQString MetaBundle::prettyTitle() const { TQString s = artist(); @@ -1051,14 +1051,14 @@ MetaBundle::prettyTitle() const if( s.isEmpty() ) s = title(); else - s = i18n("%1 - %2").arg( artist(), title() ); + s = i18n("%1 - %2").tqarg( artist(), title() ); if( s.isEmpty() ) s = prettyTitle( filename() ); return s; } -QString +TQString MetaBundle::veryNiceTitle() const { TQString s; @@ -1067,7 +1067,7 @@ MetaBundle::veryNiceTitle() const if( !title().isEmpty() ) { if( !artist().isEmpty() ) - s = i18n( "%1 by %2" ).arg( title(), artist() ); + s = i18n( "%1 by %2" ).tqarg( title(), artist() ); else s = title(); } @@ -1078,7 +1078,7 @@ MetaBundle::veryNiceTitle() const return s; } -QString +TQString MetaBundle::prettyTitle( const TQString &filename ) //static { TQString s = filename; //just so the code is more readable @@ -1088,13 +1088,13 @@ MetaBundle::prettyTitle( const TQString &filename ) //static s = s.left( s.length() - 5 ); //remove file extension, s/_/ /g and decode %2f-like sequences - s = s.left( s.findRev( '.' ) ).replace( '_', ' ' ); + s = s.left( s.tqfindRev( '.' ) ).tqreplace( '_', ' ' ); s = KURL::decode_string( s ); return s; } -QString +TQString MetaBundle::prettyLength( int seconds, bool showHours ) //static { if( seconds > 0 ) return prettyTime( seconds, showHours ); @@ -1104,7 +1104,7 @@ MetaBundle::prettyLength( int seconds, bool showHours ) //static return TQString(); //Unavailable = "" } -QString +TQString MetaBundle::prettyTime( uint seconds, bool showHours ) //static { TQString s = TQChar( ':' ); @@ -1124,7 +1124,7 @@ MetaBundle::prettyTime( uint seconds, bool showHours ) //static return s; } -QString +TQString MetaBundle::veryPrettyTime( int time ) { if( time == Undetermined ) @@ -1146,15 +1146,15 @@ MetaBundle::veryPrettyTime( int time ) switch( s.count() ) { - case 1: return i18n( "seconds", "%1s" ).arg( s[0] ); - case 2: return i18n( "minutes, seconds", "%2m %1s" ).arg( s[0], s[1] ); - case 3: return i18n( "hours, minutes, seconds", "%3h %2m %1s" ).arg( s[0], s[1], s[2] ); - case 4: return i18n( "days, hours, minutes, seconds", "%4d %3h %2m %1s" ).arg( s[0], s[1], s[2], s[3] ); + case 1: return i18n( "seconds", "%1s" ).tqarg( s[0] ); + case 2: return i18n( "minutes, seconds", "%2m %1s" ).tqarg( s[0], s[1] ); + case 3: return i18n( "hours, minutes, seconds", "%3h %2m %1s" ).tqarg( s[0], s[1], s[2] ); + case 4: return i18n( "days, hours, minutes, seconds", "%4d %3h %2m %1s" ).tqarg( s[0], s[1], s[2], s[3] ); default: return "omg bug!"; } } -QString +TQString MetaBundle::fuzzyTime( int time ) { TQString s; @@ -1208,16 +1208,16 @@ MetaBundle::fuzzyTime( int time ) TQString hours = i18n( "1 hour", "%n hours", hr ); if( week ) - return weeks.arg( day ? days.arg("") : "" ).simplifyWhiteSpace(); + return weeks.tqarg( day ? days.tqarg("") : "" ).simplifyWhiteSpace(); else if ( day ) - return days.arg( hr ? hours : "" ).simplifyWhiteSpace(); + return days.tqarg( hr ? hours : "" ).simplifyWhiteSpace(); else if ( hr ) - return i18n( "%1:%2 hours" ).arg( hr ).arg( zeroPad( min ) ); + return i18n( "%1:%2 hours" ).tqarg( hr ).tqarg( zeroPad( min ) ); else - return i18n( "%1:%2").arg( min ).arg( zeroPad( secs ) ); + return i18n( "%1:%2").tqarg( min ).tqarg( zeroPad( secs ) ); } -QString +TQString MetaBundle::prettyBitrate( int i ) { //the point here is to force sharing of these strings returned from prettyBitrate() @@ -1229,13 +1229,13 @@ MetaBundle::prettyBitrate( int i ) : prettyGeneric( "%1", i ); } -QString +TQString MetaBundle::prettyFilesize( int s ) { return KIO::convertSize( s ); } -QString +TQString MetaBundle::prettyRating( int r, bool trailingzero ) //static { if( trailingzero ) @@ -1244,7 +1244,7 @@ MetaBundle::prettyRating( int r, bool trailingzero ) //static return r ? TQString::number( float( r ) / 2 ) : TQString(); } -QString +TQString MetaBundle::ratingDescription( int r ) { switch( r ) @@ -1264,18 +1264,18 @@ MetaBundle::ratingDescription( int r ) return "if you can see this, then that's a bad sign."; } -QStringList +TQStringList MetaBundle::ratingList() { TQString s = i18n( "rating - description", "%1 - %2" ); TQStringList list; list += ratingDescription( 0 ); for ( int i = 1; i<=10; i++ ) - list += s.arg( prettyRating( i, true ) ).arg( ratingDescription( i ) ); + list += s.tqarg( prettyRating( i, true ) ).tqarg( ratingDescription( i ) ); return list; } -QStringList +TQStringList MetaBundle::genreList() //static { TQStringList list; @@ -1506,10 +1506,10 @@ MetaBundle::save( TagLib::FileRef* fileref ) return returnval; } -// QT's version encodeAttr is 1) private to QDom, and 2) a litte slow. This +// QT's version encodeAttr is 1) private to TQDom, and 2) a litte slow. This // one can be made public if needed. It happens to be on a critical path // (each char of playlist / undo save). TQStyleSheet::escape does not deal with -// unicode chars illegal for XML. There's a lot of junk in those tags +// tqunicode chars illegal for XML. There's a lot of junk in those tags static inline void xmlEncode(TQTextStream &stream, const TQString &str) { TQString tmp; @@ -1517,7 +1517,7 @@ static inline void xmlEncode(TQTextStream &stream, const TQString &str) uint i = 0; while ( i < cur->length() ) { - uint uc = (*cur)[i].unicode(); + uint uc = (*cur)[i].tqunicode(); // we try to accumulate unescaped chars before writing to stream const char *escaped; // careful about the order of tests, common before less common @@ -1530,7 +1530,7 @@ static inline void xmlEncode(TQTextStream &stream, const TQString &str) else if ( uc == '"' ) escaped = """; else { - // see if it's a XML-valid unicode char at all + // see if it's a XML-valid tqunicode char at all if ( (0x20 <= uc && uc <= 0xD7FF || 0xE000 <= uc && uc <= 0xFFFD || uc == 0x9 || uc == 0xA || uc == 0xD) ) // fairly common, other ascii chars @@ -1556,7 +1556,7 @@ static inline void xmlEncode(TQTextStream &stream, const TQString &str) bool MetaBundle::save(TQTextStream &stream, const TQStringList &attributes) const { - // QDom is too slow to use here + // TQDom is too slow to use here stream << " <item url=\""; xmlEncode( stream, url().url() ); stream << "\" uniqueid=\"" << uniqueId() << '\"'; @@ -1653,7 +1653,7 @@ MetaBundle::readUniqueIdHelper( TagLib::FileRef fileref ) const return bv; } -QString +TQString MetaBundle::readUniqueId( TagLib::FileRef* fileref ) { //This is used in case we don't get given a fileref @@ -1696,7 +1696,7 @@ MetaBundle::readUniqueId( TagLib::FileRef* fileref ) return TQString(); } - return TQString::null; + return TQString(); } int @@ -1717,7 +1717,7 @@ MetaBundle::getRand() return rand(); } -QString +TQString MetaBundle::getRandomString( int size, bool numbersOnly ) { if( size != 8 ) @@ -1739,7 +1739,7 @@ MetaBundle::getRandomString( int size, bool numbersOnly ) // shift the value to the visible characters r+=33; // we don't want ", %, ', <, >, \, `, or & - // so that we don't have issues with escaping/quoting in QStrings, + // so that we don't have issues with escaping/quoting in TQStrings, // and so that we don't have <> in our XML files where they might cause issues // hopefully this list is final, as once users really start using this // it will be a pain to change...however, there is an ATF version in CollectionDB @@ -1871,7 +1871,7 @@ void PodcastEpisodeBundle::detach() { m_url = Amarok::detachedKURL( m_url ); m_localUrl = Amarok::detachedKURL( m_localUrl ); - m_parent = Amarok::detachedKURL( m_parent ); + m_tqparent = Amarok::detachedKURL( m_tqparent ); m_author = TQDeepCopy<TQString>(m_author); m_title = TQDeepCopy<TQString>(m_title); diff --git a/amarok/src/metabundle.h b/amarok/src/metabundle.h index 98d20161..ddfd3f0e 100644 --- a/amarok/src/metabundle.h +++ b/amarok/src/metabundle.h @@ -102,9 +102,9 @@ public: typedef TQValueList<EmbeddedImage> EmbeddedImageList; /** 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 QValue<int> - column masks with this eventually. */ - typedef Q_UINT32 ColumnMask; + in matchFast. It might be a good idea to replace the TQValue<int> + column tqmasks with this eventually. */ + typedef TQ_UINT32 ColumnMask; /** Returns the name of the column at \p index as a string -- not i18ned, for internal purposes. */ static const TQString &exactColumnName( int index ); @@ -410,7 +410,7 @@ protected: // whether the search text should be rebuilt volatile mutable bool m_isSearchDirty; - // which columns the search string contains + // which columns the search string tqcontains mutable ColumnMask m_searchColumns; // the search string: textualized columns separated by space // note that matchFast searches by words, hence a word cannot span @@ -420,7 +420,7 @@ private: static inline TQString prettyGeneric( const TQString &s, const int i ) { - return (i > 0) ? s.arg( i ) : (i == Undetermined) ? "?" : "-"; + return (i > 0) ? s.tqarg( i ) : (i == Undetermined) ? "?" : "-"; } void init( TagLib::AudioProperties *ap = 0 ); @@ -514,7 +514,7 @@ inline int MetaBundle::compilation() const inline TQString MetaBundle::type() const { return isFile() - ? filename().mid( filename().findRev( '.' ) + 1 ) + ? filename().mid( filename().tqfindRev( '.' ) + 1 ) : i18n( "Stream" ); } inline PodcastEpisodeBundle *MetaBundle::podcastBundle() const { return m_podcastBundle; } @@ -533,7 +533,7 @@ inline TQString MetaBundle::prettySampleRate( bool shortened ) const return prettyGeneric( i18n( "SampleRate", "%1 Hz" ), m_sampleRate ); } -inline TQString MetaBundle::zeroPad( uint i ) { return ( i < 10 ) ? TQString( "0%1" ).arg( i ) : TQString::number( i ); } +inline TQString MetaBundle::zeroPad( uint i ) { return ( i < 10 ) ? TQString( "0%1" ).tqarg( i ) : TQString::number( i ); } inline bool MetaBundle::hasExtendedMetaInformation() const { diff --git a/amarok/src/metabundlesaver.cpp b/amarok/src/metabundlesaver.cpp index 371b5b51..612d30b9 100644 --- a/amarok/src/metabundlesaver.cpp +++ b/amarok/src/metabundlesaver.cpp @@ -39,8 +39,8 @@ MetaBundleSaver::MetaBundleSaver( MetaBundle *bundle ) : TQObject() , m_bundle( bundle ) - , m_tempSavePath( TQString::null ) - , m_origRenamedSavePath( TQString::null ) + , m_tempSavePath( TQString() ) + , m_origRenamedSavePath( TQString() ) , m_tempSaveDigest( 0 ) , m_saveFileref( 0 ) , m_maxlen( 8192 ) @@ -110,7 +110,7 @@ MetaBundleSaver::prepareToSave() return 0; } - Q_LONG actualreadlen, actualwritelen; + TQ_LONG actualreadlen, actualwritelen; while( ( actualreadlen = orig.readBlock( m_databuf, m_maxlen ) ) > 0 ) { @@ -163,7 +163,7 @@ MetaBundleSaver::doSave() TQFile origRenamedFile( m_origRenamedSavePath ); KMD5 md5sum( 0, 0 ); - Q_LONG actualreadlen; + TQ_LONG actualreadlen; int errcode; @@ -292,8 +292,8 @@ MetaBundleSaver::cleanupSave() } } - m_tempSavePath = TQString::null; - m_origRenamedSavePath = TQString::null; + m_tempSavePath = TQString(); + m_origRenamedSavePath = TQString(); m_tempSaveDigest = TQCString( 0 ); if( m_saveFileref ) { diff --git a/amarok/src/metabundlesaver.h b/amarok/src/metabundlesaver.h index 84046954..44bebac8 100644 --- a/amarok/src/metabundlesaver.h +++ b/amarok/src/metabundlesaver.h @@ -24,9 +24,10 @@ namespace TagLib { * @author Jeff Mitchell <kde-dev@emailgoeshere.com> */ -class LIBAMAROK_EXPORT MetaBundleSaver : public QObject +class LIBAMAROK_EXPORT MetaBundleSaver : public TQObject { Q_OBJECT + TQ_OBJECT public: MetaBundleSaver( MetaBundle *bundle ); ~MetaBundleSaver(); @@ -44,7 +45,7 @@ private: TQCString m_tempSaveDigest; TagLib::FileRef* m_saveFileref; char m_databuf[8192]; - Q_ULONG m_maxlen; + TQ_ULONG m_maxlen; bool m_cleanupNeeded; }; diff --git a/amarok/src/metadata/asf/asfattribute.cpp b/amarok/src/metadata/asf/asfattribute.cpp index bfe81c57..5c832431 100644 --- a/amarok/src/metadata/asf/asfattribute.cpp +++ b/amarok/src/metadata/asf/asfattribute.cpp @@ -100,7 +100,7 @@ ASF::Attribute::Attribute(unsigned int value) ASF::Attribute::Attribute(unsigned long long value) { d = new AttributePrivate; - d->type = QWordType; + d->type = TQWordType; d->longLongValue = value; } @@ -205,8 +205,8 @@ ASF::Attribute::parse(ASF::File &f, int kind) d->intValue = f.readDWORD(); break; - case QWordType: - d->longLongValue = f.readQWORD(); + case TQWordType: + d->longLongValue = f.readTQWORD(); break; case UnicodeType: @@ -245,7 +245,7 @@ ASF::Attribute::render(const String &name, int kind) const data.append(ByteVector::fromUInt(d->intValue, false)); break; - case QWordType: + case TQWordType: data.append(ByteVector::fromLongLong(d->longLongValue, false)); break; diff --git a/amarok/src/metadata/asf/asfattribute.h b/amarok/src/metadata/asf/asfattribute.h index 9a8e3c90..9624f33d 100644 --- a/amarok/src/metadata/asf/asfattribute.h +++ b/amarok/src/metadata/asf/asfattribute.h @@ -45,7 +45,7 @@ namespace TagLib BytesType = 1, BoolType = 2, DWordType = 3, - QWordType = 4, + TQWordType = 4, WordType = 5, GuidType = 6 }; @@ -71,7 +71,7 @@ namespace TagLib Attribute(unsigned int value); /*! - * Constructs an attribute with \a key and a QWordType \a value. + * Constructs an attribute with \a key and a TQWordType \a value. */ Attribute(unsigned long long value); @@ -121,7 +121,7 @@ namespace TagLib unsigned int toUInt() const; /*! - * Returns the QWordType \a value. + * Returns the TQWordType \a value. */ unsigned long long toULongLong() const; diff --git a/amarok/src/metadata/asf/asffile.cpp b/amarok/src/metadata/asf/asffile.cpp index 55a12ccc..bbe5ee5f 100644 --- a/amarok/src/metadata/asf/asffile.cpp +++ b/amarok/src/metadata/asf/asffile.cpp @@ -325,7 +325,7 @@ ASF::File::HeaderExtensionObject::parse(ASF::File *file, uint /*size*/) long long dataPos = 0; while(dataPos < dataSize) { ByteVector guid = file->readBlock(16); - long long size = file->readQWORD(); + long long size = file->readTQWORD(); BaseObject *obj; if(guid == metadataGuid) { obj = new MetadataObject(); @@ -401,13 +401,13 @@ void ASF::File::read(bool /*readProperties*/, Properties::ReadStyle /*properties d->tag = new ASF::Tag(); d->properties = new ASF::Properties(); - d->size = readQWORD(); + d->size = readTQWORD(); int numObjects = readDWORD(); seek(2, Current); for(int i = 0; i < numObjects; i++) { ByteVector guid = readBlock(16); - long size = (long)readQWORD(); + long size = (long)readTQWORD(); BaseObject *obj; if(guid == filePropertiesGuid) { obj = new FilePropertiesObject(); @@ -513,7 +513,7 @@ unsigned int ASF::File::readDWORD() return v.toUInt(false); } -long long ASF::File::readQWORD() +long long ASF::File::readTQWORD() { ByteVector v = readBlock(8); return v.toLongLong(false); diff --git a/amarok/src/metadata/asf/asffile.h b/amarok/src/metadata/asf/asffile.h index db973313..618a3a90 100644 --- a/amarok/src/metadata/asf/asffile.h +++ b/amarok/src/metadata/asf/asffile.h @@ -86,7 +86,7 @@ namespace TagLib { int readBYTE(); int readWORD(); unsigned int readDWORD(); - long long readQWORD(); + long long readTQWORD(); static ByteVector renderString(const String &str, bool includeLength = false); String readString(int len); void read(bool readProperties, Properties::ReadStyle propertiesStyle); diff --git a/amarok/src/metadata/m4a/mp4file.h b/amarok/src/metadata/m4a/mp4file.h index 9e40dbc9..c1da43d6 100644 --- a/amarok/src/metadata/m4a/mp4file.h +++ b/amarok/src/metadata/m4a/mp4file.h @@ -104,7 +104,7 @@ namespace TagLib { /*! * This will remove all tags. * - * \note This will also invalidate pointers to the tags + * \note This will also tqinvalidate pointers to the tags * as their memory will be freed. * \note In order to make the removal permanent save() still needs to be called */ diff --git a/amarok/src/metadata/m4a/mp4mvhdbox.cpp b/amarok/src/metadata/m4a/mp4mvhdbox.cpp index 36053e4b..894f7f89 100644 --- a/amarok/src/metadata/m4a/mp4mvhdbox.cpp +++ b/amarok/src/metadata/m4a/mp4mvhdbox.cpp @@ -39,7 +39,7 @@ public: TagLib::uint timescale; //! duration of presentation TagLib::ulonglong duration; - //! playout speed + //! ptqlayout speed TagLib::uint rate; //! volume for entire presentation TagLib::uint volume; diff --git a/amarok/src/metadata/m4a/mp4mvhdbox.h b/amarok/src/metadata/m4a/mp4mvhdbox.h index b133485e..31e3d740 100644 --- a/amarok/src/metadata/m4a/mp4mvhdbox.h +++ b/amarok/src/metadata/m4a/mp4mvhdbox.h @@ -44,7 +44,7 @@ namespace TagLib uint timescale() const; //! function to get the presentation duration in the mp4 file ulonglong duration() const; - //! function to get the rate (playout speed) - typically 1.0; + //! function to get the rate (ptqlayout speed) - typically 1.0; uint rate() const; //! function to get volume level for presentation - typically 1.0; uint volume() const; diff --git a/amarok/src/metadata/m4a/mp4propsproxy.h b/amarok/src/metadata/m4a/mp4propsproxy.h index 0ea29e2b..c6b6f9df 100644 --- a/amarok/src/metadata/m4a/mp4propsproxy.h +++ b/amarok/src/metadata/m4a/mp4propsproxy.h @@ -29,7 +29,7 @@ namespace TagLib namespace MP4 { //! Mp4PropsProxy is used to access the stsd box and mvhd box directly - /*! this class works as a shortcut to avoid stepping through all parent boxes + /*! this class works as a shortcut to avoid stepping through all tqparent boxes * to access the boxes in question */ class Mp4PropsProxy diff --git a/amarok/src/metadata/trueaudio/ttafile.h b/amarok/src/metadata/trueaudio/ttafile.h index 2cb07856..3a97a9ef 100644 --- a/amarok/src/metadata/trueaudio/ttafile.h +++ b/amarok/src/metadata/trueaudio/ttafile.h @@ -154,7 +154,7 @@ namespace TagLib { * This will remove the tags that match the OR-ed together TagTypes from the * file. By default it removes all tags. * - * \note This will also invalidate pointers to the tags + * \note This will also tqinvalidate pointers to the tags * as their memory will be freed. * \note In order to make the removal permanent save() still needs to be called */ diff --git a/amarok/src/metadata/wavpack/wvfile.h b/amarok/src/metadata/wavpack/wvfile.h index 6c57f6d7..18f2316e 100644 --- a/amarok/src/metadata/wavpack/wvfile.h +++ b/amarok/src/metadata/wavpack/wvfile.h @@ -136,7 +136,7 @@ namespace TagLib { * This will remove the tags that match the OR-ed together TagTypes from the * file. By default it removes all tags. * - * \note This will also invalidate pointers to the tags + * \note This will also tqinvalidate pointers to the tags * as their memory will be freed. * \note In order to make the removal permanent save() still needs to be called */ diff --git a/amarok/src/moodbar.cpp b/amarok/src/moodbar.cpp index c80c3ab1..9b89901b 100644 --- a/amarok/src/moodbar.cpp +++ b/amarok/src/moodbar.cpp @@ -142,7 +142,7 @@ // dataExists() or load() is called. Note that load() // will return immediately unless the state is Unloaded. // CantLoad: For some reason we know that we'll never be able to -// load the Moodbar, for instance if the parent bundle +// load the Moodbar, for instance if the tqparent bundle // describes a streaming source. Most methods will return // immediately in this state. // JobQueued: At some point load() was called, so we queued a job with @@ -163,7 +163,7 @@ // aren't displayed in the GUI. // // Important members: -// m_bundle: link to the parent bundle +// m_bundle: link to the tqparent bundle // m_data: if we are loaded, this is the contents of the .mood file // m_pixmap: the last time draw() was called, we cached what we drew // here @@ -514,11 +514,11 @@ MoodServer::slotJobCompleted( KProcess *proc ) if( proc != m_currentProcess ) warning() << "MoodServer::slotJobCompleted: proc != m_currentProcess!" << endl; - ReturnStatus returnval; + ReturntqStatus returnval; if( !m_currentProcess->normalExit() ) returnval = Crash; else - returnval = (ReturnStatus) m_currentProcess->exitStatus(); + returnval = (ReturntqStatus) m_currentProcess->exitStatus(); bool success = (returnval == Success); KURL url = m_currentData.m_url; @@ -526,8 +526,8 @@ MoodServer::slotJobCompleted( KProcess *proc ) if( success ) { TQString file = m_currentData.m_outfile; - TQString dir = file.left( file.findRev( '/' ) ); - file = file.right( file.length() - file.findRev( '/' ) - 1 ); + TQString dir = file.left( file.tqfindRev( '/' ) ); + file = file.right( file.length() - file.tqfindRev( '/' ) - 1 ); TQDir( dir ).rename( file + ".tmp", file ); } else @@ -802,7 +802,7 @@ Moodbar::detach( void ) m_data = TQDeepCopy<ColorList>(m_data); m_pixmap.detach(); - // Apparently this is the wrong hack -- don't detach urls + // Aptqparently this is the wrong hack -- don't detach urls //TQString url( TQDeepCopy<TQString>( m_url.url() ) ); //m_url = KURL::fromPathOrURL( url ); @@ -964,7 +964,7 @@ Moodbar::slotJobEvent( KURL url, int newState ) // Draw the moodbar onto a pixmap of the given dimensions and return // it. This is mostly Gav's original code, cut and pasted from // various places. This will not change the state. -QPixmap +TQPixmap Moodbar::draw( int width, int height ) { if( m_state != Loaded || !AmarokConfig::showMoodbar() ) // Naughty caller! @@ -972,7 +972,7 @@ Moodbar::draw( int width, int height ) m_mutex.lock(); - // Do we have to repaint, or can we use the cache? + // Do we have to tqrepaint, or can we use the cache? if( m_pixmap.width() == width && m_pixmap.height() == height ) { m_mutex.unlock(); @@ -1300,15 +1300,15 @@ Moodbar::readFile( void ) // Returns where the mood file for this bundle should be located, // based on the user preferences. If no location can be determined, -// return TQString::null. +// return TQString(). -QString +TQString Moodbar::moodFilename( const KURL &url ) { return moodFilename( url, AmarokConfig::moodsWithMusic() ); } -QString +TQString Moodbar::moodFilename( const KURL &url, bool withMusic ) { // No need to lock the object @@ -1318,13 +1318,13 @@ Moodbar::moodFilename( const KURL &url, bool withMusic ) if( withMusic ) { path = url.path(); - path.truncate(path.findRev('.')); + path.truncate(path.tqfindRev('.')); if (path.isEmpty()) // Weird... return TQString(); path += ".mood"; - int slash = path.findRev('/') + 1; + int slash = path.tqfindRev('/') + 1; TQString dir = path.left(slash); TQString file = path.right(path.length() - slash); path = dir + '.' + file; @@ -1338,13 +1338,13 @@ Moodbar::moodFilename( const KURL &url, bool withMusic ) MountPointManager::instance()->getRelativePath( deviceid, url, relativePath ); path = relativePath.path(); - path.truncate(path.findRev('.')); + path.truncate(path.tqfindRev('.')); if (path.isEmpty()) // Weird... return TQString(); path = TQString::number( deviceid ) + ',' - + path.replace('/', ',') + ".mood"; + + path.tqreplace('/', ',') + ".mood"; // Creates the path if necessary path = ::locateLocal( "data", "amarok/moods/" + path ); diff --git a/amarok/src/moodbar.h b/amarok/src/moodbar.h index e456a0c0..4ae13cfb 100644 --- a/amarok/src/moodbar.h +++ b/amarok/src/moodbar.h @@ -36,9 +36,10 @@ class MetaBundle; -class Moodbar : public QObject +class Moodbar : public TQObject { Q_OBJECT + TQ_OBJECT public: typedef TQValueVector<TQColor> ColorList; @@ -95,7 +96,7 @@ signals: private: // Undefined! We can't construct unless we know what - // *our* parent bundle is. + // *our* tqparent bundle is. Moodbar( const Moodbar& ); bool readFile( void ); @@ -113,9 +114,10 @@ private: class KProcess; // For internal use only (well, mostly) -class MoodServer : public QObject +class MoodServer : public TQObject { Q_OBJECT + TQ_OBJECT public: static MoodServer *instance( void ); @@ -164,7 +166,7 @@ private: NoPlugin = 1, NoFile = 2, CommandLine = 3 - } ReturnStatus; + } ReturntqStatus; MoodServer( void ); void setMoodbarBroken( void ); diff --git a/amarok/src/mountpointmanager.cpp b/amarok/src/mountpointmanager.cpp index 313c7750..f8dd748b 100644 --- a/amarok/src/mountpointmanager.cpp +++ b/amarok/src/mountpointmanager.cpp @@ -166,12 +166,12 @@ MountPointManager::getIdForUrl( const TQString &url ) bool MountPointManager::isMounted ( const int deviceId ) const { m_handlerMapMutex.lock(); - bool result = m_handlerMap.contains( deviceId ); + bool result = m_handlerMap.tqcontains( deviceId ); m_handlerMapMutex.unlock(); return result; } -QString +TQString MountPointManager::getMountPointForId( const int id ) const { TQString mountPoint; @@ -200,7 +200,7 @@ MountPointManager::getAbsolutePath( const int deviceId, const KURL& relativePath return; } m_handlerMapMutex.lock(); - if ( m_handlerMap.contains( deviceId ) ) + if ( m_handlerMap.tqcontains( deviceId ) ) { m_handlerMap[deviceId]->getURL( absolutePath, relativePath ); m_handlerMapMutex.unlock(); @@ -210,7 +210,7 @@ MountPointManager::getAbsolutePath( const int deviceId, const KURL& relativePath m_handlerMapMutex.unlock(); TQStringList lastMountPoint = CollectionDB::instance()->query( TQString( "SELECT lastmountpoint FROM devices WHERE id = %1" ) - .arg( deviceId ) ); + .tqarg( deviceId ) ); if ( lastMountPoint.count() == 0 ) { //hmm, no device with that id in the DB...serious problem @@ -229,7 +229,7 @@ MountPointManager::getAbsolutePath( const int deviceId, const KURL& relativePath } } -QString +TQString MountPointManager::getAbsolutePath( const int deviceId, const TQString& relativePath ) const { KURL rpath; @@ -244,7 +244,7 @@ void MountPointManager::getRelativePath( const int deviceId, const KURL& absolutePath, KURL& relativePath ) const { m_handlerMapMutex.lock(); - if ( deviceId != -1 && m_handlerMap.contains( deviceId ) ) + if ( deviceId != -1 && m_handlerMap.tqcontains( deviceId ) ) { //FIXME max: returns garbage if the absolute path is actually not under the device's mount point TQString rpath = KURL::relativePath( m_handlerMap[deviceId]->getDevicePath(), absolutePath.path() ); @@ -260,7 +260,7 @@ MountPointManager::getRelativePath( const int deviceId, const KURL& absolutePath } } -QString +TQString MountPointManager::getRelativePath( const int deviceId, const TQString& absolutePath ) const { KURL url; @@ -288,7 +288,7 @@ MountPointManager::mediumChanged( const Medium *m ) } int key = handler->getDeviceID(); m_handlerMapMutex.lock(); - if ( m_handlerMap.contains( key ) ) + if ( m_handlerMap.tqcontains( key ) ) { debug() << "Key " << key << " already exists in handlerMap, replacing" << endl; delete m_handlerMap[key]; @@ -374,7 +374,7 @@ MountPointManager::mediumAdded( const Medium *m ) } int key = handler->getDeviceID(); m_handlerMapMutex.lock(); - if ( m_handlerMap.contains( key ) ) + if ( m_handlerMap.tqcontains( key ) ) { debug() << "Key " << key << " already exists in handlerMap, replacing" << endl; delete m_handlerMap[key]; @@ -399,7 +399,7 @@ MountPointManager::getMountedDeviceIds() const { return list; } -QStringList +TQStringList MountPointManager::collectionFolders( ) { //TODO max: cache data @@ -420,7 +420,7 @@ MountPointManager::collectionFolders( ) { absPath = getAbsolutePath( *it, *strIt ); } - if ( !result.contains( absPath ) ) + if ( !result.tqcontains( absPath ) ) result.append( absPath ); } } @@ -438,8 +438,8 @@ MountPointManager::setCollectionFolders( const TQStringList &folders ) { int id = getIdForUrl( *it ); TQString rpath = getRelativePath( id, *it ); - if ( folderMap.contains( id ) ) { - if ( !folderMap[id].contains( rpath ) ) + if ( folderMap.tqcontains( id ) ) { + if ( !folderMap[id].tqcontains( rpath ) ) folderMap[id].append( rpath ); } else @@ -449,7 +449,7 @@ MountPointManager::setCollectionFolders( const TQStringList &folders ) IdList ids = getMountedDeviceIds(); foreachType( IdList, ids ) { - if( !folderMap.contains( *it ) ) + if( !folderMap.tqcontains( *it ) ) { folderConf->deleteEntry( TQString::number( *it ) ); } @@ -471,10 +471,10 @@ MountPointManager::migrateStatistics() int deviceid = getIdForUrl( *it ); TQString rpath = getRelativePath( deviceid, *it ); TQString update = TQString( "UPDATE statistics SET deviceid = %1, url = '%2'" ) - .arg( deviceid ) - .arg( CollectionDB::instance()->escapeString( rpath ) ); + .tqarg( deviceid ) + .tqarg( CollectionDB::instance()->escapeString( rpath ) ); update += TQString( " WHERE url = '%1' AND deviceid = -2;" ) - .arg( CollectionDB::instance()->escapeString( *it ) ); + .tqarg( CollectionDB::instance()->escapeString( *it ) ); CollectionDB::instance()->query( update ); } } @@ -539,15 +539,15 @@ void UrlUpdateJob::updateStatistics( ) int statCount = collDB->query( TQString( "SELECT COUNT( url ) FROM statistics WHERE deviceid = %1 AND url = '%2';" ) - .arg( newDeviceid ) - .arg( collDB->escapeString( newRpath ) ) ).first().toInt(); + .tqarg( newDeviceid ) + .tqarg( collDB->escapeString( newRpath ) ) ).first().toInt(); if( statCount ) continue; //statistics row with new URL/deviceid values already exists TQString sql = TQString( "UPDATE statistics SET deviceid = %1, url = '%2'" ) - .arg( newDeviceid ).arg( collDB->escapeString( newRpath ) ); + .tqarg( newDeviceid ).tqarg( collDB->escapeString( newRpath ) ); sql += TQString( " WHERE deviceid = %1 AND url = '%2';" ) - .arg( deviceid ).arg( collDB->escapeString( rpath ) ); + .tqarg( deviceid ).tqarg( collDB->escapeString( rpath ) ); collDB->query( sql ); } } @@ -576,7 +576,7 @@ void UrlUpdateJob::updateLabels( ) //only update rows if there is not already a row with the new deviceid/rpath and the same labelid TQStringList labelids = collDB->query( TQString( "SELECT labelid FROM tags_labels WHERE deviceid = %1 AND url = '%2';" ) - .arg( TQString::number( newDeviceid ), collDB->escapeString( newRpath ) ) ); + .tqarg( TQString::number( newDeviceid ), collDB->escapeString( newRpath ) ) ); TQString existingLabelids; if( !labelids.isEmpty() ) { @@ -591,8 +591,8 @@ void UrlUpdateJob::updateLabels( ) } TQString sql = TQString( "UPDATE tags_labels SET deviceid = %1, url = '%2' " "WHERE deviceid = %3 AND url = '%4'%5;" ) - .arg( newDeviceid ) - .arg( collDB->escapeString( newRpath ), + .tqarg( newDeviceid ) + .tqarg( collDB->escapeString( newRpath ), TQString::number( deviceid ), collDB->escapeString( rpath ), existingLabelids ); diff --git a/amarok/src/mountpointmanager.h b/amarok/src/mountpointmanager.h index fdb52acd..482e99f9 100644 --- a/amarok/src/mountpointmanager.h +++ b/amarok/src/mountpointmanager.h @@ -146,6 +146,7 @@ public: */ class MountPointManager : public TQObject { Q_OBJECT + TQ_OBJECT signals: void mediumConnected( int deviceid ); diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp index 406b4ec6..83bd4fae 100644 --- a/amarok/src/multitabbar.cpp +++ b/amarok/src/multitabbar.cpp @@ -66,7 +66,7 @@ class MultiTabBarButtonPrivate }; -MultiTabBarInternal::MultiTabBarInternal( TQWidget *parent, MultiTabBar::MultiTabBarMode bm ) : TQScrollView( parent ) +MultiTabBarInternal::MultiTabBarInternal( TQWidget *tqparent, MultiTabBar::MultiTabBarMode bm ) : TQScrollView( tqparent ) { m_expandedTabSize = -1; m_showActiveTabTexts = false; @@ -89,9 +89,9 @@ MultiTabBarInternal::MultiTabBarInternal( TQWidget *parent, MultiTabBar::MultiTa } addChild( box ); setFrameStyle( NoFrame ); - viewport() ->setBackgroundMode( Qt::PaletteBackground ); - /* box->setPaletteBackgroundColor(Qt::red); - setPaletteBackgroundColor(Qt::green);*/ + viewport() ->setBackgroundMode( TQt::PaletteBackground ); + /* box->setPaletteBackgroundColor(TQt::red); + setPaletteBackgroundColor(TQt::green);*/ } void MultiTabBarInternal::setStyle( enum MultiTabBar::MultiTabBarStyle style ) @@ -124,7 +124,7 @@ void MultiTabBarInternal::setStyle( enum MultiTabBar::MultiTabBarStyle style ) mainLayout->setAutoAdd( true ); } - viewport() ->repaint(); + viewport() ->tqrepaint(); } void MultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph ) @@ -133,32 +133,32 @@ void MultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy if ( m_position == MultiTabBar::Right ) { - paint->setPen( colorGroup().shadow() ); + paint->setPen( tqcolorGroup().shadow() ); paint->drawLine( 0, 0, 0, viewport() ->height() ); - paint->setPen( colorGroup().background().dark( 120 ) ); + paint->setPen( tqcolorGroup().background().dark( 120 ) ); paint->drawLine( 1, 0, 1, viewport() ->height() ); } else if ( m_position == MultiTabBar::Left ) { - paint->setPen( colorGroup().light() ); + paint->setPen( tqcolorGroup().light() ); paint->drawLine( 23, 0, 23, viewport() ->height() ); paint->drawLine( 22, 0, 22, viewport() ->height() ); - paint->setPen( colorGroup().shadow() ); + paint->setPen( tqcolorGroup().shadow() ); paint->drawLine( 0, 0, 0, viewport() ->height() ); } else if ( m_position == MultiTabBar::Bottom ) { - paint->setPen( colorGroup().shadow() ); + paint->setPen( tqcolorGroup().shadow() ); paint->drawLine( 0, 0, viewport() ->width(), 0 ); - paint->setPen( colorGroup().background().dark( 120 ) ); + paint->setPen( tqcolorGroup().background().dark( 120 ) ); paint->drawLine( 0, 1, viewport() ->width(), 1 ); } else { - paint->setPen( colorGroup().light() ); + paint->setPen( tqcolorGroup().light() ); paint->drawLine( 0, 23, viewport() ->width(), 23 ); paint->drawLine( 0, 22, viewport() ->width(), 22 ); - /* paint->setPen(colorGroup().shadow()); + /* paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height());*/ } } @@ -189,7 +189,7 @@ void MultiTabBarInternal::showTabSelectionMenu(TQPoint pos) void MultiTabBarInternal::mousePressEvent( TQMouseEvent *ev ) { - if ( ev->button() != TQMouseEvent::RightButton ){ + if ( ev->button() != Qt::RightButton ){ ev->ignore(); return; } @@ -219,8 +219,8 @@ void MultiTabBarInternal::mousePressEvent( TQMouseEvent *ev ) void MultiTabBarInternal::resizeEvent( TQResizeEvent *ev ) { /* kdDebug()<<"MultiTabBarInternal::resizeEvent"<<endl; - kdDebug()<<"MultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl; - kdDebug()<<"MultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/ + kdDebug()<<"MultiTabBarInternal::resizeEvent - box tqgeometry"<<box->tqgeometry()<<endl; + kdDebug()<<"MultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<endl;*/ if ( ev ) TQScrollView::resizeEvent( ev ); @@ -375,7 +375,7 @@ bool MultiTabBarInternal::eventFilter( TQObject *, TQEvent *e ) //PATCH by markey: Allow switching of tabs with mouse wheel if ( e->type() == TQEvent::Wheel ) { - TQWheelEvent* event = static_cast<TQWheelEvent*>( e ); + TQWheelEvent* event = TQT_TQWHEELEVENT( e ); const int delta = event->delta() / 120; // Determine which tab is currently active @@ -419,7 +419,7 @@ int MultiTabBarInternal::appendTab( const TQPixmap &pic , int id, const TQString tab->showActiveTabText( m_showActiveTabTexts ); tab->setVisible( Amarok::config( "BrowserBar" )->readBoolEntry( identifier, true ) ); - if ( m_style == MultiTabBar::KONQSBC ) { + if ( m_style == MultiTabBar::KONTQSBC ) { if ( m_expandedTabSize < tab->neededSize() ) { m_expandedTabSize = tab->neededSize(); for ( uint i = 0;i < m_tabs.count();i++ ) @@ -481,7 +481,7 @@ void MultiTabBarInternal::setPosition( enum MultiTabBar::MultiTabBarPosition pos m_position = pos; for ( uint i = 0;i < m_tabs.count();i++ ) m_tabs.at( i ) ->setTabsPosition( m_position ); - viewport() ->repaint(); + viewport() ->tqrepaint(); } @@ -508,8 +508,8 @@ uint MultiTabBarInternal::sizePerTab() MultiTabBarButton::MultiTabBarButton( const TQPixmap& pic, const TQString& text, TQPopupMenu *popup, - int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ) - : TQPushButton( TQIconSet(), text, parent ) + int id, TQWidget *tqparent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ) + : TQPushButton( TQIconSet(), text, tqparent ) , m_position( pos ) , m_style( style ) , m_id( id ) @@ -532,8 +532,8 @@ MultiTabBarButton::MultiTabBarButton( const TQPixmap& pic, const TQString& text, } MultiTabBarButton::MultiTabBarButton( const TQString& text, TQPopupMenu *popup, - int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ) - : TQPushButton( TQIconSet(), text, parent ), m_style( style ) + int id, TQWidget *tqparent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ) + : TQPushButton( TQIconSet(), text, tqparent ), m_style( style ) , m_animCount( 0 ) , m_animTimer( new TQTimer( this ) ) , m_dragSwitchTimer( new TQTimer( this ) ) @@ -584,26 +584,26 @@ void MultiTabBarButton::slotClicked() void MultiTabBarButton::setPosition( MultiTabBar::MultiTabBarPosition pos ) { m_position = pos; - repaint(); + tqrepaint(); } void MultiTabBarButton::setStyle( MultiTabBar::MultiTabBarStyle style ) { m_style = style; - repaint(); + tqrepaint(); } void MultiTabBarButton::hideEvent( TQHideEvent* he ) { TQPushButton::hideEvent( he ); - MultiTabBar *tb = dynamic_cast<MultiTabBar*>( parentWidget() ); + MultiTabBar *tb = dynamic_cast<MultiTabBar*>( tqparentWidget() ); if ( tb ) tb->updateSeparator(); } void MultiTabBarButton::showEvent( TQShowEvent* he ) { TQPushButton::showEvent( he ); - MultiTabBar *tb = dynamic_cast<MultiTabBar*>( parentWidget() ); + MultiTabBar *tb = dynamic_cast<MultiTabBar*>( tqparentWidget() ); if ( tb ) tb->updateSeparator(); } @@ -660,34 +660,34 @@ void MultiTabBarButton::slotAnimTimer() { if ( m_animEnter ) { m_animCount += 1; - repaint( false ); + tqrepaint( false ); if ( m_animCount >= ANIM_MAX ) m_animTimer->stop(); } else { m_animCount -= 1; - repaint( false ); + tqrepaint( false ); if ( m_animCount <= 0 ) m_animTimer->stop(); } } -TQSize MultiTabBarButton::sizeHint() const +TQSize MultiTabBarButton::tqsizeHint() const { constPolish(); int w = 0, h = 0; // calculate contents size... -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET if ( iconSet() && !iconSet() ->isNull() ) { int iw = iconSet() ->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; int ih = iconSet() ->pixmap( TQIconSet::Small, TQIconSet::Normal ).height(); w += iw; - h = QMAX( h, ih ); + h = TQMAX( h, ih ); } #endif if ( isMenuButton() ) - w += style().pixelMetric( TQStyle::PM_MenuButtonIndicator, this ); + w += tqstyle().tqpixelMetric( TQStyle::PM_MenuButtonIndicator, this ); if ( pixmap() ) { TQPixmap * pm = const_cast< TQPixmap * >( pixmap() ); @@ -697,32 +697,32 @@ TQSize MultiTabBarButton::sizeHint() const TQString s( text() ); bool empty = s.isEmpty(); if ( empty ) - s = TQString::fromLatin1( "XXXX" ); + s = TQString::tqfromLatin1( "XXXX" ); TQFontMetrics fm = fontMetrics(); TQSize sz = fm.size( ShowPrefix, s ); if ( !empty || !w ) w += sz.width(); if ( !empty || !h ) - h = QMAX( h, sz.height() ); + h = TQMAX( h, sz.height() ); } // //PATCH by markey // if ( ( m_style == MultiTabBar::AMAROK ) ) { // if( m_position == MultiTabBar::Left || m_position == MultiTabBar::Right ) -// w = ( parentWidget()->height() - 3 ) / NUM_TABS; +// w = ( tqparentWidget()->height() - 3 ) / NUM_TABS; // else -// h = ( parentWidget()->width() - 3 ) / NUM_TABS; +// h = ( tqparentWidget()->width() - 3 ) / NUM_TABS; // } - return ( style().sizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ). + return ( tqstyle().tqsizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ). expandedTo( TQApplication::globalStrut() ) ); } MultiTabBarTab::MultiTabBarTab( const TQPixmap& pic, const TQString& text, - int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, + int id, TQWidget *tqparent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ) - : MultiTabBarButton( text, 0, id, parent, pos, style ), + : MultiTabBarButton( text, 0, id, tqparent, pos, style ), m_visible(true), m_showActiveTabText( false ) { @@ -733,7 +733,7 @@ MultiTabBarTab::MultiTabBarTab( const TQPixmap& pic, const TQString& text, setToggleButton( true ); // Prevent flicker on redraw - setWFlags( getWFlags() | Qt::WNoAutoErase ); + setWFlags( getWFlags() | TQt::WNoAutoErase ); } MultiTabBarTab::~MultiTabBarTab() @@ -754,7 +754,7 @@ void MultiTabBarTab::setTabsPosition( MultiTabBar::MultiTabBarPosition pos ) } setPosition( pos ); - // repaint(); + // tqrepaint(); } void MultiTabBarTab::setIcon( const TQString& icon ) @@ -785,7 +785,7 @@ void MultiTabBarTab::slotClicked() if ( m_animTimer->isActive() ) { m_animCount = ANIM_MAX; m_animTimer->stop(); - repaint(); + tqrepaint(); } updateState(); @@ -801,23 +801,23 @@ void MultiTabBarTab::setState( bool b ) void MultiTabBarTab::updateState() { - if ( m_style != MultiTabBar::KONQSBC ) { + if ( m_style != MultiTabBar::KONTQSBC ) { if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) { TQPushButton::setText( m_text ); } else { kdDebug() << "MultiTabBarTab::updateState(): setting text to an empty TQString***************" << endl; - TQPushButton::setText( TQString::null ); + TQPushButton::setText( TQString() ); } if ( ( m_position == MultiTabBar::Right || m_position == MultiTabBar::Left ) ) { setFixedWidth( 24 ); if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) { - setFixedHeight( MultiTabBarButton::sizeHint().width() ); + setFixedHeight( MultiTabBarButton::tqsizeHint().width() ); } else setFixedHeight( 36 ); } else { setFixedHeight( 24 ); if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) { - setFixedWidth( MultiTabBarButton::sizeHint().width() ); + setFixedWidth( MultiTabBarButton::tqsizeHint().width() ); } else setFixedWidth( 36 ); } } else { @@ -858,7 +858,7 @@ void MultiTabBarTab::drawButtonLabel( TQPainter *p ) void MultiTabBarTab::drawButton( TQPainter *paint ) { if ( m_style == MultiTabBar::AMAROK ) drawButtonAmarok( paint ); - else if ( m_style != MultiTabBar::KONQSBC ) drawButtonStyled( paint ); + else if ( m_style != MultiTabBar::KONTQSBC ) drawButtonStyled( paint ); else drawButtonClassic( paint ); } @@ -870,7 +870,7 @@ void MultiTabBarTab::drawButtonStyled( TQPainter *paint ) const int height = 24; if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) { if ( ( m_position == MultiTabBar::Left ) || ( m_position == MultiTabBar::Right ) ) - sh = TQSize( this->height(), this->width() ); //MultiTabBarButton::sizeHint(); + sh = TQSize( this->height(), this->width() ); //MultiTabBarButton::tqsizeHint(); else sh = TQSize( this->width(), this->height() ); } else @@ -887,8 +887,8 @@ void MultiTabBarTab::drawButtonStyled( TQPainter *paint ) if ( isOn() ) st |= TQStyle::Style_On; - style().drawControl( TQStyle::CE_PushButton, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st ); - style().drawControl( TQStyle::CE_PushButtonLabel, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st ); + tqstyle().tqdrawControl( TQStyle::CE_PushButton, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), tqcolorGroup(), st ); + tqstyle().tqdrawControl( TQStyle::CE_PushButtonLabel, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), tqcolorGroup(), st ); switch ( m_position ) { case MultiTabBar::Left: @@ -904,8 +904,8 @@ void MultiTabBarTab::drawButtonStyled( TQPainter *paint ) paint->drawPixmap( 0, 0, pixmap ); break; } - // style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), - // colorGroup(),TQStyle::Style_Enabled); + // style().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), + // tqcolorGroup(),TQStyle::Style_Enabled); } void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) @@ -913,52 +913,52 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) TQPixmap pixmap; if ( iconSet() ) pixmap = iconSet() ->pixmap( TQIconSet::Small, TQIconSet::Normal ); - paint->fillRect( 0, 0, 24, 24, colorGroup().background() ); + paint->fillRect( 0, 0, 24, 24, tqcolorGroup().background() ); if ( !isOn() ) { if ( m_position == MultiTabBar::Right ) { - paint->fillRect( 0, 0, 21, 21, TQBrush( colorGroup().background() ) ); + paint->fillRect( 0, 0, 21, 21, TQBrush( tqcolorGroup().background() ) ); - paint->setPen( colorGroup().background().dark( 150 ) ); + paint->setPen( tqcolorGroup().background().dark( 150 ) ); paint->drawLine( 0, 22, 23, 22 ); paint->drawPixmap( 12 - pixmap.width() / 2, 12 - pixmap.height() / 2, pixmap ); - paint->setPen( colorGroup().shadow() ); + paint->setPen( tqcolorGroup().shadow() ); paint->drawLine( 0, 0, 0, 23 ); - paint->setPen( colorGroup().background().dark( 120 ) ); + paint->setPen( tqcolorGroup().background().dark( 120 ) ); paint->drawLine( 1, 0, 1, 23 ); } else if ( ( m_position == MultiTabBar::Bottom ) || ( m_position == MultiTabBar::Top ) ) { - paint->fillRect( 0, 1, 23, 22, TQBrush( colorGroup().background() ) ); + paint->fillRect( 0, 1, 23, 22, TQBrush( tqcolorGroup().background() ) ); paint->drawPixmap( 12 - pixmap.width() / 2, 12 - pixmap.height() / 2, pixmap ); - paint->setPen( colorGroup().background().dark( 120 ) ); + paint->setPen( tqcolorGroup().background().dark( 120 ) ); paint->drawLine( 23, 0, 23, 23 ); - paint->setPen( colorGroup().light() ); + paint->setPen( tqcolorGroup().light() ); paint->drawLine( 0, 22, 23, 22 ); paint->drawLine( 0, 23, 23, 23 ); - paint->setPen( colorGroup().shadow() ); + paint->setPen( tqcolorGroup().shadow() ); paint->drawLine( 0, 0, 23, 0 ); - paint->setPen( colorGroup().background().dark( 120 ) ); + paint->setPen( tqcolorGroup().background().dark( 120 ) ); paint->drawLine( 0, 1, 23, 1 ); } else { - paint->setPen( colorGroup().background().dark( 120 ) ); + paint->setPen( tqcolorGroup().background().dark( 120 ) ); paint->drawLine( 0, 23, 23, 23 ); - paint->fillRect( 0, 0, 23, 21, TQBrush( colorGroup().background() ) ); + paint->fillRect( 0, 0, 23, 21, TQBrush( tqcolorGroup().background() ) ); paint->drawPixmap( 12 - pixmap.width() / 2, 12 - pixmap.height() / 2, pixmap ); - paint->setPen( colorGroup().light() ); + paint->setPen( tqcolorGroup().light() ); paint->drawLine( 23, 0, 23, 23 ); paint->drawLine( 22, 0, 22, 23 ); - paint->setPen( colorGroup().shadow() ); + paint->setPen( tqcolorGroup().shadow() ); paint->drawLine( 0, 0, 0, 23 ); } @@ -966,12 +966,12 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) } else { if ( m_position == MultiTabBar::Right ) { - paint->setPen( colorGroup().shadow() ); + paint->setPen( tqcolorGroup().shadow() ); paint->drawLine( 0, height() - 1, 23, height() - 1 ); paint->drawLine( 0, height() - 2, 23, height() - 2 ); paint->drawLine( 23, 0, 23, height() - 1 ); paint->drawLine( 22, 0, 22, height() - 1 ); - paint->fillRect( 0, 0, 21, height() - 3, TQBrush( colorGroup().light() ) ); + paint->fillRect( 0, 0, 21, height() - 3, TQBrush( tqcolorGroup().light() ) ); paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap ); if ( m_showActiveTabText ) { @@ -980,9 +980,9 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) TQPixmap tpixmap( height() - 25 - 3, width() - 2 ); TQPainter painter( &tpixmap ); - painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( colorGroup().light() ) ); + painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( tqcolorGroup().light() ) ); - painter.setPen( colorGroup().text() ); + painter.setPen( tqcolorGroup().text() ); painter.drawText( 0, + width() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text ); paint->rotate( 90 ); @@ -992,31 +992,31 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) } else if ( m_position == MultiTabBar::Top ) { - paint->fillRect( 0, 0, width() - 1, 23, TQBrush( colorGroup().light() ) ); + paint->fillRect( 0, 0, width() - 1, 23, TQBrush( tqcolorGroup().light() ) ); paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap ); if ( m_showActiveTabText ) { - paint->setPen( colorGroup().text() ); + paint->setPen( tqcolorGroup().text() ); paint->drawText( 25, height() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text ); } } else if ( m_position == MultiTabBar::Bottom ) { - paint->setPen( colorGroup().shadow() ); + paint->setPen( tqcolorGroup().shadow() ); paint->drawLine( 0, 23, width() - 1, 23 ); paint->drawLine( 0, 22, width() - 1, 22 ); - paint->fillRect( 0, 0, width() - 1, 21, TQBrush( colorGroup().light() ) ); + paint->fillRect( 0, 0, width() - 1, 21, TQBrush( tqcolorGroup().light() ) ); paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap ); if ( m_showActiveTabText ) { - paint->setPen( colorGroup().text() ); + paint->setPen( tqcolorGroup().text() ); paint->drawText( 25, height() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text ); } } else { - paint->setPen( colorGroup().shadow() ); + paint->setPen( tqcolorGroup().shadow() ); paint->drawLine( 0, height() - 1, 23, height() - 1 ); paint->drawLine( 0, height() - 2, 23, height() - 2 ); - paint->fillRect( 0, 0, 23, height() - 3, TQBrush( colorGroup().light() ) ); + paint->fillRect( 0, 0, 23, height() - 3, TQBrush( tqcolorGroup().light() ) ); paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap ); if ( m_showActiveTabText ) { @@ -1025,9 +1025,9 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint ) TQPixmap tpixmap( height() - 25 - 3, width() - 2 ); TQPainter painter( &tpixmap ); - painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( colorGroup().light() ) ); + painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( tqcolorGroup().light() ) ); - painter.setPen( colorGroup().text() ); + painter.setPen( tqcolorGroup().text() ); painter.drawText( tpixmap.width() - TQFontMetrics( TQFont() ).width( m_text ), + width() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text ); paint->rotate( -90 ); @@ -1046,17 +1046,17 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint ) { TQColor fillColor, textColor; if ( isOn() ) { - fillColor = blendColors( colorGroup().highlight(), colorGroup().background(), static_cast<int>( m_animCount * 3.5 ) ); - textColor = blendColors( colorGroup().highlightedText(), colorGroup().text(), static_cast<int>( m_animCount * 4.5 ) ); + fillColor = blendColors( tqcolorGroup().highlight(), tqcolorGroup().background(), static_cast<int>( m_animCount * 3.5 ) ); + textColor = blendColors( tqcolorGroup().highlightedText(), tqcolorGroup().text(), static_cast<int>( m_animCount * 4.5 ) ); } else if ( isEnabled() ) { - fillColor = blendColors( colorGroup().background(), colorGroup().highlight(), static_cast<int>( m_animCount * 3.5 ) ); - textColor = blendColors( colorGroup().text(), colorGroup().highlightedText(), static_cast<int>( m_animCount * 4.5 ) ); + fillColor = blendColors( tqcolorGroup().background(), tqcolorGroup().highlight(), static_cast<int>( m_animCount * 3.5 ) ); + textColor = blendColors( tqcolorGroup().text(), tqcolorGroup().highlightedText(), static_cast<int>( m_animCount * 4.5 ) ); } else { - fillColor = colorGroup().background(); - textColor = colorGroup().text(); + fillColor = tqcolorGroup().background(); + textColor = tqcolorGroup().text(); } -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET if ( iconSet() && !iconSet() ->isNull() ) { TQPixmap icon = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ); @@ -1071,7 +1071,7 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint ) TQPainter painter( &pixmap ); // Draw the frame - painter.setPen( colorGroup().mid() ); + painter.setPen( tqcolorGroup().mid() ); /*if ( m_id != bar->visibleTabCount() - 1 )*/ painter.drawLine( 0, 0, 0, pixmap.height() - 1 ); painter.drawLine( 0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1 ); @@ -1079,11 +1079,11 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint ) TQFont font; painter.setFont( font ); TQString text = KStringHandler::rPixelSqueeze( m_text, TQFontMetrics( font ), pixmap.width() - icon.width() - 3 ); - text.replace( "...", ".." ); + text.tqreplace( "...", ".." ); const int textX = pixmap.width() / 2 - TQFontMetrics( font ).width( text ) / 2; painter.setPen( textColor ); const TQRect rect( textX + icon.width() / 2 + 2, 0, pixmap.width(), pixmap.height() ); - painter.drawText( rect, Qt::AlignLeft | Qt::AlignVCenter, text ); + painter.drawText( rect, TQt::AlignLeft | TQt::AlignVCenter, text ); // Draw the icon painter.drawPixmap( textX - icon.width() / 2 - 2, pixmap.height() / 2 - icon.height() / 2, icon ); @@ -1099,7 +1099,7 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint ) TQPainter painter( &pixmap ); // Draw the frame - painter.setPen( colorGroup().mid() ); + painter.setPen( tqcolorGroup().mid() ); /*if ( m_id != bar->visibleTabCount() - 1 )*/ painter.drawLine( 0, 0, 0, pixmap.height() - 1 ); painter.drawLine( 0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1 ); @@ -1107,11 +1107,11 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint ) TQFont font; painter.setFont( font ); TQString text = KStringHandler::rPixelSqueeze( m_text, TQFontMetrics( font ), pixmap.width() - icon.width() - 3 ); - text.replace( "...", ".." ); + text.tqreplace( "...", ".." ); const int textX = pixmap.width() / 2 - TQFontMetrics( font ).width( text ) / 2; painter.setPen( textColor ); const TQRect rect( textX + icon.width() / 2 + 2, 0, pixmap.width(), pixmap.height() ); - painter.drawText( rect, Qt::AlignLeft | Qt::AlignVCenter, text ); + painter.drawText( rect, TQt::AlignLeft | TQt::AlignVCenter, text ); // Draw the icon painter.drawPixmap( textX - icon.width() / 2 - 2, pixmap.height() / 2 - icon.height() / 2, icon ); @@ -1142,16 +1142,16 @@ TQColor MultiTabBarTab::blendColors( const TQColor& color1, const TQColor& color -MultiTabBar::MultiTabBar( MultiTabBarMode bm, TQWidget *parent, const char *name ) : TQWidget( parent, name ) +MultiTabBar::MultiTabBar( MultiTabBarMode bm, TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ) { m_buttons.setAutoDelete( false ); if ( bm == Vertical ) { m_l = new TQVBoxLayout( this ); - setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding, true ); + tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding, true ); // setFixedWidth(24); } else { m_l = new TQHBoxLayout( this ); - setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ); + tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ); // setFixedHeight(24); } m_l->setMargin( 0 ); @@ -1161,7 +1161,7 @@ MultiTabBar::MultiTabBar( MultiTabBarMode bm, TQWidget *parent, const char *name setPosition( ( bm == MultiTabBar::Vertical ) ? MultiTabBar::Right : MultiTabBar::Bottom ); setStyle( VSNET ); // setStyle(KDEV3); - //setStyle(KONQSBC); + //setStyle(KONTQSBC); m_l->insertWidget( 0, m_internal ); m_l->insertWidget( 0, m_btnTabSep = new TQFrame( this ) ); m_btnTabSep->setFixedHeight( 4 ); @@ -1184,7 +1184,7 @@ return 0; int MultiTabBar::appendButton( const TQPixmap &pic , int id, TQPopupMenu *popup, const TQString& ) { MultiTabBarButton * btn; - m_buttons.append( btn = new MultiTabBarButton( pic, TQString::null, + m_buttons.append( btn = new MultiTabBarButton( pic, TQString(), popup, id, this, m_position, m_internal->m_style ) ); m_l->insertWidget( 0, btn ); btn->show(); @@ -1295,7 +1295,7 @@ void MultiTabBar::fontChange( const TQFont& /* oldFont */ ) { for ( uint i = 0;i < tabs() ->count();i++ ) tabs() ->at( i ) ->resize(); - repaint(); + tqrepaint(); } TQPtrList<MultiTabBarTab>* MultiTabBar::tabs() { return m_internal->tabs();} diff --git a/amarok/src/multitabbar.h b/amarok/src/multitabbar.h index fbb898f2..b94020e9 100644 --- a/amarok/src/multitabbar.h +++ b/amarok/src/multitabbar.h @@ -57,9 +57,10 @@ class DropProxyTarget * should be raisable is left to the "user". *@author Joseph Wenninger */ -class MultiTabBar: public QWidget +class MultiTabBar: public TQWidget { Q_OBJECT + TQ_OBJECT public: enum MultiTabBarMode{Horizontal, Vertical}; enum MultiTabBarPosition{Left, Right, Top, Bottom}; @@ -67,12 +68,12 @@ class MultiTabBar: public QWidget /** * VSNET == Visual Studio .Net like (only show the text of active tabs * KDEV3 == Kdevelop 3 like (always show the text) - * KONQSBC == konqy's classic sidebar style (unthemed), this one is disabled + * KONTQSBC == konqy's classic sidebar style (unthemed), this one is disabled * at the moment, but will be renabled soon too */ - enum MultiTabBarStyle{VSNET = 0, KDEV3 = 1, KONQSBC = 2, KDEV3ICON = 3, AMAROK = 4, STYLELAST = 0xffff}; + enum MultiTabBarStyle{VSNET = 0, KDEV3 = 1, KONTQSBC = 2, KDEV3ICON = 3, AMAROK = 4, STYLELAST = 0xffff}; - MultiTabBar( MultiTabBarMode bm, TQWidget *parent = 0, const char *name = 0 ); + MultiTabBar( MultiTabBarMode bm, TQWidget *tqparent = 0, const char *name = 0 ); virtual ~MultiTabBar(); /** @@ -84,7 +85,7 @@ class MultiTabBar: public QWidget * @param popup A popup menu which should be displayed if the button is clicked * @param not_used_yet will be used for a popup text in the future */ - int appendButton( const TQPixmap &pic, int id = -1, TQPopupMenu* popup = 0, const TQString& not_used_yet = TQString::null ); + int appendButton( const TQPixmap &pic, int id = -1, TQPopupMenu* popup = 0, const TQString& not_used_yet = TQString() ); /** * remove a button with the given ID */ @@ -96,7 +97,7 @@ class MultiTabBar: public QWidget * @param text if a mode with text is used it will be the tab text, otherwise a mouse over hint * @param identifier for storing visibility to config file */ - int appendTab( const TQPixmap &pic, int id = -1, const TQString& text = TQString::null, const TQString& identifier = TQString::null ); + int appendTab( const TQPixmap &pic, int id = -1, const TQString& text = TQString(), const TQString& identifier = TQString() ); /** * remove a tab with a given ID */ @@ -170,14 +171,15 @@ class MultiTabBar: public QWidget /** * This class should never be created except with the appendButton call of MultiTabBar */ -class MultiTabBarButton: public QPushButton +class MultiTabBarButton: public TQPushButton { Q_OBJECT + TQ_OBJECT public: MultiTabBarButton( const TQPixmap& pic, const TQString&, TQPopupMenu *popup, - int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ); + int id, TQWidget *tqparent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ); MultiTabBarButton( const TQString&, TQPopupMenu *popup, - int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ); + int id, TQWidget *tqparent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ); virtual ~MultiTabBarButton(); int id() const; @@ -203,7 +205,7 @@ class MultiTabBarButton: public QPushButton */ void proxyDrops( DropProxyTarget *finalDropTarget ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: static const int ANIM_INTERVAL = 18; @@ -249,8 +251,9 @@ class MultiTabBarButton: public QPushButton class MultiTabBarTab: public MultiTabBarButton { Q_OBJECT + TQ_OBJECT public: - MultiTabBarTab( const TQPixmap& pic, const TQString&, int id, TQWidget *parent, + MultiTabBarTab( const TQPixmap& pic, const TQString&, int id, TQWidget *tqparent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style ); virtual ~MultiTabBarTab(); /** diff --git a/amarok/src/multitabbar_p.h b/amarok/src/multitabbar_p.h index 5ba18ad8..b11cd58b 100644 --- a/amarok/src/multitabbar_p.h +++ b/amarok/src/multitabbar_p.h @@ -27,12 +27,13 @@ #include <tqscrollview.h> #include <multitabbar.h> -class MultiTabBarInternal: public QScrollView +class MultiTabBarInternal: public TQScrollView { Q_OBJECT + TQ_OBJECT public: - MultiTabBarInternal(TQWidget *parent,MultiTabBar::MultiTabBarMode bm); - int appendTab(const TQPixmap &,int=-1,const TQString& =TQString::null, const TQString&identifier=TQString::null); + MultiTabBarInternal(TQWidget *tqparent,MultiTabBar::MultiTabBarMode bm); + int appendTab(const TQPixmap &,int=-1,const TQString& =TQString(), const TQString&identifier=TQString()); MultiTabBarTab *tab(int) const; void removeTab(int); void setTabVisible(int id, bool visible); @@ -61,9 +62,9 @@ protected: virtual void drawContents ( TQPainter *, int, int, int, int); /** - * [contentsM|m]ousePressEvent are reimplemented from QScrollView + * [contentsM|m]ousePressEvent are reimplemented from TQScrollView * in order to ignore all mouseEvents on the viewport, so that the - * parent can handle them. + * tqparent can handle them. */ virtual void contentsMousePressEvent(TQMouseEvent *); virtual void mousePressEvent(TQMouseEvent *); diff --git a/amarok/src/mydirlister.h b/amarok/src/mydirlister.h index eeb8c55a..391e45e5 100644 --- a/amarok/src/mydirlister.h +++ b/amarok/src/mydirlister.h @@ -21,15 +21,15 @@ protected: EngineController::canDecode( item->url() ) || item->url().protocol() == "audiocd" || PlaylistFile::isPlaylistFile( item->name() ) || - item->name().endsWith( ".mp3", false ) || //for now this is less confusing for the user - item->name().endsWith( ".aa", false ) || //for adding to iPod - item->name().endsWith( ".mp4", false ) || //for adding to iPod - item->name().endsWith( ".m4v", false ) || //for adding to iPod - item->name().endsWith( ".m4b", false ) || //for adding to iPod - item->name().endsWith( ".ogg", false ) || - item->name().endsWith( ".flac", false ) || - item->name().endsWith( ".wma", false ) || - item->name().endsWith( ".asf", false ); + item->name().tqendsWith( ".mp3", false ) || //for now this is less confusing for the user + item->name().tqendsWith( ".aa", false ) || //for adding to iPod + item->name().tqendsWith( ".mp4", false ) || //for adding to iPod + item->name().tqendsWith( ".m4v", false ) || //for adding to iPod + item->name().tqendsWith( ".m4b", false ) || //for adding to iPod + item->name().tqendsWith( ".ogg", false ) || + item->name().tqendsWith( ".flac", false ) || + item->name().tqendsWith( ".wma", false ) || + item->name().tqendsWith( ".asf", false ); } }; diff --git a/amarok/src/mydiroperator.cpp b/amarok/src/mydiroperator.cpp index 3e353f5b..0233bb0e 100644 --- a/amarok/src/mydiroperator.cpp +++ b/amarok/src/mydiroperator.cpp @@ -5,7 +5,7 @@ #include <tqdir.h> -MyDirOperator::MyDirOperator ( const KURL &url, TQWidget *parent, Medium *medium ) : KDirOperator( url, parent ) +MyDirOperator::MyDirOperator ( const KURL &url, TQWidget *tqparent, Medium *medium ) : KDirOperator( url, tqparent ) { m_medium = medium; setDirLister( new MyDirLister( true ) ); @@ -24,7 +24,7 @@ void MyDirOperator::myCdUp() { KURL tmp( url() ); - tmp.cd( TQString::fromLatin1("..")); + tmp.cd( TQString::tqfromLatin1("..")); if( m_medium && !tmp.path().startsWith( m_medium->mountPoint() ) ) tmp.setPath( m_medium->mountPoint() ); setURL(tmp, true); diff --git a/amarok/src/mydiroperator.h b/amarok/src/mydiroperator.h index 1068ffca..c9787648 100644 --- a/amarok/src/mydiroperator.h +++ b/amarok/src/mydiroperator.h @@ -12,9 +12,10 @@ class Medium; class MyDirOperator : public KDirOperator { Q_OBJECT + TQ_OBJECT public: - MyDirOperator( const KURL &url, TQWidget *parent, Medium *medium = 0 ); + MyDirOperator( const KURL &url, TQWidget *tqparent, Medium *medium = 0 ); public slots: //reimplemented due to a bug in KDirOperator::activatedMenu ( KDE 3.4.2 ) - See Bug #103305 diff --git a/amarok/src/newdynamic.ui b/amarok/src/newdynamic.ui index e667768e..485e8321 100644 --- a/amarok/src/newdynamic.ui +++ b/amarok/src/newdynamic.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>NewDynamic</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>NewDynamic</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>5</height> @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>21</height> @@ -98,7 +98,7 @@ <string>Minimum number of upcoming tracks to keep in the playlist</string> </property> </widget> - <widget class="QLabel" row="6" column="1"> + <widget class="TQLabel" row="6" column="1"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -112,7 +112,7 @@ <string>Minimum number of upcoming tracks to keep in the playlist</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_playlistName_label</cstring> </property> @@ -120,7 +120,7 @@ <string>Dynamic playlist name:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="2" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="2" column="2" rowspan="1" colspan="4"> <property name="name"> <cstring>m_name</cstring> </property> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>21</height> @@ -165,7 +165,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>60</width> <height>0</height> @@ -203,14 +203,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>21</height> </size> </property> </spacer> - <widget class="QCheckBox" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>m_cycleTracks</cstring> </property> @@ -239,7 +239,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>250</width> <height>250</height> @@ -290,7 +290,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>m_mixLabel</cstring> </property> @@ -302,7 +302,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -351,7 +351,7 @@ <tabstop>m_previousIntSpinBox</tabstop> <tabstop>m_upcomingIntSpinBox</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults 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 3bdb1418..fb862d6a 100644 --- a/amarok/src/organizecollectiondialog.ui +++ b/amarok/src/organizecollectiondialog.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>OrganizeCollectionDialog</class> <author><aumuell@reserv.at></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>organizeCollectionDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>folderLayout</cstring> </property> @@ -39,7 +39,7 @@ <property name="margin"> <number>5</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>folderLabel</cstring> </property> @@ -79,15 +79,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>coverCheck</cstring> </property> @@ -95,7 +95,7 @@ <string>&Use Cover Art for Folder Icons</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>ignoreTheCheck</cstring> </property> @@ -118,14 +118,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupingGroup</cstring> </property> @@ -142,7 +142,7 @@ <property name="margin"> <number>5</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>customschemeCheck</cstring> </property> @@ -153,7 +153,7 @@ <string>If checked, use a custom format string for naming the files in the collection</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>filetypeCheck</cstring> </property> @@ -164,7 +164,7 @@ <string>If checked, create a directory hierarchy using the filename extension.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>initialCheck</cstring> </property> @@ -175,7 +175,7 @@ <string>If checked, introduce another directory hierarchy for the artists' initials.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>customFormatLayout</cstring> </property> @@ -183,7 +183,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>formatLabel</cstring> </property> @@ -238,14 +238,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>replacementGroup</cstring> </property> @@ -270,7 +270,7 @@ <property name="margin"> <number>5</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>spaceCheck</cstring> </property> @@ -281,7 +281,7 @@ <string>If checked, convert spaces to underscores.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>asciiCheck</cstring> </property> @@ -292,7 +292,7 @@ <string>If checked, replace characters that are unavailable in the 7-bit ASCII code.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>vfatCheck</cstring> </property> @@ -303,15 +303,15 @@ <string>If checked, replace characters that are incompatible with MS-DOS/VFAT file systems.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -327,7 +327,7 @@ <string>Regular expression</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -357,14 +357,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>previewBox</cstring> </property> @@ -381,7 +381,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>previewText</cstring> </property> @@ -402,9 +402,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -420,14 +420,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>347</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>overwriteCheck</cstring> </property> @@ -450,7 +450,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -561,31 +561,31 @@ </connections> <includes> <include location="global" impldecl="in declaration">metabundle.h</include> - <include location="global" impldecl="in implementation">qdialog.h</include> - <include location="global" impldecl="in implementation">qstring.h</include> + <include location="global" impldecl="in implementation">tqdialog.h</include> + <include location="global" impldecl="in implementation">tqstring.h</include> </includes> <variables> <variable>MetaBundle previewBundle;</variable> <variable>bool detailed;</variable> </variables> -<signals> +<Q_SIGNALS> <signal>updatePreview( const QString & )</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot>preview( const QString & format )</slot> <slot>update( int dummy )</slot> <slot>update( const QString & dummy )</slot> <slot>slotDetails()</slot> -</slots> +</Q_SLOTS> <functions> - <function returnType="QString">buildDestination( const QString & format, const MetaBundle & mb )</function> - <function returnType="QString">buildFormatTip()</function> - <function returnType="QString">buildFormatString()</function> + <function returnType="TQString">buildDestination( const QString & format, const MetaBundle & mb )</function> + <function returnType="TQString">buildFormatTip()</function> + <function returnType="TQString">buildFormatString()</function> <function>setPreviewBundle( const MetaBundle & bundle )</function> - <function returnType="QString">cleanPath( const QString & component )</function> + <function returnType="TQString">cleanPath( const QString & component )</function> <function>init()</function> </functions> -<layoutdefaults spacing="6" margin="0"/> +<tqlayoutdefaults spacing="6" margin="0"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/amarok/src/organizecollectiondialog.ui.h b/amarok/src/organizecollectiondialog.ui.h index 3a63e13f..a2211a5f 100644 --- a/amarok/src/organizecollectiondialog.ui.h +++ b/amarok/src/organizecollectiondialog.ui.h @@ -43,16 +43,16 @@ TQString OrganizeCollectionDialog::buildDestination( const TQString &format, con track.sprintf( "%02d", mb.track() ); args["track"] = track; - Amarok::QStringx formatx( format ); + Amarok::TQStringx formatx( format ); TQString result = formatx.namedOptArgs( args ); if( result.startsWith( folderCombo->currentText() ) ) { TQString tail = result.mid( folderCombo->currentText().length() ); if( !tail.startsWith( "/" ) ) tail.prepend( "/" ); - return folderCombo->currentText() + tail.replace( TQRegExp( "/\\.*" ), "/" ); + return folderCombo->currentText() + tail.tqreplace( TQRegExp( "/\\.*" ), "/" ); } - return result.replace( TQRegExp( "/\\.*" ), "/" ); + return result.tqreplace( TQRegExp( "/\\.*" ), "/" ); } TQString OrganizeCollectionDialog::buildFormatTip() @@ -65,10 +65,10 @@ TQString OrganizeCollectionDialog::buildFormatTip() continue; args[MetaBundle::exactColumnName( i ).lower()] = MetaBundle::prettyColumnName( i ); } - args["albumartist"] = i18n( "%1 or %2" ).arg( i18n("This feature only works with \"The\", so either don't translate it at all, or only translate artist and album", "Album Artist, The") , i18n("The Album Artist") ); + args["albumartist"] = i18n( "%1 or %2" ).tqarg( i18n("This feature only works with \"The\", so either don't translate it at all, or only translate artist and album", "Album Artist, The") , i18n("The Album Artist") ); args["thealbumartist"] = i18n( "The Album Artist" ); args["theartist"] = i18n( "The Artist" ); - args["artist"] = i18n( "%1 or %2" ).arg( i18n( "This feature only works with \"The\", so either don't translate it at all, or only translate Artist", "Artist, The") , i18n( "The Artist") ); + args["artist"] = i18n( "%1 or %2" ).tqarg( i18n( "This feature only works with \"The\", so either don't translate it at all, or only translate Artist", "Artist, The") , i18n( "The Artist") ); args["folder"] = i18n( "Collection Base Folder" ); args["initial"] = i18n( "Artist's Initial" ); args["filetype"] = i18n( "File Extension of Source" ); @@ -81,7 +81,7 @@ TQString OrganizeCollectionDialog::buildFormatTip() it != args.end(); ++it ) { - tooltip += TQString( "<li>%1 - %2" ).arg( it.data(), "%" + it.key() ); + tooltip += TQString( "<li>%1 - %2" ).tqarg( it.data(), "%" + it.key() ); } tooltip += "</ul>"; @@ -142,15 +142,15 @@ TQString OrganizeCollectionDialog::cleanPath( const TQString &component ) } if( !regexpEdit->text().isEmpty() ) - result.replace( TQRegExp( regexpEdit->text() ), replaceEdit->text() ); + result.tqreplace( TQRegExp( regexpEdit->text() ), replaceEdit->text() ); result.simplifyWhiteSpace(); if( spaceCheck->isChecked() ) - result.replace( TQRegExp( "\\s" ), "_" ); + result.tqreplace( TQRegExp( "\\s" ), "_" ); if( vfatCheck->isChecked() ) result = Amarok::vfatPath( result ); - result.replace( "/", "-" ); + result.tqreplace( "/", "-" ); return result; } @@ -201,9 +201,9 @@ void OrganizeCollectionDialog::slotDetails() formatHelp->hide(); } - if( dynamic_cast<TQWidget *>(parent()) ) { - static_cast<TQWidget *>(parent())->adjustSize(); - static_cast<TQWidget *>(parent())->updateGeometry(); + if( dynamic_cast<TQWidget *>(tqparent()) ) { + static_cast<TQWidget *>(tqparent())->adjustSize(); + static_cast<TQWidget *>(tqparent())->updateGeometry(); } } diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp index ff9c0cb8..ae9b1042 100644 --- a/amarok/src/osd.cpp +++ b/amarok/src/osd.cpp @@ -45,11 +45,11 @@ namespace ShadowEngine #define MOODBAR_HEIGHT 20 -OSDWidget::OSDWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ) +OSDWidget::OSDWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ) , m_duration( 2000 ) , m_timer( new TQTimer( this ) ) - , m_alignment( Middle ) + , m_tqalignment( Middle ) , m_screen( 0 ) , m_y( MARGIN ) , m_drawShadow( false ) @@ -57,7 +57,7 @@ OSDWidget::OSDWidget( TQWidget *parent, const char *name ) , m_rating( 0 ) , m_volume( false ) { - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); setBackgroundMode( NoBackground ); unsetColors(); @@ -72,7 +72,7 @@ OSDWidget::OSDWidget( TQWidget *parent, const char *name ) void OSDWidget::show( const TQString &text, TQImage newImage ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 m_text = text; if ( !newImage.isNull() ) { @@ -115,7 +115,7 @@ OSDWidget::volChanged( unsigned char volume ) { m_volume = true; m_newvolume = volume; - m_text = m_newvolume ? i18n("Volume: %1%").arg( m_newvolume ) : i18n("Mute"); + m_text = m_newvolume ? i18n("Volume: %1%").tqarg( m_newvolume ) : i18n("Mute"); show(); } @@ -124,7 +124,7 @@ OSDWidget::volChanged( unsigned char volume ) void OSDWidget::show() //virtual { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( !isEnabled() || m_text.isEmpty() ) return; @@ -134,15 +134,15 @@ OSDWidget::show() //virtual const TQRect newGeometry = determineMetrics( M ); if( m_translucency && !isShown() || !newGeometry.intersects( oldGeometry ) ) - m_screenshot = TQPixmap::grabWindow( qt_xrootwin(), + m_screenshot = TQPixmap(TQPixmap::grabWindow( qt_xrootwin(), newGeometry.x(), newGeometry.y(), - newGeometry.width(), newGeometry.height() ); + newGeometry.width(), newGeometry.height() )); else if( m_translucency ) { const TQRect unite = oldGeometry.unite( newGeometry ); - KPixmap pix = TQPixmap::grabWindow( qt_xrootwin(), unite.x(), unite.y(), unite.width(), unite.height() ); + KPixmap pix = TQPixmap(TQPixmap::grabWindow( qt_xrootwin(), unite.x(), unite.y(), unite.width(), unite.height() )); TQPoint p = oldGeometry.topLeft() - unite.topLeft(); bitBlt( &pix, p, &m_screenshot ); @@ -168,7 +168,7 @@ OSDWidget::show() //virtual #endif } -QRect +TQRect OSDWidget::determineMetrics( const uint M ) { // sometimes we only have a tiddly cover @@ -179,10 +179,10 @@ OSDWidget::determineMetrics( const uint M ) const TQSize image = m_cover.isNull() ? TQSize( 0, 0 ) : minImageSize; const TQSize max = TQApplication::desktop()->screen( m_screen )->size() - margin; - // If we don't do that, the boundingRect() might not be suitable for drawText() (Qt issue N67674) - m_text.replace( TQRegExp(" +\n"), "\n" ); + // If we don't do that, the boundingRect() might not be suitable for drawText() (TQt issue N67674) + m_text.tqreplace( TQRegExp(" +\n"), "\n" ); // remove consecutive line breaks - m_text.replace( TQRegExp("\n+"), "\n" ); + m_text.tqreplace( TQRegExp("\n+"), "\n" ); // The osd cannot be larger than the screen TQRect rect = fontMetrics().boundingRect( 0, 0, @@ -219,9 +219,9 @@ OSDWidget::determineMetrics( const uint M ) const int availableWidth = max.width() - rect.width() - M; //WILL be >= (minImageSize.width() - M) m_scaledCover = m_cover.smoothScale( - QMIN( availableWidth, m_cover.width() ), - QMIN( rect.height(), m_cover.height() ), - TQImage::ScaleMin ); //this will force us to be with our bounds + TQMIN( availableWidth, m_cover.width() ), + TQMIN( rect.height(), m_cover.height() ), + TQ_ScaleMin ); //this will force us to be with our bounds int shadowWidth = 0; if( m_drawShadow && !m_scaledCover.hasAlpha() && @@ -243,7 +243,7 @@ OSDWidget::determineMetrics( const uint M ) const TQRect screen = TQApplication::desktop()->screenGeometry( m_screen ); TQPoint newPos( MARGIN, m_y ); - switch( m_alignment ) + switch( m_tqalignment ) { case Left: break; @@ -284,26 +284,26 @@ OSDWidget::render( const uint M, const TQSize &size ) const uint xround = (M * 200) / size.width(); const uint yround = (M * 200) / size.height(); - { /// apply the mask - static TQBitmap mask; + { /// apply the tqmask + static TQBitmap tqmask; - mask.resize( size ); - mask.fill( Qt::black ); + tqmask.resize( size ); + tqmask.fill( TQt::black ); - TQPainter p( &mask ); - p.setBrush( Qt::white ); + TQPainter p( &tqmask ); + p.setBrush( TQt::white ); p.drawRoundRect( rect, xround, yround ); - setMask( mask ); + setMask( tqmask ); } TQColor shadowColor; { int h,s,v; foregroundColor().getHsv( &h, &s, &v ); - shadowColor = v > 128 ? Qt::black : Qt::white; + shadowColor = v > 128 ? TQt::black : TQt::white; } - int align = Qt::AlignCenter | WordBreak; + int align = TQt::AlignCenter | WordBreak; m_buffer.resize( rect.size() ); TQPainter p( &m_buffer ); @@ -335,8 +335,8 @@ OSDWidget::render( const uint M, const TQSize &size ) const uint shadowSize = static_cast<uint>( m_scaledCover.width() / 100.0 * 6.0 ); const TQString folder = Amarok::saveLocation( "covershadow-cache/" ); - const TQString file = TQString( "shadow_albumcover%1x%2.png" ).arg( m_scaledCover.width() + shadowSize ) - .arg( m_scaledCover.height() + shadowSize ); + const TQString file = TQString( "shadow_albumcover%1x%2.png" ).tqarg( m_scaledCover.width() + shadowSize ) + .tqarg( m_scaledCover.height() + shadowSize ); if ( TQFile::exists( folder + file ) ) shadow.load( folder + file ); else { @@ -370,20 +370,20 @@ OSDWidget::render( const uint M, const TQSize &size ) KPixmap pixmapGradient; { // gradient - TQBitmap mask; - mask.resize( vol.size() ); - mask.fill( Qt::black ); + TQBitmap tqmask; + tqmask.resize( vol.size() ); + tqmask.fill( TQt::black ); - TQPainter p( &mask ); - p.setBrush( Qt::white ); + TQPainter p( &tqmask ); + p.setBrush( TQt::white ); p.drawRoundRect ( 3, 3, vol.width() - 6, vol.height() - 6, M * 300 / vol.width(), 99 ); p.end(); pixmapGradient = TQPixmap( vol.size() ); - KPixmapEffect::gradient( pixmapGradient, colorGroup().background(), - colorGroup().highlight(), KPixmapEffect::EllipticGradient ); - pixmapGradient.setMask( mask ); + KPixmapEffect::gradient( pixmapGradient, tqcolorGroup().background(), + tqcolorGroup().highlight(), KPixmapEffect::EllipticGradient ); + pixmapGradient.setMask( tqmask ); } if( m_translucency ) @@ -396,19 +396,19 @@ OSDWidget::render( const uint M, const TQSize &size ) vol.fill( backgroundColor() ); { // vol ( bg-alpha ) - static TQBitmap mask; - mask.resize( vol.size() ); - mask.fill( Qt::white ); + static TQBitmap tqmask; + tqmask.resize( vol.size() ); + tqmask.fill( TQt::white ); - TQPainter p( &mask ); - p.setBrush( Qt::black ); + TQPainter p( &tqmask ); + p.setBrush( TQt::black ); p.drawRoundRect ( 1, 1, rect.width()-2, rect.height() + fontMetrics().height() / 4 - 2, M * 300 / vol.width(), 99 ); - p.setBrush( Qt::white ); + p.setBrush( TQt::white ); p.drawRoundRect ( 3, 3, vol.width() - 6, vol.height() - 6, M * 300 / vol.width(), 99 ); p.end(); - vol.setMask( mask ); + vol.setMask( tqmask ); } buf.fill( backgroundColor().dark() ); @@ -468,13 +468,13 @@ OSDWidget::render( const uint M, const TQSize &size ) if( m_drawShadow ) { TQPixmap pixmap( rect.size() + TQSize(10,10) ); - pixmap.fill( Qt::black ); + pixmap.fill( TQt::black ); pixmap.setMask( pixmap.createHeuristicMask( true ) ); TQPainter p2( &pixmap ); p2.setFont( font() ); - p2.setPen( Qt::white ); - p2.setBrush( Qt::white ); + p2.setPen( TQt::white ); + p2.setBrush( TQt::white ); p2.drawText( TQRect(TQPoint(5,5), rect.size()), align , m_text ); p2.end(); @@ -513,7 +513,7 @@ OSDWidget::mousePressEvent( TQMouseEvent* ) void OSDWidget::unsetColors() { - const TQColorGroup c = TQApplication::palette().active(); + const TQColorGroup c = TQApplication::tqpalette().active(); setPaletteForegroundColor( c.highlightedText() ); setPaletteBackgroundColor( c.highlight() ); @@ -544,8 +544,8 @@ namespace Amarok TQImage icon() { return TQImage( KIconLoader().iconPath( "amarok", -KIcon::SizeHuge ) ); } } -OSDPreviewWidget::OSDPreviewWidget( TQWidget *parent ) - : OSDWidget( parent, "osdpreview" ) +OSDPreviewWidget::OSDPreviewWidget( TQWidget *tqparent ) + : OSDWidget( tqparent, "osdpreview" ) , m_dragging( false ) { m_text = i18n( "OSD Preview - drag to reposition" ); @@ -557,7 +557,7 @@ void OSDPreviewWidget::mousePressEvent( TQMouseEvent *event ) { m_dragOffset = event->pos(); - if( event->button() == LeftButton && !m_dragging ) { + if( event->button() == Qt::LeftButton && !m_dragging ) { grabMouse( KCursor::sizeAllCursor() ); m_dragging = true; } @@ -603,11 +603,11 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) if( destination.y() > maxY ) destination.ry() = maxY; if( eGlobalPosX < (hcenter-snapZone) ) { - m_alignment = Left; + m_tqalignment = Left; destination.rx() = MARGIN; } else if( eGlobalPosX > (hcenter+snapZone) ) { - m_alignment = Right; + m_tqalignment = Right; destination.rx() = screen.width() - MARGIN - width(); } else { @@ -618,10 +618,10 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) if( eGlobalPosY >= (vcenter-snapZone) && eGlobalPosY <= (vcenter+snapZone) ) { - m_alignment = Center; + m_tqalignment = Center; destination.ry() = vcenter - height()/2; } - else m_alignment = Middle; + else m_tqalignment = Middle; } destination += screen.topLeft(); @@ -649,7 +649,7 @@ Amarok::OSD::OSD(): OSDWidget( 0 ) void Amarok::OSD::show( const MetaBundle &bundle ) //slot { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQString text = ""; if( bundle.url().isEmpty() ) text = i18n( "No track playing" ); @@ -662,13 +662,13 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot tags.append(bundle.prettyText( i )); if( bundle.length() <= 0 ) - tags[PlaylistItem::Length+1] = TQString::null; + tags[PlaylistItem::Length+1] = TQString(); if( AmarokConfig::osdUsePlaylistColumns() ) { TQString tag; TQValueVector<int> availableTags; //eg, ones that aren't empty - static const TQValueList<int> parens = //display these in parentheses + static const TQValueList<int> parens = //display these in tqparentheses TQValueList<int>() << PlaylistItem::PlayCount << PlaylistItem::Year << PlaylistItem::Comment << PlaylistItem::Genre << PlaylistItem::Length << PlaylistItem::Bitrate << PlaylistItem::LastPlayed << PlaylistItem::Score << PlaylistItem::Filesize; @@ -690,10 +690,10 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot const int column = availableTags.at( i ); TQString append = ( i == 0 ) ? "" : ( n > 1 && i == n / 2 ) ? "\n" - : ( parens.contains( column ) || parens.contains( availableTags.at( i - 1 ) ) ) ? " " + : ( parens.tqcontains( column ) || parens.tqcontains( availableTags.at( i - 1 ) ) ) ? " " : i18n(" - "); - append += ( parens.contains( column ) ? "(%1)" : "%1" ); - text += append.arg( tags.at( column + 1 ) ); + append += ( parens.tqcontains( column ) ? "(%1)" : "%1" ); + text += append.tqarg( tags.at( column + 1 ) ); } } else @@ -704,7 +704,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot args[bundle.exactColumnName( i ).lower()] = bundle.prettyText( i ); if( bundle.length() <= 0 ) - args["length"] = TQString::null; + args["length"] = TQString(); uint time=EngineController::instance()->engine()->position(); @@ -725,37 +725,37 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot timeformat +="0"; timeformat +=TQString::number(sec); args["elapsed"]=timeformat; - QStringx osd = AmarokConfig::osdText(); + TQStringx osd = AmarokConfig::osdText(); // hacky, but works... - if( osd.contains( "%rating" ) ) + if( osd.tqcontains( "%rating" ) ) OSDWidget::setRating( AmarokConfig::useRatings() ? bundle.rating() : 0 ); else OSDWidget::setRating( 0 ); - osd.replace( "%rating", "" ); + osd.tqreplace( "%rating", "" ); - if( osd.contains( "%moodbar" ) && AmarokConfig::showMoodbar() ) + if( osd.tqcontains( "%moodbar" ) && AmarokConfig::showMoodbar() ) OSDWidget::setMoodbar( bundle ); - osd.replace( "%moodbar", "" ); + osd.tqreplace( "%moodbar", "" ); text = osd.namedOptArgs( args ); // KDE 3.3 rejects \n in the .kcfg file, and KConfig turns \n into \\n, so... - text.replace( "\\n", "\n" ); + text.tqreplace( "\\n", "\n" ); } if ( AmarokConfig::osdCover() ) { //avoid showing the generic cover. we can overwrite this by passing an arg. //get large cover for scaling if big cover needed - TQString location = TQString::null; + TQString location = TQString(); if( bundle.podcastBundle() ) location = CollectionDB::instance()->podcastImage( bundle, false, 0 ); else location = CollectionDB::instance()->albumImage( bundle, false, 0 ); - if ( location.find( "nocover" ) != -1 ) + if ( location.tqfind( "nocover" ) != -1 ) setImage( Amarok::icon() ); else setImage( location ); @@ -782,9 +782,9 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot void Amarok::OSD::applySettings() { - setAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) ); + tqsetAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) ); setDuration( AmarokConfig::osdDuration() ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 setEnabled( AmarokConfig::osdEnabled() ); #else setEnabled( false ); @@ -806,7 +806,7 @@ Amarok::OSD::applySettings() void Amarok::OSD::forceToggleOSD() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( !isShown() ) { const bool b = isEnabled(); setEnabled( true ); @@ -826,7 +826,7 @@ Amarok::OSD::slotCoverChanged( const TQString &artist, const TQString &album ) { TQString location = CollectionDB::instance()->albumImage( artist, album, false, 0 ); - if( location.find( "nocover" ) != -1 ) + if( location.tqfind( "nocover" ) != -1 ) setImage( Amarok::icon() ); else setImage( location ); @@ -841,7 +841,7 @@ Amarok::OSD::slotImageChanged( const TQString &remoteURL ) if( CollectionDB::instance()->getPodcastEpisodeBundle( url, &peb ) ) { PodcastChannelBundle pcb; - if( CollectionDB::instance()->getPodcastChannelBundle( peb.parent().url(), &pcb ) ) + if( CollectionDB::instance()->getPodcastChannelBundle( peb.tqparent().url(), &pcb ) ) { if( pcb.imageURL().url() == remoteURL ) { @@ -918,7 +918,7 @@ namespace ShadowEngine { alphaShadow = (int) decay( img, i, j ); - result.setPixel( i,j, qRgba( bgr, bgg , bgb, QMIN( MAX_OPACITY, alphaShadow ) ) ); + result.setPixel( i,j, tqRgba( bgr, bgg , bgb, TQMIN( MAX_OPACITY, alphaShadow ) ) ); } } @@ -931,15 +931,15 @@ namespace ShadowEngine // return 0; double alphaShadow; - alphaShadow =(qGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR + - qGray(source.pixel(i-1,j )) * AXIS_FACTOR + - qGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR + - qGray(source.pixel(i ,j-1)) * AXIS_FACTOR + + alphaShadow =(tqGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR + + tqGray(source.pixel(i-1,j )) * AXIS_FACTOR + + tqGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR + + tqGray(source.pixel(i ,j-1)) * AXIS_FACTOR + 0 + - qGray(source.pixel(i ,j+1)) * AXIS_FACTOR + - qGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR + - qGray(source.pixel(i+1,j )) * AXIS_FACTOR + - qGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / MULTIPLICATION_FACTOR; + tqGray(source.pixel(i ,j+1)) * AXIS_FACTOR + + tqGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR + + tqGray(source.pixel(i+1,j )) * AXIS_FACTOR + + tqGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / MULTIPLICATION_FACTOR; return alphaShadow; } diff --git a/amarok/src/osd.h b/amarok/src/osd.h index de2847ce..f8c3cabc 100644 --- a/amarok/src/osd.h +++ b/amarok/src/osd.h @@ -23,14 +23,15 @@ #include <tqwidget.h> //baseclass -class OSDWidget : public QWidget +class OSDWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: enum Alignment { Left, Middle, Center, Right }; - OSDWidget( TQWidget *parent, const char *name = "osd" ); + OSDWidget( TQWidget *tqparent, const char *name = "osd" ); /** resets the colours to defaults */ void unsetColors(); @@ -56,7 +57,7 @@ class OSDWidget : public QWidget void setTextColor( const TQColor &color ) { setPaletteForegroundColor( color ); } void setBackgroundColor(const TQColor &color ) { setPaletteBackgroundColor( color ); } void setOffset( int y ) { m_y = y; } - void setAlignment( Alignment alignment ) { m_alignment = alignment; } + void tqsetAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; } void setImage( const TQImage &image ) { m_cover = image; } void setScreen( int screen ); void setText( const TQString &text ) { m_text = text; } @@ -85,7 +86,7 @@ class OSDWidget : public QWidget int m_duration; TQTimer *m_timer; - Alignment m_alignment; + Alignment m_tqalignment; int m_screen; uint m_y; bool m_drawShadow; @@ -107,12 +108,13 @@ class OSDWidget : public QWidget class OSDPreviewWidget : public OSDWidget { Q_OBJECT + TQ_OBJECT public: - OSDPreviewWidget( TQWidget *parent ); + OSDPreviewWidget( TQWidget *tqparent ); int screen() { return m_screen; } - int alignment() { return m_alignment; } + int tqalignment() { return m_tqalignment; } int y() { return m_y; } public slots: @@ -154,6 +156,7 @@ namespace Amarok class OSD : public OSDWidget { Q_OBJECT + TQ_OBJECT public: static OSD *instance() diff --git a/amarok/src/pixmapviewer.cpp b/amarok/src/pixmapviewer.cpp index 85c56dc8..a710c254 100644 --- a/amarok/src/pixmapviewer.cpp +++ b/amarok/src/pixmapviewer.cpp @@ -37,14 +37,14 @@ void PixmapViewer::drawContents( TQPainter * p, int clipx, int clipy, int clipw, } void PixmapViewer::contentsMousePressEvent(TQMouseEvent *event) { - if(LeftButton == event->button()) { + if(Qt::LeftButton == event->button()) { m_currentPos = event->globalPos(); m_isDragging = true; } } void PixmapViewer::contentsMouseReleaseEvent(TQMouseEvent *event) { - if(LeftButton == event->button()) { + if(Qt::LeftButton == event->button()) { m_currentPos = event->globalPos(); m_isDragging = false; } diff --git a/amarok/src/pixmapviewer.h b/amarok/src/pixmapviewer.h index 5a93d551..9715b55b 100644 --- a/amarok/src/pixmapviewer.h +++ b/amarok/src/pixmapviewer.h @@ -23,6 +23,7 @@ class PixmapViewer : public TQScrollView { Q_OBJECT + TQ_OBJECT public: PixmapViewer(TQWidget *widget, const TQPixmap &pixmap); diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp index 9d985d4b..885bdf45 100644 --- a/amarok/src/playerwindow.cpp +++ b/amarok/src/playerwindow.cpp @@ -52,16 +52,16 @@ namespace Amarok TQPixmap getPNG( const TQString &filename ) { - TQString file = !filename.endsWith( ".png", false ) ? "amarok/images/%1.png" : "amarok/images/%1"; + TQString file = !filename.tqendsWith( ".png", false ) ? "amarok/images/%1.png" : "amarok/images/%1"; - return TQPixmap( locate( "data", file.arg( filename ) ), "PNG" ); + return TQPixmap( locate( "data", file.tqarg( filename ) ), "PNG" ); } TQPixmap getJPG( const TQString &filename ) { - TQString file = !filename.endsWith( ".jpg", false ) ? "amarok/images/%1.jpg" : "amarok/images/%1"; + TQString file = !filename.tqendsWith( ".jpg", false ) ? "amarok/images/%1.jpg" : "amarok/images/%1"; - return TQPixmap( locate( "data", TQString( "amarok/images/%1.jpg" ).arg( filename ) ), "JPEG" ); + return TQPixmap( locate( "data", TQString( "amarok/images/%1.jpg" ).tqarg( filename ) ), "JPEG" ); } } @@ -71,16 +71,16 @@ using Amarok::getPNG; //fairly pointless template which was designed to make the ctor clearer, //but probably achieves the opposite. Still, the code is neater.. template<class W> static inline W* -createWidget( const TQRect &r, TQWidget *parent, const char *name = 0, Qt::WFlags f = 0 ) +createWidget( const TQRect &r, TQWidget *tqparent, const char *name = 0, TQt::WFlags f = 0 ) { - W *w = new W( parent, name, f ); + W *w = new W( tqparent, name, f ); w->setGeometry( r ); return w; } -PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlaylist ) - : TQWidget( parent, name, Qt::WType_TopLevel ) +PlayerWidget::PlayerWidget( TQWidget *tqparent, const char *name, bool enablePlaylist ) + : TQWidget( tqparent, name, TQt::WType_TopLevel ) , EngineObserver( EngineController::instance() ) , m_minimalView( false ) , m_pAnimTimer( new TQTimer( this ) ) @@ -90,12 +90,12 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl , m_pAnalyzer( 0 ) { //the createWidget template function is used here - //createWidget just creates a widget which has it's geometry set too + //createWidget just creates a widget which has it's tqgeometry set too // Sets caption and icon correctly (needed e.g. for GNOME) kapp->setTopWidget( this ); - parent->installEventFilter( this ); //for hidePLaylistWithMainWindow mode + tqparent->installEventFilter( this ); //for hidePLaylistWithMainWindow mode //if this is the first time we have ever been run we let KWin place us if ( AmarokConfig::playerPos() != TQPoint(-1,-1) ) @@ -117,7 +117,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl setFont( font ); { //<NavButtons> - //NOTE we use a layout for the buttons so resizing will be possible + //NOTE we use a tqlayout for the buttons so resizing will be possible m_pFrameButtons = createWidget<TQHBox>( TQRect(0, 118, 311, 22), this ); KActionCollection *ac =Amarok::actionCollection(); @@ -130,8 +130,8 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl new NavButton( m_pFrameButtons, "next", ac->action( "next" ) ); KPushButton *switchView = new KPushButton( KGuiItem( "", "mini_dock" ), m_pFrameButtons ); - switchView->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ); // too big! - switchView->setFocusPolicy( TQWidget::NoFocus ); + switchView->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ); // too big! + switchView->setFocusPolicy( TQ_NoFocus ); connect( switchView, TQT_SIGNAL( clicked() ), TQT_SLOT( toggleView() ) ); @@ -168,7 +168,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl } //<TimeLabel> font.setPixelSize( 18 ); - m_pTimeLabel = createWidget<TQLabel>( TQRect(16,36, 9*12+2,18), this, 0, Qt::WNoAutoErase ); + m_pTimeLabel = createWidget<TQLabel>( TQRect(16,36, 9*12+2,18), this, 0, TQt::WNoAutoErase ); m_pTimeLabel->setFont( font ); m_timeBuffer.resize( m_pTimeLabel->size() ); @@ -176,17 +176,17 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl } //<TimeLabel> - m_pButtonEq = new IconButton( this, "eq", this, TQT_SLOT(slotShowEqualizer( bool )) ); + m_pButtonEq = new IconButton( TQT_TQWIDGET(this), "eq", TQT_TQOBJECT(this), TQT_SLOT(slotShowEqualizer( bool )) ); m_pButtonEq->setGeometry( 34,85, 28,13 ); //TODO set isOn() m_pPlaylistButton = new IconButton( this, "pl", TQT_SIGNAL(playlistToggled( bool )) ); m_pPlaylistButton->setGeometry( 5,85, 28,13 ); - m_pPlaylistButton->setOn( parent->isShown() || enablePlaylist ); + m_pPlaylistButton->setOn( tqparent->isShown() || enablePlaylist ); m_pDescription = createWidget<TQLabel>( TQRect(4,6, 250,10), this ); - m_pTimeSign = createWidget<TQLabel>( TQRect(6,40, 10,10), this, 0, Qt::WRepaintNoErase ); + m_pTimeSign = createWidget<TQLabel>( TQRect(6,40, 10,10), this, 0, TQt::WRepaintNoErase ); m_pVolSign = createWidget<TQLabel>( TQRect(295,7, 9,8), this ); m_pDescription->setText( i18n( "Artist-Title|Album|Length" ) ); @@ -296,7 +296,7 @@ void PlayerWidget::drawScroll() subs += dx + ( w - phase2 ); if( subs < 0 ) subs = 0; - bitBlt( buffer, dx, topMargin, scroll, phase2, 0, w - phase2 - subs, h, Qt::CopyROP ); + bitBlt( buffer, dx, topMargin, scroll, phase2, 0, w - phase2 - subs, h, TQt::CopyROP ); dx += w - phase2; phase2 += w - phase2; @@ -323,7 +323,7 @@ void PlayerWidget::engineStateChanged( Engine::State state, Engine::State /*oldS m_pSlider->newBundle( MetaBundle() ); // Set an empty bundle for no moodbar m_pTimeLabel->hide(); m_pTimeSign->hide(); - m_rateString = TQString::null; + m_rateString = TQString(); m_pSlider->setEnabled( false ); setScroll( i18n( "Welcome to Amarok" ) ); update(); @@ -371,7 +371,7 @@ void PlayerWidget::engineNewMetaData( const MetaBundle &bundle, bool ) if( m_rateString.isEmpty() ) m_rateString = Hz; else - m_rateString = i18n("%1 kBit - %2").arg( m_rateString, Hz ); + m_rateString = i18n("%1 kBit - %2").tqarg( m_rateString, Hz ); } TQStringList list( bundle.prettyTitle() ); @@ -435,7 +435,7 @@ void PlayerWidget::determineAmarokColors() //static using namespace Amarok::ColorScheme; - Text = Qt::white; + Text = TQt::white; Background = comodulate( hue, 0x002090 ); Foreground = comodulate( hue, 0x80A0FF ); @@ -446,7 +446,7 @@ void PlayerWidget::determineAmarokColors() //static if ( AmarokConfig::schemeKDE() ) { int h; KGlobalSettings::activeTitleColor().getHsv( &h, &s, &v ); - if( QABS( hue - h ) > 120 ) + if( TQABS( hue - h ) > 120 ) hue = h; } @@ -547,9 +547,9 @@ bool PlayerWidget::event( TQEvent *e ) return true; case 6/*TQEvent::KeyPress*/: - if (static_cast<TQKeyEvent*>(e)->key() == Qt::Key_D/* && (m_pAnalyzer->inherits(TQGLWIDGET_OBJECT_NAME_STRING)*/) + if (TQT_TQKEYEVENT(e)->key() == TQt::Key_D/* && (m_pAnalyzer->inherits(TQGLWIDGET_OBJECT_NAME_STRING)*/) { - if( m_pAnalyzer->parent() ) + if( m_pAnalyzer->tqparent() ) { m_pAnalyzer->reparent( 0, TQPoint(50,50), true ); m_pAnalyzer->setCaption( kapp->makeStdCaption( i18n("Analyzer") ) ); @@ -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 = parentWidget()->winId(); + const WId id = tqparentWidget()->winId(); const uint desktop = KWin::windowInfo( winId() ).desktop(); const KWin::WindowInfo info = KWin::windowInfo( id ); @@ -587,15 +587,15 @@ bool PlayerWidget::event( TQEvent *e ) if( info.mappingState() == NET::Withdrawn ) { - //extern Atom qt_wm_state; //XAtom defined by Qt + //extern Atom qt_wm_state; //XAtom defined by TQt //TODO prevent the active Window flicker from playlist to player window please! //TODO look at code for TQWidget::show(); //XDeleteProperty( qt_xdisplay(), id, qt_wm_state ); - //parentWidget()->show(); - //if( !parentWidget()->isShown() ) XMapWindow( qt_xdisplay(), id ); + //tqparentWidget()->show(); + //if( !tqparentWidget()->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 ); - parentWidget()->show(); + tqparentWidget()->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( parentWidget()->isShown() ) dontChangeButtonState = true; + if( tqparentWidget()->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( parentWidget()->winId(), false ); + if( info.isMinimized() ) KWin::iconifyWindow( tqparentWidget()->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! - parentWidget()->hide(); + tqparentWidget()->hide(); } return false; @@ -676,9 +676,9 @@ bool PlayerWidget::event( TQEvent *e ) bool PlayerWidget::eventFilter( TQObject *o, TQEvent *e ) { - //NOTE we only monitor for parent() - which is the PlaylistWindow + //NOTE we only monitor for tqparent() - which is the PlaylistWindow - if( o == m_pAnalyzer ) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pAnalyzer) ) { //delete analyzer, create same one back in Player Window if( e->type() == TQEvent::Close ) @@ -693,7 +693,7 @@ PlayerWidget::eventFilter( TQObject *o, TQEvent *e ) { case TQEvent::Close: - static_cast<TQCloseEvent*>(e)->accept(); //close the window! + TQT_TQCLOSEEVENT(e)->accept(); //close the window! return true; //don't let PlaylistWindow have the event - see PlaylistWindow::closeEvent() case TQEvent::Hide: @@ -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( parentWidget()->winId() ); + KWin::WindowInfo info = KWin::windowInfo( tqparentWidget()->winId() ); if( !info.isMinimized() ) break; } @@ -760,21 +760,21 @@ void PlayerWidget::contextMenuEvent( TQMouseEvent *e ) void PlayerWidget::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == TQMouseEvent::RightButton ) + if ( e->button() == Qt::RightButton ) { //Amarok::Menu::instance()->exec( e->globalPos() ); } - else if ( m_pAnalyzer->geometry().contains( e->pos() ) ) + else if ( m_pAnalyzer->tqgeometry().tqcontains( e->pos() ) ) { - createAnalyzer( e->state() & Qt::ControlButton ? -1 : +1 ); + createAnalyzer( e->state() & TQt::ControlButton ? -1 : +1 ); } else { - QRect - rect = m_pTimeLabel->geometry(); - rect |= m_pTimeSign->geometry(); + TQRect + rect = m_pTimeLabel->tqgeometry(); + rect |= m_pTimeSign->tqgeometry(); - if ( rect.contains( e->pos() ) ) + if ( rect.tqcontains( e->pos() ) ) { AmarokConfig::setLeftTimeDisplayRemaining( !AmarokConfig::leftTimeDisplayRemaining() ); timeDisplay( EngineController::engine()->position() ); @@ -814,7 +814,7 @@ void PlayerWidget::startDrag() { TQDragObject *d = new TQTextDrag( EngineController::instance()->bundle().prettyTitle(), this ); d->dragCopy(); - // Qt will delete d for us. + // TQt will delete d for us. } @@ -839,12 +839,12 @@ void PlayerWidget::slotShowEqualizer( bool show ) //SLOT #include <kiconeffect.h> #include <kimageeffect.h> -NavButton::NavButton( TQWidget *parent, const TQString &icon, KAction *action ) - : TQToolButton( parent ) +NavButton::NavButton( TQWidget *tqparent, const TQString &icon, KAction *action ) + : TQToolButton( tqparent ) , m_glowIndex( 0 ) { // Prevent flicker - setWFlags( Qt::WNoAutoErase ); + setWFlags( TQt::WNoAutoErase ); TQPixmap pixmap( getPNG( "b_" + icon ) ); KIconEffect ie; @@ -886,7 +886,7 @@ NavButton::NavButton( TQWidget *parent, const TQString &icon, KAction *action ) iconSet.setPixmap( pixmap, TQIconSet::Automatic, TQIconSet::Disabled, TQIconSet::Off ); setIconSet( iconSet ); - setFocusPolicy( TQWidget::NoFocus ); + setFocusPolicy( TQ_NoFocus ); setEnabled( action->isEnabled() ); connect( action, TQT_SIGNAL( enabled( bool ) ), TQT_SLOT( setEnabled( bool ) ) ); @@ -925,26 +925,26 @@ void NavButton::drawButtonLabel( TQPainter* p ) // CLASS IconButton ////////////////////////////////////////////////////////////////////////////////////////// -IconButton::IconButton( TQWidget *parent, const TQString &icon, const char *signal ) - : TQButton( parent ) +IconButton::IconButton( TQWidget *tqparent, const TQString &icon, const char *signal ) + : TQButton( tqparent ) , m_up( getPNG( icon + "_active2" ) ) //TODO rename files better (like the right way round for one!) , m_down( getPNG( icon + "_inactive2" ) ) { - connect( this, TQT_SIGNAL(toggled( bool )), parent, signal ); + connect( this, TQT_SIGNAL(toggled( bool )), tqparent, signal ); setToggleButton( true ); - setFocusPolicy( NoFocus ); //we have no way to show focus on these widgets currently + setFocusPolicy( TQ_NoFocus ); //we have no way to show focus on these widgets currently } -IconButton::IconButton( TQWidget *parent, const TQString &icon, TQObject* receiver, const char *slot ) - : TQButton( parent ) +IconButton::IconButton( TQWidget *tqparent, const TQString &icon, TQObject* receiver, const char *slot ) + : TQButton( tqparent ) , m_up( getPNG( icon + "_active2" ) ) //TODO rename files better (like the right way round for one!) , m_down( getPNG( icon + "_inactive2" ) ) { connect( this, TQT_SIGNAL(toggled( bool )), receiver, slot ); setToggleButton( true ); - setFocusPolicy( NoFocus ); //we have no way to show focus on these widgets currently + setFocusPolicy( TQ_NoFocus ); //we have no way to show focus on these widgets currently } void IconButton::drawButton( TQPainter *p ) diff --git a/amarok/src/playerwindow.h b/amarok/src/playerwindow.h index 7caf3413..283aa900 100644 --- a/amarok/src/playerwindow.h +++ b/amarok/src/playerwindow.h @@ -38,7 +38,7 @@ class TQStringList; class TQTimerEvent; -class NavButton : public TQToolButton //no QOBJECT macro - why bother? +class NavButton : public TQToolButton //no TQOBJECT macro - why bother? { public: NavButton( TQWidget*, const TQString&, KAction* ); @@ -58,9 +58,10 @@ protected: }; -class IconButton : public QButton +class IconButton : public TQButton { Q_OBJECT + TQ_OBJECT public: IconButton( TQWidget*, const TQString&, const char *signal ); @@ -81,6 +82,7 @@ private: class PlayerWidget : public TQWidget, public EngineObserver { Q_OBJECT + TQ_OBJECT public: PlayerWidget( TQWidget* = 0, const char* = 0, bool enablePlaylist = false ); @@ -132,7 +134,7 @@ class PlayerWidget : public TQWidget, public EngineObserver virtual void mouseMoveEvent( TQMouseEvent* ); ///to make the code clearer to n00bies ;) - TQWidget *playlistWindow() { return parentWidget(); } + TQWidget *playlistWindow() { return tqparentWidget(); } 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 91875de2..a97273ac 100644 --- a/amarok/src/playlist.cpp +++ b/amarok/src/playlist.cpp @@ -6,7 +6,7 @@ * NOTES * * The PlaylistWindow handles some Playlist events. Thanks! - * This class has a QOBJECT but it's private so you can only connect via PlaylistWindow::PlaylistWindow + * This class has a TQOBJECT but it's private so you can only connect via PlaylistWindow::PlaylistWindow * Mostly it's sensible to implement playlist functionality in this class * TODO Obtaining information about the playlist is currently hard, we need the playlist to be globally * available and have some more useful public functions @@ -163,10 +163,10 @@ namespace Glow TQMutex* Playlist::s_dynamicADTMutex = new TQMutex(); Playlist *Playlist::s_instance = 0; -Playlist::Playlist( TQWidget *parent ) - : KListView( parent, "ThePlaylist" ) +Playlist::Playlist( TQWidget *tqparent ) + : KListView( tqparent, "ThePlaylist" ) , EngineObserver( EngineController::instance() ) - , m_startupTime_t( TQDateTime::currentDateTime().toTime_t() ) + , m_startupTime_t( TQDateTime::tqcurrentDateTime().toTime_t() ) , m_oldestTime_t( CollectionDB::instance()->query( "SELECT MIN( createdate ) FROM statistics;" ).first().toInt() ) , m_currentTrack( 0 ) , m_marker( 0 ) @@ -281,17 +281,17 @@ Playlist::Playlist( TQWidget *parent ) if( AmarokConfig::useRatings() ) setColumnWidth( PlaylistItem::Rating, PlaylistItem::ratingColumnWidth() ); - setColumnAlignment( PlaylistItem::Length, Qt::AlignRight ); - setColumnAlignment( PlaylistItem::Track, Qt::AlignCenter ); - setColumnAlignment( PlaylistItem::DiscNumber, Qt::AlignCenter ); - setColumnAlignment( PlaylistItem::Bpm, Qt::AlignRight ); - setColumnAlignment( PlaylistItem::Year, Qt::AlignCenter ); - setColumnAlignment( PlaylistItem::Bitrate, Qt::AlignCenter ); - setColumnAlignment( PlaylistItem::SampleRate, Qt::AlignCenter ); - setColumnAlignment( PlaylistItem::Filesize, Qt::AlignCenter ); - setColumnAlignment( PlaylistItem::Score, Qt::AlignCenter ); - setColumnAlignment( PlaylistItem::Type, Qt::AlignCenter ); - setColumnAlignment( PlaylistItem::PlayCount, Qt::AlignCenter ); + setColumnAlignment( PlaylistItem::Length, TQt::AlignRight ); + setColumnAlignment( PlaylistItem::Track, TQt::AlignCenter ); + setColumnAlignment( PlaylistItem::DiscNumber, TQt::AlignCenter ); + setColumnAlignment( PlaylistItem::Bpm, TQt::AlignRight ); + setColumnAlignment( PlaylistItem::Year, TQt::AlignCenter ); + setColumnAlignment( PlaylistItem::Bitrate, TQt::AlignCenter ); + setColumnAlignment( PlaylistItem::SampleRate, TQt::AlignCenter ); + setColumnAlignment( PlaylistItem::Filesize, TQt::AlignCenter ); + setColumnAlignment( PlaylistItem::Score, TQt::AlignCenter ); + setColumnAlignment( PlaylistItem::Type, TQt::AlignCenter ); + setColumnAlignment( PlaylistItem::PlayCount, TQt::AlignCenter ); connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), @@ -320,22 +320,22 @@ Playlist::Playlist( TQWidget *parent ) KActionCollection* const ac = Amarok::actionCollection(); - KAction *copy = KStdAction::copy( this, TQT_SLOT( copyToClipboard() ), ac, "playlist_copy" ); - KStdAction::selectAll( this, TQT_SLOT( selectAll() ), ac, "playlist_select_all" ); + KAction *copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copyToClipboard() ), ac, "playlist_copy" ); + KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), ac, "playlist_select_all" ); - m_clearButton = new KAction( i18n( "clear playlist", "&Clear" ), Amarok::icon( "playlist_clear" ), 0, this, TQT_SLOT( clear() ), ac, "playlist_clear" ); - m_undoButton = KStdAction::undo( this, TQT_SLOT( undo() ), ac, "playlist_undo" ); - m_redoButton = KStdAction::redo( this, TQT_SLOT( redo() ), ac, "playlist_redo" ); + m_clearButton = new KAction( i18n( "clear playlist", "&Clear" ), Amarok::icon( "playlist_clear" ), 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), ac, "playlist_clear" ); + m_undoButton = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( undo() ), ac, "playlist_undo" ); + m_redoButton = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( redo() ), ac, "playlist_redo" ); m_undoButton ->setIcon( Amarok::icon( "undo" ) ); m_redoButton ->setIcon( Amarok::icon( "redo" ) ); - new KAction( i18n( "&Repopulate" ), Amarok::icon( "playlist_refresh" ), 0, this, TQT_SLOT( repopulate() ), ac, "repopulate" ); - new KAction( i18n( "S&huffle" ), "rebuild", CTRL+Key_H, this, TQT_SLOT( shuffle() ), ac, "playlist_shuffle" ); - KAction *gotoCurrent = new KAction( i18n( "&Go To Current Track" ), Amarok::icon( "music" ), CTRL+Key_J, this, TQT_SLOT( showCurrentTrack() ), ac, "playlist_show" ); - new KAction( i18n( "&Remove Duplicate && Dead Entries" ), 0, this, TQT_SLOT( removeDuplicates() ), ac, "playlist_remove_duplicates" ); - new KAction( i18n( "&Queue Selected Tracks" ), Amarok::icon( "queue_track" ), CTRL+Key_D, this, TQT_SLOT( queueSelected() ), ac, "queue_selected" ); + new KAction( i18n( "&Repopulate" ), Amarok::icon( "playlist_refresh" ), 0, TQT_TQOBJECT(this), TQT_SLOT( repopulate() ), ac, "repopulate" ); + new KAction( i18n( "S&huffle" ), "rebuild", CTRL+Key_H, TQT_TQOBJECT(this), TQT_SLOT( shuffle() ), ac, "playlist_shuffle" ); + KAction *gotoCurrent = new KAction( i18n( "&Go To Current Track" ), Amarok::icon( "music" ), CTRL+Key_J, TQT_TQOBJECT(this), TQT_SLOT( showCurrentTrack() ), ac, "playlist_show" ); + new KAction( i18n( "&Remove Duplicate && Dead Entries" ), 0, TQT_TQOBJECT(this), TQT_SLOT( removeDuplicates() ), ac, "playlist_remove_duplicates" ); + new KAction( i18n( "&Queue Selected Tracks" ), Amarok::icon( "queue_track" ), CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( queueSelected() ), ac, "queue_selected" ); KToggleAction *stopafter = new KToggleAction( i18n( "&Stop Playing After Track" ), Amarok::icon( "stop" ), CTRL+ALT+Key_V, - this, TQT_SLOT( toggleStopAfterCurrentItem() ), ac, "stop_after" ); + TQT_TQOBJECT(this), TQT_SLOT( toggleStopAfterCurrentItem() ), ac, "stop_after" ); { // KAction idiocy -- shortcuts don't work until they've been plugged into a menu KPopupMenu asdf; @@ -657,7 +657,7 @@ Playlist::setDynamicHistory( bool enable /*false*/ ) { if( *it == m_currentTrack ) break; - //avoid repainting if we can. + //avoid tqrepainting if we can. if( (*it)->isDynamicEnabled() == enable ) { (*it)->setDynamicEnabled( !enable ); @@ -666,7 +666,7 @@ Playlist::setDynamicHistory( bool enable /*false*/ ) } } -QString +TQString Playlist::defaultPlaylistPath() //static { return Amarok::saveLocation() + "current.xml"; @@ -812,19 +812,19 @@ void Playlist::addToUniqueMap( const TQString uniqueid, PlaylistItem* item ) { TQPtrList<PlaylistItem> *list; - if( m_uniqueMap.contains( uniqueid ) ) + if( m_uniqueMap.tqcontains( uniqueid ) ) list = m_uniqueMap[uniqueid]; else list = new TQPtrList<PlaylistItem>(); list->append( item ); - if( !m_uniqueMap.contains( uniqueid ) ) + if( !m_uniqueMap.tqcontains( uniqueid ) ) m_uniqueMap[uniqueid] = list; } void Playlist::removeFromUniqueMap( const TQString uniqueid, PlaylistItem* item ) { - if( !m_uniqueMap.contains( uniqueid ) ) + if( !m_uniqueMap.tqcontains( uniqueid ) ) return; TQPtrList<PlaylistItem> *list; @@ -846,7 +846,7 @@ Playlist::updateEntriesUrl( const TQString &oldUrl, const TQString &newUrl, cons MoodServer::instance()->slotFileMoved( oldUrl, newUrl ); TQPtrList<PlaylistItem> *list; - if( m_uniqueMap.contains( uniqueid ) ) + if( m_uniqueMap.tqcontains( uniqueid ) ) { list = m_uniqueMap[uniqueid]; PlaylistItem *item; @@ -862,7 +862,7 @@ void Playlist::updateEntriesUniqueId( const TQString &/*url*/, const TQString &oldid, const TQString &newid ) { TQPtrList<PlaylistItem> *list, *oldlist; - if( m_uniqueMap.contains( oldid ) ) + if( m_uniqueMap.tqcontains( oldid ) ) { list = m_uniqueMap[oldid]; m_uniqueMap.remove( oldid ); @@ -872,7 +872,7 @@ Playlist::updateEntriesUniqueId( const TQString &/*url*/, const TQString &oldid, item->setUniqueId( newid ); item->readTags(); } - if( !m_uniqueMap.contains( newid ) ) + if( !m_uniqueMap.tqcontains( newid ) ) m_uniqueMap[newid] = list; else { @@ -888,7 +888,7 @@ void Playlist::updateEntriesStatusDeleted( const TQString &/*absPath*/, const TQString &uniqueid ) { TQPtrList<PlaylistItem> *list; - if( m_uniqueMap.contains( uniqueid ) ) + if( m_uniqueMap.tqcontains( uniqueid ) ) { list = m_uniqueMap[uniqueid]; PlaylistItem *item; @@ -901,7 +901,7 @@ void Playlist::updateEntriesStatusAdded( const TQString &absPath, const TQString &uniqueid ) { TQPtrList<PlaylistItem> *list; - if( m_uniqueMap.contains( uniqueid ) ) + if( m_uniqueMap.tqcontains( uniqueid ) ) { list = m_uniqueMap[uniqueid]; if( !list ) @@ -924,7 +924,7 @@ Playlist::updateEntriesStatusAdded( const TQMap<TQString,TQString> &map ) TQMap<TQString,TQPtrList<PlaylistItem>*>::Iterator it; for( it = uniquecopy.begin(); it != uniquecopy.end(); ++it ) { - if( map.contains( it.key() )) + if( map.tqcontains( it.key() )) { updateEntriesStatusAdded( map[it.key()], it.key() ); uniquecopy.remove( it ); @@ -932,7 +932,7 @@ Playlist::updateEntriesStatusAdded( const TQMap<TQString,TQString> &map ) } for( it = uniquecopy.begin(); it != uniquecopy.end(); ++it ) - updateEntriesStatusDeleted( TQString::null, it.key() ); + updateEntriesStatusDeleted( TQString(), it.key() ); } //////////////////////////////////////////////////////////////////////////////// @@ -958,7 +958,7 @@ Playlist::playNextTrack( bool forceNext ) if( !AmarokConfig::randomMode() ) { item = MyIt::nextVisible( item ); - while( item && ( !checkFileStatus( item ) || !item->exists() ) ) + while( item && ( !checkFiletqStatus( item ) || !item->exists() ) ) item = MyIt::nextVisible( item ); setCurrentTrack( item ); } @@ -995,14 +995,14 @@ Playlist::playNextTrack( bool forceNext ) { for( ArtistAlbumMap::const_iterator it = m_albums.constBegin(), end = m_albums.constEnd(); it != end; ++it ) for( AlbumMap::const_iterator it2 = (*it).constBegin(), end2 = (*it).constEnd(); it2 != end2; ++it2 ) - if( m_prevAlbums.findRef( *it2 ) == -1 ) { + if( m_prevAlbums.tqfindRef( *it2 ) == -1 ) { if ( (*it2)->tracks.getFirst() ) tracks.append( (*it2)->tracks.getFirst() ); } } else for( MyIt it( this ); *it; ++it ) - if ( !m_prevTracks.containsRef( *it ) && checkFileStatus( *it ) && (*it)->exists() ) + if ( !m_prevTracks.tqcontainsRef( *it ) && checkFiletqStatus( *it ) && (*it)->exists() ) tracks.push_back( *it ); if( tracks.isEmpty() ) { @@ -1023,7 +1023,7 @@ Playlist::playNextTrack( bool forceNext ) // would loop infinitely otherwise TQPtrList<PlaylistAlbum> albums; for( PlaylistIterator it( this, PlaylistIterator::Visible ); *it && albums.count() <= 1; ++it ) - if( albums.findRef( (*it)->m_album ) == -1 ) + if( albums.tqfindRef( (*it)->m_album ) == -1 ) albums.append( (*it)->m_album ); if ( albums.count() > 1 ) @@ -1082,9 +1082,9 @@ Playlist::playNextTrack( bool forceNext ) item = tracks.at( KApplication::random() % tracks.count() ); //is O(1) else { - const uint currenttime_t = TQDateTime::currentDateTime().toTime_t(); + const uint currenttime_t = TQDateTime::tqcurrentDateTime().toTime_t(); TQValueVector<int> weights( tracks.size() ); - Q_INT64 total = m_total; + TQ_INT64 total = m_total; if( Amarok::randomAlbums() ) { for( int i = 0, n = tracks.count(); i < n; ++i ) @@ -1112,10 +1112,10 @@ Playlist::playNextTrack( bool forceNext ) total += ( currenttime_t - m_startupTime_t ) * weights.count(); } - Q_INT64 random; + TQ_INT64 random; if( Amarok::favorLastPlay() ) //really big huge numbers { - Q_INT64 r = Q_INT64( ( KApplication::random() / pow( 2, sizeof( int ) * 8 ) ) + TQ_INT64 r = TQ_INT64( ( KApplication::random() / pow( 2, sizeof( int ) * 8 ) ) * pow( 2, 64 ) ); random = r % total; } @@ -1131,13 +1131,13 @@ Playlist::playNextTrack( bool forceNext ) else if( item ) { item = MyIt::nextVisible( item ); - while( item && ( !checkFileStatus( item ) || !item->exists() ) ) + while( item && ( !checkFiletqStatus( item ) || !item->exists() ) ) item = MyIt::nextVisible( item ); } else { item = *MyIt( this ); //ie. first visible item - while( item && ( !checkFileStatus( item ) || !item->exists() ) ) + while( item && ( !checkFiletqStatus( item ) || !item->exists() ) ) item = item->nextSibling(); } @@ -1227,7 +1227,7 @@ Playlist::playPrevTrack() if( !item ) { item = *static_cast<MyIt&>(--MyIt( item )); - while( item && !checkFileStatus( item ) ) + while( item && !checkFiletqStatus( item ) ) item = *static_cast<MyIt&>(--MyIt( item )); } } @@ -1241,13 +1241,13 @@ Playlist::playPrevTrack() if( item ) { item = MyIt::prevVisible( item ); - while( item && ( !checkFileStatus( item ) || !item->isEnabled() ) ) + while( item && ( !checkFiletqStatus( item ) || !item->isEnabled() ) ) item = MyIt::prevVisible( item ); } else { item = *MyIt( this ); //ie. first visible item - while( item && ( !checkFileStatus( item ) || !item->isEnabled() ) ) + while( item && ( !checkFiletqStatus( item ) || !item->isEnabled() ) ) item = item->nextSibling(); } } @@ -1305,13 +1305,13 @@ Playlist::queueSelected() // Dequeuing selection with dynamic doesn't work due to the moving of the track after the last queued if( dynamicMode() ) { - ( !m_nextTracks.containsRef( *it ) ? in : out ).append( *it ); + ( !m_nextTracks.tqcontainsRef( *it ) ? in : out ).append( *it ); dynamicList.append( *it ); } else { queue( *it, true ); - ( m_nextTracks.containsRef( *it ) ? in : out ).append( *it ); + ( m_nextTracks.tqcontainsRef( *it ) ? in : out ).append( *it ); } } @@ -1319,7 +1319,7 @@ Playlist::queueSelected() if( dynamicMode() ) { TQListViewItem *item = dynamicList.first(); - if( m_nextTracks.containsRef( static_cast<PlaylistItem*>(item) ) ) + if( m_nextTracks.tqcontainsRef( static_cast<PlaylistItem*>(item) ) ) { for( item = dynamicList.last(); item; item = dynamicList.prev() ) queue( item, true ); @@ -1339,7 +1339,7 @@ Playlist::queue( TQListViewItem *item, bool multi, bool invertQueue ) { #define item static_cast<PlaylistItem*>(item) - const int queueIndex = m_nextTracks.findRef( item ); + const int queueIndex = m_nextTracks.tqfindRef( item ); const bool isQueued = queueIndex != -1; if( isQueued ) @@ -1562,14 +1562,14 @@ Playlist::slotCountChanged() } bool -Playlist::checkFileStatus( PlaylistItem * item ) +Playlist::checkFiletqStatus( PlaylistItem * item ) { //DEBUG_BLOCK //debug() << "uniqueid of item = " << item->uniqueId() << ", url = " << item->url().path() << endl; if( !item->checkExists() ) { //debug() << "not found, finding new url" << endl; - TQString path = TQString::null; + TQString path = TQString(); if( !item->uniqueId().isEmpty() ) { path = CollectionDB::instance()->urlFromUniqueId( item->uniqueId() ); @@ -1622,7 +1622,7 @@ Playlist::activate( TQListViewItem *item ) #define item static_cast<PlaylistItem*>(item) - if ( !checkFileStatus( item ) ) + if ( !checkFiletqStatus( item ) ) { Amarok::StatusBar::instance()->shortMessage( i18n("Local file does not exist.") ); return; @@ -1694,17 +1694,17 @@ Playlist::activate( TQListViewItem *item ) #undef item } -QPair<TQString, TQRect> Playlist::toolTipText( TQWidget*, const TQPoint &pos ) const +TQPair<TQString, TQRect> Playlist::toolTipText( TQWidget*, const TQPoint &pos ) const { PlaylistItem *item = static_cast<PlaylistItem*>( itemAt( pos ) ); if( !item ) - return QPair<TQString, TQRect>( TQString::null, TQRect() ); + return TQPair<TQString, TQRect>( TQString(), TQRect() ); const TQPoint contentsPos = viewportToContents( pos ); const int col = header()->sectionAt( contentsPos.x() ); if( item == m_renameItem && col == m_renameColumn ) - return QPair<TQString, TQRect>( TQString::null, TQRect() ); + return TQPair<TQString, TQRect>( TQString(), TQRect() ); TQString text; if( col == PlaylistItem::Rating ) @@ -1712,7 +1712,7 @@ QPair<TQString, TQRect> Playlist::toolTipText( TQWidget*, const TQPoint &pos ) c else text = item->text( col ); - TQRect irect = itemRect( item ); + TQRect irect = tqitemRect( item ); const int headerPos = header()->sectionPos( col ); irect.setLeft( headerPos - 1 ); irect.setRight( headerPos + header()->sectionSize( col ) ); @@ -1737,7 +1737,7 @@ QPair<TQString, TQRect> Playlist::toolTipText( TQWidget*, const TQPoint &pos ) c } if( col != PlaylistItem::Rating && fontMetrics().width( text ) <= itemWidth ) - return QPair<TQString, TQRect>( TQString::null, TQRect() ); + return TQPair<TQString, TQRect>( TQString(), TQRect() ); TQRect globalRect( viewport()->mapToGlobal( irect.topLeft() ), irect.size() ); TQSimpleRichText t( text, font() ); @@ -1752,16 +1752,16 @@ QPair<TQString, TQRect> Playlist::toolTipText( TQWidget*, const TQPoint &pos ) c if( ( col == PlaylistItem::Rating && PlaylistItem::ratingAtPoint( contentsPos.x() ) <= item->rating() + 1 ) || ( col != PlaylistItem::Rating ) ) { - text = text.replace( "&", "&" ).replace( "<", "<" ).replace( ">", ">" ); + text = text.tqreplace( "&", "&" ).tqreplace( "<", "<" ).tqreplace( ">", ">" ); if( item->isCurrent() ) { - text = TQString("<i>%1</i>").arg( text ); + text = TQString("<i>%1</i>").tqarg( text ); Amarok::ToolTip::s_hack = 1; //HACK for precise positioning } - return QPair<TQString, TQRect>( text, globalRect ); + return TQPair<TQString, TQRect>( text, globalRect ); } - return QPair<TQString, TQRect>( TQString::null, TQRect() ); + return TQPair<TQString, TQRect>( TQString(), TQRect() ); } void @@ -1833,7 +1833,7 @@ Playlist::setCurrentTrack( PlaylistItem *item ) if ( prev ) { //reset to normal height - prev->invalidateHeight(); + prev->tqinvalidateHeight(); prev->setup(); //remove pixmap in first column prev->setPixmap( m_firstColumn, TQPixmap() ); @@ -1915,7 +1915,7 @@ Playlist::setCurrentTrackPixmap( int state ) if( !m_currentTrack ) return; - TQString pixmap = TQString::null; + TQString pixmap = TQString(); if( state < 0 ) state = EngineController::engine()->state(); @@ -2094,7 +2094,7 @@ Playlist::engineStateChanged( Engine::State state, Engine::State /*oldState*/ ) } //POSSIBLYAHACK - //apparently you can't rely on EngineController::engine()->state() == state here, so pass it explicitly + //aptqparently you can't rely on EngineController::engine()->state() == state here, so pass it explicitly setCurrentTrackPixmap( state ); } @@ -2158,7 +2158,7 @@ Playlist::clear() //SLOT } /** - * Workaround for Qt 3.3.5 bug in TQListView::clear() + * Workaround for TQt 3.3.5 bug in TQListView::clear() * @see http://lists.kde.org/?l=kde-devel&m=113113845120155&w=2 * @see BUG 116004 */ @@ -2209,7 +2209,7 @@ Playlist::setColumnWidth( int col, int width ) KListView::setColumnWidth( col, width ); - //FIXME this is because Qt doesn't by default disable resizing width 0 columns. GRRR! + //FIXME this is because TQt doesn't by default disable resizing width 0 columns. GRRR! //NOTE default column sizes are stored in default amarokrc so that restoreLayout() in ctor will // call this function. This is necessary because addColumn() doesn't call setColumnWidth() GRRR! header()->setResizeEnabled( width != 0, col ); @@ -2277,7 +2277,7 @@ Playlist::writeTag( TQListViewItem *qitem, const TQString &, int column ) //SLOT for( PlaylistItem *item = m_itemsToChangeTagsFor.first(); item; item = m_itemsToChangeTagsFor.next() ) { - if( !checkFileStatus( item ) ) + if( !checkFiletqStatus( item ) ) continue; const TQString oldTag = item == qitem ? m_editOldTag : item->exactText(column); @@ -2300,7 +2300,7 @@ Playlist::writeTag( TQListViewItem *qitem, const TQString &, int column ) //SLOT static_cast<PlaylistItem*>(qitem)->setDynamicEnabled( dynamicEnabled ); m_itemsToChangeTagsFor.clear(); - m_editOldTag = TQString::null; + m_editOldTag = TQString(); } void @@ -2340,8 +2340,8 @@ Playlist::paletteChange( const TQPalette &p ) const uint steps = STEPS+5+5; //so we don't fade all the way to base, and all the way up to highlight either - fg = colorGroup().highlight(); - bg = colorGroup().base(); + fg = tqcolorGroup().highlight(); + bg = tqcolorGroup().base(); dr = double(bg.red() - fg.red()) / steps; dg = double(bg.green() - fg.green()) / steps; @@ -2357,8 +2357,8 @@ Playlist::paletteChange( const TQPalette &p ) const uint steps = STEPS + 5; //so we don't fade all the way to base - fg = colorGroup().highlightedText(); - bg = colorGroup().text(); + fg = tqcolorGroup().highlightedText(); + bg = tqcolorGroup().text(); dr = double(bg.red() - fg.red()) / steps; dg = double(bg.green() - fg.green()) / steps; @@ -2371,8 +2371,8 @@ Playlist::paletteChange( const TQPalette &p ) KListView::paletteChange( p ); - counter = 0; // reset the counter or apparently the text lacks contrast - slotGlowTimer(); // repaint currentTrack marker + counter = 0; // reset the counter or aptqparently the text lacks contrast + slotGlowTimer(); // tqrepaint currentTrack marker } void @@ -2395,7 +2395,7 @@ Playlist::contentsDragMoveEvent( TQDragMoveEvent* e ) if( !e->isAccepted() ) return; #if KDE_IS_VERSION( 3, 3, 91 ) - const bool ctrlPressed = KApplication::keyboardMouseState() & Qt::ControlButton; + const bool ctrlPressed = KApplication::keyboardMouseState() & TQt::ControlButton; #else const bool ctrlPressed = KApplication::keyboardModifiers() & ControlMask; #endif @@ -2404,7 +2404,7 @@ Playlist::contentsDragMoveEvent( TQDragMoveEvent* e ) const TQPoint p = contentsToViewport( e->pos() ); TQListViewItem *item = itemAt( p ); if( !item || ctrlPressed ) item = lastItem(); - else if( p.y() - itemRect( item ).top() < (item->height()/2) ) item = item->itemAbove(); + else if( p.y() - tqitemRect( item ).top() < (item->height()/2) ) item = item->itemAbove(); if( item != m_marker ) { //NOTE this if block prevents flicker @@ -2425,8 +2425,8 @@ Playlist::contentsDropEvent( TQDropEvent *e ) { DEBUG_BLOCK - //NOTE parent is always 0 currently, but we support it in case we start using trees - TQListViewItem *parent = 0; + //NOTE tqparent is always 0 currently, but we support it in case we start using trees + TQListViewItem *tqparent = 0; TQListViewItem *after = m_marker; //make sure to disable only if in dynamic mode and you're inserting @@ -2448,13 +2448,13 @@ Playlist::contentsDropEvent( TQDropEvent *e ) } if( !after ) - findDrop( e->pos(), parent, after ); //shouldn't happen, but you never know! + findDrop( e->pos(), tqparent, after ); //shouldn't happen, but you never know! slotEraseMarker(); if ( e->source() == viewport() ) { setSorting( NO_SORT ); //disableSorting and saveState() - movableDropEvent( parent, after ); + movableDropEvent( tqparent, after ); TQPtrList<TQListViewItem> items = selectedItems(); if( dynamicMode() && after ) { @@ -2532,7 +2532,7 @@ Playlist::viewportPaintEvent( TQPaintEvent *e ) TQPainter p( viewport() ); p.fillRect( drawDropVisualizer( 0, 0, m_marker ), - TQBrush( colorGroup().highlight().dark(), TQBrush::Dense4Pattern ) ); + TQBrush( tqcolorGroup().highlight().dark(), TQBrush::Dense4Pattern ) ); } else if( m_showHelp && isEmpty() ) { TQPainter p( viewport() ); @@ -2569,9 +2569,9 @@ Playlist::viewportPaintEvent( TQPaintEvent *e ) const uint x = (viewport()->width() - w - 30) / 2 ; const uint y = (viewport()->height() - h - 30) / 2 ; - p.setBrush( colorGroup().background() ); + p.setBrush( tqcolorGroup().background() ); p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h ); - t->draw( &p, x+15, y+15, TQRect(), colorGroup() ); + t->draw( &p, x+15, y+15, TQRect(), tqcolorGroup() ); delete t; } } @@ -2726,10 +2726,10 @@ Playlist::columnResizeEvent( int col, int oldw, int neww ) bool Playlist::eventFilter( TQObject *o, TQEvent *e ) { - #define me static_cast<TQMouseEvent*>(e) - #define ke static_cast<TQKeyEvent*>(e) + #define me TQT_TQMOUSEEVENT(e) + #define ke TQT_TQKEYEVENT(e) - if( o == header() && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::RightButton ) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header()) && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::RightButton ) { enum { HIDE = 1000, SELECT, CUSTOM, SMARTRESIZING }; @@ -2737,7 +2737,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) KPopupMenu popup; if( mouseOverColumn >= 0 ) - popup.insertItem( i18n("&Hide %1").arg( columnText( mouseOverColumn ) ), HIDE ); //TODO + popup.insertItem( i18n("&Hide %1").tqarg( columnText( mouseOverColumn ) ), HIDE ); //TODO KPopupMenu sub; for( int i = 0; i < columns(); ++i ) //columns() references a property @@ -2754,7 +2754,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) popup.insertItem( i18n("&Fit to Width"), SMARTRESIZING ); popup.setItemChecked( SMARTRESIZING, m_smartResizing ); - int col = popup.exec( static_cast<TQMouseEvent *>(e)->globalPos() ); + int col = popup.exec( TQT_TQMOUSEEVENT(e)->globalPos() ); switch( col ) { case HIDE: @@ -2795,7 +2795,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } // not in slotMouseButtonPressed because we need to disable normal usage. - if( o == viewport() && e->type() == TQEvent::MouseButtonPress && me->state() == Qt::ControlButton && me->button() == RightButton ) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) && e->type() == TQEvent::MouseButtonPress && me->state() == TQt::ControlButton && me->button() == Qt::RightButton ) { PlaylistItem *item = static_cast<PlaylistItem*>( itemAt( me->pos() ) ); @@ -2810,7 +2810,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } // trigger in-place tag editing - else if( o == viewport() && e->type() == TQEvent::MouseButtonPress && me->button() == LeftButton ) + else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::LeftButton ) { m_clicktimer->stop(); m_itemToRename = 0; @@ -2821,7 +2821,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) bool edit = item && item->isSelected() && selectedItems().count()==1 - && (me->state() & ~LeftButton) == 0 + && (me->state() & ~Qt::LeftButton) == 0 && item->url().isLocalFile(); if( edit ) { @@ -2833,7 +2833,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } } - else if( o == viewport() && e->type() == TQEvent::MouseButtonRelease && me->button() == LeftButton ) + else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) && e->type() == TQEvent::MouseButtonRelease && me->button() == Qt::LeftButton ) { int col = header()->sectionAt( viewportToContents( me->pos() ).x() ); if( col != PlaylistItem::Rating ) @@ -2859,7 +2859,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } // Toggle play/pause if user middle-clicks on current track - else if( o == viewport() && e->type() == TQEvent::MouseButtonPress && me->button() == MidButton ) + else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) && e->type() == TQEvent::MouseButtonPress && me->button() == Qt::MidButton ) { PlaylistItem *item = static_cast<PlaylistItem*>( itemAt( me->pos() ) ); @@ -2870,7 +2870,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } } - else if( o == renameLineEdit() && e->type() == 6 /*TQEvent::KeyPress*/ && m_renameItem ) + else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(renameLineEdit()) && e->type() == 6 /*TQEvent::KeyPress*/ && m_renameItem ) { const int visibleCols = numVisibleColumns(); int physicalColumn = visibleCols - 1; @@ -2886,19 +2886,19 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) int column = m_renameColumn; TQListViewItem *item = m_renameItem; - if( ke->state() & Qt::AltButton ) + if( ke->state() & TQt::AltButton ) { - if( ke->key() == Qt::Key_Up && m_visCount > 1 ) + if( ke->key() == TQt::Key_Up && m_visCount > 1 ) if( !( item = m_renameItem->itemAbove() ) ) { item = *MyIt( this, MyIt::Visible ); while( item->itemBelow() ) item = item->itemBelow(); } - if( ke->key() == Qt::Key_Down && m_visCount > 1 ) + if( ke->key() == TQt::Key_Down && m_visCount > 1 ) if( !( item = m_renameItem->itemBelow() ) ) item = *MyIt( this, MyIt::Visible ); - if( ke->key() == Qt::Key_Left ) + if( ke->key() == TQt::Key_Left ) do { if( physicalColumn == 0 ) @@ -2907,7 +2907,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) physicalColumn--; column = mapToLogicalColumn( physicalColumn ); } while( !isRenameable( column ) ); - if( ke->key() == Qt::Key_Right ) + if( ke->key() == TQt::Key_Right ) do { if( physicalColumn == visibleCols - 1 ) @@ -2918,7 +2918,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } while( !isRenameable( column ) ); } - if( ke->key() == Qt::Key_Tab ) + if( ke->key() == TQt::Key_Tab ) do { if( physicalColumn == visibleCols - 1 ) @@ -2931,7 +2931,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) physicalColumn++; column = mapToLogicalColumn( physicalColumn ); } while( !isRenameable( column ) ); - if( ke->key() == Qt::Key_Backtab ) + if( ke->key() == TQt::Key_Backtab ) do { if( physicalColumn == 0 ) @@ -2961,7 +2961,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) } } - else if( o == renameLineEdit() && ( e->type() == TQEvent::Hide || e->type() == TQEvent::Close ) ) + else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(renameLineEdit()) && ( e->type() == TQEvent::Hide || e->type() == TQEvent::Close ) ) { m_renameItem = 0; } @@ -2998,11 +2998,11 @@ Playlist::customEvent( TQCustomEvent *e ) if ( !m_queueList.isEmpty() ) { KURL::List::Iterator jt; for( MyIt it( this, MyIt::All ); *it; ++it ) { - jt = m_queueList.find( (*it)->url() ); + jt = m_queueList.tqfind( (*it)->url() ); if ( jt != m_queueList.end() ) { queue( *it ); - ( m_nextTracks.containsRef( *it ) ? in : out ).append( *it ); + ( m_nextTracks.tqcontainsRef( *it ) ? in : out ).append( *it ); m_queueList.remove( jt ); } } @@ -3108,7 +3108,7 @@ Playlist::saveXML( const TQString &path ) TQFile file( path ); if( !file.open( IO_WriteOnly | IO_Truncate | IO_Raw ) ) return; - // Manual buffering since QFile's is slow for whatever reason + // Manual buffering since TQFile's is slow for whatever reason const uint kWriteSize = 256 * 1024; TQBuffer buffer; @@ -3121,13 +3121,13 @@ Playlist::saveXML( const TQString &path ) TQString dynamic; if( dynamicMode() ) { - const TQString title = ( dynamicMode()->title() ).replace( "&", "&" ) - .replace( "<", "<" ) - .replace( ">", ">" ); - dynamic = TQString(" dynamicMode=\"%1\"").arg( title ); + const TQString title = ( dynamicMode()->title() ).tqreplace( "&", "&" ) + .tqreplace( "<", "<" ) + .tqreplace( ">", ">" ); + dynamic = TQString(" dynamicMode=\"%1\"").tqarg( title ); } stream << TQString( "<playlist product=\"%1\" version=\"%2\"%3>\n" ) - .arg( "Amarok" ).arg( Amarok::xmlVersion() ).arg( dynamic ); + .tqarg( "Amarok" ).tqarg( Amarok::xmlVersion() ).tqarg( dynamic ); for( MyIt it( this, MyIt::All ); *it; ++it ) { @@ -3135,7 +3135,7 @@ Playlist::saveXML( const TQString &path ) if( item->isEmpty() ) continue; // Skip marker items and such TQStringList attributes; - const int queueIndex = m_nextTracks.findRef( item ); + const int queueIndex = m_nextTracks.tqfindRef( item ); if ( queueIndex != -1 ) attributes << "queue_index" << TQString::number( queueIndex + 1 ); else if ( item == currentTrack() ) @@ -3202,7 +3202,7 @@ Playlist::addCustomMenuItem( const TQString &submenu, const TQString &itemTitle bool Playlist::removeCustomMenuItem( const TQString &submenu, const TQString &itemTitle ) //for dcop { - if( !m_customSubmenuItem.contains(submenu) ) + if( !m_customSubmenuItem.tqcontains(submenu) ) return false; if( m_customSubmenuItem[submenu].remove( itemTitle ) != 0 ) { @@ -3323,7 +3323,7 @@ Playlist::repopulate() //SLOT for( ; *it; ++it ) { PlaylistItem *item = static_cast<PlaylistItem *>(*it); - int queueIndex = m_nextTracks.findRef( item ); + int queueIndex = m_nextTracks.tqfindRef( item ); bool isQueued = queueIndex != -1; bool isMarker = item->isEmpty(); // markers are used by playlistloader, and removing them is not good @@ -3394,7 +3394,7 @@ Playlist::removeSelectedItems() //SLOT { if( !(*it)->isDynamicEnabled() ) dontReplaceDynamic++; - ( m_nextTracks.contains( *it ) ? queued : list ).prepend( *it ); + ( m_nextTracks.tqcontains( *it ) ? queued : list ).prepend( *it ); } if( (int)list.count() == childCount() ) @@ -3526,10 +3526,10 @@ Playlist::copyToClipboard( const TQListViewItem *item ) const //SLOT text.append( " :: " + playlistItem->url().url() ); // Copy both to clipboard and X11-selection - TQApplication::clipboard()->setText( text, QClipboard::Clipboard ); - TQApplication::clipboard()->setText( text, QClipboard::Selection ); + TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard ); + TQApplication::tqclipboard()->setText( text, TQClipboard::Selection ); - Amarok::OSD::instance()->OSDWidget::show( i18n( "Copied: %1" ).arg( text ), + Amarok::OSD::instance()->OSDWidget::show( i18n( "Copied: %1" ).tqarg( text ), TQImage(CollectionDB::instance()->albumImage(*playlistItem )) ); } } @@ -3594,17 +3594,17 @@ Playlist::changeFromQueueManager(TQPtrList<PlaylistItem> list) m_nextTracks = list; PLItemList in, out; - // make sure we repaint items no longer queued + // make sure we tqrepaint items no longer queued for( PlaylistItem* item = oldQueue.first(); item; item = oldQueue.next() ) - if( !m_nextTracks.containsRef( item ) ) + if( !m_nextTracks.tqcontainsRef( item ) ) out << item; for( PlaylistItem* item = m_nextTracks.first(); item; item = m_nextTracks.next() ) - if( !oldQueue.containsRef( item ) ) + if( !oldQueue.tqcontainsRef( item ) ) in << item; emit queueChanged( in, out ); - // repaint newly queued or altered queue items + // tqrepaint newly queued or altered queue items if( dynamicMode() ) sortQueuedItems(); else @@ -3636,7 +3636,7 @@ void Playlist::setFilter( const TQString &query ) //SLOT { const bool advanced = ExpressionParser::isAdvancedExpression( query ); - MyIt it( this, ( !advanced && query.lower().contains( m_prevfilter.lower() ) ) + MyIt it( this, ( !advanced && query.lower().tqcontains( m_prevfilter.lower() ) ) ? MyIt::Visible : MyIt::All ); @@ -3715,7 +3715,7 @@ Playlist::fileMoved( const TQString &srcPath, const TQString &dstPath ) void Playlist::appendToPreviousTracks( PlaylistItem *item ) { - if( !m_prevTracks.containsRef( item ) ) + if( !m_prevTracks.tqcontainsRef( item ) ) { m_total -= item->totalIncrementAmount(); m_prevTracks.append( item ); @@ -3725,7 +3725,7 @@ Playlist::appendToPreviousTracks( PlaylistItem *item ) void Playlist::appendToPreviousAlbums( PlaylistAlbum *album ) { - if( !m_prevAlbums.containsRef( album ) ) + if( !m_prevAlbums.tqcontainsRef( album ) ) { m_total -= album->total; m_prevAlbums.append( album ); @@ -3777,7 +3777,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S Amarok::actionCollection()->action("playlist_shuffle")->plug( &popup ); m = PlaylistBrowser::instance()->findDynamicModeByTitle( AmarokConfig::lastDynamicMode() ); if( m ) - popup.insertItem( SmallIconSet( Amarok::icon( "dynamic" ) ), i18n("L&oad %1").arg( m->title().replace( '&', "&&" ) ), ENABLEDYNAMIC); + popup.insertItem( SmallIconSet( Amarok::icon( "dynamic" ) ), i18n("L&oad %1").tqarg( m->title().tqreplace( '&', "&&" ) ), ENABLEDYNAMIC); } switch(popup.exec(p)) { @@ -3835,10 +3835,10 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S bool queueToggle = false; MyIt it( this, MyIt::Selected ); - bool firstQueued = ( m_nextTracks.findRef( *it ) != -1 ); + bool firstQueued = ( m_nextTracks.tqfindRef( *it ) != -1 ); for( ++it ; *it; ++it ) { - if ( ( m_nextTracks.findRef( *it ) != -1 ) != firstQueued ) { + if ( ( m_nextTracks.tqfindRef( *it ) != -1 ) != firstQueued ) { queueToggle = true; break; } @@ -3851,7 +3851,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S popup.changeItem( PLAY_NEXT, SmallIconSet( Amarok::icon( "dequeue_track" ) ), i18n("&Dequeue Track") ); } else { if ( queueToggle ) - popup.changeItem( PLAY_NEXT, i18n( "Toggle &Queue Status (1 track)", "Toggle &Queue Status (%n tracks)", itemCount ) ); + popup.changeItem( PLAY_NEXT, i18n( "Toggle &Queue tqStatus (1 track)", "Toggle &Queue tqStatus (%n tracks)", itemCount ) ); else // remember, queueToggled only gets set to false if there are items queued and not queued. // so, if queueToggled is false, all items have the same queue status as the first item. @@ -3915,11 +3915,11 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S popup.insertItem( trackColumn ? i18n("Iteratively Assign Track &Numbers") : i18n("&Write '%1' for Selected Tracks") - .arg( KStringHandler::rsqueeze( tag, 30 ).replace( "&", "&&" ) ), FILL_DOWN ); + .tqarg( KStringHandler::rsqueeze( tag, 30 ).tqreplace( "&", "&&" ) ), FILL_DOWN ); popup.insertItem( SmallIconSet( Amarok::icon( "edit" ) ), (itemCount == 1 ? i18n( "&Edit Tag '%1'" ) - : i18n( "&Edit '%1' Tag for Selected Tracks" )).arg( tagName ), EDIT ); + : i18n( "&Edit '%1' Tag for Selected Tracks" )).tqarg( tagName ), EDIT ); popup.insertItem( SmallIconSet( Amarok::icon( "info" ) ) , item->url().isLocalFile() ? @@ -4067,7 +4067,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S { //use "in" for the other just because it's there and not used otherwise for( MyIt it( this, MyIt::Unselected | MyIt::Visible ); *it; ++it ) - ( m_nextTracks.containsRef( *it ) ? in : out ).append( *it ); + ( m_nextTracks.tqcontainsRef( *it ) ? in : out ).append( *it ); if( !in.isEmpty() || !out.isEmpty() ) { @@ -4193,7 +4193,7 @@ void Playlist::contentsMousePressEvent( TQMouseEvent *e ) /// Conditions on setting the rating of an item if( item && - !( e->state() & Qt::ControlButton || e->state() & Qt::ShiftButton ) && // skip if ctrl or shift held + !( e->state() & TQt::ControlButton || e->state() & TQt::ShiftButton ) && // skip if ctrl or shift held ( e->button() & Qt::LeftButton ) && // only on a left click ( e->pos().x() > beginRatingSection && e->pos().x() < endRatingSection ) ) // mouse over rating column { @@ -4226,12 +4226,12 @@ void Playlist::contentsWheelEvent( TQWheelEvent *e ) if( kClamp( dest, 0, int( m_nextTracks.count() ) - 1 ) != dest ) break; PlaylistItem* const p = m_nextTracks.at( dest ); - if( changed.findRef( p ) == -1 ) + if( changed.tqfindRef( p ) == -1 ) changed << p; - if( changed.findRef( m_nextTracks.at( dest - s ) ) == -1 ) + if( changed.tqfindRef( m_nextTracks.at( dest - s ) ) == -1 ) changed << m_nextTracks.at( dest - s ); - m_nextTracks.replace( dest, m_nextTracks.at( dest - s ) ); - m_nextTracks.replace( dest - s, p ); + m_nextTracks.tqreplace( dest, m_nextTracks.at( dest - s ) ); + m_nextTracks.tqreplace( dest - s, p ); } for( int i = 0, n = changed.count(); i < n; ++i ) @@ -4291,10 +4291,10 @@ TQValueList<int> Playlist::visibleColumns() const } MetaBundle::ColumnMask Playlist::getVisibleColumnMask() const { - MetaBundle::ColumnMask mask = 0; + MetaBundle::ColumnMask tqmask = 0; for( int i = 0, n = columns(); i < n; ++i) - if( columnWidth( i ) ) mask = mask | (1 << i); - return mask; + if( columnWidth( i ) ) tqmask = tqmask | (1 << i); + return tqmask; } @@ -4330,7 +4330,7 @@ Playlist::setColumns( TQValueList<int> order, TQValueList<int> visible ) header()->moveSection( order[i], i ); for( int i = 0; i < PlaylistItem::NUM_COLUMNS; ++i ) { - if( visible.contains( i ) ) + if( visible.tqcontains( i ) ) adjustColumn( i ); else hideColumn( i ); @@ -4402,7 +4402,7 @@ void Playlist::ensureItemCentered( TQListViewItem *item ) if( !item ) return; - //HACK -- apparently the various metrics aren't reliable while the UI is still updating & stuff + //HACK -- aptqparently the various metrics aren't reliable while the UI is still updating & stuff m_itemToReallyCenter = item; TQTimer::singleShot( 0, this, TQT_SLOT( reallyEnsureItemCentered() ) ); } @@ -4430,7 +4430,7 @@ Playlist::refreshNextTracks( int from ) { // This function scans the m_nextTracks list starting from the 'from' // position and from there on updates the progressive numbering on related - // items and repaints them. In short it performs an update subsequent to + // items and tqrepaints them. In short it performs an update subsequent to // a renumbering/order changing at some point of the m_nextTracks list. //start on the 'from'-th item of the list @@ -4579,7 +4579,7 @@ Playlist::slotMouseButtonPressed( int button, TQListViewItem *after, const TQPoi { case Qt::MidButton: { - const TQString path = TQApplication::clipboard()->text( QClipboard::Selection ); + const TQString path = TQApplication::tqclipboard()->text( TQClipboard::Selection ); const KURL url = KURL::fromPathOrURL( path ); if( url.isValid() ) @@ -4646,12 +4646,12 @@ Playlist::slotMoodbarPrefs( bool show, bool moodier, int alter, bool withMusic ) { // No need to call moodbar().load(), since that will happen // automatically next time it's displayed. We do have to - // repaint so that they get displayed though. + // tqrepaint so that they get displayed though. for( PlaylistIterator it( this, PlaylistIterator::All ) ; *it ; ++it ) { (*it)->moodbar().reset(); - repaintItem(*it); + tqrepaintItem(*it); } } } @@ -4700,7 +4700,7 @@ Playlist::slotEraseMarker() //SLOT { const TQRect spot = drawDropVisualizer( 0, 0, m_marker ); m_marker = 0; - viewport()->repaint( spot, false ); + viewport()->tqrepaint( spot, false ); } } @@ -4734,7 +4734,7 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items ) TagDialog *dialog = new TagDialog( *item, item, instance() ); dialog->show(); } - else if ( checkFileStatus( item ) ) + else if ( checkFiletqStatus( item ) ) { TagDialog *dialog = new TagDialog( *item, item, instance() ); dialog->show(); @@ -4770,8 +4770,8 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items ) class CustomColumnDialog : public KDialog { public: - CustomColumnDialog( TQWidget *parent ) - : KDialog( parent ) + CustomColumnDialog( TQWidget *tqparent ) + : KDialog( tqparent ) { TQLabel *textLabel1, *textLabel2, *textLabel3; TQLineEdit *lineEdit1, *lineEdit2; @@ -4790,30 +4790,30 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items ) lineEdit2 = new TQLineEdit( this, "Command" ); groupBox1 = new TQGroupBox( 1, Qt::Vertical, i18n( "Examples" ), this ); - groupBox1->layout()->setMargin( 11 ); + groupBox1->tqlayout()->setMargin( 11 ); new KActiveLabel( i18n( "file --brief %f\n" "ls -sh %f\n" "basename %f\n" "dirname %f" ), groupBox1 ); // buddies textLabel2->setBuddy( lineEdit1 ); textLabel3->setBuddy( lineEdit2 ); - // layouts - TQHBoxLayout *layout1 = new TQHBoxLayout( 0, 0, 6 ); - layout1->addItem( new TQSpacerItem( 181, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); - layout1->addWidget( new KPushButton( KStdGuiItem::ok(), this, "OkButton" ) ); - layout1->addWidget( new KPushButton( KStdGuiItem::cancel(), this, "CancelButton" ) ); + // tqlayouts + 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" ) ); + tqlayout1->addWidget( new KPushButton( KStdGuiItem::cancel(), this, "CancelButton" ) ); - TQGridLayout *layout2 = new TQGridLayout( 0, 2, 2, 0, 6 ); - layout2->TQLayout::add( textLabel2 ); - layout2->TQLayout::add( lineEdit1 ); - layout2->TQLayout::add( textLabel3 ); - layout2->TQLayout::add( lineEdit2 ); + TQGridLayout *tqlayout2 = new TQGridLayout( 0, 2, 2, 0, 6 ); + tqlayout2->TQLayout::add( textLabel2 ); + tqlayout2->TQLayout::add( lineEdit1 ); + tqlayout2->TQLayout::add( textLabel3 ); + tqlayout2->TQLayout::add( lineEdit2 ); TQVBoxLayout *Form1Layout = new TQVBoxLayout( this, 11, 6, "Form1Layout"); Form1Layout->addWidget( textLabel1 ); Form1Layout->addWidget( groupBox1 ); - Form1Layout->addLayout( layout2 ); - Form1Layout->addLayout( layout1 ); + Form1Layout->addLayout( tqlayout2 ); + Form1Layout->addLayout( tqlayout1 ); Form1Layout->addItem( new TQSpacerItem( 20, 231, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); // properties @@ -4830,8 +4830,8 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items ) TQT_SLOT(reject()) ); } - TQString command() { return static_cast<KLineEdit*>(child("Command"))->text(); } - TQString name() { return static_cast<KLineEdit*>(child("ColumnName"))->text(); } + TQString command() { return static_cast<KLineEdit*>(TQT_TQWIDGET(child("Command")))->text(); } + TQString name() { return static_cast<KLineEdit*>(TQT_TQWIDGET(child("ColumnName")))->text(); } }; void @@ -4843,7 +4843,7 @@ Playlist::addCustomColumn() const int index = addColumn( dialog.name(), 100 ); TQStringList args = TQStringList::split( ' ', dialog.command() ); - TQStringList::Iterator pcf = args.find( "%f" ); + TQStringList::Iterator pcf = args.tqfind( "%f" ); if ( pcf == args.end() ) { //there is no %f, so add one on the end //TODO prolly this is confusing, instead ask the user if we should add one @@ -4960,7 +4960,7 @@ TagWriter::completeJob() // we write a space for some reason I cannot recall m_item->setExactText( m_tagType, m_oldTagString.isEmpty() ? " " : m_oldTagString ); Amarok::StatusBar::instance()->longMessage( i18n( - "Sorry, the tag for %1 could not be changed." ).arg( m_item->url().fileName() ), KDE::StatusBar::Sorry ); + "Sorry, the tag for %1 could not be changed." ).tqarg( m_item->url().fileName() ), KDE::StatusBar::Sorry ); break; case false: diff --git a/amarok/src/playlist.h b/amarok/src/playlist.h index 0162a8ca..f742dfe2 100644 --- a/amarok/src/playlist.h +++ b/amarok/src/playlist.h @@ -79,6 +79,7 @@ class Medium; class Playlist : private KListView, public EngineObserver, public Amarok::ToolTipClient { Q_OBJECT + TQ_OBJECT public: ~Playlist(); @@ -174,7 +175,7 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi void restoreLayout(KConfig *config, const TQString &group); //AFT-related functions - bool checkFileStatus( PlaylistItem * item ); + bool checkFiletqStatus( PlaylistItem * item ); void addToUniqueMap( const TQString uniqueid, PlaylistItem* item ); void removeFromUniqueMap( const TQString uniqueid, PlaylistItem* item ); @@ -196,7 +197,7 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi friend bool PlaylistWindow::eventFilter( TQObject*, TQEvent* ); //for convenience we handle some playlist events here public: - QPair<TQString, TQRect> toolTipText( TQWidget*, const TQPoint &pos ) const; + TQPair<TQString, TQRect> toolTipText( TQWidget*, const TQPoint &pos ) const; signals: void aboutToClear(); @@ -350,7 +351,7 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi typedef TQMap<AtomicString, PlaylistAlbum*> AlbumMap; typedef TQMap<AtomicString, AlbumMap> ArtistAlbumMap; ArtistAlbumMap m_albums; - uint m_startupTime_t; //TQDateTime::currentDateTime().toTime_t as of startup + uint m_startupTime_t; //TQDateTime::tqcurrentDateTime().toTime_t as of startup uint m_oldestTime_t; //the createdate of the oldest song in the collection @@ -380,7 +381,7 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi int m_selLength; int m_visCount; int m_visLength; - Q_INT64 m_total; //for Favor Tracks + TQ_INT64 m_total; //for Favor Tracks bool m_itemCountDirty; KAction *m_undoButton; @@ -451,21 +452,21 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi : fieldString( ( item.*m_refGetter ) () ); } - bool contains( const FieldType &key ) { return contains( fieldString( key ) ); } + bool tqcontains( const FieldType &key ) { return tqcontains( fieldString( key ) ); } // Just first match, or NULL PlaylistItem *getFirst( const FieldType &field ) { - Iterator it = find( fieldString( field ) ); + Iterator it = tqfind( fieldString( field ) ); return it == end() || it.data().isEmpty() ? 0 : it.data().getFirst(); } void add( PlaylistItem *item ) { TQPtrList<PlaylistItem> &row = operator[]( keyOf( *item ) ); // adds one if needed - if ( !row.containsRef(item) ) row.append( item ); + if ( !row.tqcontainsRef(item) ) row.append( item ); } void remove( PlaylistItem *item ) { - Iterator it = find( keyOf( *item ) ); + Iterator it = tqfind( keyOf( *item ) ); if (it != end()) { while ( it.data().removeRef( item ) ) { }; if ( it.data().isEmpty() ) erase( it ); @@ -491,7 +492,7 @@ class PlaylistAlbum public: PLItemList tracks; int refcount; - Q_INT64 total; //for Favor Tracks + TQ_INT64 total; //for Favor Tracks PlaylistAlbum(): refcount( 0 ), total( 0 ) { } }; @@ -502,12 +503,12 @@ public: * sorry. */ -class PlaylistIterator : public QListViewItemIterator +class PlaylistIterator : public TQListViewItemIterator { public: PlaylistIterator( TQListViewItem *item, int flags = 0 ) //TQListViewItemIterator is not great and doesn't allow you to see everything if you - //mask both Visible and Invisible :( instead just visible items are returned + //tqmask both Visible and Invisible :( instead just visible items are returned : TQListViewItemIterator( item, flags == All ? 0 : flags | Visible ) {} diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp index a018eba9..0e55ec7a 100644 --- a/amarok/src/playlistbrowser.cpp +++ b/amarok/src/playlistbrowser.cpp @@ -79,7 +79,7 @@ namespace Amarok { foreach( path ) { item = prox; TQString text( *it ); - text.replace( escaped, sep ); + text.tqreplace( escaped, sep ); for ( ; item; item = item->nextSibling() ) { if ( text == item->text(0) ) { @@ -94,14 +94,14 @@ namespace Amarok { return item; } - QStringList + TQStringList splitPath( TQString path ) { TQStringList list; const static TQChar sep( '/' ); int bOffset = 0, sOffset = 0; - int pos = path.find( sep, bOffset ); + int pos = path.tqfind( sep, bOffset ); while ( pos != -1 ) { if ( pos > sOffset && pos <= (int)path.length() ) { @@ -111,7 +111,7 @@ namespace Amarok { } } bOffset = pos + 1; - pos = path.find( sep, bOffset ); + pos = path.tqfind( sep, bOffset ); } int length = path.length() - 1; @@ -123,7 +123,7 @@ namespace Amarok { } -inline QString +inline TQString fileExtension( const TQString &fileName ) { return Amarok::extension( fileName ); @@ -175,8 +175,8 @@ PlaylistBrowser::PlaylistBrowser( const char *name ) addMenu->insertItem( i18n("Podcast..."), PODCAST ); connect( addMenu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotAddMenu(int) ) ); - renameButton = new KAction( i18n("Rename"), "editclear", 0, this, TQT_SLOT( renameSelectedItem() ), m_ac ); - removeButton = new KAction( i18n("Delete"), Amarok::icon( "remove" ), 0, this, TQT_SLOT( removeSelectedItems() ), m_ac ); + renameButton = new KAction( i18n("Rename"), "editclear", 0, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), m_ac ); + removeButton = new KAction( i18n("Delete"), Amarok::icon( "remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT( removeSelectedItems() ), m_ac ); m_toolbar = new Browser::ToolBar( browserBox ); m_toolbar->setIconText( KToolBar::IconTextRight, false ); //we want the open button to have text on right @@ -196,8 +196,8 @@ PlaylistBrowser::PlaylistBrowser( const char *name ) m_listview = new PlaylistBrowserView( m_splitter ); - int sort = Amarok::config( "PlaylistBrowser" )->readNumEntry( "Sorting", Qt::Ascending ); - m_listview->setSorting( 0, sort == Qt::Ascending ? true : false ); + int sort = Amarok::config( "PlaylistBrowser" )->readNumEntry( "Sorting", TQt::Ascending ); + m_listview->setSorting( 0, sort == TQt::Ascending ? true : false ); m_podcastTimerInterval = Amarok::config( "PlaylistBrowser" )->readNumEntry( "Podcast Interval", 14400000 ); connect( m_podcastTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scanPodcasts()) ); @@ -213,7 +213,7 @@ PlaylistBrowser::PlaylistBrowser( const char *name ) this, TQT_SLOT( currentItemChanged( TQListViewItem * ) ) ); connect( CollectionDB::instance(), TQT_SIGNAL( scanDone( bool ) ), TQT_SLOT( collectionScanDone() ) ); - setMinimumWidth( m_toolbar->sizeHint().width() ); + setMinimumWidth( m_toolbar->tqsizeHint().width() ); m_infoPane = new InfoPane( m_splitter ); @@ -350,7 +350,7 @@ PlaylistBrowser::setInfo( const TQString &title, const TQString &info ) void PlaylistBrowser::resizeEvent( TQResizeEvent * ) { - if( static_cast<TQWidget*>( m_infoPane->child( "container" ) )->isShown() ) + if( TQT_TQWIDGET( m_infoPane->child( "container" ) )->isShown() ) m_infoPane->setMaximumHeight( ( int )( m_splitter->height() / 1.5 ) ); } @@ -460,18 +460,18 @@ void PlaylistBrowser::loadCoolStreams() } } -void PlaylistBrowser::addStream( TQListViewItem *parent ) +void PlaylistBrowser::addStream( TQListViewItem *tqparent ) { - StreamEditor dialog( this, i18n( "Radio Stream" ), TQString::null ); + StreamEditor dialog( this, i18n( "Radio Stream" ), TQString() ); dialog.setCaption( i18n( "Add Radio Stream" ) ); - if( !parent ) parent = static_cast<TQListViewItem*>(m_streamsCategory); + if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_streamsCategory); if( dialog.exec() == TQDialog::Accepted ) { - new StreamEntry( parent, 0, dialog.url(), dialog.name() ); - parent->sortChildItems( 0, true ); - parent->setOpen( true ); + new StreamEntry( tqparent, 0, dialog.url(), dialog.name() ); + tqparent->sortChildItems( 0, true ); + tqparent->setOpen( true ); saveStreams(); } @@ -562,54 +562,54 @@ void PlaylistBrowser::loadLastfmStreams( const bool subscriber /*false*/ ) } TQString user = AmarokConfig::scrobblerUsername(); - KURL url( TQString("lastfm://user/%1/neighbours").arg( user ) ); + KURL url( TQString("lastfm://user/%1/neighbours").tqarg( user ) ); last = new LastFmEntry( m_lastfmCategory, tagsFolder, url, i18n( "Neighbor Radio" ) ); last->setKept( false ); - url = KURL::fromPathOrURL( TQString("lastfm://user/%1/recommended/100").arg( user ) ); + url = KURL::fromPathOrURL( TQString("lastfm://user/%1/recommended/100").tqarg( user ) ); last = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Recommended Radio" ) ); last->setKept( false ); if( subscriber ) { - url = KURL::fromPathOrURL( TQString("lastfm://user/%1/personal").arg( user ) ); + url = KURL::fromPathOrURL( TQString("lastfm://user/%1/personal").tqarg( user ) ); last = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Personal Radio" ) ); last->setKept( false ); - url = KURL::fromPathOrURL( TQString("lastfm://user/%1/loved").arg( user ) ); + url = KURL::fromPathOrURL( TQString("lastfm://user/%1/loved").tqarg( user ) ); last = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Loved Radio" ) ); last->setKept( false ); } } -void PlaylistBrowser::addLastFmRadio( TQListViewItem *parent ) +void PlaylistBrowser::addLastFmRadio( TQListViewItem *tqparent ) { - StreamEditor dialog( this, i18n( "Last.fm Radio" ), TQString::null ); + StreamEditor dialog( this, i18n( "Last.fm Radio" ), TQString() ); dialog.setCaption( i18n( "Add Last.fm Radio" ) ); - if( !parent ) parent = static_cast<TQListViewItem*>(m_lastfmCategory); + if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_lastfmCategory); if( dialog.exec() == TQDialog::Accepted ) { - new LastFmEntry( parent, 0, dialog.url(), dialog.name() ); - parent->sortChildItems( 0, true ); - parent->setOpen( true ); + new LastFmEntry( tqparent, 0, dialog.url(), dialog.name() ); + tqparent->sortChildItems( 0, true ); + tqparent->setOpen( true ); saveLastFm(); } } -void PlaylistBrowser::addLastFmCustomRadio( TQListViewItem *parent ) +void PlaylistBrowser::addLastFmCustomRadio( TQListViewItem *tqparent ) { TQString token = LastFm::Controller::createCustomStation(); if( token.isEmpty() ) return; - token.replace( "/", "%252" ); + token.tqreplace( "/", "%252" ); const TQString text = "lastfm://artistnames/" + token; const KURL url( text ); TQString name = LastFm::Controller::stationDescription( text ); - name.replace( "%252", "/" ); - new LastFmEntry( parent, 0, url, name ); + name.tqreplace( "%252", "/" ); + new LastFmEntry( tqparent, 0, url, name ); saveLastFm(); } @@ -651,24 +651,24 @@ TQString PlaylistBrowser::smartplaylistBrowserCache() const return Amarok::saveLocation() + "smartplaylistbrowser_save.xml"; } -void PlaylistBrowser::addSmartPlaylist( TQListViewItem *parent ) //SLOT +void PlaylistBrowser::addSmartPlaylist( TQListViewItem *tqparent ) //SLOT { if( CollectionDB::instance()->isEmpty() || !m_smartCategory ) return; - if( !parent ) parent = static_cast<TQListViewItem*>(m_smartCategory); + if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_smartCategory); SmartPlaylistEditor dialog( i18n("Untitled"), this ); if( dialog.exec() == TQDialog::Accepted ) { - PlaylistCategory *category = dynamic_cast<PlaylistCategory*>(parent); + PlaylistCategory *category = dynamic_cast<PlaylistCategory*>(tqparent); for( TQListViewItem *item = category->firstChild(); item; item = item->nextSibling() ) { SmartPlaylist *sp = dynamic_cast<SmartPlaylist*>(item); if ( sp && sp->title() == dialog.name() ) { if( KMessageBox::warningContinueCancel( PlaylistWindow::self(), - i18n( "A Smart Playlist named \"%1\" already exists. Do you want to overwrite it?" ).arg( dialog.name() ), + i18n( "A Smart Playlist named \"%1\" already exists. Do you want to overwrite it?" ).tqarg( dialog.name() ), i18n( "Overwrite Playlist?" ), i18n( "Overwrite" ) ) == KMessageBox::Continue ) { delete item; @@ -678,9 +678,9 @@ void PlaylistBrowser::addSmartPlaylist( TQListViewItem *parent ) //SLOT return; } } - new SmartPlaylist( parent, 0, dialog.result() ); - parent->sortChildItems( 0, true ); - parent->setOpen( true ); + new SmartPlaylist( tqparent, 0, dialog.result() ); + tqparent->sortChildItems( 0, true ); + tqparent->setOpen( true ); saveSmartPlaylists(); } @@ -770,10 +770,10 @@ void PlaylistBrowser::updateSmartPlaylistElement( TQDomElement& query ) TQDomText text = child.toText(); TQString sql = text.data(); if ( selectFromSearch.search( sql ) != -1 ) - sql.replace( selectFromSearch, "SELECT (*ListOfFields*) FROM" ); + sql.tqreplace( selectFromSearch, "SELECT (*ListOfFields*) FROM" ); if ( limitSearch.search( sql ) != -1 ) - sql.replace( limitSearch, - TQString( "LIMIT %1 OFFSET %2").arg( limitSearch.capturedTexts()[2].toInt() ).arg( limitSearch.capturedTexts()[1].toInt() ) ); + sql.tqreplace( limitSearch, + TQString( "LIMIT %1 OFFSET %2").tqarg( limitSearch.capturedTexts()[2].toInt() ).tqarg( limitSearch.capturedTexts()[1].toInt() ) ); text.setData( sql ); break; @@ -794,7 +794,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() m_smartDefaults->setOpen( m_smartDefaultsOpen ); m_smartDefaults->setKept( false ); /********** All Collection **************/ - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.sortBy( QueryBuilder::tabArtist, QueryBuilder::valName ); qb.sortBy( QueryBuilder::tabAlbum, QueryBuilder::valName ); qb.sortBy( QueryBuilder::tabSong, QueryBuilder::valTrack ); @@ -803,26 +803,26 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() item->setPixmap( 0, SmallIcon( Amarok::icon( "collection" ) ) ); item->setKept( false ); /********** Favorite Tracks **************/ - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.sortByFavorite(); qb.setLimit( 0, 15 ); item = new SmartPlaylist( m_smartDefaults, item, i18n( "Favorite Tracks" ), qb.query() ); item->setKept( false ); last = 0; - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.sortByFavorite(); qb.setLimit( 0, 15 ); foreach( artists ) { QueryBuilder qbTemp( qb ); qbTemp.addMatch( QueryBuilder::tabArtist, *it ); - last = new SmartPlaylist( item, last, i18n( "By %1" ).arg( *it ), qbTemp.query() ); + last = new SmartPlaylist( item, last, i18n( "By %1" ).tqarg( *it ), qbTemp.query() ); last->setKept( false ); } /********** Most Played **************/ - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.sortBy( QueryBuilder::tabStats, QueryBuilder::valPlayCounter, true ); qb.setLimit( 0, 15 ); @@ -830,19 +830,19 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() item->setKept( false ); last = 0; - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.sortBy( QueryBuilder::tabStats, QueryBuilder::valPlayCounter, true ); qb.setLimit( 0, 15 ); foreach( artists ) { QueryBuilder qbTemp( qb ); qbTemp.addMatch( QueryBuilder::tabArtist, *it ); - last = new SmartPlaylist( item, last, i18n( "By %1" ).arg( *it ), qbTemp.query() ); + last = new SmartPlaylist( item, last, i18n( "By %1" ).tqarg( *it ), qbTemp.query() ); last->setKept( false ); } /********** Newest Tracks **************/ - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.sortBy( QueryBuilder::tabSong, QueryBuilder::valCreateDate, true ); qb.setLimit( 0, 15 ); @@ -850,19 +850,19 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() item->setKept( false ); last = 0; - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.sortBy( QueryBuilder::tabSong, QueryBuilder::valCreateDate, true ); qb.setLimit( 0, 15 ); foreach( artists ) { QueryBuilder qbTemp( qb ); qbTemp.addMatch( QueryBuilder::tabArtist, *it ); - last = new SmartPlaylist( item, last, i18n( "By %1" ).arg( *it ), qbTemp.query( true ) ); + last = new SmartPlaylist( item, last, i18n( "By %1" ).tqarg( *it ), qbTemp.query( true ) ); last->setKept( false ); } /********** Last Played **************/ - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.sortBy( QueryBuilder::tabStats, QueryBuilder::valAccessDate, true ); qb.setLimit( 0, 15 ); @@ -870,7 +870,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() item->setKept( false ); /********** Never Played **************/ - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.addNumericFilter( QueryBuilder::tabStats, QueryBuilder::valPlayCounter, "0" ); qb.sortBy( QueryBuilder::tabArtist, QueryBuilder::valName ); qb.sortBy( QueryBuilder::tabAlbum, QueryBuilder::valName ); @@ -880,7 +880,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() item->setKept( false ); /********** Ever Played **************/ - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.excludeFilter( QueryBuilder::tabStats, QueryBuilder::valPlayCounter, "1", QueryBuilder::modeLess ); qb.sortBy( QueryBuilder::tabArtist, QueryBuilder::valName ); qb.sortBy( QueryBuilder::tabAlbum, QueryBuilder::valName ); @@ -895,7 +895,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() item->setKept( false ); last = 0; - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.sortBy( QueryBuilder::tabArtist, QueryBuilder::valName ); qb.sortBy( QueryBuilder::tabAlbum, QueryBuilder::valName ); qb.sortBy( QueryBuilder::tabSong, QueryBuilder::valTrack ); @@ -903,12 +903,12 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() QueryBuilder qbTemp( qb ); qbTemp.addMatch( QueryBuilder::tabGenre, *it ); - last = new SmartPlaylist( item, last, i18n( "%1" ).arg( *it ), qbTemp.query( true ) ); + last = new SmartPlaylist( item, last, i18n( "%1" ).tqarg( *it ), qbTemp.query( true ) ); last->setKept( false ); } /********** 50 Random Tracks **************/ - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.setOptions( QueryBuilder::optRandomize ); qb.setLimit( 0, 50 ); item = new SmartPlaylist( m_smartDefaults, item, i18n( "50 Random Tracks" ), qb.query( true ) ); @@ -1040,10 +1040,10 @@ PlaylistBrowser::fixDynamicPlaylistPath( TQListViewItem *item ) } } -QString +TQString PlaylistBrowser::guessPathFromPlaylistName( TQString name ) { - TQListViewItem *item = m_listview->findItem( name, 0, Qt::ExactMatch ); + TQListViewItem *item = m_listview->tqfindItem( name, 0, TQt::ExactMatch ); PlaylistBrowserEntry *entry = dynamic_cast<PlaylistBrowserEntry*>( item ); if ( entry ) return entry->name(); @@ -1171,15 +1171,15 @@ DEBUG_BLOCK foreachType( TQValueList<PodcastChannelBundle>, channels ) { - PlaylistCategory *parent = p; - const int parentId = (*it).parentId(); - if( parentId > 0 && folderMap.find( parentId ) != folderMap.end() ) - parent = folderMap[parentId]; + PlaylistCategory *tqparent = p; + const int tqparentId = (*it).tqparentId(); + if( tqparentId > 0 && folderMap.tqfind( tqparentId ) != folderMap.end() ) + tqparent = folderMap[tqparentId]; - channel = new PodcastChannel( parent, channel, *it ); + channel = new PodcastChannel( tqparent, channel, *it ); - bool hasNew = CollectionDB::instance()->query( TQString("SELECT COUNT(parent) FROM podcastepisodes WHERE ( parent='%1' AND isNew=%2 ) LIMIT 1" ) - .arg( (*it).url().url(), CollectionDB::instance()->boolT() ) ) + bool hasNew = CollectionDB::instance()->query( TQString("SELECT COUNT(tqparent) FROM podcastepisodes WHERE ( tqparent='%1' AND isNew=%2 ) LIMIT 1" ) + .tqarg( (*it).url().url(), CollectionDB::instance()->boolT() ) ) .first().toInt() > 0; channel->setNew( hasNew ); @@ -1196,24 +1196,24 @@ TQMap<int,PlaylistCategory*> PlaylistBrowser::loadPodcastFolders( PlaylistCategory *p ) { DEBUG_BLOCK - TQString sql = "SELECT * FROM podcastfolders ORDER BY parent ASC;"; + TQString sql = "SELECT * FROM podcastfolders ORDER BY tqparent ASC;"; TQStringList values = CollectionDB::instance()->query( sql ); - // store the folder and IDs so finding a parent is fast + // store the folder and IDs so finding a tqparent is fast TQMap<int,PlaylistCategory*> folderMap; PlaylistCategory *folder = 0; foreach( values ) { const int id = (*it).toInt(); const TQString t = *++it; - const int parentId = (*++it).toInt(); + const int tqparentId = (*++it).toInt(); const bool isOpen = ( (*++it) == CollectionDB::instance()->boolT() ? true : false ); - PlaylistCategory *parent = p; - if( parentId > 0 && folderMap.find( parentId ) != folderMap.end() ) - parent = folderMap[parentId]; + PlaylistCategory *tqparent = p; + if( tqparentId > 0 && folderMap.tqfind( tqparentId ) != folderMap.end() ) + tqparent = folderMap[tqparentId]; - folder = new PlaylistCategory( parent, folder, t, id ); + folder = new PlaylistCategory( tqparent, folder, t, id ); folder->setOpen( isOpen ); folderMap[id] = folder; @@ -1241,15 +1241,15 @@ void PlaylistBrowser::savePodcastFolderStates( PlaylistCategory *folder ) if( folder != m_podcastCategory ) { 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 children - int parentId = static_cast<PlaylistCategory*>(folder->parent())->id(); - int newId = CollectionDB::instance()->addPodcastFolder( folder->text(0), parentId, folder->isOpen() ); + { // 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() ); folder->setId( newId ); PodcastChannel *chan = static_cast<PodcastChannel*>(folder->firstChild()); while( chan ) { if( isPodcastChannel( chan ) ) - // will update the database so child has correct parentId. + // will update the database so child has correct tqparentId. chan->setParent( folder ); chan = static_cast<PodcastChannel*>(chan->nextSibling()); } @@ -1257,7 +1257,7 @@ void PlaylistBrowser::savePodcastFolderStates( PlaylistCategory *folder ) else { CollectionDB::instance()->updatePodcastFolder( folder->id(), folder->text(0), - static_cast<PlaylistCategory*>(folder->parent())->id(), folder->isOpen() ); + static_cast<PlaylistCategory*>(folder->tqparent())->id(), folder->isOpen() ); } } } @@ -1277,9 +1277,9 @@ void PlaylistBrowser::scanPodcasts() m_podcastTimer->start( m_podcastTimerInterval ); } -void PlaylistBrowser::refreshPodcasts( TQListViewItem *parent ) +void PlaylistBrowser::refreshPodcasts( TQListViewItem *tqparent ) { - for( TQListViewItem *child = parent->firstChild(); + for( TQListViewItem *child = tqparent->firstChild(); child; child = child->nextSibling() ) { @@ -1290,21 +1290,21 @@ void PlaylistBrowser::refreshPodcasts( TQListViewItem *parent ) } } -void PlaylistBrowser::addPodcast( TQListViewItem *parent ) +void PlaylistBrowser::addPodcast( TQListViewItem *tqparent ) { bool ok; - const TQString name = KInputDialog::getText(i18n("Add Podcast"), i18n("Enter Podcast URL:"), TQString::null, &ok, this); + const TQString name = KInputDialog::getText(i18n("Add Podcast"), i18n("Enter Podcast URL:"), TQString(), &ok, this); if( ok && !name.isEmpty() ) { - addPodcast( KURL::fromPathOrURL( name ), parent ); + addPodcast( KURL::fromPathOrURL( name ), tqparent ); } } -void PlaylistBrowser::configurePodcasts( TQListViewItem *parent ) +void PlaylistBrowser::configurePodcasts( TQListViewItem *tqparent ) { TQPtrList<PodcastChannel> podcastChannelList; - for( TQListViewItem *child = parent->firstChild(); + for( TQListViewItem *child = tqparent->firstChild(); child; child = child->nextSibling() ) { @@ -1314,7 +1314,7 @@ void PlaylistBrowser::configurePodcasts( TQListViewItem *parent ) } } if( !podcastChannelList.isEmpty() ) - configurePodcasts( podcastChannelList, i18n( "Podcasts contained in %1", "All in %1").arg( parent->text( 0 ) ) ); + configurePodcasts( podcastChannelList, i18n( "Podcasts contained in %1", "All in %1").tqarg( tqparent->text( 0 ) ) ); } void PlaylistBrowser::configureSelectedPodcasts() @@ -1375,11 +1375,11 @@ void PlaylistBrowser::configurePodcasts( TQPtrList<PodcastChannel> &podcastChann } PodcastChannel * -PlaylistBrowser::findPodcastChannel( const KURL &feed, TQListViewItem *parent ) const +PlaylistBrowser::findPodcastChannel( const KURL &feed, TQListViewItem *tqparent ) const { - if( !parent ) parent = static_cast<TQListViewItem*>(m_podcastCategory); + if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_podcastCategory); - for( TQListViewItem *it = parent->firstChild(); + for( TQListViewItem *it = tqparent->firstChild(); it; it = it->nextSibling() ) { @@ -1425,9 +1425,9 @@ PlaylistBrowser::findPodcastEpisode( const KURL &episode, const KURL &feed ) con return 0; } -void PlaylistBrowser::addPodcast( const KURL& origUrl, TQListViewItem *parent ) +void PlaylistBrowser::addPodcast( const KURL& origUrl, TQListViewItem *tqparent ) { - if( !parent ) parent = static_cast<TQListViewItem*>(m_podcastCategory); + if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_podcastCategory); KURL url( origUrl ); if( url.protocol() == "itpc" || url.protocol() == "pcast" ) @@ -1438,12 +1438,12 @@ void PlaylistBrowser::addPodcast( const KURL& origUrl, TQListViewItem *parent ) { Amarok::StatusBar::instance()->longMessage( i18n( "Already subscribed to feed %1 as %2" ) - .arg( url.prettyURL(), channel->title() ), + .tqarg( url.prettyURL(), channel->title() ), KDE::StatusBar::Sorry ); return; } - PodcastChannel *pc = new PodcastChannel( parent, 0, url ); + PodcastChannel *pc = new PodcastChannel( tqparent, 0, url ); if( m_podcastItemsToScan.isEmpty() ) { @@ -1455,8 +1455,8 @@ void PlaylistBrowser::addPodcast( const KURL& origUrl, TQListViewItem *parent ) m_podcastItemsToScan.append( pc ); } - parent->sortChildItems( 0, true ); - parent->setOpen( true ); + tqparent->sortChildItems( 0, true ); + tqparent->setOpen( true ); } void PlaylistBrowser::changePodcastInterval() @@ -1503,7 +1503,7 @@ bool PlaylistBrowser::deleteSelectedPodcastItems( const bool removeItem, const b button = KMessageBox::warningContinueCancel( this, i18n( "<p>You have selected 1 podcast episode to be <b>irreversibly</b> deleted. ", "<p>You have selected %n podcast episodes to be <b>irreversibly</b> deleted. ", - urls.count() ), TQString::null, KStdGuiItem::del() ); + urls.count() ), TQString(), KStdGuiItem::del() ); if( silent || button != KMessageBox::Continue ) return false; @@ -1540,7 +1540,7 @@ bool PlaylistBrowser::deletePodcasts( TQPtrList<PodcastChannel> items ) } #undef ch /// we don't need to delete from the database, because removing the channel from the database - /// automatically removes the children as well. + /// automatically removes the tqchildren as well. m_podcastItemsToScan.remove( static_cast<PodcastChannel*>(*it) ); } CollectionDB::instance()->removePodcastChannel( static_cast<PodcastChannel*>(*it)->url() ); @@ -1686,11 +1686,11 @@ DynamicMode *PlaylistBrowser::findDynamicModeByTitle( const TQString &title ) } PlaylistEntry * -PlaylistBrowser::findPlaylistEntry( const TQString &url, TQListViewItem *parent ) const +PlaylistBrowser::findPlaylistEntry( const TQString &url, TQListViewItem *tqparent ) const { - if( !parent ) parent = static_cast<TQListViewItem*>(m_playlistCategory); + if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_playlistCategory); - for( TQListViewItem *it = parent->firstChild(); + for( TQListViewItem *it = tqparent->firstChild(); it; it = it->nextSibling() ) { @@ -1728,7 +1728,7 @@ int PlaylistBrowser::loadPlaylist( const TQString &playlist, bool /*force*/ ) // roland } -void PlaylistBrowser::addPlaylist( const TQString &path, TQListViewItem *parent, bool force, bool imported ) +void PlaylistBrowser::addPlaylist( const TQString &path, TQListViewItem *tqparent, bool force, bool imported ) { // this function adds a playlist to the playlist browser @@ -1757,9 +1757,9 @@ void PlaylistBrowser::addPlaylist( const TQString &path, TQListViewItem *parent, } if ( !playlistImports ) //We didn't find the Imported folder, so create it. playlistImports = new PlaylistCategory( m_playlistCategory, 0, i18n("Imported") ); - parent = playlistImports; + tqparent = playlistImports; } - else if( !parent ) parent = static_cast<TQListViewItem*>(m_playlistCategory); + else if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_playlistCategory); if( !playlist ) { if( !m_playlistCategory || !m_playlistCategory->childCount() ) { //first child @@ -1769,11 +1769,11 @@ void PlaylistBrowser::addPlaylist( const TQString &path, TQListViewItem *parent, KURL auxKURL; auxKURL.setPath(path); - m_lastPlaylist = playlist = new PlaylistEntry( parent, 0, auxKURL ); + m_lastPlaylist = playlist = new PlaylistEntry( tqparent, 0, auxKURL ); } - parent->setOpen( true ); - parent->sortChildItems( 0, true ); + tqparent->setOpen( true ); + tqparent->sortChildItems( 0, true ); m_listview->clearSelection(); playlist->setSelected( true ); } @@ -1789,7 +1789,7 @@ bool PlaylistBrowser::savePlaylist( const TQString &path, const TQValueList<KURL if( !file.open( IO_WriteOnly ) ) { - KMessageBox::sorry( PlaylistWindow::self(), i18n( "Cannot write playlist (%1).").arg(path) ); + KMessageBox::sorry( PlaylistWindow::self(), i18n( "Cannot write playlist (%1).").tqarg(path) ); return false; } @@ -1836,15 +1836,15 @@ bool PlaylistBrowser::savePlaylist( const TQString &path, const TQValueList<KURL return true; } -void PlaylistBrowser::openPlaylist( TQListViewItem *parent ) //SLOT +void PlaylistBrowser::openPlaylist( TQListViewItem *tqparent ) //SLOT { // open a file selector to add playlists to the playlist browser TQStringList files; - files = KFileDialog::getOpenFileNames( TQString::null, "*.m3u *.pls *.xspf|" + i18n("Playlist Files"), this, i18n("Import Playlists") ); + files = KFileDialog::getOpenFileNames( TQString(), "*.m3u *.pls *.xspf|" + i18n("Playlist Files"), this, i18n("Import Playlists") ); const TQStringList::ConstIterator end = files.constEnd(); for( TQStringList::ConstIterator it = files.constBegin(); it != end; ++it ) - addPlaylist( *it, parent ); + addPlaylist( *it, tqparent ); savePlaylists(); } @@ -1927,10 +1927,10 @@ void PlaylistBrowser::savePlaylist( PlaylistEntry *item ) PlaylistBrowserEntry * PlaylistBrowser::findItem( TQString &t, int c ) const { - return static_cast<PlaylistBrowserEntry *>( m_listview->findItem( t, c, Qt::ExactMatch ) ); + return static_cast<PlaylistBrowserEntry *>( m_listview->tqfindItem( t, c, TQt::ExactMatch ) ); } -bool PlaylistBrowser::createPlaylist( TQListViewItem *parent, bool current, TQString title ) +bool PlaylistBrowser::createPlaylist( TQListViewItem *tqparent, bool current, TQString title ) { if( title.isEmpty() ) title = i18n("Untitled"); @@ -1938,8 +1938,8 @@ bool PlaylistBrowser::createPlaylist( TQListViewItem *parent, bool current, TQSt if( path.isEmpty() ) return false; - if( !parent ) - parent = static_cast<TQListViewItem *>( m_playlistCategory ); + if( !tqparent ) + tqparent = static_cast<TQListViewItem *>( m_playlistCategory ); if( current ) { @@ -1951,7 +1951,7 @@ bool PlaylistBrowser::createPlaylist( TQListViewItem *parent, bool current, TQSt { //Remove any items in Listview that have the same path as this one // Should only happen when overwriting a playlist - TQListViewItem *item = parent->firstChild(); + TQListViewItem *item = tqparent->firstChild(); while( item ) { if( static_cast<PlaylistEntry*>( item )->url() == path ) @@ -1968,8 +1968,8 @@ bool PlaylistBrowser::createPlaylist( TQListViewItem *parent, bool current, TQSt if ( TQFileInfo( path ).exists() ) TQFileInfo( path ).dir().remove( path ); - m_lastPlaylist = new PlaylistEntry( parent, 0, path ); - parent->sortChildItems( 0, true ); + m_lastPlaylist = new PlaylistEntry( tqparent, 0, path ); + tqparent->sortChildItems( 0, true ); } savePlaylists(); @@ -2105,18 +2105,18 @@ void PlaylistBrowser::removeSelectedItems() //SLOT continue; // if the playlist containing this item is already selected the current item will be skipped - // it will be deleted from the parent - TQListViewItem *parent = it.current()->parent(); + // it will be deleted from the tqparent + TQListViewItem *tqparent = it.current()->tqparent(); - if( parent && parent->isSelected() ) //parent will remove children + if( tqparent && tqparent->isSelected() ) //tqparent will remove tqchildren continue; - if (parent) { - while( parent->parent() && static_cast<PlaylistBrowserEntry*>(parent)->isKept() ) - parent = parent->parent(); + if (tqparent) { + while( tqparent->tqparent() && static_cast<PlaylistBrowserEntry*>(tqparent)->isKept() ) + tqparent = tqparent->tqparent(); } - if( parent && !static_cast<PlaylistBrowserEntry*>(parent)->isKept() ) + if( tqparent && !static_cast<PlaylistBrowserEntry*>(tqparent)->isKept() ) continue; switch( (*it)->rtti() ) @@ -2154,7 +2154,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT case PlaylistCategory::RTTI: folderCount++; - if( parent == m_playlistCategory ) + if( tqparent == m_playlistCategory ) { for( TQListViewItem *ch = (*it)->firstChild(); ch; ch = ch->nextSibling() ) { @@ -2172,7 +2172,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT playlistFoldersToDelete.append( static_cast<PlaylistCategory*>(*it) ); continue; // don't add the folder to selected, else it will be deleted twice } - else if( parent == m_podcastCategory ) + else if( tqparent == m_podcastCategory ) { for( TQListViewItem *ch = (*it)->firstChild(); ch; ch = ch->nextSibling() ) { @@ -2226,7 +2226,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT if( totalCount > 0 ) { - int button = KMessageBox::warningContinueCancel( this, message, TQString::null, KStdGuiItem::del() ); + int button = KMessageBox::warningContinueCancel( this, message, TQString(), KStdGuiItem::del() ); if( button != KMessageBox::Continue ) return; } @@ -2235,7 +2235,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT { if ( isPlaylistTrackItem( *it ) ) { - static_cast<PlaylistEntry*>( (*it)->parent() )->removeTrack( (*it) ); + static_cast<PlaylistEntry*>( (*it)->tqparent() )->removeTrack( (*it) ); continue; } if ( isDynamic( *it ) ) @@ -2278,7 +2278,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT if( lastfmCount ) saveLastFm(); } -// remove podcast folders. we need to do this recursively to ensure all children are removed from the db +// remove podcast folders. we need to do this recursively to ensure all tqchildren are removed from the db void PlaylistBrowser::removePodcastFolder( PlaylistCategory *item ) { if( !item ) return; @@ -2556,8 +2556,8 @@ void PlaylistBrowser::showContextMenu( TQListViewItem *item, const TQPoint &p, i // CLASS PlaylistBrowserView //////////////////////////////////////////////////////////////////////////// -PlaylistBrowserView::PlaylistBrowserView( TQWidget *parent, const char *name ) - : KListView( parent, name ) +PlaylistBrowserView::PlaylistBrowserView( TQWidget *tqparent, const char *name ) + : KListView( tqparent, name ) , m_marker( 0 ) { addColumn( i18n("Playlists") ); @@ -2619,7 +2619,7 @@ void PlaylistBrowserView::contentsDragLeaveEvent( TQDragLeaveEvent* ) void PlaylistBrowserView::contentsDropEvent( TQDropEvent *e ) { - TQListViewItem *parent = 0; + TQListViewItem *tqparent = 0; TQListViewItem *after; const TQPoint p = contentsToViewport( e->pos() ); @@ -2630,7 +2630,7 @@ void PlaylistBrowserView::contentsDropEvent( TQDropEvent *e ) } if( !isPlaylist( item ) ) - findDrop( e->pos(), parent, after ); + findDrop( e->pos(), tqparent, after ); eraseMarker(); @@ -2656,7 +2656,7 @@ void PlaylistBrowserView::contentsDropEvent( TQDropEvent *e ) { // check if it is podcast category TQListViewItem *cat = item; while( isCategory(cat) && cat!=PlaylistBrowser::instance()->podcastCategory() ) - cat = cat->parent(); + cat = cat->tqparent(); if( cat == PlaylistBrowser::instance()->podcastCategory() ) PlaylistBrowser::instance()->addPodcast(*it, item); @@ -2691,24 +2691,24 @@ void PlaylistBrowserView::contentsDropEvent( TQDropEvent *e ) if( bundles.isEmpty() ) return; - if( parent && isPlaylist( parent ) ) { + if( tqparent && isPlaylist( tqparent ) ) { //insert the dropped tracks - PlaylistEntry *playlist = static_cast<PlaylistEntry *>( parent ); + PlaylistEntry *playlist = static_cast<PlaylistEntry *>( tqparent ); playlist->insertTracks( after, bundles ); } else //dropped on a playlist item { - TQListViewItem *parent = item; + TQListViewItem *tqparent = item; bool isPlaylistFolder = false; - while( parent ) + while( tqparent ) { - if( parent == PlaylistBrowser::instance()->m_playlistCategory ) + if( tqparent == PlaylistBrowser::instance()->m_playlistCategory ) { isPlaylistFolder = true; break; } - parent = parent->parent(); + tqparent = tqparent->tqparent(); } if( isPlaylist( item ) ) { @@ -2721,7 +2721,7 @@ void PlaylistBrowserView::contentsDropEvent( TQDropEvent *e ) PlaylistBrowser *pb = PlaylistBrowser::instance(); TQString title = suggestion == 1 ? album : suggestion == 2 ? artist - : TQString::null; + : TQString(); if ( pb->createPlaylist( item, false, title ) ) pb->m_lastPlaylist->insertTracks( 0, bundles ); } @@ -2744,7 +2744,7 @@ void PlaylistBrowserView::eraseMarker() //SLOT spot = drawDropVisualizer( 0, 0, m_marker ); m_marker = 0; - viewport()->repaint( spot, false ); + viewport()->tqrepaint( spot, false ); } } @@ -2759,7 +2759,7 @@ void PlaylistBrowserView::viewportPaintEvent( TQPaintEvent *e ) drawItemHighlighter( &painter, m_marker ); else //when dragging on a track we draw a line marker painter.fillRect( drawDropVisualizer( 0, 0, m_marker ), - TQBrush( colorGroup().highlight(), TQBrush::Dense4Pattern ) ); + TQBrush( tqcolorGroup().highlight(), TQBrush::Dense4Pattern ) ); } } @@ -2768,17 +2768,17 @@ void PlaylistBrowserView::mousePressed( int button, TQListViewItem *item, const // this function expande/collapse the playlist if the +/- symbol has been pressed // and show the save menu if the save icon has been pressed - if( !item || button != LeftButton ) return; + if( !item || button != Qt::LeftButton ) return; if( isPlaylist( item ) ) { TQPoint p = mapFromGlobal( pnt ); p.setY( p.y() - header()->height() ); - TQRect itemrect = itemRect( item ); + TQRect itemrect = tqitemRect( item ); TQRect expandRect = TQRect( 4, itemrect.y() + (item->height()/2) - 5, 15, 15 ); - if( expandRect.contains( p ) ) { //expand symbol clicked + if( expandRect.tqcontains( p ) ) { //expand symbol clicked setOpen( item, !item->isOpen() ); return; } @@ -2795,7 +2795,7 @@ void PlaylistBrowserView::moveSelectedItems( TQListViewItem *newParent ) isSmartPlaylist( newParent ) || isPodcastEpisode( newParent ) || isStream( newParent ) ) { after = newParent; - newParent = newParent->parent(); + newParent = newParent->tqparent(); } #define newParent static_cast<PlaylistBrowserEntry*>(newParent) @@ -2807,7 +2807,7 @@ void PlaylistBrowserView::moveSelectedItems( TQListViewItem *newParent ) TQListViewItemIterator it( this, TQListViewItemIterator::Selected ); for( ; it.current(); ++it ) { - if( !(*it)->parent() ) //must be a base category we are draggin' + if( !(*it)->tqparent() ) //must be a base category we are draggin' continue; selected.append( *it ); @@ -2815,15 +2815,15 @@ void PlaylistBrowserView::moveSelectedItems( TQListViewItem *newParent ) for( TQListViewItem *item = selected.first(); item; item = selected.next() ) { - TQListViewItem *itemParent = item->parent(); + TQListViewItem *itemParent = item->tqparent(); if( isPlaylistTrackItem( item ) ) { if( isPlaylistTrackItem( newParent ) ) { - if( !after && newParent != newParent->parent()->firstChild() ) + if( !after && newParent != newParent->tqparent()->firstChild() ) after = newParent->itemAbove(); - newParent = static_cast<PlaylistEntry*>(newParent->parent()); + newParent = static_cast<PlaylistEntry*>(newParent->tqparent()); } else if( !isPlaylist( newParent ) ) continue; @@ -2841,8 +2841,8 @@ void PlaylistBrowserView::moveSelectedItems( TQListViewItem *newParent ) continue; TQListViewItem *base = newParent; - while( base->parent() ) - base = base->parent(); + while( base->tqparent() ) + base = base->tqparent(); if( base == PlaylistBrowser::instance()->m_playlistCategory && isPlaylist( item ) || base == PlaylistBrowser::instance()->m_streamsCategory && isStream( item ) || @@ -2850,7 +2850,7 @@ void PlaylistBrowserView::moveSelectedItems( TQListViewItem *newParent ) base == PlaylistBrowser::instance()->m_dynamicCategory && isDynamic( item ) ) { // if the item is from the cool streams dir, copy it. - if( item->parent() == PlaylistBrowser::instance()->m_coolStreams ) + if( item->tqparent() == PlaylistBrowser::instance()->m_coolStreams ) { #define item static_cast<StreamEntry*>(item) new StreamEntry( newParent, after, item->url(), item->title() ); @@ -2876,7 +2876,7 @@ void PlaylistBrowserView::rename( TQListViewItem *item, int c ) { KListView::rename( item, c ); - TQRect rect( itemRect( item ) ); + TQRect rect( tqitemRect( item ) ); int fieldX = rect.x() + treeStepSize() + 2; int fieldW = rect.width() - treeStepSize() - 2; @@ -2917,7 +2917,7 @@ void PlaylistBrowserView::startDrag() KMultipleDrag *drag = new KMultipleDrag( this ); TQListViewItemIterator it( this, TQListViewItemIterator::Selected ); - TQString pixText = TQString::null; + TQString pixText = TQString(); uint count = 0; for( ; it.current(); ++it ) @@ -2951,8 +2951,8 @@ void PlaylistBrowserView::startDrag() else if( isPodcastEpisode( *it ) ) { - if( (*it)->parent()->isSelected() ) continue; - if( !podList.isEmpty() && lastPodcastEpisode && lastPodcastEpisode->TQListViewItem::parent() != (*it)->parent() ) + if( (*it)->tqparent()->isSelected() ) continue; + if( !podList.isEmpty() && lastPodcastEpisode && lastPodcastEpisode->TQListViewItem::tqparent() != (*it)->tqparent() ) { // we moved onto a new podcast channel urls += podList; podList.clear(); @@ -3006,7 +3006,7 @@ void PlaylistBrowserView::startDrag() textdrag->setSubtype( "amarok-sql" ); drag->addDragObject( textdrag ); } - itemList += KURL::fromPathOrURL( TQString("smartplaylist://%1").arg( item->text(0) ) ); + itemList += KURL::fromPathOrURL( TQString("smartplaylist://%1").tqarg( item->text(0) ) ); pixText = (*it)->text(0); } @@ -3015,18 +3015,18 @@ void PlaylistBrowserView::startDrag() DynamicEntry *item = static_cast<DynamicEntry*>( *it ); // Serialize pointer to string - const TQString str = TQString::number( reinterpret_cast<Q_ULLONG>( item ) ); + const TQString str = TQString::number( reinterpret_cast<TQ_ULLONG>( item ) ); TQTextDrag *textdrag = new TQTextDrag( str, 0 ); textdrag->setSubtype( "dynamic" ); drag->addDragObject( textdrag ); - itemList += KURL::fromPathOrURL( TQString("dynamic://%1").arg( item->text(0) ) ); + itemList += KURL::fromPathOrURL( TQString("dynamic://%1").tqarg( item->text(0) ) ); pixText = (*it)->text(0); } else if( isPlaylistTrackItem( *it ) ) { - if( (*it)->parent()->isSelected() ) continue; + if( (*it)->tqparent()->isSelected() ) continue; urls += static_cast<PlaylistTrackItem*>(*it)->url(); itemList += static_cast<PlaylistTrackItem*>(*it)->url(); } @@ -3036,7 +3036,7 @@ void PlaylistBrowserView::startDrag() if( !podList.isEmpty() ) urls += podList; - if( count > 1 ) pixText = TQString::null; + if( count > 1 ) pixText = TQString(); drag->addDragObject( new KURLDrag( urls, viewport() ) ); drag->setPixmap( CollectionDB::createDragPixmap( itemList, pixText ), @@ -3054,12 +3054,12 @@ TQString PlaylistDialog::getSaveFileName( const TQString &suggestion, bool propo if( !suggestion.isEmpty() ) { TQString path = Amarok::saveLocation("playlists/") + "%1" + ".m3u"; - if( TQFileInfo( path.arg( suggestion ) ).exists() && !proposeOverwriting ) + if( TQFileInfo( path.tqarg( suggestion ) ).exists() && !proposeOverwriting ) { int n = 2; - while( TQFileInfo( path.arg( i18n( "%1 (%2)" ).arg( suggestion, TQString::number( n ) ) ) ).exists() ) + while( TQFileInfo( path.tqarg( i18n( "%1 (%2)" ).tqarg( suggestion, TQString::number( n ) ) ) ).exists() ) n++; - dialog.edit->setText( i18n( "%1 (%2)" ).arg( suggestion, TQString::number( n ) ) ); + dialog.edit->setText( i18n( "%1 (%2)" ).tqarg( suggestion, TQString::number( n ) ) ); } else dialog.edit->setText( suggestion ); @@ -3099,7 +3099,7 @@ void PlaylistDialog::slotOk() if( !TQFileInfo( result ).exists() || KMessageBox::warningContinueCancel( PlaylistWindow::self(), - i18n( "A playlist named \"%1\" already exists. Do you want to overwrite it?" ).arg( edit->text() ), + i18n( "A playlist named \"%1\" already exists. Do you want to overwrite it?" ).tqarg( edit->text() ), i18n( "Overwrite Playlist?" ), i18n( "Overwrite" ) ) == KMessageBox::Continue ) { KDialogBase::slotOk(); @@ -3124,8 +3124,8 @@ void PlaylistDialog::slotCustomPath() } -InfoPane::InfoPane( TQWidget *parent ) - : TQVBox( parent ), +InfoPane::InfoPane( TQWidget *tqparent ) + : TQVBox( tqparent ), m_enable( false ), m_storedHeight( 100 ) { @@ -3135,14 +3135,14 @@ InfoPane::InfoPane( TQWidget *parent ) { TQFrame *box = new TQHBox( container ); box->setMargin( 3 ); - box->setBackgroundMode( Qt::PaletteBase ); + box->setBackgroundMode( TQt::PaletteBase ); m_infoBrowser = new HTMLView( box, "extended_info", false /*DNDEnabled*/, false /*JS enabled*/ ); container->setFrameStyle( TQFrame::StyledPanel ); container->setMargin( 3 ); - container->setBackgroundMode( Qt::PaletteBase ); + container->setBackgroundMode( TQt::PaletteBase ); } m_pushButton = new KPushButton( KGuiItem( i18n("&Show Extended Info"), "info" ), this ); @@ -3151,7 +3151,7 @@ InfoPane::InfoPane( TQWidget *parent ) connect( m_pushButton, TQT_SIGNAL(toggled( bool )), TQT_SLOT(toggle( bool )) ); //Set the height to fixed. The button shouldn't be resized. - setFixedHeight( m_pushButton->sizeHint().height() ); + setFixedHeight( m_pushButton->tqsizeHint().height() ); } InfoPane::~InfoPane() @@ -3165,10 +3165,10 @@ InfoPane::~InfoPane() int InfoPane::getHeight() { - if( static_cast<TQWidget*>( child( "container" ) )->isShown() ) + if( TQT_TQWIDGET( child( "container" ) )->isShown() ) { //If the InfoPane is shown, return true height. - return static_cast<TQSplitter*>( parentWidget() )->sizes().last(); + return static_cast<TQSplitter*>( tqparentWidget() )->sizes().last(); } return m_storedHeight; @@ -3182,7 +3182,7 @@ InfoPane::setStoredHeight( const int newHeight ) { void InfoPane::toggle( bool toggled ) { - TQSplitter *splitter = static_cast<TQSplitter*>( parentWidget() ); + TQSplitter *splitter = static_cast<TQSplitter*>( tqparentWidget() ); if ( !toggled ) { @@ -3190,13 +3190,13 @@ InfoPane::toggle( bool toggled ) setStoredHeight( splitter->sizes().last() ); //Set the height to fixed. The button shouldn't be resized. - setFixedHeight( m_pushButton->sizeHint().height() ); + setFixedHeight( m_pushButton->tqsizeHint().height() ); //Now the info pane is not shown, we can disable the button if necessary m_pushButton->setEnabled( m_enable ); } else { - setMaximumHeight( ( int )( parentWidget()->height() / 1.5 ) ); + setMaximumHeight( ( int )( tqparentWidget()->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. @@ -3209,7 +3209,7 @@ InfoPane::toggle( bool toggled ) setMinimumHeight( 150 ); } - static_cast<TQWidget*>( child( "container" ) )->setShown( toggled ); + TQT_TQWIDGET( child( "container" ) )->setShown( toggled ); } void @@ -3219,14 +3219,14 @@ InfoPane::setInfo( const TQString &title, const TQString &info ) //whether there is content to show. Otherwise, just remember what we wanted to do //so we can do it later, when the user does hide the pane. m_enable = !( info.isEmpty() && title.isEmpty() ); - if ( !static_cast<TQWidget*>(child("container"))->isShown() ) + if ( !TQT_TQWIDGET(child("container"))->isShown() ) m_pushButton->setEnabled( m_enable ); if( m_pushButton->isOn() ) toggle( !(info.isEmpty() && title.isEmpty()) ); TQString info_ = info; - info_.replace( "\n", "<br/>" ); + info_.tqreplace( "\n", "<br/>" ); m_infoBrowser->set( m_enable ? @@ -3243,8 +3243,8 @@ InfoPane::setInfo( const TQString &title, const TQString &info ) "</td>" "</tr>" "</table>" - "</div>" ).arg( title, info_ ) : - TQString::null ); + "</div>" ).tqarg( title, info_ ) : + TQString() ); } #include "playlistbrowser.moc" diff --git a/amarok/src/playlistbrowser.h b/amarok/src/playlistbrowser.h index fd0e2d01..7576ecf3 100644 --- a/amarok/src/playlistbrowser.h +++ b/amarok/src/playlistbrowser.h @@ -40,9 +40,10 @@ class PlaylistBrowserView; class PlaylistTrackItem; -class PlaylistBrowser : public QVBox +class PlaylistBrowser : public TQVBox { Q_OBJECT + TQ_OBJECT friend class DynamicMode; friend class PlaylistBrowserView; @@ -64,15 +65,15 @@ class PlaylistBrowser : public QVBox void setInfo( const TQString &title, const TQString &info ); - void addStream( TQListViewItem *parent = 0 ); - void addSmartPlaylist( TQListViewItem *parent = 0 ); - void addDynamic( TQListViewItem *parent = 0 ); - void addPlaylist( const TQString &path, TQListViewItem *parent = 0, bool force=false, bool imported=false ); - PlaylistEntry *findPlaylistEntry( const TQString &url, TQListViewItem *parent=0 ) const; + void addStream( TQListViewItem *tqparent = 0 ); + void addSmartPlaylist( TQListViewItem *tqparent = 0 ); + void addDynamic( TQListViewItem *tqparent = 0 ); + void addPlaylist( const TQString &path, TQListViewItem *tqparent = 0, bool force=false, bool imported=false ); + PlaylistEntry *findPlaylistEntry( const TQString &url, TQListViewItem *tqparent=0 ) const; int loadPlaylist( const TQString &playlist, bool force=false ); - void addPodcast( TQListViewItem *parent = 0 ); - void addPodcast( const KURL &url, TQListViewItem *parent = 0 ); + void addPodcast( TQListViewItem *tqparent = 0 ); + void addPodcast( const KURL &url, TQListViewItem *tqparent = 0 ); void loadPodcastsFromDatabase( PlaylistCategory *p = 0 ); void registerPodcastSettings( const TQString &title, const PodcastSettings *settings ); @@ -112,7 +113,7 @@ class PlaylistBrowser : public QVBox void selectionChanged(); public slots: - void openPlaylist( TQListViewItem *parent = 0 ); + void openPlaylist( TQListViewItem *tqparent = 0 ); void scanPodcasts(); private slots: @@ -145,8 +146,8 @@ class PlaylistBrowser : public QVBox void saveStreams(); void loadLastfmStreams( const bool subscriber = false ); - void addLastFmRadio( TQListViewItem *parent ); - void addLastFmCustomRadio( TQListViewItem *parent ); + void addLastFmRadio( TQListViewItem *tqparent ); + void addLastFmCustomRadio( TQListViewItem *tqparent ); void saveLastFm(); PlaylistCategory* loadSmartPlaylists(); @@ -163,7 +164,7 @@ class PlaylistBrowser : public QVBox PlaylistCategory* loadPodcasts(); TQMap<int,PlaylistCategory*> loadPodcastFolders( PlaylistCategory *p ); void changePodcastInterval(); - void configurePodcasts( TQListViewItem *parent ); + void configurePodcasts( TQListViewItem *tqparent ); void configurePodcasts( TQPtrList<PodcastChannel> &podcastChannelList, const TQString &caption ); void configureSelectedPodcasts(); bool deleteSelectedPodcastItems( const bool removeItem=false, const bool silent=false ); @@ -172,7 +173,7 @@ class PlaylistBrowser : public QVBox void refreshPodcasts( TQListViewItem *category ); void removePodcastFolder( PlaylistCategory *item ); void savePodcastFolderStates( PlaylistCategory *folder ); - PodcastChannel *findPodcastChannel( const KURL &feed, TQListViewItem *parent=0 ) const; + PodcastChannel *findPodcastChannel( const KURL &feed, TQListViewItem *tqparent=0 ) const; void markDynamicEntries(); PlaylistBrowserEntry* findByName( TQString name ); @@ -180,7 +181,7 @@ class PlaylistBrowser : public QVBox PlaylistCategory* loadPlaylists(); void savePlaylists(); void savePlaylist( PlaylistEntry * ); - bool createPlaylist( TQListViewItem *parent = 0, bool current = true, TQString title = 0 ); + bool createPlaylist( TQListViewItem *tqparent = 0, bool current = true, TQString title = 0 ); bool deletePlaylists( TQPtrList<PlaylistEntry> items ); bool deletePlaylists( KURL::List items ); @@ -240,11 +241,12 @@ class PlaylistBrowser : public QVBox class PlaylistBrowserView : public KListView { Q_OBJECT + TQ_OBJECT friend class PlaylistEntry; public: - PlaylistBrowserView( TQWidget *parent, const char *name=0 ); + PlaylistBrowserView( TQWidget *tqparent, const char *name=0 ); ~PlaylistBrowserView(); void rename( TQListViewItem *item, int c ); @@ -271,8 +273,9 @@ class PlaylistBrowserView : public KListView class PlaylistDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - static TQString getSaveFileName( const TQString &suggestion = TQString::null, bool proposeOverwriting = false ); + static TQString getSaveFileName( const TQString &suggestion = TQString(), bool proposeOverwriting = false ); private: KLineEdit *edit; @@ -370,29 +373,30 @@ isLastFm( TQListViewItem *item ) return item->rtti() == LastFmEntry::RTTI ? true : false; } -inline QString +inline TQString fileBaseName( const TQString &filePath ) { // this function returns the file name without extension // (e.g. if the file path is "/home/user/playlist.m3u", "playlist" is returned - TQString fileName = filePath.right( filePath.length() - filePath.findRev( '/' ) - 1 ); - return fileName.mid( 0, fileName.findRev( '.' ) ); + TQString fileName = filePath.right( filePath.length() - filePath.tqfindRev( '/' ) - 1 ); + return fileName.mid( 0, fileName.tqfindRev( '.' ) ); } -inline QString +inline TQString fileDirPath( const TQString &filePath ) { - return filePath.left( filePath.findRev( '/' )+1 ); + return filePath.left( filePath.tqfindRev( '/' )+1 ); } -class InfoPane : public QVBox +class InfoPane : public TQVBox { Q_OBJECT + TQ_OBJECT public: - InfoPane( TQWidget *parent ); + InfoPane( TQWidget *tqparent ); ~InfoPane(); int getHeight(); void setStoredHeight( const int newHeight ); diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp index 1eb0c426..9f807c14 100644 --- a/amarok/src/playlistbrowseritem.cpp +++ b/amarok/src/playlistbrowseritem.cpp @@ -143,7 +143,7 @@ PlaylistBrowserEntry::setKept( bool k ) void PlaylistBrowserEntry::updateInfo() { - PlaylistBrowser::instance()->setInfo( TQString::null, TQString::null ); + PlaylistBrowser::instance()->setInfo( TQString(), TQString() ); return; } @@ -156,15 +156,15 @@ PlaylistBrowserEntry::slotDoubleClicked() void PlaylistBrowserEntry::slotRenameItem() { - TQListViewItem *parent = KListViewItem::parent(); + TQListViewItem *tqparent = KListViewItem::tqparent(); - while( parent ) + while( tqparent ) { - if( !static_cast<PlaylistBrowserEntry*>( parent )->isKept() ) + if( !static_cast<PlaylistBrowserEntry*>( tqparent )->isKept() ) return; - if( !parent->parent() ) + if( !tqparent->tqparent() ) break; - parent = parent->parent(); + tqparent = tqparent->tqparent(); } setRenameEnabled( 0, true ); @@ -181,8 +181,8 @@ PlaylistBrowserEntry::slotPostRenameItem( const TQString /*newName*/ ) /// CLASS PlaylistCategory //////////////////////////////////////////////////////////////////////////// -PlaylistCategory::PlaylistCategory( TQListView *parent, TQListViewItem *after, const TQString &t, bool isFolder ) - : PlaylistBrowserEntry( parent, after ) +PlaylistCategory::PlaylistCategory( TQListView *tqparent, TQListViewItem *after, const TQString &t, bool isFolder ) + : PlaylistBrowserEntry( tqparent, after ) , m_title( t ) , m_id( -1 ) , m_folder( isFolder ) @@ -194,8 +194,8 @@ PlaylistCategory::PlaylistCategory( TQListView *parent, TQListViewItem *after, c } -PlaylistCategory::PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQString &t, bool isFolder ) - : PlaylistBrowserEntry( parent, after ) +PlaylistCategory::PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *after, const TQString &t, bool isFolder ) + : PlaylistBrowserEntry( tqparent, after ) , m_title( t ) , m_id( -1 ) , m_folder( isFolder ) @@ -207,8 +207,8 @@ PlaylistCategory::PlaylistCategory( PlaylistCategory *parent, TQListViewItem *af } -PlaylistCategory::PlaylistCategory( TQListView *parent, TQListViewItem *after, const TQDomElement &xmlDefinition, bool isFolder ) - : PlaylistBrowserEntry( parent, after ) +PlaylistCategory::PlaylistCategory( TQListView *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition, bool isFolder ) + : PlaylistBrowserEntry( tqparent, after ) , m_id( -1 ) , m_folder( isFolder ) { @@ -219,8 +219,8 @@ PlaylistCategory::PlaylistCategory( TQListView *parent, TQListViewItem *after, c } -PlaylistCategory::PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ) - : PlaylistBrowserEntry( parent, after ) +PlaylistCategory::PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition ) + : PlaylistBrowserEntry( tqparent, after ) , m_id( -1 ) , m_folder( true ) { @@ -230,8 +230,8 @@ PlaylistCategory::PlaylistCategory( PlaylistCategory *parent, TQListViewItem *af setPixmap( 0, SmallIcon( Amarok::icon( "files" ) ) ); } -PlaylistCategory::PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQString &t, const int id ) - : PlaylistBrowserEntry( parent, after ) +PlaylistCategory::PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *after, const TQString &t, const int id ) + : PlaylistBrowserEntry( tqparent, after ) , m_title( t ) , m_id( id ) , m_folder( true ) @@ -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 parentId = parent() ? static_cast<PlaylistCategory*>(parent())->id() : 0; - CollectionDB::instance()->updatePodcastFolder( m_id, text(0), parentId, isOpen() ); + const int tqparentId = tqparent() ? static_cast<PlaylistCategory*>(tqparent())->id() : 0; + CollectionDB::instance()->updatePodcastFolder( m_id, text(0), tqparentId, 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 *parentCat = this; + TQListViewItem *tqparentCat = this; - while( parentCat->parent() ) - parentCat = parentCat->parent(); + while( tqparentCat->tqparent() ) + tqparentCat = tqparentCat->tqparent(); bool isPodcastFolder = false; @@ -412,37 +412,37 @@ PlaylistCategory::showContextMenu( const TQPoint &position ) menu.insertSeparator(); } - if( parentCat == static_cast<TQListViewItem*>( PlaylistBrowser::instance()->m_playlistCategory) ) + if( tqparentCat == 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( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_smartCategory) ) + else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_smartCategory) ) menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("New Smart Playlist..."), SMART ); - else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_dynamicCategory) ) + else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_dynamicCategory) ) menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("New Dynamic Playlist..."), DYNAMIC ); - else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_streamsCategory) ) + else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_streamsCategory) ) menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Radio Stream..."), STREAM ); - else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_lastfmCategory) ) + else if( tqparentCat == 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( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_podcastCategory) ) + else if( tqparentCat == 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( parentCat->childCount() == 0 ) + if( tqparentCat->childCount() == 0 ) menu.setItemEnabled( CONFIG, false ); - if( parentCat == this ) + if( tqparentCat == this ) menu.insertItem( SmallIconSet( Amarok::icon( "configure" ) ), i18n("Scan Interval..."), INTERVAL ); } @@ -514,7 +514,7 @@ PlaylistCategory::showContextMenu( const TQPoint &position ) break; } name = i18n("Folder"); - if( c ) name = i18n("Folder %1").arg(c); + if( c ) name = i18n("Folder %1").tqarg(c); if( tracker == firstChild() && !isCategory( tracker ) ) tracker = 0; newFolder = new PlaylistCategory( this, tracker, name, true ); @@ -553,8 +553,8 @@ PlaylistCategory::paintCell( TQPainter *p, const TQColorGroup &cg, int column, i /// CLASS PlaylistEntry //////////////////////////////////////////////////////////////////////////// -PlaylistEntry::PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &url, int tracks, int length ) - : PlaylistBrowserEntry( parent, after ) +PlaylistEntry::PlaylistEntry( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url, int tracks, int length ) + : PlaylistBrowserEntry( tqparent, after ) , m_url( url ) , m_length( length ) , m_trackCount( tracks ) @@ -583,8 +583,8 @@ PlaylistEntry::PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, con } -PlaylistEntry::PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ) - : PlaylistBrowserEntry( parent, after ) +PlaylistEntry::PlaylistEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition ) + : PlaylistBrowserEntry( tqparent, after ) , m_loading( false ) , m_loaded( false ) , m_dynamic( false ) @@ -600,7 +600,7 @@ PlaylistEntry::PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, con if( title.isEmpty() ) { title = fileBaseName( m_url.path() ); - title.replace( '_', ' ' ); + title.tqreplace( '_', ' ' ); } setText( 0, title ); @@ -642,7 +642,7 @@ void PlaylistEntry::load() startAnimation(); connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); - //delete all children, so that we don't duplicate things + //delete all tqchildren, so that we don't duplicate things while( firstChild() ) delete firstChild(); @@ -687,7 +687,7 @@ void PlaylistEntry::insertTracks( TQListViewItem *after, TQValueList<MetaBundle> { int pos = 0; if( after ) { - pos = m_trackList.find( static_cast<PlaylistTrackItem*>(after)->trackInfo() ) + 1; + pos = m_trackList.tqfind( static_cast<PlaylistTrackItem*>(after)->trackInfo() ) + 1; if( pos == -1 ) return; } @@ -756,7 +756,7 @@ void PlaylistEntry::customEvent( TQCustomEvent *e ) if ( str.isEmpty() ) str = fileBaseName( m_url.path() ); - str.replace( '_', ' ' ); + str.tqreplace( '_', ' ' ); setText( 0, str ); foreachType( BundleList, playlist->bundles ) @@ -784,14 +784,14 @@ void PlaylistEntry::customEvent( TQCustomEvent *e ) stopAnimation(); //stops the loading animation if( m_trackCount && !m_dynamic && !isDynamic() ) setOpen( true ); - else listView()->repaintItem( this ); + else listView()->tqrepaintItem( this ); m_trackCount = m_trackList.count(); } /** * We destroy the tracks on collapsing the entry. However, if we are using dynamic mode, then we leave them - * because adding from a custom list is problematic if the entry has no children. Using load() is not effective + * because adding from a custom list is problematic if the entry has no tqchildren. Using load() is not effective * since this is a threaded operation and would require pulling apart the entire class to make it work. */ @@ -814,7 +814,7 @@ void PlaylistEntry::setOpen( bool open ) } else if( !isDynamic() || !m_dynamic ) { //collapse - //delete all children + //delete all tqchildren while( firstChild() ) delete firstChild(); @@ -855,10 +855,10 @@ void PlaylistEntry::updateInfo() TQString str = "<html><body><table width=\"100%\" border=\"0\">"; - str += body.arg( i18n( "Playlist" ), text(0) ); - str += body.arg( i18n( "Number of tracks" ), TQString::number(m_trackCount) ); - str += body.arg( i18n( "Length" ), MetaBundle::prettyTime( m_length ) ); - str += body.arg( i18n( "Location" ), m_url.prettyURL() ); + str += body.tqarg( i18n( "Playlist" ), text(0) ); + str += body.tqarg( i18n( "Number of tracks" ), TQString::number(m_trackCount) ); + str += body.tqarg( i18n( "Length" ), MetaBundle::prettyTime( m_length ) ); + str += body.tqarg( i18n( "Location" ), m_url.prettyURL() ); str += "</table></body></html>"; PlaylistBrowser::instance()->setInfo( text(0), str ); @@ -875,11 +875,11 @@ void PlaylistEntry::showContextMenu( const TQPoint &position ) { KPopupMenu menu( listView() ); - enum Id { LOAD, APPEND, QUEUE, RENAME, DELETE, MEDIADEVICE_COPY, MEDIADEVICE_SYNC }; + enum Id { LOAD, APPEND, TQUEUE, RENAME, DELETE, MEDIADEVICE_COPY, MEDIADEVICE_SYNC }; menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), QUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), TQUEUE ); if( MediaBrowser::isAvailable() ) { @@ -906,7 +906,7 @@ void PlaylistEntry::showContextMenu( const TQPoint &position ) case APPEND: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Append ); break; - case QUEUE: + case TQUEUE: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Queue ); break; case RENAME: @@ -951,7 +951,7 @@ void PlaylistEntry::setDynamic( bool enable ) m_dynamic = enable; } - listView()->repaintItem( this ); + listView()->tqrepaintItem( this ); } void PlaylistEntry::setup() @@ -1053,19 +1053,19 @@ TQDomElement PlaylistEntry::xml() const /// CLASS PlaylistTrackItem //////////////////////////////////////////////////////////////////////////////// -PlaylistTrackItem::PlaylistTrackItem( TQListViewItem *parent, TQListViewItem *after, TrackItemInfo *info ) - : PlaylistBrowserEntry( parent, after ) +PlaylistTrackItem::PlaylistTrackItem( TQListViewItem *tqparent, TQListViewItem *after, TrackItemInfo *info ) + : PlaylistBrowserEntry( tqparent, after ) , m_trackInfo( info ) { setDragEnabled( true ); setRenameEnabled( 0, false ); - PlaylistEntry *p = dynamic_cast<PlaylistEntry *>(parent); + PlaylistEntry *p = dynamic_cast<PlaylistEntry *>(tqparent); if(!p) - debug() << "parent: " << parent << " is not a PlaylistEntry" << endl; - if( p && p->text( 0 ).contains( info->artist() ) ) + debug() << "tqparent: " << tqparent << " is not a PlaylistEntry" << endl; + if( p && p->text( 0 ).tqcontains( info->artist() ) ) setText( 0, info->title() ); else - setText( 0, i18n("%1 - %2").arg( info->artist(), info->title() ) ); + setText( 0, i18n("%1 - %2").tqarg( info->artist(), info->title() ) ); } const KURL &PlaylistTrackItem::url() @@ -1082,11 +1082,11 @@ void PlaylistTrackItem::slotDoubleClicked() void PlaylistTrackItem::showContextMenu( const TQPoint &position ) { KPopupMenu menu( listView() ); - enum Actions { LOAD, APPEND, QUEUE, BURN, REMOVE, INFO }; + enum Actions { LOAD, APPEND, TQUEUE, BURN, REMOVE, INFO }; menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Track" ), QUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Track" ), TQUEUE ); menu.insertSeparator(); @@ -1105,7 +1105,7 @@ void PlaylistTrackItem::showContextMenu( const TQPoint &position ) case APPEND: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Append ); break; - case QUEUE: + case TQUEUE: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Queue ); break; case BURN: @@ -1121,7 +1121,7 @@ void PlaylistTrackItem::showContextMenu( const TQPoint &position ) TagDialog* dialog = new TagDialog( url() ); dialog->show(); } - else KMessageBox::sorry( PlaylistBrowser::instance(), i18n( "This file does not exist: %1" ).arg( url().path() ) ); + else KMessageBox::sorry( PlaylistBrowser::instance(), i18n( "This file does not exist: %1" ).tqarg( url().path() ) ); } } @@ -1155,8 +1155,8 @@ TrackItemInfo::TrackItemInfo( const MetaBundle &mb ) /// CLASS StreamEntry //////////////////////////////////////////////////////////////////////////// -StreamEntry::StreamEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &u, const TQString &t ) - : PlaylistBrowserEntry( parent, after ) +StreamEntry::StreamEntry( TQListViewItem *tqparent, TQListViewItem *after, const KURL &u, const TQString &t ) + : PlaylistBrowserEntry( tqparent, after ) , m_title( t ) , m_url( u ) { @@ -1172,8 +1172,8 @@ StreamEntry::StreamEntry( TQListViewItem *parent, TQListViewItem *after, const K setText( 0, m_title ); } -StreamEntry::StreamEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ) - : PlaylistBrowserEntry( parent, after ) +StreamEntry::StreamEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition ) + : PlaylistBrowserEntry( tqparent, after ) { setDragEnabled( true ); setRenameEnabled( 0, true ); @@ -1212,7 +1212,7 @@ void StreamEntry::updateInfo() TQString str = "<html><body><table width=\"100%\" border=\"0\">"; - str += body.arg( i18n( "URL" ), m_url.prettyURL() ); + str += body.tqarg( i18n( "URL" ), m_url.prettyURL() ); str += "</table></body></html>"; PlaylistBrowser::instance()->setInfo( text(0), str ); @@ -1291,11 +1291,11 @@ void StreamEntry::showContextMenu( const TQPoint &position ) { KPopupMenu menu( listView() ); - enum Actions { LOAD, APPEND, QUEUE, EDIT, REMOVE }; + enum Actions { LOAD, APPEND, TQUEUE, EDIT, REMOVE }; menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), QUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), TQUEUE ); menu.insertSeparator(); // Forbid editing non removable items @@ -1316,7 +1316,7 @@ StreamEntry::showContextMenu( const TQPoint &position ) case APPEND: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Append ); break; - case QUEUE: + case TQUEUE: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Queue ); break; case EDIT: @@ -1354,8 +1354,8 @@ TQDomElement LastFmEntry::xml() const /// CLASS StreamEditor //////////////////////////////////////////////////////////////////////////// -StreamEditor::StreamEditor( TQWidget *parent, const TQString &title, const TQString &url, bool readonly ) - : KDialogBase( parent, "StreamEditor", true, TQString::null, Ok|Cancel) +StreamEditor::StreamEditor( TQWidget *tqparent, const TQString &title, const TQString &url, bool readonly ) + : KDialogBase( tqparent, "StreamEditor", true, TQString(), Ok|Cancel) { makeGridMainWidget( 2, Qt::Horizontal ); @@ -1387,16 +1387,16 @@ StreamEditor::StreamEditor( TQWidget *parent, const TQString &title, const TQStr ///////////////////////////////////////////////////////////////////////////// /// CLASS DynamicEntry //////////////////////////////////////////////////////////////////////////// -DynamicEntry::DynamicEntry( TQListViewItem *parent, TQListViewItem *after, const TQString &name ) - : PlaylistBrowserEntry( parent, after, name ) +DynamicEntry::DynamicEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQString &name ) + : PlaylistBrowserEntry( tqparent, after, name ) , DynamicMode( name ) { setPixmap( 0, SmallIcon( Amarok::icon( "dynamic" ) ) ); setDragEnabled( true ); } -DynamicEntry::DynamicEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ) - : PlaylistBrowserEntry( parent, after ) +DynamicEntry::DynamicEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition ) + : PlaylistBrowserEntry( tqparent, after ) , DynamicMode( xmlDefinition.attribute( "name" ) ) { setPixmap( 0, SmallIcon( Amarok::icon( "dynamic" ) ) ); @@ -1511,15 +1511,15 @@ DynamicEntry::showContextMenu( const TQPoint &position ) /// CLASS PodcastChannel //////////////////////////////////////////////////////////////////////////// -PodcastChannel::PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const KURL &url ) - : PlaylistBrowserEntry( parent, after ) +PodcastChannel::PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url ) + : PlaylistBrowserEntry( tqparent, after ) , m_polished( true ) // we get the items immediately if url is given , m_url( url ) , m_fetching( false ) , m_updating( false ) , m_new( false ) , m_hasProblem( false ) - , m_parent( static_cast<PlaylistCategory*>(parent) ) + , m_tqparent( static_cast<PlaylistCategory*>(tqparent) ) , m_settingsValid( false ) { setDragEnabled( true ); @@ -1531,16 +1531,16 @@ PodcastChannel::PodcastChannel( TQListViewItem *parent, TQListViewItem *after, c fetch(); } -PodcastChannel::PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const KURL &url, +PodcastChannel::PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url, const TQDomNode &channelSettings ) - : PlaylistBrowserEntry( parent, after ) + : PlaylistBrowserEntry( tqparent, after ) , m_polished( true ) // we get the items immediately if url is given , m_url( url ) , m_fetching( false ) , m_updating( false ) , m_new( false ) , m_hasProblem( false ) - , m_parent( static_cast<PlaylistCategory*>(parent) ) + , m_tqparent( static_cast<PlaylistCategory*>(tqparent) ) , m_settingsValid( true ) { setDragEnabled( true ); @@ -1554,17 +1554,17 @@ PodcastChannel::PodcastChannel( TQListViewItem *parent, TQListViewItem *after, c fetch(); } -PodcastChannel::PodcastChannel( TQListViewItem *parent, TQListViewItem *after, +PodcastChannel::PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url, const TQDomNode &channelSettings, const TQDomDocument &xmlDefinition ) - : PlaylistBrowserEntry( parent, after ) + : PlaylistBrowserEntry( tqparent, after ) , m_polished( true ) //automatically load the channel , m_url( url ) , m_fetching( false ) , m_updating( false ) , m_new( false ) , m_hasProblem( false ) - , m_parent( static_cast<PlaylistCategory*>(parent) ) + , m_tqparent( static_cast<PlaylistCategory*>(tqparent) ) , m_settingsValid( true ) { TQDomNode type = xmlDefinition.namedItem("rss"); @@ -1581,8 +1581,8 @@ PodcastChannel::PodcastChannel( TQListViewItem *parent, TQListViewItem *after, setPixmap( 0, SmallIcon( Amarok::icon( "podcast" ) ) ); } -PodcastChannel::PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const PodcastChannelBundle &pcb ) - : PlaylistBrowserEntry( parent, after ) +PodcastChannel::PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const PodcastChannelBundle &pcb ) + : PlaylistBrowserEntry( tqparent, after ) , m_bundle( pcb ) , m_polished( false ) , m_url( pcb.url() ) @@ -1590,7 +1590,7 @@ PodcastChannel::PodcastChannel( TQListViewItem *parent, TQListViewItem *after, c , m_updating( false ) , m_new( false ) , m_hasProblem( false ) - , m_parent( static_cast<PlaylistCategory*>(parent) ) + , m_tqparent( static_cast<PlaylistCategory*>(tqparent) ) , m_settingsValid( true ) { setText( 0, title() ); @@ -1929,7 +1929,7 @@ PodcastChannel::setXml( const TQDomNode &xml, const int feedType ) setText( 0, t ); - TQString l = TQString::null; + TQString l = TQString(); if( isAtom ) l = xml.namedItem( "link" ).toElement().attribute( "rel" ); @@ -1964,7 +1964,7 @@ PodcastChannel::setXml( const TQDomNode &xml, const int feedType ) delete settings; m_bundle.setImageURL( KURL::fromPathOrURL( img ) ); - m_bundle.setParentId( m_parent->id() ); + m_bundle.setParentId( m_tqparent->id() ); if( !m_updating ) { // don't reinsert on a refresh debug() << "Adding podcast to database" << endl; @@ -2056,8 +2056,8 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) TQString guid = xml.namedItem( "guid" ).toElement().text(); if( !guid.isEmpty() ) { - command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND guid='%2';") - .arg( CollectionDB::instance()->escapeString( url().url() ), + command = TQString("SELECT id FROM podcastepisodes WHERE tqparent='%1' AND guid='%2';") + .tqarg( CollectionDB::instance()->escapeString( url().url() ), CollectionDB::instance()->escapeString( guid ) ); TQStringList values = CollectionDB::instance()->query( command ); return !values.isEmpty(); @@ -2065,8 +2065,8 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) TQString episodeTitle = xml.namedItem( "title" ).toElement().text(); KURL episodeURL = xml.namedItem( "enclosure" ).toElement().attribute( "url" ); - command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND url='%2' AND title='%3';") - .arg( CollectionDB::instance()->escapeString( url().url() ), + command = TQString("SELECT id FROM podcastepisodes WHERE tqparent='%1' AND url='%2' AND title='%3';") + .tqarg( CollectionDB::instance()->escapeString( url().url() ), CollectionDB::instance()->escapeString( episodeURL.url() ), CollectionDB::instance()->escapeString( episodeTitle ) ); TQStringList values = CollectionDB::instance()->query( command ); @@ -2079,15 +2079,15 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) TQString guid = xml.namedItem( "id" ).toElement().text(); if( !guid.isEmpty() ) { - command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND guid='%2';") - .arg( CollectionDB::instance()->escapeString( url().url() ), + command = TQString("SELECT id FROM podcastepisodes WHERE tqparent='%1' AND guid='%2';") + .tqarg( CollectionDB::instance()->escapeString( url().url() ), CollectionDB::instance()->escapeString( guid ) ); TQStringList values = CollectionDB::instance()->query( command ); return !values.isEmpty(); } TQString episodeTitle = xml.namedItem("title").toElement().text(); - TQString episodeURL = TQString::null; + TQString episodeURL = TQString(); TQDomNode n = xml.namedItem("link"); for( ; !n.isNull(); n = n.nextSibling() ) { @@ -2098,8 +2098,8 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) } } - command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND url='%2' AND title='%3';") - .arg( CollectionDB::instance()->escapeString( url().url() ), + command = TQString("SELECT id FROM podcastepisodes WHERE tqparent='%1' AND url='%2' AND title='%3';") + .tqarg( CollectionDB::instance()->escapeString( url().url() ), CollectionDB::instance()->escapeString( episodeURL ), CollectionDB::instance()->escapeString( episodeTitle ) ); TQStringList values = CollectionDB::instance()->query( command ); @@ -2113,15 +2113,15 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) void PodcastChannel::setParent( PlaylistCategory *newParent ) { - if( newParent != m_parent ) + if( newParent != m_tqparent ) { - m_parent->takeItem( this ); + m_tqparent->takeItem( this ); newParent->insertItem( this ); newParent->sortChildItems( 0, true ); - m_parent = newParent; + m_tqparent = newParent; } - m_bundle.setParentId( m_parent->id() ); + m_bundle.setParentId( m_tqparent->id() ); CollectionDB::instance()->updatePodcastChannel( m_bundle ); } @@ -2136,15 +2136,15 @@ PodcastChannel::updateInfo() TQString str = "<html><body><table width=\"100%\" border=\"0\">"; - str += body.arg( i18n( "Description" ), description() ); - str += body.arg( i18n( "Website" ), link().prettyURL() ); - str += body.arg( i18n( "Copyright" ), copyright() ); - str += body.arg( i18n( "URL" ), m_url.prettyURL() ); + str += body.tqarg( i18n( "Description" ), description() ); + str += body.tqarg( i18n( "Website" ), link().prettyURL() ); + str += body.tqarg( i18n( "Copyright" ), copyright() ); + str += body.tqarg( i18n( "URL" ), m_url.prettyURL() ); str += "</table>"; str += i18n( "<p> <b>Episodes</b></p><ul>" ); for( TQListViewItem *c = firstChild(); c; c = c->nextSibling() ) { - str += TQString("<li>%1</li>").arg( static_cast<PodcastEpisode*>(c)->title() ); + str += TQString("<li>%1</li>").tqarg( static_cast<PodcastEpisode*>(c)->title() ); } str += "</ul></body></html>"; @@ -2299,11 +2299,11 @@ PodcastChannel::showContextMenu( const TQPoint &position ) { KPopupMenu menu( listView() ); - enum Actions { LOAD, APPEND, QUEUE, DELETE, RESCAN, LISTENED, NEW, CONFIG }; + enum Actions { LOAD, APPEND, TQUEUE, DELETE, RESCAN, LISTENED, NEW, CONFIG }; menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), QUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), TQUEUE ); menu.insertSeparator(); menu.insertItem( SmallIconSet( Amarok::icon( "remove" ) ), i18n( "&Delete" ), DELETE ); menu.insertItem( SmallIconSet( Amarok::icon( "refresh" ) ), i18n( "&Check for Updates" ), RESCAN ); @@ -2323,7 +2323,7 @@ PodcastChannel::showContextMenu( const TQPoint &position ) PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Append ); break; - case QUEUE: + case TQUEUE: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Queue ); break; @@ -2355,10 +2355,10 @@ PodcastChannel::showContextMenu( const TQPoint &position ) /// @note we fucking hate itunes for taking over podcasts and inserting /// their own attributes. //////////////////////////////////////////////////////////////////////////// -PodcastEpisode::PodcastEpisode( TQListViewItem *parent, TQListViewItem *after, +PodcastEpisode::PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xml, const int feedType, const bool &isNew ) - : PlaylistBrowserEntry( parent, after ) - , m_parent( parent ) + : PlaylistBrowserEntry( tqparent, after ) + , m_tqparent( tqparent ) , m_fetching( false ) , m_onDisk( false ) , m_localUrl( KURL() ) @@ -2428,10 +2428,10 @@ PodcastEpisode::PodcastEpisode( TQListViewItem *parent, TQListViewItem *after, if( title.isEmpty() ) title = link.fileName(); - KURL parentUrl = static_cast<PodcastChannel*>(parent)->url(); + KURL tqparentUrl = static_cast<PodcastChannel*>(tqparent)->url(); m_bundle.setDBId( -1 ); m_bundle.setURL( link ); - m_bundle.setParent( parentUrl ); + m_bundle.setParent( tqparentUrl ); m_bundle.setTitle( title ); m_bundle.setSubtitle( subtitle ); m_bundle.setAuthor( author ); @@ -2452,9 +2452,9 @@ PodcastEpisode::PodcastEpisode( TQListViewItem *parent, TQListViewItem *after, setRenameEnabled( 0, false ); } -PodcastEpisode::PodcastEpisode( TQListViewItem *parent, TQListViewItem *after, PodcastEpisodeBundle &bundle ) - : PlaylistBrowserEntry( parent, after ) - , m_parent( parent ) +PodcastEpisode::PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after, PodcastEpisodeBundle &bundle ) + : PlaylistBrowserEntry( tqparent, after ) + , m_tqparent( tqparent ) , m_bundle( bundle ) , m_fetching( false ) , m_onDisk( false ) @@ -2550,7 +2550,7 @@ PodcastEpisode::downloadMedia() connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); KURL localDir; - PodcastChannel *channel = dynamic_cast<PodcastChannel*>(m_parent); + PodcastChannel *channel = dynamic_cast<PodcastChannel*>(m_tqparent); if( channel ) localDir = KURL::fromPathOrURL( channel->saveLocation() ); else @@ -2565,7 +2565,7 @@ PodcastEpisode::downloadMedia() Amarok::StatusBar::instance()->newProgressOperation( m_podcastEpisodeJob ) .setDescription( title().isEmpty() ? i18n( "Downloading Podcast Media" ) - : i18n( "Downloading Podcast \"%1\"" ).arg( title() ) ) + : i18n( "Downloading Podcast \"%1\"" ).tqarg( title() ) ) .setAbortSlot( this, TQT_SLOT( abortDownload()) ) .setProgressSignal( m_podcastEpisodeJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ) ); @@ -2587,8 +2587,8 @@ void PodcastEpisode::createLocalDir( const KURL &localDir ) TQString localDirString = localDir.path(); if( !TQFile::exists( localDirString ) ) { - TQString parentDirString = localDir.directory( true, true ); - createLocalDir( parentDirString ); + TQString tqparentDirString = localDir.directory( true, true ); + createLocalDir( tqparentDirString ); TQDir dir( localDirString ); dir.mkdir( localDirString ); } @@ -2633,7 +2633,7 @@ void PodcastEpisode::downloadResult( KIO::Job * transferJob ) setLocalUrl( m_localUrl ); - PodcastChannel *channel = dynamic_cast<PodcastChannel *>( m_parent ); + PodcastChannel *channel = dynamic_cast<PodcastChannel *>( m_tqparent ); if( channel && channel->autotransfer() && MediaBrowser::isAvailable() ) { addToMediaDevice(); @@ -2658,7 +2658,7 @@ void PodcastEpisode::addToMediaDevice() { MetaBundle *bundle = new MetaBundle( localUrl() ); - PodcastChannel *channel = dynamic_cast<PodcastChannel *>( m_parent ); + PodcastChannel *channel = dynamic_cast<PodcastChannel *>( m_tqparent ); if(channel && !channel->title().isEmpty()) bundle->setAlbum(channel->title()); if(!title().isEmpty()) @@ -2687,11 +2687,11 @@ PodcastEpisode::setNew( const bool &n ) updatePixmap(); CollectionDB::instance()->updatePodcastEpisode( dBId(), m_bundle ); - // if we mark an item as listened, we might need to update the parent + // if we mark an item as listened, we might need to update the tqparent if( n == true ) - static_cast<PodcastChannel*>(m_parent)->setNew( true ); + static_cast<PodcastChannel*>(m_tqparent)->setNew( true ); else - static_cast<PodcastChannel*>(m_parent)->checkAndSetNew(); + static_cast<PodcastChannel*>(m_tqparent)->checkAndSetNew(); } void @@ -2776,7 +2776,7 @@ PodcastEpisode::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int if( fmName.width( name ) > _width ) { //decapitateString removes the channels title from the epsiodes title - name = Amarok::decapitateString( name, static_cast<PodcastChannel *>(m_parent)->title() ); + name = Amarok::decapitateString( name, static_cast<PodcastChannel *>(m_tqparent)->title() ); if( fmName.width( name ) > _width ) name = KStringHandler::rPixelSqueeze( name, pBuf.fontMetrics(), _width ); } @@ -2794,13 +2794,13 @@ PodcastEpisode::updateInfo() TQString str = "<html><body><table width=\"100%\" border=\"0\">"; - //str += body.arg( i18n( "Title" ), m_bundle.title() ); - str += body.arg( i18n( "Description" ), m_bundle.description() ); - str += body.arg( i18n( "Date" ), m_bundle.date() ); - str += body.arg( i18n( "Author" ), m_bundle.author() ); - str += body.arg( i18n( "Type" ), m_bundle.type() ); - str += body.arg( i18n( "URL" ), m_bundle.url().prettyURL() ); - str += body.arg( i18n( "Local URL" ), isOnDisk() ? localUrl().prettyURL() : i18n( "n/a" ) ); + //str += body.tqarg( i18n( "Title" ), m_bundle.title() ); + str += body.tqarg( i18n( "Description" ), m_bundle.description() ); + str += body.tqarg( i18n( "Date" ), m_bundle.date() ); + str += body.tqarg( i18n( "Author" ), m_bundle.author() ); + str += body.tqarg( i18n( "Type" ), m_bundle.type() ); + str += body.tqarg( i18n( "URL" ), m_bundle.url().prettyURL() ); + str += body.tqarg( i18n( "Local URL" ), isOnDisk() ? localUrl().prettyURL() : i18n( "n/a" ) ); str += "</table></body></html>"; PlaylistBrowser::instance()->setInfo( text(0), str ); @@ -2826,10 +2826,10 @@ PodcastEpisode::showContextMenu( const TQPoint &position ) { KPopupMenu menu( listView() ); - enum Actions { LOAD, APPEND, QUEUE, GET, ASSOCIATE, DELETE, MEDIA_DEVICE, LISTENED, NEW, OPEN_WITH /* has to be last */ }; + enum Actions { LOAD, APPEND, TQUEUE, GET, ASSOCIATE, DELETE, MEDIA_DEVICE, LISTENED, NEW, OPEN_WITH /* has to be last */ }; menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Track" ), QUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Track" ), TQUEUE ); int accuracy = 0; KMimeType::Ptr mimetype; @@ -2891,7 +2891,7 @@ PodcastEpisode::showContextMenu( const TQPoint &position ) PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Append ); break; - case QUEUE: + case TQUEUE: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Queue ); break; @@ -2977,14 +2977,14 @@ class AssociatePodcastDialog : public KDialogBase public: AssociatePodcastDialog( PodcastEpisode *item ) - : KDialogBase( Amarok::mainWindow(), "associatepodcastdialog", true, i18n("Select Local File for %1").arg(item->title()), Ok|Cancel, Ok, false ) + : KDialogBase( Amarok::mainWindow(), "associatepodcastdialog", true, i18n("Select Local File for %1").tqarg(item->title()), Ok|Cancel, Ok, false ) { TQVBox* vbox = makeVBoxMainWidget(); vbox->setSpacing( KDialog::spacingHint() ); m_urlRequester = new KURLRequester( vbox ); - if( dynamic_cast<PodcastChannel *>(item->parent()) ) - m_urlRequester->setURL( static_cast<PodcastChannel *>(item->parent())->saveLocation() ); + if( dynamic_cast<PodcastChannel *>(item->tqparent()) ) + m_urlRequester->setURL( static_cast<PodcastChannel *>(item->tqparent())->saveLocation() ); } KURL url() const { return KURL::fromPathOrURL( m_urlRequester->url() ); } }; @@ -3007,8 +3007,8 @@ PodcastEpisode::associateWithLocalFile() /// CLASS SmartPlaylist //////////////////////////////////////////////////////////////////////////// -SmartPlaylist::SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQString &name, const TQString &query ) - : PlaylistBrowserEntry( parent, after, name ) +SmartPlaylist::SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, const TQString &name, const TQString &query ) + : PlaylistBrowserEntry( tqparent, after, name ) , m_sqlForTags( query ) , m_title( name ) , m_dynamic( false ) @@ -3019,8 +3019,8 @@ SmartPlaylist::SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, con setText( 0, name ); } -SmartPlaylist::SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQString &name, const TQString &urls, const TQString &tags ) - : PlaylistBrowserEntry( parent, after, name ) +SmartPlaylist::SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, const TQString &name, const TQString &urls, const TQString &tags ) + : PlaylistBrowserEntry( tqparent, after, name ) , m_sqlForTags( tags ) , m_title( name ) , m_dynamic( false ) @@ -3032,8 +3032,8 @@ SmartPlaylist::SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, con } -SmartPlaylist::SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ) - : PlaylistBrowserEntry( parent, after ) +SmartPlaylist::SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition ) + : PlaylistBrowserEntry( tqparent, after ) , m_after( after ) , m_dynamic( false ) { @@ -3045,7 +3045,7 @@ SmartPlaylist::SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, con int SmartPlaylist::length() { TQString sql = query(); - sql.replace(TQRegExp("SELECT.*FROM"), "SELECT COUNT(*) FROM"); + sql.tqreplace(TQRegExp("SELECT.*FROM"), "SELECT COUNT(*) FROM"); CollectionDB *db = CollectionDB::instance(); TQStringList result = db->query( sql ); @@ -3069,7 +3069,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) static TQStringList years; static TQStringList labels; - //Delete all children before + //Delete all tqchildren before while( firstChild() ) delete firstChild(); @@ -3086,8 +3086,8 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) genres = CollectionDB::instance()->genreList(); } foreach( genres ) { - m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), - TQString(queryChildren).replace( + m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).tqarg( *it ), + TQString(queryChildren).tqreplace( "(*ExpandString*)", *it) ); } } @@ -3096,8 +3096,8 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) artists = CollectionDB::instance()->artistList(); } foreach( artists ) { - m_after = new SmartPlaylist( item, m_after, i18n( "By %1" ).arg( *it ), - TQString(queryChildren).replace( + m_after = new SmartPlaylist( item, m_after, i18n( "By %1" ).tqarg( *it ), + TQString(queryChildren).tqreplace( "(*ExpandString*)", *it) ); } } @@ -3106,8 +3106,8 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) composers = CollectionDB::instance()->composerList(); } foreach( composers ) { - m_after = new SmartPlaylist( item, m_after, i18n( "By %1" ).arg( *it ), - TQString(queryChildren).replace( + m_after = new SmartPlaylist( item, m_after, i18n( "By %1" ).tqarg( *it ), + TQString(queryChildren).tqreplace( "(*ExpandString*)", *it) ); } } @@ -3116,8 +3116,8 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) albums = CollectionDB::instance()->albumList(); } foreach( albums ) { - m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), - TQString(queryChildren).replace( + m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).tqarg( *it ), + TQString(queryChildren).tqreplace( "(*ExpandString*)", *it) ); } } @@ -3126,8 +3126,8 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) years = CollectionDB::instance()->yearList(); } foreach( years ) { - m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), - TQString(queryChildren).replace( + m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).tqarg( *it ), + TQString(queryChildren).tqreplace( "(*ExpandString*)", *it) ); } } @@ -3136,7 +3136,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) labels = CollectionDB::instance()->labelList(); } foreach( labels ) { - m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), TQString(queryChildren).replace("(*ExpandString*)", *it) ); + m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).tqarg( *it ), TQString(queryChildren).tqreplace("(*ExpandString*)", *it) ); } } } @@ -3147,20 +3147,20 @@ TQString SmartPlaylist::query() { if ( m_sqlForTags.isEmpty() ) m_sqlForTags = xmlToQuery( m_xml ); // duplicate string, thread-safely (TQDeepCopy is not thread-safe) - return TQString( m_sqlForTags.unicode(), m_sqlForTags.length() ) - .replace( "(*CurrentTimeT*)" , - TQString::number(TQDateTime::currentDateTime().toTime_t()) ) - .replace( "(*ListOfFields*)" , QueryBuilder::dragSQLFields() ) - .replace( "(*MountedDeviceSelection*)" , + return TQString( m_sqlForTags.tqunicode(), m_sqlForTags.length() ) + .tqreplace( "(*CurrentTimeT*)" , + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t()) ) + .tqreplace( "(*ListOfFields*)" , QueryBuilder::dragSTQLFields() ) + .tqreplace( "(*MountedDeviceSelection*)" , CollectionDB::instance()->deviceidSelection() ); } // static -QString +TQString SmartPlaylist::xmlToQuery(const TQDomElement &xml, bool forExpand /* = false */) { QueryBuilder qb; - qb.initSQLDrag(); + qb.initSTQLDrag(); // This code is partly copied from SmartPlaylistEditor -- but refactoring // to have it common would involve adding an internal data structure for smart // playlist queries. I think having the XML be that data structure is almost as good, @@ -3181,7 +3181,7 @@ SmartPlaylist::xmlToQuery(const TQDomElement &xml, bool forExpand /* = false */) TQDomElement criteria = criteriaList.item( j ).toElement(); TQString field = criteria.attribute( "field" ); int table; - Q_INT64 value; + TQ_INT64 value; if ( !qb.getField( field, &table, &value ) ) continue; TQStringList filters; @@ -3246,7 +3246,7 @@ SmartPlaylist::xmlToQuery(const TQDomElement &xml, bool forExpand /* = false */) } - if ( condition == i18n( "contains" ) ) + if ( condition == i18n( "tqcontains" ) ) qb.addFilter( table, value, filters[0] ); else if ( condition == i18n( "does not contain" ) ) qb.excludeFilter( table, value, filters[0]) ; @@ -3317,7 +3317,7 @@ SmartPlaylist::xmlToQuery(const TQDomElement &xml, bool forExpand /* = false */) } else { // normal sort int table; - Q_INT64 value; + TQ_INT64 value; if ( !qb.getField( field, &table, &value ) ) continue; qb.sortBy( table, value, orderby.attribute( "order" ) == "DESC" ); } @@ -3328,8 +3328,8 @@ SmartPlaylist::xmlToQuery(const TQDomElement &xml, bool forExpand /* = false */) // expand by, if needed if ( forExpand ) { - // TODO: The most efficient way would be to pass the children the XML - // and what to expand by, then have the children compute the query as needed. + // TODO: The most efficient way would be to pass the tqchildren the XML + // and what to expand by, then have the tqchildren compute the query as needed. // This could save a few megs of RAM for queries, but this patch is getting // too big already, right now. Ovy TQDomNodeList expandbyList = xml.elementsByTagName( "expandby" ); @@ -3377,8 +3377,8 @@ bool SmartPlaylist::isTimeOrdered() const TQString sql = query(); - return ! ( ( sql.find( createDate, false ) == -1 ) /*not create ordered*/ && - ( sql.find( accessDate, false ) == -1 ) /*not access ordered*/ ); + return ! ( ( sql.tqfind( createDate, false ) == -1 ) /*not create ordered*/ && + ( sql.tqfind( accessDate, false ) == -1 ) /*not access ordered*/ ); } void SmartPlaylist::slotDoubleClicked() @@ -3394,11 +3394,11 @@ void SmartPlaylist::showContextMenu( const TQPoint &position ) { KPopupMenu menu( listView() ); - enum Actions { LOAD, ADD, QUEUE, EDIT, REMOVE, MEDIADEVICE_COPY, MEDIADEVICE_SYNC }; + enum Actions { LOAD, ADD, TQUEUE, EDIT, REMOVE, MEDIADEVICE_COPY, MEDIADEVICE_SYNC }; menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), ADD ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), QUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), TQUEUE ); if( MediaBrowser::isAvailable() ) { menu.insertSeparator(); @@ -3426,7 +3426,7 @@ void SmartPlaylist::showContextMenu( const TQPoint &position ) case ADD: Playlist::instance()->insertMediaSql( query(), Playlist::Append ); break; - case QUEUE: + case TQUEUE: Playlist::instance()->insertMediaSql( query(), Playlist::Queue ); break; case EDIT: @@ -3454,8 +3454,8 @@ void SmartPlaylist::slotPostRenameItem( const TQString newName ) xml().setAttribute( "name", newName ); } -ShoutcastBrowser::ShoutcastBrowser( PlaylistCategory *parent ) - : PlaylistCategory( parent, 0, i18n( "Shoutcast Streams" ) ) +ShoutcastBrowser::ShoutcastBrowser( PlaylistCategory *tqparent ) + : PlaylistCategory( tqparent, 0, i18n( "Shoutcast Streams" ) ) , m_downloading( false ) , m_cj( 0 ) , m_loading1( new TQPixmap( locate("data", "amarok/images/loading1.png" ) ) ) @@ -3581,7 +3581,7 @@ void ShoutcastBrowser::doneGenreDownload( KIO::Job *job, const KURL &from, const { TQDomElement e = n.toElement(); // try to convert the node to an element. const TQString name = e.attribute( "name" ); - if( !name.isNull() && !bannedGenres.contains( name.lower() ) && !genreMapping.contains( name ) ) + if( !name.isNull() && !bannedGenres.tqcontains( name.lower() ) && !genreMapping.tqcontains( name ) ) { last = new ShoutcastGenre( this, last, name ); genreCache[ name ] = last; // so we can append genres later if needed @@ -3620,7 +3620,7 @@ ShoutcastGenre::ShoutcastGenre( ShoutcastBrowser *browser, TQListViewItem *after { setExpandable( true ); setKept( false ); - m_genre = genre.replace( "&", "%26" ); //fix & + m_genre = genre.tqreplace( "&", "%26" ); //fix & } void ShoutcastGenre::slotDoubleClicked() @@ -3712,7 +3712,7 @@ void ShoutcastGenre::doneListDownload( KIO::Job *job, const KURL &from, const KU TQDomElement e = n.toElement(); // try to convert the node to an element. if( e.hasAttribute( "name" ) ) { - if( !e.attribute( "name" ).isNull() && ! m_stations.contains( e.attribute( "name" ) ) ) + if( !e.attribute( "name" ).isNull() && ! m_stations.tqcontains( e.attribute( "name" ) ) ) { m_stations << e.attribute( "name" ); StreamEntry* entry = new StreamEntry( this, this, diff --git a/amarok/src/playlistbrowseritem.h b/amarok/src/playlistbrowseritem.h index e6d955e9..f4b5a984 100644 --- a/amarok/src/playlistbrowseritem.h +++ b/amarok/src/playlistbrowseritem.h @@ -50,16 +50,17 @@ namespace KIO { class Job; class TransferJob; class CopyJob; } //podcast downloa class PlaylistBrowserEntry : public TQObject, public KListViewItem { Q_OBJECT + TQ_OBJECT public: - PlaylistBrowserEntry( TQListViewItem *parent, TQListViewItem *after ) - : KListViewItem( parent, after) { m_kept = true; } - PlaylistBrowserEntry( TQListView *parent, TQListViewItem *after ) - : KListViewItem( parent, after) { m_kept = true; } - PlaylistBrowserEntry( TQListViewItem *parent, TQListViewItem *after, const TQString &name ) - : KListViewItem( parent, after, name) { m_kept = true; } + PlaylistBrowserEntry( TQListViewItem *tqparent, TQListViewItem *after ) + : KListViewItem( tqparent, after) { m_kept = true; } + PlaylistBrowserEntry( TQListView *tqparent, TQListViewItem *after ) + : KListViewItem( tqparent, after) { m_kept = true; } + PlaylistBrowserEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQString &name ) + : KListViewItem( tqparent, after, name) { m_kept = true; } virtual TQDomElement xml() const { return TQDomElement(); } - TQListViewItem* parent() const { return KListViewItem::parent(); } + TQListViewItem* tqparent() const { return KListViewItem::tqparent(); } bool isKept() const { return m_kept; } // if kept == true, then it will be saved void setKept( bool k ); // to the cache files. If false, non-renameable @@ -86,9 +87,10 @@ class PlaylistBrowserEntry : public TQObject, public KListViewItem class DynamicEntry : public PlaylistBrowserEntry, public DynamicMode { Q_OBJECT + TQ_OBJECT public: - DynamicEntry( TQListViewItem *parent, TQListViewItem *after, const TQString &title ); - DynamicEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ); + DynamicEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQString &title ); + DynamicEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition ); ~DynamicEntry() { }; virtual TQString text( int column ) const; @@ -106,12 +108,13 @@ class DynamicEntry : public PlaylistBrowserEntry, public DynamicMode class PlaylistCategory : public PlaylistBrowserEntry { Q_OBJECT + TQ_OBJECT public: - PlaylistCategory( TQListView *parent, TQListViewItem *after, const TQString &, bool isFolder=false ); - PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQString &, bool isFolder=true ); - PlaylistCategory( TQListView *parent, TQListViewItem *after, const TQDomElement &xmlDefinition, bool isFolder=false); - PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ); - PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQString &t, const int id ); + PlaylistCategory( TQListView *tqparent, TQListViewItem *after, const TQString &, bool isFolder=false ); + PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *after, const TQString &, bool isFolder=true ); + PlaylistCategory( TQListView *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition, bool isFolder=false); + PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition ); + PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *after, const TQString &t, const int id ); ~PlaylistCategory() { }; @@ -149,17 +152,18 @@ class PlaylistCategory : public PlaylistBrowserEntry class PlaylistEntry : public PlaylistBrowserEntry { Q_OBJECT + TQ_OBJECT friend class PlaylistTrackItem; friend class TrackItemInfo; friend class PlaylistCategory; public: - PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &, int tracks=0, int length=0 ); - PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ); + PlaylistEntry( TQListViewItem *tqparent, TQListViewItem *after, const KURL &, int tracks=0, int length=0 ); + PlaylistEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition ); ~PlaylistEntry(); - void sortChildItems ( int /*column*/, bool /*ascending*/ ) { /* Don't sort its children */ }; //reimplemented + void sortChildItems ( int /*column*/, bool /*ascending*/ ) { /* Don't sort its tqchildren */ }; //reimplemented void load(); @@ -230,10 +234,11 @@ class PlaylistEntry : public PlaylistBrowserEntry class PlaylistTrackItem : public PlaylistBrowserEntry { Q_OBJECT + TQ_OBJECT friend class TrackItemInfo; public: - PlaylistTrackItem( TQListViewItem *parent, TQListViewItem *after, TrackItemInfo *info ); + PlaylistTrackItem( TQListViewItem *tqparent, TQListViewItem *after, TrackItemInfo *info ); const KURL &url(); TrackItemInfo *trackInfo() const { return m_trackInfo; } @@ -254,15 +259,16 @@ class PlaylistTrackItem : public PlaylistBrowserEntry class PodcastEpisode : public PlaylistBrowserEntry { Q_OBJECT + TQ_OBJECT public: - PodcastEpisode( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xml, + PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xml, const int feedType, const bool &isNew=false ); - PodcastEpisode( TQListViewItem *parent, TQListViewItem *after, PodcastEpisodeBundle &bundle ); + PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after, PodcastEpisodeBundle &bundle ); void downloadMedia(); void setOnDisk( bool d = true ); - TQListViewItem *itemChannel() { return m_parent; } + TQListViewItem *itemChannel() { return m_tqparent; } const bool isNew() const { return m_bundle.isNew(); } @@ -322,7 +328,7 @@ class PodcastEpisode : public PlaylistBrowserEntry void stopAnimation(); void updatePixmap(); - TQListViewItem *m_parent; //podcast channel it belongs to + TQListViewItem *m_tqparent; //podcast channel it belongs to PodcastEpisodeBundle m_bundle; KURL m_localUrl; @@ -341,26 +347,27 @@ class PodcastEpisode : public PlaylistBrowserEntry class PodcastChannel : public PlaylistBrowserEntry { Q_OBJECT + TQ_OBJECT public: - PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const KURL &url, + PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url, const TQDomNode &channelSettings ); - PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const KURL &url ); - PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const KURL &url, + PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url ); + PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url, const TQDomNode &channelSettings, const TQDomDocument &xml ); - PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const PodcastChannelBundle &pcb ); + PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const PodcastChannelBundle &pcb ); enum MediaFetch{ STREAM=0, AUTOMATIC=1 }; void setNew( const bool n = true ); bool hasNew() const { return m_new; } - // iterate over all children and explicitly check if there are any episodes which have not been listened + // iterate over all tqchildren and explicitly check if there are any episodes which have not been listened // to. Mark the channel as new/listened after doing this. void checkAndSetNew(); void setListened( const bool n = true ); // over rides each child so it has been listened - void setOpen( bool open ); // if !m_polished, load the children. Lazy loading to improve start times + void setOpen( bool open ); // if !m_polished, load the tqchildren. Lazy loading to improve start times void load(); const bool isPolished() const { return m_polished; } @@ -436,7 +443,7 @@ class PodcastChannel : public PlaylistBrowserEntry bool m_hasProblem; KIO::TransferJob *m_podcastJob; - PlaylistCategory *m_parent; // category it belongs to + PlaylistCategory *m_tqparent; // category it belongs to TQString m_podcastCurrentUrl; TQPtrList<PodcastEpisode> m_podcastDownloadQueue; bool m_settingsValid; @@ -445,9 +452,10 @@ class PodcastChannel : public PlaylistBrowserEntry class StreamEntry : public PlaylistBrowserEntry { Q_OBJECT + TQ_OBJECT public: - StreamEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &, const TQString &t ); - StreamEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ); + StreamEntry( TQListViewItem *tqparent, TQListViewItem *after, const KURL &, const TQString &t ); + StreamEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition ); ~StreamEntry() { }; void setURL ( KURL u ) { m_url = u; } @@ -478,11 +486,12 @@ class StreamEntry : public PlaylistBrowserEntry class LastFmEntry : public StreamEntry { Q_OBJECT + TQ_OBJECT public: - LastFmEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &u, const TQString &t ) - : StreamEntry( parent, after, u, t ) { } - LastFmEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ) - : StreamEntry( parent, after, xmlDefinition ) { } + LastFmEntry( TQListViewItem *tqparent, TQListViewItem *after, const KURL &u, const TQString &t ) + : StreamEntry( tqparent, after, u, t ) { } + LastFmEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition ) + : StreamEntry( tqparent, after, xmlDefinition ) { } virtual TQDomElement xml() const; public slots: @@ -496,10 +505,10 @@ class LastFmEntry : public StreamEntry class StreamEditor : public KDialogBase { public: - StreamEditor( TQWidget *parent, const TQString &title, const TQString &url, bool readonly = false ); + StreamEditor( TQWidget *tqparent, const TQString &title, const TQString &url, bool readonly = false ); KURL url() const { return KURL( m_urlLineEdit->text() ); } - TQString name() const { return m_nameLineEdit->text().replace( "\n", " " ); } + TQString name() const { return m_nameLineEdit->text().tqreplace( "\n", " " ); } private: KLineEdit *m_urlLineEdit; @@ -510,11 +519,12 @@ class StreamEditor : public KDialogBase class SmartPlaylist : public PlaylistBrowserEntry { Q_OBJECT + TQ_OBJECT public: - SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQString &name, const TQString &query ); - SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQString &name, + SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, const TQString &name, const TQString &query ); + SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, const TQString &name, const TQString &urls, const TQString &tags ); - SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ); + SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition ); bool isDynamic() const { return m_dynamic; } bool isEditable() const { return !m_xml.isNull(); } @@ -545,7 +555,7 @@ class SmartPlaylist : public PlaylistBrowserEntry bool m_dynamic; // Build the query for a given xml object. If \p for expand is true, - // insert (*ExpandString*) as placeholders for childrens' filters + // insert (*ExpandString*) as placeholders for tqchildrens' filters static TQString xmlToQuery( const TQDomElement &xml, bool forExpand = false ); }; @@ -580,8 +590,9 @@ class TrackItemInfo class ShoutcastBrowser : public PlaylistCategory { Q_OBJECT + TQ_OBJECT public: - ShoutcastBrowser( PlaylistCategory* parent ); + ShoutcastBrowser( PlaylistCategory* tqparent ); void setOpen( bool open ); public slots: @@ -609,6 +620,7 @@ class ShoutcastBrowser : public PlaylistCategory class ShoutcastGenre : public PlaylistCategory { Q_OBJECT + TQ_OBJECT public: ShoutcastGenre( ShoutcastBrowser *browser, TQListViewItem *after, TQString genre ); void setOpen( bool open ); diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp index 74af7ca5..85888d75 100644 --- a/amarok/src/playlistitem.cpp +++ b/amarok/src/playlistitem.cpp @@ -48,8 +48,8 @@ #include "playlistitem.h" double PlaylistItem::glowIntensity; -TQColor PlaylistItem::glowText = Qt::white; -TQColor PlaylistItem::glowBase = Qt::white; +TQColor PlaylistItem::glowText = TQt::white; +TQColor PlaylistItem::glowBase = TQt::white; bool PlaylistItem::s_pixmapChanged = false; @@ -213,7 +213,7 @@ bool PlaylistItem::isQueued() const int PlaylistItem::queuePosition() const { - return listView()->m_nextTracks.findRef( this ); + return listView()->m_nextTracks.tqfindRef( this ); } void PlaylistItem::setEnabled() @@ -379,12 +379,12 @@ int PlaylistItem::ratingColumnWidth() //static void PlaylistItem::update() const { - listView()->repaintItem( this ); + listView()->tqrepaintItem( this ); } void PlaylistItem::updateColumn( int column ) const { - const TQRect r = listView()->itemRect( this ); + const TQRect r = listView()->tqitemRect( this ); if( !r.isValid() ) return; @@ -410,7 +410,7 @@ PlaylistItem::nextInAlbum() const { if( !m_album ) return 0; - const int index = m_album->tracks.findRef( this ); + const int index = m_album->tracks.tqfindRef( this ); if( index == int(m_album->tracks.count() - 1) ) return 0; if( index != -1 ) @@ -434,7 +434,7 @@ PlaylistItem::prevInAlbum() const { if( !m_album ) return 0; - const int index = m_album->tracks.findRef( this ); + const int index = m_album->tracks.tqfindRef( this ); if( index == 0 ) return 0; if( index != -1 ) @@ -507,9 +507,9 @@ PlaylistItem::compare( TQListViewItem *i, int col, bool ascending ) const return compare( i, Album, ascending ); else { - if( a.startsWith( "the ", false ) ) + if( a.tqstartsWith( "the ", false ) ) a = a.mid( 4 ); - if( b.startsWith( "the ", false ) ) + if( b.tqstartsWith( "the ", false ) ) b = b.mid( 4 ); } break; @@ -529,7 +529,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co //TODO add spacing on either side of items //p->translate( 2, 0 ); width -= 3; - // Don't try to draw if width or height is 0, as this crashes Qt + // Don't try to draw if width or height is 0, as this crashes TQt if( !painter || !listView() || width <= 0 || height() == 0 ) return; @@ -575,8 +575,8 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co s_pixmapChanged = false; } - // Determine if we need to repaint the pixmap, or paint from cache - if ( paintCache[column].map.find( colorKey ) == paintCache[column].map.end() ) + // Determine if we need to tqrepaint the pixmap, or paint from cache + if ( paintCache[column].map.tqfind( colorKey ) == paintCache[column].map.end() ) { // Update painting cache paintCache[column].width = width; @@ -588,7 +588,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co TQColor bg; if( isSelected() ) - bg = listView()->colorGroup().highlight(); + bg = listView()->tqcolorGroup().highlight(); else bg = isAlternate() ? listView()->alternateBackground() : listView()->viewport()->backgroundColor(); @@ -596,7 +596,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co buf.fill( bg ); // Draw column divider line - p.setPen( listView()->viewport()->colorGroup().mid() ); + p.setPen( listView()->viewport()->tqcolorGroup().mid() ); p.drawLine( width - 1, 0, width - 1, height() - 1 ); // Here we draw the background bar graphics for the current track: @@ -613,7 +613,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co // Left part if( column == listView()->m_firstColumn ) { - TQImage tmpImage = currentTrackLeft.smoothScale( 1, height(), TQImage::ScaleMax ); + TQImage tmpImage = currentTrackLeft.smoothScale( 1, height(), TQ_ScaleMax ); KIconEffect::colorize( tmpImage, glowBase, colorize ); imageTransparency( tmpImage, intensity ); p.drawImage( 0, 0, tmpImage, 0, 0, tmpImage.width() - 1 ); //HACK @@ -625,7 +625,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co else if( column == Playlist::instance()->mapToLogicalColumn( Playlist::instance()->numVisibleColumns() - 1 ) ) { - TQImage tmpImage = currentTrackRight.smoothScale( 1, height(), TQImage::ScaleMax ); + TQImage tmpImage = currentTrackRight.smoothScale( 1, height(), TQ_ScaleMax ); KIconEffect::colorize( tmpImage, glowBase, colorize ); imageTransparency( tmpImage, intensity ); p.drawImage( width - tmpImage.width(), 0, tmpImage ); @@ -649,8 +649,8 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co leftMargin += pixmap( column )->width() + 2; } - if( align != Qt::AlignCenter ) - align |= Qt::AlignVCenter; + if( align != TQt::AlignCenter ) + align |= TQt::AlignVCenter; if( column != Rating && moodbarType != 1 ) @@ -690,8 +690,8 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co else { const TQColorGroup _cg = ( !exists() || !isEnabled() ) - ? listView()->palette().disabled() - : listView()->palette().active(); + ? listView()->tqpalette().disabled() + : listView()->tqpalette().active(); TQColor bg = isSelected() ? _cg.highlight() : isAlternate() ? listView()->alternateBackground() @@ -703,7 +703,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co Copyright (C) 2000 Reginald Stadlbauer <reggie@kde.org> Copyright (C) 2000,2003 Charles Samuels <charles@kde.org> Copyright (C) 2000 Peter Putzer */ - if ( bg == Qt::black ) + if ( bg == TQt::black ) bg = TQColor(55, 55, 55); // dark gray else { @@ -724,7 +724,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co // Draw column divider line if( !isSelected() ) { - p.setPen( listView()->viewport()->colorGroup().mid() ); + p.setPen( listView()->viewport()->tqcolorGroup().mid() ); p.drawLine( width - 1, 0, width - 1, height() - 1 ); } @@ -735,8 +735,8 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co leftMargin += pixmap( column )->width(); } - if( align != Qt::AlignCenter ) - align |= Qt::AlignVCenter; + if( align != TQt::AlignCenter ) + align |= TQt::AlignVCenter; if( column == Rating ) drawRating( &p ); @@ -762,7 +762,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co } } /// Track action symbols - const int queue = listView()->m_nextTracks.findRef( this ) + 1; + const int queue = listView()->m_nextTracks.tqfindRef( this ) + 1; const bool stop = ( this == listView()->m_stopAfterTrack ); const bool repeat = Amarok::repeatTrack() && isCurrent; @@ -815,13 +815,13 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co //TODO the shadow is hard to do well when using a dark font color //TODO it also looks cluttered for small font sizes //p->setPen( cg.highlightedText().dark() ); - //p->drawText( width - w + 2, 3, w, h-1, Qt::AlignCenter, str ); + //p->drawText( width - w + 2, 3, w, h-1, TQt::AlignCenter, str ); if( !multi ) tmp = -(qh / 2); y += tmp; p.setPen( cg.highlightedText() ); - p.drawText( x, y, -x + width, multi ? h/2 : qh, Qt::AlignCenter, str ); + p.drawText( x, y, -x + width, multi ? h/2 : qh, TQt::AlignCenter, str ); y -= tmp; if( isCurrent ) y -= height() / 2; @@ -859,7 +859,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co if( this != listView()->currentTrack() && !isSelected() ) { - p.setPen( TQPen( cg.mid(), 0, Qt::SolidLine ) ); + p.setPen( TQPen( cg.mid(), 0, TQt::SolidLine ) ); p.drawLine( width - 1, 0, width - 1, height() - 1 ); } @@ -934,7 +934,7 @@ void PlaylistItem::moodbarJobEvent( int newState ) { (void) newState; // want to redraw nomatter what the new state is if( AmarokConfig::showMoodbar() ) - repaint(); + tqrepaint(); // Don't automatically resort because it's annoying } @@ -984,7 +984,7 @@ void PlaylistItem::imageTransparency( TQImage& image, float factor ) //static // Process all pixels. Highly optimized. for( int i = 0; i < pixels; ++i ) { c = data[i]; // Memory access is slow, so do it only once - data[i] = qRgba( qRed( c ), qGreen( c ), qBlue( c ), table[qAlpha( c )] ); + data[i] = tqRgba( tqRed( c ), tqGreen( c ), tqBlue( c ), table[tqAlpha( c )] ); } } @@ -1001,7 +1001,7 @@ void PlaylistItem::refAlbum() { if( Amarok::entireAlbums() ) { - if( listView()->m_albums[artist_album()].find( album() ) == listView()->m_albums[artist_album()].end() ) + if( listView()->m_albums[artist_album()].tqfind( album() ) == listView()->m_albums[artist_album()].end() ) listView()->m_albums[artist_album()][album()] = new PlaylistAlbum; m_album = listView()->m_albums[artist_album()][album()]; m_album->refcount++; @@ -1049,14 +1049,14 @@ void PlaylistItem::incrementTotals() m_album->tracks.insert( i, this ); break; } - const Q_INT64 prevTotal = m_album->total; - Q_INT64 total = m_album->total * prevCount; + const TQ_INT64 prevTotal = m_album->total; + TQ_INT64 total = m_album->total * prevCount; total += totalIncrementAmount(); - m_album->total = Q_INT64( double( total + 0.5 ) / m_album->tracks.count() ); - if( listView()->m_prevAlbums.findRef( m_album ) == -1 ) + m_album->total = TQ_INT64( double( total + 0.5 ) / m_album->tracks.count() ); + if( listView()->m_prevAlbums.tqfindRef( m_album ) == -1 ) listView()->m_total = listView()->m_total - prevTotal + m_album->total; } - else if( listView()->m_prevTracks.findRef( this ) == -1 ) + else if( listView()->m_prevTracks.tqfindRef( this ) == -1 ) listView()->m_total += totalIncrementAmount(); } @@ -1064,16 +1064,16 @@ void PlaylistItem::decrementTotals() { if( Amarok::entireAlbums() && m_album ) { - const Q_INT64 prevTotal = m_album->total; - Q_INT64 total = m_album->total * m_album->tracks.count(); + const TQ_INT64 prevTotal = m_album->total; + TQ_INT64 total = m_album->total * m_album->tracks.count(); if (!m_album->tracks.removeRef( this )) warning() << "Unable to remove myself from m_album" << endl; total -= totalIncrementAmount(); - m_album->total = Q_INT64( double( total + 0.5 ) / m_album->tracks.count() ); - if( listView()->m_prevAlbums.findRef( m_album ) == -1 ) + m_album->total = TQ_INT64( double( total + 0.5 ) / m_album->tracks.count() ); + if( listView()->m_prevAlbums.tqfindRef( m_album ) == -1 ) listView()->m_total = listView()->m_total - prevTotal + m_album->total; } - else if( listView()->m_prevTracks.findRef( this ) == -1 ) + else if( listView()->m_prevTracks.tqfindRef( this ) == -1 ) listView()->m_total -= totalIncrementAmount(); } diff --git a/amarok/src/playlistitem.h b/amarok/src/playlistitem.h index a3640c82..3477906b 100644 --- a/amarok/src/playlistitem.h +++ b/amarok/src/playlistitem.h @@ -3,7 +3,7 @@ //NOTE please show restraint when adding data members to this class! // some users have playlists with 20,000 items or more in, one 32 bit int adds up rapidly! -// -- on second thought, 80KB isn't all that much. be careful with QStrings, though. +// -- on second thought, 80KB isn't all that much. be careful with TQStrings, though. #ifndef PLAYLISTITEM_H @@ -96,7 +96,7 @@ class LIBAMAROK_EXPORT PlaylistItem : public MetaBundle, public KListViewItem //updates only the area of a specific column, avoids flickering of the current item marker void updateColumn( int column ) const; - virtual void setup(); // from QListViewItem + virtual void setup(); // from TQListViewItem virtual bool operator== ( const PlaylistItem & item ) const; virtual bool operator< ( const PlaylistItem & item ) const; diff --git a/amarok/src/playlistloader.cpp b/amarok/src/playlistloader.cpp index 22cafbf3..e4d30469 100644 --- a/amarok/src/playlistloader.cpp +++ b/amarok/src/playlistloader.cpp @@ -73,7 +73,7 @@ public: UrlLoader::UrlLoader( const KURL::List &urls, TQListViewItem *after, int options ) - : ThreadManager::DependentJob( Playlist::instance(), "UrlLoader" ) + : ThreadManager::DependentJob( TQT_TQOBJECT(Playlist::instance()), "UrlLoader" ) , m_markerListViewItem( new PlaylistItem( Playlist::instance(), after ) ) , m_playFirstUrl( options & (Playlist::StartPlay | Playlist::DirectPlay) ) , m_coloring( options & Playlist::Colorize ) @@ -94,7 +94,7 @@ UrlLoader::UrlLoader( const KURL::List &urls, TQListViewItem *after, int options Amarok::StatusBar::instance()->newProgressOperation( this ) .setDescription( m_description ) - .setStatus( i18n("Preparing") ) + .settqStatus( i18n("Preparing") ) .setAbortSlot( this, TQT_SLOT(abort()) ) .setTotalSteps( 100 ); @@ -135,7 +135,7 @@ UrlLoader::UrlLoader( const KURL::List &urls, TQListViewItem *after, int options // url looks like media:/device/path DCOPRef mediamanager( "kded", "mediamanager" ); TQString device = path.mid( 1 ); // remove first slash - const int slash = device.find( '/' ); + const int slash = device.tqfind( '/' ); const TQString filePath = device.mid( slash ); // extract relative path device = device.left( slash ); // extract device DCOPReply reply = mediamanager.call( "properties(TQString)", device ); @@ -285,7 +285,7 @@ UrlLoader::customEvent( TQCustomEvent *e) // Append foo values and replace with correct values later. m_nextTracks.append( item ); - m_nextTracks.replace( (*it).queue - 1, item ); + m_nextTracks.tqreplace( (*it).queue - 1, item ); } } if( (*it).stopafter ) @@ -312,7 +312,7 @@ UrlLoader::completeJob() TQPtrListIterator<PlaylistItem> it( newQueue ); PLItemList added; for( it.toFirst(); *it; ++it ) - if( !m_oldQueue.containsRef( *it ) ) + if( !m_oldQueue.tqcontainsRef( *it ) ) added << (*it); if( !added.isEmpty() ) @@ -324,9 +324,9 @@ UrlLoader::completeJob() for ( uint it = 0; it < m_badURLs.count(); it++ ) { if( it < 5 ) - text += TQString("<br>%1").arg( m_badURLs[it].prettyURL() ); + text += TQString("<br>%1").tqarg( m_badURLs[it].prettyURL() ); else if( it == 5 ) - text += TQString("<br>Plus %1 more").arg( m_badURLs.count() - it ); + text += TQString("<br>Plus %1 more").tqarg( m_badURLs.count() - it ); debug() << "\t" << m_badURLs[it] << endl; } @@ -515,7 +515,7 @@ void UrlLoader::slotPlaylistInfo( const TQString &, const TQString &version, con "and this version can no longer read it.\n" "You will have to create a new one.\n" "Sorry :(" ) ); - static_cast<MyXmlLoader*>( const_cast<TQObject*>( sender() ) )->abort(); //HACK? + static_cast<MyXmlLoader*>( const_cast<TQT_BASE_OBJECT_NAME*>( sender() ) )->abort(); //HACK? return; } else @@ -558,7 +558,7 @@ PlaylistFile::PlaylistFile( const TQString &path ) bool PlaylistFile::loadM3u( TQTextStream &stream ) { - const TQString directory = m_path.left( m_path.findRev( '/' ) + 1 ); + const TQString directory = m_path.left( m_path.tqfindRev( '/' ) + 1 ); MetaBundle b; for( TQString line; !stream.atEnd(); ) @@ -630,7 +630,7 @@ PlaylistFile::loadPls( TQTextStream &stream ) continue; lines.append(tmp); - if (tmp.contains(regExp_File)) { + if (tmp.tqcontains(regExp_File)) { entryCnt++; continue; } @@ -638,8 +638,8 @@ PlaylistFile::loadPls( TQTextStream &stream ) havePlaylistSection = true; continue; } - if (tmp.contains(regExp_NumberOfEntries)) { - numberOfEntries = tmp.section('=', -1).stripWhiteSpace().toUInt(); + if (tmp.tqcontains(regExp_NumberOfEntries)) { + numberOfEntries = TQString(tmp.section('=', -1)).stripWhiteSpace().toUInt(); continue; } } @@ -675,43 +675,43 @@ PlaylistFile::loadPls( TQTextStream &stream ) inPlaylistSection = true; continue; } - if ((*i).contains(regExp_File)) { + if ((*i).tqcontains(regExp_File)) { // Have a "File#=XYZ" line. index = loadPls_extractIndex(*i); if (index > numberOfEntries || index == 0) continue; - tmp = (*i).section('=', 1).stripWhiteSpace(); + tmp = TQString((*i).section('=', 1)).stripWhiteSpace(); m_bundles[index - 1].setUrl(KURL::fromPathOrURL(tmp)); // Ensure that if the entry has no title, we show at least the URL as title m_bundles[index - 1].setTitle(tmp); continue; } - if ((*i).contains(regExp_Title)) { + if ((*i).tqcontains(regExp_Title)) { // Have a "Title#=XYZ" line. index = loadPls_extractIndex(*i); if (index > numberOfEntries || index == 0) continue; - tmp = (*i).section('=', 1).stripWhiteSpace(); + tmp = TQString((*i).section('=', 1)).stripWhiteSpace(); m_bundles[index - 1].setTitle(tmp); continue; } - if ((*i).contains(regExp_Length)) { + if ((*i).tqcontains(regExp_Length)) { // Have a "Length#=XYZ" line. index = loadPls_extractIndex(*i); if (index > numberOfEntries || index == 0) continue; - tmp = (*i).section('=', 1).stripWhiteSpace(); + tmp = TQString((*i).section('=', 1)).stripWhiteSpace(); m_bundles[index - 1].setLength(tmp.toInt(&ok)); Q_ASSERT(ok); continue; } - if ((*i).contains(regExp_NumberOfEntries)) { + if ((*i).tqcontains(regExp_NumberOfEntries)) { // Have the "NumberOfEntries=#" line. continue; } - if ((*i).contains(regExp_Version)) { + if ((*i).tqcontains(regExp_Version)) { // Have the "Version=#" line. - tmp = (*i).section('=', 1).stripWhiteSpace(); + tmp = TQString((*i).section('=', 1)).stripWhiteSpace(); // We only support Version=2 if (tmp.toUInt(&ok) != 2) warning() << ".pls playlist: Unsupported version." << endl; @@ -829,7 +829,7 @@ PlaylistFile::loadASX( TQTextStream &stream ) TQRegExp ex("(<[/]?[^>]*[A-Z]+[^>]*>)"); ex.setCaseSensitive(true); while ( (ex.search(content)) != -1 ) - content.replace(ex.cap( 1 ), ex.cap( 1 ).lower()); + content.tqreplace(ex.cap( 1 ), TQString(ex.cap( 1 )).lower()); if (!doc.setContent(content, &errorMsg, &errorLine, &errorColumn)) @@ -855,9 +855,9 @@ PlaylistFile::loadASX( TQTextStream &stream ) while (!node.isNull()) { - url = TQString::null; - title = TQString::null; - author = TQString::null; + url = TQString(); + title = TQString(); + author = TQString(); length = TQTime(); if (node.nodeName().lower() == "entry") { @@ -878,7 +878,7 @@ PlaylistFile::loadASX( TQTextStream &stream ) } if ((subNode.nodeName().lower() == "duration") && (subNode.isElement())) { - duration = TQString::null; + duration = TQString(); element = subNode.toElement(); if (element.hasAttribute("value")) duration = element.attribute("value"); @@ -943,7 +943,7 @@ PlaylistFile::loadSMIL( TQTextStream &stream ) { MetaBundle b; node = nodeList.item(i); - url = TQString::null; + url = TQString(); if( (node.nodeName().lower() == "audio") && (node.isElement()) ) { element = node.toElement(); @@ -982,7 +982,7 @@ RemotePlaylistFetcher::RemotePlaylistFetcher( const KURL &source, TQListViewItem { //We keep the extension so the UrlLoader knows what file type it is const TQString path = source.path(); - m_temp = new KTempFile( TQString::null /*use default prefix*/, path.mid( path.findRev( '.' ) ) ); + m_temp = new KTempFile( TQString() /*use default prefix*/, path.mid( path.tqfindRev( '.' ) ) ); m_temp->setAutoDelete( true ); m_destination.setPath( m_temp->name() ); diff --git a/amarok/src/playlistloader.h b/amarok/src/playlistloader.h index d1509a1f..a08c3beb 100644 --- a/amarok/src/playlistloader.h +++ b/amarok/src/playlistloader.h @@ -100,9 +100,16 @@ PlaylistFile::format( const TQString &fileName ) * + List directories, remote and local * + Read tags, from file:/// and from DB */ +#ifdef Q_MOC_RUN +// MOC_SKIP_BEGIN +class UrlLoader : public JobBase +// MOC_SKIP_END +#else // Q_MOC_RUN class UrlLoader : public ThreadManager::DependentJob +#endif // Q_MOC_RUN { -Q_OBJECT + Q_OBJECT + TQ_OBJECT public: UrlLoader( const KURL::List&, TQListViewItem*, int options = 0 ); @@ -171,9 +178,10 @@ public: * @author Max Howell * @short Fetches a playlist-file from any location, and then loads it into the Playlist-view */ -class RemotePlaylistFetcher : public QObject +class RemotePlaylistFetcher : public TQObject { Q_OBJECT + TQ_OBJECT const KURL m_source; KURL m_destination; @@ -191,11 +199,12 @@ private slots: void abort() { delete this; } }; -// PRIVATE -- should be in the .cpp, but fucking moc. +// PRIVATE -- should be in the .cpp, but fucking tqmoc. class MyXmlLoader: public MetaBundle::XmlLoader { Q_OBJECT + TQ_OBJECT public: MyXmlLoader() { } virtual bool startElement( const TQString&, const TQString&, const TQString &, const TQXmlAttributes& ); diff --git a/amarok/src/playlistselection.cpp b/amarok/src/playlistselection.cpp index aaad2ea0..c0e3b690 100644 --- a/amarok/src/playlistselection.cpp +++ b/amarok/src/playlistselection.cpp @@ -31,8 +31,8 @@ #include <klistview.h> #include <klocale.h> -PlaylistSelection::PlaylistSelection( TQWidget* parent, const char* name ) - : KListView( parent, name ) +PlaylistSelection::PlaylistSelection( TQWidget* tqparent, const char* name ) + : KListView( tqparent, name ) { addColumn( i18n("Select Playlists") ); setRootIsDecorated( true ); @@ -71,9 +71,9 @@ void PlaylistSelection::loadChildren( TQListViewItem* browserParent, TQListViewI //////////////////////////////// namespace ConfigDynamic { - KDialogBase* basicDialog( TQWidget* parent ) + KDialogBase* basicDialog( TQWidget* tqparent ) { - KDialogBase* dialog = new KDialogBase( parent, "new dynamic", true, + KDialogBase* dialog = new KDialogBase( tqparent, "new dynamic", true, i18n("Create Dynamic Playlist"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ); @@ -82,14 +82,14 @@ namespace ConfigDynamic NewDynamic* nd = new NewDynamic( dialog, "new dynamic"); //TQSizePolicy policy; //policy.setHorData(TQSizePolicy::Maximum); - //dialog->setSizePolicy(policy); + //dialog->tqsetSizePolicy(policy); dialog->setMainWidget( nd ); return dialog; } - void dynamicDialog( TQWidget* parent ) + void dynamicDialog( TQWidget* tqparent ) { - KDialogBase* dialog = basicDialog( parent ); + KDialogBase* dialog = basicDialog( tqparent ); NewDynamic* nd = static_cast<NewDynamic*>(dialog->mainWidget()); nd->m_mixLabel->setText( i18n("Add Dynamic Playlist") ); @@ -97,9 +97,9 @@ namespace ConfigDynamic addDynamic( nd ); } - void editDynamicPlaylist( TQWidget* parent, DynamicMode* mode ) + void editDynamicPlaylist( TQWidget* tqparent, DynamicMode* mode ) { - KDialogBase* dialog = basicDialog( parent ); + KDialogBase* dialog = basicDialog( tqparent ); NewDynamic* nd = static_cast<NewDynamic*>(dialog->mainWidget()); nd->m_name->setText( mode->title() ); @@ -123,7 +123,7 @@ namespace ConfigDynamic else //if its a suggested song or a random mix... { nd->selectPlaylist->hide(); - nd->layout()->remove( nd->selectPlaylist ); + nd->tqlayout()->remove( nd->selectPlaylist ); // don't allow editing the name of the default random and suggested dynamics nd->m_name->hide(); nd->m_playlistName_label->hide(); @@ -138,7 +138,7 @@ namespace ConfigDynamic } nd->updateGeometry(); - dialog->resize( nd->minimumSizeHint() ); + dialog->resize( nd->tqminimumSizeHint() ); if( dialog->exec() == TQDialog::Accepted ) { @@ -151,7 +151,7 @@ namespace ConfigDynamic void loadDynamicMode( DynamicMode* saveMe, NewDynamic* dialog ) { - saveMe->setTitle( dialog->m_name->text().replace( "\n", " " ) ); + saveMe->setTitle( dialog->m_name->text().tqreplace( "\n", " " ) ); saveMe->setCycleTracks( dialog->m_cycleTracks->isChecked() ); saveMe->setUpcomingCount( dialog->m_upcomingIntSpinBox->value() ); saveMe->setPreviousCount( dialog->m_previousIntSpinBox->value() ); @@ -171,14 +171,14 @@ namespace ConfigDynamic void addDynamic( NewDynamic* dialog ) { - TQListViewItem *parent = PlaylistBrowser::instance()->getDynamicCategory(); - DynamicEntry *saveMe = new DynamicEntry( parent, 0, dialog->m_name->text().replace( "\n", " " ) ); + TQListViewItem *tqparent = PlaylistBrowser::instance()->getDynamicCategory(); + DynamicEntry *saveMe = new DynamicEntry( tqparent, 0, dialog->m_name->text().tqreplace( "\n", " " ) ); saveMe->setAppendType( DynamicMode::CUSTOM ); loadDynamicMode( saveMe, dialog ); - parent->sortChildItems( 0, true ); - parent->setOpen( true ); + tqparent->sortChildItems( 0, true ); + tqparent->setOpen( true ); PlaylistBrowser::instance()->saveDynamics(); } @@ -187,13 +187,13 @@ namespace ConfigDynamic //////////////////////////////// /// SelectionListItem //////////////////////////////// -SelectionListItem::SelectionListItem( TQCheckListItem * parent, const TQString& text, TQListViewItem* browserEquivalent ) - : TQCheckListItem( parent, text, TQCheckListItem::CheckBox ) +SelectionListItem::SelectionListItem( TQCheckListItem * tqparent, const TQString& text, TQListViewItem* browserEquivalent ) + : TQCheckListItem( tqparent, text, TQCheckListItem::CheckBox ) , m_browserEquivalent( browserEquivalent ) { } -SelectionListItem::SelectionListItem( TQListViewItem * parent, const TQString& text, TQListViewItem* browserEquivalent ) - : TQCheckListItem( parent, text, TQCheckListItem::CheckBox ) +SelectionListItem::SelectionListItem( TQListViewItem * tqparent, const TQString& text, TQListViewItem* browserEquivalent ) + : TQCheckListItem( tqparent, text, TQCheckListItem::CheckBox ) , m_browserEquivalent( browserEquivalent ) { } @@ -207,14 +207,14 @@ void SelectionListItem::stateChange( bool b ) } } -QString +TQString SelectionListItem::name() const { - TQString fullName = text(0).replace('/', "\\/"); - TQListViewItem *p = parent(); + TQString fullName = text(0).tqreplace('/', "\\/"); + TQListViewItem *p = tqparent(); while ( p ) { - fullName.prepend( p->text(0).replace('/', "\\/") + "/" ); - p = p->parent(); + fullName.prepend( p->text(0).tqreplace('/', "\\/") + "/" ); + p = p->tqparent(); } return fullName; } diff --git a/amarok/src/playlistselection.h b/amarok/src/playlistselection.h index c0830095..e1d2844b 100644 --- a/amarok/src/playlistselection.h +++ b/amarok/src/playlistselection.h @@ -20,11 +20,12 @@ class DynamicMode; class PlaylistSelection : public KListView { Q_OBJECT + TQ_OBJECT public: - PlaylistSelection(TQWidget* parent, const char* name); - virtual TQSize sizeHint() const + PlaylistSelection(TQWidget* tqparent, const char* name); + virtual TQSize tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } private: @@ -34,18 +35,18 @@ class PlaylistSelection : public KListView namespace ConfigDynamic { void addDynamic( NewDynamic* dialog ); - void dynamicDialog( TQWidget* parent ); - void editDynamicPlaylist( TQWidget* parent, DynamicMode* mode ); + void dynamicDialog( TQWidget* tqparent ); + void editDynamicPlaylist( TQWidget* tqparent, DynamicMode* mode ); void loadDynamicMode( DynamicMode* saveMe, NewDynamic* dialog ); - KDialogBase* basicDialog( TQWidget* parent ); + KDialogBase* basicDialog( TQWidget* tqparent ); } -class SelectionListItem : public QCheckListItem +class SelectionListItem : public TQCheckListItem { public: - SelectionListItem( TQListViewItem * parent, const TQString& text, TQListViewItem* browserEquivalent ); - SelectionListItem( TQCheckListItem * parent, const TQString& text, TQListViewItem* browserEquivalent ); + SelectionListItem( TQListViewItem * tqparent, const TQString& text, TQListViewItem* browserEquivalent ); + SelectionListItem( TQCheckListItem * tqparent, const TQString& text, TQListViewItem* browserEquivalent ); virtual TQString name() const; diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp index 1ccbdf99..ce6f7dbe 100644 --- a/amarok/src/playlistwindow.cpp +++ b/amarok/src/playlistwindow.cpp @@ -86,8 +86,8 @@ namespace Amarok class ToolBar : public KToolBar { public: - ToolBar( TQWidget *parent, const char *name ) - : KToolBar( parent, name ) + ToolBar( TQWidget *tqparent, const char *name ) + : KToolBar( tqparent, name ) {} protected: @@ -106,7 +106,7 @@ namespace Amarok PlaylistWindow *PlaylistWindow::s_instance = 0; PlaylistWindow::PlaylistWindow() - : TQWidget( 0, "PlaylistWindow", Qt::WGroupLeader ) + : TQWidget( 0, "PlaylistWindow", TQt::WGroupLeader ) , KXMLGUIClient() , m_lastBrowser( 0 ) { @@ -123,37 +123,37 @@ PlaylistWindow::PlaylistWindow() new K3bExporter(); - KStdAction::configureToolbars( kapp, TQT_SLOT( slotConfigToolBars() ), ac ); - KStdAction::keyBindings( kapp, TQT_SLOT( slotConfigShortcuts() ), ac ); - KStdAction::keyBindings( kapp, TQT_SLOT( slotConfigGlobalShortcuts() ), ac, "options_configure_globals" ); - KStdAction::preferences( kapp, TQT_SLOT( slotConfigAmarok() ), ac ); + KStdAction::configureToolbars( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigToolBars() ), ac ); + KStdAction::keyBindings( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigShortcuts() ), ac ); + KStdAction::keyBindings( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigGlobalShortcuts() ), ac, "options_configure_globals" ); + KStdAction::preferences( TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigAmarok() ), ac ); ac->action("options_configure_globals")->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::KeyBindings))->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::ConfigureToolbars))->setIcon( Amarok::icon( "configure" ) ); ac->action(KStdAction::name(KStdAction::Preferences))->setIcon( Amarok::icon( "configure" ) ); - KStdAction::quit( kapp, TQT_SLOT( quit() ), ac ); - KStdAction::open( this, TQT_SLOT(slotAddLocation()), ac, "playlist_add" )->setText( i18n("&Add Media...") ); + KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), ac ); + KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(slotAddLocation()), ac, "playlist_add" )->setText( i18n("&Add Media...") ); ac->action( "playlist_add" )->setIcon( Amarok::icon( "files" ) ); - KStdAction::open( this, TQT_SLOT(slotAddStream()), ac, "stream_add" )->setText( i18n("&Add Stream...") ); + KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(slotAddStream()), ac, "stream_add" )->setText( i18n("&Add Stream...") ); ac->action( "stream_add" )->setIcon( Amarok::icon( "files" ) ); - KStdAction::save( this, TQT_SLOT(savePlaylist()), ac, "playlist_save" )->setText( i18n("&Save Playlist As...") ); + KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT(savePlaylist()), ac, "playlist_save" )->setText( i18n("&Save Playlist As...") ); ac->action( "playlist_save" )->setIcon( Amarok::icon( "save" ) ); -#ifndef Q_WS_MAC - KStdAction::showMenubar( this, TQT_SLOT(slotToggleMenu()), ac ); +#ifndef TQ_WS_MAC + KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotToggleMenu()), ac ); #endif //FIXME: after string freeze rename to "Burn Current Playlist"? - new KAction( i18n("Burn to CD"), Amarok::icon( "burn" ), 0, this, TQT_SLOT(slotBurnPlaylist()), ac, "playlist_burn" ); + new KAction( i18n("Burn to CD"), Amarok::icon( "burn" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBurnPlaylist()), ac, "playlist_burn" ); actionCollection()->action("playlist_burn")->setEnabled( K3bExporter::isAvailable() ); - new KAction( i18n("Play Media..."), Amarok::icon( "files" ), 0, this, TQT_SLOT(slotPlayMedia()), ac, "playlist_playmedia" ); - new KAction( i18n("Play Audio CD"), Amarok::icon( "album" ), 0, this, TQT_SLOT(playAudioCD()), ac, "play_audiocd" ); + new KAction( i18n("Play Media..."), Amarok::icon( "files" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlayMedia()), ac, "playlist_playmedia" ); + new KAction( i18n("Play Audio CD"), Amarok::icon( "album" ), 0, TQT_TQOBJECT(this), TQT_SLOT(playAudioCD()), ac, "play_audiocd" ); KAction *playPause = new KAction( i18n( "&Play/Pause" ), Amarok::icon( "play" ), Key_Space, ec, TQT_SLOT( playPause() ), ac, "play_pause" ); - new KAction( i18n("Script Manager"), Amarok::icon( "scripts" ), 0, this, TQT_SLOT(showScriptSelector()), ac, "script_manager" ); - new KAction( i18n("Queue Manager"), Amarok::icon( "queue" ), 0, this, TQT_SLOT(showQueueManager()), ac, "queue_manager" ); + new KAction( i18n("Script Manager"), Amarok::icon( "scripts" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showScriptSelector()), ac, "script_manager" ); + new KAction( i18n("Queue Manager"), Amarok::icon( "queue" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showQueueManager()), ac, "queue_manager" ); KAction *seekForward = new KAction( i18n( "&Seek Forward" ), Amarok::icon( "fastforward" ), Key_Right, ec, TQT_SLOT( seekForward() ), ac, "seek_forward" ); KAction *seekBackward = new KAction( i18n( "&Seek Backward" ), Amarok::icon( "rewind" ), Key_Left, ec, TQT_SLOT( seekBackward() ), ac, "seek_backward" ); - new KAction( i18n("Statistics"), Amarok::icon( "info" ), 0, this, TQT_SLOT(showStatistics()), ac, "statistics" ); + new KAction( i18n("Statistics"), Amarok::icon( "info" ), 0, TQT_TQOBJECT(this), TQT_SLOT(showStatistics()), ac, "statistics" ); new KAction( i18n("Update Collection"), Amarok::icon( "refresh" ), 0, CollectionDB::instance(), TQT_SLOT( scanModifiedDirs() ), actionCollection(), "update_collection" ); m_lastfmTags << "Alternative" << "Ambient" << "Chill Out" << "Classical" << "Dance" @@ -196,7 +196,7 @@ PlaylistWindow::PlaylistWindow() new KAction( i18n( "Pause" ), Amarok::icon( "pause" ), 0, ec, TQT_SLOT( pause() ), ac, "pause" ); new KAction( i18n( "Next Track" ), Amarok::icon( "next" ), 0, ec, TQT_SLOT( next() ), ac, "next" ); - KAction *toggleFocus = new KAction( i18n( "Toggle Focus" ), "reload", CTRL+Key_Tab, this, TQT_SLOT( slotToggleFocus() ), ac, "toggle_focus" ); + KAction *toggleFocus = new KAction( i18n( "Toggle Focus" ), "reload", CTRL+Key_Tab, TQT_TQOBJECT(this), TQT_SLOT( slotToggleFocus() ), ac, "toggle_focus" ); { // KAction idiocy -- shortcuts don't work until they've been plugged into a menu @@ -227,7 +227,7 @@ PlaylistWindow::PlaylistWindow() new Amarok::BurnMenuAction( ac ); if( AmarokConfig::playlistWindowSize().isValid() ) { - // if first ever run, use sizeHint(), and let + // if first ever run, use tqsizeHint(), and let // KWin place us otherwise use the stored values resize( AmarokConfig::playlistWindowSize() ); move( AmarokConfig::playlistWindowPos() ); @@ -258,7 +258,7 @@ void PlaylistWindow::init() m_browsers = new BrowserBar( this ); - //<Dynamic Mode Status Bar /> + //<Dynamic Mode tqStatus Bar /> DynamicBar *dynamicBar = new DynamicBar( m_browsers->container()); TQFrame *playlist; @@ -282,7 +282,7 @@ void PlaylistWindow::init() filter_label->setBuddy( m_lineEdit ); bar->setStretchableWidget( m_lineEdit ); KPushButton *filterButton = new KPushButton("...", bar, "filter"); - filterButton->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); + filterButton->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); m_lineEdit->setFrame( TQFrame::Sunken ); m_lineEdit->installEventFilter( this ); //we intercept keyEvents @@ -304,7 +304,7 @@ void PlaylistWindow::init() dynamicBar->init(); m_toolbar = new Amarok::ToolBar( m_browsers->container(), "mainToolBar" ); -#ifndef Q_WS_MAC +#ifndef TQ_WS_MAC m_toolbar->setShown( AmarokConfig::showToolbar() ); #endif TQWidget *statusbar = new Amarok::StatusBar( this ); @@ -313,7 +313,7 @@ void PlaylistWindow::init() connect( repeatAction, TQT_SIGNAL( activated( int ) ), playlist, TQT_SLOT( slotRepeatTrackToggled( int ) ) ); m_menubar = new KMenuBar( this ); -#ifndef Q_WS_MAC +#ifndef TQ_WS_MAC m_menubar->setShown( AmarokConfig::showMenuBar() ); #endif @@ -368,7 +368,7 @@ void PlaylistWindow::init() m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n("&Cover Manager"), Amarok::Menu::ID_SHOW_COVER_MANAGER ); actionCollection()->action("queue_manager")->plug( m_toolsMenu ); m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n("&Visualizations"), Amarok::Menu::ID_SHOW_VIS_SELECTOR ); - m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), kapp, TQT_SLOT( slotConfigEqualizer() ), 0, Amarok::Menu::ID_CONFIGURE_EQUALIZER ); + m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigEqualizer() ), 0, Amarok::Menu::ID_CONFIGURE_ETQUALIZER ); actionCollection()->action("script_manager")->plug( m_toolsMenu ); actionCollection()->action("statistics")->plug( m_toolsMenu ); m_toolsMenu->insertSeparator(); @@ -388,7 +388,7 @@ void PlaylistWindow::init() //BEGIN Settings menu m_settingsMenu = new KPopupMenu( m_menubar ); //TODO use KStdAction or KMainWindow -#ifndef Q_WS_MAC +#ifndef TQ_WS_MAC static_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar)))->setChecked( AmarokConfig::showMenuBar() ); actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar))->plug( m_settingsMenu ); m_settingsMenu->insertItem( AmarokConfig::showToolbar() ? i18n( "Hide Toolbar" ) : i18n("Show Toolbar"), ID_SHOW_TOOLBAR ); @@ -396,7 +396,7 @@ void PlaylistWindow::init() m_settingsMenu->insertSeparator(); #endif -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC // plug it first, as this item will be moved to the applications first menu actionCollection()->action(KStdAction::name(KStdAction::Preferences))->plug( m_settingsMenu ); #endif @@ -424,7 +424,7 @@ void PlaylistWindow::init() layV->addWidget( statusbar ); //The volume slider later becomes our FocusProxy, so all wheelEvents get redirected to it - m_toolbar->setFocusPolicy( TQWidget::WheelFocus ); + m_toolbar->setFocusPolicy( TQ_WheelFocus ); m_toolbar->setFlat( true ); m_toolbar->setMovingEnabled( false ); playlist->setMargin( 2 ); @@ -488,7 +488,7 @@ void PlaylistWindow::init() PlaylistBrowser::instance(), TQT_SLOT( loadDynamicItems() ) ); - qApp->installEventFilter( this ); // keyboards shortcuts for the browsers + tqApp->installEventFilter( this ); // keyboards shortcuts for the browsers connect( playlist, TQT_SIGNAL( itemCountChanged( int, int, int, int, int, int ) ), statusbar, TQT_SLOT( slotItemCountChanged( int, int, int, int, int, int ) ) ); @@ -554,15 +554,15 @@ void PlaylistWindow::createGUI() (*it)->unplug( m_toolbar ); KXMLGUIBuilder builder( this ); - KXMLGUIFactory factory( &builder, this ); + KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) ); //build Toolbar, plug actions factory.addClient( this ); //TEXT ON RIGHT HACK //KToolBarButtons have independent settings for their appearance. - //KToolBarButton::modeChange() causes that button to set its mode to that of its parent KToolBar - //KToolBar::setIconText() calls modeChange() for children, unless 2nd param is false + //KToolBarButton::modeChange() causes that button to set its mode to that of its tqparent KToolBar + //KToolBar::setIconText() calls modeChange() for tqchildren, unless 2nd param is false TQStringList list; list << "toolbutton_playlist_add" @@ -578,7 +578,7 @@ void PlaylistWindow::createGUI() const TQStringList::ConstIterator last = list.fromLast(); for( TQStringList::ConstIterator it = list.constBegin(); it != end; ++it ) { - KToolBarButton* const button = static_cast<KToolBarButton*>( m_toolbar->child( (*it).latin1() ) ); + KToolBarButton* const button = static_cast<KToolBarButton*>( TQT_TQWIDGET(m_toolbar->child( (*it).latin1() )) ); if ( it == last ) { //if the user has no PlayerWindow, he MUST have the menu action plugged @@ -589,7 +589,7 @@ void PlaylistWindow::createGUI() if ( button ) { button->modeChange(); - button->setFocusPolicy( TQWidget::NoFocus ); + button->setFocusPolicy( TQ_NoFocus ); } } @@ -639,7 +639,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) //there are a few keypresses that we intercept - #define e static_cast<TQKeyEvent*>(e) + #define e TQT_TQKEYEVENT(e) if( e->key() == Key_F2 ) { @@ -682,7 +682,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) } } - if( o == m_lineEdit ) //the search lineedit + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) ) //the search lineedit { TQListViewItem *item; switch( e->key() ) @@ -707,7 +707,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) for( It it( pl, It::Visible ); PlaylistItem *x = static_cast<PlaylistItem*>( *it ); ++it ) { pl->queue( x, true ); - ( pl->m_nextTracks.contains( x ) ? in : out ).append( x ); + ( pl->m_nextTracks.tqcontains( x ) ? in : out ).append( x ); } else { @@ -753,9 +753,9 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) //following are for Playlist::instance() only //we don't handle these in the playlist because often we manipulate the lineEdit too - if( o == pl ) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(pl) ) { - if( pl->currentItem() && ( e->key() == Key_Up && pl->currentItem()->itemAbove() == 0 && !(e->state() & Qt::ShiftButton) ) ) + if( pl->currentItem() && ( e->key() == Key_Up && pl->currentItem()->itemAbove() == 0 && !(e->state() & TQt::ShiftButton) ) ) { TQListViewItem *lastitem = *It( pl, It::Visible ); if ( !lastitem ) @@ -768,7 +768,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) pl->ensureItemVisible( lastitem ); return true; } - if( pl->currentItem() && ( e->key() == Key_Down && pl->currentItem()->itemBelow() == 0 && !(e->state() & Qt::ShiftButton) ) ) + if( pl->currentItem() && ( e->key() == Key_Down && pl->currentItem()->itemBelow() == 0 && !(e->state() & TQt::ShiftButton) ) ) { pl->currentItem()->setSelected( false ); pl->setCurrentItem( *It( pl, It::Visible ) ); @@ -781,7 +781,7 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) pl->removeSelectedItems(); return true; } - if( ( ( e->key() >= Key_0 && e->key() <= Key_Z ) || e->key() == Key_Backspace || e->key() == Key_Escape ) && ( !e->state() || e->state() == Qt::ShiftButton ) ) //only if shift or no modifier key is pressed and 0-Z or backspace or escape + if( ( ( e->key() >= Key_0 && e->key() <= Key_Z ) || e->key() == Key_Backspace || e->key() == Key_Escape ) && ( !e->state() || e->state() == TQt::ShiftButton ) ) //only if shift or no modifier key is pressed and 0-Z or backspace or escape { m_lineEdit->setFocus(); TQApplication::sendEvent( m_lineEdit, e ); @@ -801,11 +801,11 @@ bool PlaylistWindow::eventFilter( TQObject *o, TQEvent *e ) void PlaylistWindow::closeEvent( TQCloseEvent *e ) { -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC Q_UNUSED( e ); hide(); #else - Amarok::genericEventHandler( this, e ); + Amarok::genericEventHandler( TQT_TQWIDGET(this), TQT_TQEVENT(e) ); #endif } @@ -819,7 +819,7 @@ void PlaylistWindow::showEvent( TQShowEvent* ) } #include <tqdesktopwidget.h> -TQSize PlaylistWindow::sizeHint() const +TQSize PlaylistWindow::tqsizeHint() const { return TQApplication::desktop()->screenGeometry( (TQWidget*)this ).size() / 1.5; } @@ -856,7 +856,7 @@ void PlaylistWindow::savePlaylist() const //SLOT } if( useArtist && useAlbum ) - title = i18n("%1 - %2").arg( artist, album ); + title = i18n("%1 - %2").tqarg( artist, album ); else if( useArtist ) title = artist; else if( useAlbum ) @@ -887,8 +887,8 @@ void PlaylistWindow::slotAddLocation( bool directPlay ) //SLOT { // open a file selector to add media to the playlist KURL::List files; - //files = KFileDialog::getOpenURLs( TQString::null, "*.*|" + i18n("All Files"), this, i18n("Add Media") ); - KFileDialog dlg( TQString::null, "*.*|", this, "openMediaDialog", true ); + //files = KFileDialog::getOpenURLs( TQString(), "*.*|" + i18n("All Files"), this, i18n("Add Media") ); + KFileDialog dlg( TQString(), "*.*|", this, "openMediaDialog", true ); dlg.setCaption( directPlay ? i18n("Play Media (Files or URLs)") : i18n("Add Media (Files or URLs)") ); dlg.setMode( KFile::Files | KFile::Directory ); dlg.exec(); @@ -908,7 +908,7 @@ void PlaylistWindow::slotAddLocation( bool directPlay ) //SLOT void PlaylistWindow::slotAddStream() //SLOT { bool ok; - TQString url = KInputDialog::getText( i18n("Add Stream"), i18n("URL"), TQString::null, &ok, this ); + TQString url = KInputDialog::getText( i18n("Add Stream"), i18n("URL"), TQString(), &ok, this ); if ( !ok ) return; @@ -922,7 +922,7 @@ void PlaylistWindow::playLastfmPersonal() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/personal" ) - .arg( AmarokConfig::scrobblerUsername() ) ); + .tqarg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay ); } @@ -933,7 +933,7 @@ void PlaylistWindow::addLastfmPersonal() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/personal" ) - .arg( AmarokConfig::scrobblerUsername() ) ); + .tqarg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url ); } @@ -944,7 +944,7 @@ void PlaylistWindow::playLastfmNeighbor() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/neighbours" ) - .arg( AmarokConfig::scrobblerUsername() ) ); + .tqarg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay ); } @@ -955,7 +955,7 @@ void PlaylistWindow::addLastfmNeighbor() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/neighbours" ) - .arg( AmarokConfig::scrobblerUsername() ) ); + .tqarg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url ); } @@ -1006,7 +1006,7 @@ void PlaylistWindow::addLastfmGlobaltag( int id ) //SLOT void PlaylistWindow::playAudioCD() //SLOT { KURL::List urls; - if( EngineController::engine()->getAudioCDContents(TQString::null, urls) ) + if( EngineController::engine()->getAudioCDContents(TQString(), urls) ) { if (!urls.isEmpty()) Playlist::instance()->insertMedia(urls, Playlist::Replace); @@ -1093,7 +1093,7 @@ void PlaylistWindow::actionsMenuAboutToShow() //SLOT void PlaylistWindow::toolsMenuAboutToShow() //SLOT { - m_toolsMenu->setItemEnabled( Amarok::Menu::ID_CONFIGURE_EQUALIZER, EngineController::hasEngineProperty( "HasEqualizer" ) ); + m_toolsMenu->setItemEnabled( Amarok::Menu::ID_CONFIGURE_ETQUALIZER, EngineController::hasEngineProperty( "HasEqualizer" ) ); m_toolsMenu->setItemEnabled( Amarok::Menu::ID_RESCAN_COLLECTION, !ThreadManager::instance()->isJobPending( "CollectionScanner" ) ); } @@ -1115,7 +1115,7 @@ void PlaylistWindow::toolsMenuAboutToShow() //SLOT */ void PlaylistWindow::showHide() //SLOT { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 const KWin::WindowInfo info = KWin::windowInfo( winId() ); const uint desktop = KWin::currentDesktop(); const bool isOnThisDesktop = info.isOnDesktop( desktop ); @@ -1142,7 +1142,7 @@ void PlaylistWindow::showHide() //SLOT void PlaylistWindow::activate() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 const KWin::WindowInfo info = KWin::windowInfo( winId() ); if( KWinModule( NULL, KWinModule::INFO_DESKTOP ).activeWindow() != winId()) @@ -1158,7 +1158,7 @@ void PlaylistWindow::activate() bool PlaylistWindow::isReallyShown() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 const KWin::WindowInfo info = KWin::windowInfo( winId() ); return isShown() && !info.isMinimized() && info.isOnDesktop( KWin::currentDesktop() ); #else @@ -1187,8 +1187,8 @@ PlaylistWindow::mbAvailabilityChanged( bool isAvailable ) //SLOT ////////////////////////////////////////////////////////////////////////////////////////// /// DynamicBar ////////////////////////////////////////////////////////////////////////////////////////// -DynamicBar::DynamicBar(TQWidget* parent) - : TQHBox( parent, "DynamicModeStatusBar" ) +DynamicBar::DynamicBar(TQWidget* tqparent) + : TQHBox( tqparent, "DynamicModeStatusBar" ) { m_titleWidget = new DynamicTitle(this); @@ -1248,10 +1248,10 @@ void DynamicTitle::setTitle(const TQString& newTitle) void DynamicTitle::paintEvent(TQPaintEvent* /*e*/) { TQPainter p; - p.begin( this, false ); - TQPen pen( colorGroup().highlightedText(), 0, Qt::NoPen ); + p.tqbegin( this, false ); + TQPen pen( tqcolorGroup().highlightedText(), 0, TQt::NoPen ); p.setPen( pen ); - p.setBrush( colorGroup().highlight() ); + p.setBrush( tqcolorGroup().highlight() ); p.setFont(m_font); TQFontMetrics fm(m_font); @@ -1266,10 +1266,10 @@ void DynamicTitle::paintEvent(TQPaintEvent* /*e*/) p.drawEllipse( 0, yStart, s_curveWidth * 2, textHeight); p.drawEllipse( s_curveWidth + textWidth + s_imageSize, yStart, s_curveWidth*2, textHeight); p.fillRect( s_curveWidth, yStart, textWidth + s_imageSize + s_curveWidth, textHeight - , TQBrush( colorGroup().highlight()) ); + , TQBrush( tqcolorGroup().highlight()) ); p.drawPixmap( s_curveWidth, yStart + ((textHeight - s_imageSize) /2), SmallIcon("dynamic") ); //not sure why first arg of Rect shouldn't add @curveWidth - p.drawText( TQRect(s_imageSize, yStart, s_curveWidth + textWidth +s_imageSize, textHeight), Qt::AlignCenter, m_title); + p.drawText( TQRect(s_imageSize, yStart, s_curveWidth + textWidth +s_imageSize, textHeight), TQt::AlignCenter, m_title); } #include "playlistwindow.moc" diff --git a/amarok/src/playlistwindow.h b/amarok/src/playlistwindow.h index 7f04cb8b..3cb5943a 100644 --- a/amarok/src/playlistwindow.h +++ b/amarok/src/playlistwindow.h @@ -41,6 +41,7 @@ class TQTimer; class PlaylistWindow : public TQWidget, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: PlaylistWindow(); @@ -99,7 +100,7 @@ class PlaylistWindow : public TQWidget, public KXMLGUIClient protected: virtual void closeEvent( TQCloseEvent* ); virtual void showEvent( TQShowEvent* ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; private: enum MenuId { ID_SHOW_TOOLBAR = 2000, ID_SHOW_PLAYERWINDOW }; @@ -121,11 +122,12 @@ class PlaylistWindow : public TQWidget, public KXMLGUIClient static PlaylistWindow *s_instance; }; -class DynamicTitle : public QWidget +class DynamicTitle : public TQWidget { Q_OBJECT + TQ_OBJECT public: - DynamicTitle( TQWidget* parent ); + DynamicTitle( TQWidget* tqparent ); void setTitle( const TQString& newTitle ); protected: @@ -138,11 +140,12 @@ class DynamicTitle : public QWidget TQFont m_font; }; -class DynamicBar : public QHBox +class DynamicBar : public TQHBox { Q_OBJECT + TQ_OBJECT public: - DynamicBar( TQWidget* parent ); + DynamicBar( TQWidget* tqparent ); void init(); public slots: diff --git a/amarok/src/plugin/plugin.cpp b/amarok/src/plugin/plugin.cpp index 5a1d98c6..0cfca13f 100644 --- a/amarok/src/plugin/plugin.cpp +++ b/amarok/src/plugin/plugin.cpp @@ -22,10 +22,10 @@ Plugin::addPluginProperty( const TQString& key, const TQString& value ) } -QString +TQString Plugin::pluginProperty( const TQString& key ) { - if ( m_properties.find( key.lower() ) == m_properties.end() ) + if ( m_properties.tqfind( key.lower() ) == m_properties.end() ) return "false"; return m_properties[key.lower()]; @@ -35,7 +35,7 @@ Plugin::pluginProperty( const TQString& key ) bool Plugin::hasPluginProperty( const TQString& key ) { - return m_properties.find( key.lower() ) != m_properties.end(); + return m_properties.tqfind( key.lower() ) != m_properties.end(); } } diff --git a/amarok/src/plugin/plugin.h b/amarok/src/plugin/plugin.h index b10948c7..e29c88e8 100644 --- a/amarok/src/plugin/plugin.h +++ b/amarok/src/plugin/plugin.h @@ -27,10 +27,10 @@ namespace Amarok virtual ~Plugin(); /** - * TODO @param parent you must parent the widget to parent + * TODO @param tqparent you must tqparent the widget to tqparent * @return the configure widget for your plugin, create it on the heap! */ - //TODO rename configureWidget( TQWidget *parent ) + //TODO rename configureWidget( TQWidget *tqparent ) virtual PluginConfig* configure() const { return 0; } void addPluginProperty( const TQString& key, const TQString& value ); diff --git a/amarok/src/plugin/pluginconfig.h b/amarok/src/plugin/pluginconfig.h index ccc182c5..e42eb857 100644 --- a/amarok/src/plugin/pluginconfig.h +++ b/amarok/src/plugin/pluginconfig.h @@ -14,9 +14,10 @@ namespace Amarok * Class to allow user configuration of your plugin; you provide a GUI widget via view() */ - class PluginConfig : public QObject + class PluginConfig : public TQObject { Q_OBJECT + TQ_OBJECT signals: /** Emit whenever some view setting is changed by the user */ diff --git a/amarok/src/pluginmanager.cpp b/amarok/src/pluginmanager.cpp index 472a2510..9164bc12 100644 --- a/amarok/src/pluginmanager.cpp +++ b/amarok/src/pluginmanager.cpp @@ -44,7 +44,7 @@ KTrader::OfferList PluginManager::query( const TQString& constraint ) { // Add versioning constraint - QString + TQString str = "[X-KDE-Amarok-framework-version] == "; str += TQString::number( FrameworkVersion ); if ( !constraint.stripWhiteSpace().isEmpty() ) @@ -95,8 +95,8 @@ PluginManager::createFromService( const KService::Ptr service ) if ( !lib ) { KMessageBox::error( 0, i18n( "<p>KLibLoader could not load the plugin:<br/><i>%1</i></p>" "<p>Error message:<br/><i>%2</i></p>" ) - .arg( service->library() ) - .arg( loader->lastErrorMessage() ) ); + .tqarg( service->library() ) + .tqarg( loader->lastErrorMessage() ) ); return 0; } //look up address of init function and cast it to pointer-to-function @@ -174,12 +174,12 @@ PluginManager::showAbout( const TQString &constraint ) TQString str = "<html><body><table width=\"100%\" border=\"1\">"; - str += body.arg( i18n( "Name" ), s->name() ); - str += body.arg( i18n( "Library" ), s->library() ); - str += body.arg( i18n( "Authors" ), s->property( "X-KDE-Amarok-authors" ).toStringList().join( "\n" ) ); - str += body.arg( i18n( "Email" ), s->property( "X-KDE-Amarok-email" ).toStringList().join( "\n" ) ); - str += body.arg( i18n( "Version" ), s->property( "X-KDE-Amarok-version" ).toString() ); - str += body.arg( i18n( "Framework Version" ), s->property( "X-KDE-Amarok-framework-version" ).toString() ); + str += body.tqarg( i18n( "Name" ), s->name() ); + str += body.tqarg( i18n( "Library" ), s->library() ); + str += body.tqarg( i18n( "Authors" ), s->property( "X-KDE-Amarok-authors" ).toStringList().join( "\n" ) ); + str += body.tqarg( i18n( "Email" ), s->property( "X-KDE-Amarok-email" ).toStringList().join( "\n" ) ); + str += body.tqarg( i18n( "Version" ), s->property( "X-KDE-Amarok-version" ).toString() ); + str += body.tqarg( i18n( "Framework Version" ), s->property( "X-KDE-Amarok-framework-version" ).toString() ); str += "</table></body></html>"; diff --git a/amarok/src/pluginmanager.h b/amarok/src/pluginmanager.h index 861c0b8e..ef1dc11d 100644 --- a/amarok/src/pluginmanager.h +++ b/amarok/src/pluginmanager.h @@ -47,22 +47,22 @@ class PluginManager * The keys used in the query (Type, ServiceType, Exec) are all * fields found in the .desktop files. * - * @param constraint A constraint to limit the choices returned, TQString::null to + * @param constraint A constraint to limit the choices returned, TQString() to * get all services of the given @p servicetype * * @return A list of services that satisfy the query * @see http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html */ - static KTrader::OfferList query( const TQString& constraint = TQString::null ); + static KTrader::OfferList query( const TQString& constraint = TQString() ); /** * Load and instantiate plugin from query - * @param constraint A constraint to limit the choices returned, TQString::null to + * @param constraint A constraint to limit the choices returned, TQString() to * get all services of the given @p servicetype * @return Pointer to Plugin, or NULL if error * @see http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html */ - static Amarok::Plugin* createFromQuery( const TQString& constraint = TQString::null ); + static Amarok::Plugin* createFromQuery( const TQString& constraint = TQString() ); /** * Load and instantiate plugin from service diff --git a/amarok/src/podcastbundle.h b/amarok/src/podcastbundle.h index f1e4fbe1..c5738228 100644 --- a/amarok/src/podcastbundle.h +++ b/amarok/src/podcastbundle.h @@ -13,7 +13,7 @@ class PodcastChannelBundle { public: PodcastChannelBundle() - : m_parentId( -1 ) + : m_tqparentId( -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_parentId = -1; + m_tqparentId = -1; setSettings( settings ); } @@ -60,8 +60,8 @@ class PodcastChannelBundle const KURL &imageURL() const; const TQString &description() const; const TQString ©right() const; - /// The id which the parent folder has in the database - int parentId() const; + /// The id which the tqparent folder has in the database + int tqparentId() 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_parentId; + int m_tqparentId; 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::parentId() const { return m_parentId; } +inline int PodcastChannelBundle::tqparentId() const { return m_tqparentId; } 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_parentId = p; } +inline void PodcastChannelBundle::setParentId ( const int p ) { m_tqparentId = p; } inline void PodcastChannelBundle::setSaveLocation( const TQString &s ) { m_saveLocation = s; } inline void PodcastChannelBundle::setAutoScan( const bool b ) { m_autoscan = b; } @@ -149,7 +149,7 @@ class PodcastEpisodeBundle , m_isNew( false ) { } - PodcastEpisodeBundle( const KURL &url, const KURL &parent, const TQString &title, + PodcastEpisodeBundle( const KURL &url, const KURL &tqparent, const TQString &title, const TQString &author, const TQString &desc, const TQString &date, const TQString &type, const int duration, const TQString &guid, const bool isNew ) @@ -157,7 +157,7 @@ class PodcastEpisodeBundle , m_size( 0 ) { m_url = url; - m_parent = parent; + m_tqparent = tqparent; m_author = author; m_title = title; m_description = desc; @@ -178,7 +178,7 @@ class PodcastEpisodeBundle /// The local url of the podcast episode (if it has been downloaded, an invalid url otherwise) const KURL &localUrl() const; /// The url of the podcast channel - const KURL &parent() const; + const KURL &tqparent() const; const TQString &author() const; const TQString &title() const; const TQString &subtitle() const; @@ -215,7 +215,7 @@ class PodcastEpisodeBundle int m_id; KURL m_url; KURL m_localUrl; - KURL m_parent; + KURL m_tqparent; TQString m_author; TQString m_title; TQString m_subtitle; @@ -232,7 +232,7 @@ class PodcastEpisodeBundle inline int PodcastEpisodeBundle::dBId() const { return m_id; } inline const KURL &PodcastEpisodeBundle::url() const { return m_url; } inline const KURL &PodcastEpisodeBundle::localUrl() const { return m_localUrl; } -inline const KURL &PodcastEpisodeBundle::parent() const { return m_parent; } +inline const KURL &PodcastEpisodeBundle::tqparent() const { return m_tqparent; } inline const TQString &PodcastEpisodeBundle::author() const { return m_author; } inline const TQString &PodcastEpisodeBundle::title() const { return m_title; } inline const TQString &PodcastEpisodeBundle::subtitle() const { return m_subtitle; } @@ -248,7 +248,7 @@ inline bool PodcastEpisodeBundle::isNew() const { return m_isNew inline void PodcastEpisodeBundle::setDBId( const int i ) { m_id = i; } inline void PodcastEpisodeBundle::setURL( const KURL &u ) { m_url = u; } inline void PodcastEpisodeBundle::setLocalURL( const KURL &u ) { m_localUrl = u; } -inline void PodcastEpisodeBundle::setParent( const KURL &u ) { m_parent = u; } +inline void PodcastEpisodeBundle::setParent( const KURL &u ) { m_tqparent = u; } inline void PodcastEpisodeBundle::setAuthor( const TQString &a ) { m_author = a; } inline void PodcastEpisodeBundle::setTitle( const TQString &t ) { m_title = t; } inline void PodcastEpisodeBundle::setSubtitle( const TQString &t ) { m_subtitle = t; } diff --git a/amarok/src/podcastsettings.cpp b/amarok/src/podcastsettings.cpp index 298486a1..9a3168f9 100644 --- a/amarok/src/podcastsettings.cpp +++ b/amarok/src/podcastsettings.cpp @@ -62,8 +62,8 @@ PodcastSettings::PodcastSettings( const TQString &title, const TQString &save, c m_purgeCount = purgecount; } -PodcastSettingsDialog::PodcastSettingsDialog( PodcastSettings *settings, TQWidget* parent ) - : KDialogBase( parent, 0, true, i18n("change options", "Configure %1").arg( settings->m_title ) +PodcastSettingsDialog::PodcastSettingsDialog( PodcastSettings *settings, TQWidget* tqparent ) + : KDialogBase( tqparent, 0, true, i18n("change options", "Configure %1").tqarg( settings->m_title ) , KDialogBase::User1|KDialogBase::Ok|KDialogBase::Cancel , KDialogBase::Ok, true , KGuiItem(i18n("Reset"), "reset" ) ) @@ -73,8 +73,8 @@ PodcastSettingsDialog::PodcastSettingsDialog( PodcastSettings *settings, TQWidge setSettings( settings ); } -PodcastSettingsDialog::PodcastSettingsDialog( const TQPtrList<PodcastSettings> &list, const TQString &caption, TQWidget* parent ) - : KDialogBase( parent, 0, true, i18n("change options", "Configure %1").arg( caption ) +PodcastSettingsDialog::PodcastSettingsDialog( const TQPtrList<PodcastSettings> &list, const TQString &caption, TQWidget* tqparent ) + : KDialogBase( tqparent, 0, true, i18n("change options", "Configure %1").tqarg( caption ) , KDialogBase::User1|KDialogBase::Ok|KDialogBase::Cancel , KDialogBase::Ok, true , KGuiItem(i18n("Reset"), "reset" ) ) diff --git a/amarok/src/podcastsettings.h b/amarok/src/podcastsettings.h index 0e5b8b80..65137785 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 *parentSettings, const TQString &title ); + PodcastSettings( const PodcastSettings *tqparentSettings, 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 ); @@ -48,10 +48,11 @@ class PodcastSettings class PodcastSettingsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PodcastSettingsDialog( PodcastSettings *list, TQWidget* parent=0 ); - PodcastSettingsDialog( const TQPtrList<PodcastSettings> &list, const TQString &caption, TQWidget* parent=0 ); + PodcastSettingsDialog( PodcastSettings *list, TQWidget* tqparent=0 ); + PodcastSettingsDialog( const TQPtrList<PodcastSettings> &list, const TQString &caption, TQWidget* tqparent=0 ); bool configure(); PodcastSettings *getSettings() { return m_settings; } diff --git a/amarok/src/podcastsettingsbase.ui b/amarok/src/podcastsettingsbase.ui index db3389e2..764cef7c 100644 --- a/amarok/src/podcastsettingsbase.ui +++ b/amarok/src/podcastsettingsbase.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PodcastSettingsDialogBase</class> <author>Seb Ruiz</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -31,7 +31,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup" row="3" column="0" rowspan="1" colspan="6"> + <widget class="TQButtonGroup" row="3" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_streamRadio</cstring> </property> @@ -62,7 +62,7 @@ <string>Media must be explicitly downloaded, otherwise the podcast will be played from the remote server.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_downloadRadio</cstring> </property> @@ -76,7 +76,7 @@ <string>Download media as soon as it becomes available</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_addToMediaDeviceCheck</cstring> </property> @@ -92,7 +92,7 @@ </widget> </vbox> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_purgeCheck</cstring> </property> @@ -116,14 +116,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="4" column="4"> + <widget class="TQLabel" row="4" column="4"> <property name="name"> <cstring>m_purgeCountLabel</cstring> </property> @@ -131,7 +131,7 @@ <string>Keep maximum of:</string> </property> </widget> - <widget class="QSpinBox" row="4" column="5"> + <widget class="TQSpinBox" row="4" column="5"> <property name="name"> <cstring>m_purgeCountSpinBox</cstring> </property> @@ -148,7 +148,7 @@ <string>The maximum number of podcast items to store</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="6"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>m_autoFetchCheck</cstring> </property> @@ -162,7 +162,7 @@ <string>When checked, Amarok will automatically scan the podcast for updates</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>5</height> @@ -210,7 +210,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp index 7cb3b745..6962cfbb 100644 --- a/amarok/src/prettypopupmenu.cpp +++ b/amarok/src/prettypopupmenu.cpp @@ -37,8 +37,8 @@ TQColor PrettyPopupMenu::s_sidePixmapColor; // public //////////////////////////////////////////////////////////////////////////////// -PrettyPopupMenu::PrettyPopupMenu( TQWidget* parent, const char* name ) - : KPopupMenu( parent, name ) +PrettyPopupMenu::PrettyPopupMenu( TQWidget* tqparent, const char* name ) + : KPopupMenu( tqparent, name ) { // Must be initialized so that we know the size on first invocation if ( s_sidePixmap.isNull() ) @@ -62,21 +62,21 @@ PrettyPopupMenu::generateSidePixmap() } } -QRect +TQRect PrettyPopupMenu::sideImageRect() const { - return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), s_sidePixmap.width(), + return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), s_sidePixmap.width(), height() - 2*frameWidth() ), this ); } -QColor +TQColor PrettyPopupMenu::calcPixmapColor() { KConfig *config = KGlobal::config(); config->setGroup("WM"); - TQColor color = TQApplication::palette().active().highlight(); -// TQColor activeTitle = TQApplication::palette().active().background(); -// TQColor inactiveTitle = TQApplication::palette().inactive().background(); + TQColor color = TQApplication::tqpalette().active().highlight(); +// TQColor activeTitle = TQApplication::tqpalette().active().background(); +// TQColor inactiveTitle = TQApplication::tqpalette().inactive().background(); TQColor activeTitle = config->readColorEntry("activeBackground", &color); TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color); @@ -84,7 +84,7 @@ PrettyPopupMenu::calcPixmapColor() int h1, s1, v1, h2, s2, v2, h3, s3, v3; activeTitle.hsv(&h1, &s1, &v1); inactiveTitle.hsv(&h2, &s2, &v2); - TQApplication::palette().active().background().hsv(&h3, &s3, &v3); + TQApplication::tqpalette().active().background().hsv(&h3, &s3, &v3); if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) && ((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1)) @@ -95,7 +95,7 @@ PrettyPopupMenu::calcPixmapColor() // limit max/min brightness int r, g, b; color.rgb(&r, &g, &b); - int gray = qGray(r, g, b); + int gray = tqGray(r, g, b); if (gray > 180) { r = (r - (gray - 180) < 0 ? 0 : r - (gray - 180)); g = (g - (gray - 180) < 0 ? 0 : g - (gray - 180)); @@ -138,14 +138,14 @@ void PrettyPopupMenu::resizeEvent(TQResizeEvent * e) { KPopupMenu::resizeEvent( e ); - setFrameRect( TQStyle::visualRect( TQRect( s_sidePixmap.width(), 0, + setFrameRect( TQStyle::tqvisualRect( TQRect( s_sidePixmap.width(), 0, width() - s_sidePixmap.width(), height() ), this ) ); } -//Workaround Qt3.3.x sizing bug, by ensuring we're always wide enough. +//Workaround TQt3.3.x sizing bug, by ensuring we're always wide enough. void PrettyPopupMenu::resize( int width, int height ) { - width = kMax(width, maximumSize().width()); + width = kMax(width, tqmaximumSize().width()); KPopupMenu::resize(width, height); } @@ -174,9 +174,9 @@ PrettyPopupMenu::paintEvent( TQPaintEvent* e ) drawContents( &p ); - style().drawPrimitive( TQStyle::PE_PanelPopup, &p, + tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - colorGroup(), TQStyle::Style_Default, + tqcolorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); } diff --git a/amarok/src/prettypopupmenu.h b/amarok/src/prettypopupmenu.h index 230c7368..06bdbd66 100644 --- a/amarok/src/prettypopupmenu.h +++ b/amarok/src/prettypopupmenu.h @@ -42,9 +42,10 @@ class TQSize; class PrettyPopupMenu : public KPopupMenu { Q_OBJECT + TQ_OBJECT public: - PrettyPopupMenu( TQWidget *parent = 0, const char *name = 0 ); + PrettyPopupMenu( TQWidget *tqparent = 0, const char *name = 0 ); int sidePixmapWidth() const { return s_sidePixmap.width(); } diff --git a/amarok/src/qstringx.h b/amarok/src/qstringx.h index 36752fe1..a70ffae4 100644 --- a/amarok/src/qstringx.h +++ b/amarok/src/qstringx.h @@ -2,8 +2,8 @@ // Copyright (C) 2006 Martin Aumueller <aumuell@reserv.at> // See COPYING file for licensing information -#ifndef AMAROK_QSTRINGX_H -#define AMAROK_QSTRINGX_H +#ifndef AMAROK_TQSTRINGX_H +#define AMAROK_TQSTRINGX_H #include <tqglobal.h> #include <tqregexp.h> @@ -14,16 +14,16 @@ namespace Amarok { -class QStringx : public QString +class TQStringx : public TQString { public: - QStringx() {}; - QStringx( TQChar ch ) : TQString( ch ) {}; - QStringx( const TQString& s ) : TQString( s ) {}; - QStringx( const TQByteArray& ba ) : TQString( ba ) {}; - QStringx( const TQChar* unicode, uint length ) : TQString( unicode, length ) {}; - QStringx( const char* str ) : TQString( str ) {}; - virtual ~QStringx() {}; + TQStringx() {}; + TQStringx( TQChar ch ) : TQString( ch ) {}; + TQStringx( const TQString& s ) : TQString( s ) {}; + TQStringx( const TQByteArray& ba ) : TQString( ba ) {}; + TQStringx( const TQChar* tqunicode, uint length ) : TQString( tqunicode, length ) {}; + TQStringx( const char* str ) : TQString( str ) {}; + virtual ~TQStringx() {}; // the numbers following % obviously are not taken into account TQString args( const TQStringList& args ) const @@ -61,7 +61,7 @@ public: TQString p = rxArg.capturedTexts()[0].mid(1, len-1); result += mid( start, pos-start ); - if( args[p] != TQString::null ) + if( args[p] != TQString() ) result += args[p]; else if( opt ) return TQString(); @@ -88,14 +88,14 @@ public: pos = rxOptArg.search( *this, start ) ) { int len = rxOptArg.matchedLength(); - QStringx opt = rxOptArg.capturedTexts()[0].mid(1, len-2); + TQStringx opt = TQString(rxOptArg.capturedTexts()[0].mid(1, len-2)); - result += QStringx(mid( start, pos-start )).namedArgs( args ); + result += TQStringx(mid( start, pos-start )).namedArgs( args ); result += opt.namedArgs( args, true ); start = pos + len; } - result += QStringx( mid( start ) ).namedArgs( args ); + result += TQStringx( mid( start ) ).namedArgs( args ); return result; } @@ -103,4 +103,4 @@ public: } // namespace Amarok -#endif // AMAROK_QSTRINGX_H +#endif // AMAROK_TQSTRINGX_H diff --git a/amarok/src/queuemanager.cpp b/amarok/src/queuemanager.cpp index 313a734f..8082cc91 100644 --- a/amarok/src/queuemanager.cpp +++ b/amarok/src/queuemanager.cpp @@ -56,7 +56,7 @@ QueueItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt fw += 2; //add some more padding p->setPen( cg.highlightedText() ); - p->drawText( width - fw, 2, fw, h-1, Qt::AlignCenter, str ); + p->drawText( width - fw, 2, fw, h-1, TQt::AlignCenter, str ); } @@ -64,8 +64,8 @@ QueueItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt /// CLASS QueueList ////////////////////////////////////////////////////////////////////////////////////////// -QueueList::QueueList( TQWidget *parent, const char *name ) - : KListView( parent, name ) +QueueList::QueueList( TQWidget *tqparent, const char *name ) + : KListView( tqparent, name ) { addColumn( i18n("Name") ); setResizeMode( TQListView::LastColumn ); @@ -105,9 +105,9 @@ QueueList::viewportPaintEvent( TQPaintEvent *e ) const uint x = (viewport()->width() - w - 30) / 2 ; const uint y = (viewport()->height() - h - 30) / 2 ; - p.setBrush( colorGroup().background() ); + p.setBrush( tqcolorGroup().background() ); p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h ); - t.draw( &p, x+15, y+15, TQRect(), colorGroup() ); + t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() ); } } @@ -262,10 +262,10 @@ QueueList::contentsDropEvent( TQDropEvent *e ) } else { - TQListViewItem *parent = 0; + TQListViewItem *tqparent = 0; TQListViewItem *after; - findDrop( e->pos(), parent, after ); + findDrop( e->pos(), tqparent, after ); QueueManager::instance()->addItems( after ); } @@ -278,8 +278,8 @@ QueueList::contentsDropEvent( TQDropEvent *e ) QueueManager *QueueManager::s_instance = 0; -QueueManager::QueueManager( TQWidget *parent, const char *name ) - : KDialogBase( KDialogBase::Swallow, 0, parent, name, false, 0, Ok|Apply|Cancel ) +QueueManager::QueueManager( TQWidget *tqparent, const char *name ) + : KDialogBase( KDialogBase::Swallow, 0, tqparent, name, false, 0, Ok|Apply|Cancel ) { s_instance = this; @@ -299,11 +299,11 @@ QueueManager::QueueManager( TQWidget *parent, const char *name ) m_listview = new QueueList( box ); TQVBox *buttonBox = new TQVBox( box ); - m_up = new KPushButton( KGuiItem( TQString::null, "up" ), buttonBox ); - m_down = new KPushButton( KGuiItem( TQString::null, "down" ), buttonBox ); - m_remove = new KPushButton( KGuiItem( TQString::null, Amarok::icon( "dequeue_track" ) ), buttonBox ); - m_add = new KPushButton( KGuiItem( TQString::null, Amarok::icon( "queue_track" ) ), buttonBox ); - m_clear = new KPushButton( KGuiItem( TQString::null, Amarok::icon( "playlist_clear" ) ), buttonBox ); + m_up = new KPushButton( KGuiItem( TQString(), "up" ), buttonBox ); + m_down = new KPushButton( KGuiItem( TQString(), "down" ), buttonBox ); + m_remove = new KPushButton( KGuiItem( TQString(), Amarok::icon( "dequeue_track" ) ), buttonBox ); + m_add = new KPushButton( KGuiItem( TQString(), Amarok::icon( "queue_track" ) ), buttonBox ); + m_clear = new KPushButton( KGuiItem( TQString(), Amarok::icon( "playlist_clear" ) ), buttonBox ); TQToolTip::add( m_up, i18n( "Move up" ) ); TQToolTip::add( m_down, i18n( "Move down" ) ); @@ -371,9 +371,9 @@ QueueManager::addItems( TQListViewItem *after ) #define item static_cast<PlaylistItem*>(item) TQValueList<PlaylistItem*> current = m_map.values(); - if( current.find( item ) == current.end() ) //avoid duplication + if( current.tqfind( item ) == current.end() ) //avoid duplication { - TQString title = i18n("%1 - %2").arg( item->artist(), item->title() ); + TQString title = i18n("%1 - %2").tqarg( item->artist(), item->title() ); after = new QueueItem( m_listview, after, title ); m_map[ after ] = item; @@ -401,22 +401,22 @@ QueueManager::addQueuedItem( PlaylistItem *item ) Playlist *pl = Playlist::instance(); if( !pl ) return; //should never happen - const int index = pl->m_nextTracks.findRef( item ); + const int index = pl->m_nextTracks.tqfindRef( item ); TQListViewItem *after; if( !index ) after = 0; else { - int find = m_listview->childCount(); - if( index - 1 <= find ) - find = index - 1; - after = m_listview->itemAtIndex( find ); + int tqfind = m_listview->childCount(); + if( index - 1 <= tqfind ) + tqfind = index - 1; + after = m_listview->itemAtIndex( tqfind ); } TQValueList<PlaylistItem*> current = m_map.values(); - TQValueListIterator<PlaylistItem*> newItem = current.find( item ); + TQValueListIterator<PlaylistItem*> newItem = current.tqfind( item ); - TQString title = i18n("%1 - %2").arg( item->artist(), item->title() ); + TQString title = i18n("%1 - %2").tqarg( item->artist(), item->title() ); if( newItem == current.end() ) //avoid duplication { @@ -432,11 +432,11 @@ QueueManager::removeQueuedItem( PlaylistItem *item ) if( !pl ) return; //should never happen TQValueList<PlaylistItem*> current = m_map.values(); - TQValueListIterator<PlaylistItem*> newItem = current.find( item ); + TQValueListIterator<PlaylistItem*> newItem = current.tqfind( item ); - TQString title = i18n("%1 - %2").arg( item->artist(), item->title() ); + TQString title = i18n("%1 - %2").tqarg( item->artist(), item->title() ); - TQListViewItem *removableItem = m_listview->findItem( title, 0 ); + TQListViewItem *removableItem = m_listview->tqfindItem( title, 0 ); if( removableItem ) { @@ -478,7 +478,7 @@ QueueManager::insertItems() for( PlaylistItem *item = list.first(); item; item = list.next() ) { - TQString title = i18n("%1 - %2").arg( item->artist(), item->title() ); + TQString title = i18n("%1 - %2").tqarg( item->artist(), item->title() ); last = new QueueItem( m_listview, last, title ); m_map[ last ] = item; @@ -504,7 +504,7 @@ QueueManager::removeSelected() //SLOT for( TQListViewItem *item = selected.first(); item; item = selected.next() ) { //Remove the key from the map, so we can re-queue the item - TQMapIterator<TQListViewItem*, PlaylistItem*> it = m_map.find( item ); + TQMapIterator<TQListViewItem*, PlaylistItem*> it = m_map.tqfind( item ); m_map.remove( it ); diff --git a/amarok/src/queuemanager.h b/amarok/src/queuemanager.h index 072b8fb0..478bc247 100644 --- a/amarok/src/queuemanager.h +++ b/amarok/src/queuemanager.h @@ -11,8 +11,8 @@ * * ***************************************************************************/ -#ifndef AMAROK_QUEUEMANAGER_H -#define AMAROK_QUEUEMANAGER_H +#ifndef AMAROK_TQUEUEMANAGER_H +#define AMAROK_TQUEUEMANAGER_H #include "playlistitem.h" @@ -26,8 +26,8 @@ class KPushButton; class QueueItem : public KListViewItem { public: - QueueItem( TQListView *parent, TQListViewItem *after, TQString t ) - : KListViewItem( parent, after, t ) + QueueItem( TQListView *tqparent, TQListViewItem *after, TQString t ) + : KListViewItem( tqparent, after, t ) { }; void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); @@ -37,11 +37,12 @@ class QueueItem : public KListViewItem class QueueList : public KListView { Q_OBJECT + TQ_OBJECT friend class QueueManager; public: - QueueList( TQWidget *parent, const char *name = 0 ); + QueueList( TQWidget *tqparent, const char *name = 0 ); ~QueueList() {}; bool hasSelection(); @@ -68,9 +69,10 @@ class QueueList : public KListView class QueueManager : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - QueueManager( TQWidget *parent = 0, const char *name = 0 ); + QueueManager( TQWidget *tqparent = 0, const char *name = 0 ); ~QueueManager(); TQPtrList<PlaylistItem> newQueue(); @@ -103,4 +105,4 @@ class QueueManager : public KDialogBase static QueueManager *s_instance; }; -#endif /* AMAROK_QUEUEMANAGER_H */ +#endif /* AMAROK_TQUEUEMANAGER_H */ diff --git a/amarok/src/refreshimages.cpp b/amarok/src/refreshimages.cpp index 8b9dfe90..8967f978 100644 --- a/amarok/src/refreshimages.cpp +++ b/amarok/src/refreshimages.cpp @@ -52,9 +52,9 @@ RefreshImages::RefreshImages() TQString url = TQString("http://webservices.amazon.%1/onca/xml?Service=AWSECommerceService&SubscriptionId=%2&Operation=ItemLookup&ItemId=%3&ResponseGroup=Small,Images") - .arg(localeToTLD(locale)) - .arg("0RQSQ0B8CRY7VX2VF3G2") //Ian Monroe - .arg(asin); + .tqarg(localeToTLD(locale)) + .tqarg("0RTQSQ0B8CRY7VX2VF3G2") //Ian Monroe + .tqarg(asin); debug() << url << endl; diff --git a/amarok/src/refreshimages.h b/amarok/src/refreshimages.h index 7d7678a0..09adfb3c 100644 --- a/amarok/src/refreshimages.h +++ b/amarok/src/refreshimages.h @@ -14,7 +14,7 @@ class TQStringList; class JobInfo { public: - JobInfo() : m_last(false) { } //for QMap + JobInfo() : m_last(false) { } //for TQMap JobInfo(const TQString& asin, const TQString& locale, bool last) : m_asin(asin), m_locale(locale), m_last(last) { } TQString m_asin; @@ -23,9 +23,10 @@ class JobInfo bool m_last; }; -class RefreshImages : public QObject +class RefreshImages : public TQObject { Q_OBJECT + TQ_OBJECT public: RefreshImages(); private slots: diff --git a/amarok/src/scancontroller.cpp b/amarok/src/scancontroller.cpp index 60c18f10..64182944 100644 --- a/amarok/src/scancontroller.cpp +++ b/amarok/src/scancontroller.cpp @@ -55,8 +55,8 @@ void ScanController::setInstance( ScanController* curr ) currController = curr; } -ScanController::ScanController( CollectionDB* parent, bool incremental, const TQStringList& folders ) - : DependentJob( parent, "CollectionScanner" ) +ScanController::ScanController( CollectionDB* tqparent, bool incremental, const TQStringList& folders ) + : DependentJob( tqparent, "CollectionScanner" ) , TQXmlDefaultHandler() , m_scanner( new Amarok::ProcIO() ) , m_folders( TQDeepCopy<TQStringList>( folders ) ) @@ -141,7 +141,7 @@ ScanController::completeJob( void ) { for( it = m_filesAdded.begin(); it != m_filesAdded.end(); ++it ) { - if( m_filesDeleted.contains( it.key() ) ) + if( m_filesDeleted.tqcontains( it.key() ) ) m_filesDeleted.remove( it.key() ); } for( it = m_filesAdded.begin(); it != m_filesAdded.end(); ++it ) @@ -189,7 +189,7 @@ ScanController::initIncremental() const TQStringList values = CollectionDB::instance()->query( TQString( "SELECT deviceid, dir, changedate FROM directories WHERE deviceid IN (%1);" ) - .arg( deviceIds ) ); + .tqarg( deviceIds ) ); foreach( values ) { @@ -248,7 +248,7 @@ ScanController::doJob() //in), so preserve the necessary other tables (eg artist) CollectionDB::instance()->prepareTempTables(); - CollectionDB::instance()->invalidateArtistAlbumCache(); + CollectionDB::instance()->tqinvalidateArtistAlbumCache(); main_loop: uint delayCount = 100; @@ -268,7 +268,7 @@ main_loop: TQDeepCopy<TQString> data = m_xmlData; m_source->setData( data ); - m_xmlData = TQString::null; + m_xmlData = TQString(); m_dataMutex.unlock(); @@ -380,7 +380,7 @@ ScanController::requestAcknowledged() void ScanController::slotFileMoved( const TQString &/*src*/, const TQString &/*dest*/) { - //why is this needed? QBob, take a look at this + //why is this needed? TQBob, take a look at this /* if( m_incremental ) // pedantry { @@ -486,10 +486,10 @@ ScanController::startElement( const TQString&, const TQString& localName, const else if( localName == "image" ) { // Deserialize CoverBundle list TQStringList list = TQStringList::split( "AMAROK_MAGIC", attrs.value( "list" ), true ); - TQValueList< QPair<TQString, TQString> > covers; + TQValueList< TQPair<TQString, TQString> > covers; for( uint i = 0; i < list.count(); ) { - covers += qMakePair( list[i], list[i + 1] ); + covers += tqMakePair( list[i], list[i + 1] ); i += 2; } @@ -511,7 +511,7 @@ ScanController::customEvent( TQCustomEvent* e ) { debug() << "RestartEvent received." << endl; - TQFile log( Amarok::saveLocation( TQString::null ) + "collection_scan.log" ); + TQFile log( Amarok::saveLocation( TQString() ) + "collection_scan.log" ); if ( !log.open( IO_ReadOnly ) ) ::warning() << "Failed opening log file " << log.name() << endl; else { @@ -521,7 +521,7 @@ ScanController::customEvent( TQCustomEvent* e ) } m_dataMutex.lock(); - m_xmlData = TQString::null; + m_xmlData = TQString(); delete m_source; m_source = new TQXmlInputSource(); m_dataMutex.unlock(); diff --git a/amarok/src/scancontroller.h b/amarok/src/scancontroller.h index edff21dc..780b65c6 100644 --- a/amarok/src/scancontroller.h +++ b/amarok/src/scancontroller.h @@ -42,10 +42,16 @@ class KProcIO; * driven SAX2 parser is used, which can process the entities as they arrive, without * the need for a DOM document structure. */ - -class ScanController : public ThreadManager::DependentJob, public QXmlDefaultHandler +#ifdef Q_MOC_RUN +// MOC_SKIP_BEGIN +class ScanController : public JobBase, public TQXmlDefaultHandler +// MOC_SKIP_END +#else // Q_MOC_RUN +class ScanController : public ThreadManager::DependentJob, public TQXmlDefaultHandler +#endif // Q_MOC_RUN { Q_OBJECT + TQ_OBJECT public: static const int RestartEventType = 8891; @@ -68,7 +74,7 @@ class ScanController : public ThreadManager::DependentJob, public QXmlDefaultHan }; public: - ScanController( CollectionDB* parent, bool incremental, const TQStringList& folders = TQStringList() ); + ScanController( CollectionDB* tqparent, bool incremental, const TQStringList& folders = TQStringList() ); ~ScanController(); static ScanController* instance(); diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp index ea2a89eb..a22d83f7 100644 --- a/amarok/src/scriptmanager.cpp +++ b/amarok/src/scriptmanager.cpp @@ -80,7 +80,7 @@ namespace Amarok { */ ProcIO::ProcIO() : KProcIO( TQTextCodec::codecForName( "UTF-8" ) ) {} - QString + TQString proxyForUrl(const TQString& url) { KURL kurl( url ); @@ -88,14 +88,14 @@ namespace Amarok { TQString proxy; if ( KProtocolManager::proxyForURL( kurl ) != - TQString::fromLatin1( "DIRECT" ) ) { + TQString::tqfromLatin1( "DIRECT" ) ) { KProtocolManager::slaveProtocol ( kurl, proxy ); } return proxy; } - QString + TQString proxyForProtocol(const TQString& protocol) { return KProtocolManager::proxyFor( protocol ); @@ -114,8 +114,8 @@ namespace Amarok { class AmarokScriptNewStuff : public KNewStuff { public: - AmarokScriptNewStuff(const TQString &type, TQWidget *parentWidget=0) - : KNewStuff( type, parentWidget ) + AmarokScriptNewStuff(const TQString &type, TQWidget *tqparentWidget=0) + : KNewStuff( type, tqparentWidget ) {} bool install( const TQString& fileName ) @@ -134,8 +134,8 @@ class AmarokScriptNewStuff : public KNewStuff ScriptManager* ScriptManager::s_instance = 0; -ScriptManager::ScriptManager( TQWidget *parent, const char *name ) - : KDialogBase( parent, name, false, TQString::null, Close, Close, true ) +ScriptManager::ScriptManager( TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, false, TQString(), Close, Close, true ) , EngineObserver( EngineController::instance() ) , m_gui( new ScriptManagerBase( this ) ) { @@ -199,9 +199,9 @@ ScriptManager::ScriptManager( TQWidget *parent, const char *name ) m_gui->configureButton->setIconSet( SmallIconSet( Amarok::icon( "configure" ) ) ); m_gui->aboutButton ->setIconSet( SmallIconSet( Amarok::icon( "info" ) ) ); - TQSize sz = sizeHint(); + TQSize sz = tqsizeHint(); setMinimumSize( kMax( 350, sz.width() ), kMax( 250, sz.height() ) ); - resize( sizeHint() ); + resize( tqsizeHint() ); connect( this, TQT_SIGNAL(lyricsScriptChanged()), ContextBrowser::instance(), TQT_SLOT( lyricsScriptChanged() ) ); @@ -245,7 +245,7 @@ ScriptManager::~ScriptManager() bool ScriptManager::runScript( const TQString& name, bool silent ) { - if( !m_scripts.contains( name ) ) + if( !m_scripts.tqcontains( name ) ) return false; m_gui->listView->setCurrentItem( m_scripts[name].li ); @@ -256,7 +256,7 @@ ScriptManager::runScript( const TQString& name, bool silent ) bool ScriptManager::stopScript( const TQString& name ) { - if( !m_scripts.contains( name ) ) + if( !m_scripts.tqcontains( name ) ) return false; m_gui->listView->setCurrentItem( m_scripts[name].li ); @@ -266,7 +266,7 @@ ScriptManager::stopScript( const TQString& name ) } -QStringList +TQStringList ScriptManager::listRunningScripts() { TQStringList runningScripts; @@ -285,10 +285,10 @@ ScriptManager::customMenuClicked( const TQString& message ) } -QString +TQString ScriptManager::specForScript( const TQString& name ) { - if( !m_scripts.contains( name ) ) + if( !m_scripts.tqcontains( name ) ) return TQString(); TQFileInfo info( m_scripts[name].url.path() ); const TQString specPath = info.dirPath() + '/' + info.baseName( true ) + ".spec"; @@ -339,12 +339,12 @@ ScriptManager::requestNewScore( const TQString &url, double prevscore, int playc m_scripts[script].process->writeStdin( TQString( "requestNewScore %6 %1 %2 %3 %4 %5" ) - .arg( prevscore ) - .arg( playcount ) - .arg( length ) - .arg( percentage ) - .arg( reason ) - .arg( KURL::encode_string( url ) ) ); //last because it might have %s + .tqarg( prevscore ) + .tqarg( playcount ) + .tqarg( length ) + .tqarg( percentage ) + .tqarg( reason ) + .tqarg( KURL::encode_string( url ) ) ); //last because it might have %s } //////////////////////////////////////////////////////////////////////////////// @@ -370,7 +370,7 @@ ScriptManager::findScripts() //SLOT { foreach( runningScripts ) - if( m_scripts.contains( *it ) ) { + if( m_scripts.tqcontains( *it ) ) { debug() << "Auto-running script: " << *it << endl; m_gui->listView->setCurrentItem( m_scripts[*it].li ); slotRunScript(); @@ -414,7 +414,7 @@ ScriptManager::slotInstallScript( const TQString& path ) TQString _path = path; if( path.isNull() ) { - _path = KFileDialog::getOpenFileName( TQString::null, + _path = KFileDialog::getOpenFileName( TQString(), "*.amarokscript.tar *.amarokscript.tar.bz2 *.amarokscript.tar.gz|" + i18n( "Script Packages (*.amarokscript.tar, *.amarokscript.tar.bz2, *.amarokscript.tar.gz)" ) , this @@ -435,7 +435,7 @@ ScriptManager::slotInstallScript( const TQString& path ) const TQString scriptFolder = destination + archiveDir->entries().first(); if( TQFile::exists( scriptFolder ) ) { KMessageBox::error( 0, i18n( "A script with the name '%1' is already installed. " - "Please uninstall it first." ).arg( archiveDir->entries().first() ) ); + "Please uninstall it first." ).tqarg( archiveDir->entries().first() ) ); return false; } @@ -491,7 +491,7 @@ ScriptManager::slotRetrieveScript() // Delete KNewStuff's configuration entries. These entries reflect which scripts // are already installed. As we cannot yet keep them in sync after uninstalling // scripts, we deactivate the check marks entirely. - Amarok::config()->deleteGroup( "KNewStuffStatus" ); + Amarok::config()->deleteGroup( "KNewStufftqStatus" ); // we need this because KNewStuffGeneric's install function isn't clever enough AmarokScriptNewStuff *kns = new AmarokScriptNewStuff( "amarok/script", this ); @@ -512,10 +512,10 @@ ScriptManager::slotUninstallScript() { const TQString name = m_gui->listView->currentItem()->text( 0 ); - if( KMessageBox::warningContinueCancel( 0, i18n( "Are you sure you want to uninstall the script '%1'?" ).arg( name ), i18n("Uninstall Script"), i18n("Uninstall") ) == KMessageBox::Cancel ) + if( KMessageBox::warningContinueCancel( 0, i18n( "Are you sure you want to uninstall the script '%1'?" ).tqarg( name ), i18n("Uninstall Script"), i18n("Uninstall") ) == KMessageBox::Cancel ) return; - if( m_scripts.find( name ) == m_scripts.end() ) + if( m_scripts.tqfind( name ) == m_scripts.end() ) return; KURL scriptDirURL( m_scripts[name].url.upURL() ); @@ -570,14 +570,14 @@ ScriptManager::slotRunScript( bool silent ) TQListViewItem* const li = m_gui->listView->currentItem(); const TQString name = li->text( 0 ); - if( m_scripts[name].type == "lyrics" && lyricsScriptRunning() != TQString::null ) { + if( m_scripts[name].type == "lyrics" && lyricsScriptRunning() != TQString() ) { if( !silent ) KMessageBox::sorry( 0, i18n( "Another lyrics script is already running. " "You may only run one lyrics script at a time." ) ); return false; } - if( m_scripts[name].type == "transcode" && transcodeScriptRunning() != TQString::null ) { + if( m_scripts[name].type == "transcode" && transcodeScriptRunning() != TQString() ) { if( !silent ) KMessageBox::sorry( 0, i18n( "Another transcode script is already running. " "You may only run one transcode script at a time." ) ); @@ -610,7 +610,7 @@ ScriptManager::slotRunScript( bool silent ) { if( !silent ) KMessageBox::sorry( 0, i18n( "<p>Could not start the script <i>%1</i>.</p>" - "<p>Please make sure that the file has execute (+x) permissions.</p>" ).arg( name ) ); + "<p>Please make sure that the file has execute (+x) permissions.</p>" ).tqarg( name ) ); delete script; return false; } @@ -634,11 +634,11 @@ ScriptManager::slotStopScript() const TQString name = li->text( 0 ); // Just a sanity check - if( m_scripts.find( name ) == m_scripts.end() ) + if( m_scripts.tqfind( name ) == m_scripts.end() ) return; terminateProcess( &m_scripts[name].process ); - m_scripts[name].log = TQString::null; + m_scripts[name].log = TQString(); slotCurrentChanged( m_gui->listView->currentItem() ); li->setPixmap( 0, TQPixmap() ); @@ -654,7 +654,7 @@ ScriptManager::slotConfigureScript() const KURL url = m_scripts[name].url; TQDir::setCurrent( url.directory() ); - m_scripts[name].process->writeStdin( "configure" ); + m_scripts[name].process->writeStdin( TQString("configure") ); } @@ -671,14 +671,14 @@ ScriptManager::slotAboutScript() } KAboutDialog* about = new KAboutDialog( KAboutDialog::AbtTabbed|KAboutDialog::AbtProduct, - TQString::null, + TQString(), KDialogBase::Ok, KDialogBase::Ok, this ); kapp->setTopWidget( about ); - about->setCaption( kapp->makeStdCaption( i18n( "About %1" ).arg( name ) ) ); + about->setCaption( kapp->makeStdCaption( i18n( "About %1" ).tqarg( name ) ) ); about->setProduct( "", "", "", "" ); // Get rid of the confusing KDE version text - TQLabel* product = static_cast<TQLabel*>( about->mainWidget()->child( "version" ) ); - if( product ) product->setText( i18n( "%1 Amarok Script" ).arg( name ) ); + TQLabel* product = static_cast<TQLabel*>( TQT_TQWIDGET(about->mainWidget()->child( "version" )) ); + if( product ) product->setText( i18n( "%1 Amarok Script" ).tqarg( name ) ); about->addTextPage( i18n( "About" ), readme.readAll(), true ); if( license.open( IO_ReadOnly ) ) @@ -726,7 +726,7 @@ ScriptManager::slotShowContextMenu( TQListViewItem* item, const TQPoint& pos ) KTextEdit* editor = new KTextEdit( it.data().log ); kapp->setTopWidget( editor ); - editor->setCaption( kapp->makeStdCaption( i18n( "Output Log for %1" ).arg( it.key() ) ) ); + editor->setCaption( kapp->makeStdCaption( i18n( "Output Log for %1" ).tqarg( it.key() ) ) ); editor->setReadOnly( true ); TQFont font( "fixed" ); @@ -746,7 +746,7 @@ ScriptManager::slotShowContextMenu( TQListViewItem* item, const TQPoint& pos ) void ScriptManager::slotReceivedStdout( KProcess*, char* buf, int len ) { - debug() << TQString::fromLatin1( buf, len ) << endl; + debug() << TQString::tqfromLatin1( buf, len ) << endl; } @@ -759,7 +759,7 @@ ScriptManager::slotReceivedStderr( KProcess* process, char* buf, int len ) for( it = m_scripts.begin(); it != end; ++it ) if( it.data().process == process ) break; - const TQString text = TQString::fromLatin1( buf, len ); + const TQString text = TQString::tqfromLatin1( buf, len ); error() << it.key() << ":\n" << text << endl; if( it.data().log.length() > 20000 ) @@ -780,13 +780,13 @@ ScriptManager::scriptFinished( KProcess* process ) //SLOT // Check if there was an error on exit if( process->normalExit() && process->exitStatus() != 0 ) KMessageBox::detailedError( 0, i18n( "The script '%1' exited with error code: %2" ) - .arg( it.key() ).arg( process->exitStatus() ) + .tqarg( it.key() ).tqarg( process->exitStatus() ) ,it.data().log ); // Destroy script process delete it.data().process; it.data().process = 0; - it.data().log = TQString::null; + it.data().log = TQString(); it.data().li->setPixmap( 0, TQPixmap() ); slotCurrentChanged( m_gui->listView->currentItem() ); } @@ -796,7 +796,7 @@ ScriptManager::scriptFinished( KProcess* process ) //SLOT // private //////////////////////////////////////////////////////////////////////////////// -QStringList +TQStringList ScriptManager::scriptsOfType( const TQString &type ) const { TQStringList scripts; @@ -808,7 +808,7 @@ ScriptManager::scriptsOfType( const TQString &type ) const } -QString +TQString ScriptManager::scriptRunningOfType( const TQString &type ) const { foreachType( ScriptMap, m_scripts ) @@ -820,7 +820,7 @@ ScriptManager::scriptRunningOfType( const TQString &type ) const } -QString +TQString ScriptManager::ensureScoreScriptRunning() { TQString s = scoreScriptRunning(); diff --git a/amarok/src/scriptmanager.h b/amarok/src/scriptmanager.h index bf926859..a3707248 100644 --- a/amarok/src/scriptmanager.h +++ b/amarok/src/scriptmanager.h @@ -56,11 +56,12 @@ class KProcIO; class ScriptManager : public KDialogBase, public EngineObserver { Q_OBJECT + TQ_OBJECT friend class AmarokScriptNewStuff; public: - ScriptManager( TQWidget *parent = 0, const char *name = 0 ); + ScriptManager( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~ScriptManager(); static ScriptManager* instance() { return s_instance ? s_instance : new ScriptManager( PlaylistWindow::self() ); } @@ -88,7 +89,7 @@ class ScriptManager : public KDialogBase, public EngineObserver /** Returns the path of the spec file of the given script */ TQString specForScript( const TQString& name ); - /** Return name of the lyrics script currently running, or TQString::null if none */ + /** Return name of the lyrics script currently running, or TQString() if none */ TQString lyricsScriptRunning() const; /** Returns a list of all lyrics scripts */ @@ -103,13 +104,13 @@ class ScriptManager : public KDialogBase, public EngineObserver /** Sends a playlistChange notification to all scripts */ void notifyPlaylistChange( const TQString& change ); - /** Return name of the transcode script currently running, or TQString::null if none */ + /** Return name of the transcode script currently running, or TQString() if none */ TQString transcodeScriptRunning() const; /** Sends a transcode notification to all scripts */ void notifyTranscode( const TQString& srcUrl, const TQString& filetype ); - /** Return name of the scoring script currently running, or TQString::null if none */ + /** Return name of the scoring script currently running, or TQString() if none */ TQString scoreScriptRunning() const; /** Returns a list of all scoring scripts */ @@ -129,7 +130,7 @@ class ScriptManager : public KDialogBase, public EngineObserver /** Enables/disables the buttons */ void slotCurrentChanged( TQListViewItem* ); - bool slotInstallScript( const TQString& path = TQString::null ); + bool slotInstallScript( const TQString& path = TQString() ); void slotRetrieveScript(); void slotUninstallScript(); bool slotRunScript( bool silent = false ); diff --git a/amarok/src/scriptmanagerbase.ui b/amarok/src/scriptmanagerbase.ui index 14445660..0b78f94c 100644 --- a/amarok/src/scriptmanagerbase.ui +++ b/amarok/src/scriptmanagerbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ScriptManagerBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ScriptManagerBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -48,14 +48,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> </size> </property> </spacer> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>retrieveButton</cstring> </property> @@ -63,7 +63,7 @@ <string>&Get More Scripts</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>installButton</cstring> </property> @@ -85,7 +85,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>aboutButton</cstring> </property> @@ -93,7 +93,7 @@ <string>&About</string> </property> </widget> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>runButton</cstring> </property> @@ -101,7 +101,7 @@ <string>&Run</string> </property> </widget> - <widget class="QPushButton" row="5" column="1"> + <widget class="TQPushButton" row="5" column="1"> <property name="name"> <cstring>stopButton</cstring> </property> @@ -109,7 +109,7 @@ <string>&Stop</string> </property> </widget> - <widget class="QPushButton" row="6" column="1"> + <widget class="TQPushButton" row="6" column="1"> <property name="name"> <cstring>configureButton</cstring> </property> @@ -117,7 +117,7 @@ <string>&Configure</string> </property> </widget> - <widget class="QPushButton" row="7" column="1"> + <widget class="TQPushButton" row="7" column="1"> <property name="name"> <cstring>uninstallButton</cstring> </property> @@ -130,6 +130,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="0"/> -<layoutfunctions spacing="KDialog::spacingHint"/> +<tqlayoutdefaults spacing="6" margin="0"/> +<tqlayoutfunctions spacing="KDialog::spacingHint"/> </UI> diff --git a/amarok/src/scripts/alarm/COPYING b/amarok/src/scripts/alarm/COPYING index 0fc8a215..449a9762 100644 --- a/amarok/src/scripts/alarm/COPYING +++ b/amarok/src/scripts/alarm/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/amarok/src/scripts/alarm/alarm.py b/amarok/src/scripts/alarm/alarm.py index 97152c73..e9bafa1c 100755 --- a/amarok/src/scripts/alarm/alarm.py +++ b/amarok/src/scripts/alarm/alarm.py @@ -140,7 +140,7 @@ class Alarm( QApplication ): string = QString( self.queue.get_nowait() ) print "[Alarm Script] Received notification: " + str( string ) - if string.contains( "configure" ): + if string.tqcontains( "configure" ): self.configure() def configure( self ): diff --git a/amarok/src/scripts/amarok_live/amarok.live.remaster.part1.sh b/amarok/src/scripts/amarok_live/amarok.live.remaster.part1.sh index 2ae79905..cdfde00d 100644 --- a/amarok/src/scripts/amarok_live/amarok.live.remaster.part1.sh +++ b/amarok/src/scripts/amarok_live/amarok.live.remaster.part1.sh @@ -137,7 +137,7 @@ rmdir $WORK/amarok.livecd mkdir $WORK/amarok.live/home/amarok/.kde/share/apps/amarok/playlists chown 500:500 $WORK/amarok.live/home/amarok/.kde/share/apps/amarok/playlists -find $WORK/amarok.live/home/amarok/.kde/share/apps/ -type d -print0 | xargs -0 chmod +x +tqfind $WORK/amarok.live/home/amarok/.kde/share/apps/ -type d -print0 | xargs -0 chmod +x chmod -R 777 $WORK/amarok.live/music/ chmod -R 777 $WORK/amarok.live/home/amarok/.kde/share/apps/amarok #chmod -R 777 $WORK/mklivecd/ diff --git a/amarok/src/scripts/amarok_live/amarok_live.py b/amarok/src/scripts/amarok_live/amarok_live.py index 2a1fca82..ab51d907 100755 --- a/amarok/src/scripts/amarok_live/amarok_live.py +++ b/amarok/src/scripts/amarok_live/amarok_live.py @@ -222,7 +222,7 @@ class Remasterer( QApplication ): line = sys.stdin.readline() if line: - qApp.postEvent( self, Notification(line) ) + tqApp.postEvent( self, Notification(line) ) else: break @@ -237,12 +237,12 @@ class Remasterer( QApplication ): string = QString(notification.string) debug( "Received notification: " + str( string ) ) - if string.contains( "configure" ): + if string.tqcontains( "configure" ): self.configure() - if string.contains( "stop"): + if string.tqcontains( "stop"): self.stop() - elif string.contains( "customMenuClicked" ): + elif string.tqcontains( "customMenuClicked" ): if "selected" in string: self.copyTrack( string ) elif "playlist" in string: @@ -353,10 +353,10 @@ class Remasterer( QApplication ): # get the list of files. yes, its ugly. it works though. #files = event.split(":")[-1][2:-1].split()[2:] #trying out a new one - #files = event.split(":")[-1][3:-2].replace("\"Amarok live!\" \"add to livecd\" ", "").split("\" \"") + #files = event.split(":")[-1][3:-2].tqreplace("\"Amarok live!\" \"add to livecd\" ", "").split("\" \"") #and another - files = event.replace("customMenuClicked: Amarok live Add selected to livecd", "").split() + files = event.tqreplace("customMenuClicked: Amarok live Add selected to livecd", "").split() allfiles = "" for file in files: diff --git a/amarok/src/scripts/common/Zeroconf.py b/amarok/src/scripts/common/Zeroconf.py index fa508393..2a1f678e 100644 --- a/amarok/src/scripts/common/Zeroconf.py +++ b/amarok/src/scripts/common/Zeroconf.py @@ -112,7 +112,7 @@ _DNS_TTL = 60 * 60; # one hour default TTL _MAX_MSG_TYPICAL = 1460 # unused _MAX_MSG_ABSOLUTE = 8972 -_FLAGS_QR_MASK = 0x8000 # query response mask +_FLAGS_QR_MASK = 0x8000 # query response tqmask _FLAGS_QR_QUERY = 0x0000 # query _FLAGS_QR_RESPONSE = 0x8000 # response @@ -1092,7 +1092,7 @@ class ServiceInfo(object): index += length for s in strs: - eindex = s.find('=') + eindex = s.tqfind('=') if eindex == -1: # No equals sign at all key = s @@ -1417,7 +1417,7 @@ class Zeroconf(object): while i < 3: for record in self.cache.entriesWithName(info.type): if record.type == _TYPE_PTR and not record.isExpired(now) and record.alias == info.name: - if (info.name.find('.') < 0): + if (info.name.tqfind('.') < 0): info.name = info.name + ".[" + info.address + ":" + info.port + "]." + info.type self.checkService(info) return diff --git a/amarok/src/scripts/databasescripts/TODO b/amarok/src/scripts/databasescripts/TODO index 76457207..cfebb831 100644 --- a/amarok/src/scripts/databasescripts/TODO +++ b/amarok/src/scripts/databasescripts/TODO @@ -6,5 +6,5 @@ Script Ideas: General: * Properly use the ui file, to make it easier to maintain later -* Maybe pass error messages back to the parent dialog to abstract scripts away from amarok? +* Maybe pass error messages back to the tqparent dialog to abstract scripts away from amarok? diff --git a/amarok/src/scripts/databasescripts/databaseScripts.rb b/amarok/src/scripts/databasescripts/databaseScripts.rb index 5d38de77..d42086fc 100644 --- a/amarok/src/scripts/databasescripts/databaseScripts.rb +++ b/amarok/src/scripts/databasescripts/databaseScripts.rb @@ -27,9 +27,9 @@ class DatabaseScriptChooser < Qt::Dialog attr_reader :m_saveDir attr_reader :m_okayButton - slots 'optionChanged(int)', 'textChanged(const QString &)', 'accept()', 'cancel()' + Q_SLOTS 'optionChanged(int)', 'textChanged(const QString &)', 'accept()', 'cancel()' - def initialize(parent = nil, name = nil, modal = false, fl = 0) + def initialize(tqparent = nil, name = nil, modal = false, fl = 0) super if name.nil? @@ -38,36 +38,36 @@ class DatabaseScriptChooser < Qt::Dialog @Form1Layout = Qt::GridLayout.new(self, 1, 1, 2, 2, 'Form1Layout') - @layout3 = Qt::VBoxLayout.new(nil, 0, 2, 'layout3') + @tqlayout3 = Qt::VBoxLayout.new(nil, 0, 2, 'tqlayout3') @m_optionCombo = Qt::ComboBox.new(false, self, "m_optionCombo") - @layout3.addWidget(@m_optionCombo) + @tqlayout3.addWidget(@m_optionCombo) - @layout1 = Qt::HBoxLayout.new(nil, 0, 2, 'layout1') + @tqlayout1 = Qt::HBoxLayout.new(nil, 0, 2, 'tqlayout1') @m_saveText = Qt::Label.new(self, "m_saveText") - @layout1.addWidget(@m_saveText) + @tqlayout1.addWidget(@m_saveText) @m_saveDir = KDE::URLRequester.new(self, "m_saveDir") @m_saveDir.setMode( KDE::File::Directory | KDE::File::ExistingOnly ); @m_saveDir.setURL( ENV["HOME"] ) - @layout1.addWidget(@m_saveDir) - @layout3.addLayout(@layout1) + @tqlayout1.addWidget(@m_saveDir) + @tqlayout3.addLayout(@tqlayout1) @spacer1 = Qt::SpacerItem.new(20, 21, Qt::SizePolicy::Minimum, Qt::SizePolicy::Expanding) - @layout3.addItem(@spacer1) + @tqlayout3.addItem(@spacer1) - @layout2 = Qt::HBoxLayout.new(nil, 0, 2, 'layout2') + @tqlayout2 = Qt::HBoxLayout.new(nil, 0, 2, 'tqlayout2') @m_cancelButton = Qt::PushButton.new(self, "@m_cancelButton") - @layout2.addWidget(@m_cancelButton) + @tqlayout2.addWidget(@m_cancelButton) @spacer2 = Qt::SpacerItem.new(61, 20, Qt::SizePolicy::Expanding, Qt::SizePolicy::Minimum) - @layout2.addItem(@spacer2) + @tqlayout2.addItem(@spacer2) @m_okayButton = Qt::PushButton.new(self, "m_okayButton") - @layout2.addWidget(@m_okayButton) - @layout3.addLayout(@layout2) + @tqlayout2.addWidget(@m_okayButton) + @tqlayout3.addLayout(@tqlayout2) connect( @m_optionCombo, SIGNAL( "activated(int)" ), self, SLOT( "optionChanged(int)" ) ); connect( @m_okayButton, SIGNAL( "clicked()" ), self, SLOT( "accept()" ) ) @@ -76,10 +76,10 @@ class DatabaseScriptChooser < Qt::Dialog connect( @m_saveDir, SIGNAL( "textChanged(const QString &)" ), self, SLOT( "textChanged(const QString &)" ) ); - @Form1Layout.addLayout(@layout3, 0, 0) + @Form1Layout.addLayout(@tqlayout3, 0, 0) languageChange() - resize( Qt::Size.new(356, 137).expandedTo(minimumSizeHint()) ) + resize( Qt::Size.new(356, 137).expandedTo(tqminimumSizeHint()) ) clearWState( WState_Polished ) end diff --git a/amarok/src/scripts/embedcover/COPYING b/amarok/src/scripts/embedcover/COPYING index 6822c1a4..de684ac0 100644 --- a/amarok/src/scripts/embedcover/COPYING +++ b/amarok/src/scripts/embedcover/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/amarok/src/scripts/embedcover/addimage2mp3.rb b/amarok/src/scripts/embedcover/addimage2mp3.rb index f5fd46d3..afccacea 100644 --- a/amarok/src/scripts/embedcover/addimage2mp3.rb +++ b/amarok/src/scripts/embedcover/addimage2mp3.rb @@ -28,7 +28,7 @@ def setId3v2Size( data, size ) end # -# Unsynchronize the entire ID3-V2 tag, frame by frame (replace 0xfff* with 0xff00f*) +# Unsynchronize the entire ID3-V2 tag, frame by frame (tqreplace 0xfff* with 0xff00f*) # def unsynchronize( data ) data[5] |= 0b10000000 # Set Unsychronization global tag flag diff --git a/amarok/src/scripts/graphequalizer/eqdialog.ui b/amarok/src/scripts/graphequalizer/eqdialog.ui index 81f98b6c..30facbce 100644 --- a/amarok/src/scripts/graphequalizer/eqdialog.ui +++ b/amarok/src/scripts/graphequalizer/eqdialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EqDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>EqDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -15,11 +15,11 @@ <property name="caption"> <string>Graph Equalizer</string> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>eqGroupBox</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>20</x> <y>20</y> @@ -36,11 +36,11 @@ <property name="checked"> <bool>true</bool> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>288</y> @@ -52,11 +52,11 @@ <string><p align="center">The blue drag points can be dragged to adjust the equalizer. Double-click on the line to add a new drag point.</p></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>20</y> @@ -68,17 +68,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -94,14 +94,14 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>preampSlider</cstring> </property> @@ -125,7 +125,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -134,7 +134,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>preampLabel</cstring> </property> @@ -148,13 +148,13 @@ <property name="name"> <cstring>canvasView</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>404</width> <height>200</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>404</width> <height>200</height> @@ -199,13 +199,13 @@ <includes> <include location="local" impldecl="in implementation">eqdialog.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>eqGroupBox_toggled( bool eqEnabled )</slot> -</slots> +</Q_SLOTS> <functions> <function specifier="non virtual">init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>equalizercanvasview.h</includehint> </includehints> diff --git a/amarok/src/scripts/graphequalizer/eqdialog.ui.h b/amarok/src/scripts/graphequalizer/eqdialog.ui.h index b52cec76..244422cb 100644 --- a/amarok/src/scripts/graphequalizer/eqdialog.ui.h +++ b/amarok/src/scripts/graphequalizer/eqdialog.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). diff --git a/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp b/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp index b8c1939f..aaea599a 100644 --- a/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp +++ b/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp @@ -16,8 +16,8 @@ #include <klocale.h> #include <kmessagebox.h> -EqualizerCanvasView::EqualizerCanvasView(TQWidget *parent = 0, const char *name = 0) - : TQCanvasView(parent, name) +EqualizerCanvasView::EqualizerCanvasView(TQWidget *tqparent = 0, const char *name = 0) + : TQCanvasView(tqparent, name) { m_pen.setWidth(5); m_circleList = new TQPtrList<EqualizerCircle>(); @@ -31,7 +31,7 @@ EqualizerCanvasView::init() // TQCanvasLine* line = new TQCanvasLine(this->canvas()); // line->setPoints(0,100,400,100); // line->setPen(TQPen(m_pen)); -// line->setBrush(TQBrush(Qt::black)); +// line->setBrush(TQBrush(TQt::black)); TQCanvasLine* lineLeft = makeLine(TQPoint(0,canvas()->height()/2) ,TQPoint(canvas()->width()/2,canvas()->height()/2)); TQCanvasLine* lineRight= makeLine(TQPoint(canvas()->width()/2,canvas()->height()/2) @@ -181,7 +181,7 @@ TQPtrList<EqualizerCircle>* circleList ) { m_line1 = line1; m_line2 = line2; - setBrush(TQBrush(Qt::blue)); + setBrush(TQBrush(TQt::blue)); move(x,y); m_circleList = circleList; @@ -192,7 +192,7 @@ TQPtrList<EqualizerCircle>* circleList ) { if(it->x() > x) { - index = m_circleList->find(it); + index = m_circleList->tqfind(it); //if(index != 0) //{ m_circleList->insert(index,this); @@ -205,7 +205,7 @@ TQPtrList<EqualizerCircle>* circleList ) m_circleList->append(this); //clean up the loose pointer for the line that was split - unsigned int circleIndex = m_circleList->find(this); + unsigned int circleIndex = m_circleList->tqfind(this); if(circleIndex > 0) m_circleList->at(circleIndex-1)->setLine(RIGHT,m_line1); if(circleIndex < m_circleList->count()-1) @@ -214,7 +214,7 @@ TQPtrList<EqualizerCircle>* circleList ) void EqualizerCircle::setLocation(const TQPoint &newLocation) { - unsigned int circleIndex = m_circleList->find(this); + unsigned int circleIndex = m_circleList->tqfind(this); double xMin, xMax; TQPoint correctedLoc(newLocation); if(m_line1 == 0 || m_line2 == 0) diff --git a/amarok/src/scripts/graphequalizer/equalizercanvasview.h b/amarok/src/scripts/graphequalizer/equalizercanvasview.h index 2a2352f5..f34dc8d9 100644 --- a/amarok/src/scripts/graphequalizer/equalizercanvasview.h +++ b/amarok/src/scripts/graphequalizer/equalizercanvasview.h @@ -4,8 +4,8 @@ */ -#ifndef _EQUALIZERCANVASVIEW_H_ -#define _EQUALIZERCANVASVIEW_H_ +#ifndef _ETQUALIZERCANVASVIEW_H_ +#define _ETQUALIZERCANVASVIEW_H_ #ifdef HAVE_CONFIG_H #include <config.h> @@ -17,7 +17,7 @@ #include <kmainwindow.h> -class EqualizerCircle : public QCanvasEllipse +class EqualizerCircle : public TQCanvasEllipse { public: @@ -40,11 +40,12 @@ private: * @short An equalizer widget for Amarok, using a line graph * @author Ian Monroe <ian@monroe.nu> */ -class EqualizerCanvasView : public QCanvasView +class EqualizerCanvasView : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: - EqualizerCanvasView(TQWidget *parent, const char *name); + EqualizerCanvasView(TQWidget *tqparent, const char *name); void init(); void contentsMousePressEvent(TQMouseEvent *event); void contentsMouseDoubleClickEvent(TQMouseEvent *event); @@ -61,13 +62,14 @@ private: TQPtrList<EqualizerCircle>* m_circleList; }; -class CallAmarok : public QObject +class CallAmarok : public TQObject { Q_OBJECT + TQ_OBJECT public: - CallAmarok(TQObject* parent, const char *name, + CallAmarok(TQObject* tqparent, const char *name, EqualizerCanvasView* canvasView, TQSlider* preampSlider) - : TQObject(parent, name) + : TQObject(tqparent, name) { m_canvasView = canvasView; m_preampSlider = preampSlider; @@ -79,4 +81,4 @@ private: EqualizerCanvasView* m_canvasView; }; -#endif // _EQUALIZERCANVASVIEW_H_ +#endif // _ETQUALIZERCANVASVIEW_H_ diff --git a/amarok/src/scripts/graphequalizer/equalizerdialog.h b/amarok/src/scripts/graphequalizer/equalizerdialog.h index 0b4b0f02..bdd3c161 100644 --- a/amarok/src/scripts/graphequalizer/equalizerdialog.h +++ b/amarok/src/scripts/graphequalizer/equalizerdialog.h @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef EQUALIZERDIALOG_H -#define EQUALIZERDIALOG_H +#ifndef ETQUALIZERDIALOG_H +#define ETQUALIZERDIALOG_H #include <tqdialog.h> @@ -26,9 +26,10 @@ /** @author Ian Monroe */ -class EqualizerDialog : public QDialog +class EqualizerDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: EqualizerDialog(); diff --git a/amarok/src/scripts/graphequalizer/stdinreader.h b/amarok/src/scripts/graphequalizer/stdinreader.h index 16ff12b4..4fa92856 100644 --- a/amarok/src/scripts/graphequalizer/stdinreader.h +++ b/amarok/src/scripts/graphequalizer/stdinreader.h @@ -9,12 +9,12 @@ #include <tqtextstream.h> #include <kdebug.h> -class StdinReader : public QObject +class StdinReader : public TQObject { -Q_OBJECT +TQ_OBJECT public: - StdinReader(TQObject * parent = 0, const char * name = 0) - :TQObject(parent,name) + StdinReader(TQObject * tqparent = 0, const char * name = 0) + :TQObject(tqparent,name) { TQSocketNotifier* streamListener = new TQSocketNotifier(0, TQSocketNotifier::Read, this, "stdinWatcher"); connect(streamListener, TQT_SIGNAL(activated(int)), this, TQT_SLOT(dataRecieved()) ); diff --git a/amarok/src/scripts/lyrics_astraweb/COPYING b/amarok/src/scripts/lyrics_astraweb/COPYING index 6822c1a4..de684ac0 100644 --- a/amarok/src/scripts/lyrics_astraweb/COPYING +++ b/amarok/src/scripts/lyrics_astraweb/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/amarok/src/scripts/lyrics_lyrc/COPYING b/amarok/src/scripts/lyrics_lyrc/COPYING index 6822c1a4..de684ac0 100644 --- a/amarok/src/scripts/lyrics_lyrc/COPYING +++ b/amarok/src/scripts/lyrics_lyrc/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/amarok/src/scripts/mp3fix/COPYING b/amarok/src/scripts/mp3fix/COPYING index 6822c1a4..de684ac0 100644 --- a/amarok/src/scripts/mp3fix/COPYING +++ b/amarok/src/scripts/mp3fix/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/amarok/src/scripts/playlist2html/Playlist.py b/amarok/src/scripts/playlist2html/Playlist.py index ff1779c5..f1785f1c 100644 --- a/amarok/src/scripts/playlist2html/Playlist.py +++ b/amarok/src/scripts/playlist2html/Playlist.py @@ -13,7 +13,7 @@ FIELDS = ("Artist", "Title", "Album", "Track", "Length", "Genre", "Score" ) class Track(object): """Class that holds the information of one track in the current playlist""" - __slots__ = FIELDS + __Q_SLOTS__ = FIELDS def __init__(self, **kwargs): for key,value in kwargs.iteritems(): @@ -23,7 +23,7 @@ class Track(object): def toRow(self, style=''): """Returns the a html-table-row with member values of this class""" tmp = ['<td>%s</td>'%(i) for i in [getattr(self,f) for f in \ - self.__slots__ ]] + self.__Q_SLOTS__ ]] tr_style = '' if style: tr_style='class="%s"'%(style) @@ -95,7 +95,7 @@ class Playlist: def _setFullPage(self): - self.fullPage = self.code%(os.environ['LOGNAME'],(self._createTable()).encode(self.encoding,'replace')) + self.fullPage = self.code%(os.environ['LOGNAME'],(self._createTable()).encode(self.encoding,'tqreplace')) def _getMtime(self): diff --git a/amarok/src/scripts/score_default/COPYING b/amarok/src/scripts/score_default/COPYING index 6822c1a4..de684ac0 100644 --- a/amarok/src/scripts/score_default/COPYING +++ b/amarok/src/scripts/score_default/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/amarok/src/scripts/score_impulsive/COPYING b/amarok/src/scripts/score_impulsive/COPYING index 6822c1a4..de684ac0 100644 --- a/amarok/src/scripts/score_impulsive/COPYING +++ b/amarok/src/scripts/score_impulsive/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/amarok/src/scripts/templates/amarok.rb b/amarok/src/scripts/templates/amarok.rb index fbbcc7fb..a0bbef95 100644 --- a/amarok/src/scripts/templates/amarok.rb +++ b/amarok/src/scripts/templates/amarok.rb @@ -19,7 +19,7 @@ ############################################################################ class QtIoListener < Qt::Object - slots 'dataRecieved()' + Q_SLOTS 'dataRecieved()' def initialize(app, iostream, lineHandler) super(app) @lineHandler = lineHandler diff --git a/amarok/src/scripts/templates/python_qt_template.py b/amarok/src/scripts/templates/python_qt_template.py index 177d728e..51a692ac 100755 --- a/amarok/src/scripts/templates/python_qt_template.py +++ b/amarok/src/scripts/templates/python_qt_template.py @@ -105,7 +105,7 @@ class Test( QApplication ): line = sys.stdin.readline() if line: - qApp.postEvent( self, Notification(line) ) + tqApp.postEvent( self, Notification(line) ) else: break @@ -120,22 +120,22 @@ class Test( QApplication ): string = QString(notification.string) debug( "Received notification: " + str( string ) ) - if string.contains( "configure" ): + if string.tqcontains( "configure" ): self.configure() - if string.contains( "engineStateChange: play" ): + if string.tqcontains( "engineStateChange: play" ): self.engineStatePlay() - if string.contains( "engineStateChange: idle" ): + if string.tqcontains( "engineStateChange: idle" ): self.engineStateIdle() - if string.contains( "engineStateChange: pause" ): + if string.tqcontains( "engineStateChange: pause" ): self.engineStatePause() - if string.contains( "engineStateChange: empty" ): + if string.tqcontains( "engineStateChange: empty" ): self.engineStatePause() - if string.contains( "trackChange" ): + if string.tqcontains( "trackChange" ): self.trackChange() # Notification callbacks. Implement these functions to react to specific notification diff --git a/amarok/src/scripts/webcontrol/Playlist.py b/amarok/src/scripts/webcontrol/Playlist.py index 2338d183..b93f2894 100644 --- a/amarok/src/scripts/webcontrol/Playlist.py +++ b/amarok/src/scripts/webcontrol/Playlist.py @@ -25,7 +25,7 @@ FIELDS = ("TrackNo", "Title", "Artist", "Album", "Length", "Rating") class Track(object): """Class that holds the information of one track in the current playlist""" - __slots__ = FIELDS + __Q_SLOTS__ = FIELDS max_field_value_lengths = [(0,"")] * len(FIELDS) @@ -49,13 +49,13 @@ class Track(object): aend = "</a>" - tmp = [ '<td>' + astart + i + aend +'</td>' for i in [getattr(self,f) for f in self.__slots__ ] ] + tmp = [ '<td>' + astart + i + aend +'</td>' for i in [getattr(self,f) for f in self.__Q_SLOTS__ ] ] index = 0 -# for f in self.__slots__ : +# for f in self.__Q_SLOTS__ : # print string.strip(f) - for i in [getattr(self,f) for f in self.__slots__ ]: + for i in [getattr(self,f) for f in self.__Q_SLOTS__ ]: if len(string.strip(i)) > Track.max_field_value_lengths[index][0]: Track.max_field_value_lengths[index] = (len(string.strip(i)),i) index += 1 @@ -237,9 +237,9 @@ class Playlist: counter = "countdown(" + str(status.timeLeft()) + ");" self.fullPage = code % ( counter, - self._createActions(status).encode(self.encoding,'replace'), + self._createActions(status).encode(self.encoding,'tqreplace'), os.environ['LOGNAME'], - self._createTable(status).encode(self.encoding,'replace') ) + self._createTable(status).encode(self.encoding,'tqreplace') ) def _getMtime(self): """gets the mtime from the current.xml file, to check if the current.xml diff --git a/amarok/src/scripts/webcontrol/RequestHandler.py b/amarok/src/scripts/webcontrol/RequestHandler.py index 8519ef35..02fe479e 100644 --- a/amarok/src/scripts/webcontrol/RequestHandler.py +++ b/amarok/src/scripts/webcontrol/RequestHandler.py @@ -28,11 +28,11 @@ PLIST = None REQ_IDS = {} # -# Holding current AmarokStatus. A bunch of init_XXX functions in +# Holding current AmaroktqStatus. A bunch of init_XXX functions in # order to begin dcop requests as early as possible to avoid too # much latency # -class AmarokStatus: +class AmaroktqStatus: EngineEmpty = 1 EngineIdle = 2 @@ -63,7 +63,7 @@ class AmarokStatus: if self.playState != -1: res = self.playState == self.EnginePlay else: - res = string.find(self.dcop_isplaying.result(), "true") >= 0 + res = string.tqfind(self.dcop_isplaying.result(), "true") >= 0 if res: self.playState = self.EnginePlay else: @@ -90,19 +90,19 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): our server.""" def _amarokPlay(self): - AmarokStatus.playState = AmarokStatus.EnginePlay + AmaroktqStatus.playState = AmaroktqStatus.EnginePlay Globals._dcopCallPlayer("play") def _amarokPause(self): - AmarokStatus.playState = AmarokStatus.EnginePause + AmaroktqStatus.playState = AmaroktqStatus.EnginePause Globals._dcopCallPlayer("pause") def _amarokNext(self): Globals._dcopCallPlayer("next") def _amarokGoto(self,index): - AmarokStatus.playState = AmarokStatus.EnginePlay - AmarokStatus.currentTrackIndex = int(index) + AmaroktqStatus.playState = AmaroktqStatus.EnginePlay + AmaroktqStatus.currentTrackIndex = int(index) Globals._dcopCallPlaylistArg("playByIndex",index) def _amarokPrev(self): @@ -110,7 +110,7 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): def _amarokStop(self): Globals._dcopCallPlayer("stop") - AmarokStatus.playState = AmarokStatus.EngineStop + AmaroktqStatus.playState = AmaroktqStatus.EngineStop def _amarokSetVolume(self, val): Globals._dcopCallPlayerArg("setVolume",val) @@ -165,8 +165,8 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): self._amarokSetVolume(qmap["value"]) return 1 - def _amarokStatus(self): - status = AmarokStatus() + def _amaroktqStatus(self): + status = AmaroktqStatus() return status def _sendFile(self, path): @@ -219,7 +219,7 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): qmap = self._parseQueryVars() session_id, last_req_id = self._getSessionInfo(qmap) - if AmarokStatus.allowControl and self._handleAction(qmap): + if AmaroktqStatus.allowControl and self._handleAction(qmap): last_req_id = last_req_id + 1 REQ_IDS[session_id] = last_req_id @@ -229,20 +229,20 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): # Surely there must be a better way that this:) # self.send_response(200) - if string.find(self.path, ".png") >= 0: + if string.tqfind(self.path, ".png") >= 0: self.send_header("content-type","image/png") self.end_headers() self._sendFile(self.path) - elif string.find(self.path, ".js") >= 0: + elif string.tqfind(self.path, ".js") >= 0: self.send_header("content-type","text/plain") self.end_headers() self._sendFile(self.path) - elif string.find(self.path, ".css") >= 0: + elif string.tqfind(self.path, ".css") >= 0: self.send_header("content-type","text/css") self.end_headers() self._sendFile(self.path) else: - status = self._amarokStatus() + status = self._amaroktqStatus() status.dcop_volume.init() status.dcop_trackcurrenttime.init() status.dcop_tracktotaltime.init() diff --git a/amarok/src/scripts/webcontrol/WebControl.py b/amarok/src/scripts/webcontrol/WebControl.py index e399402f..bf0188e1 100755 --- a/amarok/src/scripts/webcontrol/WebControl.py +++ b/amarok/src/scripts/webcontrol/WebControl.py @@ -60,13 +60,13 @@ class ConfigDialog( QDialog ): self.config = ConfigParser.ConfigParser() - allowControl = RequestHandler.AmarokStatus.allowControl - publish = RequestHandler.AmarokStatus.publish + allowControl = RequestHandler.AmaroktqStatus.allowControl + publish = RequestHandler.AmaroktqStatus.publish try: config = ConfigParser.ConfigParser() config.read( "webcontrolrc" ) - allowControl = string.find(config.get( "General", "allowcontrol" ), "True") >= 0 - publish = string.find(config.get( "General", "publish" ), "True") >= 0 + allowControl = string.tqfind(config.get( "General", "allowcontrol" ), "True") >= 0 + publish = string.tqfind(config.get( "General", "publish" ), "True") >= 0 except: pass @@ -159,8 +159,8 @@ class WebControl( QApplication ): config.read( "webcontrolrc" ) try: - RequestHandler.AmarokStatus.allowControl = string.find(config.get( "General", "allowcontrol" ), "True") >= 0 - RequestHandler.AmarokStatus.publish = string.find(config.get( "General", "publish" ), "True") >= 0 + RequestHandler.AmaroktqStatus.allowControl = string.tqfind(config.get( "General", "allowcontrol" ), "True") >= 0 + RequestHandler.AmaroktqStatus.publish = string.tqfind(config.get( "General", "publish" ), "True") >= 0 except: debug( "No config file found, using defaults." ) @@ -170,7 +170,7 @@ class WebControl( QApplication ): self.zeroconfPublishing() def zeroconfPublishing( self ): - if RequestHandler.AmarokStatus.publish: + if RequestHandler.AmaroktqStatus.publish: if not publisher.active: threading.Thread(target = publisher.run).start() else: @@ -184,7 +184,7 @@ class WebControl( QApplication ): while True: line = sys.stdin.readline() if line: - qApp.postEvent( self, Notification(line) ) + tqApp.postEvent( self, Notification(line) ) else: break @@ -198,25 +198,25 @@ class WebControl( QApplication ): string = QString(notification.string) debug( "Received notification: " + str( string ) ) - if string.contains( "configure" ): + if string.tqcontains( "configure" ): self.configure() - elif string.contains( "exit" ): + elif string.tqcontains( "exit" ): cleanup(None,None) - elif string.contains( "engineStateChange: play" ): + elif string.tqcontains( "engineStateChange: play" ): self.engineStatePlay() - elif string.contains( "engineStateChange: idle" ): + elif string.tqcontains( "engineStateChange: idle" ): self.engineStateIdle() - elif string.contains( "engineStateChange: pause" ): + elif string.tqcontains( "engineStateChange: pause" ): self.engineStatePause() - elif string.contains( "engineStateChange: empty" ): + elif string.tqcontains( "engineStateChange: empty" ): self.engineStatePause() - elif string.contains( "trackChange" ): + elif string.tqcontains( "trackChange" ): self.trackChange() else: @@ -234,32 +234,32 @@ class WebControl( QApplication ): def engineStatePlay( self ): """ Called when Engine state changes to Play """ - RequestHandler.AmarokStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime") - RequestHandler.AmarokStatus.dcop_trackcurrenttime.result() - RequestHandler.AmarokStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime") - RequestHandler.AmarokStatus.dcop_tracktotaltime.result() - RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EnginePlay + RequestHandler.AmaroktqStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime") + RequestHandler.AmaroktqStatus.dcop_trackcurrenttime.result() + RequestHandler.AmaroktqStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime") + RequestHandler.AmaroktqStatus.dcop_tracktotaltime.result() + RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EnginePlay def engineStateIdle( self ): """ Called when Engine state changes to Idle """ - RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EngineIdle + RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EngineIdle def engineStatePause( self ): """ Called when Engine state changes to Pause """ - RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EnginePause + RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EnginePause def engineStateEmpty( self ): """ Called when Engine state changes to Empty """ - RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EngineEmpty + RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EngineEmpty def trackChange( self ): """ Called when a new track starts """ - RequestHandler.AmarokStatus.dcop_trackcurrentindex = Globals.PlaylistDcop("getActiveIndex") - RequestHandler.AmarokStatus.dcop_trackcurrentindex.result() - RequestHandler.AmarokStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime") - RequestHandler.AmarokStatus.dcop_trackcurrenttime.result() - RequestHandler.AmarokStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime") - RequestHandler.AmarokStatus.dcop_tracktotaltime.result() + RequestHandler.AmaroktqStatus.dcop_trackcurrentindex = Globals.PlaylistDcop("getActiveIndex") + RequestHandler.AmaroktqStatus.dcop_trackcurrentindex.result() + RequestHandler.AmaroktqStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime") + RequestHandler.AmaroktqStatus.dcop_trackcurrenttime.result() + RequestHandler.AmaroktqStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime") + RequestHandler.AmaroktqStatus.dcop_tracktotaltime.result() diff --git a/amarok/src/scripts/webcontrol/main.js b/amarok/src/scripts/webcontrol/main.js index 1f09d591..071a42f9 100644 --- a/amarok/src/scripts/webcontrol/main.js +++ b/amarok/src/scripts/webcontrol/main.js @@ -205,7 +205,7 @@ function setScrollInUrl(newUrl) { if (newUrl.match(/scroll=\d*/)) { - return newUrl.replace(/scroll=\d*/g, "scroll=" + getPageScroll()); + return newUrl.tqreplace(/scroll=\d*/g, "scroll=" + getPageScroll()); } else { if (newUrl.match(/\?/)) { return newUrl + "&scroll=" + getPageScroll(); diff --git a/amarok/src/scrobbler.cpp b/amarok/src/scrobbler.cpp index 424c4f97..74525985 100644 --- a/amarok/src/scrobbler.cpp +++ b/amarok/src/scrobbler.cpp @@ -270,7 +270,7 @@ SubmitItem::SubmitItem( m_album = album; m_title = title; m_length = length; - m_playStartTime = now ? TQDateTime::currentDateTime( Qt::UTC ).toTime_t() : 0; + m_playStartTime = now ? TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t() : 0; } @@ -421,8 +421,8 @@ ScrobblerSubmitter::~ScrobblerSubmitter() */ void ScrobblerSubmitter::performHandshake() { - TQString handshakeUrl = TQString::null; - uint currentTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + TQString handshakeUrl = TQString(); + uint currentTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); if ( PROTOCOL_VERSION == "1.1" ) { @@ -439,10 +439,10 @@ void ScrobblerSubmitter::performHandshake() "&c=%2" "&v=%3" "&u=%4" ) - .arg( PROTOCOL_VERSION ) - .arg( CLIENT_ID ) - .arg( CLIENT_VERSION ) - .arg( m_username ); + .tqarg( PROTOCOL_VERSION ) + .tqarg( CLIENT_ID ) + .tqarg( CLIENT_VERSION ) + .tqarg( m_username ); } else if ( PROTOCOL_VERSION == "1.2" ) @@ -464,13 +464,13 @@ void ScrobblerSubmitter::performHandshake() "&u=%4" "&t=%5" "&a=%6" ) - .arg( PROTOCOL_VERSION ) - .arg( CLIENT_ID ) - .arg( CLIENT_VERSION ) - .arg( m_username ) - .arg( currentTime ) - .arg( KMD5( KMD5( m_password.utf8() ).hexDigest() + - currentTime ).hexDigest() ); + .tqarg( PROTOCOL_VERSION ) + .tqarg( CLIENT_ID ) + .tqarg( CLIENT_VERSION ) + .tqarg( m_username ) + .tqarg( currentTime ) + .tqarg( KMD5( KMD5( m_password.utf8() ).hexDigest() + + currentTime ).hexDigest().data() ); } else @@ -665,7 +665,7 @@ void ScrobblerSubmitter::scheduledTimeReached() */ void ScrobblerSubmitter::audioScrobblerHandshakeResult( KIO::Job* job ) //SLOT { - m_prevSubmitTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + m_prevSubmitTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); m_inProgress = false; if ( job->error() ) { @@ -712,7 +712,7 @@ void ScrobblerSubmitter::audioScrobblerHandshakeResult( KIO::Job* job ) //SLOT // INTERVAL n (protocol 1.1) else if ( m_submitResultBuffer.startsWith( "FAILED" ) ) { - TQString reason = m_submitResultBuffer.mid( 0, m_submitResultBuffer.find( "\n" ) ); + TQString reason = m_submitResultBuffer.mid( 0, m_submitResultBuffer.tqfind( "\n" ) ); if ( reason.length() > 6 ) reason = reason.mid( 7 ).stripWhiteSpace(); @@ -745,7 +745,7 @@ void ScrobblerSubmitter::audioScrobblerHandshakeResult( KIO::Job* job ) //SLOT */ void ScrobblerSubmitter::audioScrobblerSubmitResult( KIO::Job* job ) //SLOT { - m_prevSubmitTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + m_prevSubmitTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); m_inProgress = false; if ( job->error() ) { @@ -773,7 +773,7 @@ void ScrobblerSubmitter::audioScrobblerSubmitResult( KIO::Job* job ) //SLOT // INTERVAL n (protocol 1.1) else if ( m_submitResultBuffer.startsWith( "FAILED" ) ) { - TQString reason = m_submitResultBuffer.mid( 0, m_submitResultBuffer.find( "\n" ) ); + TQString reason = m_submitResultBuffer.mid( 0, m_submitResultBuffer.tqfind( "\n" ) ); if ( reason.length() > 6 ) reason = reason.mid( 7 ).stripWhiteSpace(); @@ -795,7 +795,7 @@ void ScrobblerSubmitter::audioScrobblerSubmitResult( KIO::Job* job ) //SLOT if ( interval.startsWith( "INTERVAL" ) ) m_interval = interval.mid( 9 ).toUInt(); - m_challenge = TQString::null; + m_challenge = TQString(); enqueueJob( job ); } else @@ -891,7 +891,7 @@ SubmitItem* ScrobblerSubmitter::dequeueItem() SubmitItem* item = 0; if( m_lastSubmissionFinishTime > 0 && !m_holdFakeQueue && m_fakeQueue.getFirst() ) { - uint limit = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + uint limit = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); if ( m_submitQueue.getFirst() ) if ( m_submitQueue.getFirst()->playStartTime() <= limit ) @@ -1000,7 +1000,7 @@ void ScrobblerSubmitter::announceSubmit( SubmitItem *item, int tracks, bool succ if ( success ) { if ( tracks == 1 ) - _short = i18n( "'%1' submitted to last.fm" ).arg( item->title() ); + _short = i18n( "'%1' submitted to last.fm" ).tqarg( item->title() ); else { _short = i18n( "Several tracks submitted to last.fm" ); @@ -1008,20 +1008,20 @@ void ScrobblerSubmitter::announceSubmit( SubmitItem *item, int tracks, bool succ _long = "<p>"; _long = i18n( "'%1' and one other track submitted", "'%1' and %n other tracks submitted", tracks-1 ) - .arg( item->title() ); + .tqarg( item->title() ); } } else { if ( tracks == 1 ) - _short = i18n( "Failed to submit '%1' to last.fm" ).arg( item->title() ); + _short = i18n( "Failed to submit '%1' to last.fm" ).tqarg( item->title() ); else { _short = i18n( "Failed to submit several tracks to last.fm" ); _long = "<p>"; _long = i18n( "Failed to submit '%1' and one other track", "Failed to submit '%1' and %n other tracks", tracks-1 ) - .arg( item->title() ); + .tqarg( item->title() ); } } @@ -1047,7 +1047,7 @@ void ScrobblerSubmitter::saveSubmitQueue() } if ( m_lastSubmissionFinishTime == 0 ) - m_lastSubmissionFinishTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + m_lastSubmissionFinishTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); TQDomDocument newdoc; TQDomElement submitQueue = newdoc.createElement( "submit" ); @@ -1108,7 +1108,7 @@ void ScrobblerSubmitter::readSubmitQueue() if(last && last > m_lastSubmissionFinishTime) m_lastSubmissionFinishTime = last; - const TQString ITEM( "item" ); //so we don't construct these QStrings all the time + const TQString ITEM( "item" ); //so we don't construct these TQStrings all the time for( TQDomNode n = d.namedItem( "submit" ).firstChild(); !n.isNull() && n.nodeName() == ITEM; n = n.nextSibling() ) enqueueItem( new SubmitItem( n.toElement() ) ); @@ -1127,7 +1127,7 @@ bool ScrobblerSubmitter::schedule( bool failure ) if ( m_inProgress || !canSubmit() ) return false; - uint when, currentTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t(); + uint when, currentTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t(); if ( currentTime - m_prevSubmitTime > m_interval ) when = 0; else @@ -1143,7 +1143,7 @@ bool ScrobblerSubmitter::schedule( bool failure ) if ( m_needHandshake || m_challenge.isEmpty() ) { - m_challenge = TQString::null; + m_challenge = TQString(); m_needHandshake = false; if ( when == 0 ) diff --git a/amarok/src/scrobbler.h b/amarok/src/scrobbler.h index 663dc90f..d2cf44d4 100644 --- a/amarok/src/scrobbler.h +++ b/amarok/src/scrobbler.h @@ -29,6 +29,7 @@ class Scrobbler : public TQObject, public EngineObserver friend class MediaDevice; Q_OBJECT + TQ_OBJECT public: static Scrobbler *instance(); @@ -112,9 +113,10 @@ class SubmitQueue : public TQPtrList<SubmitItem> }; -class ScrobblerSubmitter : public QObject +class ScrobblerSubmitter : public TQObject { Q_OBJECT + TQ_OBJECT public: static TQString PROTOCOL_VERSION; diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp index 453efff6..84b27efa 100644 --- a/amarok/src/sliderwidget.cpp +++ b/amarok/src/sliderwidget.cpp @@ -41,8 +41,8 @@ #include <kpopupmenu.h> #include <kstandarddirs.h> -Amarok::Slider::Slider( Qt::Orientation orientation, TQWidget *parent, uint max ) - : TQSlider( orientation, parent ) +Amarok::Slider::Slider( Qt::Orientation orientation, TQWidget *tqparent, uint max ) + : TQSlider( orientation, tqparent ) , m_sliding( false ) , m_outside( false ) , m_prevValue( 0 ) @@ -54,7 +54,7 @@ void Amarok::Slider::wheelEvent( TQWheelEvent *e ) { if( orientation() == Qt::Vertical ) { - // Will be handled by the parent widget + // Will be handled by the tqparent widget e->ignore(); return; } @@ -62,8 +62,8 @@ Amarok::Slider::wheelEvent( TQWheelEvent *e ) // Position Slider (horizontal) int step = e->delta() * 1500 / 18; int nval = TQSlider::value() + step; - nval = QMAX(nval, minValue()); - nval = QMIN(nval, maxValue()); + nval = TQMAX(nval, minValue()); + nval = TQMIN(nval, maxValue()); TQSlider::setValue( nval ); @@ -78,7 +78,7 @@ Amarok::Slider::mouseMoveEvent( TQMouseEvent *e ) //feels better, but using set value of 20 is bad of course TQRect rect( -20, -20, width()+40, height()+40 ); - if ( orientation() == Horizontal && !rect.contains( e->pos() ) ) { + if ( orientation() == Qt::Horizontal && !rect.tqcontains( e->pos() ) ) { if ( !m_outside ) TQSlider::setValue( m_prevValue ); m_outside = true; @@ -94,7 +94,7 @@ Amarok::Slider::mouseMoveEvent( TQMouseEvent *e ) void Amarok::Slider::slideEvent( TQMouseEvent *e ) { - TQSlider::setValue( orientation() == Horizontal + TQSlider::setValue( orientation() == Qt::Horizontal ? ((TQApplication::reverseLayout()) ? TQRangeControl::valueFromPosition( width() - (e->pos().x() - sliderRect().width()/2), width() + sliderRect().width() ) : TQRangeControl::valueFromPosition( e->pos().x() - sliderRect().width()/2, width() - sliderRect().width() ) ) @@ -107,7 +107,7 @@ Amarok::Slider::mousePressEvent( TQMouseEvent *e ) m_sliding = true; m_prevValue = TQSlider::value(); - if ( !sliderRect().contains( e->pos() ) ) + if ( !sliderRect().tqcontains( e->pos() ) ) mouseMoveEvent( e ); } @@ -141,15 +141,15 @@ Amarok::Slider::setValue( int newValue ) #define MARGIN 3 Amarok::PrettySlider::PrettySlider( Qt::Orientation orientation, SliderMode mode, - TQWidget *parent, uint max ) - : Amarok::Slider( orientation, parent, max ) + TQWidget *tqparent, uint max ) + : Amarok::Slider( orientation, tqparent, max ) , m_mode( mode ) , m_showingMoodbar( false ) { if( m_mode == Pretty) { - setWFlags( Qt::WNoAutoErase ); - setFocusPolicy( TQWidget::NoFocus ); + setWFlags( TQt::WNoAutoErase ); + setFocusPolicy( TQ_NoFocus ); } // We only have to connect this *once*, since our MetaBundle @@ -175,7 +175,7 @@ void Amarok::PrettySlider::slideEvent( TQMouseEvent *e ) { if( m_mode == Pretty || m_showingMoodbar ) - TQSlider::setValue( orientation() == Horizontal + TQSlider::setValue( orientation() == Qt::Horizontal ? TQRangeControl::valueFromPosition( e->pos().x(), width()-2 ) : TQRangeControl::valueFromPosition( e->pos().y(), height()-2 ) ); else @@ -217,7 +217,7 @@ Amarok::PrettySlider::paintEvent( TQPaintEvent *e ) TQPixmap buf( size() ); TQPainter p( &buf, this ); - buf.fill( parentWidget()->backgroundColor() ); + buf.fill( tqparentWidget()->backgroundColor() ); if ( orientation() == Qt::Vertical ) { @@ -329,20 +329,20 @@ Amarok::PrettySlider::newBundle( const MetaBundle &bundle ) /** these functions aren't required in our fixed size world, but they may become useful one day **/ -QSize -Amarok::PrettySlider::minimumSizeHint() const +TQSize +Amarok::PrettySlider::tqminimumSizeHint() const { - return sizeHint(); + return tqsizeHint(); } -QSize -Amarok::PrettySlider::sizeHint() const +TQSize +Amarok::PrettySlider::tqsizeHint() const { constPolish(); return (orientation() == Horizontal ? TQSize( maxValue(), THICKNESS + MARGIN ) - : TQSize( THICKNESS + MARGIN, maxValue() )).expandedTo( QApplit ication::globalStrut() ); + : TQSize( THICKNESS + MARGIN, maxValue() )).expandedTo( TQApplit ication::globalStrut() ); } #endif @@ -350,14 +350,14 @@ Amarok::PrettySlider::sizeHint() const /// CLASS VolumeSlider ////////////////////////////////////////////////////////////////////////////////////////// -Amarok::VolumeSlider::VolumeSlider( TQWidget *parent, uint max ) - : Amarok::Slider( Qt::Horizontal, parent, max ) +Amarok::VolumeSlider::VolumeSlider( TQWidget *tqparent, uint max ) + : Amarok::Slider( Qt::Horizontal, tqparent, max ) , m_animCount( 0 ) , m_animTimer( new TQTimer( this ) ) , m_pixmapInset( TQPixmap( locate( "data","amarok/images/volumeslider-inset.png" ) ) ) { setWFlags( getWFlags() | WNoAutoErase ); - setFocusPolicy( TQWidget::NoFocus ); + setFocusPolicy( TQ_NoFocus ); // BEGIN Calculate handle animation pixmaps for mouse-over effect TQImage pixmapHandle ( locate( "data","amarok/images/volumeslider-handle.png" ) ); @@ -386,15 +386,15 @@ void Amarok::VolumeSlider::generateGradient() { //TQImage temp( locate( "data","amarok/images/volumeslider-gradient.png" ) ); - //KIconEffect::colorize( temp, colorGroup().highlight(), 1.0 ); + //KIconEffect::colorize( temp, tqcolorGroup().highlight(), 1.0 ); const TQPixmap temp( locate( "data","amarok/images/volumeslider-gradient.png" ) ); - const TQBitmap mask( temp.createHeuristicMask() ); + const TQBitmap tqmask( temp.createHeuristicMask() ); m_pixmapGradient = TQPixmap( m_pixmapInset.size() ); - KPixmapEffect::gradient( m_pixmapGradient, colorGroup().background(), colorGroup().highlight(), + KPixmapEffect::gradient( m_pixmapGradient, tqcolorGroup().background(), tqcolorGroup().highlight(), KPixmapEffect::HorizontalGradient ); - m_pixmapGradient.setMask( mask ); + m_pixmapGradient.setMask( tqmask ); } void @@ -402,12 +402,12 @@ Amarok::VolumeSlider::slotAnimTimer() //SLOT { if ( m_animEnter ) { m_animCount++; - repaint( false ); + tqrepaint( false ); if ( m_animCount == ANIM_MAX - 1 ) m_animTimer->stop(); } else { m_animCount--; - repaint( false ); + tqrepaint( false ); if ( m_animCount == 0 ) m_animTimer->stop(); } @@ -416,7 +416,7 @@ Amarok::VolumeSlider::slotAnimTimer() //SLOT void Amarok::VolumeSlider::mousePressEvent( TQMouseEvent *e ) { - if( e->button() != RightButton ) { + if( e->button() != Qt::RightButton ) { Amarok::Slider::mousePressEvent( e ); slideEvent( e ); } @@ -470,12 +470,12 @@ Amarok::VolumeSlider::paintEvent( TQPaintEvent * ) TQPixmap buf( size() ); // Erase background - if( parentWidget()->backgroundPixmap() ) - buf.fill( parentWidget(), pos() ); + if( tqparentWidget()->backgroundPixmap() ) + buf.fill( tqparentWidget(), pos() ); else { - buf.fill( colorGroup().background() ); + buf.fill( tqcolorGroup().background() ); // TQPainter p( &buf ); -// p.fillRect( rect(), qApp->palette().brush( TQPalette::Active, TQColorGroup::Background ) ); +// p.fillRect( rect(), tqApp->palette().brush( TQPalette::Active, TQColorGroup::Background ) ); } const int padding = 7; @@ -492,7 +492,7 @@ Amarok::VolumeSlider::paintEvent( TQPaintEvent * ) font.setPixelSize( 9 ); p.setFont( font ); const TQRect rect( 0, 0, 34, 15 ); - p.drawText( rect, Qt::AlignRight | Qt::AlignVCenter, TQString::number( value() ) + '%' ); + p.drawText( rect, TQt::AlignRight | TQt::AlignVCenter, TQString::number( value() ) + '%' ); p.end(); bitBlt( this, 0, 0, &buf ); diff --git a/amarok/src/sliderwidget.h b/amarok/src/sliderwidget.h index 1fa7d63a..2bf4d7aa 100644 --- a/amarok/src/sliderwidget.h +++ b/amarok/src/sliderwidget.h @@ -35,9 +35,10 @@ class TQTimer; namespace Amarok { - class Slider : public QSlider + class Slider : public TQSlider { Q_OBJECT + TQ_OBJECT public: Slider( Qt::Orientation, TQWidget*, uint max = 0 ); @@ -52,7 +53,7 @@ namespace Amarok signals: //we emit this when the user has specifically changed the slider //so connect to it if valueChanged() is too generic - //Qt also emits valueChanged( int ) + //TQt also emits valueChanged( int ) void sliderReleased( int ); protected: @@ -68,7 +69,7 @@ namespace Amarok int adjustValue( int v ) const { int mp = (minValue() + maxValue()) / 2; - return orientation() == Vertical ? mp - (v - mp) : v; + return orientation() == Qt::Vertical ? mp - (v - mp) : v; } private: @@ -83,6 +84,7 @@ namespace Amarok class PrettySlider : public Slider { Q_OBJECT + TQ_OBJECT public: typedef enum @@ -92,7 +94,7 @@ namespace Amarok } SliderMode; PrettySlider( Qt::Orientation orientation, SliderMode mode, - TQWidget *parent, uint max = 0 ); + TQWidget *tqparent, uint max = 0 ); virtual void newBundle( const MetaBundle &bundle ); @@ -117,9 +119,10 @@ namespace Amarok class VolumeSlider: public Slider { Q_OBJECT + TQ_OBJECT public: - VolumeSlider( TQWidget *parent, uint max = 0 ); + VolumeSlider( TQWidget *tqparent, uint max = 0 ); protected: virtual void paintEvent( TQPaintEvent* ); diff --git a/amarok/src/smartplaylisteditor.cpp b/amarok/src/smartplaylisteditor.cpp index f4da79a9..9002164c 100644 --- a/amarok/src/smartplaylisteditor.cpp +++ b/amarok/src/smartplaylisteditor.cpp @@ -64,8 +64,8 @@ TQStringList m_expandableDbFields; -SmartPlaylistEditor::SmartPlaylistEditor( TQString defaultName, TQWidget *parent, const char *name ) - : KDialogBase( parent, name, true, i18n("Create Smart Playlist"), +SmartPlaylistEditor::SmartPlaylistEditor( TQString defaultName, TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, true, i18n("Create Smart Playlist"), Ok|Cancel, Ok, true ) { init(defaultName); @@ -74,8 +74,8 @@ SmartPlaylistEditor::SmartPlaylistEditor( TQString defaultName, TQWidget *parent } -SmartPlaylistEditor::SmartPlaylistEditor( TQWidget *parent, TQDomElement xml, const char *name) - : KDialogBase( parent, name, true, i18n("Edit Smart Playlist"), +SmartPlaylistEditor::SmartPlaylistEditor( TQWidget *tqparent, TQDomElement xml, const char *name) + : KDialogBase( tqparent, name, true, i18n("Edit Smart Playlist"), Ok|Cancel, Ok, true ) { init( xml.attribute( "name" ) ); @@ -123,7 +123,7 @@ SmartPlaylistEditor::SmartPlaylistEditor( TQWidget *parent, TQDomElement xml, co TQDomElement orderby = orderbyList.item(0).toElement(); // we only allow one orderby node //random is always the last one. - int dbfield = orderby.attribute( "field" ) == "random" ? m_dbFields.count() : m_dbFields.findIndex( orderby.attribute( "field" ) ); + int dbfield = orderby.attribute( "field" ) == "random" ? m_dbFields.count() : m_dbFields.tqfindIndex( orderby.attribute( "field" ) ); m_orderCombo->setCurrentItem( dbfield ); updateOrderTypes( dbfield ); @@ -146,7 +146,7 @@ SmartPlaylistEditor::SmartPlaylistEditor( TQWidget *parent, TQDomElement xml, co m_expandCheck->setChecked( true ); TQDomElement expandby = expandbyList.item(0).toElement(); // we only allow one orderby node - int dbfield = m_expandableFields.findIndex( expandby.attribute( "field" ) ); + int dbfield = m_expandableFields.tqfindIndex( expandby.attribute( "field" ) ); m_expandCombo->setCurrentItem( dbfield ); } } @@ -190,7 +190,7 @@ void SmartPlaylistEditor::init(TQString defaultName) matchAnyBox->setStretchFactor( new TQWidget( matchAnyBox ), 1 ); //criteria box - m_criteriaAnyGroupBox = new TQVGroupBox( TQString::null, mainWidget() ); + m_criteriaAnyGroupBox = new TQVGroupBox( TQString(), mainWidget() ); //match box (all) TQHBox *matchAllBox = new TQHBox( mainWidget() ); @@ -198,7 +198,7 @@ void SmartPlaylistEditor::init(TQString defaultName) matchAllBox->setStretchFactor( new TQWidget( matchAllBox ), 1 ); //criteria box - m_criteriaAllGroupBox = new TQVGroupBox( TQString::null, mainWidget() ); + m_criteriaAllGroupBox = new TQVGroupBox( TQString(), mainWidget() ); //order box TQHBox *hbox2 = new TQHBox( mainWidget() ); @@ -290,7 +290,7 @@ void SmartPlaylistEditor::removeCriteriaAny( CriteriaEditor *criteria ) { m_criteriaEditorAnyList.remove( criteria ); criteria->deleteLater(); - resize( size().width(), sizeHint().height() ); + resize( size().width(), tqsizeHint().height() ); if( m_criteriaEditorAnyList.count() == 1 ) m_criteriaEditorAnyList.first()->enableRemove( false ); @@ -300,7 +300,7 @@ void SmartPlaylistEditor::removeCriteriaAll( CriteriaEditor *criteria ) { m_criteriaEditorAllList.remove( criteria ); criteria->deleteLater(); - resize( size().width(), sizeHint().height() ); + resize( size().width(), tqsizeHint().height() ); if( m_criteriaEditorAllList.count() == 1 ) m_criteriaEditorAllList.first()->enableRemove( false ); @@ -322,7 +322,7 @@ void SmartPlaylistEditor::updateOrderTypes( int index ) } if( currentOrderType < m_orderTypeCombo->count() ) m_orderTypeCombo->setCurrentItem( currentOrderType ); - m_orderTypeCombo->setFont(m_orderTypeCombo->font()); // invalidate size hint + m_orderTypeCombo->setFont(m_orderTypeCombo->font()); // tqinvalidate size hint m_orderTypeCombo->updateGeometry(); } @@ -403,8 +403,8 @@ TQDomElement SmartPlaylistEditor::result() // CLASS CriteriaEditor //////////////////////////////////////////////////////////////////////////// -CriteriaEditor::CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *parent, int criteriaType, TQDomElement criteria ) - : TQHBox( parent ) +CriteriaEditor::CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *tqparent, int criteriaType, TQDomElement criteria ) + : TQHBox( tqparent ) , m_playlistEditor( editor ) , m_currentValueType( -1 ) { @@ -438,7 +438,7 @@ CriteriaEditor::CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *parent, i } if ( !criteria.isNull() ) { - int field = m_dbFields.findIndex( criteria.attribute( "field" ) ); + int field = m_dbFields.tqfindIndex( criteria.attribute( "field" ) ); TQString condition = criteria.attribute("condition"); @@ -641,7 +641,7 @@ TQString CriteriaEditor::getSearchCriteria() else if( m_dateCombo->currentItem() == 1 ) //months time=86400*30*n; else time=86400*365*n; //years - value += "(*CurrentTimeT*)" + TQString(" - %1 AND ").arg(time) + "(*CurrentTimeT*)"; + value += "(*CurrentTimeT*)" + TQString(" - %1 AND ").tqarg(time) + "(*CurrentTimeT*)"; } else { TQDateTime datetime1( m_dateEdit1->date() ); @@ -683,7 +683,7 @@ TQString CriteriaEditor::getSearchCriteria() }; - if( criteria == i18n("contains") ) + if( criteria == i18n("tqcontains") ) searchCriteria += CollectionDB::likeCondition( value, true, true ); else if( criteria == i18n("does not contain") ) searchCriteria += " NOT " + CollectionDB::likeCondition( value, true, true ); @@ -816,20 +816,20 @@ void CriteriaEditor::slotFieldSelected( int field ) && fs != "fdescfs" && fs != "kernfs" && fs != "usbfs" - && !fs.contains( "proc" ) + && !fs.tqcontains( "proc" ) && fs != "unknown" && fs != "none" && fs != "sunrpc" && fs != "none" && device != "tmpfs" - && device.find("shm") == -1 + && device.tqfind("shm") == -1 && mountpoint != "/dev/swap" && mountpoint != "/dev/pts" - && mountpoint.find("/proc") != 0 - && mountpoint.find("/sys") != 0 - || fs.find( "smb" ) != -1 - || fs.find( "cifs" ) != -1 - || fs.find( "nfs" ) != -1 + && mountpoint.tqfind("/proc") != 0 + && mountpoint.tqfind("/sys") != 0 + || fs.tqfind( "smb" ) != -1 + || fs.tqfind( "cifs" ) != -1 + || fs.tqfind( "nfs" ) != -1 ) items << mountpoint; } @@ -864,7 +864,7 @@ void CriteriaEditor::loadEditWidgets() TQObjectList* list = m_editBox->queryList( TQWIDGET_OBJECT_NAME_STRING ); for( TQObject *obj = list->first(); obj; obj = list->next() ) - static_cast<TQWidget*>(obj)->deleteLater(); + TQT_TQWIDGET(obj)->deleteLater(); delete list; @@ -896,7 +896,7 @@ void CriteriaEditor::loadEditWidgets() m_intSpinBox1 = new KIntSpinBox( m_editBox ); int maxValue = 1000; if( yearField ) { - maxValue = TQDate::currentDate().year(); + maxValue = TQDate::tqcurrentDate().year(); m_intSpinBox1->setValue( maxValue ); } m_intSpinBox1->setMaxValue( maxValue ); @@ -905,11 +905,11 @@ void CriteriaEditor::loadEditWidgets() if( m_criteriaCombo->currentText() == i18n("is between") ) { m_rangeLabel = new TQLabel( i18n("and"), m_editBox ); - m_rangeLabel->setAlignment( AlignCenter ); + m_rangeLabel->tqsetAlignment( AlignCenter ); m_rangeLabel->show(); m_intSpinBox2 = new KIntSpinBox( m_editBox ); if( yearField ) { - maxValue = TQDate::currentDate().year(); + maxValue = TQDate::tqcurrentDate().year(); m_intSpinBox2->setValue( maxValue ); } m_intSpinBox2->setMaxValue( maxValue ); @@ -927,7 +927,7 @@ void CriteriaEditor::loadEditWidgets() if( m_criteriaCombo->currentText() == i18n("is between") ) { m_rangeLabel = new TQLabel( i18n("and"), m_editBox ); - m_rangeLabel->setAlignment( AlignCenter ); + m_rangeLabel->tqsetAlignment( AlignCenter ); m_rangeLabel->show(); m_comboBox2 = new KComboBox( false, m_editBox ); m_comboBox2->insertStringList( list ); @@ -950,14 +950,14 @@ void CriteriaEditor::loadEditWidgets() m_dateCombo->show(); } else { - m_dateEdit1 = new QDateEdit( TQDate::currentDate(), m_editBox); + m_dateEdit1 = new TQDateEdit( TQDate::tqcurrentDate(), m_editBox); m_dateEdit1->setFocus(); m_dateEdit1->show(); if( m_criteriaCombo->currentText() == i18n("is between") ) { m_rangeLabel = new TQLabel( i18n("and"), m_editBox ); - m_rangeLabel->setAlignment( AlignCenter ); + m_rangeLabel->tqsetAlignment( AlignCenter ); m_rangeLabel->show(); - m_dateEdit2 = new QDateEdit( TQDate::currentDate(), m_editBox); + m_dateEdit2 = new TQDateEdit( TQDate::tqcurrentDate(), m_editBox); m_dateEdit2->show(); } } @@ -974,7 +974,7 @@ void CriteriaEditor::loadEditWidgets() m_intSpinBox1->show(); if( m_criteriaCombo->currentText() == i18n("is between") ) { m_rangeLabel = new TQLabel( i18n("and"), m_editBox ); - m_rangeLabel->setAlignment( AlignCenter ); + m_rangeLabel->tqsetAlignment( AlignCenter ); m_rangeLabel->show(); m_intSpinBox2 = new KIntSpinBox( m_editBox ); m_intSpinBox2->setMaxValue( maxValue ); @@ -1003,7 +1003,7 @@ void CriteriaEditor::loadCriteriaList( int valueType, TQString condition ) switch( valueType ) { case String: case AutoCompletionString: - items << i18n( "contains" ) << i18n( "does not contain" ) << i18n( "is" ) << i18n( "is not" ) + items << i18n( "tqcontains" ) << i18n( "does not contain" ) << i18n( "is" ) << i18n( "is not" ) << i18n( "starts with" ) << i18n( "does not start with" ) << i18n( "ends with" ) << i18n( "does not end with" ); break; @@ -1027,7 +1027,7 @@ void CriteriaEditor::loadCriteriaList( int valueType, TQString condition ) m_criteriaCombo->insertStringList( items ); if ( !condition.isEmpty() ) { - int index = items.findIndex( condition ); + int index = items.tqfindIndex( condition ); if (index!=-1) m_criteriaCombo->setCurrentItem( index ); } diff --git a/amarok/src/smartplaylisteditor.h b/amarok/src/smartplaylisteditor.h index daa18b36..1e2dd6dc 100644 --- a/amarok/src/smartplaylisteditor.h +++ b/amarok/src/smartplaylisteditor.h @@ -16,7 +16,7 @@ class KComboBox; class KIntSpinBox; class KLineEdit; class TQCheckBox; -class QDateEdit; +class TQDateEdit; class TQLabel; class TQToolButton; class TQVGroupBox; @@ -26,15 +26,16 @@ class CriteriaEditor; class SmartPlaylistEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT friend class CriteriaEditor; public: - SmartPlaylistEditor( TQString playlist_name, TQWidget *parent, const char *name=0 ); - SmartPlaylistEditor( TQWidget *parent, TQDomElement xml, const char *name=0 ); + SmartPlaylistEditor( TQString playlist_name, TQWidget *tqparent, const char *name=0 ); + SmartPlaylistEditor( TQWidget *tqparent, TQDomElement xml, const char *name=0 ); TQDomElement result(); - TQString name() const { return m_nameLineEdit->text().replace( "\n", " " ); } + TQString name() const { return m_nameLineEdit->text().tqreplace( "\n", " " ); } enum CriteriaType { criteriaAll = 0, criteriaAny = 1 }; @@ -80,11 +81,12 @@ Q_OBJECT -class CriteriaEditor : public QHBox +class CriteriaEditor : public TQHBox { Q_OBJECT + TQ_OBJECT public: - CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *parent, int criteriaType, TQDomElement criteria = TQDomElement() ); + CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *tqparent, int criteriaType, TQDomElement criteria = TQDomElement() ); ~CriteriaEditor(); TQString getSearchCriteria(); void setSearchCriteria( const TQString &str ); @@ -102,7 +104,7 @@ Q_OBJECT private: enum ValueType { String, AutoCompletionString, Number, Year, Date, Rating, Length }; - void loadCriteriaList( int valueType, TQString condition = TQString::null ); + void loadCriteriaList( int valueType, TQString condition = TQString() ); int getValueType( int fieldIndex ); inline int indexToRating( int ); inline int ratingToIndex( int ); @@ -123,8 +125,8 @@ Q_OBJECT KComboBox *m_comboBox2; KIntSpinBox *m_intSpinBox1; KIntSpinBox *m_intSpinBox2; - QDateEdit *m_dateEdit1; - QDateEdit *m_dateEdit2; + TQDateEdit *m_dateEdit1; + TQDateEdit *m_dateEdit2; KComboBox *m_dateCombo; TQLabel *m_rangeLabel; KComboBox *m_lengthCombo; diff --git a/amarok/src/socketserver.cpp b/amarok/src/socketserver.cpp index 2886ff57..e0aa98a8 100644 --- a/amarok/src/socketserver.cpp +++ b/amarok/src/socketserver.cpp @@ -38,8 +38,8 @@ /// @class Amarok::SocketServer -Amarok::SocketServer::SocketServer( const TQString &socketName, TQObject *parent ) - : TQServerSocket( parent ) +Amarok::SocketServer::SocketServer( const TQString &socketName, TQObject *tqparent ) + : TQServerSocket( tqparent ) { m_sockfd = ::socket( AF_UNIX, SOCK_STREAM, 0 ); @@ -85,8 +85,8 @@ Amarok::SocketServer::~SocketServer() /// @class Vis::SocketServer -Vis::SocketServer::SocketServer( TQObject *parent ) - : Amarok::SocketServer( "amarok.visualization_socket", parent ) +Vis::SocketServer::SocketServer( TQObject *tqparent ) + : Amarok::SocketServer( "amarok.visualization_socket", tqparent ) {} void @@ -101,7 +101,7 @@ Vis::SocketServer::newConnection( int sockfd ) /// @class Vis::SocketNotifier Vis::SocketNotifier::SocketNotifier( int sockfd ) - : TQSocketNotifier( sockfd, TQSocketNotifier::Read, this ) + : TQSocketNotifier( sockfd, QSocketNotifier::Read, TQT_TQOBJECT(this) ) { connect( this, TQT_SIGNAL(activated( int )), TQT_SLOT(request( int )) ); } @@ -145,17 +145,17 @@ Vis::SocketNotifier::request( int sockfd ) //slot Vis::Selector* Vis::Selector::instance() { - TQWidget *parent = reinterpret_cast<TQWidget*>( pApp->playlistWindow() ); - TQObject *o = parent->child( "Vis::Selector::instance" ); + TQWidget *tqparent = reinterpret_cast<TQWidget*>( pApp->playlistWindow() ); + TQObject *o = tqparent->child( "Vis::Selector::instance" ); debug() << bool(o == 0) << endl; - return o ? static_cast<Selector*>( o ) : new Selector( parent ); + return o ? static_cast<Selector*>( TQT_TQWIDGET(o) ) : new Selector( tqparent ); } -Vis::Selector::Selector( TQWidget *parent ) - : TQListView( parent, "Vis::Selector::instance", Qt::WType_Dialog ) - , m_server( new SocketServer( this ) ) +Vis::Selector::Selector( TQWidget *tqparent ) + : TQListView( tqparent, "Vis::Selector::instance", TQt::WType_Dialog ) + , m_server( new SocketServer( TQT_TQOBJECT(this) ) ) { Amarok::OverrideCursor waitcursor; @@ -176,7 +176,7 @@ Vis::Selector::Selector( TQWidget *parent ) connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), this, TQT_SLOT(rightButton( TQListViewItem*, const TQPoint&, int )) ); - // Can I get a pointer to the data section of a QCString? + // Can I get a pointer to the data section of a TQCString? char str[4096]; FILE* vis = popen( "amarok_libvisual --list", "r" ); str[ fread( static_cast<void*>( str ), sizeof(char), 4096, vis ) ] = '\0'; @@ -187,9 +187,9 @@ Vis::Selector::Selector( TQWidget *parent ) for( TQStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it ) new Item( this, "amarok_libvisual", *it, "libvisual" ); - resize( sizeHint() + TQSize(20,0) ); + resize( tqsizeHint() + TQSize(20,0) ); // Center the widget on screen - move( parentWidget()->width()/2 - width()/2, parentWidget()->height()/2 - height()/2 ); + move( tqparentWidget()->width()/2 - width()/2, tqparentWidget()->height()/2 - height()/2 ); } void @@ -204,7 +204,7 @@ Vis::Selector::processExited( KProcess *proc ) void Vis::Selector::receivedStdout( KProcess */*proc*/, char* buffer, int length ) { - debug() << TQString::fromLatin1( buffer, length ) << endl; + debug() << TQString::tqfromLatin1( buffer, length ) << endl; } void diff --git a/amarok/src/socketserver.h b/amarok/src/socketserver.h index 281408f7..35fa7bc3 100644 --- a/amarok/src/socketserver.h +++ b/amarok/src/socketserver.h @@ -22,10 +22,10 @@ class KProcess; namespace Amarok { - class SocketServer : public QServerSocket + class SocketServer : public TQServerSocket { public: - SocketServer( const TQString &socketName, TQObject *parent ); + SocketServer( const TQString &socketName, TQObject *tqparent ); ~SocketServer(); protected: @@ -47,9 +47,10 @@ namespace Vis TQCString path() const { return m_path; } }; - class SocketNotifier : public QSocketNotifier + class SocketNotifier : public TQSocketNotifier { Q_OBJECT + TQ_OBJECT public: SocketNotifier( int sockfd ); @@ -58,10 +59,11 @@ namespace Vis void request( int ); }; - class Selector : public QListView + class Selector : public TQListView { Q_OBJECT - Selector( TQWidget *parent=0 ); + TQ_OBJECT + Selector( TQWidget *tqparent=0 ); SocketServer *m_server; virtual void viewportPaintEvent( TQPaintEvent* ); @@ -74,11 +76,11 @@ namespace Vis ///assigns pid/sockfd combo void mapPID( int, int ); - class Item : public QCheckListItem + class Item : public TQCheckListItem { public: - Item( TQListView *parent, const char *command, const TQString &text, const TQString &s2 ) - : TQCheckListItem( parent, text, TQCheckListItem::CheckBox ) + Item( TQListView *tqparent, const char *command, const TQString &text, const TQString &s2 ) + : TQCheckListItem( tqparent, text, TQCheckListItem::CheckBox ) , m_proc( 0 ) , m_sockfd( -1 ) , m_command( command ) { setText( 1, s2 ); } diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c index 616fa3c2..5281e7ba 100644 --- a/amarok/src/sqlite/sqlite3.c +++ b/amarok/src/sqlite/sqlite3.c @@ -1,30 +1,30 @@ /****************************************************************************** -** This file is an amalgamation of many separate C source files from SQLite +** This file is an amalgamation of many separate C source files from STQLite ** version 3.4.1. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a one translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements -** of 5% are more are commonly seen when SQLite is compiled as a single +** of 5% are more are commonly seen when STQLite is compiled as a single ** translation unit. ** -** This file is all you need to compile SQLite. To use SQLite in other +** This file is all you need to compile STQLite. To use STQLite in other ** programs, you need this file and the "sqlite3.h" header file that defines -** the programming interface to the SQLite library. (If you do not have +** the programming interface to the STQLite library. (If you do not have ** the "sqlite3.h" header file at hand, you will find a copy in the first ** 2702 lines past this header comment.) Additional code files may be -** needed if you want a wrapper to interface SQLite with your choice of +** needed if you want a wrapper to interface STQLite with your choice of ** programming language. The code for the "sqlite3" command-line shell ** is also in a separate file. This file contains only code for the core -** SQLite library. +** STQLite library. ** ** This amalgamation was generated on 2007-07-20 11:05:39 UTC. */ -#define SQLITE_AMALGAMATION 1 -#ifndef SQLITE_PRIVATE -# define SQLITE_PRIVATE static +#define STQLITE_AMALGAMATION 1 +#ifndef STQLITE_PRIVATE +# define STQLITE_PRIVATE static #endif -#ifndef SQLITE_API -# define SQLITE_API +#ifndef STQLITE_API +# define STQLITE_API #endif /************** Begin file sqlite3.h *****************************************/ /* @@ -38,21 +38,21 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** This header file defines the interface that the SQLite library +** This header file defines the interface that the STQLite library ** presents to client programs. If a C-function, structure, datatype, ** or constant definition does not appear in this file, then it is -** not a published API of SQLite, is subject to change without -** notice, and should not be referenced by programs that use SQLite. +** not a published API of STQLite, is subject to change without +** notice, and should not be referenced by programs that use STQLite. ** ** Some of the definitions that are in this file are marked as ** "experimental". Experimental interfaces are normally new -** features recently added to SQLite. We do not anticipate changes +** features recently added to STQLite. We do not anticipate changes ** to experimental interfaces but reserve to make minor changes if ** experience from use "in the wild" suggest such changes are prudent. ** -** The official C-language API documentation for SQLite is derived +** The official C-language API documentation for STQLite is derived ** from comments in this file. This file is the authoritative source -** on how SQLite interfaces are suppose to operate. +** on how STQLite interfaces are suppose to operate. ** ** The name of this file under configuration management is "sqlite.h.in". ** The makefile makes some minor changes to this file (such as inserting @@ -61,8 +61,8 @@ ** ** @(#) $Id: sqlite.h.in,v 1.218 2007/07/19 12:41:40 drh Exp $ */ -#ifndef _SQLITE3_H_ -#define _SQLITE3_H_ +#ifndef _STQLITE3_H_ +#define _STQLITE3_H_ #include <stdarg.h> /* Needed for the definition of va_list */ /* @@ -76,18 +76,18 @@ extern "C" { ** Make sure these symbols where not defined by some previous header ** file. */ -#ifdef SQLITE_VERSION -# undef SQLITE_VERSION +#ifdef STQLITE_VERSION +# undef STQLITE_VERSION #endif -#ifdef SQLITE_VERSION_NUMBER -# undef SQLITE_VERSION_NUMBER +#ifdef STQLITE_VERSION_NUMBER +# undef STQLITE_VERSION_NUMBER #endif /* ** CAPI3REF: Compile-Time Library Version Numbers ** -** The version of the SQLite library is contained in the sqlite3.h -** header file in a #define named SQLITE_VERSION. The SQLITE_VERSION +** The version of the STQLite library is contained in the sqlite3.h +** header file in a #define named STQLITE_VERSION. The STQLITE_VERSION ** macro resolves to a string constant. ** ** The format of the version string is "X.Y.Z", where @@ -95,48 +95,48 @@ extern "C" { ** is the release number. The X.Y.Z might be followed by "alpha" or "beta". ** For example "3.1.1beta". ** -** The X value is always 3 in SQLite. The X value only changes when +** The X value is always 3 in STQLite. The X value only changes when ** backwards compatibility is broken and we intend to never break ** backwards compatibility. The Y value only changes when ** there are major feature enhancements that are forwards compatible ** but not backwards compatible. The Z value is incremented with ** each release but resets back to 0 when Y is incremented. ** -** The SQLITE_VERSION_NUMBER is an integer with the value +** The STQLITE_VERSION_NUMBER is an integer with the value ** (X*1000000 + Y*1000 + Z). For example, for version "3.1.1beta", -** SQLITE_VERSION_NUMBER is set to 3001001. To detect if they are using +** STQLITE_VERSION_NUMBER is set to 3001001. To detect if they are using ** version 3.1.1 or greater at compile time, programs may use the test -** (SQLITE_VERSION_NUMBER>=3001001). +** (STQLITE_VERSION_NUMBER>=3001001). ** ** See also: [sqlite3_libversion()] and [sqlite3_libversion_number()]. */ -#define SQLITE_VERSION "3.4.1" -#define SQLITE_VERSION_NUMBER 3004001 +#define STQLITE_VERSION "3.4.1" +#define STQLITE_VERSION_NUMBER 3004001 /* ** CAPI3REF: Run-Time Library Version Numbers ** ** These routines return values equivalent to the header constants -** [SQLITE_VERSION] and [SQLITE_VERSION_NUMBER]. The values returned +** [STQLITE_VERSION] and [STQLITE_VERSION_NUMBER]. The values returned ** by this routines should only be different from the header values ** if you compile your program using an sqlite3.h header from a -** different version of SQLite that the version of the library you +** different version of STQLite that the version of the library you ** link against. ** ** The sqlite3_version[] string constant contains the text of the -** [SQLITE_VERSION] string. The sqlite3_libversion() function returns +** [STQLITE_VERSION] string. The sqlite3_libversion() function returns ** a poiner to the sqlite3_version[] string constant. The function ** is provided for DLL users who can only access functions and not ** constants within the DLL. */ extern const char sqlite3_version[]; -SQLITE_API const char *sqlite3_libversion(void); +STQLITE_API const char *sqlite3_libversion(void); int sqlite3_libversion_number(void); /* ** CAPI3REF: Database Connection Handle ** -** Each open SQLite database is represented by pointer to an instance of the +** Each open STQLite database is represented by pointer to an instance of the ** opaque structure named "sqlite3". It is useful to think of an sqlite3 ** pointer as an object. The [sqlite3_open] interface is its constructor ** and [sqlite3_close] is its destructor. There are many other interfaces @@ -153,12 +153,12 @@ typedef struct sqlite3 sqlite3; ** Some compilers do not support the "long long" datatype. So we have ** to do compiler-specific typedefs for 64-bit signed and unsigned integers. ** -** Many SQLite interface functions require a 64-bit integer arguments. +** Many STQLite interface functions require a 64-bit integer arguments. ** Those interfaces are declared using this typedef. */ -#ifdef SQLITE_INT64_TYPE - typedef SQLITE_INT64_TYPE sqlite_int64; - typedef unsigned SQLITE_INT64_TYPE sqlite_uint64; +#ifdef STQLITE_INT64_TYPE + typedef STQLITE_INT64_TYPE sqlite_int64; + typedef unsigned STQLITE_INT64_TYPE sqlite_uint64; #elif defined(_MSC_VER) || defined(__BORLANDC__) typedef __int64 sqlite_int64; typedef unsigned __int64 sqlite_uint64; @@ -171,7 +171,7 @@ typedef struct sqlite3 sqlite3; ** If compiling for a processor that lacks floating point support, ** substitute integer for floating-point */ -#ifdef SQLITE_OMIT_FLOATING_POINT +#ifdef STQLITE_OMIT_FLOATING_POINT # define double sqlite_int64 #endif @@ -184,10 +184,10 @@ typedef struct sqlite3 sqlite3; ** ** All SQL statements prepared using [sqlite3_prepare_v2()] or ** [sqlite3_prepare16_v2()] must be destroyed using [sqlite3_finalize()] -** before this routine is called. Otherwise, SQLITE_BUSY is returned and the +** before this routine is called. Otherwise, STQLITE_BUSY is returned and the ** database connection remains open. */ -SQLITE_API int sqlite3_close(sqlite3 *); +STQLITE_API int sqlite3_close(sqlite3 *); /* ** The type for a callback function. @@ -210,7 +210,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**); ** invoked once for each row of the query result. This callback ** should normally return 0. If the callback returns a non-zero ** value then the query is aborted, all subsequent SQL statements -** are skipped and the sqlite3_exec() function returns the SQLITE_ABORT. +** are skipped and the sqlite3_exec() function returns the STQLITE_ABORT. ** ** The 4th parameter to this interface is an arbitrary pointer that is ** passed through to the callback function as its first parameter. @@ -235,12 +235,12 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**); ** message. Use [sqlite3_free()] for this. If errmsg==NULL, ** then no error message is ever written. ** -** The return value is is SQLITE_OK if there are no errors and -** some other [SQLITE_OK | return code] if there is an error. +** The return value is is STQLITE_OK if there are no errors and +** some other [STQLITE_OK | return code] if there is an error. ** The particular return value depends on the type of error. ** */ -SQLITE_API int sqlite3_exec( +STQLITE_API int sqlite3_exec( sqlite3*, /* An open database */ const char *sql, /* SQL to be evaluted */ int (*callback)(void*,int,char**,char**), /* Callback function */ @@ -250,59 +250,59 @@ SQLITE_API int sqlite3_exec( /* ** CAPI3REF: Result Codes -** KEYWORDS: SQLITE_OK +** KEYWORDS: STQLITE_OK ** -** Many SQLite functions return an integer result code from the set shown +** Many STQLite functions return an integer result code from the set shown ** above in order to indicates success or failure. ** -** The result codes above are the only ones returned by SQLite in its +** The result codes above are the only ones returned by STQLite in its ** default configuration. However, the [sqlite3_extended_result_codes()] ** API can be used to set a database connectoin to return more detailed ** result codes. ** -** See also: [SQLITE_IOERR_READ | extended result codes] +** See also: [STQLITE_IOERR_READ | extended result codes] ** */ -#define SQLITE_OK 0 /* Successful result */ +#define STQLITE_OK 0 /* Successful result */ /* beginning-of-error-codes */ -#define SQLITE_ERROR 1 /* SQL error or missing database */ -#define SQLITE_INTERNAL 2 /* NOT USED. Internal logic error in SQLite */ -#define SQLITE_PERM 3 /* Access permission denied */ -#define SQLITE_ABORT 4 /* Callback routine requested an abort */ -#define SQLITE_BUSY 5 /* The database file is locked */ -#define SQLITE_LOCKED 6 /* A table in the database is locked */ -#define SQLITE_NOMEM 7 /* A malloc() failed */ -#define SQLITE_READONLY 8 /* Attempt to write a readonly database */ -#define SQLITE_INTERRUPT 9 /* Operation terminated by sqlite3_interrupt()*/ -#define SQLITE_IOERR 10 /* Some kind of disk I/O error occurred */ -#define SQLITE_CORRUPT 11 /* The database disk image is malformed */ -#define SQLITE_NOTFOUND 12 /* NOT USED. Table or record not found */ -#define SQLITE_FULL 13 /* Insertion failed because database is full */ -#define SQLITE_CANTOPEN 14 /* Unable to open the database file */ -#define SQLITE_PROTOCOL 15 /* NOT USED. Database lock protocol error */ -#define SQLITE_EMPTY 16 /* Database is empty */ -#define SQLITE_SCHEMA 17 /* The database schema changed */ -#define SQLITE_TOOBIG 18 /* String or BLOB exceeds size limit */ -#define SQLITE_CONSTRAINT 19 /* Abort due to contraint violation */ -#define SQLITE_MISMATCH 20 /* Data type mismatch */ -#define SQLITE_MISUSE 21 /* Library used incorrectly */ -#define SQLITE_NOLFS 22 /* Uses OS features not supported on host */ -#define SQLITE_AUTH 23 /* Authorization denied */ -#define SQLITE_FORMAT 24 /* Auxiliary database format error */ -#define SQLITE_RANGE 25 /* 2nd parameter to sqlite3_bind out of range */ -#define SQLITE_NOTADB 26 /* File opened that is not a database file */ -#define SQLITE_ROW 100 /* sqlite3_step() has another row ready */ -#define SQLITE_DONE 101 /* sqlite3_step() has finished executing */ +#define STQLITE_ERROR 1 /* SQL error or missing database */ +#define STQLITE_INTERNAL 2 /* NOT USED. Internal logic error in STQLite */ +#define STQLITE_PERM 3 /* Access permission denied */ +#define STQLITE_ABORT 4 /* Callback routine requested an abort */ +#define STQLITE_BUSY 5 /* The database file is locked */ +#define STQLITE_LOCKED 6 /* A table in the database is locked */ +#define STQLITE_NOMEM 7 /* A malloc() failed */ +#define STQLITE_READONLY 8 /* Attempt to write a readonly database */ +#define STQLITE_INTERRUPT 9 /* Operation terminated by sqlite3_interrupt()*/ +#define STQLITE_IOERR 10 /* Some kind of disk I/O error occurred */ +#define STQLITE_CORRUPT 11 /* The database disk image is malformed */ +#define STQLITE_NOTFOUND 12 /* NOT USED. Table or record not found */ +#define STQLITE_FULL 13 /* Insertion failed because database is full */ +#define STQLITE_CANTOPEN 14 /* Unable to open the database file */ +#define STQLITE_PROTOCOL 15 /* NOT USED. Database lock protocol error */ +#define STQLITE_EMPTY 16 /* Database is empty */ +#define STQLITE_SCHEMA 17 /* The database schema changed */ +#define STQLITE_TOOBIG 18 /* String or BLOB exceeds size limit */ +#define STQLITE_CONSTRAINT 19 /* Abort due to contraint violation */ +#define STQLITE_MISMATCH 20 /* Data type mismatch */ +#define STQLITE_MISUSE 21 /* Library used incorrectly */ +#define STQLITE_NOLFS 22 /* Uses OS features not supported on host */ +#define STQLITE_AUTH 23 /* Authorization denied */ +#define STQLITE_FORMAT 24 /* Auxiliary database format error */ +#define STQLITE_RANGE 25 /* 2nd parameter to sqlite3_bind out of range */ +#define STQLITE_NOTADB 26 /* File opened that is not a database file */ +#define STQLITE_ROW 100 /* sqlite3_step() has another row ready */ +#define STQLITE_DONE 101 /* sqlite3_step() has finished executing */ /* end-of-error-codes */ /* ** CAPI3REF: Extended Result Codes ** -** In its default configuration, SQLite API routines return one of 26 integer +** In its default configuration, STQLite API routines return one of 26 integer ** result codes described at result-codes. However, experience has shown that ** many of these result codes are too course-grained. They do not provide as ** much information about problems as users might like. In an effort to -** address this, newer versions of SQLite (version 3.3.8 and later) include +** address this, newer versions of STQLite (version 3.3.8 and later) include ** support for additional result codes that provide more detailed information ** about errors. The extended result codes are enabled (or disabled) for ** each database @@ -311,50 +311,50 @@ SQLITE_API int sqlite3_exec( ** Some of the available extended result codes are listed above. ** We expect the number of extended result codes will be expand ** over time. Software that uses extended result codes should expect -** to see new result codes in future releases of SQLite. +** to see new result codes in future releases of STQLite. ** ** The symbolic name for an extended result code always contains a related ** 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 masking off the lower 8 bytes. +** corresponding primary result code by tqmasking off the lower 8 bytes. ** -** The SQLITE_OK result code will never be extended. It will always +** The STQLITE_OK result code will never be extended. It will always ** be exactly zero. */ -#define SQLITE_IOERR_READ (SQLITE_IOERR | (1<<8)) -#define SQLITE_IOERR_SHORT_READ (SQLITE_IOERR | (2<<8)) -#define SQLITE_IOERR_WRITE (SQLITE_IOERR | (3<<8)) -#define SQLITE_IOERR_FSYNC (SQLITE_IOERR | (4<<8)) -#define SQLITE_IOERR_DIR_FSYNC (SQLITE_IOERR | (5<<8)) -#define SQLITE_IOERR_TRUNCATE (SQLITE_IOERR | (6<<8)) -#define SQLITE_IOERR_FSTAT (SQLITE_IOERR | (7<<8)) -#define SQLITE_IOERR_UNLOCK (SQLITE_IOERR | (8<<8)) -#define SQLITE_IOERR_RDLOCK (SQLITE_IOERR | (9<<8)) -#define SQLITE_IOERR_DELETE (SQLITE_IOERR | (10<<8)) -#define SQLITE_IOERR_BLOCKED (SQLITE_IOERR | (11<<8)) +#define STQLITE_IOERR_READ (STQLITE_IOERR | (1<<8)) +#define STQLITE_IOERR_SHORT_READ (STQLITE_IOERR | (2<<8)) +#define STQLITE_IOERR_WRITE (STQLITE_IOERR | (3<<8)) +#define STQLITE_IOERR_FSYNC (STQLITE_IOERR | (4<<8)) +#define STQLITE_IOERR_DIR_FSYNC (STQLITE_IOERR | (5<<8)) +#define STQLITE_IOERR_TRUNCATE (STQLITE_IOERR | (6<<8)) +#define STQLITE_IOERR_FSTAT (STQLITE_IOERR | (7<<8)) +#define STQLITE_IOERR_UNLOCK (STQLITE_IOERR | (8<<8)) +#define STQLITE_IOERR_RDLOCK (STQLITE_IOERR | (9<<8)) +#define STQLITE_IOERR_DELETE (STQLITE_IOERR | (10<<8)) +#define STQLITE_IOERR_BLOCKED (STQLITE_IOERR | (11<<8)) /* ** CAPI3REF: Enable Or Disable Extended Result Codes ** ** This routine enables or disables the -** [SQLITE_IOERR_READ | extended result codes] feature. -** By default, SQLite API routines return one of only 26 integer -** [SQLITE_OK | result codes]. When extended result codes +** [STQLITE_IOERR_READ | extended result codes] feature. +** By default, STQLite API routines return one of only 26 integer +** [STQLITE_OK | result codes]. When extended result codes ** are enabled by this routine, the repetoire of result codes can be ** much larger and can (hopefully) provide more detailed information ** about the cause of an error. ** ** The second argument is a boolean value that turns extended result ** codes on and off. Extended result codes are off by default for -** backwards compatibility with older versions of SQLite. +** backwards compatibility with older versions of STQLite. */ int sqlite3_extended_result_codes(sqlite3*, int onoff); /* ** CAPI3REF: Last Insert Rowid ** -** Each entry in an SQLite table has a unique 64-bit signed integer key +** Each entry in an STQLite table has a unique 64-bit signed integer key ** called the "rowid". The rowid is always available as an undeclared ** column named ROWID, OID, or _ROWID_. If the table has a column of ** type INTEGER PRIMARY KEY then that column is another an alias for the @@ -396,7 +396,7 @@ sqlite_int64 sqlite3_last_insert_rowid(sqlite3*); ** then the changes in the inner, recursive call are counted together ** with the changes in the outer call. ** -** SQLite implements the command "DELETE FROM table" without a WHERE clause +** STQLite implements the command "DELETE FROM table" without a WHERE clause ** by dropping and recreating the table. (This is much faster than going ** through and deleting individual elements from the table.) Because of ** this optimization, the change count for "DELETE FROM table" will be @@ -404,7 +404,7 @@ sqlite_int64 sqlite3_last_insert_rowid(sqlite3*); ** table. To get an accurate count of the number of rows deleted, use ** "DELETE FROM table WHERE 1" instead. */ -SQLITE_API int sqlite3_changes(sqlite3*); +STQLITE_API int sqlite3_changes(sqlite3*); /* ** CAPI3REF: Total Number Of Rows Modified @@ -418,7 +418,7 @@ SQLITE_API int sqlite3_changes(sqlite3*); ** ** See also the [sqlite3_change()] interface. ** -** SQLite implements the command "DELETE FROM table" without a WHERE clause +** STQLite implements the command "DELETE FROM table" without a WHERE clause ** by dropping and recreating the table. (This is much faster than going ** through and deleting individual elements form the table.) Because of ** this optimization, the change count for "DELETE FROM table" will be @@ -440,12 +440,12 @@ int sqlite3_total_changes(sqlite3*); ** It is safe to call this routine from a thread different from the ** thread that is currently running the database operation. ** -** The SQL operation that is interrupted will return [SQLITE_INTERRUPT]. +** The SQL operation that is interrupted will return [STQLITE_INTERRUPT]. ** If an interrupted operation was an update that is inside an ** explicit transaction, then the entire transaction will be rolled ** back automatically. */ -SQLITE_API void sqlite3_interrupt(sqlite3*); +STQLITE_API void sqlite3_interrupt(sqlite3*); /* ** CAPI3REF: Determine If An SQL Statement Is Complete @@ -459,23 +459,23 @@ SQLITE_API void sqlite3_interrupt(sqlite3*); ** These routines are useful for command-line input to determine if the ** currently entered text forms one or more complete SQL statements or ** if additional input is needed before sending the statements into -** SQLite for parsing. The algorithm is simple. If the +** STQLite for parsing. The algorithm is simple. If the ** last token other than spaces and comments is a semicolon, then return ** true. Actually, the algorithm is a little more complicated than that ** in order to deal with triggers, but the basic idea is the same: the ** statement is not complete unless it ends in a semicolon. */ -SQLITE_API int sqlite3_complete(const char *sql); -SQLITE_API int sqlite3_complete16(const void *sql); +STQLITE_API int sqlite3_complete(const char *sql); +STQLITE_API int sqlite3_complete16(const void *sql); /* -** CAPI3REF: Register A Callback To Handle SQLITE_BUSY Errors +** CAPI3REF: Register A Callback To Handle STQLITE_BUSY Errors ** ** This routine identifies a callback function that might be invoked ** whenever an attempt is made to open a database table ** that another thread or process has locked. -** If the busy callback is NULL, then [SQLITE_BUSY] -** (or sometimes [SQLITE_IOERR_BLOCKED]) +** If the busy callback is NULL, then [STQLITE_BUSY] +** (or sometimes [STQLITE_IOERR_BLOCKED]) ** is returned immediately upon encountering the lock. ** If the busy callback is not NULL, then the ** callback will be invoked with two arguments. The @@ -484,14 +484,14 @@ SQLITE_API int sqlite3_complete16(const void *sql); ** the handler is the number of times that the busy handler has ** been invoked for this locking event. If the ** busy callback returns 0, then no additional attempts are made to -** access the database and [SQLITE_BUSY] or [SQLITE_IOERR_BLOCKED] is returned. +** access the database and [STQLITE_BUSY] or [STQLITE_IOERR_BLOCKED] is returned. ** If the callback returns non-zero, then another attempt is made to open the ** database for reading and the cycle repeats. ** ** The presence of a busy handler does not guarantee that ** it will be invoked when there is lock contention. -** If SQLite determines that invoking the busy handler could result in -** a deadlock, it will return [SQLITE_BUSY] instead. +** If STQLite determines that invoking the busy handler could result in +** a deadlock, it will return [STQLITE_BUSY] instead. ** Consider a scenario where one process is holding a read lock that ** it is trying to promote to a reserved lock and ** a second process is holding a reserved lock that it is trying @@ -499,22 +499,22 @@ SQLITE_API int sqlite3_complete16(const void *sql); ** because it is blocked by the second and the second process cannot ** proceed because it is blocked by the first. If both processes ** invoke the busy handlers, neither will make any progress. Therefore, -** SQLite returns [SQLITE_BUSY] for the first process, hoping that this +** STQLite returns [STQLITE_BUSY] for the first process, hoping that this ** will induce the first process to release its read lock and allow ** the second process to proceed. ** ** The default busy callback is NULL. ** -** The [SQLITE_BUSY] error is converted to [SQLITE_IOERR_BLOCKED] when -** SQLite is in the middle of a large transaction where all the -** changes will not fit into the in-memory cache. SQLite will +** The [STQLITE_BUSY] error is converted to [STQLITE_IOERR_BLOCKED] when +** STQLite is in the middle of a large transaction where all the +** changes will not fit into the in-memory cache. STQLite will ** already hold a RESERVED lock on the database file, but it needs ** to promote this lock to EXCLUSIVE so that it can spill cache ** pages into the database file without harm to concurrent ** readers. If it is unable to promote the lock, then the in-memory ** cache will be left in an inconsistent state and so the error -** code is promoted from the relatively benign [SQLITE_BUSY] to -** the more severe [SQLITE_IOERR_BLOCKED]. This error code promotion +** code is promoted from the relatively benign [STQLITE_BUSY] to +** the more severe [STQLITE_IOERR_BLOCKED]. This error code promotion ** forces an automatic rollback of the changes. See the ** <a href="http://www.sqlite.org/cvstrac/wiki?p=CorruptionFollowingBusyError"> ** CorruptionFollowingBusyError</a> wiki page for a discussion of why @@ -541,7 +541,7 @@ int sqlite3_busy_handler(sqlite3*, int(*)(void*,int), void*); ** table is locked. The handler will sleep multiple times until ** at least "ms" milliseconds of sleeping have been done. After ** "ms" milliseconds of sleeping, the handler returns 0 which -** causes [sqlite3_step()] to return [SQLITE_BUSY] or [SQLITE_IOERR_BLOCKED]. +** causes [sqlite3_step()] to return [STQLITE_BUSY] or [STQLITE_IOERR_BLOCKED]. ** ** Calling this routine with an argument less than or equal to zero ** turns off all busy handlers. @@ -699,53 +699,53 @@ void sqlite3_free_table(char **result); ** The code above will render a correct SQL statement in the zSQL ** variable even if the zText variable is a NULL pointer. */ -SQLITE_API char *sqlite3_mprintf(const char*,...); -SQLITE_API char *sqlite3_vmprintf(const char*, va_list); -SQLITE_API char *sqlite3_snprintf(int,char*,const char*, ...); +STQLITE_API char *sqlite3_mprintf(const char*,...); +STQLITE_API char *sqlite3_vmprintf(const char*, va_list); +STQLITE_API char *sqlite3_snprintf(int,char*,const char*, ...); /* ** CAPI3REF: Memory Allocation Functions ** -** SQLite uses its own memory allocator. On some installations, this +** STQLite uses its own memory allocator. On some installations, this ** memory allocator is identical to the standard malloc()/realloc()/free() ** and can be used interchangable. On others, the implementations are ** different. For maximum portability, it is best not to mix calls ** to the standard malloc/realloc/free with the sqlite versions. */ -SQLITE_API void *sqlite3_malloc(int); -SQLITE_API void *sqlite3_realloc(void*, int); -SQLITE_API void sqlite3_free(void*); +STQLITE_API void *sqlite3_malloc(int); +STQLITE_API void *sqlite3_realloc(void*, int); +STQLITE_API void sqlite3_free(void*); /* ** CAPI3REF: Compile-Time Authorization Callbacks *** -** This routine registers a authorizer callback with the SQLite library. +** This routine registers a authorizer callback with the STQLite library. ** The authorizer callback is invoked as SQL statements are being compiled ** by [sqlite3_prepare()] or its variants [sqlite3_prepare_v2()], ** [sqlite3_prepare16()] and [sqlite3_prepare16_v2()]. At various ** points during the compilation process, as logic is being created ** to perform various actions, the authorizer callback is invoked to ** see if those actions are allowed. The authorizer callback should -** return SQLITE_OK to allow the action, [SQLITE_IGNORE] to disallow the +** return STQLITE_OK to allow the action, [STQLITE_IGNORE] to disallow the ** specific action but allow the SQL statement to continue to be -** compiled, or [SQLITE_DENY] to cause the entire SQL statement to be +** compiled, or [STQLITE_DENY] to cause the entire SQL statement to be ** rejected with an error. ** -** Depending on the action, the [SQLITE_IGNORE] and [SQLITE_DENY] return +** Depending on the action, the [STQLITE_IGNORE] and [STQLITE_DENY] return ** codes might mean something different or they might mean the same ** thing. If the action is, for example, to perform a delete opertion, -** then [SQLITE_IGNORE] and [SQLITE_DENY] both cause the statement compilation +** then [STQLITE_IGNORE] and [STQLITE_DENY] both cause the statement compilation ** to fail with an error. But if the action is to read a specific column -** from a specific table, then [SQLITE_DENY] will cause the entire -** statement to fail but [SQLITE_IGNORE] will cause a NULL value to be +** from a specific table, then [STQLITE_DENY] will cause the entire +** statement to fail but [STQLITE_IGNORE] will cause a NULL value to be ** read instead of the actual column value. ** ** The first parameter to the authorizer callback is a copy of ** the third parameter to the sqlite3_set_authorizer() interface. ** The second parameter to the callback is an integer -** [SQLITE_COPY | action code] that specifies the particular action +** [STQLITE_COPY | action code] that specifies the particular action ** to be authorized. The available action codes are -** [SQLITE_COPY | documented separately]. The third through sixth +** [STQLITE_COPY | documented separately]. The third through sixth ** parameters to the callback are strings that contain additional ** details about the action to be authorized. ** @@ -779,13 +779,13 @@ int sqlite3_set_authorizer( ** CAPI3REF: Authorizer Return Codes ** ** The [sqlite3_set_authorizer | authorizer callback function] must -** return either [SQLITE_OK] or one of these two constants in order -** to signal SQLite whether or not the action is permitted. See the +** return either [STQLITE_OK] or one of these two constants in order +** to signal STQLite whether or not the action is permitted. See the ** [sqlite3_set_authorizer | authorizer documentation] for additional ** information. */ -#define SQLITE_DENY 1 /* Abort the SQL statement with an error */ -#define SQLITE_IGNORE 2 /* Don't allow access, but don't generate an error */ +#define STQLITE_DENY 1 /* Abort the SQL statement with an error */ +#define STQLITE_IGNORE 2 /* Don't allow access, but don't generate an error */ /* ** CAPI3REF: Authorizer Action Codes @@ -807,38 +807,38 @@ int sqlite3_set_authorizer( ** top-level SQL code. */ /******************************************* 3rd ************ 4th ***********/ -#define SQLITE_CREATE_INDEX 1 /* Index Name Table Name */ -#define SQLITE_CREATE_TABLE 2 /* Table Name NULL */ -#define SQLITE_CREATE_TEMP_INDEX 3 /* Index Name Table Name */ -#define SQLITE_CREATE_TEMP_TABLE 4 /* Table Name NULL */ -#define SQLITE_CREATE_TEMP_TRIGGER 5 /* Trigger Name Table Name */ -#define SQLITE_CREATE_TEMP_VIEW 6 /* View Name NULL */ -#define SQLITE_CREATE_TRIGGER 7 /* Trigger Name Table Name */ -#define SQLITE_CREATE_VIEW 8 /* View Name NULL */ -#define SQLITE_DELETE 9 /* Table Name NULL */ -#define SQLITE_DROP_INDEX 10 /* Index Name Table Name */ -#define SQLITE_DROP_TABLE 11 /* Table Name NULL */ -#define SQLITE_DROP_TEMP_INDEX 12 /* Index Name Table Name */ -#define SQLITE_DROP_TEMP_TABLE 13 /* Table Name NULL */ -#define SQLITE_DROP_TEMP_TRIGGER 14 /* Trigger Name Table Name */ -#define SQLITE_DROP_TEMP_VIEW 15 /* View Name NULL */ -#define SQLITE_DROP_TRIGGER 16 /* Trigger Name Table Name */ -#define SQLITE_DROP_VIEW 17 /* View Name NULL */ -#define SQLITE_INSERT 18 /* Table Name NULL */ -#define SQLITE_PRAGMA 19 /* Pragma Name 1st arg or NULL */ -#define SQLITE_READ 20 /* Table Name Column Name */ -#define SQLITE_SELECT 21 /* NULL NULL */ -#define SQLITE_TRANSACTION 22 /* NULL NULL */ -#define SQLITE_UPDATE 23 /* Table Name Column Name */ -#define SQLITE_ATTACH 24 /* Filename NULL */ -#define SQLITE_DETACH 25 /* Database Name NULL */ -#define SQLITE_ALTER_TABLE 26 /* Database Name Table Name */ -#define SQLITE_REINDEX 27 /* Index Name NULL */ -#define SQLITE_ANALYZE 28 /* Table Name NULL */ -#define SQLITE_CREATE_VTABLE 29 /* Table Name Module Name */ -#define SQLITE_DROP_VTABLE 30 /* Table Name Module Name */ -#define SQLITE_FUNCTION 31 /* Function Name NULL */ -#define SQLITE_COPY 0 /* No longer used */ +#define STQLITE_CREATE_INDEX 1 /* Index Name Table Name */ +#define STQLITE_CREATE_TABLE 2 /* Table Name NULL */ +#define STQLITE_CREATE_TEMP_INDEX 3 /* Index Name Table Name */ +#define STQLITE_CREATE_TEMP_TABLE 4 /* Table Name NULL */ +#define STQLITE_CREATE_TEMP_TRIGGER 5 /* Trigger Name Table Name */ +#define STQLITE_CREATE_TEMP_VIEW 6 /* View Name NULL */ +#define STQLITE_CREATE_TRIGGER 7 /* Trigger Name Table Name */ +#define STQLITE_CREATE_VIEW 8 /* View Name NULL */ +#define STQLITE_DELETE 9 /* Table Name NULL */ +#define STQLITE_DROP_INDEX 10 /* Index Name Table Name */ +#define STQLITE_DROP_TABLE 11 /* Table Name NULL */ +#define STQLITE_DROP_TEMP_INDEX 12 /* Index Name Table Name */ +#define STQLITE_DROP_TEMP_TABLE 13 /* Table Name NULL */ +#define STQLITE_DROP_TEMP_TRIGGER 14 /* Trigger Name Table Name */ +#define STQLITE_DROP_TEMP_VIEW 15 /* View Name NULL */ +#define STQLITE_DROP_TRIGGER 16 /* Trigger Name Table Name */ +#define STQLITE_DROP_VIEW 17 /* View Name NULL */ +#define STQLITE_INSERT 18 /* Table Name NULL */ +#define STQLITE_PRAGMA 19 /* Pragma Name 1st arg or NULL */ +#define STQLITE_READ 20 /* Table Name Column Name */ +#define STQLITE_SELECT 21 /* NULL NULL */ +#define STQLITE_TRANSACTION 22 /* NULL NULL */ +#define STQLITE_UPDATE 23 /* Table Name Column Name */ +#define STQLITE_ATTACH 24 /* Filename NULL */ +#define STQLITE_DETACH 25 /* Database Name NULL */ +#define STQLITE_ALTER_TABLE 26 /* Database Name Table Name */ +#define STQLITE_REINDEX 27 /* Index Name NULL */ +#define STQLITE_ANALYZE 28 /* Table Name NULL */ +#define STQLITE_CREATE_VTABLE 29 /* Table Name Module Name */ +#define STQLITE_DROP_VTABLE 30 /* Table Name Module Name */ +#define STQLITE_FUNCTION 31 /* Function Name NULL */ +#define STQLITE_COPY 0 /* No longer used */ /* ** CAPI3REF: Tracing And Profiling Functions @@ -854,8 +854,8 @@ int sqlite3_set_authorizer( ** The sqlite3_profile() API is currently considered experimental and ** is subject to change. */ -SQLITE_API void *sqlite3_trace(sqlite3*, void(*xTrace)(void*,const char*), void*); -SQLITE_API void *sqlite3_profile(sqlite3*, +STQLITE_API void *sqlite3_trace(sqlite3*, void(*xTrace)(void*,const char*), void*); +STQLITE_API void *sqlite3_profile(sqlite3*, void(*xProfile)(void*,const char*,sqlite_uint64), void*); /* @@ -885,7 +885,7 @@ SQLITE_API void *sqlite3_profile(sqlite3*, ** If the progress callback returns a result other than 0, then the current ** query is immediately terminated and any database changes rolled back. ** The containing [sqlite3_exec()], [sqlite3_step()], or -** [sqlite3_get_table()] call returns SQLITE_INTERRUPT. This feature +** [sqlite3_get_table()] call returns STQLITE_INTERRUPT. This feature ** can be used, for example, to implement the "Cancel" button on a ** progress dialog box in a GUI. */ @@ -898,7 +898,7 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); ** encoded for sqlite3_open() and UTF-16 encoded in the native byte order ** for sqlite3_open16(). An [sqlite3*] handle is returned in *ppDb, even ** if an error occurs. If the database is opened (or created) successfully, -** then SQLITE_OK is returned. Otherwise an error code is returned. The +** then STQLITE_OK is returned. Otherwise an error code is returned. The ** sqlite3_errmsg() or sqlite3_errmsg16() routines can be used to obtain ** an English language description of the error. ** @@ -915,20 +915,20 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); ** defined. Filenames containing international characters must be converted ** to UTF-8 prior to passing them into sqlite3_open(). */ -SQLITE_API int sqlite3_open( +STQLITE_API int sqlite3_open( const char *filename, /* Database filename (UTF-8) */ - sqlite3 **ppDb /* OUT: SQLite db handle */ + sqlite3 **ppDb /* OUT: STQLite db handle */ ); -SQLITE_API int sqlite3_open16( +STQLITE_API int sqlite3_open16( const void *filename, /* Database filename (UTF-16) */ - sqlite3 **ppDb /* OUT: SQLite db handle */ + sqlite3 **ppDb /* OUT: STQLite db handle */ ); /* ** CAPI3REF: Error Codes And Messages ** ** The sqlite3_errcode() interface returns the numeric -** [SQLITE_OK | result code] or [SQLITE_IOERR_READ | extended result code] +** [STQLITE_OK | result code] or [STQLITE_IOERR_READ | extended result code] ** for the most recent failed sqlite3_* API call associated ** with [sqlite3] handle 'db'. If a prior API call failed but the ** most recent API call succeeded, the return value from sqlite3_errcode() @@ -937,7 +937,7 @@ SQLITE_API int sqlite3_open16( ** The sqlite3_errmsg() and sqlite3_errmsg16() return English-langauge ** text that describes the error, as either UTF8 or UTF16 respectively. ** Memory to hold the error message string is managed internally. The -** string may be overwritten or deallocated by subsequent calls to SQLite +** string may be overwritten or deallocated by subsequent calls to STQLite ** interface functions. ** ** Calls to many sqlite3_* functions set the error code and string returned @@ -952,9 +952,9 @@ SQLITE_API int sqlite3_open16( ** code returned by this function is associated with the same error as ** the strings returned by [sqlite3_errmsg()] and [sqlite3_errmsg16()]. */ -SQLITE_API int sqlite3_errcode(sqlite3 *db); -SQLITE_API const char *sqlite3_errmsg(sqlite3*); -SQLITE_API const void *sqlite3_errmsg16(sqlite3*); +STQLITE_API int sqlite3_errcode(sqlite3 *db); +STQLITE_API const char *sqlite3_errmsg(sqlite3*); +STQLITE_API const void *sqlite3_errmsg16(sqlite3*); /* ** CAPI3REF: SQL Statement Object @@ -987,7 +987,7 @@ typedef struct sqlite3_stmt sqlite3_stmt; ** To execute an SQL query, it must first be compiled into a byte-code ** program using one of these routines. ** -** The first argument "db" is an [sqlite3 | SQLite database handle] +** The first argument "db" is an [sqlite3 | STQLite database handle] ** obtained from a prior call to [sqlite3_open()] or [sqlite3_open16()]. ** The second argument "zSql" is the statement to be compiled, encoded ** as either UTF-8 or UTF-16. The sqlite3_prepare() and sqlite3_prepare_v2() @@ -1013,8 +1013,8 @@ typedef struct sqlite3_stmt sqlite3_stmt; ** procedure is responsible for deleting the compiled SQL statement ** using [sqlite3_finalize()] after it has finished with it. ** -** On success, [SQLITE_OK] is returned. Otherwise an -** [SQLITE_ERROR | error code] is returned. +** On success, [STQLITE_OK] is returned. Otherwise an +** [STQLITE_ERROR | error code] is returned. ** ** The sqlite3_prepare_v2() and sqlite3_prepare16_v2() interfaces are ** recommended for all new programs. The two older interfaces are retained @@ -1026,30 +1026,30 @@ typedef struct sqlite3_stmt sqlite3_stmt; ** ** <ol> ** <li> -** If the database schema changes, instead of returning [SQLITE_SCHEMA] as it +** If the database schema changes, instead of returning [STQLITE_SCHEMA] as it ** always used to do, [sqlite3_step()] will automatically recompile the SQL ** statement and try to run it again. If the schema has changed in a way ** that makes the statement no longer valid, [sqlite3_step()] will still -** return [SQLITE_SCHEMA]. But unlike the legacy behavior, [SQLITE_SCHEMA] is +** return [STQLITE_SCHEMA]. But unlike the legacy behavior, [STQLITE_SCHEMA] is ** now a fatal error. Calling [sqlite3_prepare_v2()] again will not make the ** error go away. Note: use [sqlite3_errmsg()] to find the text of the parsing -** error that results in an [SQLITE_SCHEMA] return. +** error that results in an [STQLITE_SCHEMA] return. ** </li> ** ** <li> ** When an error occurs, ** [sqlite3_step()] will return one of the detailed -** [SQLITE_ERROR | result codes] or -** [SQLITE_IOERR_READ | extended result codes] such as directly. +** [STQLITE_ERROR | result codes] or +** [STQLITE_IOERR_READ | extended result codes] such as directly. ** The legacy behavior was that [sqlite3_step()] would only return a generic -** [SQLITE_ERROR] result code and you would have to make a second call to +** [STQLITE_ERROR] result code and you would have to make a second call to ** [sqlite3_reset()] in order to find the underlying cause of the problem. ** With the "v2" prepare interfaces, the underlying reason for the error is ** returned immediately. ** </li> ** </ol> */ -SQLITE_API int sqlite3_prepare( +STQLITE_API int sqlite3_prepare( sqlite3 *db, /* Database handle */ const char *zSql, /* SQL statement, UTF-8 encoded */ int nByte, /* Maximum length of zSql in bytes. */ @@ -1063,7 +1063,7 @@ int sqlite3_prepare_v2( sqlite3_stmt **ppStmt, /* OUT: Statement handle */ const char **pzTail /* OUT: Pointer to unused portion of zSql */ ); -SQLITE_API int sqlite3_prepare16( +STQLITE_API int sqlite3_prepare16( sqlite3 *db, /* Database handle */ const void *zSql, /* SQL statement, UTF-16 encoded */ int nByte, /* Maximum length of zSql in bytes. */ @@ -1081,7 +1081,7 @@ int sqlite3_prepare16_v2( /* ** CAPI3REF: Dynamically Typed Value Object ** -** SQLite uses dynamic typing for the values it stores. Values can +** STQLite uses dynamic typing for the values it stores. Values can ** be integers, floating point values, strings, BLOBs, or NULL. When ** passing around values internally, each value is represented as ** an instance of the sqlite3_value object. @@ -1129,7 +1129,7 @@ typedef struct sqlite3_context sqlite3_context; ** [sqlite3_bind_parameter_name()] API if desired. The index for "?NNN" ** parametes is the value of NNN. ** The NNN value must be between 1 and the compile-time -** parameter SQLITE_MAX_VARIABLE_NUMBER (default value: 999). +** parameter STQLITE_MAX_VARIABLE_NUMBER (default value: 999). ** See <a href="limits.html">limits.html</a> for additional information. ** ** The third argument is the value to bind to the parameter. @@ -1144,10 +1144,10 @@ typedef struct sqlite3_context sqlite3_context; ** ** The fifth argument to sqlite3_bind_blob(), sqlite3_bind_text(), and ** sqlite3_bind_text16() is a destructor used to dispose of the BLOB or -** text after SQLite has finished with it. If the fifth argument is the -** special value [SQLITE_STATIC], then the library assumes that the information +** text after STQLite has finished with it. If the fifth argument is the +** special value [STQLITE_STATIC], then the library assumes that the information ** is in static, unmanaged space and does not need to be freed. If the -** fifth argument has the value [SQLITE_TRANSIENT], then SQLite makes its +** fifth argument has the value [STQLITE_TRANSIENT], then STQLite makes its ** own private copy of the data immediately, before the sqlite3_bind_*() ** routine returns. ** @@ -1164,10 +1164,10 @@ typedef struct sqlite3_context sqlite3_context; ** Bindings are not cleared by the [sqlite3_reset()] routine. ** Unbound parameters are interpreted as NULL. ** -** These routines return [SQLITE_OK] on success or an error code if -** anything goes wrong. [SQLITE_RANGE] is returned if the parameter -** index is out of range. [SQLITE_NOMEM] is returned if malloc fails. -** [SQLITE_MISUSE] is returned if these routines are called on a virtual +** These routines return [STQLITE_OK] on success or an error code if +** anything goes wrong. [STQLITE_RANGE] is returned if the parameter +** index is out of range. [STQLITE_NOMEM] is returned if malloc fails. +** [STQLITE_MISUSE] is returned if these routines are called on a virtual ** machine that is the wrong state or which has already been finalized. */ int sqlite3_bind_blob(sqlite3_stmt*, int, const void*, int n, void(*)(void*)); @@ -1292,11 +1292,11 @@ const void *sqlite3_column_name16(sqlite3_stmt*, int N); ** name of the attached database, table and column that query result ** column was extracted from. ** -** As with all other SQLite APIs, those postfixed with "16" return UTF-16 +** As with all other STQLite APIs, those postfixed with "16" return UTF-16 ** encoded strings, the other functions return UTF-8. ** ** These APIs are only available if the library was compiled with the -** SQLITE_ENABLE_COLUMN_METADATA preprocessor symbol defined. +** STQLITE_ENABLE_COLUMN_METADATA preprocessor symbol defined. */ const char *sqlite3_column_database_name(sqlite3_stmt*,int); const void *sqlite3_column_database_name16(sqlite3_stmt*,int); @@ -1327,9 +1327,9 @@ const void *sqlite3_column_origin_name16(sqlite3_stmt*,int); ** result column (i==1), and a NULL pointer for the first result column ** (i==0). ** -** SQLite uses dynamic run-time typing. So just because a column +** STQLite uses dynamic run-time typing. So just because a column ** is declared to contain a particular type does not mean that the -** data stored in that column is of the declared type. SQLite is +** data stored in that column is of the declared type. STQLite is ** strongly typed, but the typing is dynamic not static. Type ** is associated with individual values, not with the containers ** used to hold those values. @@ -1353,71 +1353,71 @@ const void *sqlite3_column_decltype16(sqlite3_stmt*,int); ** new "v2" interface is recommended for new applications but the legacy ** interface will continue to be supported. ** -** In the lagacy interface, the return value will be either [SQLITE_BUSY], -** [SQLITE_DONE], [SQLITE_ROW], [SQLITE_ERROR], or [SQLITE_MISUSE]. -** With the "v2" interface, any of the other [SQLITE_OK | result code] -** or [SQLITE_IOERR_READ | extended result code] might be returned as +** In the lagacy interface, the return value will be either [STQLITE_BUSY], +** [STQLITE_DONE], [STQLITE_ROW], [STQLITE_ERROR], or [STQLITE_MISUSE]. +** With the "v2" interface, any of the other [STQLITE_OK | result code] +** or [STQLITE_IOERR_READ | extended result code] might be returned as ** well. ** -** [SQLITE_BUSY] means that the database engine was unable to acquire the +** [STQLITE_BUSY] means that the database engine was unable to acquire the ** database locks it needs to do its job. If the statement is a COMMIT ** or occurs outside of an explicit transaction, then you can retry the ** statement. If the statement is not a COMMIT and occurs within a ** explicit transaction then you should rollback the transaction before ** continuing. ** -** [SQLITE_DONE] means that the statement has finished executing +** [STQLITE_DONE] means that the statement has finished executing ** successfully. sqlite3_step() should not be called again on this virtual ** machine without first calling [sqlite3_reset()] to reset the virtual ** machine back to its initial state. ** ** If the SQL statement being executed returns any data, then -** [SQLITE_ROW] is returned each time a new row of data is ready +** [STQLITE_ROW] is returned each time a new row of data is ready ** for processing by the caller. The values may be accessed using ** the [sqlite3_column_int | column access functions]. ** sqlite3_step() is called again to retrieve the next row of data. ** -** [SQLITE_ERROR] means that a run-time error (such as a constraint +** [STQLITE_ERROR] means that a run-time error (such as a constraint ** violation) has occurred. sqlite3_step() should not be called again on ** the VM. More information may be found by calling [sqlite3_errmsg()]. ** With the legacy interface, a more specific error code (example: -** [SQLITE_INTERRUPT], [SQLITE_SCHEMA], [SQLITE_CORRUPT], and so forth) +** [STQLITE_INTERRUPT], [STQLITE_SCHEMA], [STQLITE_CORRUPT], and so forth) ** can be obtained by calling [sqlite3_reset()] on the ** [sqlite_stmt | prepared statement]. In the "v2" interface, ** the more specific error code is returned directly by sqlite3_step(). ** -** [SQLITE_MISUSE] means that the this routine was called inappropriately. +** [STQLITE_MISUSE] means that the this routine was called inappropriately. ** Perhaps it was called on a [sqlite_stmt | prepared statement] that has ** already been [sqlite3_finalize | finalized] or on one that had -** previously returned [SQLITE_ERROR] or [SQLITE_DONE]. Or it could +** previously returned [STQLITE_ERROR] or [STQLITE_DONE]. Or it could ** be the case that the same database connection is being used by two or ** more threads at the same moment in time. ** ** <b>Goofy Interface Alert:</b> ** In the legacy interface, ** the sqlite3_step() API always returns a generic error code, -** [SQLITE_ERROR], following any error other than [SQLITE_BUSY] -** and [SQLITE_MISUSE]. You must call [sqlite3_reset()] or +** [STQLITE_ERROR], following any error other than [STQLITE_BUSY] +** and [STQLITE_MISUSE]. You must call [sqlite3_reset()] or ** [sqlite3_finalize()] in order to find one of the specific -** [SQLITE_ERROR | result codes] that better describes the error. +** [STQLITE_ERROR | result codes] that better describes the error. ** We admit that this is a goofy design. The problem has been fixed ** with the "v2" interface. If you prepare all of your SQL statements ** using either [sqlite3_prepare_v2()] or [sqlite3_prepare16_v2()] instead ** of the legacy [sqlite3_prepare()] and [sqlite3_prepare16()], then the -** more specific [SQLITE_ERROR | result codes] are returned directly +** more specific [STQLITE_ERROR | result codes] are returned directly ** by sqlite3_step(). The use of the "v2" interface is recommended. */ -SQLITE_API int sqlite3_step(sqlite3_stmt*); +STQLITE_API int sqlite3_step(sqlite3_stmt*); /* ** CAPI3REF: ** ** Return the number of values in the current row of the result set. ** -** After a call to [sqlite3_step()] that returns [SQLITE_ROW], this routine +** After a call to [sqlite3_step()] that returns [STQLITE_ROW], this routine ** will return the same value as the [sqlite3_column_count()] function. -** After [sqlite3_step()] has returned an [SQLITE_DONE], [SQLITE_BUSY], or -** a [SQLITE_ERROR | error code], or before [sqlite3_step()] has been +** After [sqlite3_step()] has returned an [STQLITE_DONE], [STQLITE_BUSY], or +** a [STQLITE_ERROR | error code], or before [sqlite3_step()] has been ** called on the [sqlite_stmt | prepared statement] for the first time, ** this routine returns zero. */ @@ -1426,7 +1426,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); /* ** CAPI3REF: Fundamental Datatypes ** -** Every value in SQLite has one of five fundamental datatypes: +** Every value in STQLite has one of five fundamental datatypes: ** ** <ul> ** <li> 64-bit signed integer @@ -1438,21 +1438,21 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** ** These constants are codes for each of those types. ** -** Note that the SQLITE_TEXT constant was also used in SQLite version 2 +** Note that the STQLITE_TEXT constant was also used in STQLite version 2 ** for a completely different meaning. Software that links against both -** SQLite version 2 and SQLite version 3 should use SQLITE3_TEXT not -** SQLITE_TEXT. -*/ -#define SQLITE_INTEGER 1 -#define SQLITE_FLOAT 2 -#define SQLITE_BLOB 4 -#define SQLITE_NULL 5 -#ifdef SQLITE_TEXT -# undef SQLITE_TEXT +** STQLite version 2 and STQLite version 3 should use STQLITE3_TEXT not +** STQLITE_TEXT. +*/ +#define STQLITE_INTEGER 1 +#define STQLITE_FLOAT 2 +#define STQLITE_BLOB 4 +#define STQLITE_NULL 5 +#ifdef STQLITE_TEXT +# undef STQLITE_TEXT #else -# define SQLITE_TEXT 3 +# define STQLITE_TEXT 3 #endif -#define SQLITE3_TEXT 3 +#define STQLITE3_TEXT 3 /* ** CAPI3REF: Results Values From A Query @@ -1470,13 +1470,13 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** the column index is out of range, the result is undefined. ** ** The sqlite3_column_type() routine returns -** [SQLITE_INTEGER | datatype code] for the initial data type -** of the result column. The returned value is one of [SQLITE_INTEGER], -** [SQLITE_FLOAT], [SQLITE_TEXT], [SQLITE_BLOB], or [SQLITE_NULL]. The value +** [STQLITE_INTEGER | datatype code] for the initial data type +** of the result column. The returned value is one of [STQLITE_INTEGER], +** [STQLITE_FLOAT], [STQLITE_TEXT], [STQLITE_BLOB], or [STQLITE_NULL]. The value ** returned by sqlite3_column_type() is only meaningful if no type ** conversions have occurred as described below. After a type conversion, ** the value returned by sqlite3_column_type() is undefined. Future -** versions of SQLite may change the behavior of sqlite3_column_type() +** versions of STQLite may change the behavior of sqlite3_column_type() ** following a type conversion. ** ** If the result is a BLOB or UTF-8 string then the sqlite3_column_bytes() @@ -1525,14 +1525,14 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** </blockquote> ** ** The table above makes reference to standard C library functions atoi() -** and atof(). SQLite does not really use these functions. It has its +** and atof(). STQLite does not really use these functions. It has its ** on equavalent internal routines. The atoi() and atof() names are ** used in the table for brevity and because they are familiar to most ** C programmers. ** ** 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 invalidated. +** sqlite3_column_text16() may be tqinvalidated. ** Type conversions and pointer invalidations might occur ** in the following cases: ** @@ -1551,10 +1551,10 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** </ul> ** ** Conversions between UTF-16be and UTF-16le are always done in place and do -** not invalidate a prior pointer, though of course the content of the buffer +** 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 invalidated. +** not possible and in those cases prior pointers are tqinvalidated. ** ** The safest and easiest to remember policy is to invoke these routines ** in one of the following ways: @@ -1588,9 +1588,9 @@ sqlite3_value *sqlite3_column_value(sqlite3_stmt*, int iCol); ** ** The sqlite3_finalize() function is called to delete a ** [sqlite3_stmt | compiled SQL statement]. If the statement was -** executed successfully, or not executed at all, then SQLITE_OK is returned. +** executed successfully, or not executed at all, then STQLITE_OK is returned. ** If execution of the statement failed then an -** [SQLITE_ERROR | error code] or [SQLITE_IOERR_READ | extended error code] +** [STQLITE_ERROR | error code] or [STQLITE_IOERR_READ | extended error code] ** is returned. ** ** This routine can be called at any point during the execution of the @@ -1599,9 +1599,9 @@ sqlite3_value *sqlite3_column_value(sqlite3_stmt*, int iCol); ** encountering an error or an interrupt. (See [sqlite3_interrupt()].) ** Incomplete updates may be rolled back and transactions cancelled, ** depending on the circumstances, and the -** [SQLITE_ERROR | result code] returned will be [SQLITE_ABORT]. +** [STQLITE_ERROR | result code] returned will be [STQLITE_ABORT]. */ -SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt); +STQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt); /* ** CAPI3REF: Reset A Prepared Statement Object @@ -1613,7 +1613,7 @@ SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt); ** the [sqlite3_bind_blob | sqlite3_bind_*() API] retain their values. ** Use [sqlite3_clear_bindings()] to reset the bindings. */ -SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt); +STQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt); /* ** CAPI3REF: Create Or Redefine SQL Functions @@ -1635,24 +1635,24 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt); ** The length of the name is limited to 255 bytes, exclusive of the ** zero-terminator. Note that the name length limit is in bytes, not ** characters. Any attempt to create a function with a longer name -** will result in an SQLITE_ERROR error. +** will result in an STQLITE_ERROR error. ** ** The third parameter is the number of arguments that the SQL function or ** aggregate takes. If this parameter is negative, then the SQL function or ** aggregate may take any number of arguments. ** ** The fourth parameter, eTextRep, specifies what -** [SQLITE_UTF8 | text encoding] this SQL function prefers for +** [STQLITE_UTF8 | text encoding] this SQL function prefers for ** its parameters. Any SQL function implementation should be able to work ** work with UTF-8, UTF-16le, or UTF-16be. But some implementations may be ** more efficient with one encoding than another. It is allowed to ** invoke sqlite_create_function() or sqlite3_create_function16() multiple ** times with the same function but with different values of eTextRep. -** When multiple implementations of the same function are available, SQLite +** When multiple implementations of the same function are available, STQLite ** will pick the one that involves the least amount of data conversion. ** If there is only a single implementation which does not care what ** text encoding is used, then the fourth argument should be -** [SQLITE_ANY]. +** [STQLITE_ANY]. ** ** The fifth parameter is an arbitrary pointer. The implementation ** of the function can gain access to this pointer using @@ -1669,7 +1669,7 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt); ** ** It is permitted to register multiple implementations of the same ** functions with the same name but with either differing numbers of -** arguments or differing perferred text encodings. SQLite will use +** arguments or differing perferred text encodings. STQLite will use ** the implementation most closely matches the way in which the ** SQL function is used. */ @@ -1698,14 +1698,14 @@ int sqlite3_create_function16( ** CAPI3REF: Text Encodings ** ** These constant define integer codes that represent the various -** text encodings supported by SQLite. +** text encodings supported by STQLite. */ -#define SQLITE_UTF8 1 -#define SQLITE_UTF16LE 2 -#define SQLITE_UTF16BE 3 -#define SQLITE_UTF16 4 /* Use native byte order */ -#define SQLITE_ANY 5 /* sqlite3_create_function only */ -#define SQLITE_UTF16_ALIGNED 8 /* sqlite3_create_collation only */ +#define STQLITE_UTF8 1 +#define STQLITE_UTF16LE 2 +#define STQLITE_UTF16BE 3 +#define STQLITE_UTF16 4 /* Use native byte order */ +#define STQLITE_ANY 5 /* sqlite3_create_function only */ +#define STQLITE_UTF16_ALIGNED 8 /* sqlite3_create_collation only */ /* ** CAPI3REF: Obsolete Functions @@ -1717,7 +1717,7 @@ int sqlite3_create_function16( ** using these functions, we are not going to tell you want they do. */ int sqlite3_aggregate_count(sqlite3_context*); -SQLITE_API int sqlite3_expired(sqlite3_stmt*); +STQLITE_API int sqlite3_expired(sqlite3_stmt*); int sqlite3_transfer_bindings(sqlite3_stmt*, sqlite3_stmt*); int sqlite3_global_recover(void); @@ -1753,11 +1753,11 @@ int sqlite3_global_recover(void); ** such a conversion is possible without loss of information (in order ** words if the value is original a string that looks like a number) ** then it is done. Otherwise no conversion occurs. The -** [SQLITE_INTEGER | datatype] after conversion is returned. +** [STQLITE_INTEGER | datatype] after conversion is returned. ** ** 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 invalidated by a subsequent call to +** [sqlite3_value_text16()] can be tqinvalidated by a subsequent call to ** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite_value_text()], ** or [sqlite3_value_text16()]. */ @@ -1784,7 +1784,7 @@ int sqlite3_value_numeric_type(sqlite3_value*); ** same aggregate instance) the same buffer is returned. The implementation ** of the aggregate can use the returned buffer to accumulate data. ** -** The buffer allocated is freed automatically by SQLite whan the aggregate +** The buffer allocated is freed automatically by STQLite whan the aggregate ** query concludes. ** ** The first parameter should be a copy of the @@ -1843,18 +1843,18 @@ void sqlite3_set_auxdata(sqlite3_context*, int, void*, void (*)(void*)); ** ** These are special value for the destructor that is passed in as the ** final argument to routines like [sqlite3_result_blob()]. If the destructor -** argument is SQLITE_STATIC, it means that the content pointer is constant +** argument is STQLITE_STATIC, it means that the content pointer is constant ** and will never change. It does not need to be destroyed. The -** SQLITE_TRANSIENT value means that the content will likely change in -** the near future and that SQLite should make its own private copy of +** STQLITE_TRANSIENT value means that the content will likely change in +** the near future and that STQLite should make its own private copy of ** the content before returning. ** ** The typedef is necessary to work around problems in certain ** C++ compilers. See ticket #2191. */ typedef void (*sqlite3_destructor_type)(void*); -#define SQLITE_STATIC ((sqlite3_destructor_type)0) -#define SQLITE_TRANSIENT ((sqlite3_destructor_type)-1) +#define STQLITE_STATIC ((sqlite3_destructor_type)0) +#define STQLITE_TRANSIENT ((sqlite3_destructor_type)-1) /* ** CAPI3REF: Setting The Result Of An SQL Function @@ -1906,14 +1906,14 @@ void sqlite3_result_zeroblob(sqlite3_context*, int n); ** and a UTF-16 string for sqlite3_create_collation16(). In all cases ** the name is passed as the second function argument. ** -** The third argument must be one of the constants [SQLITE_UTF8], -** [SQLITE_UTF16LE] or [SQLITE_UTF16BE], indicating that the user-supplied +** The third argument must be one of the constants [STQLITE_UTF8], +** [STQLITE_UTF16LE] or [STQLITE_UTF16BE], indicating that the user-supplied ** routine expects to be passed pointers to strings encoded using UTF-8, ** UTF-16 little-endian or UTF-16 big-endian respectively. ** ** A pointer to the user supplied routine must be passed as the fifth ** argument. If it is NULL, this is the same as deleting the collation -** sequence (so that SQLite cannot call it anymore). Each time the user +** sequence (so that STQLite cannot call it anymore). Each time the user ** supplied function is invoked, it is passed a copy of the void* passed as ** the fourth argument to sqlite3_create_collation() or ** sqlite3_create_collation16() as its first parameter. @@ -1977,8 +1977,8 @@ int sqlite3_create_collation16( ** When the callback is invoked, the first argument passed is a copy ** of the second argument to sqlite3_collation_needed() or ** sqlite3_collation_needed16(). The second argument is the database -** handle. The third argument is one of [SQLITE_UTF8], [SQLITE_UTF16BE], or -** [SQLITE_UTF16LE], indicating the most desirable form of the collation +** handle. The third argument is one of [STQLITE_UTF8], [STQLITE_UTF16BE], or +** [STQLITE_UTF16LE], indicating the most desirable form of the collation ** sequence function required. The fourth parameter is the name of the ** required collation sequence. ** @@ -2002,9 +2002,9 @@ int sqlite3_collation_needed16( ** called right after sqlite3_open(). ** ** The code to implement this API is not available in the public release -** of SQLite. +** of STQLite. */ -SQLITE_API int sqlite3_key( +STQLITE_API int sqlite3_key( sqlite3 *db, /* Database to be rekeyed */ const void *pKey, int nKey /* The key */ ); @@ -2015,9 +2015,9 @@ SQLITE_API int sqlite3_key( ** database is decrypted. ** ** The code to implement this API is not available in the public release -** of SQLite. +** of STQLite. */ -SQLITE_API int sqlite3_rekey( +STQLITE_API int sqlite3_rekey( sqlite3 *db, /* Database to be rekeyed */ const void *pKey, int nKey /* The new key */ ); @@ -2033,19 +2033,19 @@ SQLITE_API int sqlite3_rekey( ** the nearest second. The number of milliseconds of sleep actually ** requested from the operating system is returned. */ -SQLITE_API int sqlite3_sleep(int); +STQLITE_API int sqlite3_sleep(int); /* ** CAPI3REF: Name Of The Folder Holding Temporary Files ** ** If this global variable is made to point to a string which is ** the name of a folder (a.ka. directory), then all temporary files -** created by SQLite will be placed in that directory. If this variable -** is NULL pointer, then SQLite does a search for an appropriate temporary +** created by STQLite will be placed in that directory. If this variable +** is NULL pointer, then STQLite does a search for an appropriate temporary ** file directory. ** ** Once [sqlite3_open()] has been called, changing this variable will -** invalidate the current temporary database, if any. Generally speaking, +** tqinvalidate the current temporary database, if any. Generally speaking, ** it is not safe to invoke this routine after [sqlite3_open()] has ** been called. */ @@ -2109,7 +2109,7 @@ void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*); ** The second argument is a pointer to the function to invoke when a ** row is updated, inserted or deleted. The first argument to the callback is ** a copy of the third argument to sqlite3_update_hook(). The second callback -** argument is one of SQLITE_INSERT, SQLITE_DELETE or SQLITE_UPDATE, depending +** argument is one of STQLITE_INSERT, STQLITE_DELETE or STQLITE_UPDATE, depending ** on the operation that caused the callback to be invoked. The third and ** fourth arguments to the callback contain pointers to the database and ** table name containing the affected row. The final callback parameter is @@ -2163,8 +2163,8 @@ void *sqlite3_update_hook( ** cache is enabled, the sqlite3_create_module() API used to register ** virtual tables will always return an error. ** -** This routine returns [SQLITE_OK] if shared cache was -** enabled or disabled successfully. An [SQLITE_ERROR | error code] +** This routine returns [STQLITE_OK] if shared cache was +** enabled or disabled successfully. An [STQLITE_ERROR | error code] ** is returned otherwise. ** ** Shared cache is disabled by default for backward compatibility. @@ -2179,7 +2179,7 @@ int sqlite3_enable_shared_cache(int); ** used to cache database pages to improve performance). ** ** This function is not a part of standard builds. It is only created -** if SQLite is compiled with the SQLITE_ENABLE_MEMORY_MANAGEMENT macro. +** if STQLite is compiled with the STQLITE_ENABLE_MEMORY_MANAGEMENT macro. */ int sqlite3_release_memory(int); @@ -2187,7 +2187,7 @@ int sqlite3_release_memory(int); ** CAPI3REF: Impose A Limit On Heap Size ** ** Place a "soft" limit on the amount of heap memory that may be allocated by -** SQLite within the current thread. If an internal allocation is requested +** STQLite within the current thread. If an internal allocation is requested ** that would exceed the specified limit, [sqlite3_release_memory()] is invoked ** one or more times to free up some space before the allocation is made. ** @@ -2203,13 +2203,13 @@ int sqlite3_release_memory(int); ** [sqlite3_release_memory()] will only be called when memory is exhaused. ** The default value for the soft heap limit is zero. ** -** SQLite makes a best effort to honor the soft heap limit. But if it +** STQLite makes a best effort to honor the soft heap limit. But if it ** is unable to reduce memory usage below the soft limit, execution will ** continue without error or notification. This is why the limit is ** called a "soft" limit. It is advisory only. ** ** This function is only available if the library was compiled with the -** SQLITE_ENABLE_MEMORY_MANAGEMENT option set. +** STQLITE_ENABLE_MEMORY_MANAGEMENT option set. ** memory-management has been enabled. */ void sqlite3_soft_heap_limit(int); @@ -2287,11 +2287,11 @@ void sqlite3_thread_cleanup(void); ** ** This function may load one or more schemas from database files. If an ** error occurs during this process, or if the requested table or column -** cannot be found, an SQLITE error code is returned and an error message +** cannot be found, an STQLITE error code is returned and an error message ** left in the database handle (to be retrieved using sqlite3_errmsg()). ** ** This API is only available if the library was compiled with the -** SQLITE_ENABLE_COLUMN_METADATA preprocessor symbol defined. +** STQLITE_ENABLE_COLUMN_METADATA preprocessor symbol defined. */ int sqlite3_table_column_metadata( sqlite3 *db, /* Connection handle */ @@ -2308,11 +2308,11 @@ int sqlite3_table_column_metadata( /* ** CAPI3REF: Load An Extension ** -** Attempt to load an SQLite extension library contained in the file +** Attempt to load an STQLite extension library contained in the file ** zFile. The entry point is zProc. zProc may be 0 in which case the ** name of the entry point defaults to "sqlite3_extension_init". ** -** Return [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong. +** Return [STQLITE_OK] on success and [STQLITE_ERROR] if something goes wrong. ** ** If an error occurs and pzErrMsg is not 0, then fill *pzErrMsg with ** error message text. The calling function should free this memory @@ -2365,7 +2365,7 @@ int sqlite3_enable_load_extension(sqlite3 *db, int onoff); ** Automatic extensions apply across all threads. ** ** This interface is experimental and is subject to change or -** removal in future releases of SQLite. +** removal in future releases of STQLite. */ int sqlite3_auto_extension(void *xEntryPoint); @@ -2380,7 +2380,7 @@ int sqlite3_auto_extension(void *xEntryPoint); ** This call disabled automatic extensions in all threads. ** ** This interface is experimental and is subject to change or -** removal in future releases of SQLite. +** removal in future releases of STQLite. */ void sqlite3_reset_auto_extension(void); @@ -2472,7 +2472,7 @@ struct sqlite3_module { ** the right-hand side of the corresponding aConstraint[] is evaluated ** and becomes the argvIndex-th entry in argv. If aConstraintUsage[].omit ** is true, then the constraint is assumed to be fully handled by the -** virtual table and is not checked again by SQLite. +** virtual table and is not checked again by STQLite. ** ** The idxNum and idxPtr values are recorded and passed into xFilter. ** sqlite3_free() is used to free idxPtr if needToFreeIdxPtr is true. @@ -2512,21 +2512,21 @@ struct sqlite3_index_info { int orderByConsumed; /* True if output is already ordered */ double estimatedCost; /* Estimated cost of using this index */ }; -#define SQLITE_INDEX_CONSTRAINT_EQ 2 -#define SQLITE_INDEX_CONSTRAINT_GT 4 -#define SQLITE_INDEX_CONSTRAINT_LE 8 -#define SQLITE_INDEX_CONSTRAINT_LT 16 -#define SQLITE_INDEX_CONSTRAINT_GE 32 -#define SQLITE_INDEX_CONSTRAINT_MATCH 64 +#define STQLITE_INDEX_CONSTRAINT_EQ 2 +#define STQLITE_INDEX_CONSTRAINT_GT 4 +#define STQLITE_INDEX_CONSTRAINT_LE 8 +#define STQLITE_INDEX_CONSTRAINT_LT 16 +#define STQLITE_INDEX_CONSTRAINT_GE 32 +#define STQLITE_INDEX_CONSTRAINT_MATCH 64 /* -** This routine is used to register a new module name with an SQLite +** This routine is used to register a new module name with an STQLite ** connection. Module names must be registered before creating new ** virtual tables on the module, or before using preexisting virtual ** tables of the module. */ int sqlite3_create_module( - sqlite3 *db, /* SQLite connection to register module with */ + sqlite3 *db, /* STQLite connection to register module with */ const char *zName, /* Name of the module */ const sqlite3_module *, /* Methods for the module */ void * /* Client data for xCreate/xConnect */ @@ -2538,7 +2538,7 @@ int sqlite3_create_module( ** even more experimental than the rest of the virtual tables API. */ int sqlite3_create_module_v2( - sqlite3 *db, /* SQLite connection to register module with */ + sqlite3 *db, /* STQLite connection to register module with */ const char *zName, /* Name of the module */ const sqlite3_module *, /* Methods for the module */ void *, /* Client data for xCreate/xConnect */ @@ -2648,7 +2648,7 @@ typedef struct sqlite3_blob sqlite3_blob; ** read and write access. If it is zero, the blob is opened for read ** access. ** -** On success, [SQLITE_OK] is returned and the new +** On success, [STQLITE_OK] is returned and the new ** [sqlite3_blob | blob handle] is written to *ppBlob. ** Otherwise an error code is returned and ** any value written to *ppBlob should not be used by the caller. @@ -2688,9 +2688,9 @@ int sqlite3_blob_bytes(sqlite3_blob *); ** n bytes of data are copied into buffer ** z from the open blob, starting at offset iOffset. ** -** On success, SQLITE_OK is returned. Otherwise, an -** [SQLITE_ERROR | SQLite error code] or an -** [SQLITE_IOERR_READ | extended error code] is returned. +** On success, STQLITE_OK is returned. Otherwise, an +** [STQLITE_ERROR | STQLite error code] or an +** [STQLITE_IOERR_READ | extended error code] is returned. */ int sqlite3_blob_read(sqlite3_blob *, void *z, int n, int iOffset); @@ -2704,16 +2704,16 @@ int sqlite3_blob_read(sqlite3_blob *, void *z, int n, int iOffset); ** ** If the [sqlite3_blob | blob-handle] passed as the first argument ** was not opened for writing (the flags parameter to [sqlite3_blob_open()] -*** was zero), this function returns [SQLITE_READONLY]. +*** was zero), this function returns [STQLITE_READONLY]. ** ** This function may only modify the contents of the blob, it is ** not possible to increase the size of a blob using this API. If ** offset iOffset is less than n bytes from the end of the blob, -** [SQLITE_ERROR] is returned and no data is written. +** [STQLITE_ERROR] is returned and no data is written. ** -** On success, SQLITE_OK is returned. Otherwise, an -** [SQLITE_ERROR | SQLite error code] or an -** [SQLITE_IOERR_READ | extended error code] is returned. +** On success, STQLITE_OK is returned. Otherwise, an +** [STQLITE_ERROR | STQLite error code] or an +** [STQLITE_IOERR_READ | extended error code] is returned. */ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); @@ -2721,7 +2721,7 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** Undo the hack that converts floating point types to integer for ** builds on processors without floating point support. */ -#ifdef SQLITE_OMIT_FLOATING_POINT +#ifdef STQLITE_OMIT_FLOATING_POINT # undef double #endif @@ -2744,7 +2744,7 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** ************************************************************************* ** This file contains the C functions that implement date and time -** functions for SQLite. +** functions for STQLite. ** ** There is only one exported symbol in this file - the function ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file. @@ -2752,7 +2752,7 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** ** $Id: date.c,v 1.66 2007/05/08 21:56:00 drh Exp $ ** -** SQLite processes all times and dates as Julian Day numbers. The +** STQLite processes all times and dates as Julian Day numbers. The ** dates and times are stored as the number of days since noon ** in Greenwich on November 24, 4714 B.C. according to the Gregorian ** calendar system. @@ -2792,12 +2792,12 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** May you share freely, never taking more than you give. ** ************************************************************************* -** Internal interface definitions for SQLite. +** Internal interface definitions for STQLite. ** ** @(#) $Id: sqliteInt.h,v 1.578 2007/06/26 10:38:55 danielk1977 Exp $ */ -#ifndef _SQLITEINT_H_ -#define _SQLITEINT_H_ +#ifndef _STQLITEINT_H_ +#define _STQLITEINT_H_ /************** Include sqliteLimit.h in the middle of sqliteInt.h ***********/ /************** Begin file sqliteLimit.h *************************************/ /* @@ -2812,7 +2812,7 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** ************************************************************************* ** -** This file defines various limits of what SQLite can process. +** This file defines various limits of what STQLite can process. ** ** @(#) $Id: sqliteLimit.h,v 1.1 2007/06/19 15:23:48 drh Exp $ */ @@ -2824,8 +2824,8 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** The hard limit is the ability of a 32-bit signed integer ** to count the size: 2^31-1 or 2147483647. */ -#ifndef SQLITE_MAX_LENGTH -# define SQLITE_MAX_LENGTH 1000000000 +#ifndef STQLITE_MAX_LENGTH +# define STQLITE_MAX_LENGTH 1000000000 #endif /* @@ -2845,27 +2845,27 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** that is the case, there is no point in having more than a few ** dozen values in any of the other situations described above. */ -#ifndef SQLITE_MAX_COLUMN -# define SQLITE_MAX_COLUMN 2000 +#ifndef STQLITE_MAX_COLUMN +# define STQLITE_MAX_COLUMN 2000 #endif /* ** The maximum length of a single SQL statement in bytes. -** The hard limit here is the same as SQLITE_MAX_LENGTH. +** The hard limit here is the same as STQLITE_MAX_LENGTH. */ -#ifndef SQLITE_MAX_SQL_LENGTH -# define SQLITE_MAX_SQL_LENGTH 1000000 +#ifndef STQLITE_MAX_STQL_LENGTH +# define STQLITE_MAX_STQL_LENGTH 1000000 #endif /* ** The maximum depth of an expression tree. This is limited to -** some extent by SQLITE_MAX_SQL_LENGTH. But sometime you might +** some extent by STQLITE_MAX_STQL_LENGTH. But sometime you might ** want to place more severe limits on the complexity of an ** expression. A value of 0 (the default) means do not enforce ** any limitation on expression tree depth. */ -#ifndef SQLITE_MAX_EXPR_DEPTH -# define SQLITE_MAX_EXPR_DEPTH 1000 +#ifndef STQLITE_MAX_EXPR_DEPTH +# define STQLITE_MAX_EXPR_DEPTH 1000 #endif /* @@ -2876,68 +2876,68 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** never has more than 3 or 4 terms. Use a value of 0 to disable ** any limit on the number of terms in a compount SELECT. */ -#ifndef SQLITE_MAX_COMPOUND_SELECT -# define SQLITE_MAX_COMPOUND_SELECT 500 +#ifndef STQLITE_MAX_COMPOUND_SELECT +# define STQLITE_MAX_COMPOUND_SELECT 500 #endif /* ** The maximum number of opcodes in a VDBE program. ** Not currently enforced. */ -#ifndef SQLITE_MAX_VDBE_OP -# define SQLITE_MAX_VDBE_OP 25000 +#ifndef STQLITE_MAX_VDBE_OP +# define STQLITE_MAX_VDBE_OP 25000 #endif /* ** The maximum number of arguments to an SQL function. */ -#ifndef SQLITE_MAX_FUNCTION_ARG -# define SQLITE_MAX_FUNCTION_ARG 100 +#ifndef STQLITE_MAX_FUNCTION_ARG +# define STQLITE_MAX_FUNCTION_ARG 100 #endif /* ** The maximum number of in-memory pages to use for the main database -** table and for temporary tables. The SQLITE_DEFAULT_CACHE_SIZE +** table and for temporary tables. The STQLITE_DEFAULT_CACHE_SIZE */ -#ifndef SQLITE_DEFAULT_CACHE_SIZE -# define SQLITE_DEFAULT_CACHE_SIZE 2000 +#ifndef STQLITE_DEFAULT_CACHE_SIZE +# define STQLITE_DEFAULT_CACHE_SIZE 2000 #endif -#ifndef SQLITE_DEFAULT_TEMP_CACHE_SIZE -# define SQLITE_DEFAULT_TEMP_CACHE_SIZE 500 +#ifndef STQLITE_DEFAULT_TEMP_CACHE_SIZE +# define STQLITE_DEFAULT_TEMP_CACHE_SIZE 500 #endif /* ** The maximum number of attached databases. This must be at least 2 ** in order to support the main database file (0) and the file used to ** hold temporary tables (1). And it must be less than 32 because -** we use a bitmask of databases with a u32 in places (for example +** we use a bittqmask of databases with a u32 in places (for example ** the Parse.cookieMask field). */ -#ifndef SQLITE_MAX_ATTACHED -# define SQLITE_MAX_ATTACHED 10 +#ifndef STQLITE_MAX_ATTACHED +# define STQLITE_MAX_ATTACHED 10 #endif /* ** The maximum value of a ?nnn wildcard that the parser will accept. */ -#ifndef SQLITE_MAX_VARIABLE_NUMBER -# define SQLITE_MAX_VARIABLE_NUMBER 999 +#ifndef STQLITE_MAX_VARIABLE_NUMBER +# define STQLITE_MAX_VARIABLE_NUMBER 999 #endif /* ** The default size of a database page. */ -#ifndef SQLITE_DEFAULT_PAGE_SIZE -# define SQLITE_DEFAULT_PAGE_SIZE 1024 +#ifndef STQLITE_DEFAULT_PAGE_SIZE +# define STQLITE_DEFAULT_PAGE_SIZE 1024 #endif /* Maximum page size. The upper bound on this value is 32768. This a limit ** imposed by the necessity of storing the value in a 2-byte unsigned integer ** and the fact that the page size must be a power of 2. */ -#ifndef SQLITE_MAX_PAGE_SIZE -# define SQLITE_MAX_PAGE_SIZE 32768 +#ifndef STQLITE_MAX_PAGE_SIZE +# define STQLITE_MAX_PAGE_SIZE 32768 #endif /* @@ -2947,34 +2947,34 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** This value can be lowered (or raised) at run-time using that the ** max_page_count macro. */ -#ifndef SQLITE_MAX_PAGE_COUNT -# define SQLITE_MAX_PAGE_COUNT 1073741823 +#ifndef STQLITE_MAX_PAGE_COUNT +# define STQLITE_MAX_PAGE_COUNT 1073741823 #endif /* ** Maximum length (in bytes) of the pattern in a LIKE or GLOB ** operator. */ -#ifndef SQLITE_MAX_LIKE_PATTERN_LENGTH -# define SQLITE_MAX_LIKE_PATTERN_LENGTH 50000 +#ifndef STQLITE_MAX_LIKE_PATTERN_LENGTH +# define STQLITE_MAX_LIKE_PATTERN_LENGTH 50000 #endif /************** End of sqliteLimit.h *****************************************/ /************** Continuing where we left off in sqliteInt.h ******************/ -#if defined(SQLITE_TCL) || defined(TCLSH) +#if defined(STQLITE_TCL) || defined(TCLSH) # include <tcl.h> #endif /* -** Many people are failing to set -DNDEBUG=1 when compiling SQLite. +** Many people are failing to set -DNDEBUG=1 when compiling STQLite. ** Setting NDEBUG makes the code smaller and run faster. So the following -** lines are added to automatically set NDEBUG unless the -DSQLITE_DEBUG=1 +** lines are added to automatically set NDEBUG unless the -DSTQLITE_DEBUG=1 ** option is set. Thus NDEBUG becomes an opt-in rather than an opt-out ** feature. */ -#if !defined(NDEBUG) && !defined(SQLITE_DEBUG) +#if !defined(NDEBUG) && !defined(STQLITE_DEBUG) # define NDEBUG 1 #endif @@ -2983,7 +2983,7 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** underlying operating system supports it. If the OS lacks ** large file support, or if the OS is windows, these should be no-ops. ** -** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch +** Large file support can be disabled using the -DSTQLITE_DISABLE_LFS switch ** on the compiler command line. This is necessary if you are compiling ** on a recent machine (ex: RedHat 7.2) but you want your code to work ** on an older machine (ex: RedHat 6.0). If you compile on RedHat 7.2 @@ -2993,7 +2993,7 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** ** Similar is true for MacOS. LFS is only supported on MacOS 9 and later. */ -#ifndef SQLITE_DISABLE_LFS +#ifndef STQLITE_DISABLE_LFS # define _LARGE_FILE 1 # ifndef _FILE_OFFSET_BITS # define _FILE_OFFSET_BITS 64 @@ -3015,12 +3015,12 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** ************************************************************************* ** This is the header file for the generic hash-table implemenation -** used in SQLite. +** used in STQLite. ** ** $Id: hash.h,v 1.9 2006/02/14 10:48:39 danielk1977 Exp $ */ -#ifndef _SQLITE_HASH_H_ -#define _SQLITE_HASH_H_ +#ifndef _STQLITE_HASH_H_ +#define _STQLITE_HASH_H_ /* Forward declarations of structures. */ typedef struct Hash Hash; @@ -3035,7 +3035,7 @@ typedef struct HashElem HashElem; ** this structure opaque. */ struct Hash { - char keyClass; /* SQLITE_HASH_INT, _POINTER, _STRING, _BINARY */ + char keyClass; /* STQLITE_HASH_INT, _POINTER, _STRING, _BINARY */ char copyKey; /* True if copy of key made on insert */ int count; /* Number of entries in this table */ HashElem *first; /* The first element of the array */ @@ -3063,32 +3063,32 @@ struct HashElem { /* ** There are 4 different modes of operation for a hash table: ** -** SQLITE_HASH_INT nKey is used as the key and pKey is ignored. +** STQLITE_HASH_INT nKey is used as the key and pKey is ignored. ** -** SQLITE_HASH_POINTER pKey is used as the key and nKey is ignored. +** STQLITE_HASH_POINTER pKey is used as the key and nKey is ignored. ** -** SQLITE_HASH_STRING pKey points to a string that is nKey bytes long +** STQLITE_HASH_STRING pKey points to a string that is nKey bytes long ** (including the null-terminator, if any). Case ** is ignored in comparisons. ** -** SQLITE_HASH_BINARY pKey points to binary data nKey bytes long. +** STQLITE_HASH_BINARY pKey points to binary data nKey bytes long. ** memcmp() is used to compare keys. ** -** A copy of the key is made for SQLITE_HASH_STRING and SQLITE_HASH_BINARY +** A copy of the key is made for STQLITE_HASH_STRING and STQLITE_HASH_BINARY ** if the copyKey parameter to HashInit is 1. */ -/* #define SQLITE_HASH_INT 1 // NOT USED */ -/* #define SQLITE_HASH_POINTER 2 // NOT USED */ -#define SQLITE_HASH_STRING 3 -#define SQLITE_HASH_BINARY 4 +/* #define STQLITE_HASH_INT 1 // NOT USED */ +/* #define STQLITE_HASH_POINTER 2 // NOT USED */ +#define STQLITE_HASH_STRING 3 +#define STQLITE_HASH_BINARY 4 /* ** Access routines. To delete, insert a NULL pointer. */ -SQLITE_PRIVATE void sqlite3HashInit(Hash*, int keytype, int copyKey); -SQLITE_PRIVATE void *sqlite3HashInsert(Hash*, const void *pKey, int nKey, void *pData); -SQLITE_PRIVATE void *sqlite3HashFind(const Hash*, const void *pKey, int nKey); -SQLITE_PRIVATE void sqlite3HashClear(Hash*); +STQLITE_PRIVATE void sqlite3HashInit(Hash*, int keytype, int copyKey); +STQLITE_PRIVATE void *sqlite3HashInsert(Hash*, const void *pKey, int nKey, void *pData); +STQLITE_PRIVATE void *sqlite3HashFind(const Hash*, const void *pKey, int nKey); +STQLITE_PRIVATE void sqlite3HashClear(Hash*); /* ** Macros for looping over all elements of a hash table. The idiom is @@ -3113,7 +3113,7 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*); */ #define sqliteHashCount(H) ((H)->count) -#endif /* _SQLITE_HASH_H_ */ +#endif /* _STQLITE_HASH_H_ */ /************** End of hash.h ************************************************/ /************** Continuing where we left off in sqliteInt.h ******************/ @@ -3121,7 +3121,7 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*); /************** Begin file parse.h *******************************************/ #define TK_SEMI 1 #define TK_EXPLAIN 2 -#define TK_QUERY 3 +#define TK_TQUERY 3 #define TK_PLAN 4 #define TK_BEGIN 5 #define TK_TRANSACTION 6 @@ -3212,7 +3212,7 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*); #define TK_DEFAULT 91 #define TK_NULL 92 #define TK_PRIMARY 93 -#define TK_UNIQUE 94 +#define TK_UNITQUE 94 #define TK_CHECK 95 #define TK_REFERENCES 96 #define TK_AUTOINCR 97 @@ -3286,26 +3286,26 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*); ** If compiling for a processor that lacks floating point support, ** substitute integer for floating-point */ -#ifdef SQLITE_OMIT_FLOATING_POINT +#ifdef STQLITE_OMIT_FLOATING_POINT # define double sqlite_int64 # define LONGDOUBLE_TYPE sqlite_int64 -# ifndef SQLITE_BIG_DBL -# define SQLITE_BIG_DBL (0x7fffffffffffffff) +# ifndef STQLITE_BIG_DBL +# define STQLITE_BIG_DBL (0x7fffffffffffffff) # endif -# define SQLITE_OMIT_DATETIME_FUNCS 1 -# define SQLITE_OMIT_TRACE 1 -# undef SQLITE_MIXED_ENDIAN_64BIT_FLOAT +# define STQLITE_OMIT_DATETIME_FUNCS 1 +# define STQLITE_OMIT_TRACE 1 +# undef STQLITE_MIXED_ENDIAN_64BIT_FLOAT #endif -#ifndef SQLITE_BIG_DBL -# define SQLITE_BIG_DBL (1e99) +#ifndef STQLITE_BIG_DBL +# define STQLITE_BIG_DBL (1e99) #endif /* -** OMIT_TEMPDB is set to 1 if SQLITE_OMIT_TEMPDB is defined, or 0 +** OMIT_TEMPDB is set to 1 if STQLITE_OMIT_TEMPDB is defined, or 0 ** afterward. Having this macro allows us to cause the C compiler ** to omit code used by TEMP tables without messy #ifndef statements. */ -#ifdef SQLITE_OMIT_TEMPDB +#ifdef STQLITE_OMIT_TEMPDB #define OMIT_TEMPDB 1 #else #define OMIT_TEMPDB 0 @@ -3314,16 +3314,16 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*); /* ** If the following macro is set to 1, then NULL values are considered ** distinct when determining whether or not two entries are the same -** in a UNIQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, +** in a UNITQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, ** OCELOT, and Firebird all work. The SQL92 spec explicitly says this ** is the way things are suppose to work. ** ** If the following macro is set to 0, the NULLs are indistinct for -** a UNIQUE index. In this mode, you can only have a single NULL entry -** for a column declared UNIQUE. This is the way Informix and SQL Server +** a UNITQUE index. In this mode, you can only have a single NULL entry +** for a column declared UNITQUE. This is the way Informix and SQL Server ** work. */ -#define NULL_DISTINCT_FOR_UNIQUE 1 +#define NULL_DISTINCT_FOR_UNITQUE 1 /* ** The "file format" number is an integer that is incremented whenever @@ -3331,9 +3331,9 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*); ** the default file format for new databases and the maximum file format ** that the library can read. */ -#define SQLITE_MAX_FILE_FORMAT 4 -#ifndef SQLITE_DEFAULT_FILE_FORMAT -# define SQLITE_DEFAULT_FILE_FORMAT 1 +#define STQLITE_MAX_FILE_FORMAT 4 +#ifndef STQLITE_DEFAULT_FILE_FORMAT +# define STQLITE_DEFAULT_FILE_FORMAT 1 #endif /* @@ -3357,9 +3357,9 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*); ** not, there are still machines out there that use EBCDIC.) */ #if 'A' == '\301' -# define SQLITE_EBCDIC 1 +# define STQLITE_EBCDIC 1 #else -# define SQLITE_ASCII 1 +# define STQLITE_ASCII 1 #endif /* @@ -3401,13 +3401,13 @@ typedef UINT8_TYPE i8; /* 1-byte signed integer */ */ extern const int sqlite3one; #if defined(i386) || defined(__i386__) || defined(_M_IX86) -# define SQLITE_BIGENDIAN 0 -# define SQLITE_LITTLEENDIAN 1 -# define SQLITE_UTF16NATIVE SQLITE_UTF16LE +# define STQLITE_BIGENDIAN 0 +# define STQLITE_LITTLEENDIAN 1 +# define STQLITE_UTF16NATIVE STQLITE_UTF16LE #else -# define SQLITE_BIGENDIAN (*(char *)(&sqlite3one)==0) -# define SQLITE_LITTLEENDIAN (*(char *)(&sqlite3one)==1) -# define SQLITE_UTF16NATIVE (SQLITE_BIGENDIAN?SQLITE_UTF16BE:SQLITE_UTF16LE) +# define STQLITE_BIGENDIAN (*(char *)(&sqlite3one)==0) +# define STQLITE_LITTLEENDIAN (*(char *)(&sqlite3one)==1) +# define STQLITE_UTF16NATIVE (STQLITE_BIGENDIAN?STQLITE_UTF16BE:STQLITE_UTF16LE) #endif /* @@ -3451,8 +3451,8 @@ struct BusyHandler { ** ** $Id: vdbe.h,v 1.110 2007/05/08 21:45:28 drh Exp $ */ -#ifndef _SQLITE_VDBE_H_ -#define _SQLITE_VDBE_H_ +#ifndef _STQLITE_VDBE_H_ +#define _STQLITE_VDBE_H_ /* ** A single VDBE is an opaque structure named "Vdbe". Only routines @@ -3516,7 +3516,7 @@ typedef struct VdbeOpList VdbeOpList; #define P3_KEYINFO_HANDOFF (-9) /* -** The Vdbe.aColName array contains 5n Mem structures, where n is the +** The Vdbe.aColName array tqcontains 5n Mem structures, where n is the ** number of columns of data returned by the statement. */ #define COLNAME_NAME 0 @@ -3688,7 +3688,7 @@ typedef struct VdbeOpList VdbeOpList; #define OP_NotUsed_137 137 /* Opcodes that are guaranteed to never push a value onto the stack -** contain a 1 their corresponding position of the following mask +** contain a 1 their corresponding position of the following tqmask ** set. See the opcodeNoPush() function in vdbeaux.c */ #define NOPUSH_MASK_0 0xeeb4 #define NOPUSH_MASK_1 0xf96b @@ -3708,37 +3708,37 @@ typedef struct VdbeOpList VdbeOpList; ** Prototypes for the VDBE interface. See comments on the implementation ** for a description of what each of these routines does. */ -SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(sqlite3*); -SQLITE_PRIVATE int sqlite3VdbeAddOp(Vdbe*,int,int,int); -SQLITE_PRIVATE int sqlite3VdbeOp3(Vdbe*,int,int,int,const char *zP3,int); -SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp); -SQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe*, int addr, int P1); -SQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe*, int addr, int P2); -SQLITE_PRIVATE void sqlite3VdbeJumpHere(Vdbe*, int addr); -SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe*, int addr, int N); -SQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe*, int addr, const char *zP1, int N); -SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe*, int); -SQLITE_PRIVATE int sqlite3VdbeMakeLabel(Vdbe*); -SQLITE_PRIVATE void sqlite3VdbeDelete(Vdbe*); -SQLITE_PRIVATE void sqlite3VdbeMakeReady(Vdbe*,int,int,int,int); -SQLITE_PRIVATE int sqlite3VdbeFinalize(Vdbe*); -SQLITE_PRIVATE void sqlite3VdbeResolveLabel(Vdbe*, int); -SQLITE_PRIVATE int sqlite3VdbeCurrentAddr(Vdbe*); -#ifdef SQLITE_DEBUG -SQLITE_PRIVATE void sqlite3VdbeTrace(Vdbe*,FILE*); -#endif -SQLITE_PRIVATE void sqlite3VdbeResetStepResult(Vdbe*); -SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe*); -SQLITE_PRIVATE void sqlite3VdbeSetNumCols(Vdbe*,int); -SQLITE_PRIVATE int sqlite3VdbeSetColName(Vdbe*, int, int, const char *, int); -SQLITE_PRIVATE void sqlite3VdbeCountChanges(Vdbe*); -SQLITE_PRIVATE sqlite3 *sqlite3VdbeDb(Vdbe*); -SQLITE_PRIVATE void sqlite3VdbeSetSql(Vdbe*, const char *z, int n); -SQLITE_PRIVATE const char *sqlite3VdbeGetSql(Vdbe*); -SQLITE_PRIVATE void sqlite3VdbeSwap(Vdbe*,Vdbe*); +STQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(sqlite3*); +STQLITE_PRIVATE int sqlite3VdbeAddOp(Vdbe*,int,int,int); +STQLITE_PRIVATE int sqlite3VdbeOp3(Vdbe*,int,int,int,const char *zP3,int); +STQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp); +STQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe*, int addr, int P1); +STQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe*, int addr, int P2); +STQLITE_PRIVATE void sqlite3VdbeJumpHere(Vdbe*, int addr); +STQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe*, int addr, int N); +STQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe*, int addr, const char *zP1, int N); +STQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe*, int); +STQLITE_PRIVATE int sqlite3VdbeMakeLabel(Vdbe*); +STQLITE_PRIVATE void sqlite3VdbeDelete(Vdbe*); +STQLITE_PRIVATE void sqlite3VdbeMakeReady(Vdbe*,int,int,int,int); +STQLITE_PRIVATE int sqlite3VdbeFinalize(Vdbe*); +STQLITE_PRIVATE void sqlite3VdbeResolveLabel(Vdbe*, int); +STQLITE_PRIVATE int sqlite3VdbeCurrentAddr(Vdbe*); +#ifdef STQLITE_DEBUG +STQLITE_PRIVATE void sqlite3VdbeTrace(Vdbe*,FILE*); +#endif +STQLITE_PRIVATE void sqlite3VdbeResetStepResult(Vdbe*); +STQLITE_PRIVATE int sqlite3VdbeReset(Vdbe*); +STQLITE_PRIVATE void sqlite3VdbeSetNumCols(Vdbe*,int); +STQLITE_PRIVATE int sqlite3VdbeSetColName(Vdbe*, int, int, const char *, int); +STQLITE_PRIVATE void sqlite3VdbeCountChanges(Vdbe*); +STQLITE_PRIVATE sqlite3 *sqlite3VdbeDb(Vdbe*); +STQLITE_PRIVATE void sqlite3VdbeSetSql(Vdbe*, const char *z, int n); +STQLITE_PRIVATE const char *sqlite3VdbeGetSql(Vdbe*); +STQLITE_PRIVATE void sqlite3VdbeSwap(Vdbe*,Vdbe*); #ifndef NDEBUG -SQLITE_PRIVATE void sqlite3VdbeComment(Vdbe*, const char*, ...); +STQLITE_PRIVATE void sqlite3VdbeComment(Vdbe*, const char*, ...); # define VdbeComment(X) sqlite3VdbeComment X #else # define VdbeComment(X) @@ -3773,14 +3773,14 @@ SQLITE_PRIVATE void sqlite3VdbeComment(Vdbe*, const char*, ...); /* TODO: This definition is just included so other modules compile. It ** needs to be revisited. */ -#define SQLITE_N_BTREE_META 10 +#define STQLITE_N_BTREE_META 10 /* ** If defined as non-zero, auto-vacuum is enabled by default. Otherwise ** it must be turned on for each database using "PRAGMA auto_vacuum = 1". */ -#ifndef SQLITE_DEFAULT_AUTOVACUUM - #define SQLITE_DEFAULT_AUTOVACUUM 0 +#ifndef STQLITE_DEFAULT_AUTOVACUUM + #define STQLITE_DEFAULT_AUTOVACUUM 0 #endif #define BTREE_AUTOVACUUM_NONE 0 /* Do not do auto-vacuum */ @@ -3795,7 +3795,7 @@ typedef struct BtCursor BtCursor; typedef struct BtShared BtShared; -SQLITE_PRIVATE int sqlite3BtreeOpen( +STQLITE_PRIVATE int sqlite3BtreeOpen( const char *zFilename, /* Name of database file to open */ sqlite3 *db, /* Associated database connection */ Btree **, /* Return open Btree* here */ @@ -3812,39 +3812,39 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( #define BTREE_NO_READLOCK 2 /* Omit readlocks on readonly files */ #define BTREE_MEMORY 4 /* In-memory DB. No argument */ -SQLITE_PRIVATE int sqlite3BtreeClose(Btree*); -SQLITE_PRIVATE int sqlite3BtreeSetBusyHandler(Btree*,BusyHandler*); -SQLITE_PRIVATE int sqlite3BtreeSetCacheSize(Btree*,int); -SQLITE_PRIVATE int sqlite3BtreeSetSafetyLevel(Btree*,int,int); -SQLITE_PRIVATE int sqlite3BtreeSyncDisabled(Btree*); -SQLITE_PRIVATE int sqlite3BtreeSetPageSize(Btree*,int,int); -SQLITE_PRIVATE int sqlite3BtreeGetPageSize(Btree*); -SQLITE_PRIVATE int sqlite3BtreeMaxPageCount(Btree*,int); -SQLITE_PRIVATE int sqlite3BtreeGetReserve(Btree*); -SQLITE_PRIVATE int sqlite3BtreeSetAutoVacuum(Btree *, int); -SQLITE_PRIVATE int sqlite3BtreeGetAutoVacuum(Btree *); -SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree*,int); -SQLITE_PRIVATE int sqlite3BtreeCommitPhaseOne(Btree*, const char *zMaster); -SQLITE_PRIVATE int sqlite3BtreeCommitPhaseTwo(Btree*); -SQLITE_PRIVATE int sqlite3BtreeCommit(Btree*); -SQLITE_PRIVATE int sqlite3BtreeRollback(Btree*); -SQLITE_PRIVATE int sqlite3BtreeBeginStmt(Btree*); -SQLITE_PRIVATE int sqlite3BtreeCommitStmt(Btree*); -SQLITE_PRIVATE int sqlite3BtreeRollbackStmt(Btree*); -SQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree*, int*, int flags); -SQLITE_PRIVATE int sqlite3BtreeIsInTrans(Btree*); -SQLITE_PRIVATE int sqlite3BtreeIsInStmt(Btree*); -SQLITE_PRIVATE int sqlite3BtreeIsInReadTrans(Btree*); -SQLITE_PRIVATE void *sqlite3BtreeSchema(Btree *, int, void(*)(void *)); -SQLITE_PRIVATE int sqlite3BtreeSchemaLocked(Btree *); -SQLITE_PRIVATE int sqlite3BtreeLockTable(Btree *, int, u8); - -SQLITE_PRIVATE const char *sqlite3BtreeGetFilename(Btree *); -SQLITE_PRIVATE const char *sqlite3BtreeGetDirname(Btree *); -SQLITE_PRIVATE const char *sqlite3BtreeGetJournalname(Btree *); -SQLITE_PRIVATE int sqlite3BtreeCopyFile(Btree *, Btree *); - -SQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *); +STQLITE_PRIVATE int sqlite3BtreeClose(Btree*); +STQLITE_PRIVATE int sqlite3BtreeSetBusyHandler(Btree*,BusyHandler*); +STQLITE_PRIVATE int sqlite3BtreeSetCacheSize(Btree*,int); +STQLITE_PRIVATE int sqlite3BtreeSetSafetyLevel(Btree*,int,int); +STQLITE_PRIVATE int sqlite3BtreeSyncDisabled(Btree*); +STQLITE_PRIVATE int sqlite3BtreeSetPageSize(Btree*,int,int); +STQLITE_PRIVATE int sqlite3BtreeGetPageSize(Btree*); +STQLITE_PRIVATE int sqlite3BtreeMaxPageCount(Btree*,int); +STQLITE_PRIVATE int sqlite3BtreeGetReserve(Btree*); +STQLITE_PRIVATE int sqlite3BtreeSetAutoVacuum(Btree *, int); +STQLITE_PRIVATE int sqlite3BtreeGetAutoVacuum(Btree *); +STQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree*,int); +STQLITE_PRIVATE int sqlite3BtreeCommitPhaseOne(Btree*, const char *zMaster); +STQLITE_PRIVATE int sqlite3BtreeCommitPhaseTwo(Btree*); +STQLITE_PRIVATE int sqlite3BtreeCommit(Btree*); +STQLITE_PRIVATE int sqlite3BtreeRollback(Btree*); +STQLITE_PRIVATE int sqlite3BtreeBeginStmt(Btree*); +STQLITE_PRIVATE int sqlite3BtreeCommitStmt(Btree*); +STQLITE_PRIVATE int sqlite3BtreeRollbackStmt(Btree*); +STQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree*, int*, int flags); +STQLITE_PRIVATE int sqlite3BtreeIsInTrans(Btree*); +STQLITE_PRIVATE int sqlite3BtreeIsInStmt(Btree*); +STQLITE_PRIVATE int sqlite3BtreeIsInReadTrans(Btree*); +STQLITE_PRIVATE void *sqlite3BtreeSchema(Btree *, int, void(*)(void *)); +STQLITE_PRIVATE int sqlite3BtreeSchemaLocked(Btree *); +STQLITE_PRIVATE int sqlite3BtreeLockTable(Btree *, int, u8); + +STQLITE_PRIVATE const char *sqlite3BtreeGetFilename(Btree *); +STQLITE_PRIVATE const char *sqlite3BtreeGetDirname(Btree *); +STQLITE_PRIVATE const char *sqlite3BtreeGetJournalname(Btree *); +STQLITE_PRIVATE int sqlite3BtreeCopyFile(Btree *, Btree *); + +STQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *); /* The flags parameter to sqlite3BtreeCreateTable can be the bitwise OR ** of the following flags: @@ -3853,12 +3853,12 @@ SQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *); #define BTREE_ZERODATA 2 /* Table has keys only - no data */ #define BTREE_LEAFDATA 4 /* Data stored in leaves only. Implies INTKEY */ -SQLITE_PRIVATE int sqlite3BtreeDropTable(Btree*, int, int*); -SQLITE_PRIVATE int sqlite3BtreeClearTable(Btree*, int); -SQLITE_PRIVATE int sqlite3BtreeGetMeta(Btree*, int idx, u32 *pValue); -SQLITE_PRIVATE int sqlite3BtreeUpdateMeta(Btree*, int idx, u32 value); +STQLITE_PRIVATE int sqlite3BtreeDropTable(Btree*, int, int*); +STQLITE_PRIVATE int sqlite3BtreeClearTable(Btree*, int); +STQLITE_PRIVATE int sqlite3BtreeGetMeta(Btree*, int idx, u32 *pValue); +STQLITE_PRIVATE int sqlite3BtreeUpdateMeta(Btree*, int idx, u32 value); -SQLITE_PRIVATE int sqlite3BtreeCursor( +STQLITE_PRIVATE int sqlite3BtreeCursor( Btree*, /* BTree containing table to open */ int iTable, /* Index of root page */ int wrFlag, /* 1 for writing. 0 for read-only */ @@ -3867,35 +3867,35 @@ SQLITE_PRIVATE int sqlite3BtreeCursor( BtCursor **ppCursor /* Returned cursor */ ); -SQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor*); -SQLITE_PRIVATE int sqlite3BtreeMoveto(BtCursor*,const void *pKey,i64 nKey,int bias,int *pRes); -SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor*); -SQLITE_PRIVATE int sqlite3BtreeInsert(BtCursor*, const void *pKey, i64 nKey, +STQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor*); +STQLITE_PRIVATE int sqlite3BtreeMoveto(BtCursor*,const void *pKey,i64 nKey,int bias,int *pRes); +STQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor*); +STQLITE_PRIVATE int sqlite3BtreeInsert(BtCursor*, const void *pKey, i64 nKey, const void *pData, int nData, int nZero, int bias); -SQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor*, int *pRes); -SQLITE_PRIVATE int sqlite3BtreeLast(BtCursor*, int *pRes); -SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor*, int *pRes); -SQLITE_PRIVATE int sqlite3BtreeEof(BtCursor*); -SQLITE_PRIVATE int sqlite3BtreeFlags(BtCursor*); -SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor*, int *pRes); -SQLITE_PRIVATE int sqlite3BtreeKeySize(BtCursor*, i64 *pSize); -SQLITE_PRIVATE int sqlite3BtreeKey(BtCursor*, u32 offset, u32 amt, void*); -SQLITE_PRIVATE const void *sqlite3BtreeKeyFetch(BtCursor*, int *pAmt); -SQLITE_PRIVATE const void *sqlite3BtreeDataFetch(BtCursor*, int *pAmt); -SQLITE_PRIVATE int sqlite3BtreeDataSize(BtCursor*, u32 *pSize); -SQLITE_PRIVATE int sqlite3BtreeData(BtCursor*, u32 offset, u32 amt, void*); - -SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck(Btree*, int *aRoot, int nRoot, int, int*); -SQLITE_PRIVATE struct Pager *sqlite3BtreePager(Btree*); - -SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor*, u32 offset, u32 amt, void*); -SQLITE_PRIVATE void sqlite3BtreeCacheOverflow(BtCursor *); - -#ifdef SQLITE_TEST -SQLITE_PRIVATE int sqlite3BtreeCursorInfo(BtCursor*, int*, int); -SQLITE_PRIVATE void sqlite3BtreeCursorList(Btree*); -SQLITE_PRIVATE int sqlite3BtreePageDump(Btree*, int, int recursive); +STQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor*, int *pRes); +STQLITE_PRIVATE int sqlite3BtreeLast(BtCursor*, int *pRes); +STQLITE_PRIVATE int sqlite3BtreeNext(BtCursor*, int *pRes); +STQLITE_PRIVATE int sqlite3BtreeEof(BtCursor*); +STQLITE_PRIVATE int sqlite3BtreeFlags(BtCursor*); +STQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor*, int *pRes); +STQLITE_PRIVATE int sqlite3BtreeKeySize(BtCursor*, i64 *pSize); +STQLITE_PRIVATE int sqlite3BtreeKey(BtCursor*, u32 offset, u32 amt, void*); +STQLITE_PRIVATE const void *sqlite3BtreeKeyFetch(BtCursor*, int *pAmt); +STQLITE_PRIVATE const void *sqlite3BtreeDataFetch(BtCursor*, int *pAmt); +STQLITE_PRIVATE int sqlite3BtreeDataSize(BtCursor*, u32 *pSize); +STQLITE_PRIVATE int sqlite3BtreeData(BtCursor*, u32 offset, u32 amt, void*); + +STQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck(Btree*, int *aRoot, int nRoot, int, int*); +STQLITE_PRIVATE struct Pager *sqlite3BtreePager(Btree*); + +STQLITE_PRIVATE int sqlite3BtreePutData(BtCursor*, u32 offset, u32 amt, void*); +STQLITE_PRIVATE void sqlite3BtreeCacheOverflow(BtCursor *); + +#ifdef STQLITE_TEST +STQLITE_PRIVATE int sqlite3BtreeCursorInfo(BtCursor*, int*, int); +STQLITE_PRIVATE void sqlite3BtreeCursorList(Btree*); +STQLITE_PRIVATE int sqlite3BtreePageDump(Btree*, int, int recursive); #endif #endif /* _BTREE_H_ */ @@ -3952,7 +3952,7 @@ typedef struct PgHdr DbPage; /* ** Valid values for the second argument to sqlite3PagerLockingMode(). */ -#define PAGER_LOCKINGMODE_QUERY -1 +#define PAGER_LOCKINGMODE_TQUERY -1 #define PAGER_LOCKINGMODE_NORMAL 0 #define PAGER_LOCKINGMODE_EXCLUSIVE 1 @@ -3960,70 +3960,70 @@ typedef struct PgHdr DbPage; ** See source code comments for a detailed description of the following ** routines: */ -SQLITE_PRIVATE int sqlite3PagerOpen(Pager **ppPager, const char *zFilename, +STQLITE_PRIVATE int sqlite3PagerOpen(Pager **ppPager, const char *zFilename, int nExtra, int flags); -SQLITE_PRIVATE void sqlite3PagerSetBusyhandler(Pager*, BusyHandler *pBusyHandler); -SQLITE_PRIVATE void sqlite3PagerSetDestructor(Pager*, void(*)(DbPage*,int)); -SQLITE_PRIVATE void sqlite3PagerSetReiniter(Pager*, void(*)(DbPage*,int)); -SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager*, int); -SQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager*, int); -SQLITE_PRIVATE int sqlite3PagerReadFileheader(Pager*, int, unsigned char*); -SQLITE_PRIVATE void sqlite3PagerSetCachesize(Pager*, int); -SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager); -SQLITE_PRIVATE int sqlite3PagerAcquire(Pager *pPager, Pgno pgno, DbPage **ppPage, int clrFlag); +STQLITE_PRIVATE void sqlite3PagerSetBusyhandler(Pager*, BusyHandler *pBusyHandler); +STQLITE_PRIVATE void sqlite3PagerSetDestructor(Pager*, void(*)(DbPage*,int)); +STQLITE_PRIVATE void sqlite3PagerSetReiniter(Pager*, void(*)(DbPage*,int)); +STQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager*, int); +STQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager*, int); +STQLITE_PRIVATE int sqlite3PagerReadFileheader(Pager*, int, unsigned char*); +STQLITE_PRIVATE void sqlite3PagerSetCachesize(Pager*, int); +STQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager); +STQLITE_PRIVATE int sqlite3PagerAcquire(Pager *pPager, Pgno pgno, DbPage **ppPage, int clrFlag); #define sqlite3PagerGet(A,B,C) sqlite3PagerAcquire(A,B,C,0) -SQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno); -SQLITE_PRIVATE int sqlite3PagerRef(DbPage*); -SQLITE_PRIVATE int sqlite3PagerUnref(DbPage*); -SQLITE_PRIVATE int sqlite3PagerWrite(DbPage*); -SQLITE_PRIVATE int sqlite3PagerOverwrite(Pager *pPager, Pgno pgno, void*); -SQLITE_PRIVATE int sqlite3PagerPagecount(Pager*); -SQLITE_PRIVATE int sqlite3PagerTruncate(Pager*,Pgno); -SQLITE_PRIVATE int sqlite3PagerBegin(DbPage*, int exFlag); -SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager*,const char *zMaster, Pgno); -SQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager*); -SQLITE_PRIVATE int sqlite3PagerRollback(Pager*); -SQLITE_PRIVATE int sqlite3PagerIsreadonly(Pager*); -SQLITE_PRIVATE int sqlite3PagerStmtBegin(Pager*); -SQLITE_PRIVATE int sqlite3PagerStmtCommit(Pager*); -SQLITE_PRIVATE int sqlite3PagerStmtRollback(Pager*); -SQLITE_PRIVATE void sqlite3PagerDontRollback(DbPage*); -SQLITE_PRIVATE void sqlite3PagerDontWrite(DbPage*); -SQLITE_PRIVATE int sqlite3PagerRefcount(Pager*); -SQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(Pager*,int,int); -SQLITE_PRIVATE const char *sqlite3PagerFilename(Pager*); -SQLITE_PRIVATE const char *sqlite3PagerDirname(Pager*); -SQLITE_PRIVATE const char *sqlite3PagerJournalname(Pager*); -SQLITE_PRIVATE int sqlite3PagerNosync(Pager*); -SQLITE_PRIVATE int sqlite3PagerMovepage(Pager*,DbPage*,Pgno); -SQLITE_PRIVATE void *sqlite3PagerGetData(DbPage *); -SQLITE_PRIVATE void *sqlite3PagerGetExtra(DbPage *); -SQLITE_PRIVATE int sqlite3PagerLockingMode(Pager *, int); - -#if defined(SQLITE_ENABLE_MEMORY_MANAGEMENT) && !defined(SQLITE_OMIT_DISKIO) -SQLITE_PRIVATE int sqlite3PagerReleaseMemory(int); -#endif - -#ifdef SQLITE_HAS_CODEC -SQLITE_PRIVATE void sqlite3PagerSetCodec(Pager*,void*(*)(void*,void*,Pgno,int),void*); -#endif - -#if !defined(NDEBUG) || defined(SQLITE_TEST) -SQLITE_PRIVATE Pgno sqlite3PagerPagenumber(DbPage*); -SQLITE_PRIVATE int sqlite3PagerIswriteable(DbPage*); -#endif - -#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST) -SQLITE_PRIVATE int sqlite3PagerLockstate(Pager*); -#endif - -#ifdef SQLITE_TEST -SQLITE_PRIVATE int *sqlite3PagerStats(Pager*); -SQLITE_PRIVATE void sqlite3PagerRefdump(Pager*); +STQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno); +STQLITE_PRIVATE int sqlite3PagerRef(DbPage*); +STQLITE_PRIVATE int sqlite3PagerUnref(DbPage*); +STQLITE_PRIVATE int sqlite3PagerWrite(DbPage*); +STQLITE_PRIVATE int sqlite3PagerOverwrite(Pager *pPager, Pgno pgno, void*); +STQLITE_PRIVATE int sqlite3PagerPagecount(Pager*); +STQLITE_PRIVATE int sqlite3PagerTruncate(Pager*,Pgno); +STQLITE_PRIVATE int sqlite3PagerBegin(DbPage*, int exFlag); +STQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager*,const char *zMaster, Pgno); +STQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager*); +STQLITE_PRIVATE int sqlite3PagerRollback(Pager*); +STQLITE_PRIVATE int sqlite3PagerIsreadonly(Pager*); +STQLITE_PRIVATE int sqlite3PagerStmtBegin(Pager*); +STQLITE_PRIVATE int sqlite3PagerStmtCommit(Pager*); +STQLITE_PRIVATE int sqlite3PagerStmtRollback(Pager*); +STQLITE_PRIVATE void sqlite3PagerDontRollback(DbPage*); +STQLITE_PRIVATE void sqlite3PagerDontWrite(DbPage*); +STQLITE_PRIVATE int sqlite3PagerRefcount(Pager*); +STQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(Pager*,int,int); +STQLITE_PRIVATE const char *sqlite3PagerFilename(Pager*); +STQLITE_PRIVATE const char *sqlite3PagerDirname(Pager*); +STQLITE_PRIVATE const char *sqlite3PagerJournalname(Pager*); +STQLITE_PRIVATE int sqlite3PagerNosync(Pager*); +STQLITE_PRIVATE int sqlite3PagerMovepage(Pager*,DbPage*,Pgno); +STQLITE_PRIVATE void *sqlite3PagerGetData(DbPage *); +STQLITE_PRIVATE void *sqlite3PagerGetExtra(DbPage *); +STQLITE_PRIVATE int sqlite3PagerLockingMode(Pager *, int); + +#if defined(STQLITE_ENABLE_MEMORY_MANAGEMENT) && !defined(STQLITE_OMIT_DISKIO) +STQLITE_PRIVATE int sqlite3PagerReleaseMemory(int); +#endif + +#ifdef STQLITE_HAS_CODEC +STQLITE_PRIVATE void sqlite3PagerSetCodec(Pager*,void*(*)(void*,void*,Pgno,int),void*); +#endif + +#if !defined(NDEBUG) || defined(STQLITE_TEST) +STQLITE_PRIVATE Pgno sqlite3PagerPagenumber(DbPage*); +STQLITE_PRIVATE int sqlite3PagerIswriteable(DbPage*); +#endif + +#if defined(STQLITE_DEBUG) || defined(STQLITE_TEST) +STQLITE_PRIVATE int sqlite3PagerLockstate(Pager*); +#endif + +#ifdef STQLITE_TEST +STQLITE_PRIVATE int *sqlite3PagerStats(Pager*); +STQLITE_PRIVATE void sqlite3PagerRefdump(Pager*); int pager3_refinfo_enable; #endif -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST void disable_simulated_io_errors(void); void enable_simulated_io_errors(void); #else @@ -4036,10 +4036,10 @@ void enable_simulated_io_errors(void); /************** End of pager.h ***********************************************/ /************** Continuing where we left off in sqliteInt.h ******************/ -#ifdef SQLITE_MEMDEBUG +#ifdef STQLITE_MEMDEBUG /* ** The following global variables are used for testing and debugging -** only. They only work if SQLITE_MEMDEBUG is defined. +** only. They only work if STQLITE_MEMDEBUG is defined. */ extern int sqlite3_nMalloc; /* Number of sqliteMalloc() calls */ extern int sqlite3_nFree; /* Number of sqliteFree() calls */ @@ -4093,13 +4093,13 @@ extern int sqlite3_mallocHasFailed; struct ThreadData { int dummy; /* So that this structure is never empty */ -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT int nSoftHeapLimit; /* Suggested max mem allocation. No limit if <0 */ int nAlloc; /* Number of bytes currently allocated */ Pager *pPager; /* Linked list of all pagers in this thread */ #endif -#ifndef SQLITE_OMIT_SHARED_CACHE +#ifndef STQLITE_OMIT_SHARED_CACHE u8 useSharedData; /* True if shared pagers and schemas are enabled */ BtShared *pBtree; /* Linked list of all currently open BTrees */ #endif @@ -4177,10 +4177,10 @@ typedef struct WhereLevel WhereLevel; ** ** This header file (together with is companion C source-code file ** "os.c") attempt to abstract the underlying operating system so that -** the SQLite library will work on both POSIX and windows systems. +** the STQLite library will work on both POSIX and windows systems. */ -#ifndef _SQLITE_OS_H_ -#define _SQLITE_OS_H_ +#ifndef _STQLITE_OS_H_ +#define _STQLITE_OS_H_ /* ** Figure out if we are dealing with Unix, Windows, or some other @@ -4230,7 +4230,7 @@ typedef struct WhereLevel WhereLevel; */ #if OS_WIN # include <windows.h> -# define SQLITE_TEMPNAME_SIZE (MAX_PATH+50) +# define STQLITE_TEMPNAME_SIZE (MAX_PATH+50) #elif OS_OS2 # if (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ >= 3) && defined(OS2_HIGH_MEMORY) # include <os2safe.h> /* has to be included before os2.h for linking to work */ @@ -4242,9 +4242,9 @@ typedef struct WhereLevel WhereLevel; # define INCL_DOSPROCESS # define INCL_DOSMODULEMGR # include <os2.h> -# define SQLITE_TEMPNAME_SIZE (CCHMAXPATHCOMP) +# define STQLITE_TEMPNAME_SIZE (CCHMAXPATHCOMP) #else -# define SQLITE_TEMPNAME_SIZE 200 +# define STQLITE_TEMPNAME_SIZE 200 #endif /* If the SET_FULLSYNC macro is not defined above, then make it @@ -4257,8 +4257,8 @@ typedef struct WhereLevel WhereLevel; /* ** The default size of a disk sector */ -#ifndef SQLITE_DEFAULT_SECTOR_SIZE -# define SQLITE_DEFAULT_SECTOR_SIZE 512 +#ifndef STQLITE_DEFAULT_SECTOR_SIZE +# define STQLITE_DEFAULT_SECTOR_SIZE 512 #endif /* @@ -4271,7 +4271,7 @@ typedef struct WhereLevel WhereLevel; ** using -DTEMP_FILE_PREFIX=myprefix_ on the compiler command line. ** ** 2006-10-31: The default prefix used to be "sqlite_". But then -** Mcafee started using SQLite in their anti-virus product and it +** Mcafee started using STQLite in their anti-virus product and it ** started putting files with the "sqlite" name in the c:/temp folder. ** This annoyed many windows users. Those users would then do a ** Google search for "sqlite", find the telephone numbers of the @@ -4371,7 +4371,7 @@ typedef struct WhereLevel WhereLevel; /* ** If using an alternative OS interface, then we must have an "os_other.h" ** header file available for that interface. Presumably the "os_other.h" -** header file contains #defines similar to those above. +** header file tqcontains #defines similar to those above. */ #if OS_OTHER # include "os_other.h" @@ -4410,7 +4410,7 @@ struct IoMethod { /* ** The OsFile object describes an open disk file in an OS-dependent way. ** The version of OsFile defined here is a generic version. Each OS -** implementation defines its own subclass of this structure that contains +** implementation defines its own subclass of this structure that tqcontains ** additional information needed to handle file I/O. But the pMethod ** entry (pointing to the virtual function table) always occurs first ** so that we can always find the appropriate methods. @@ -4474,7 +4474,7 @@ struct OsFile { ** shared locks begins at SHARED_FIRST. ** ** These #defines are available in sqlite_aux.h so that adaptors for -** connecting SQLite to other operating systems can use the same byte +** connecting STQLite to other operating systems can use the same byte ** ranges for locking. In particular, the same locking strategy and ** byte ranges are used for Unix. This leaves open the possiblity of having ** clients on win95, winNT, and unix all talking to the same shared file @@ -4499,7 +4499,7 @@ struct OsFile { ** 1GB boundary. ** */ -#ifndef SQLITE_TEST +#ifndef STQLITE_TEST #define PENDING_BYTE 0x40000000 /* First byte past the 1GB boundary */ #else extern unsigned int sqlite3_pending_byte; @@ -4513,50 +4513,50 @@ extern unsigned int sqlite3_pending_byte; /* ** Prototypes for operating system interface routines. */ -SQLITE_PRIVATE int sqlite3OsClose(OsFile**); -SQLITE_PRIVATE int sqlite3OsOpenDirectory(OsFile*, const char*); -SQLITE_PRIVATE int sqlite3OsRead(OsFile*, void*, int amt); -SQLITE_PRIVATE int sqlite3OsWrite(OsFile*, const void*, int amt); -SQLITE_PRIVATE int sqlite3OsSeek(OsFile*, i64 offset); -SQLITE_PRIVATE int sqlite3OsTruncate(OsFile*, i64 size); -SQLITE_PRIVATE int sqlite3OsSync(OsFile*, int); -SQLITE_PRIVATE void sqlite3OsSetFullSync(OsFile *id, int setting); -SQLITE_PRIVATE int sqlite3OsFileSize(OsFile*, i64 *pSize); -SQLITE_PRIVATE int sqlite3OsLock(OsFile*, int); -SQLITE_PRIVATE int sqlite3OsUnlock(OsFile*, int); -SQLITE_PRIVATE int sqlite3OsCheckReservedLock(OsFile *id); -SQLITE_PRIVATE int sqlite3OsOpenReadWrite(const char*, OsFile**, int*); -SQLITE_PRIVATE int sqlite3OsOpenExclusive(const char*, OsFile**, int); -SQLITE_PRIVATE int sqlite3OsOpenReadOnly(const char*, OsFile**); -SQLITE_PRIVATE int sqlite3OsDelete(const char*); -SQLITE_PRIVATE int sqlite3OsFileExists(const char*); -SQLITE_PRIVATE char *sqlite3OsFullPathname(const char*); -SQLITE_PRIVATE int sqlite3OsIsDirWritable(char*); -SQLITE_PRIVATE int sqlite3OsSyncDirectory(const char*); -SQLITE_PRIVATE int sqlite3OsSectorSize(OsFile *id); -SQLITE_PRIVATE int sqlite3OsTempFileName(char*); -SQLITE_PRIVATE int sqlite3OsRandomSeed(char*); -SQLITE_PRIVATE int sqlite3OsSleep(int ms); -SQLITE_PRIVATE int sqlite3OsCurrentTime(double*); -SQLITE_PRIVATE void sqlite3OsEnterMutex(void); -SQLITE_PRIVATE void sqlite3OsLeaveMutex(void); -SQLITE_PRIVATE int sqlite3OsInMutex(int); -SQLITE_PRIVATE ThreadData *sqlite3OsThreadSpecificData(int); -SQLITE_PRIVATE void *sqlite3OsMalloc(int); -SQLITE_PRIVATE void *sqlite3OsRealloc(void *, int); -SQLITE_PRIVATE void sqlite3OsFree(void *); -SQLITE_PRIVATE int sqlite3OsAllocationSize(void *); -SQLITE_PRIVATE void *sqlite3OsDlopen(const char*); -SQLITE_PRIVATE void *sqlite3OsDlsym(void*, const char*); -SQLITE_PRIVATE int sqlite3OsDlclose(void*); - -#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) -SQLITE_PRIVATE int sqlite3OsFileHandle(OsFile *id); -SQLITE_PRIVATE int sqlite3OsLockState(OsFile *id); -#endif - -/* -** If the SQLITE_ENABLE_REDEF_IO macro is defined, then the OS-layer +STQLITE_PRIVATE int sqlite3OsClose(OsFile**); +STQLITE_PRIVATE int sqlite3OsOpenDirectory(OsFile*, const char*); +STQLITE_PRIVATE int sqlite3OsRead(OsFile*, void*, int amt); +STQLITE_PRIVATE int sqlite3OsWrite(OsFile*, const void*, int amt); +STQLITE_PRIVATE int sqlite3OsSeek(OsFile*, i64 offset); +STQLITE_PRIVATE int sqlite3OsTruncate(OsFile*, i64 size); +STQLITE_PRIVATE int sqlite3OsSync(OsFile*, int); +STQLITE_PRIVATE void sqlite3OsSetFullSync(OsFile *id, int setting); +STQLITE_PRIVATE int sqlite3OsFileSize(OsFile*, i64 *pSize); +STQLITE_PRIVATE int sqlite3OsLock(OsFile*, int); +STQLITE_PRIVATE int sqlite3OsUnlock(OsFile*, int); +STQLITE_PRIVATE int sqlite3OsCheckReservedLock(OsFile *id); +STQLITE_PRIVATE int sqlite3OsOpenReadWrite(const char*, OsFile**, int*); +STQLITE_PRIVATE int sqlite3OsOpenExclusive(const char*, OsFile**, int); +STQLITE_PRIVATE int sqlite3OsOpenReadOnly(const char*, OsFile**); +STQLITE_PRIVATE int sqlite3OsDelete(const char*); +STQLITE_PRIVATE int sqlite3OsFileExists(const char*); +STQLITE_PRIVATE char *sqlite3OsFullPathname(const char*); +STQLITE_PRIVATE int sqlite3OsIsDirWritable(char*); +STQLITE_PRIVATE int sqlite3OsSyncDirectory(const char*); +STQLITE_PRIVATE int sqlite3OsSectorSize(OsFile *id); +STQLITE_PRIVATE int sqlite3OsTempFileName(char*); +STQLITE_PRIVATE int sqlite3OsRandomSeed(char*); +STQLITE_PRIVATE int sqlite3OsSleep(int ms); +STQLITE_PRIVATE int sqlite3OsCurrentTime(double*); +STQLITE_PRIVATE void sqlite3OsEnterMutex(void); +STQLITE_PRIVATE void sqlite3OsLeaveMutex(void); +STQLITE_PRIVATE int sqlite3OsInMutex(int); +STQLITE_PRIVATE ThreadData *sqlite3OsThreadSpecificData(int); +STQLITE_PRIVATE void *sqlite3OsMalloc(int); +STQLITE_PRIVATE void *sqlite3OsRealloc(void *, int); +STQLITE_PRIVATE void sqlite3OsFree(void *); +STQLITE_PRIVATE int sqlite3OsAllocationSize(void *); +STQLITE_PRIVATE void *sqlite3OsDlopen(const char*); +STQLITE_PRIVATE void *sqlite3OsDlsym(void*, const char*); +STQLITE_PRIVATE int sqlite3OsDlclose(void*); + +#if defined(STQLITE_TEST) || defined(STQLITE_DEBUG) +STQLITE_PRIVATE int sqlite3OsFileHandle(OsFile *id); +STQLITE_PRIVATE int sqlite3OsLockState(OsFile *id); +#endif + +/* +** If the STQLITE_ENABLE_REDEF_IO macro is defined, then the OS-layer ** interface routines are not called directly but are invoked using ** pointers to functions. This allows the implementation of various ** OS-layer interface routines to be modified at run-time. There are @@ -4564,13 +4564,13 @@ SQLITE_PRIVATE int sqlite3OsLockState(OsFile *id); ** most users, a direct call to the underlying interface is preferable ** so the the redefinable I/O interface is turned off by default. */ -#ifdef SQLITE_ENABLE_REDEF_IO +#ifdef STQLITE_ENABLE_REDEF_IO /* ** When redefinable I/O is enabled, a single global instance of the -** following structure holds pointers to the routines that SQLite +** following structure holds pointers to the routines that STQLite ** uses to talk with the underlying operating system. Modify this -** structure (before using any SQLite API!) to accomodate perculiar +** structure (before using any STQLite API!) to accomodate perculiar ** operating system interfaces or behaviors. */ struct sqlite3OsVtbl { @@ -4607,19 +4607,19 @@ struct sqlite3OsVtbl { /* Macro used to comment out routines that do not exists when there is ** no disk I/O or extension loading */ -#ifdef SQLITE_OMIT_DISKIO +#ifdef STQLITE_OMIT_DISKIO # define IF_DISKIO(X) 0 #else # define IF_DISKIO(X) X #endif -#ifdef SQLITE_OMIT_LOAD_EXTENSION +#ifdef STQLITE_OMIT_LOAD_EXTENSION # define IF_DLOPEN(X) 0 #else # define IF_DLOPEN(X) X #endif -#if defined(_SQLITE_OS_C_) || defined(SQLITE_AMALGAMATION) +#if defined(_STQLITE_OS_C_) || defined(STQLITE_AMALGAMATION) /* ** The os.c file implements the global virtual function table. ** We have to put this file here because the initializers @@ -4656,7 +4656,7 @@ struct sqlite3OsVtbl { ** Files other than os.c just reference the global virtual function table. */ extern struct sqlite3OsVtbl sqlite3Os; -#endif /* _SQLITE_OS_C_ */ +#endif /* _STQLITE_OS_C_ */ /* This additional API routine is available with redefinable I/O */ @@ -4708,9 +4708,9 @@ struct sqlite3OsVtbl *sqlite3_os_switch(void); #define sqlite3OsFree sqlite3Os.xFree #define sqlite3OsAllocationSize sqlite3Os.xAllocationSize -#endif /* SQLITE_ENABLE_REDEF_IO */ +#endif /* STQLITE_ENABLE_REDEF_IO */ -#endif /* _SQLITE_OS_H_ */ +#endif /* _STQLITE_OS_H_ */ /************** End of os.h **************************************************/ /************** Continuing where we left off in sqliteInt.h ******************/ @@ -4754,7 +4754,7 @@ struct Schema { u8 enc; /* Text encoding used by this database */ u16 flags; /* Flags associated with this schema */ int cache_size; /* Number of pages to use in the cache */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE sqlite3 *db; /* "Owner" connection. See comment above */ #endif }; @@ -4813,7 +4813,7 @@ struct sqlite3 { int nDb; /* Number of backends currently in use */ Db *aDb; /* All backends */ int flags; /* Miscellanous flags. See below */ - int errCode; /* Most recent error code (SQLITE_*) */ + int errCode; /* Most recent error code (STQLITE_*) */ int errMask; /* & result codes with this before returning */ u8 autoCommit; /* The auto-commit flag. */ u8 temp_store; /* 1: file 2: memory 0: default */ @@ -4853,17 +4853,17 @@ struct sqlite3 { int isInterrupted; /* True if sqlite3_interrupt has been called */ double notUsed1; /* Spacer */ } u1; -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION int (*xAuth)(void*,int,const char*,const char*,const char*,const char*); /* Access authorization function */ void *pAuthArg; /* 1st argument to the access auth function */ #endif -#ifndef SQLITE_OMIT_PROGRESS_CALLBACK +#ifndef STQLITE_OMIT_PROGRESS_CALLBACK int (*xProgress)(void *); /* The progress callback */ void *pProgressArg; /* Argument to the progress callback */ int nProgressOps; /* Number of opcodes for progress callback */ #endif -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE Hash aModule; /* populated by sqlite3_create_module() */ Table *pVTab; /* vtab with active Connect/Create method */ sqlite3_vtab **aVTrans; /* Virtual tables with open transactions */ @@ -4874,7 +4874,7 @@ struct sqlite3 { BusyHandler busyHandler; /* Busy callback */ int busyTimeout; /* Busy handler timeout, in msec */ Db aDbStatic[2]; /* Static space for the 2 default backends */ -#ifdef SQLITE_SSE +#ifdef STQLITE_SSE sqlite3_stmt *pFetch; /* Used by SSE to fetch stored statements */ #endif u8 dfltLockMode; /* Default locking-mode for attached dbs */ @@ -4888,42 +4888,42 @@ struct sqlite3 { /* ** Possible values for the sqlite.flags and or Db.flags fields. ** -** On sqlite.flags, the SQLITE_InTrans value means that we have -** executed a BEGIN. On Db.flags, SQLITE_InTrans means a statement +** On sqlite.flags, the STQLITE_InTrans value means that we have +** executed a BEGIN. On Db.flags, STQLITE_InTrans means a statement ** transaction is active on that particular database file. */ -#define SQLITE_VdbeTrace 0x00000001 /* True to trace VDBE execution */ -#define SQLITE_InTrans 0x00000008 /* True if in a transaction */ -#define SQLITE_InternChanges 0x00000010 /* Uncommitted Hash table changes */ -#define SQLITE_FullColNames 0x00000020 /* Show full column names on SELECT */ -#define SQLITE_ShortColNames 0x00000040 /* Show short columns names */ -#define SQLITE_CountRows 0x00000080 /* Count rows changed by INSERT, */ +#define STQLITE_VdbeTrace 0x00000001 /* True to trace VDBE execution */ +#define STQLITE_InTrans 0x00000008 /* True if in a transaction */ +#define STQLITE_InternChanges 0x00000010 /* Uncommitted Hash table changes */ +#define STQLITE_FullColNames 0x00000020 /* Show full column names on SELECT */ +#define STQLITE_ShortColNames 0x00000040 /* Show short columns names */ +#define STQLITE_CountRows 0x00000080 /* Count rows changed by INSERT, */ /* DELETE, or UPDATE and return */ /* the count using a callback. */ -#define SQLITE_NullCallback 0x00000100 /* Invoke the callback once if the */ +#define STQLITE_NullCallback 0x00000100 /* Invoke the callback once if the */ /* result set is empty */ -#define SQLITE_SqlTrace 0x00000200 /* Debug print SQL as it executes */ -#define SQLITE_VdbeListing 0x00000400 /* Debug listings of VDBE programs */ -#define SQLITE_WriteSchema 0x00000800 /* OK to update SQLITE_MASTER */ -#define SQLITE_NoReadlock 0x00001000 /* Readlocks are omitted when +#define STQLITE_SqlTrace 0x00000200 /* Debug print SQL as it executes */ +#define STQLITE_VdbeListing 0x00000400 /* Debug listings of VDBE programs */ +#define STQLITE_WriteSchema 0x00000800 /* OK to update STQLITE_MASTER */ +#define STQLITE_NoReadlock 0x00001000 /* Readlocks are omitted when ** accessing read-only databases */ -#define SQLITE_IgnoreChecks 0x00002000 /* Do not enforce check constraints */ -#define SQLITE_ReadUncommitted 0x00004000 /* For shared-cache mode */ -#define SQLITE_LegacyFileFmt 0x00008000 /* Create new databases in format 1 */ -#define SQLITE_FullFSync 0x00010000 /* Use full fsync on the backend */ -#define SQLITE_LoadExtension 0x00020000 /* Enable load_extension */ +#define STQLITE_IgnoreChecks 0x00002000 /* Do not enforce check constraints */ +#define STQLITE_ReadUncommitted 0x00004000 /* For shared-cache mode */ +#define STQLITE_LegacyFileFmt 0x00008000 /* Create new databases in format 1 */ +#define STQLITE_FullFSync 0x00010000 /* Use full fsync on the backend */ +#define STQLITE_LoadExtension 0x00020000 /* Enable load_extension */ -#define SQLITE_RecoveryMode 0x00040000 /* Ignore schema errors */ +#define STQLITE_RecoveryMode 0x00040000 /* Ignore schema errors */ /* ** Possible values for the sqlite.magic field. ** The numbers are obtained at random and have no special meaning, other ** than being distinct from one another. */ -#define SQLITE_MAGIC_OPEN 0xa029a697 /* Database is open */ -#define SQLITE_MAGIC_CLOSED 0x9f3c2d33 /* Database is closed */ -#define SQLITE_MAGIC_BUSY 0xf03b7906 /* Database currently in use */ -#define SQLITE_MAGIC_ERROR 0xb5357930 /* An SQLITE_MISUSE error occurred */ +#define STQLITE_MAGIC_OPEN 0xa029a697 /* Database is open */ +#define STQLITE_MAGIC_CLOSED 0x9f3c2d33 /* Database is closed */ +#define STQLITE_MAGIC_BUSY 0xf03b7906 /* Database currently in use */ +#define STQLITE_MAGIC_ERROR 0xb5357930 /* An STQLITE_MISUSE error occurred */ /* ** Each SQL function is defined by an instance of the following @@ -4933,9 +4933,9 @@ struct sqlite3 { */ struct FuncDef { i16 nArg; /* Number of arguments. -1 means unlimited */ - u8 iPrefEnc; /* Preferred text encoding (SQLITE_UTF8, 16LE, 16BE) */ + u8 iPrefEnc; /* Preferred text encoding (STQLITE_UTF8, 16LE, 16BE) */ u8 needCollSeq; /* True if sqlite3GetFuncCollSeq() might be called */ - u8 flags; /* Some combination of SQLITE_FUNC_* */ + u8 flags; /* Some combination of STQLITE_FUNC_* */ void *pUserData; /* User data parameter */ FuncDef *pNext; /* Next function with same name */ void (*xFunc)(sqlite3_context*,int,sqlite3_value**); /* Regular function */ @@ -4945,7 +4945,7 @@ struct FuncDef { }; /* -** Each SQLite module (virtual table definition) is defined by an +** Each STQLite module (virtual table definition) is defined by an ** instance of the following structure, stored in the sqlite3.aModule ** hash table. */ @@ -4959,9 +4959,9 @@ struct Module { /* ** Possible values for FuncDef.flags */ -#define SQLITE_FUNC_LIKE 0x01 /* Candidate for the LIKE optimization */ -#define SQLITE_FUNC_CASE 0x02 /* Case-sensitive LIKE-type function */ -#define SQLITE_FUNC_EPHEM 0x04 /* Ephermeral. Delete with VDBE */ +#define STQLITE_FUNC_LIKE 0x01 /* Candidate for the LIKE optimization */ +#define STQLITE_FUNC_CASE 0x02 /* Case-sensitive LIKE-type function */ +#define STQLITE_FUNC_EPHEM 0x04 /* Ephermeral. Delete with VDBE */ /* ** information about each column of an SQL table is held in an instance @@ -4974,8 +4974,8 @@ struct Column { char *zColl; /* Collating sequence. If NULL, use the default */ u8 notNull; /* True if there is a NOT NULL constraint */ u8 isPrimKey; /* True if this column is part of the PRIMARY KEY */ - char affinity; /* One of the SQLITE_AFF_... values */ -#ifndef SQLITE_OMIT_VIRTUALTABLE + char affinity; /* One of the STQLITE_AFF_... values */ +#ifndef STQLITE_OMIT_VIRTUALTABLE u8 isHidden; /* True if this column is 'hidden' */ #endif }; @@ -4988,7 +4988,7 @@ struct Column { ** There may two seperate implementations of the collation function, one ** that processes text in UTF-8 encoding (CollSeq.xCmp) and another that ** processes text encoded in UTF-16 (CollSeq.xCmp16), using the machine -** native byte order. When a collation sequence is invoked, SQLite selects +** native byte order. When a collation sequence is invoked, STQLite selects ** the version that will require the least expensive encoding ** translations, if any. ** @@ -5004,7 +5004,7 @@ struct Column { struct CollSeq { char *zName; /* Name of the collating sequence, UTF-8 encoded */ u8 enc; /* Text encoding handled by xCmp() */ - u8 type; /* One of the SQLITE_COLL_... values below */ + u8 type; /* One of the STQLITE_COLL_... values below */ void *pUser; /* First argument to xCmp() */ int (*xCmp)(void*,int, const void*, int, const void*); void (*xDel)(void*); /* Destructor for pUser */ @@ -5013,22 +5013,22 @@ struct CollSeq { /* ** Allowed values of CollSeq flags: */ -#define SQLITE_COLL_BINARY 1 /* The default memcmp() collating sequence */ -#define SQLITE_COLL_NOCASE 2 /* The built-in NOCASE collating sequence */ -#define SQLITE_COLL_REVERSE 3 /* The built-in REVERSE collating sequence */ -#define SQLITE_COLL_USER 0 /* Any other user-defined collating sequence */ +#define STQLITE_COLL_BINARY 1 /* The default memcmp() collating sequence */ +#define STQLITE_COLL_NOCASE 2 /* The built-in NOCASE collating sequence */ +#define STQLITE_COLL_REVERSE 3 /* The built-in REVERSE collating sequence */ +#define STQLITE_COLL_USER 0 /* Any other user-defined collating sequence */ /* ** A sort order can be either ASC or DESC. */ -#define SQLITE_SO_ASC 0 /* Sort in ascending order */ -#define SQLITE_SO_DESC 1 /* Sort in ascending order */ +#define STQLITE_SO_ASC 0 /* Sort in ascending order */ +#define STQLITE_SO_DESC 1 /* Sort in ascending order */ /* ** Column affinity types. ** -** These used to have mnemonic name like 'i' for SQLITE_AFF_INTEGER and -** 't' for SQLITE_AFF_TEXT. But we can save a little space and improve +** These used to have mnemonic name like 'i' for STQLITE_AFF_INTEGER and +** 't' for STQLITE_AFF_TEXT. But we can save a little space and improve ** the speed a little by number the values consecutively. ** ** But rather than start with 0 or 1, we begin with 'a'. That way, @@ -5038,13 +5038,13 @@ struct CollSeq { ** Note also that the numeric types are grouped together so that testing ** for a numeric type is a single comparison. */ -#define SQLITE_AFF_TEXT 'a' -#define SQLITE_AFF_NONE 'b' -#define SQLITE_AFF_NUMERIC 'c' -#define SQLITE_AFF_INTEGER 'd' -#define SQLITE_AFF_REAL 'e' +#define STQLITE_AFF_TEXT 'a' +#define STQLITE_AFF_NONE 'b' +#define STQLITE_AFF_NUMERIC 'c' +#define STQLITE_AFF_INTEGER 'd' +#define STQLITE_AFF_REAL 'e' -#define sqlite3IsNumericAffinity(X) ((X)>=SQLITE_AFF_NUMERIC) +#define sqlite3IsNumericAffinity(X) ((X)>=STQLITE_AFF_NUMERIC) /* ** Each SQL table is represented in memory by an instance of the @@ -5088,10 +5088,10 @@ struct Table { Trigger *pTrigger; /* List of SQL triggers on this table */ FKey *pFKey; /* Linked list of all foreign keys in this table */ char *zColAff; /* String defining the affinity of each column */ -#ifndef SQLITE_OMIT_CHECK +#ifndef STQLITE_OMIT_CHECK Expr *pCheck; /* The AND of all CHECK constraints */ #endif -#ifndef SQLITE_OMIT_ALTERTABLE +#ifndef STQLITE_OMIT_ALTERTABLE int addColOffset; /* Offset in CREATE TABLE statement to add a new column */ #endif u8 readOnly; /* True if this table should not be written by the user */ @@ -5099,7 +5099,7 @@ struct Table { u8 hasPrimKey; /* True if there exists a primary key */ u8 keyConf; /* What to do in case of uniqueness conflict on iPKey */ u8 autoInc; /* True if the integer primary key is autoincrement */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE u8 isVirtual; /* True if this is a virtual table */ u8 isCommit; /* True once the CREATE TABLE has been committed */ Module *pMod; /* Pointer to the implementation of the module */ @@ -5115,7 +5115,7 @@ struct Table { ** done as a macro so that it will be optimized out when virtual ** table support is omitted from the build. */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE # define IsVirtual(X) ((X)->isVirtual) # define IsHiddenColumn(X) ((X)->isHidden) #else @@ -5165,7 +5165,7 @@ struct FKey { }; /* -** SQLite supports many different ways to resolve a contraint +** STQLite supports many different ways to resolve a contraint ** error. ROLLBACK processing means that a constraint violation ** causes the operation in process to fail and for the current transaction ** to be rolled back. ABORT processing means the operation in process @@ -5176,7 +5176,7 @@ struct FKey { ** occurs. IGNORE means that the particular row that caused the constraint ** error is not inserted or updated. Processing continues and no error ** is returned. REPLACE means that preexisting database rows that caused -** a UNIQUE constraint violation are removed so that the new insert or +** a UNITQUE constraint violation are removed so that the new insert or ** update can proceed. Processing continues and no error is reported. ** ** RESTRICT, SETNULL, and CASCADE actions apply only to foreign keys. @@ -5255,7 +5255,7 @@ struct Index { Table *pTable; /* The SQL table being indexed */ int tnum; /* Page containing root of this index in database file */ u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */ - u8 autoIndex; /* True if is automatically created (ex: by UNIQUE) */ + u8 autoIndex; /* True if is automatically created (ex: by UNITQUE) */ char *zColAff; /* String defining the affinity of each column */ Index *pNext; /* The next index associated with the same table */ Schema *pSchema; /* Schema containing this index */ @@ -5386,7 +5386,7 @@ struct Expr { ** right side of "<expr> IN (<select>)" */ Table *pTab; /* Table for OP_Column expressions. */ Schema *pSchema; -#if SQLITE_MAX_EXPR_DEPTH>0 +#if STQLITE_MAX_EXPR_DEPTH>0 int nHeight; /* Height of the tree headed by this node */ #endif }; @@ -5459,13 +5459,13 @@ struct IdList { }; /* -** The bitmask datatype defined below is used for various optimizations. +** The bittqmask datatype defined below is used for various optimizations. ** ** Changing this from a 64-bit to a 32-bit type limits the number of ** tables in a join to 32 instead of 64. But it also reduces the size ** of the library by 738 bytes on ix86. */ -typedef u64 Bitmask; +typedef u64 Bittqmask; /* ** The following structure describes the FROM clause of a SELECT statement. @@ -5475,7 +5475,7 @@ typedef u64 Bitmask; ** With the addition of multiple database support, the following structure ** can also be used to describe a particular table such as the table that ** is modified by an INSERT, DELETE, or UPDATE statement. In standard SQL, -** such a table must be a simple name: ID. But in SQLite, the table can +** such a table must be a simple name: ID. But in STQLite, the table can ** now be identified by a database name, a dot, then the table name: ID.ID. ** ** The jointype starts out showing the join type between the current table @@ -5497,7 +5497,7 @@ struct SrcList { int iCursor; /* The VDBE cursor number used to access this table */ Expr *pOn; /* The ON clause of a join */ IdList *pUsing; /* The USING clause of a join */ - Bitmask colUsed; /* Bit N (1<<N) set if column N or pTab is used */ + Bittqmask colUsed; /* Bit N (1<<N) set if column N or pTab is used */ } a[1]; /* One entry for each identifier on the list */ }; @@ -5594,7 +5594,7 @@ struct WhereInfo { ** the context containing the match is incremented. ** ** Each subquery gets a new NameContext. The pNext field points to the -** NameContext in the parent query. Thus the process of scanning the +** NameContext in the tqparent query. Thus the process of scanning the ** NameContext list corresponds to searching through successively outer ** subqueries looking for a match. */ @@ -5704,10 +5704,10 @@ struct Parse { int nSet; /* Number of sets used so far */ int ckOffset; /* Stack offset to data used by CHECK constraints */ u32 writeMask; /* Start a write transaction on these databases */ - u32 cookieMask; /* Bitmask of schema verified databases */ + u32 cookieMask; /* Bittqmask of schema verified databases */ int cookieGoto; /* Address of OP_Goto to cookie verifier subroutine */ - int cookieValue[SQLITE_MAX_ATTACHED+2]; /* Values of cookies to verify */ -#ifndef SQLITE_OMIT_SHARED_CACHE + int cookieValue[STQLITE_MAX_ATTACHED+2]; /* Values of cookies to verify */ +#ifndef STQLITE_OMIT_SHARED_CACHE int nTableLock; /* Number of locks in aTableLock */ TableLock *aTableLock; /* Required table locks for shared-cache mode */ #endif @@ -5729,17 +5729,17 @@ struct Parse { Trigger *pNewTrigger; /* Trigger under construct by a CREATE TRIGGER */ TriggerStack *trigStack; /* Trigger actions being coded */ const char *zAuthContext; /* The 6th parameter to db->xAuth callbacks */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE Token sArg; /* Complete text of a module argument */ u8 declareVtab; /* True if inside sqlite3_declare_vtab() */ Table *pVirtualLock; /* Require virtual table lock on this table */ #endif -#if SQLITE_MAX_EXPR_DEPTH>0 +#if STQLITE_MAX_EXPR_DEPTH>0 int nHeight; /* Expression tree height of current sub-select */ #endif }; -#ifdef SQLITE_OMIT_VIRTUALTABLE +#ifdef STQLITE_OMIT_VIRTUALTABLE #define IN_DECLARE_VTAB 0 #else #define IN_DECLARE_VTAB (pParse->declareVtab) @@ -5874,9 +5874,9 @@ struct TriggerStep { * * struct TriggerStack has a "pNext" member, to allow linked lists to be * constructed. When coding nested triggers (triggers fired by other triggers) - * each nested trigger stores its parent trigger's TriggerStack as the "pNext" + * each nested trigger stores its tqparent trigger's TriggerStack as the "pNext" * pointer. Once the nested trigger has been coded, the pNext value is restored - * to the pTriggerStack member of the Parse stucture and coding of the parent + * to the pTriggerStack member of the Parse stucture and coding of the tqparent * trigger continues. * * Before a nested trigger is coded, the linked list pointed to by the @@ -5919,13 +5919,13 @@ typedef struct { /* * This global flag is set for performance testing of triggers. When it is set - * SQLite will perform the overhead of building new and old trigger references + * STQLite will perform the overhead of building new and old trigger references * even when no triggers exist */ extern int sqlite3_always_code_trigger_setup; /* -** A lookup table used by the SQLITE_READ_UTF8 macro. The definition +** A lookup table used by the STQLITE_READ_UTF8 macro. The definition ** is in utf.c. */ extern const unsigned char sqlite3UtfTrans1[]; @@ -5933,11 +5933,11 @@ extern const unsigned char sqlite3UtfTrans1[]; /* ** Macros for reading UTF8 characters. ** -** SQLITE_READ_UTF8(x,c) reads a single UTF8 value out of x and writes +** STQLITE_READ_UTF8(x,c) reads a single UTF8 value out of x and writes ** that value into c. The type of x must be unsigned char*. The type ** of c must be unsigned int. ** -** SQLITE_SKIP_UTF8(x) advances x forward by one character. The type of +** STQLITE_SKIP_UTF8(x) advances x forward by one character. The type of ** x must be unsigned char*. ** ** Notes On Invalid UTF-8: @@ -5956,11 +5956,11 @@ extern const unsigned char sqlite3UtfTrans1[]; ** invalid characters. ** ** * These routines accept an infinite number of different UTF8 encodings -** for unicode values 0x80 and greater. They do not change over-length +** for tqunicode values 0x80 and greater. They do not change over-length ** encodings to 0xfffd as some systems recommend. ** */ -#define SQLITE_READ_UTF8(zIn, c) { \ +#define STQLITE_READ_UTF8(zIn, c) { \ c = *(zIn++); \ if( c>=0xc0 ){ \ c = sqlite3UtfTrans1[c-0xc0]; \ @@ -5972,7 +5972,7 @@ extern const unsigned char sqlite3UtfTrans1[]; || (c&0xFFFFFFFE)==0xFFFE ){ c = 0xFFFD; } \ } \ } -#define SQLITE_SKIP_UTF8(zIn) { \ +#define STQLITE_SKIP_UTF8(zIn) { \ if( (*(zIn++))>=0xc0 ){ \ while( (*zIn & 0xc0)==0x80 ){ zIn++; } \ } \ @@ -5982,185 +5982,185 @@ extern const unsigned char sqlite3UtfTrans1[]; /* -** The SQLITE_CORRUPT_BKPT macro can be either a constant (for production +** The STQLITE_CORRUPT_BKPT macro can be either a constant (for production ** builds) or a function call (for debugging). If it is a function call, ** it allows the operator to set a breakpoint at the spot where database ** corruption is first detected. */ -#ifdef SQLITE_DEBUG -SQLITE_PRIVATE int sqlite3Corrupt(void); -# define SQLITE_CORRUPT_BKPT sqlite3Corrupt() +#ifdef STQLITE_DEBUG +STQLITE_PRIVATE int sqlite3Corrupt(void); +# define STQLITE_CORRUPT_BKPT sqlite3Corrupt() #else -# define SQLITE_CORRUPT_BKPT SQLITE_CORRUPT +# define STQLITE_CORRUPT_BKPT STQLITE_CORRUPT #endif /* ** Internal function prototypes */ -SQLITE_PRIVATE int sqlite3StrICmp(const char *, const char *); -SQLITE_PRIVATE int sqlite3StrNICmp(const char *, const char *, int); -SQLITE_PRIVATE int sqlite3IsNumber(const char*, int*, u8); +STQLITE_PRIVATE int sqlite3StrICmp(const char *, const char *); +STQLITE_PRIVATE int sqlite3StrNICmp(const char *, const char *, int); +STQLITE_PRIVATE int sqlite3IsNumber(const char*, int*, u8); -SQLITE_PRIVATE void *sqlite3Malloc(int,int); -SQLITE_PRIVATE void *sqlite3MallocRaw(int,int); -SQLITE_PRIVATE void *sqlite3Realloc(void*,int); -SQLITE_PRIVATE char *sqlite3StrDup(const char*); -SQLITE_PRIVATE char *sqlite3StrNDup(const char*, int); +STQLITE_PRIVATE void *sqlite3Malloc(int,int); +STQLITE_PRIVATE void *sqlite3MallocRaw(int,int); +STQLITE_PRIVATE void *sqlite3Realloc(void*,int); +STQLITE_PRIVATE char *sqlite3StrDup(const char*); +STQLITE_PRIVATE char *sqlite3StrNDup(const char*, int); # define sqlite3CheckMemory(a,b) -SQLITE_PRIVATE void *sqlite3ReallocOrFree(void*,int); -SQLITE_PRIVATE void sqlite3FreeX(void*); -SQLITE_PRIVATE void *sqlite3MallocX(int); -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT -SQLITE_PRIVATE int sqlite3AllocSize(void *); -#endif - -SQLITE_PRIVATE char *sqlite3MPrintf(const char*, ...); -SQLITE_PRIVATE char *sqlite3VMPrintf(const char*, va_list); -#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) -SQLITE_PRIVATE void sqlite3DebugPrintf(const char*, ...); -SQLITE_PRIVATE void *sqlite3TextToPtr(const char*); -#endif -SQLITE_PRIVATE void sqlite3SetString(char **, ...); -SQLITE_PRIVATE void sqlite3ErrorMsg(Parse*, const char*, ...); -SQLITE_PRIVATE void sqlite3ErrorClear(Parse*); -SQLITE_PRIVATE void sqlite3Dequote(char*); -SQLITE_PRIVATE void sqlite3DequoteExpr(Expr*); -SQLITE_PRIVATE int sqlite3KeywordCode(const unsigned char*, int); -SQLITE_PRIVATE int sqlite3RunParser(Parse*, const char*, char **); -SQLITE_PRIVATE void sqlite3FinishCoding(Parse*); -SQLITE_PRIVATE Expr *sqlite3Expr(int, Expr*, Expr*, const Token*); -SQLITE_PRIVATE Expr *sqlite3ExprOrFree(int, Expr*, Expr*, const Token*); -SQLITE_PRIVATE Expr *sqlite3RegisterExpr(Parse*,Token*); -SQLITE_PRIVATE Expr *sqlite3ExprAnd(Expr*, Expr*); -SQLITE_PRIVATE void sqlite3ExprSpan(Expr*,Token*,Token*); -SQLITE_PRIVATE Expr *sqlite3ExprFunction(ExprList*, Token*); -SQLITE_PRIVATE void sqlite3ExprAssignVarNumber(Parse*, Expr*); -SQLITE_PRIVATE void sqlite3ExprDelete(Expr*); -SQLITE_PRIVATE ExprList *sqlite3ExprListAppend(ExprList*,Expr*,Token*); -SQLITE_PRIVATE void sqlite3ExprListDelete(ExprList*); -SQLITE_PRIVATE int sqlite3Init(sqlite3*, char**); -SQLITE_PRIVATE int sqlite3InitCallback(void*, int, char**, char**); -SQLITE_PRIVATE void sqlite3Pragma(Parse*,Token*,Token*,Token*,int); -SQLITE_PRIVATE void sqlite3ResetInternalSchema(sqlite3*, int); -SQLITE_PRIVATE void sqlite3BeginParse(Parse*,int); -SQLITE_PRIVATE void sqlite3CommitInternalChanges(sqlite3*); -SQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse*,char*,Select*); -SQLITE_PRIVATE void sqlite3OpenMasterTable(Parse *, int); -SQLITE_PRIVATE void sqlite3StartTable(Parse*,Token*,Token*,int,int,int,int); -SQLITE_PRIVATE void sqlite3AddColumn(Parse*,Token*); -SQLITE_PRIVATE void sqlite3AddNotNull(Parse*, int); -SQLITE_PRIVATE void sqlite3AddPrimaryKey(Parse*, ExprList*, int, int, int); -SQLITE_PRIVATE void sqlite3AddCheckConstraint(Parse*, Expr*); -SQLITE_PRIVATE void sqlite3AddColumnType(Parse*,Token*); -SQLITE_PRIVATE void sqlite3AddDefaultValue(Parse*,Expr*); -SQLITE_PRIVATE void sqlite3AddCollateType(Parse*, const char*, int); -SQLITE_PRIVATE void sqlite3EndTable(Parse*,Token*,Token*,Select*); - -SQLITE_PRIVATE void sqlite3CreateView(Parse*,Token*,Token*,Token*,Select*,int,int); - -#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE) -SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse*,Table*); +STQLITE_PRIVATE void *sqlite3ReallocOrFree(void*,int); +STQLITE_PRIVATE void sqlite3FreeX(void*); +STQLITE_PRIVATE void *sqlite3MallocX(int); +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT +STQLITE_PRIVATE int sqlite3AllocSize(void *); +#endif + +STQLITE_PRIVATE char *sqlite3MPrintf(const char*, ...); +STQLITE_PRIVATE char *sqlite3VMPrintf(const char*, va_list); +#if defined(STQLITE_TEST) || defined(STQLITE_DEBUG) +STQLITE_PRIVATE void sqlite3DebugPrintf(const char*, ...); +STQLITE_PRIVATE void *sqlite3TextToPtr(const char*); +#endif +STQLITE_PRIVATE void sqlite3SetString(char **, ...); +STQLITE_PRIVATE void sqlite3ErrorMsg(Parse*, const char*, ...); +STQLITE_PRIVATE void sqlite3ErrorClear(Parse*); +STQLITE_PRIVATE void sqlite3Dequote(char*); +STQLITE_PRIVATE void sqlite3DequoteExpr(Expr*); +STQLITE_PRIVATE int sqlite3KeywordCode(const unsigned char*, int); +STQLITE_PRIVATE int sqlite3RunParser(Parse*, const char*, char **); +STQLITE_PRIVATE void sqlite3FinishCoding(Parse*); +STQLITE_PRIVATE Expr *sqlite3Expr(int, Expr*, Expr*, const Token*); +STQLITE_PRIVATE Expr *sqlite3ExprOrFree(int, Expr*, Expr*, const Token*); +STQLITE_PRIVATE Expr *sqlite3RegisterExpr(Parse*,Token*); +STQLITE_PRIVATE Expr *sqlite3ExprAnd(Expr*, Expr*); +STQLITE_PRIVATE void sqlite3ExprSpan(Expr*,Token*,Token*); +STQLITE_PRIVATE Expr *sqlite3ExprFunction(ExprList*, Token*); +STQLITE_PRIVATE void sqlite3ExprAssignVarNumber(Parse*, Expr*); +STQLITE_PRIVATE void sqlite3ExprDelete(Expr*); +STQLITE_PRIVATE ExprList *sqlite3ExprListAppend(ExprList*,Expr*,Token*); +STQLITE_PRIVATE void sqlite3ExprListDelete(ExprList*); +STQLITE_PRIVATE int sqlite3Init(sqlite3*, char**); +STQLITE_PRIVATE int sqlite3InitCallback(void*, int, char**, char**); +STQLITE_PRIVATE void sqlite3Pragma(Parse*,Token*,Token*,Token*,int); +STQLITE_PRIVATE void sqlite3ResetInternalSchema(sqlite3*, int); +STQLITE_PRIVATE void sqlite3BeginParse(Parse*,int); +STQLITE_PRIVATE void sqlite3CommitInternalChanges(sqlite3*); +STQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse*,char*,Select*); +STQLITE_PRIVATE void sqlite3OpenMasterTable(Parse *, int); +STQLITE_PRIVATE void sqlite3StartTable(Parse*,Token*,Token*,int,int,int,int); +STQLITE_PRIVATE void sqlite3AddColumn(Parse*,Token*); +STQLITE_PRIVATE void sqlite3AddNotNull(Parse*, int); +STQLITE_PRIVATE void sqlite3AddPrimaryKey(Parse*, ExprList*, int, int, int); +STQLITE_PRIVATE void sqlite3AddCheckConstraint(Parse*, Expr*); +STQLITE_PRIVATE void sqlite3AddColumnType(Parse*,Token*); +STQLITE_PRIVATE void sqlite3AddDefaultValue(Parse*,Expr*); +STQLITE_PRIVATE void sqlite3AddCollateType(Parse*, const char*, int); +STQLITE_PRIVATE void sqlite3EndTable(Parse*,Token*,Token*,Select*); + +STQLITE_PRIVATE void sqlite3CreateView(Parse*,Token*,Token*,Token*,Select*,int,int); + +#if !defined(STQLITE_OMIT_VIEW) || !defined(STQLITE_OMIT_VIRTUALTABLE) +STQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse*,Table*); #else # define sqlite3ViewGetColumnNames(A,B) 0 #endif -SQLITE_PRIVATE void sqlite3DropTable(Parse*, SrcList*, int, int); -SQLITE_PRIVATE void sqlite3DeleteTable(Table*); -SQLITE_PRIVATE void sqlite3Insert(Parse*, SrcList*, ExprList*, Select*, IdList*, int); -SQLITE_PRIVATE void *sqlite3ArrayAllocate(void*,int,int,int*,int*,int*); -SQLITE_PRIVATE IdList *sqlite3IdListAppend(IdList*, Token*); -SQLITE_PRIVATE int sqlite3IdListIndex(IdList*,const char*); -SQLITE_PRIVATE SrcList *sqlite3SrcListAppend(SrcList*, Token*, Token*); -SQLITE_PRIVATE SrcList *sqlite3SrcListAppendFromTerm(SrcList*, Token*, Token*, Token*, +STQLITE_PRIVATE void sqlite3DropTable(Parse*, SrcList*, int, int); +STQLITE_PRIVATE void sqlite3DeleteTable(Table*); +STQLITE_PRIVATE void sqlite3Insert(Parse*, SrcList*, ExprList*, Select*, IdList*, int); +STQLITE_PRIVATE void *sqlite3ArrayAllocate(void*,int,int,int*,int*,int*); +STQLITE_PRIVATE IdList *sqlite3IdListAppend(IdList*, Token*); +STQLITE_PRIVATE int sqlite3IdListIndex(IdList*,const char*); +STQLITE_PRIVATE SrcList *sqlite3SrcListAppend(SrcList*, Token*, Token*); +STQLITE_PRIVATE SrcList *sqlite3SrcListAppendFromTerm(SrcList*, Token*, Token*, Token*, Select*, Expr*, IdList*); -SQLITE_PRIVATE void sqlite3SrcListShiftJoinType(SrcList*); -SQLITE_PRIVATE void sqlite3SrcListAssignCursors(Parse*, SrcList*); -SQLITE_PRIVATE void sqlite3IdListDelete(IdList*); -SQLITE_PRIVATE void sqlite3SrcListDelete(SrcList*); -SQLITE_PRIVATE void sqlite3CreateIndex(Parse*,Token*,Token*,SrcList*,ExprList*,int,Token*, +STQLITE_PRIVATE void sqlite3SrcListShiftJoinType(SrcList*); +STQLITE_PRIVATE void sqlite3SrcListAssignCursors(Parse*, SrcList*); +STQLITE_PRIVATE void sqlite3IdListDelete(IdList*); +STQLITE_PRIVATE void sqlite3SrcListDelete(SrcList*); +STQLITE_PRIVATE void sqlite3CreateIndex(Parse*,Token*,Token*,SrcList*,ExprList*,int,Token*, Token*, int, int); -SQLITE_PRIVATE void sqlite3DropIndex(Parse*, SrcList*, int); -SQLITE_PRIVATE int sqlite3Select(Parse*, Select*, int, int, Select*, int, int*, char *aff); -SQLITE_PRIVATE Select *sqlite3SelectNew(ExprList*,SrcList*,Expr*,ExprList*,Expr*,ExprList*, +STQLITE_PRIVATE void sqlite3DropIndex(Parse*, SrcList*, int); +STQLITE_PRIVATE int sqlite3Select(Parse*, Select*, int, int, Select*, int, int*, char *aff); +STQLITE_PRIVATE Select *sqlite3SelectNew(ExprList*,SrcList*,Expr*,ExprList*,Expr*,ExprList*, int,Expr*,Expr*); -SQLITE_PRIVATE void sqlite3SelectDelete(Select*); -SQLITE_PRIVATE Table *sqlite3SrcListLookup(Parse*, SrcList*); -SQLITE_PRIVATE int sqlite3IsReadOnly(Parse*, Table*, int); -SQLITE_PRIVATE void sqlite3OpenTable(Parse*, int iCur, int iDb, Table*, int); -SQLITE_PRIVATE void sqlite3DeleteFrom(Parse*, SrcList*, Expr*); -SQLITE_PRIVATE void sqlite3Update(Parse*, SrcList*, ExprList*, Expr*, int); -SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(Parse*, SrcList*, Expr*, ExprList**); -SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo*); -SQLITE_PRIVATE void sqlite3ExprCodeGetColumn(Vdbe*, Table*, int, int); -SQLITE_PRIVATE void sqlite3ExprCode(Parse*, Expr*); -SQLITE_PRIVATE void sqlite3ExprCodeAndCache(Parse*, Expr*); -SQLITE_PRIVATE int sqlite3ExprCodeExprList(Parse*, ExprList*); -SQLITE_PRIVATE void sqlite3ExprIfTrue(Parse*, Expr*, int, int); -SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse*, Expr*, int, int); -SQLITE_PRIVATE Table *sqlite3FindTable(sqlite3*,const char*, const char*); -SQLITE_PRIVATE Table *sqlite3LocateTable(Parse*,const char*, const char*); -SQLITE_PRIVATE Index *sqlite3FindIndex(sqlite3*,const char*, const char*); -SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTable(sqlite3*,int,const char*); -SQLITE_PRIVATE void sqlite3UnlinkAndDeleteIndex(sqlite3*,int,const char*); -SQLITE_PRIVATE void sqlite3Vacuum(Parse*); -SQLITE_PRIVATE int sqlite3RunVacuum(char**, sqlite3*); -SQLITE_PRIVATE char *sqlite3NameFromToken(Token*); -SQLITE_PRIVATE int sqlite3ExprCompare(Expr*, Expr*); +STQLITE_PRIVATE void sqlite3SelectDelete(Select*); +STQLITE_PRIVATE Table *sqlite3SrcListLookup(Parse*, SrcList*); +STQLITE_PRIVATE int sqlite3IsReadOnly(Parse*, Table*, int); +STQLITE_PRIVATE void sqlite3OpenTable(Parse*, int iCur, int iDb, Table*, int); +STQLITE_PRIVATE void sqlite3DeleteFrom(Parse*, SrcList*, Expr*); +STQLITE_PRIVATE void sqlite3Update(Parse*, SrcList*, ExprList*, Expr*, int); +STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(Parse*, SrcList*, Expr*, ExprList**); +STQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo*); +STQLITE_PRIVATE void sqlite3ExprCodeGetColumn(Vdbe*, Table*, int, int); +STQLITE_PRIVATE void sqlite3ExprCode(Parse*, Expr*); +STQLITE_PRIVATE void sqlite3ExprCodeAndCache(Parse*, Expr*); +STQLITE_PRIVATE int sqlite3ExprCodeExprList(Parse*, ExprList*); +STQLITE_PRIVATE void sqlite3ExprIfTrue(Parse*, Expr*, int, int); +STQLITE_PRIVATE void sqlite3ExprIfFalse(Parse*, Expr*, int, int); +STQLITE_PRIVATE Table *sqlite3FindTable(sqlite3*,const char*, const char*); +STQLITE_PRIVATE Table *sqlite3LocateTable(Parse*,const char*, const char*); +STQLITE_PRIVATE Index *sqlite3FindIndex(sqlite3*,const char*, const char*); +STQLITE_PRIVATE void sqlite3UnlinkAndDeleteTable(sqlite3*,int,const char*); +STQLITE_PRIVATE void sqlite3UnlinkAndDeleteIndex(sqlite3*,int,const char*); +STQLITE_PRIVATE void sqlite3Vacuum(Parse*); +STQLITE_PRIVATE int sqlite3RunVacuum(char**, sqlite3*); +STQLITE_PRIVATE char *sqlite3NameFromToken(Token*); +STQLITE_PRIVATE int sqlite3ExprCompare(Expr*, Expr*); int sqliteFuncId(Token*); -SQLITE_PRIVATE int sqlite3ExprResolveNames(NameContext *, Expr *); -SQLITE_PRIVATE int sqlite3ExprAnalyzeAggregates(NameContext*, Expr*); -SQLITE_PRIVATE int sqlite3ExprAnalyzeAggList(NameContext*,ExprList*); -SQLITE_PRIVATE Vdbe *sqlite3GetVdbe(Parse*); -SQLITE_PRIVATE Expr *sqlite3CreateIdExpr(const char*); -SQLITE_PRIVATE void sqlite3Randomness(int, void*); -SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3*); -SQLITE_PRIVATE void sqlite3CodeVerifySchema(Parse*, int); -SQLITE_PRIVATE void sqlite3BeginTransaction(Parse*, int); -SQLITE_PRIVATE void sqlite3CommitTransaction(Parse*); -SQLITE_PRIVATE void sqlite3RollbackTransaction(Parse*); -SQLITE_PRIVATE int sqlite3ExprIsConstant(Expr*); -SQLITE_PRIVATE int sqlite3ExprIsConstantNotJoin(Expr*); -SQLITE_PRIVATE int sqlite3ExprIsConstantOrFunction(Expr*); -SQLITE_PRIVATE int sqlite3ExprIsInteger(Expr*, int*); -SQLITE_PRIVATE int sqlite3IsRowid(const char*); -SQLITE_PRIVATE void sqlite3GenerateRowDelete(sqlite3*, Vdbe*, Table*, int, int); -SQLITE_PRIVATE void sqlite3GenerateRowIndexDelete(Vdbe*, Table*, int, char*); -SQLITE_PRIVATE void sqlite3GenerateIndexKey(Vdbe*, Index*, int); -SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(Parse*,Table*,int,char*,int,int,int,int); -SQLITE_PRIVATE void sqlite3CompleteInsertion(Parse*, Table*, int, char*, int, int, int, int); -SQLITE_PRIVATE void sqlite3OpenTableAndIndices(Parse*, Table*, int, int); -SQLITE_PRIVATE void sqlite3BeginWriteOperation(Parse*, int, int); -SQLITE_PRIVATE Expr *sqlite3ExprDup(Expr*); -SQLITE_PRIVATE void sqlite3TokenCopy(Token*, Token*); -SQLITE_PRIVATE ExprList *sqlite3ExprListDup(ExprList*); -SQLITE_PRIVATE SrcList *sqlite3SrcListDup(SrcList*); -SQLITE_PRIVATE IdList *sqlite3IdListDup(IdList*); -SQLITE_PRIVATE Select *sqlite3SelectDup(Select*); -SQLITE_PRIVATE FuncDef *sqlite3FindFunction(sqlite3*,const char*,int,int,u8,int); -SQLITE_PRIVATE void sqlite3RegisterBuiltinFunctions(sqlite3*); -SQLITE_PRIVATE void sqlite3RegisterDateTimeFunctions(sqlite3*); -SQLITE_PRIVATE int sqlite3SafetyOn(sqlite3*); -SQLITE_PRIVATE int sqlite3SafetyOff(sqlite3*); -SQLITE_PRIVATE int sqlite3SafetyCheck(sqlite3*); -SQLITE_PRIVATE void sqlite3ChangeCookie(sqlite3*, Vdbe*, int); - -#ifndef SQLITE_OMIT_TRIGGER -SQLITE_PRIVATE void sqlite3BeginTrigger(Parse*, Token*,Token*,int,int,IdList*,SrcList*, +STQLITE_PRIVATE int sqlite3ExprResolveNames(NameContext *, Expr *); +STQLITE_PRIVATE int sqlite3ExprAnalyzeAggregates(NameContext*, Expr*); +STQLITE_PRIVATE int sqlite3ExprAnalyzeAggList(NameContext*,ExprList*); +STQLITE_PRIVATE Vdbe *sqlite3GetVdbe(Parse*); +STQLITE_PRIVATE Expr *sqlite3CreateIdExpr(const char*); +STQLITE_PRIVATE void sqlite3Randomness(int, void*); +STQLITE_PRIVATE void sqlite3RollbackAll(sqlite3*); +STQLITE_PRIVATE void sqlite3CodeVerifySchema(Parse*, int); +STQLITE_PRIVATE void sqlite3BeginTransaction(Parse*, int); +STQLITE_PRIVATE void sqlite3CommitTransaction(Parse*); +STQLITE_PRIVATE void sqlite3RollbackTransaction(Parse*); +STQLITE_PRIVATE int sqlite3ExprIsConstant(Expr*); +STQLITE_PRIVATE int sqlite3ExprIsConstantNotJoin(Expr*); +STQLITE_PRIVATE int sqlite3ExprIsConstantOrFunction(Expr*); +STQLITE_PRIVATE int sqlite3ExprIsInteger(Expr*, int*); +STQLITE_PRIVATE int sqlite3IsRowid(const char*); +STQLITE_PRIVATE void sqlite3GenerateRowDelete(sqlite3*, Vdbe*, Table*, int, int); +STQLITE_PRIVATE void sqlite3GenerateRowIndexDelete(Vdbe*, Table*, int, char*); +STQLITE_PRIVATE void sqlite3GenerateIndexKey(Vdbe*, Index*, int); +STQLITE_PRIVATE void sqlite3GenerateConstraintChecks(Parse*,Table*,int,char*,int,int,int,int); +STQLITE_PRIVATE void sqlite3CompleteInsertion(Parse*, Table*, int, char*, int, int, int, int); +STQLITE_PRIVATE void sqlite3OpenTableAndIndices(Parse*, Table*, int, int); +STQLITE_PRIVATE void sqlite3BeginWriteOperation(Parse*, int, int); +STQLITE_PRIVATE Expr *sqlite3ExprDup(Expr*); +STQLITE_PRIVATE void sqlite3TokenCopy(Token*, Token*); +STQLITE_PRIVATE ExprList *sqlite3ExprListDup(ExprList*); +STQLITE_PRIVATE SrcList *sqlite3SrcListDup(SrcList*); +STQLITE_PRIVATE IdList *sqlite3IdListDup(IdList*); +STQLITE_PRIVATE Select *sqlite3SelectDup(Select*); +STQLITE_PRIVATE FuncDef *sqlite3FindFunction(sqlite3*,const char*,int,int,u8,int); +STQLITE_PRIVATE void sqlite3RegisterBuiltinFunctions(sqlite3*); +STQLITE_PRIVATE void sqlite3RegisterDateTimeFunctions(sqlite3*); +STQLITE_PRIVATE int sqlite3SafetyOn(sqlite3*); +STQLITE_PRIVATE int sqlite3SafetyOff(sqlite3*); +STQLITE_PRIVATE int sqlite3SafetyCheck(sqlite3*); +STQLITE_PRIVATE void sqlite3ChangeCookie(sqlite3*, Vdbe*, int); + +#ifndef STQLITE_OMIT_TRIGGER +STQLITE_PRIVATE void sqlite3BeginTrigger(Parse*, Token*,Token*,int,int,IdList*,SrcList*, Expr*,int, int); -SQLITE_PRIVATE void sqlite3FinishTrigger(Parse*, TriggerStep*, Token*); -SQLITE_PRIVATE void sqlite3DropTrigger(Parse*, SrcList*, int); -SQLITE_PRIVATE void sqlite3DropTriggerPtr(Parse*, Trigger*); -SQLITE_PRIVATE int sqlite3TriggersExist(Parse*, Table*, int, ExprList*); -SQLITE_PRIVATE int sqlite3CodeRowTrigger(Parse*, int, ExprList*, int, Table *, int, int, +STQLITE_PRIVATE void sqlite3FinishTrigger(Parse*, TriggerStep*, Token*); +STQLITE_PRIVATE void sqlite3DropTrigger(Parse*, SrcList*, int); +STQLITE_PRIVATE void sqlite3DropTriggerPtr(Parse*, Trigger*); +STQLITE_PRIVATE int sqlite3TriggersExist(Parse*, Table*, int, ExprList*); +STQLITE_PRIVATE int sqlite3CodeRowTrigger(Parse*, int, ExprList*, int, Table *, int, int, int, int); void sqliteViewTriggers(Parse*, Table*, Expr*, int, ExprList*); -SQLITE_PRIVATE void sqlite3DeleteTriggerStep(TriggerStep*); -SQLITE_PRIVATE TriggerStep *sqlite3TriggerSelectStep(Select*); -SQLITE_PRIVATE TriggerStep *sqlite3TriggerInsertStep(Token*, IdList*, ExprList*,Select*,int); -SQLITE_PRIVATE TriggerStep *sqlite3TriggerUpdateStep(Token*, ExprList*, Expr*, int); -SQLITE_PRIVATE TriggerStep *sqlite3TriggerDeleteStep(Token*, Expr*); -SQLITE_PRIVATE void sqlite3DeleteTrigger(Trigger*); -SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTrigger(sqlite3*,int,const char*); +STQLITE_PRIVATE void sqlite3DeleteTriggerStep(TriggerStep*); +STQLITE_PRIVATE TriggerStep *sqlite3TriggerSelectStep(Select*); +STQLITE_PRIVATE TriggerStep *sqlite3TriggerInsertStep(Token*, IdList*, ExprList*,Select*,int); +STQLITE_PRIVATE TriggerStep *sqlite3TriggerUpdateStep(Token*, ExprList*, Expr*, int); +STQLITE_PRIVATE TriggerStep *sqlite3TriggerDeleteStep(Token*, Expr*); +STQLITE_PRIVATE void sqlite3DeleteTrigger(Trigger*); +STQLITE_PRIVATE void sqlite3UnlinkAndDeleteTrigger(sqlite3*,int,const char*); #else # define sqlite3TriggersExist(A,B,C,D,E,F) 0 # define sqlite3DeleteTrigger(A) @@ -6169,199 +6169,199 @@ SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTrigger(sqlite3*,int,const char*); # define sqlite3CodeRowTrigger(A,B,C,D,E,F,G,H,I) 0 #endif -SQLITE_PRIVATE int sqlite3JoinType(Parse*, Token*, Token*, Token*); -SQLITE_PRIVATE void sqlite3CreateForeignKey(Parse*, ExprList*, Token*, ExprList*, int); -SQLITE_PRIVATE void sqlite3DeferForeignKey(Parse*, int); -#ifndef SQLITE_OMIT_AUTHORIZATION -SQLITE_PRIVATE void sqlite3AuthRead(Parse*,Expr*,SrcList*); -SQLITE_PRIVATE int sqlite3AuthCheck(Parse*,int, const char*, const char*, const char*); -SQLITE_PRIVATE void sqlite3AuthContextPush(Parse*, AuthContext*, const char*); -SQLITE_PRIVATE void sqlite3AuthContextPop(AuthContext*); +STQLITE_PRIVATE int sqlite3JoinType(Parse*, Token*, Token*, Token*); +STQLITE_PRIVATE void sqlite3CreateForeignKey(Parse*, ExprList*, Token*, ExprList*, int); +STQLITE_PRIVATE void sqlite3DeferForeignKey(Parse*, int); +#ifndef STQLITE_OMIT_AUTHORIZATION +STQLITE_PRIVATE void sqlite3AuthRead(Parse*,Expr*,SrcList*); +STQLITE_PRIVATE int sqlite3AuthCheck(Parse*,int, const char*, const char*, const char*); +STQLITE_PRIVATE void sqlite3AuthContextPush(Parse*, AuthContext*, const char*); +STQLITE_PRIVATE void sqlite3AuthContextPop(AuthContext*); #else # define sqlite3AuthRead(a,b,c) -# define sqlite3AuthCheck(a,b,c,d,e) SQLITE_OK +# define sqlite3AuthCheck(a,b,c,d,e) STQLITE_OK # define sqlite3AuthContextPush(a,b,c) # define sqlite3AuthContextPop(a) ((void)(a)) #endif -SQLITE_PRIVATE void sqlite3Attach(Parse*, Expr*, Expr*, Expr*); -SQLITE_PRIVATE void sqlite3Detach(Parse*, Expr*); -SQLITE_PRIVATE int sqlite3BtreeFactory(const sqlite3 *db, const char *zFilename, +STQLITE_PRIVATE void sqlite3Attach(Parse*, Expr*, Expr*, Expr*); +STQLITE_PRIVATE void sqlite3Detach(Parse*, Expr*); +STQLITE_PRIVATE int sqlite3BtreeFactory(const sqlite3 *db, const char *zFilename, int omitJournal, int nCache, Btree **ppBtree); -SQLITE_PRIVATE int sqlite3FixInit(DbFixer*, Parse*, int, const char*, const Token*); -SQLITE_PRIVATE int sqlite3FixSrcList(DbFixer*, SrcList*); -SQLITE_PRIVATE int sqlite3FixSelect(DbFixer*, Select*); -SQLITE_PRIVATE int sqlite3FixExpr(DbFixer*, Expr*); -SQLITE_PRIVATE int sqlite3FixExprList(DbFixer*, ExprList*); -SQLITE_PRIVATE int sqlite3FixTriggerStep(DbFixer*, TriggerStep*); -SQLITE_PRIVATE int sqlite3AtoF(const char *z, double*); -SQLITE_API char *sqlite3_snprintf(int,char*,const char*,...); -SQLITE_PRIVATE int sqlite3GetInt32(const char *, int*); -SQLITE_PRIVATE int sqlite3FitsIn64Bits(const char *); -SQLITE_PRIVATE int sqlite3Utf16ByteLen(const void *pData, int nChar); -SQLITE_PRIVATE int sqlite3Utf8CharLen(const char *pData, int nByte); -SQLITE_PRIVATE u32 sqlite3ReadUtf8(const unsigned char *); -SQLITE_PRIVATE int sqlite3PutVarint(unsigned char *, u64); -SQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *, u64 *); -SQLITE_PRIVATE int sqlite3GetVarint32(const unsigned char *, u32 *); -SQLITE_PRIVATE int sqlite3VarintLen(u64 v); -SQLITE_PRIVATE void sqlite3IndexAffinityStr(Vdbe *, Index *); -SQLITE_PRIVATE void sqlite3TableAffinityStr(Vdbe *, Table *); -SQLITE_PRIVATE char sqlite3CompareAffinity(Expr *pExpr, char aff2); -SQLITE_PRIVATE int sqlite3IndexAffinityOk(Expr *pExpr, char idx_affinity); -SQLITE_PRIVATE char sqlite3ExprAffinity(Expr *pExpr); -SQLITE_PRIVATE int sqlite3Atoi64(const char*, i64*); -SQLITE_PRIVATE void sqlite3Error(sqlite3*, int, const char*,...); -SQLITE_PRIVATE void *sqlite3HexToBlob(const char *z); -SQLITE_PRIVATE int sqlite3TwoPartName(Parse *, Token *, Token *, Token **); -SQLITE_PRIVATE const char *sqlite3ErrStr(int); -SQLITE_PRIVATE int sqlite3ReadSchema(Parse *pParse); -SQLITE_PRIVATE CollSeq *sqlite3FindCollSeq(sqlite3*,u8 enc, const char *,int,int); -SQLITE_PRIVATE CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char *zName, int nName); -SQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr); -SQLITE_PRIVATE Expr *sqlite3ExprSetColl(Parse *pParse, Expr *, Token *); -SQLITE_PRIVATE int sqlite3CheckCollSeq(Parse *, CollSeq *); -SQLITE_PRIVATE int sqlite3CheckObjectName(Parse *, const char *); -SQLITE_PRIVATE void sqlite3VdbeSetChanges(sqlite3 *, int); -SQLITE_PRIVATE void sqlite3Utf16Substr(sqlite3_context *,int,sqlite3_value **); - -SQLITE_PRIVATE const void *sqlite3ValueText(sqlite3_value*, u8); -SQLITE_PRIVATE int sqlite3ValueBytes(sqlite3_value*, u8); -SQLITE_PRIVATE void sqlite3ValueSetStr(sqlite3_value*, int, const void *,u8, void(*)(void*)); -SQLITE_PRIVATE void sqlite3ValueFree(sqlite3_value*); -SQLITE_PRIVATE sqlite3_value *sqlite3ValueNew(void); -SQLITE_PRIVATE char *sqlite3Utf16to8(const void*, int); -SQLITE_PRIVATE int sqlite3ValueFromExpr(Expr *, u8, u8, sqlite3_value **); -SQLITE_PRIVATE void sqlite3ValueApplyAffinity(sqlite3_value *, u8, u8); +STQLITE_PRIVATE int sqlite3FixInit(DbFixer*, Parse*, int, const char*, const Token*); +STQLITE_PRIVATE int sqlite3FixSrcList(DbFixer*, SrcList*); +STQLITE_PRIVATE int sqlite3FixSelect(DbFixer*, Select*); +STQLITE_PRIVATE int sqlite3FixExpr(DbFixer*, Expr*); +STQLITE_PRIVATE int sqlite3FixExprList(DbFixer*, ExprList*); +STQLITE_PRIVATE int sqlite3FixTriggerStep(DbFixer*, TriggerStep*); +STQLITE_PRIVATE int sqlite3AtoF(const char *z, double*); +STQLITE_API char *sqlite3_snprintf(int,char*,const char*,...); +STQLITE_PRIVATE int sqlite3GetInt32(const char *, int*); +STQLITE_PRIVATE int sqlite3FitsIn64Bits(const char *); +STQLITE_PRIVATE int sqlite3Utf16ByteLen(const void *pData, int nChar); +STQLITE_PRIVATE int sqlite3Utf8CharLen(const char *pData, int nByte); +STQLITE_PRIVATE u32 sqlite3ReadUtf8(const unsigned char *); +STQLITE_PRIVATE int sqlite3PutVarint(unsigned char *, u64); +STQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *, u64 *); +STQLITE_PRIVATE int sqlite3GetVarint32(const unsigned char *, u32 *); +STQLITE_PRIVATE int sqlite3VarintLen(u64 v); +STQLITE_PRIVATE void sqlite3IndexAffinityStr(Vdbe *, Index *); +STQLITE_PRIVATE void sqlite3TableAffinityStr(Vdbe *, Table *); +STQLITE_PRIVATE char sqlite3CompareAffinity(Expr *pExpr, char aff2); +STQLITE_PRIVATE int sqlite3IndexAffinityOk(Expr *pExpr, char idx_affinity); +STQLITE_PRIVATE char sqlite3ExprAffinity(Expr *pExpr); +STQLITE_PRIVATE int sqlite3Atoi64(const char*, i64*); +STQLITE_PRIVATE void sqlite3Error(sqlite3*, int, const char*,...); +STQLITE_PRIVATE void *sqlite3HexToBlob(const char *z); +STQLITE_PRIVATE int sqlite3TwoPartName(Parse *, Token *, Token *, Token **); +STQLITE_PRIVATE const char *sqlite3ErrStr(int); +STQLITE_PRIVATE int sqlite3ReadSchema(Parse *pParse); +STQLITE_PRIVATE CollSeq *sqlite3FindCollSeq(sqlite3*,u8 enc, const char *,int,int); +STQLITE_PRIVATE CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char *zName, int nName); +STQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr); +STQLITE_PRIVATE Expr *sqlite3ExprSetColl(Parse *pParse, Expr *, Token *); +STQLITE_PRIVATE int sqlite3CheckCollSeq(Parse *, CollSeq *); +STQLITE_PRIVATE int sqlite3CheckObjectName(Parse *, const char *); +STQLITE_PRIVATE void sqlite3VdbeSetChanges(sqlite3 *, int); +STQLITE_PRIVATE void sqlite3Utf16Substr(sqlite3_context *,int,sqlite3_value **); + +STQLITE_PRIVATE const void *sqlite3ValueText(sqlite3_value*, u8); +STQLITE_PRIVATE int sqlite3ValueBytes(sqlite3_value*, u8); +STQLITE_PRIVATE void sqlite3ValueSetStr(sqlite3_value*, int, const void *,u8, void(*)(void*)); +STQLITE_PRIVATE void sqlite3ValueFree(sqlite3_value*); +STQLITE_PRIVATE sqlite3_value *sqlite3ValueNew(void); +STQLITE_PRIVATE char *sqlite3Utf16to8(const void*, int); +STQLITE_PRIVATE int sqlite3ValueFromExpr(Expr *, u8, u8, sqlite3_value **); +STQLITE_PRIVATE void sqlite3ValueApplyAffinity(sqlite3_value *, u8, u8); extern const unsigned char sqlite3UpperToLower[]; -SQLITE_PRIVATE void sqlite3RootPageMoved(Db*, int, int); -SQLITE_PRIVATE void sqlite3Reindex(Parse*, Token*, Token*); -SQLITE_PRIVATE void sqlite3AlterFunctions(sqlite3*); -SQLITE_PRIVATE void sqlite3AlterRenameTable(Parse*, SrcList*, Token*); -SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *, int *); -SQLITE_PRIVATE void sqlite3NestedParse(Parse*, const char*, ...); -SQLITE_PRIVATE void sqlite3ExpirePreparedStatements(sqlite3*); -SQLITE_PRIVATE void sqlite3CodeSubselect(Parse *, Expr *); -SQLITE_PRIVATE int sqlite3SelectResolve(Parse *, Select *, NameContext *); -SQLITE_PRIVATE void sqlite3ColumnDefault(Vdbe *, Table *, int); -SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *, Token *); -SQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *, SrcList *); -SQLITE_PRIVATE CollSeq *sqlite3GetCollSeq(sqlite3*, CollSeq *, const char *, int); -SQLITE_PRIVATE char sqlite3AffinityType(const Token*); -SQLITE_PRIVATE void sqlite3Analyze(Parse*, Token*, Token*); -SQLITE_PRIVATE int sqlite3InvokeBusyHandler(BusyHandler*); -SQLITE_PRIVATE int sqlite3FindDb(sqlite3*, Token*); -SQLITE_PRIVATE int sqlite3AnalysisLoad(sqlite3*,int iDB); -SQLITE_PRIVATE void sqlite3DefaultRowEst(Index*); -SQLITE_PRIVATE void sqlite3RegisterLikeFunctions(sqlite3*, int); -SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3*,Expr*,int*,char*); -SQLITE_PRIVATE ThreadData *sqlite3ThreadData(void); -SQLITE_PRIVATE const ThreadData *sqlite3ThreadDataReadOnly(void); -SQLITE_PRIVATE void sqlite3ReleaseThreadData(void); -SQLITE_PRIVATE void sqlite3AttachFunctions(sqlite3 *); -SQLITE_PRIVATE void sqlite3MinimumFileFormat(Parse*, int, int); -SQLITE_PRIVATE void sqlite3SchemaFree(void *); -SQLITE_PRIVATE Schema *sqlite3SchemaGet(Btree *); -SQLITE_PRIVATE int sqlite3SchemaToIndex(sqlite3 *db, Schema *); -SQLITE_PRIVATE KeyInfo *sqlite3IndexKeyinfo(Parse *, Index *); -SQLITE_PRIVATE int sqlite3CreateFunc(sqlite3 *, const char *, int, int, void *, +STQLITE_PRIVATE void sqlite3RootPageMoved(Db*, int, int); +STQLITE_PRIVATE void sqlite3Reindex(Parse*, Token*, Token*); +STQLITE_PRIVATE void sqlite3AlterFunctions(sqlite3*); +STQLITE_PRIVATE void sqlite3AlterRenameTable(Parse*, SrcList*, Token*); +STQLITE_PRIVATE int sqlite3GetToken(const unsigned char *, int *); +STQLITE_PRIVATE void sqlite3NestedParse(Parse*, const char*, ...); +STQLITE_PRIVATE void sqlite3ExpirePreparedStatements(sqlite3*); +STQLITE_PRIVATE void sqlite3CodeSubselect(Parse *, Expr *); +STQLITE_PRIVATE int sqlite3SelectResolve(Parse *, Select *, NameContext *); +STQLITE_PRIVATE void sqlite3ColumnDefault(Vdbe *, Table *, int); +STQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *, Token *); +STQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *, SrcList *); +STQLITE_PRIVATE CollSeq *sqlite3GetCollSeq(sqlite3*, CollSeq *, const char *, int); +STQLITE_PRIVATE char sqlite3AffinityType(const Token*); +STQLITE_PRIVATE void sqlite3Analyze(Parse*, Token*, Token*); +STQLITE_PRIVATE int sqlite3InvokeBusyHandler(BusyHandler*); +STQLITE_PRIVATE int sqlite3FindDb(sqlite3*, Token*); +STQLITE_PRIVATE int sqlite3AnalysisLoad(sqlite3*,int iDB); +STQLITE_PRIVATE void sqlite3DefaultRowEst(Index*); +STQLITE_PRIVATE void sqlite3RegisterLikeFunctions(sqlite3*, int); +STQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3*,Expr*,int*,char*); +STQLITE_PRIVATE ThreadData *sqlite3ThreadData(void); +STQLITE_PRIVATE const ThreadData *sqlite3ThreadDataReadOnly(void); +STQLITE_PRIVATE void sqlite3ReleaseThreadData(void); +STQLITE_PRIVATE void sqlite3AttachFunctions(sqlite3 *); +STQLITE_PRIVATE void sqlite3MinimumFileFormat(Parse*, int, int); +STQLITE_PRIVATE void sqlite3SchemaFree(void *); +STQLITE_PRIVATE Schema *sqlite3SchemaGet(Btree *); +STQLITE_PRIVATE int sqlite3SchemaToIndex(sqlite3 *db, Schema *); +STQLITE_PRIVATE KeyInfo *sqlite3IndexKeyinfo(Parse *, Index *); +STQLITE_PRIVATE int sqlite3CreateFunc(sqlite3 *, const char *, int, int, void *, void (*)(sqlite3_context*,int,sqlite3_value **), void (*)(sqlite3_context*,int,sqlite3_value **), void (*)(sqlite3_context*)); -SQLITE_PRIVATE int sqlite3ApiExit(sqlite3 *db, int); -SQLITE_PRIVATE void sqlite3FailedMalloc(void); -SQLITE_PRIVATE void sqlite3AbortOtherActiveVdbes(sqlite3 *, Vdbe *); -SQLITE_PRIVATE int sqlite3OpenTempDatabase(Parse *); - -#ifndef SQLITE_OMIT_LOAD_EXTENSION -SQLITE_PRIVATE void sqlite3CloseExtensions(sqlite3*); -SQLITE_PRIVATE int sqlite3AutoLoadExtensions(sqlite3*); +STQLITE_PRIVATE int sqlite3ApiExit(sqlite3 *db, int); +STQLITE_PRIVATE void sqlite3FailedMalloc(void); +STQLITE_PRIVATE void sqlite3AbortOtherActiveVdbes(sqlite3 *, Vdbe *); +STQLITE_PRIVATE int sqlite3OpenTempDatabase(Parse *); + +#ifndef STQLITE_OMIT_LOAD_EXTENSION +STQLITE_PRIVATE void sqlite3CloseExtensions(sqlite3*); +STQLITE_PRIVATE int sqlite3AutoLoadExtensions(sqlite3*); #else # define sqlite3CloseExtensions(X) -# define sqlite3AutoLoadExtensions(X) SQLITE_OK +# define sqlite3AutoLoadExtensions(X) STQLITE_OK #endif -#ifndef SQLITE_OMIT_SHARED_CACHE -SQLITE_PRIVATE void sqlite3TableLock(Parse *, int, int, u8, const char *); +#ifndef STQLITE_OMIT_SHARED_CACHE +STQLITE_PRIVATE void sqlite3TableLock(Parse *, int, int, u8, const char *); #else #define sqlite3TableLock(v,w,x,y,z) #endif -#ifdef SQLITE_TEST -SQLITE_PRIVATE int sqlite3Utf8To8(unsigned char*); +#ifdef STQLITE_TEST +STQLITE_PRIVATE int sqlite3Utf8To8(unsigned char*); #endif -#ifdef SQLITE_MEMDEBUG -SQLITE_PRIVATE void sqlite3MallocDisallow(void); -SQLITE_PRIVATE void sqlite3MallocAllow(void); -SQLITE_PRIVATE int sqlite3TestMallocFail(void); +#ifdef STQLITE_MEMDEBUG +STQLITE_PRIVATE void sqlite3MallocDisallow(void); +STQLITE_PRIVATE void sqlite3MallocAllow(void); +STQLITE_PRIVATE int sqlite3TestMallocFail(void); #else #define sqlite3TestMallocFail() 0 #define sqlite3MallocDisallow() #define sqlite3MallocAllow() #endif -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT -SQLITE_PRIVATE void *sqlite3ThreadSafeMalloc(int); -SQLITE_PRIVATE void sqlite3ThreadSafeFree(void *); +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT +STQLITE_PRIVATE void *sqlite3ThreadSafeMalloc(int); +STQLITE_PRIVATE void sqlite3ThreadSafeFree(void *); #else #define sqlite3ThreadSafeMalloc sqlite3MallocX #define sqlite3ThreadSafeFree sqlite3FreeX #endif -#ifdef SQLITE_OMIT_VIRTUALTABLE +#ifdef STQLITE_OMIT_VIRTUALTABLE # define sqlite3VtabClear(X) # define sqlite3VtabSync(X,Y) (Y) # define sqlite3VtabRollback(X) # define sqlite3VtabCommit(X) #else -SQLITE_PRIVATE void sqlite3VtabClear(Table*); -SQLITE_PRIVATE int sqlite3VtabSync(sqlite3 *db, int rc); -SQLITE_PRIVATE int sqlite3VtabRollback(sqlite3 *db); -SQLITE_PRIVATE int sqlite3VtabCommit(sqlite3 *db); -#endif -SQLITE_PRIVATE void sqlite3VtabLock(sqlite3_vtab*); -SQLITE_PRIVATE void sqlite3VtabUnlock(sqlite3*, sqlite3_vtab*); -SQLITE_PRIVATE void sqlite3VtabBeginParse(Parse*, Token*, Token*, Token*); -SQLITE_PRIVATE void sqlite3VtabFinishParse(Parse*, Token*); -SQLITE_PRIVATE void sqlite3VtabArgInit(Parse*); -SQLITE_PRIVATE void sqlite3VtabArgExtend(Parse*, Token*); -SQLITE_PRIVATE int sqlite3VtabCallCreate(sqlite3*, int, const char *, char **); -SQLITE_PRIVATE int sqlite3VtabCallConnect(Parse*, Table*); -SQLITE_PRIVATE int sqlite3VtabCallDestroy(sqlite3*, int, const char *); -SQLITE_PRIVATE int sqlite3VtabBegin(sqlite3 *, sqlite3_vtab *); -SQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction(FuncDef*, int nArg, Expr*); -SQLITE_PRIVATE void sqlite3InvalidFunction(sqlite3_context*,int,sqlite3_value**); -SQLITE_PRIVATE int sqlite3Reprepare(Vdbe*); -SQLITE_PRIVATE void sqlite3ExprListCheckLength(Parse*, ExprList*, int, const char*); +STQLITE_PRIVATE void sqlite3VtabClear(Table*); +STQLITE_PRIVATE int sqlite3VtabSync(sqlite3 *db, int rc); +STQLITE_PRIVATE int sqlite3VtabRollback(sqlite3 *db); +STQLITE_PRIVATE int sqlite3VtabCommit(sqlite3 *db); +#endif +STQLITE_PRIVATE void sqlite3VtabLock(sqlite3_vtab*); +STQLITE_PRIVATE void sqlite3VtabUnlock(sqlite3*, sqlite3_vtab*); +STQLITE_PRIVATE void sqlite3VtabBeginParse(Parse*, Token*, Token*, Token*); +STQLITE_PRIVATE void sqlite3VtabFinishParse(Parse*, Token*); +STQLITE_PRIVATE void sqlite3VtabArgInit(Parse*); +STQLITE_PRIVATE void sqlite3VtabArgExtend(Parse*, Token*); +STQLITE_PRIVATE int sqlite3VtabCallCreate(sqlite3*, int, const char *, char **); +STQLITE_PRIVATE int sqlite3VtabCallConnect(Parse*, Table*); +STQLITE_PRIVATE int sqlite3VtabCallDestroy(sqlite3*, int, const char *); +STQLITE_PRIVATE int sqlite3VtabBegin(sqlite3 *, sqlite3_vtab *); +STQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction(FuncDef*, int nArg, Expr*); +STQLITE_PRIVATE void sqlite3InvalidFunction(sqlite3_context*,int,sqlite3_value**); +STQLITE_PRIVATE int sqlite3Reprepare(Vdbe*); +STQLITE_PRIVATE void sqlite3ExprListCheckLength(Parse*, ExprList*, int, const char*); CollSeq* sqlite3BinaryCompareCollSeq(Parse *, Expr *, Expr *); -#if SQLITE_MAX_EXPR_DEPTH>0 -SQLITE_PRIVATE void sqlite3ExprSetHeight(Expr *); -SQLITE_PRIVATE int sqlite3SelectExprHeight(Select *); +#if STQLITE_MAX_EXPR_DEPTH>0 +STQLITE_PRIVATE void sqlite3ExprSetHeight(Expr *); +STQLITE_PRIVATE int sqlite3SelectExprHeight(Select *); #else #define sqlite3ExprSetHeight(x) #endif -SQLITE_PRIVATE u32 sqlite3Get2byte(const u8*); -SQLITE_PRIVATE u32 sqlite3Get4byte(const u8*); -SQLITE_PRIVATE void sqlite3Put2byte(u8*, u32); -SQLITE_PRIVATE void sqlite3Put4byte(u8*, u32); +STQLITE_PRIVATE u32 sqlite3Get2byte(const u8*); +STQLITE_PRIVATE u32 sqlite3Get4byte(const u8*); +STQLITE_PRIVATE void sqlite3Put2byte(u8*, u32); +STQLITE_PRIVATE void sqlite3Put4byte(u8*, u32); -#ifdef SQLITE_SSE +#ifdef STQLITE_SSE #include "sseInt.h" #endif -#ifdef SQLITE_DEBUG -SQLITE_PRIVATE void sqlite3ParserTrace(FILE*, char *); +#ifdef STQLITE_DEBUG +STQLITE_PRIVATE void sqlite3ParserTrace(FILE*, char *); #endif /* -** If the SQLITE_ENABLE IOTRACE exists then the global variable +** If the STQLITE_ENABLE IOTRACE exists then the global variable ** sqlite3_io_trace is a pointer to a printf-like routine used to ** print I/O tracing messages. */ -#ifdef SQLITE_ENABLE_IOTRACE +#ifdef STQLITE_ENABLE_IOTRACE # define IOTRACE(A) if( sqlite3_io_trace ){ sqlite3_io_trace A; } -SQLITE_PRIVATE void sqlite3VdbeIOTraceSql(Vdbe*); +STQLITE_PRIVATE void sqlite3VdbeIOTraceSql(Vdbe*); #else # define IOTRACE(A) # define sqlite3VdbeIOTraceSql(X) @@ -6375,7 +6375,7 @@ extern void (*sqlite3_io_trace)(const char*,...); #include <ctype.h> #include <time.h> -#ifndef SQLITE_OMIT_DATETIME_FUNCS +#ifndef STQLITE_OMIT_DATETIME_FUNCS /* ** A structure for holding a single date and time. @@ -6638,7 +6638,7 @@ static int parseDateOrTime(const char *zDate, DateTime *p){ p->rJD = r; p->validJD = 1; return 0; - }else if( sqlite3IsNumber(zDate, 0, SQLITE_UTF8) ){ + }else if( sqlite3IsNumber(zDate, 0, STQLITE_UTF8) ){ getValue(zDate, &p->rJD); p->validJD = 1; return 0; @@ -6992,7 +6992,7 @@ static int isDate(int argc, sqlite3_value **argv, DateTime *p){ /* ** The following routines implement the various date and time functions -** of SQLite. +** of STQLite. */ /* @@ -7028,7 +7028,7 @@ static void datetimeFunc( computeYMD_HMS(&x); sqlite3_snprintf(sizeof(zBuf), zBuf, "%04d-%02d-%02d %02d:%02d:%02d", x.Y, x.M, x.D, x.h, x.m, (int)(x.s)); - sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT); + sqlite3_result_text(context, zBuf, -1, STQLITE_TRANSIENT); } } @@ -7047,7 +7047,7 @@ static void timeFunc( char zBuf[100]; computeHMS(&x); sqlite3_snprintf(sizeof(zBuf), zBuf, "%02d:%02d:%02d", x.h, x.m, (int)x.s); - sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT); + sqlite3_result_text(context, zBuf, -1, STQLITE_TRANSIENT); } } @@ -7066,7 +7066,7 @@ static void dateFunc( char zBuf[100]; computeYMD(&x); sqlite3_snprintf(sizeof(zBuf), zBuf, "%04d-%02d-%02d", x.Y, x.M, x.D); - sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT); + sqlite3_result_text(context, zBuf, -1, STQLITE_TRANSIENT); } } @@ -7136,7 +7136,7 @@ static void strftimeFunc( } if( n<sizeof(zBuf) ){ z = zBuf; - }else if( n>SQLITE_MAX_LENGTH ){ + }else if( n>STQLITE_MAX_LENGTH ){ sqlite3_result_error_toobig(context); return; }else{ @@ -7201,7 +7201,7 @@ static void strftimeFunc( } } z[j] = 0; - sqlite3_result_text(context, z, -1, SQLITE_TRANSIENT); + sqlite3_result_text(context, z, -1, STQLITE_TRANSIENT); if( z!=zBuf ){ sqliteFree(z); } @@ -7219,7 +7219,7 @@ static void ctimeFunc( ){ sqlite3_value *pVal = sqlite3ValueNew(); if( pVal ){ - sqlite3ValueSetStr(pVal, -1, "now", SQLITE_UTF8, SQLITE_STATIC); + sqlite3ValueSetStr(pVal, -1, "now", STQLITE_UTF8, STQLITE_STATIC); timeFunc(context, 1, &pVal); sqlite3ValueFree(pVal); } @@ -7237,7 +7237,7 @@ static void cdateFunc( ){ sqlite3_value *pVal = sqlite3ValueNew(); if( pVal ){ - sqlite3ValueSetStr(pVal, -1, "now", SQLITE_UTF8, SQLITE_STATIC); + sqlite3ValueSetStr(pVal, -1, "now", STQLITE_UTF8, STQLITE_STATIC); dateFunc(context, 1, &pVal); sqlite3ValueFree(pVal); } @@ -7255,14 +7255,14 @@ static void ctimestampFunc( ){ sqlite3_value *pVal = sqlite3ValueNew(); if( pVal ){ - sqlite3ValueSetStr(pVal, -1, "now", SQLITE_UTF8, SQLITE_STATIC); + sqlite3ValueSetStr(pVal, -1, "now", STQLITE_UTF8, STQLITE_STATIC); datetimeFunc(context, 1, &pVal); sqlite3ValueFree(pVal); } } -#endif /* !defined(SQLITE_OMIT_DATETIME_FUNCS) */ +#endif /* !defined(STQLITE_OMIT_DATETIME_FUNCS) */ -#ifdef SQLITE_OMIT_DATETIME_FUNCS +#ifdef STQLITE_OMIT_DATETIME_FUNCS /* ** If the library is compiled to omit the full-scale date and time ** handling (to get a smaller binary), the following minimal version @@ -7284,7 +7284,7 @@ static void currentTimeFunc( char zBuf[20]; time(&t); -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST { extern int sqlite3_current_time; /* See os_XXX.c */ if( sqlite3_current_time ){ @@ -7309,7 +7309,7 @@ static void currentTimeFunc( } #endif - sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT); + sqlite3_result_text(context, zBuf, -1, STQLITE_TRANSIENT); } #endif @@ -7318,8 +7318,8 @@ static void currentTimeFunc( ** functions. This should be the only routine in this file with ** external linkage. */ -SQLITE_PRIVATE void sqlite3RegisterDateTimeFunctions(sqlite3 *db){ -#ifndef SQLITE_OMIT_DATETIME_FUNCS +STQLITE_PRIVATE void sqlite3RegisterDateTimeFunctions(sqlite3 *db){ +#ifndef STQLITE_OMIT_DATETIME_FUNCS static const struct { char *zName; int nArg; @@ -7338,7 +7338,7 @@ SQLITE_PRIVATE void sqlite3RegisterDateTimeFunctions(sqlite3 *db){ for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){ sqlite3CreateFunc(db, aFuncs[i].zName, aFuncs[i].nArg, - SQLITE_UTF8, 0, aFuncs[i].xFunc, 0, 0); + STQLITE_UTF8, 0, aFuncs[i].xFunc, 0, 0); } #else static const struct { @@ -7352,7 +7352,7 @@ SQLITE_PRIVATE void sqlite3RegisterDateTimeFunctions(sqlite3 *db){ int i; for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){ - sqlite3CreateFunc(db, aFuncs[i].zName, 0, SQLITE_UTF8, + sqlite3CreateFunc(db, aFuncs[i].zName, 0, STQLITE_UTF8, aFuncs[i].zFormat, currentTimeFunc, 0, 0); } #endif @@ -7375,62 +7375,62 @@ SQLITE_PRIVATE void sqlite3RegisterDateTimeFunctions(sqlite3 *db){ ** This file contains OS interface code that is common to all ** architectures. */ -#define _SQLITE_OS_C_ 1 -#undef _SQLITE_OS_C_ +#define _STQLITE_OS_C_ 1 +#undef _STQLITE_OS_C_ /* ** The following routines are convenience wrappers around methods ** of the OsFile object. This is mostly just syntactic sugar. All -** of this would be completely automatic if SQLite were coded using +** of this would be completely automatic if STQLite were coded using ** C++ instead of plain old C. */ -SQLITE_PRIVATE int sqlite3OsClose(OsFile **pId){ +STQLITE_PRIVATE int sqlite3OsClose(OsFile **pId){ OsFile *id; if( pId!=0 && (id = *pId)!=0 ){ return id->pMethod->xClose(pId); }else{ - return SQLITE_OK; + return STQLITE_OK; } } -SQLITE_PRIVATE int sqlite3OsOpenDirectory(OsFile *id, const char *zName){ +STQLITE_PRIVATE int sqlite3OsOpenDirectory(OsFile *id, const char *zName){ return id->pMethod->xOpenDirectory(id, zName); } -SQLITE_PRIVATE int sqlite3OsRead(OsFile *id, void *pBuf, int amt){ +STQLITE_PRIVATE int sqlite3OsRead(OsFile *id, void *pBuf, int amt){ return id->pMethod->xRead(id, pBuf, amt); } -SQLITE_PRIVATE int sqlite3OsWrite(OsFile *id, const void *pBuf, int amt){ +STQLITE_PRIVATE int sqlite3OsWrite(OsFile *id, const void *pBuf, int amt){ return id->pMethod->xWrite(id, pBuf, amt); } -SQLITE_PRIVATE int sqlite3OsSeek(OsFile *id, i64 offset){ +STQLITE_PRIVATE int sqlite3OsSeek(OsFile *id, i64 offset){ return id->pMethod->xSeek(id, offset); } -SQLITE_PRIVATE int sqlite3OsTruncate(OsFile *id, i64 size){ +STQLITE_PRIVATE int sqlite3OsTruncate(OsFile *id, i64 size){ return id->pMethod->xTruncate(id, size); } -SQLITE_PRIVATE int sqlite3OsSync(OsFile *id, int fullsync){ +STQLITE_PRIVATE int sqlite3OsSync(OsFile *id, int fullsync){ return id->pMethod->xSync(id, fullsync); } -SQLITE_PRIVATE void sqlite3OsSetFullSync(OsFile *id, int value){ +STQLITE_PRIVATE void sqlite3OsSetFullSync(OsFile *id, int value){ id->pMethod->xSetFullSync(id, value); } -SQLITE_PRIVATE int sqlite3OsFileSize(OsFile *id, i64 *pSize){ +STQLITE_PRIVATE int sqlite3OsFileSize(OsFile *id, i64 *pSize){ return id->pMethod->xFileSize(id, pSize); } -SQLITE_PRIVATE int sqlite3OsLock(OsFile *id, int lockType){ +STQLITE_PRIVATE int sqlite3OsLock(OsFile *id, int lockType){ return id->pMethod->xLock(id, lockType); } -SQLITE_PRIVATE int sqlite3OsUnlock(OsFile *id, int lockType){ +STQLITE_PRIVATE int sqlite3OsUnlock(OsFile *id, int lockType){ return id->pMethod->xUnlock(id, lockType); } -SQLITE_PRIVATE int sqlite3OsCheckReservedLock(OsFile *id){ +STQLITE_PRIVATE int sqlite3OsCheckReservedLock(OsFile *id){ return id->pMethod->xCheckReservedLock(id); } -SQLITE_PRIVATE int sqlite3OsSectorSize(OsFile *id){ +STQLITE_PRIVATE int sqlite3OsSectorSize(OsFile *id){ int (*xSectorSize)(OsFile*) = id->pMethod->xSectorSize; - return xSectorSize ? xSectorSize(id) : SQLITE_DEFAULT_SECTOR_SIZE; + return xSectorSize ? xSectorSize(id) : STQLITE_DEFAULT_SECTOR_SIZE; } -#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) +#if defined(STQLITE_TEST) || defined(STQLITE_DEBUG) /* These methods are currently only used for testing and debugging. */ int sqlite3OsFileHandle(OsFile *id){ return id->pMethod->xFileHandle(id); @@ -7440,7 +7440,7 @@ SQLITE_PRIVATE int sqlite3OsSectorSize(OsFile *id){ } #endif -#ifdef SQLITE_ENABLE_REDEF_IO +#ifdef STQLITE_ENABLE_REDEF_IO /* ** A function to return a pointer to the virtual function table. ** This routine really does not accomplish very much since the @@ -7510,7 +7510,7 @@ struct sqlite3OsVtbl *sqlite3_os_switch(void){ ** The test wrapper provides extra test facilities to ensure the library ** does not leak memory and handles the failure of the underlying OS level ** allocation system correctly. It is only present if the library is -** compiled with the SQLITE_MEMDEBUG macro set. +** compiled with the STQLITE_MEMDEBUG macro set. ** ** * Guardposts to detect overwrites. ** * Ability to cause a specific Malloc() or Realloc() to fail. @@ -7519,7 +7519,7 @@ struct sqlite3OsVtbl *sqlite3_os_switch(void){ #define MAX(x,y) ((x)>(y)?(x):(y)) -#if defined(SQLITE_ENABLE_MEMORY_MANAGEMENT) && !defined(SQLITE_OMIT_DISKIO) +#if defined(STQLITE_ENABLE_MEMORY_MANAGEMENT) && !defined(STQLITE_OMIT_DISKIO) /* ** Set the soft heap-size limit for the current thread. Passing a negative ** value indicates no limit. @@ -7533,13 +7533,13 @@ void sqlite3_soft_heap_limit(int n){ } /* -** Release memory held by SQLite instances created by the current thread. +** Release memory held by STQLite instances created by the current thread. */ int sqlite3_release_memory(int n){ return sqlite3PagerReleaseMemory(n); } #else -/* If SQLITE_ENABLE_MEMORY_MANAGEMENT is not defined, then define a version +/* If STQLITE_ENABLE_MEMORY_MANAGEMENT is not defined, then define a version ** of sqlite3_release_memory() to be used by other code in this file. ** This is done for no better reason than to reduce the number of ** pre-processor #ifndef statements. @@ -7547,23 +7547,23 @@ int sqlite3_release_memory(int n){ #define sqlite3_release_memory(x) 0 /* 0 == no memory freed */ #endif -#ifdef SQLITE_MEMDEBUG +#ifdef STQLITE_MEMDEBUG /*-------------------------------------------------------------------------- ** Begin code for memory allocation system test layer. ** -** Memory debugging is turned on by defining the SQLITE_MEMDEBUG macro. +** Memory debugging is turned on by defining the STQLITE_MEMDEBUG macro. ** -** SQLITE_MEMDEBUG==1 -> Fence-posting only (thread safe) -** SQLITE_MEMDEBUG==2 -> Fence-posting + linked list of allocations (not ts) -** SQLITE_MEMDEBUG==3 -> Above + backtraces (not thread safe, req. glibc) +** STQLITE_MEMDEBUG==1 -> Fence-posting only (thread safe) +** STQLITE_MEMDEBUG==2 -> Fence-posting + linked list of allocations (not ts) +** STQLITE_MEMDEBUG==3 -> Above + backtraces (not thread safe, req. glibc) */ /* Figure out whether or not to store backtrace() information for each malloc. -** The backtrace() function is only used if SQLITE_MEMDEBUG is set to 2 or +** The backtrace() function is only used if STQLITE_MEMDEBUG is set to 2 or ** greater and glibc is in use. If we don't want to use backtrace(), then just ** define it as an empty macro and set the amount of space reserved to 0. */ -#if defined(__GLIBC__) && SQLITE_MEMDEBUG>2 +#if defined(__GLIBC__) && STQLITE_MEMDEBUG>2 extern int backtrace(void **, int); #define TESTALLOC_STACKSIZE 128 #define TESTALLOC_STACKFRAMES ((TESTALLOC_STACKSIZE-8)/sizeof(void*)) @@ -7664,7 +7664,7 @@ int sqlite3_mallocfail_trace = 0; /* Print a msg on malloc fail if true */ ** Check for a simulated memory allocation failure. Return true if ** the failure should be simulated. Return false to proceed as normal. */ -SQLITE_PRIVATE int sqlite3TestMallocFail(){ +STQLITE_PRIVATE int sqlite3TestMallocFail(){ if( sqlite3_isFail ){ return 1; } @@ -7769,7 +7769,7 @@ static void *getOsPointer(void *p) } -#if SQLITE_MEMDEBUG>1 +#if STQLITE_MEMDEBUG>1 /* ** The argument points to an Os level allocation. Link it into the threads list ** of allocations. @@ -7849,8 +7849,8 @@ static void relinkAlloc(void *p) ** Todo: We could have a version of this function that outputs to stdout, ** to debug memory leaks when Tcl is not available. */ -#if defined(TCLSH) && defined(SQLITE_DEBUG) && SQLITE_MEMDEBUG>1 -SQLITE_PRIVATE int sqlite3OutstandingMallocs(Tcl_Interp *interp){ +#if defined(TCLSH) && defined(STQLITE_DEBUG) && STQLITE_MEMDEBUG>1 +STQLITE_PRIVATE int sqlite3OutstandingMallocs(Tcl_Interp *interp){ void *p; Tcl_Obj *pRes = Tcl_NewObj(); Tcl_IncrRefCount(pRes); @@ -7900,7 +7900,7 @@ SQLITE_PRIVATE int sqlite3OutstandingMallocs(Tcl_Interp *interp){ */ static void * OSMALLOC(int n){ sqlite3OsEnterMutex(); -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT sqlite3_nMaxAlloc = MAX(sqlite3_nMaxAlloc, sqlite3ThreadDataReadOnly()->nAlloc); #endif @@ -7947,7 +7947,7 @@ static void OSFREE(void *pFree){ ** This is the test layer's wrapper around sqlite3OsRealloc(). */ static void * OSREALLOC(void *pRealloc, int n){ -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT sqlite3_nMaxAlloc = MAX(sqlite3_nMaxAlloc, sqlite3ThreadDataReadOnly()->nAlloc); #endif @@ -7969,7 +7969,7 @@ static void OSMALLOC_FAILED(){ #else /* Define macros to call the sqlite3OsXXX interface directly if -** the SQLITE_MEMDEBUG macro is not defined. +** the STQLITE_MEMDEBUG macro is not defined. */ #define OSMALLOC(x) sqlite3OsMalloc(x) #define OSREALLOC(x,y) sqlite3OsRealloc(x,y) @@ -7977,7 +7977,7 @@ static void OSMALLOC_FAILED(){ #define OSSIZEOF(x) sqlite3OsAllocationSize(x) #define OSMALLOC_FAILED() -#endif /* SQLITE_MEMDEBUG */ +#endif /* STQLITE_MEMDEBUG */ /* ** End code for memory allocation system test layer. **--------------------------------------------------------------------------*/ @@ -7993,10 +7993,10 @@ static void OSMALLOC_FAILED(){ ** false. The updateMemoryUsedCount() routine below will deallocate ** the TSD if it ought to be. ** -** If SQLITE_ENABLE_MEMORY_MANAGEMENT is not defined, this routine is +** If STQLITE_ENABLE_MEMORY_MANAGEMENT is not defined, this routine is ** a no-op */ -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT static int enforceSoftLimit(int n){ ThreadData *pTsd = sqlite3ThreadData(); if( pTsd==0 ){ @@ -8017,10 +8017,10 @@ static int enforceSoftLimit(int n){ ** thread-specific-data (TSD). If after this update the TSD is ** no longer being used, then deallocate it. ** -** If SQLITE_ENABLE_MEMORY_MANAGEMENT is not defined, this routine is +** If STQLITE_ENABLE_MEMORY_MANAGEMENT is not defined, this routine is ** a no-op */ -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT static void updateMemoryUsedCount(int n){ ThreadData *pTsd = sqlite3ThreadData(); if( pTsd ){ @@ -8040,7 +8040,7 @@ static void updateMemoryUsedCount(int n){ ** sqlite3OsMalloc(). If the Malloc() call fails, attempt to free memory ** by calling sqlite3_release_memory(). */ -SQLITE_PRIVATE void *sqlite3MallocRaw(int n, int doMemManage){ +STQLITE_PRIVATE void *sqlite3MallocRaw(int n, int doMemManage){ void *p = 0; if( n>0 && !sqlite3MallocFailed() && (!doMemManage || enforceSoftLimit(n)) ){ while( (p = OSMALLOC(n))==0 && sqlite3_release_memory(n) ){} @@ -8059,7 +8059,7 @@ SQLITE_PRIVATE void *sqlite3MallocRaw(int n, int doMemManage){ ** pointer to the new allocation is returned. If the Realloc() call fails, ** attempt to free memory by calling sqlite3_release_memory(). */ -SQLITE_PRIVATE void *sqlite3Realloc(void *p, int n){ +STQLITE_PRIVATE void *sqlite3Realloc(void *p, int n){ if( sqlite3MallocFailed() ){ return 0; } @@ -8068,7 +8068,7 @@ SQLITE_PRIVATE void *sqlite3Realloc(void *p, int n){ return sqlite3Malloc(n, 1); }else{ void *np = 0; -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT int origSize = OSSIZEOF(p); #endif if( enforceSoftLimit(n - origSize) ){ @@ -8088,7 +8088,7 @@ SQLITE_PRIVATE void *sqlite3Realloc(void *p, int n){ ** Free the memory pointed to by p. p must be either a NULL pointer or a ** value returned by a previous call to sqlite3Malloc() or sqlite3Realloc(). */ -SQLITE_PRIVATE void sqlite3FreeX(void *p){ +STQLITE_PRIVATE void sqlite3FreeX(void *p){ if( p ){ updateMemoryUsedCount(0 - OSSIZEOF(p)); OSFREE(p); @@ -8099,7 +8099,7 @@ SQLITE_PRIVATE void sqlite3FreeX(void *p){ ** A version of sqliteMalloc() that is always a function, not a macro. ** Currently, this is used only to alloc to allocate the parser engine. */ -SQLITE_PRIVATE void *sqlite3MallocX(int n){ +STQLITE_PRIVATE void *sqlite3MallocX(int n){ return sqliteMalloc(n); } @@ -8110,14 +8110,14 @@ SQLITE_PRIVATE void *sqlite3MallocX(int n){ ** These two are implemented as wrappers around sqlite3MallocRaw(), ** sqlite3Realloc() and sqlite3Free(). */ -SQLITE_PRIVATE void *sqlite3Malloc(int n, int doMemManage){ +STQLITE_PRIVATE void *sqlite3Malloc(int n, int doMemManage){ void *p = sqlite3MallocRaw(n, doMemManage); if( p ){ memset(p, 0, n); } return p; } -SQLITE_PRIVATE void *sqlite3ReallocOrFree(void *p, int n){ +STQLITE_PRIVATE void *sqlite3ReallocOrFree(void *p, int n){ void *pNew; pNew = sqlite3Realloc(p, n); if( !pNew ){ @@ -8139,12 +8139,12 @@ SQLITE_PRIVATE void *sqlite3ReallocOrFree(void *p, int n){ ** not sqlite3Free(). Calling sqlite3Free() on memory obtained from ** ThreadSafeMalloc() will cause an error somewhere down the line. */ -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT -SQLITE_PRIVATE void *sqlite3ThreadSafeMalloc(int n){ +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT +STQLITE_PRIVATE void *sqlite3ThreadSafeMalloc(int n){ (void)ENTER_MALLOC; return sqlite3Malloc(n, 0); } -SQLITE_PRIVATE void sqlite3ThreadSafeFree(void *p){ +STQLITE_PRIVATE void sqlite3ThreadSafeFree(void *p){ (void)ENTER_MALLOC; if( p ){ OSFREE(p); @@ -8160,11 +8160,11 @@ SQLITE_PRIVATE void sqlite3ThreadSafeFree(void *p){ ** ** The number of bytes allocated does not include any overhead inserted by ** any malloc() wrapper functions that may be called. So the value returned -** is the number of bytes that were available to SQLite using pointer p, +** is the number of bytes that were available to STQLite using pointer p, ** regardless of how much memory was actually allocated. */ -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT -SQLITE_PRIVATE int sqlite3AllocSize(void *p){ +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT +STQLITE_PRIVATE int sqlite3AllocSize(void *p){ return OSSIZEOF(p); } #endif @@ -8176,7 +8176,7 @@ SQLITE_PRIVATE int sqlite3AllocSize(void *p){ ** called via macros that record the current file and line number in the ** ThreadData structure. */ -SQLITE_PRIVATE char *sqlite3StrDup(const char *z){ +STQLITE_PRIVATE char *sqlite3StrDup(const char *z){ char *zNew; int n; if( z==0 ) return 0; @@ -8185,7 +8185,7 @@ SQLITE_PRIVATE char *sqlite3StrDup(const char *z){ if( zNew ) memcpy(zNew, z, n); return zNew; } -SQLITE_PRIVATE char *sqlite3StrNDup(const char *z, int n){ +STQLITE_PRIVATE char *sqlite3StrNDup(const char *z, int n){ char *zNew; if( z==0 ) return 0; zNew = sqlite3MallocRaw(n+1, 1); @@ -8203,7 +8203,7 @@ SQLITE_PRIVATE char *sqlite3StrNDup(const char *z, int n){ ** point to that string. The 1st argument must either be NULL or ** point to memory obtained from sqliteMalloc(). */ -SQLITE_PRIVATE void sqlite3SetString(char **pz, ...){ +STQLITE_PRIVATE void sqlite3SetString(char **pz, ...){ va_list ap; int nByte; const char *z; @@ -8240,19 +8240,19 @@ SQLITE_PRIVATE void sqlite3SetString(char **pz, ...){ ** ** The returned value is normally a copy of the second argument to this ** function. However, if a malloc() failure has occured since the previous -** invocation SQLITE_NOMEM is returned instead. +** invocation STQLITE_NOMEM is returned instead. ** ** If the first argument, db, is not NULL and a malloc() error has occured, ** then the connection error-code (the value returned by sqlite3_errcode()) -** is set to SQLITE_NOMEM. +** is set to STQLITE_NOMEM. */ int sqlite3_mallocHasFailed = 0; -SQLITE_PRIVATE int sqlite3ApiExit(sqlite3* db, int rc){ +STQLITE_PRIVATE int sqlite3ApiExit(sqlite3* db, int rc){ if( sqlite3MallocFailed() ){ sqlite3_mallocHasFailed = 0; sqlite3OsLeaveMutex(); - sqlite3Error(db, SQLITE_NOMEM, 0); - rc = SQLITE_NOMEM; + sqlite3Error(db, STQLITE_NOMEM, 0); + rc = STQLITE_NOMEM; } return rc & (db ? db->errMask : 0xff); } @@ -8260,7 +8260,7 @@ SQLITE_PRIVATE int sqlite3ApiExit(sqlite3* db, int rc){ /* ** Set the "malloc has failed" condition to true for this thread. */ -SQLITE_PRIVATE void sqlite3FailedMalloc(){ +STQLITE_PRIVATE void sqlite3FailedMalloc(){ if( !sqlite3MallocFailed() ){ sqlite3OsEnterMutex(); assert( sqlite3_mallocHasFailed==0 ); @@ -8268,12 +8268,12 @@ SQLITE_PRIVATE void sqlite3FailedMalloc(){ } } -#ifdef SQLITE_MEMDEBUG +#ifdef STQLITE_MEMDEBUG /* ** This function sets a flag in the thread-specific-data structure that will ** cause an assert to fail if sqliteMalloc() or sqliteRealloc() is called. */ -SQLITE_PRIVATE void sqlite3MallocDisallow(){ +STQLITE_PRIVATE void sqlite3MallocDisallow(){ assert( sqlite3_mallocDisallowed>=0 ); sqlite3_mallocDisallowed++; } @@ -8282,7 +8282,7 @@ SQLITE_PRIVATE void sqlite3MallocDisallow(){ ** This function clears the flag set in the thread-specific-data structure set ** by sqlite3MallocDisallow(). */ -SQLITE_PRIVATE void sqlite3MallocAllow(){ +STQLITE_PRIVATE void sqlite3MallocAllow(){ assert( sqlite3_mallocDisallowed>0 ); sqlite3_mallocDisallowed--; } @@ -8359,13 +8359,13 @@ SQLITE_PRIVATE void sqlite3MallocAllow(){ #define etCHARX 9 /* Characters. %c */ /* The rest are extensions, not normally found in printf() */ #define etCHARLIT 10 /* Literal characters. %' */ -#define etSQLESCAPE 11 /* Strings with '\'' doubled. %q */ -#define etSQLESCAPE2 12 /* Strings with '\'' doubled and enclosed in '', +#define etSTQLESCAPE 11 /* Strings with '\'' doubled. %q */ +#define etSTQLESCAPE2 12 /* Strings with '\'' doubled and enclosed in '', NULL pointers replaced by SQL NULL. %Q */ #define etTOKEN 13 /* a pointer to a Token structure */ #define etSRCLIST 14 /* a pointer to a SrcList */ #define etPOINTER 15 /* The %p conversion */ -#define etSQLESCAPE3 16 /* %w -> Strings with '\"' doubled */ +#define etSTQLESCAPE3 16 /* %w -> Strings with '\"' doubled */ /* @@ -8405,15 +8405,15 @@ static const et_info fmtinfo[] = { { 's', 0, 4, etSTRING, 0, 0 }, { 'g', 0, 1, etGENERIC, 30, 0 }, { 'z', 0, 6, etDYNSTRING, 0, 0 }, - { 'q', 0, 4, etSQLESCAPE, 0, 0 }, - { 'Q', 0, 4, etSQLESCAPE2, 0, 0 }, - { 'w', 0, 4, etSQLESCAPE3, 0, 0 }, + { 'q', 0, 4, etSTQLESCAPE, 0, 0 }, + { 'Q', 0, 4, etSTQLESCAPE2, 0, 0 }, + { 'w', 0, 4, etSTQLESCAPE3, 0, 0 }, { 'c', 0, 0, etCHARX, 0, 0 }, { 'o', 8, 0, etRADIX, 0, 2 }, { 'u', 10, 0, etRADIX, 0, 0 }, { 'x', 16, 0, etRADIX, 16, 1 }, { 'X', 16, 0, etRADIX, 0, 4 }, -#ifndef SQLITE_OMIT_FLOATING_POINT +#ifndef STQLITE_OMIT_FLOATING_POINT { 'f', 0, 1, etFLOAT, 0, 0 }, { 'e', 0, 1, etEXP, 30, 0 }, { 'E', 0, 1, etEXP, 14, 0 }, @@ -8429,10 +8429,10 @@ static const et_info fmtinfo[] = { #define etNINFO (sizeof(fmtinfo)/sizeof(fmtinfo[0])) /* -** If SQLITE_OMIT_FLOATING_POINT is defined, then none of the floating point +** If STQLITE_OMIT_FLOATING_POINT is defined, then none of the floating point ** conversions will work. */ -#ifndef SQLITE_OMIT_FLOATING_POINT +#ifndef STQLITE_OMIT_FLOATING_POINT /* ** "*val" is a double such that 0.1 <= *val < 10.0 ** Return the ascii code for the leading digit of *val, then @@ -8456,17 +8456,17 @@ static int et_getdigit(LONGDOUBLE_TYPE *val, int *cnt){ *val = (*val - d)*10.0; return digit; } -#endif /* SQLITE_OMIT_FLOATING_POINT */ +#endif /* STQLITE_OMIT_FLOATING_POINT */ /* ** On machines with a small stack size, you can redefine the -** SQLITE_PRINT_BUF_SIZE to be less than 350. But beware - for +** STQLITE_PRINT_BUF_SIZE to be less than 350. But beware - for ** smaller values some %f conversions may go into an infinite loop. */ -#ifndef SQLITE_PRINT_BUF_SIZE -# define SQLITE_PRINT_BUF_SIZE 350 +#ifndef STQLITE_PRINT_BUF_SIZE +# define STQLITE_PRINT_BUF_SIZE 350 #endif -#define etBUFSIZE SQLITE_PRINT_BUF_SIZE /* Size of the output buffer */ +#define etBUFSIZE STQLITE_PRINT_BUF_SIZE /* Size of the output buffer */ /* ** The root program. All variations call this core. @@ -8529,7 +8529,7 @@ static int vxprintf( static const char spaces[] = " "; #define etSPACESIZE (sizeof(spaces)-1) -#ifndef SQLITE_OMIT_FLOATING_POINT +#ifndef STQLITE_OMIT_FLOATING_POINT int exp, e2; /* exponent of real numbers */ double rounder; /* Used for rounding floating point values */ etByte flag_dp; /* True if decimal point should be shown */ @@ -8725,7 +8725,7 @@ static int vxprintf( case etEXP: case etGENERIC: realvalue = va_arg(ap,double); -#ifndef SQLITE_OMIT_FLOATING_POINT +#ifndef STQLITE_OMIT_FLOATING_POINT if( precision<0 ) precision = 6; /* Set default precision */ if( precision>etBUFSIZE/2-10 ) precision = etBUFSIZE/2-10; if( realvalue<0.0 ){ @@ -8903,19 +8903,19 @@ static int vxprintf( length = strlen(bufpt); if( precision>=0 && precision<length ) length = precision; break; - case etSQLESCAPE: - case etSQLESCAPE2: - case etSQLESCAPE3: { + case etSTQLESCAPE: + case etSTQLESCAPE2: + case etSTQLESCAPE3: { int i, j, n, ch, isnull; int needQuote; - char q = ((xtype==etSQLESCAPE3)?'"':'\''); /* Quote character */ + char q = ((xtype==etSTQLESCAPE3)?'"':'\''); /* Quote character */ char *escarg = va_arg(ap,char*); isnull = escarg==0; - if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)"); + if( isnull ) escarg = (xtype==etSTQLESCAPE2 ? "NULL" : "(NULL)"); for(i=n=0; (ch=escarg[i])!=0; i++){ if( ch==q ) n++; } - needQuote = !isnull && xtype==etSQLESCAPE2; + needQuote = !isnull && xtype==etSTQLESCAPE2; n += i + 1 + needQuote*2; if( n>etBUFSIZE ){ bufpt = zExtra = sqliteMalloc( n ); @@ -9096,8 +9096,8 @@ static void *printf_realloc(void *old, int size){ ** Print into memory obtained from sqliteMalloc(). Use the internal ** %-conversion extensions. */ -SQLITE_PRIVATE char *sqlite3VMPrintf(const char *zFormat, va_list ap){ - char zBase[SQLITE_PRINT_BUF_SIZE]; +STQLITE_PRIVATE char *sqlite3VMPrintf(const char *zFormat, va_list ap){ + char zBase[STQLITE_PRINT_BUF_SIZE]; return base_vprintf(printf_realloc, 1, zBase, sizeof(zBase), zFormat, ap); } @@ -9105,10 +9105,10 @@ SQLITE_PRIVATE char *sqlite3VMPrintf(const char *zFormat, va_list ap){ ** Print into memory obtained from sqliteMalloc(). Use the internal ** %-conversion extensions. */ -SQLITE_PRIVATE char *sqlite3MPrintf(const char *zFormat, ...){ +STQLITE_PRIVATE char *sqlite3MPrintf(const char *zFormat, ...){ va_list ap; char *z; - char zBase[SQLITE_PRINT_BUF_SIZE]; + char zBase[STQLITE_PRINT_BUF_SIZE]; va_start(ap, zFormat); z = base_vprintf(printf_realloc, 1, zBase, sizeof(zBase), zFormat, ap); va_end(ap); @@ -9119,8 +9119,8 @@ SQLITE_PRIVATE char *sqlite3MPrintf(const char *zFormat, ...){ ** Print into memory obtained from sqlite3_malloc(). Omit the internal ** %-conversion extensions. */ -SQLITE_API char *sqlite3_vmprintf(const char *zFormat, va_list ap){ - char zBase[SQLITE_PRINT_BUF_SIZE]; +STQLITE_API char *sqlite3_vmprintf(const char *zFormat, va_list ap){ + char zBase[STQLITE_PRINT_BUF_SIZE]; return base_vprintf(sqlite3_realloc, 0, zBase, sizeof(zBase), zFormat, ap); } @@ -9128,7 +9128,7 @@ SQLITE_API char *sqlite3_vmprintf(const char *zFormat, va_list ap){ ** Print into memory obtained from sqlite3_malloc()(). Omit the internal ** %-conversion extensions. */ -SQLITE_API char *sqlite3_mprintf(const char *zFormat, ...){ +STQLITE_API char *sqlite3_mprintf(const char *zFormat, ...){ va_list ap; char *z; va_start(ap, zFormat); @@ -9139,11 +9139,11 @@ SQLITE_API char *sqlite3_mprintf(const char *zFormat, ...){ /* ** sqlite3_snprintf() works like snprintf() except that it ignores the -** current locale settings. This is important for SQLite because we +** current locale settings. This is important for STQLite because we ** are not able to use a "," as the decimal point in place of "." as ** specified by some locales. */ -SQLITE_API char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){ +STQLITE_API char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){ char *z; va_list ap; @@ -9157,13 +9157,13 @@ SQLITE_API char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){ return z; } -#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) || defined(SQLITE_MEMDEBUG) +#if defined(STQLITE_TEST) || defined(STQLITE_DEBUG) || defined(STQLITE_MEMDEBUG) /* ** A version of printf() that understands %lld. Used for debugging. ** The printf() built into some versions of windows does not understand %lld ** and segfaults if you give it a long long int. */ -SQLITE_PRIVATE void sqlite3DebugPrintf(const char *zFormat, ...){ +STQLITE_PRIVATE void sqlite3DebugPrintf(const char *zFormat, ...){ extern int getpid(void); va_list ap; char zBuf[500]; @@ -9189,7 +9189,7 @@ SQLITE_PRIVATE void sqlite3DebugPrintf(const char *zFormat, ...){ ** ************************************************************************* ** This file contains code to implement a pseudo-random number -** generator (PRNG) for SQLite. +** generator (PRNG) for STQLite. ** ** Random numbers are used by some of the database backends in order ** to generate random integer keys for tables or random filenames. @@ -9208,7 +9208,7 @@ SQLITE_PRIVATE void sqlite3DebugPrintf(const char *zFormat, ...){ ** well be good enough. But maybe not. Or maybe lrand48() has some ** subtle problems on some systems that could cause problems. It is hard ** to know. To minimize the risk of problems due to bad lrand48() -** implementations, SQLite uses this random number generator based +** implementations, STQLite uses this random number generator based ** on RC4, which we know works very well. ** ** (Later): Actually, OP_NewRowid does not depend on a good source of @@ -9231,7 +9231,7 @@ static int randomByte(void){ ** not need to contain a lot of randomness since we are not ** trying to do secure encryption or anything like that... ** - ** Nothing in this file or anywhere else in SQLite does any kind of + ** Nothing in this file or anywhere else in STQLite does any kind of ** encryption. The RC4 algorithm is being used as a PRNG (pseudo-random ** number generator) not as an encryption device. */ @@ -9267,7 +9267,7 @@ static int randomByte(void){ /* ** Return N random bytes. */ -SQLITE_PRIVATE void sqlite3Randomness(int N, void *pBuf){ +STQLITE_PRIVATE void sqlite3Randomness(int N, void *pBuf){ unsigned char *zBuf = pBuf; sqlite3OsEnterMutex(); while( N-- ){ @@ -9403,7 +9403,7 @@ struct Cursor { u8 *pIncrKey; /* Pointer to pKeyInfo->incrKey */ KeyInfo *pKeyInfo; /* Info about index keys needed by index cursors */ int nField; /* Number of fields in the header */ - i64 seqCount; /* Sequence counter */ + i64 setqCount; /* Sequence counter */ sqlite3_vtab_cursor *pVtabCursor; /* The cursor for a virtual table */ const sqlite3_module *pModule; /* Module for cursor pVtabCursor */ @@ -9412,7 +9412,7 @@ struct Cursor { ** aRow might point to (ephemeral) data for the current row, or it might ** be NULL. */ - int cacheStatus; /* Cache is valid if this matches Vdbe.cacheCtr */ + int cachetqStatus; /* Cache is valid if this matches Vdbe.cacheCtr */ int payloadSize; /* Total number of bytes in the record */ u32 *aType; /* Type values for all entries in the record */ u32 *aOffset; /* Cached offsets to the start of each columns data */ @@ -9440,8 +9440,8 @@ typedef struct Cursor Cursor; ** ** Each value has a manifest type. The manifest type of the value stored ** in a Mem struct is returned by the MemType(Mem*) macro. The type is -** one of SQLITE_NULL, SQLITE_INTEGER, SQLITE_REAL, SQLITE_TEXT or -** SQLITE_BLOB. +** one of STQLITE_NULL, STQLITE_INTEGER, STQLITE_REAL, STQLITE_TEXT or +** STQLITE_BLOB. */ struct Mem { union { @@ -9452,8 +9452,8 @@ struct Mem { char *z; /* String or BLOB value */ int n; /* Number of characters in string value, including '\0' */ u16 flags; /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */ - u8 type; /* One of SQLITE_NULL, SQLITE_TEXT, SQLITE_INTEGER, etc */ - u8 enc; /* SQLITE_UTF8, SQLITE_UTF16BE, SQLITE_UTF16LE */ + u8 type; /* One of STQLITE_NULL, STQLITE_TEXT, STQLITE_INTEGER, etc */ + u8 enc; /* STQLITE_UTF8, STQLITE_UTF16BE, STQLITE_UTF16LE */ void (*xDel)(void *); /* If not null, call this function to delete Mem.z */ char zShort[NBFS]; /* Space for short strings */ }; @@ -9466,7 +9466,7 @@ typedef struct Mem Mem; ** No other flags may be set in this case. ** ** If the MEM_Str flag is set then Mem.z points at a string representation. -** Usually this is encoded in the same unicode encoding as the main +** Usually this is encoded in the same tqunicode encoding as the main ** database (see below for exceptions). If the MEM_Term flag is also ** set, then the string is nul terminated. The MEM_Int and MEM_Real ** flags may coexist with the MEM_Str flag. @@ -9493,13 +9493,13 @@ typedef struct Mem Mem; #define MEM_Agg 0x0400 /* Mem.z points to an agg function context */ #define MEM_Zero 0x0800 /* Mem.i contains count of 0s appended to blob */ -#ifdef SQLITE_OMIT_INCRBLOB +#ifdef STQLITE_OMIT_INCRBLOB #undef MEM_Zero #define MEM_Zero 0x0000 #endif -/* A VdbeFunc is just a FuncDef (defined in sqliteInt.h) that contains +/* A VdbeFunc is just a FuncDef (defined in sqliteInt.h) that tqcontains ** additional information about auxiliary information bound to arguments ** of the function. This is used to implement the sqlite3_get_auxdata() ** and sqlite3_set_auxdata() APIs. The "auxdata" is some auxiliary data @@ -9524,7 +9524,7 @@ typedef struct VdbeFunc VdbeFunc; ** implement the SQL functions. ** ** There is a typedef for this structure in sqlite.h. So all routines, -** even the public interface to SQLite, can use a pointer to this structure. +** even the public interface to STQLite, can use a pointer to this structure. ** But this file is the only place where the internal details of this ** structure are known. ** @@ -9606,7 +9606,7 @@ struct Context { ** set to 2 for xDestroy method calls and 1 for all other methods. This ** variable is used for two purposes: to allow xDestroy methods to execute ** "DROP TABLE" statements and to prevent some nasty side effects of -** malloc failure when SQLite is invoked recursively by a virtual table +** malloc failure when STQLite is invoked recursively by a virtual table ** method function. */ struct Vdbe { @@ -9659,11 +9659,11 @@ struct Vdbe { i64 startTime; /* Time when query started - used for profiling */ int nSql; /* Number of bytes in zSql */ char *zSql; /* Text of the SQL statement that generated this */ -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG FILE *trace; /* Write an execution trace here, if not NULL */ #endif int openedStatement; /* True if this VM has opened a statement journal */ -#ifdef SQLITE_SSE +#ifdef STQLITE_SSE int fetchId; /* Statement number used by sqlite3_fetch_statement */ int lru; /* Counter used for LRU cache replacement */ #endif @@ -9680,69 +9680,69 @@ struct Vdbe { /* ** Function prototypes */ -SQLITE_PRIVATE void sqlite3VdbeFreeCursor(Vdbe *, Cursor*); +STQLITE_PRIVATE void sqlite3VdbeFreeCursor(Vdbe *, Cursor*); void sqliteVdbePopStack(Vdbe*,int); -SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(Cursor*); -#if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE) -SQLITE_PRIVATE void sqlite3VdbePrintOp(FILE*, int, Op*); +STQLITE_PRIVATE int sqlite3VdbeCursorMoveto(Cursor*); +#if defined(STQLITE_DEBUG) || defined(VDBE_PROFILE) +STQLITE_PRIVATE void sqlite3VdbePrintOp(FILE*, int, Op*); #endif -SQLITE_PRIVATE int sqlite3VdbeSerialTypeLen(u32); -SQLITE_PRIVATE u32 sqlite3VdbeSerialType(Mem*, int); -SQLITE_PRIVATE int sqlite3VdbeSerialPut(unsigned char*, int, Mem*, int); -SQLITE_PRIVATE int sqlite3VdbeSerialGet(const unsigned char*, u32, Mem*); -SQLITE_PRIVATE void sqlite3VdbeDeleteAuxData(VdbeFunc*, int); +STQLITE_PRIVATE int sqlite3VdbeSerialTypeLen(u32); +STQLITE_PRIVATE u32 sqlite3VdbeSerialType(Mem*, int); +STQLITE_PRIVATE int sqlite3VdbeSerialPut(unsigned char*, int, Mem*, int); +STQLITE_PRIVATE int sqlite3VdbeSerialGet(const unsigned char*, u32, Mem*); +STQLITE_PRIVATE void sqlite3VdbeDeleteAuxData(VdbeFunc*, int); int sqlite2BtreeKeyCompare(BtCursor *, const void *, int, int, int *); -SQLITE_PRIVATE int sqlite3VdbeIdxKeyCompare(Cursor*, int , const unsigned char*, int*); -SQLITE_PRIVATE int sqlite3VdbeIdxRowid(BtCursor *, i64 *); -SQLITE_PRIVATE int sqlite3MemCompare(const Mem*, const Mem*, const CollSeq*); -SQLITE_PRIVATE int sqlite3VdbeRecordCompare(void*,int,const void*,int, const void*); -SQLITE_PRIVATE int sqlite3VdbeIdxRowidLen(const u8*); -SQLITE_PRIVATE int sqlite3VdbeExec(Vdbe*); -SQLITE_PRIVATE int sqlite3VdbeList(Vdbe*); -SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe*); -SQLITE_PRIVATE int sqlite3VdbeChangeEncoding(Mem *, int); -SQLITE_PRIVATE int sqlite3VdbeMemTooBig(Mem*); -SQLITE_PRIVATE int sqlite3VdbeMemCopy(Mem*, const Mem*); -SQLITE_PRIVATE void sqlite3VdbeMemShallowCopy(Mem*, const Mem*, int); -SQLITE_PRIVATE int sqlite3VdbeMemMove(Mem*, Mem*); -SQLITE_PRIVATE int sqlite3VdbeMemNulTerminate(Mem*); -SQLITE_PRIVATE int sqlite3VdbeMemSetStr(Mem*, const char*, int, u8, void(*)(void*)); -SQLITE_PRIVATE void sqlite3VdbeMemSetInt64(Mem*, i64); -SQLITE_PRIVATE void sqlite3VdbeMemSetDouble(Mem*, double); -SQLITE_PRIVATE void sqlite3VdbeMemSetNull(Mem*); -SQLITE_PRIVATE void sqlite3VdbeMemSetZeroBlob(Mem*,int); -SQLITE_PRIVATE int sqlite3VdbeMemMakeWriteable(Mem*); -SQLITE_PRIVATE int sqlite3VdbeMemDynamicify(Mem*); -SQLITE_PRIVATE int sqlite3VdbeMemStringify(Mem*, int); -SQLITE_PRIVATE i64 sqlite3VdbeIntValue(Mem*); -SQLITE_PRIVATE int sqlite3VdbeMemIntegerify(Mem*); -SQLITE_PRIVATE double sqlite3VdbeRealValue(Mem*); -SQLITE_PRIVATE void sqlite3VdbeIntegerAffinity(Mem*); -SQLITE_PRIVATE int sqlite3VdbeMemRealify(Mem*); -SQLITE_PRIVATE int sqlite3VdbeMemNumerify(Mem*); -SQLITE_PRIVATE int sqlite3VdbeMemFromBtree(BtCursor*,int,int,int,Mem*); -SQLITE_PRIVATE void sqlite3VdbeMemRelease(Mem *p); -SQLITE_PRIVATE int sqlite3VdbeMemFinalize(Mem*, FuncDef*); +STQLITE_PRIVATE int sqlite3VdbeIdxKeyCompare(Cursor*, int , const unsigned char*, int*); +STQLITE_PRIVATE int sqlite3VdbeIdxRowid(BtCursor *, i64 *); +STQLITE_PRIVATE int sqlite3MemCompare(const Mem*, const Mem*, const CollSeq*); +STQLITE_PRIVATE int sqlite3VdbeRecordCompare(void*,int,const void*,int, const void*); +STQLITE_PRIVATE int sqlite3VdbeIdxRowidLen(const u8*); +STQLITE_PRIVATE int sqlite3VdbeExec(Vdbe*); +STQLITE_PRIVATE int sqlite3VdbeList(Vdbe*); +STQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe*); +STQLITE_PRIVATE int sqlite3VdbeChangeEncoding(Mem *, int); +STQLITE_PRIVATE int sqlite3VdbeMemTooBig(Mem*); +STQLITE_PRIVATE int sqlite3VdbeMemCopy(Mem*, const Mem*); +STQLITE_PRIVATE void sqlite3VdbeMemShallowCopy(Mem*, const Mem*, int); +STQLITE_PRIVATE int sqlite3VdbeMemMove(Mem*, Mem*); +STQLITE_PRIVATE int sqlite3VdbeMemNulTerminate(Mem*); +STQLITE_PRIVATE int sqlite3VdbeMemSetStr(Mem*, const char*, int, u8, void(*)(void*)); +STQLITE_PRIVATE void sqlite3VdbeMemSetInt64(Mem*, i64); +STQLITE_PRIVATE void sqlite3VdbeMemSetDouble(Mem*, double); +STQLITE_PRIVATE void sqlite3VdbeMemSetNull(Mem*); +STQLITE_PRIVATE void sqlite3VdbeMemSetZeroBlob(Mem*,int); +STQLITE_PRIVATE int sqlite3VdbeMemMakeWriteable(Mem*); +STQLITE_PRIVATE int sqlite3VdbeMemDynamicify(Mem*); +STQLITE_PRIVATE int sqlite3VdbeMemStringify(Mem*, int); +STQLITE_PRIVATE i64 sqlite3VdbeIntValue(Mem*); +STQLITE_PRIVATE int sqlite3VdbeMemIntegerify(Mem*); +STQLITE_PRIVATE double sqlite3VdbeRealValue(Mem*); +STQLITE_PRIVATE void sqlite3VdbeIntegerAffinity(Mem*); +STQLITE_PRIVATE int sqlite3VdbeMemRealify(Mem*); +STQLITE_PRIVATE int sqlite3VdbeMemNumerify(Mem*); +STQLITE_PRIVATE int sqlite3VdbeMemFromBtree(BtCursor*,int,int,int,Mem*); +STQLITE_PRIVATE void sqlite3VdbeMemRelease(Mem *p); +STQLITE_PRIVATE int sqlite3VdbeMemFinalize(Mem*, FuncDef*); #ifndef NDEBUG -SQLITE_PRIVATE void sqlite3VdbeMemSanity(Mem*); -SQLITE_PRIVATE int sqlite3VdbeOpcodeNoPush(u8); -#endif -SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem*, u8); -#ifdef SQLITE_DEBUG -SQLITE_PRIVATE void sqlite3VdbePrintSql(Vdbe*); -SQLITE_PRIVATE void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf); -#endif -SQLITE_PRIVATE int sqlite3VdbeMemHandleBom(Mem *pMem); -SQLITE_PRIVATE void sqlite3VdbeFifoInit(Fifo*); -SQLITE_PRIVATE int sqlite3VdbeFifoPush(Fifo*, i64); -SQLITE_PRIVATE int sqlite3VdbeFifoPop(Fifo*, i64*); -SQLITE_PRIVATE void sqlite3VdbeFifoClear(Fifo*); - -#ifndef SQLITE_OMIT_INCRBLOB -SQLITE_PRIVATE int sqlite3VdbeMemExpandBlob(Mem *); +STQLITE_PRIVATE void sqlite3VdbeMemSanity(Mem*); +STQLITE_PRIVATE int sqlite3VdbeOpcodeNoPush(u8); +#endif +STQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem*, u8); +#ifdef STQLITE_DEBUG +STQLITE_PRIVATE void sqlite3VdbePrintSql(Vdbe*); +STQLITE_PRIVATE void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf); +#endif +STQLITE_PRIVATE int sqlite3VdbeMemHandleBom(Mem *pMem); +STQLITE_PRIVATE void sqlite3VdbeFifoInit(Fifo*); +STQLITE_PRIVATE int sqlite3VdbeFifoPush(Fifo*, i64); +STQLITE_PRIVATE int sqlite3VdbeFifoPop(Fifo*, i64*); +STQLITE_PRIVATE void sqlite3VdbeFifoClear(Fifo*); + +#ifndef STQLITE_OMIT_INCRBLOB +STQLITE_PRIVATE int sqlite3VdbeMemExpandBlob(Mem *); #else - #define sqlite3VdbeMemExpandBlob(x) SQLITE_OK + #define sqlite3VdbeMemExpandBlob(x) STQLITE_OK #endif #endif /* !defined(_VDBEINT_H_) */ @@ -9751,8 +9751,8 @@ SQLITE_PRIVATE int sqlite3VdbeMemExpandBlob(Mem *); /************** Continuing where we left off in utf.c ************************/ /* -** The following constant value is used by the SQLITE_BIGENDIAN and -** SQLITE_LITTLEENDIAN macros. +** The following constant value is used by the STQLITE_BIGENDIAN and +** STQLITE_LITTLEENDIAN macros. */ const int sqlite3one = 1; @@ -9843,13 +9843,13 @@ const unsigned char sqlite3UtfTrans1[] = { */ /* #define TRANSLATE_TRACE 1 */ -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 /* ** This routine transforms the internal text encoding used by pMem to ** desiredEnc. It is an error if the string is already of the desired ** encoding, or if *pMem does not contain a string value. */ -SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ +STQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ unsigned char zShort[NBFS]; /* Temporary short output buffer */ int len; /* Maximum length of output string in bytes */ unsigned char *zOut; /* Output buffer */ @@ -9863,7 +9863,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ assert( pMem->enc!=0 ); assert( pMem->n>=0 ); -#if defined(TRANSLATE_TRACE) && defined(SQLITE_DEBUG) +#if defined(TRANSLATE_TRACE) && defined(STQLITE_DEBUG) { char zBuf[100]; sqlite3VdbeMemPrettyPrint(pMem, zBuf); @@ -9875,13 +9875,13 @@ SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ ** all that is required is to swap the byte order. This case is handled ** differently from the others. */ - if( pMem->enc!=SQLITE_UTF8 && desiredEnc!=SQLITE_UTF8 ){ + if( pMem->enc!=STQLITE_UTF8 && desiredEnc!=STQLITE_UTF8 ){ u8 temp; int rc; rc = sqlite3VdbeMemMakeWriteable(pMem); - if( rc!=SQLITE_OK ){ - assert( rc==SQLITE_NOMEM ); - return SQLITE_NOMEM; + if( rc!=STQLITE_OK ){ + assert( rc==STQLITE_NOMEM ); + return STQLITE_NOMEM; } zIn = (u8*)pMem->z; zTerm = &zIn[pMem->n]; @@ -9896,7 +9896,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ } /* Set len to the maximum number of bytes required in the output buffer. */ - if( desiredEnc==SQLITE_UTF8 ){ + if( desiredEnc==STQLITE_UTF8 ){ /* When converting from UTF-16, the maximum growth results from ** translating a 2-byte character to a 4-byte UTF-8 character. ** A single byte is required for the output string @@ -9923,19 +9923,19 @@ SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ zTerm = &zIn[pMem->n]; if( len>NBFS ){ zOut = sqliteMallocRaw(len); - if( !zOut ) return SQLITE_NOMEM; + if( !zOut ) return STQLITE_NOMEM; }else{ zOut = zShort; } z = zOut; - if( pMem->enc==SQLITE_UTF8 ){ + if( pMem->enc==STQLITE_UTF8 ){ unsigned int iExtra = 0xD800; if( 0==(pMem->flags&MEM_Term) && zTerm>zIn && (zTerm[-1]&0x80) ){ /* This UTF8 string is not nul-terminated, and the last byte is ** not a character in the ascii range (codpoints 0..127). This - ** means the SQLITE_READ_UTF8() macro might read past the end + ** means the STQLITE_READ_UTF8() macro might read past the end ** of the allocated buffer. ** ** There are four possibilities: @@ -9952,7 +9952,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ ** ** 4. The entire string consists of continuation characters. ** - ** Cases (3) and (4) require no special handling. The SQLITE_READ_UTF8() + ** Cases (3) and (4) require no special handling. The STQLITE_READ_UTF8() ** macro will not overread the buffer in these cases. */ unsigned char *zExtra = &zTerm[-1]; @@ -9962,7 +9962,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ if( (zExtra[0]&0xC0)==0xC0 ){ /* Make a copy of the last character encoding in the input string. - ** Then make sure it is nul-terminated and use SQLITE_READ_UTF8() + ** Then make sure it is nul-terminated and use STQLITE_READ_UTF8() ** to decode the codepoint. Store the codepoint in variable iExtra, ** it will be appended to the output string later. */ @@ -9973,7 +9973,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ if( nExtra>15 ){ zExtra = sqliteMallocRaw(nExtra+1); if( !zExtra ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } zFree = zExtra; }else{ @@ -9981,25 +9981,25 @@ SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ } memcpy(zExtra, zTerm, nExtra); zExtra[nExtra] = '\0'; - SQLITE_READ_UTF8(zExtra, iExtra); + STQLITE_READ_UTF8(zExtra, iExtra); sqliteFree(zFree); } } - if( desiredEnc==SQLITE_UTF16LE ){ + if( desiredEnc==STQLITE_UTF16LE ){ /* UTF-8 -> UTF-16 Little-endian */ while( zIn<zTerm ){ - SQLITE_READ_UTF8(zIn, c); + STQLITE_READ_UTF8(zIn, c); WRITE_UTF16LE(z, c); } if( iExtra!=0xD800 ){ WRITE_UTF16LE(z, iExtra); } }else{ - assert( desiredEnc==SQLITE_UTF16BE ); + assert( desiredEnc==STQLITE_UTF16BE ); /* UTF-8 -> UTF-16 Big-endian */ while( zIn<zTerm ){ - SQLITE_READ_UTF8(zIn, c); + STQLITE_READ_UTF8(zIn, c); WRITE_UTF16BE(z, c); } if( iExtra!=0xD800 ){ @@ -10009,8 +10009,8 @@ SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ pMem->n = z - zOut; *z++ = 0; }else{ - assert( desiredEnc==SQLITE_UTF8 ); - if( pMem->enc==SQLITE_UTF16LE ){ + assert( desiredEnc==STQLITE_UTF8 ); + if( pMem->enc==STQLITE_UTF16LE ){ /* UTF-16 Little-endian -> UTF-8 */ while( zIn<zTerm ){ READ_UTF16LE(zIn, c); @@ -10026,7 +10026,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ pMem->n = z - zOut; } *z = 0; - assert( (pMem->n+(desiredEnc==SQLITE_UTF8?1:2))<=len ); + assert( (pMem->n+(desiredEnc==STQLITE_UTF8?1:2))<=len ); sqlite3VdbeMemRelease(pMem); pMem->flags &= ~(MEM_Static|MEM_Dyn|MEM_Ephem|MEM_Short); @@ -10041,14 +10041,14 @@ SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){ pMem->z = (char*)zOut; translate_out: -#if defined(TRANSLATE_TRACE) && defined(SQLITE_DEBUG) +#if defined(TRANSLATE_TRACE) && defined(STQLITE_DEBUG) { char zBuf[100]; sqlite3VdbeMemPrettyPrint(pMem, zBuf); fprintf(stderr, "OUTPUT: %s\n", zBuf); } #endif - return SQLITE_OK; + return STQLITE_OK; } /* @@ -10060,18 +10060,18 @@ translate_out: ** The allocation (static, dynamic etc.) and encoding of the Mem may be ** changed by this function. */ -SQLITE_PRIVATE int sqlite3VdbeMemHandleBom(Mem *pMem){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3VdbeMemHandleBom(Mem *pMem){ + int rc = STQLITE_OK; u8 bom = 0; if( pMem->n<0 || pMem->n>1 ){ u8 b1 = *(u8 *)pMem->z; u8 b2 = *(((u8 *)pMem->z) + 1); if( b1==0xFE && b2==0xFF ){ - bom = SQLITE_UTF16BE; + bom = STQLITE_UTF16BE; } if( b1==0xFF && b2==0xFE ){ - bom = SQLITE_UTF16LE; + bom = STQLITE_UTF16LE; } } @@ -10088,25 +10088,25 @@ SQLITE_PRIVATE int sqlite3VdbeMemHandleBom(Mem *pMem){ char *z = pMem->z; pMem->z = 0; pMem->xDel = 0; - rc = sqlite3VdbeMemSetStr(pMem, &z[2], pMem->n-2, bom, SQLITE_TRANSIENT); + rc = sqlite3VdbeMemSetStr(pMem, &z[2], pMem->n-2, bom, STQLITE_TRANSIENT); xDel(z); }else{ rc = sqlite3VdbeMemSetStr(pMem, &pMem->z[2], pMem->n-2, bom, - SQLITE_TRANSIENT); + STQLITE_TRANSIENT); } } return rc; } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ /* -** pZ is a UTF-8 encoded unicode string. If nByte is less than zero, -** return the number of unicode characters in pZ up to (but not including) +** pZ is a UTF-8 encoded tqunicode string. If nByte is less than zero, +** return the number of tqunicode characters in pZ up to (but not including) ** the first 0x00 byte. If nByte is not less than zero, return the -** number of unicode characters in the first nByte of pZ (or up to +** number of tqunicode characters in the first nByte of pZ (or up to ** the first 0x00, whichever comes first). */ -SQLITE_PRIVATE int sqlite3Utf8CharLen(const char *zIn, int nByte){ +STQLITE_PRIVATE int sqlite3Utf8CharLen(const char *zIn, int nByte){ int r = 0; const u8 *z = (const u8*)zIn; const u8 *zTerm; @@ -10117,13 +10117,13 @@ SQLITE_PRIVATE int sqlite3Utf8CharLen(const char *zIn, int nByte){ } assert( z<=zTerm ); while( *z!=0 && z<zTerm ){ - SQLITE_SKIP_UTF8(z); + STQLITE_SKIP_UTF8(z); r++; } return r; } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 /* ** Convert a UTF-16 string in the native encoding into a UTF-8 string. ** Memory to hold the UTF-8 string is obtained from malloc and must be @@ -10131,33 +10131,33 @@ SQLITE_PRIVATE int sqlite3Utf8CharLen(const char *zIn, int nByte){ ** ** NULL is returned if there is an allocation error. */ -SQLITE_PRIVATE char *sqlite3Utf16to8(const void *z, int nByte){ +STQLITE_PRIVATE char *sqlite3Utf16to8(const void *z, int nByte){ Mem m; memset(&m, 0, sizeof(m)); - sqlite3VdbeMemSetStr(&m, z, nByte, SQLITE_UTF16NATIVE, SQLITE_STATIC); - sqlite3VdbeChangeEncoding(&m, SQLITE_UTF8); + sqlite3VdbeMemSetStr(&m, z, nByte, STQLITE_UTF16NATIVE, STQLITE_STATIC); + sqlite3VdbeChangeEncoding(&m, STQLITE_UTF8); assert( (m.flags & MEM_Term)!=0 || sqlite3MallocFailed() ); assert( (m.flags & MEM_Str)!=0 || sqlite3MallocFailed() ); return (m.flags & MEM_Dyn)!=0 ? m.z : sqliteStrDup(m.z); } /* -** pZ is a UTF-16 encoded unicode string. If nChar is less than zero, +** pZ is a UTF-16 encoded tqunicode string. If nChar is less than zero, ** return the number of bytes up to (but not including), the first pair ** of consecutive 0x00 bytes in pZ. If nChar is not less than zero, -** then return the number of bytes in the first nChar unicode characters +** then return the number of bytes in the first nChar tqunicode characters ** in pZ (or up until the first pair of 0x00 bytes, whichever comes first). */ -SQLITE_PRIVATE int sqlite3Utf16ByteLen(const void *zIn, int nChar){ +STQLITE_PRIVATE int sqlite3Utf16ByteLen(const void *zIn, int nChar){ unsigned int c = 1; char const *z = zIn; int n = 0; - if( SQLITE_UTF16NATIVE==SQLITE_UTF16BE ){ - /* Using an "if (SQLITE_UTF16NATIVE==SQLITE_UTF16BE)" construct here + if( STQLITE_UTF16NATIVE==STQLITE_UTF16BE ){ + /* Using an "if (STQLITE_UTF16NATIVE==STQLITE_UTF16BE)" construct here ** and in other parts of this file means that at one branch will ** not be covered by coverage testing on any single host. But coverage ** will be complete if the tests are run on both a little-endian and - ** big-endian host. Because both the UTF16NATIVE and SQLITE_UTF16BE + ** big-endian host. Because both the UTF16NATIVE and STQLITE_UTF16BE ** macros are constant at compile time the compiler can determine ** which branch will be followed. It is therefore assumed that no runtime ** penalty is paid for this "if" statement. @@ -10175,7 +10175,7 @@ SQLITE_PRIVATE int sqlite3Utf16ByteLen(const void *zIn, int nChar){ return (z-(char const *)zIn)-((c==0)?2:0); } -#if defined(SQLITE_TEST) +#if defined(STQLITE_TEST) /* ** Translate UTF-8 to UTF-8. ** @@ -10185,13 +10185,13 @@ SQLITE_PRIVATE int sqlite3Utf16ByteLen(const void *zIn, int nChar){ ** The translation is done in-place (since it is impossible for the ** correct UTF-8 encoding to be longer than a malformed encoding). */ -SQLITE_PRIVATE int sqlite3Utf8To8(unsigned char *zIn){ +STQLITE_PRIVATE int sqlite3Utf8To8(unsigned char *zIn){ unsigned char *zOut = zIn; unsigned char *zStart = zIn; int c; while(1){ - SQLITE_READ_UTF8(zIn, c); + STQLITE_READ_UTF8(zIn, c); if( c==0 ) break; if( c!=0xfffd ){ WRITE_UTF8(zOut, c); @@ -10202,13 +10202,13 @@ SQLITE_PRIVATE int sqlite3Utf8To8(unsigned char *zIn){ } #endif -#if defined(SQLITE_TEST) +#if defined(STQLITE_TEST) /* ** This routine is called from the TCL test function "translate_selftest". ** It checks that the primitives for serializing and deserializing ** characters in each encoding are inverses of each other. */ -SQLITE_PRIVATE void sqlite3UtfSelfTest(){ +STQLITE_PRIVATE void sqlite3UtfSelfTest(){ unsigned int i, t; unsigned char zBuf[20]; unsigned char *z; @@ -10221,7 +10221,7 @@ SQLITE_PRIVATE void sqlite3UtfSelfTest(){ n = z-zBuf; z[0] = 0; z = zBuf; - SQLITE_READ_UTF8(z, c); + STQLITE_READ_UTF8(z, c); t = i; if( i>=0xD800 && i<=0xDFFF ) t = 0xFFFD; if( (i&0xFFFFFFFE)==0xFFFE ) t = 0xFFFD; @@ -10251,8 +10251,8 @@ SQLITE_PRIVATE void sqlite3UtfSelfTest(){ assert( (z-zBuf)==n ); } } -#endif /* SQLITE_TEST */ -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_TEST */ +#endif /* STQLITE_OMIT_UTF16 */ /************** End of utf.c *************************************************/ /************** Begin file util.c ********************************************/ @@ -10294,10 +10294,10 @@ SQLITE_PRIVATE void sqlite3UtfSelfTest(){ ** encoded in UTF-8. ** ** To clear the most recent error for sqlite handle "db", sqlite3Error -** should be called with err_code set to SQLITE_OK and zFormat set +** should be called with err_code set to STQLITE_OK and zFormat set ** to NULL. */ -SQLITE_PRIVATE void sqlite3Error(sqlite3 *db, int err_code, const char *zFormat, ...){ +STQLITE_PRIVATE void sqlite3Error(sqlite3 *db, int err_code, const char *zFormat, ...){ if( db && (db->pErr || (db->pErr = sqlite3ValueNew())!=0) ){ db->errCode = err_code; if( zFormat ){ @@ -10306,9 +10306,9 @@ SQLITE_PRIVATE void sqlite3Error(sqlite3 *db, int err_code, const char *zFormat, va_start(ap, zFormat); z = sqlite3VMPrintf(zFormat, ap); va_end(ap); - sqlite3ValueSetStr(db->pErr, -1, z, SQLITE_UTF8, sqlite3FreeX); + sqlite3ValueSetStr(db->pErr, -1, z, STQLITE_UTF8, sqlite3FreeX); }else{ - sqlite3ValueSetStr(db->pErr, 0, 0, SQLITE_UTF8, SQLITE_STATIC); + sqlite3ValueSetStr(db->pErr, 0, 0, STQLITE_UTF8, STQLITE_STATIC); } } } @@ -10330,22 +10330,22 @@ SQLITE_PRIVATE void sqlite3Error(sqlite3 *db, int err_code, const char *zFormat, ** Function sqlite3Error() should be used during statement execution ** (sqlite3_step() etc.). */ -SQLITE_PRIVATE void sqlite3ErrorMsg(Parse *pParse, const char *zFormat, ...){ +STQLITE_PRIVATE void sqlite3ErrorMsg(Parse *pParse, const char *zFormat, ...){ va_list ap; pParse->nErr++; sqliteFree(pParse->zErrMsg); va_start(ap, zFormat); pParse->zErrMsg = sqlite3VMPrintf(zFormat, ap); va_end(ap); - if( pParse->rc==SQLITE_OK ){ - pParse->rc = SQLITE_ERROR; + if( pParse->rc==STQLITE_OK ){ + pParse->rc = STQLITE_ERROR; } } /* ** Clear the error message in pParse, if any */ -SQLITE_PRIVATE void sqlite3ErrorClear(Parse *pParse){ +STQLITE_PRIVATE void sqlite3ErrorClear(Parse *pParse){ sqliteFree(pParse->zErrMsg); pParse->zErrMsg = 0; pParse->nErr = 0; @@ -10361,7 +10361,7 @@ SQLITE_PRIVATE void sqlite3ErrorClear(Parse *pParse){ ** brackets from around identifers. For example: "[a-b-c]" becomes ** "a-b-c". */ -SQLITE_PRIVATE void sqlite3Dequote(char *z){ +STQLITE_PRIVATE void sqlite3Dequote(char *z){ int quote; int i, j; if( z==0 ) return; @@ -10392,7 +10392,7 @@ SQLITE_PRIVATE void sqlite3Dequote(char *z){ ** lower-case character. */ const unsigned char sqlite3UpperToLower[] = { -#ifdef SQLITE_ASCII +#ifdef STQLITE_ASCII 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, @@ -10409,7 +10409,7 @@ const unsigned char sqlite3UpperToLower[] = { 234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251, 252,253,254,255 #endif -#ifdef SQLITE_EBCDIC +#ifdef STQLITE_EBCDIC 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* 0x */ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, /* 1x */ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, /* 2x */ @@ -10434,14 +10434,14 @@ const unsigned char sqlite3UpperToLower[] = { ** Some systems have stricmp(). Others have strcasecmp(). Because ** there is no consistency, we will define our own. */ -SQLITE_PRIVATE int sqlite3StrICmp(const char *zLeft, const char *zRight){ +STQLITE_PRIVATE int sqlite3StrICmp(const char *zLeft, const char *zRight){ register unsigned char *a, *b; a = (unsigned char *)zLeft; b = (unsigned char *)zRight; while( *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; } return UpperToLower[*a] - UpperToLower[*b]; } -SQLITE_PRIVATE int sqlite3StrNICmp(const char *zLeft, const char *zRight, int N){ +STQLITE_PRIVATE int sqlite3StrNICmp(const char *zLeft, const char *zRight, int N){ register unsigned char *a, *b; a = (unsigned char *)zLeft; b = (unsigned char *)zRight; @@ -10457,9 +10457,9 @@ SQLITE_PRIVATE int sqlite3StrNICmp(const char *zLeft, const char *zRight, int N) ** ** An empty string is considered non-numeric. */ -SQLITE_PRIVATE int sqlite3IsNumber(const char *z, int *realnum, u8 enc){ - int incr = (enc==SQLITE_UTF8?1:2); - if( enc==SQLITE_UTF16BE ) z++; +STQLITE_PRIVATE int sqlite3IsNumber(const char *z, int *realnum, u8 enc){ + int incr = (enc==STQLITE_UTF8?1:2); + if( enc==STQLITE_UTF16BE ) z++; if( *z=='-' || *z=='+' ) z += incr; if( !isdigit(*(u8*)z) ){ return 0; @@ -10495,8 +10495,8 @@ SQLITE_PRIVATE int sqlite3IsNumber(const char *z, int *realnum, u8 enc){ ** of "." depending on how locale is set. But that would cause problems ** for SQL. So this routine always uses "." regardless of locale. */ -SQLITE_PRIVATE int sqlite3AtoF(const char *z, double *pResult){ -#ifndef SQLITE_OMIT_FLOATING_POINT +STQLITE_PRIVATE int sqlite3AtoF(const char *z, double *pResult){ +#ifndef STQLITE_OMIT_FLOATING_POINT int sign = 1; const char *zBegin = z; LONGDOUBLE_TYPE v1 = 0.0; @@ -10550,7 +10550,7 @@ SQLITE_PRIVATE int sqlite3AtoF(const char *z, double *pResult){ return z - zBegin; #else return sqlite3Atoi64(z, pResult); -#endif /* SQLITE_OMIT_FLOATING_POINT */ +#endif /* STQLITE_OMIT_FLOATING_POINT */ } /* @@ -10586,7 +10586,7 @@ static int compare2pow63(const char *zNum){ ** 32-bit numbers. At that time, it was much faster than the ** atoi() library routine in RedHat 7.2. */ -SQLITE_PRIVATE int sqlite3Atoi64(const char *zNum, i64 *pNum){ +STQLITE_PRIVATE int sqlite3Atoi64(const char *zNum, i64 *pNum){ i64 v = 0; int neg; int i, c; @@ -10631,7 +10631,7 @@ SQLITE_PRIVATE int sqlite3Atoi64(const char *zNum, i64 *pNum){ ** 9223373036854775808 will not fit in 64 bits. So it seems safer to return ** false. */ -SQLITE_PRIVATE int sqlite3FitsIn64Bits(const char *zNum){ +STQLITE_PRIVATE int sqlite3FitsIn64Bits(const char *zNum){ int i, c; int neg = 0; if( *zNum=='-' ){ @@ -10664,7 +10664,7 @@ SQLITE_PRIVATE int sqlite3FitsIn64Bits(const char *zNum){ ** This is different from sqlite3Atoi64() which requires the ** input number to be zero-terminated. */ -SQLITE_PRIVATE int sqlite3GetInt32(const char *zNum, int *pValue){ +STQLITE_PRIVATE int sqlite3GetInt32(const char *zNum, int *pValue){ sqlite_int64 v = 0; int i, c; int neg = 0; @@ -10698,15 +10698,15 @@ SQLITE_PRIVATE int sqlite3GetInt32(const char *zNum, int *pValue){ ** NULL or which have been previously closed. If this routine returns ** TRUE it means that the db pointer is invalid and should not be ** dereferenced for any reason. The calling function should invoke -** SQLITE_MISUSE immediately. +** STQLITE_MISUSE immediately. */ -SQLITE_PRIVATE int sqlite3SafetyCheck(sqlite3 *db){ +STQLITE_PRIVATE int sqlite3SafetyCheck(sqlite3 *db){ int magic; if( db==0 ) return 1; magic = db->magic; - if( magic!=SQLITE_MAGIC_CLOSED && - magic!=SQLITE_MAGIC_OPEN && - magic!=SQLITE_MAGIC_BUSY ) return 1; + if( magic!=STQLITE_MAGIC_CLOSED && + magic!=STQLITE_MAGIC_OPEN && + magic!=STQLITE_MAGIC_BUSY ) return 1; return 0; } @@ -10739,7 +10739,7 @@ SQLITE_PRIVATE int sqlite3SafetyCheck(sqlite3 *db){ ** bit clear. Except, if we get to the 9th byte, it stores the full ** 8 bits and is the last byte. */ -SQLITE_PRIVATE int sqlite3PutVarint(unsigned char *p, u64 v){ +STQLITE_PRIVATE int sqlite3PutVarint(unsigned char *p, u64 v){ int i, j, n; u8 buf[10]; if( v & (((u64)0xff000000)<<32) ){ @@ -10768,7 +10768,7 @@ SQLITE_PRIVATE int sqlite3PutVarint(unsigned char *p, u64 v){ ** Read a 64-bit variable-length integer from memory starting at p[0]. ** Return the number of bytes read. The value is stored in *v. */ -SQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *p, u64 *v){ +STQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *p, u64 *v){ u32 x; u64 x64; int n; @@ -10810,7 +10810,7 @@ SQLITE_PRIVATE int sqlite3GetVarint(const unsigned char *p, u64 *v){ ** Read a 32-bit variable-length integer from memory starting at p[0]. ** Return the number of bytes read. The value is stored in *v. */ -SQLITE_PRIVATE int sqlite3GetVarint32(const unsigned char *p, u32 *v){ +STQLITE_PRIVATE int sqlite3GetVarint32(const unsigned char *p, u32 *v){ u32 x; int n; unsigned char c; @@ -10836,7 +10836,7 @@ SQLITE_PRIVATE int sqlite3GetVarint32(const unsigned char *p, u32 *v){ ** Return the number of bytes that will be needed to store the given ** 64-bit integer. */ -SQLITE_PRIVATE int sqlite3VarintLen(u64 v){ +STQLITE_PRIVATE int sqlite3VarintLen(u64 v){ int i = 0; do{ i++; @@ -10849,10 +10849,10 @@ SQLITE_PRIVATE int sqlite3VarintLen(u64 v){ /* ** Read or write a four-byte big-endian integer value. */ -SQLITE_PRIVATE u32 sqlite3Get4byte(const u8 *p){ +STQLITE_PRIVATE u32 sqlite3Get4byte(const u8 *p){ return (p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3]; } -SQLITE_PRIVATE void sqlite3Put4byte(unsigned char *p, u32 v){ +STQLITE_PRIVATE void sqlite3Put4byte(unsigned char *p, u32 v){ p[0] = v>>24; p[1] = v>>16; p[2] = v>>8; @@ -10861,8 +10861,8 @@ SQLITE_PRIVATE void sqlite3Put4byte(unsigned char *p, u32 v){ -#if !defined(SQLITE_OMIT_BLOB_LITERAL) || defined(SQLITE_HAS_CODEC) \ - || defined(SQLITE_TEST) +#if !defined(STQLITE_OMIT_BLOB_LITERAL) || defined(STQLITE_HAS_CODEC) \ + || defined(STQLITE_TEST) /* ** Translate a single byte of Hex into an integer. */ @@ -10876,16 +10876,16 @@ static int hexToInt(int h){ return h - 'A' + 10; } } -#endif /* !SQLITE_OMIT_BLOB_LITERAL || SQLITE_HAS_CODEC || SQLITE_TEST */ +#endif /* !STQLITE_OMIT_BLOB_LITERAL || STQLITE_HAS_CODEC || STQLITE_TEST */ -#if !defined(SQLITE_OMIT_BLOB_LITERAL) || defined(SQLITE_HAS_CODEC) +#if !defined(STQLITE_OMIT_BLOB_LITERAL) || defined(STQLITE_HAS_CODEC) /* ** Convert a BLOB literal of the form "x'hhhhhh'" into its binary ** value. Return a pointer to its binary value. Space to hold the ** binary value has been obtained from malloc and must be freed by ** the calling routine. */ -SQLITE_PRIVATE void *sqlite3HexToBlob(const char *z){ +STQLITE_PRIVATE void *sqlite3HexToBlob(const char *z){ char *zBlob; int i; int n = strlen(z); @@ -10899,19 +10899,19 @@ SQLITE_PRIVATE void *sqlite3HexToBlob(const char *z){ } return zBlob; } -#endif /* !SQLITE_OMIT_BLOB_LITERAL || SQLITE_HAS_CODEC */ +#endif /* !STQLITE_OMIT_BLOB_LITERAL || STQLITE_HAS_CODEC */ /* -** Change the sqlite.magic from SQLITE_MAGIC_OPEN to SQLITE_MAGIC_BUSY. -** Return an error (non-zero) if the magic was not SQLITE_MAGIC_OPEN +** Change the sqlite.magic from STQLITE_MAGIC_OPEN to STQLITE_MAGIC_BUSY. +** Return an error (non-zero) if the magic was not STQLITE_MAGIC_OPEN ** when this routine is called. ** -** This routine is called when entering an SQLite API. The SQLITE_MAGIC_OPEN +** This routine is called when entering an STQLite API. The STQLITE_MAGIC_OPEN ** value indicates that the database connection passed into the API is ** open and is not being used by another thread. By changing the value -** to SQLITE_MAGIC_BUSY we indicate that the connection is in use. -** sqlite3SafetyOff() below will change the value back to SQLITE_MAGIC_OPEN +** to STQLITE_MAGIC_BUSY we indicate that the connection is in use. +** sqlite3SafetyOff() below will change the value back to STQLITE_MAGIC_OPEN ** when the API exits. ** ** This routine is a attempt to detect if two threads use the @@ -10919,7 +10919,7 @@ SQLITE_PRIVATE void *sqlite3HexToBlob(const char *z){ ** condition so it is possible that the error is not detected. ** But usually the problem will be seen. The result will be an ** error which can be used to debug the application that is -** using SQLite incorrectly. +** using STQLite incorrectly. ** ** Ticket #202: If db->magic is not a valid open value, take care not ** to modify the db structure at all. It could be that db is a stale @@ -10927,28 +10927,28 @@ SQLITE_PRIVATE void *sqlite3HexToBlob(const char *z){ ** call to sqlite3_close(db) and db has been deallocated. And we do ** not want to write into deallocated memory. */ -SQLITE_PRIVATE int sqlite3SafetyOn(sqlite3 *db){ - if( db->magic==SQLITE_MAGIC_OPEN ){ - db->magic = SQLITE_MAGIC_BUSY; +STQLITE_PRIVATE int sqlite3SafetyOn(sqlite3 *db){ + if( db->magic==STQLITE_MAGIC_OPEN ){ + db->magic = STQLITE_MAGIC_BUSY; return 0; - }else if( db->magic==SQLITE_MAGIC_BUSY ){ - db->magic = SQLITE_MAGIC_ERROR; + }else if( db->magic==STQLITE_MAGIC_BUSY ){ + db->magic = STQLITE_MAGIC_ERROR; db->u1.isInterrupted = 1; } return 1; } /* -** Change the magic from SQLITE_MAGIC_BUSY to SQLITE_MAGIC_OPEN. -** Return an error (non-zero) if the magic was not SQLITE_MAGIC_BUSY +** Change the magic from STQLITE_MAGIC_BUSY to STQLITE_MAGIC_OPEN. +** Return an error (non-zero) if the magic was not STQLITE_MAGIC_BUSY ** when this routine is called. */ -SQLITE_PRIVATE int sqlite3SafetyOff(sqlite3 *db){ - if( db->magic==SQLITE_MAGIC_BUSY ){ - db->magic = SQLITE_MAGIC_OPEN; +STQLITE_PRIVATE int sqlite3SafetyOff(sqlite3 *db){ + if( db->magic==STQLITE_MAGIC_BUSY ){ + db->magic = STQLITE_MAGIC_OPEN; return 0; }else { - db->magic = SQLITE_MAGIC_ERROR; + db->magic = STQLITE_MAGIC_ERROR; db->u1.isInterrupted = 1; return 1; } @@ -10957,7 +10957,7 @@ SQLITE_PRIVATE int sqlite3SafetyOff(sqlite3 *db){ /* ** Return a pointer to the ThreadData associated with the calling thread. */ -SQLITE_PRIVATE ThreadData *sqlite3ThreadData(){ +STQLITE_PRIVATE ThreadData *sqlite3ThreadData(){ ThreadData *p = (ThreadData*)sqlite3OsThreadSpecificData(1); if( !p ){ sqlite3FailedMalloc(); @@ -10970,7 +10970,7 @@ SQLITE_PRIVATE ThreadData *sqlite3ThreadData(){ ** If no ThreadData has been allocated to this thread yet, return a pointer ** to a substitute ThreadData structure that is all zeros. */ -SQLITE_PRIVATE const ThreadData *sqlite3ThreadDataReadOnly(){ +STQLITE_PRIVATE const ThreadData *sqlite3ThreadDataReadOnly(){ static const ThreadData zeroData = {0}; /* Initializer to silence warnings ** from broken compilers */ const ThreadData *pTd = sqlite3OsThreadSpecificData(0); @@ -10981,7 +10981,7 @@ SQLITE_PRIVATE const ThreadData *sqlite3ThreadDataReadOnly(){ ** Check to see if the ThreadData for this thread is all zero. If it ** is, then deallocate it. */ -SQLITE_PRIVATE void sqlite3ReleaseThreadData(){ +STQLITE_PRIVATE void sqlite3ReleaseThreadData(){ sqlite3OsThreadSpecificData(-1); } @@ -10999,7 +10999,7 @@ SQLITE_PRIVATE void sqlite3ReleaseThreadData(){ ** ************************************************************************* ** This is the implementation of generic hash-tables -** used in SQLite. +** used in STQLite. ** ** $Id: hash.c,v 1.19 2007/03/31 03:59:24 drh Exp $ */ @@ -11008,20 +11008,20 @@ SQLITE_PRIVATE void sqlite3ReleaseThreadData(){ ** fields of the Hash structure. ** ** "pNew" is a pointer to the hash table that is to be initialized. -** keyClass is one of the constants SQLITE_HASH_INT, SQLITE_HASH_POINTER, -** SQLITE_HASH_BINARY, or SQLITE_HASH_STRING. The value of keyClass +** keyClass is one of the constants STQLITE_HASH_INT, STQLITE_HASH_POINTER, +** STQLITE_HASH_BINARY, or STQLITE_HASH_STRING. The value of keyClass ** determines what kind of key the hash table will use. "copyKey" is ** true if the hash table should make its own private copy of keys and ** false if it should just use the supplied pointer. CopyKey only makes -** sense for SQLITE_HASH_STRING and SQLITE_HASH_BINARY and is ignored +** sense for STQLITE_HASH_STRING and STQLITE_HASH_BINARY and is ignored ** for other key classes. */ -SQLITE_PRIVATE void sqlite3HashInit(Hash *pNew, int keyClass, int copyKey){ +STQLITE_PRIVATE void sqlite3HashInit(Hash *pNew, int keyClass, int copyKey){ assert( pNew!=0 ); - assert( keyClass>=SQLITE_HASH_STRING && keyClass<=SQLITE_HASH_BINARY ); + assert( keyClass>=STQLITE_HASH_STRING && keyClass<=STQLITE_HASH_BINARY ); pNew->keyClass = keyClass; #if 0 - if( keyClass==SQLITE_HASH_POINTER || keyClass==SQLITE_HASH_INT ) copyKey = 0; + if( keyClass==STQLITE_HASH_POINTER || keyClass==STQLITE_HASH_INT ) copyKey = 0; #endif pNew->copyKey = copyKey; pNew->first = 0; @@ -11036,7 +11036,7 @@ SQLITE_PRIVATE void sqlite3HashInit(Hash *pNew, int keyClass, int copyKey){ ** Call this routine to delete a hash table or to reset a hash table ** to the empty state. */ -SQLITE_PRIVATE void sqlite3HashClear(Hash *pH){ +STQLITE_PRIVATE void sqlite3HashClear(Hash *pH){ HashElem *elem; /* For looping over all elements of the table */ assert( pH!=0 ); @@ -11058,7 +11058,7 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash *pH){ #if 0 /* NOT USED */ /* -** Hash and comparison functions when the mode is SQLITE_HASH_INT +** Hash and comparison functions when the mode is STQLITE_HASH_INT */ static int intHash(const void *pKey, int nKey){ return nKey ^ (nKey<<8) ^ (nKey>>8); @@ -11070,7 +11070,7 @@ static int intCompare(const void *pKey1, int n1, const void *pKey2, int n2){ #if 0 /* NOT USED */ /* -** Hash and comparison functions when the mode is SQLITE_HASH_POINTER +** Hash and comparison functions when the mode is STQLITE_HASH_POINTER */ static int ptrHash(const void *pKey, int nKey){ uptr x = Addr(pKey); @@ -11084,7 +11084,7 @@ static int ptrCompare(const void *pKey1, int n1, const void *pKey2, int n2){ #endif /* -** Hash and comparison functions when the mode is SQLITE_HASH_STRING +** Hash and comparison functions when the mode is STQLITE_HASH_STRING */ static int strHash(const void *pKey, int nKey){ const char *z = (const char *)pKey; @@ -11102,7 +11102,7 @@ static int strCompare(const void *pKey1, int n1, const void *pKey2, int n2){ } /* -** Hash and comparison functions when the mode is SQLITE_HASH_BINARY +** Hash and comparison functions when the mode is STQLITE_HASH_BINARY */ static int binHash(const void *pKey, int nKey){ int h = 0; @@ -11132,18 +11132,18 @@ static int binCompare(const void *pKey1, int n1, const void *pKey2, int n2){ static int (*hashFunction(int keyClass))(const void*,int){ #if 0 /* HASH_INT and HASH_POINTER are never used */ switch( keyClass ){ - case SQLITE_HASH_INT: return &intHash; - case SQLITE_HASH_POINTER: return &ptrHash; - case SQLITE_HASH_STRING: return &strHash; - case SQLITE_HASH_BINARY: return &binHash;; + case STQLITE_HASH_INT: return &intHash; + case STQLITE_HASH_POINTER: return &ptrHash; + case STQLITE_HASH_STRING: return &strHash; + case STQLITE_HASH_BINARY: return &binHash;; default: break; } return 0; #else - if( keyClass==SQLITE_HASH_STRING ){ + if( keyClass==STQLITE_HASH_STRING ){ return &strHash; }else{ - assert( keyClass==SQLITE_HASH_BINARY ); + assert( keyClass==STQLITE_HASH_BINARY ); return &binHash; } #endif @@ -11158,18 +11158,18 @@ static int (*hashFunction(int keyClass))(const void*,int){ static int (*compareFunction(int keyClass))(const void*,int,const void*,int){ #if 0 /* HASH_INT and HASH_POINTER are never used */ switch( keyClass ){ - case SQLITE_HASH_INT: return &intCompare; - case SQLITE_HASH_POINTER: return &ptrCompare; - case SQLITE_HASH_STRING: return &strCompare; - case SQLITE_HASH_BINARY: return &binCompare; + case STQLITE_HASH_INT: return &intCompare; + case STQLITE_HASH_POINTER: return &ptrCompare; + case STQLITE_HASH_STRING: return &strCompare; + case STQLITE_HASH_BINARY: return &binCompare; default: break; } return 0; #else - if( keyClass==SQLITE_HASH_STRING ){ + if( keyClass==STQLITE_HASH_STRING ){ return &strCompare; }else{ - assert( keyClass==SQLITE_HASH_BINARY ); + assert( keyClass==STQLITE_HASH_BINARY ); return &binCompare; } #endif @@ -11294,7 +11294,7 @@ static void removeElementGivenHash( ** that matches pKey,nKey. Return the data for this element if it is ** found, or NULL if there is no match. */ -SQLITE_PRIVATE void *sqlite3HashFind(const Hash *pH, const void *pKey, int nKey){ +STQLITE_PRIVATE void *sqlite3HashFind(const Hash *pH, const void *pKey, int nKey){ int h; /* A hash on key */ HashElem *elem; /* The element that matches key */ int (*xHash)(const void*,int); /* The hash function */ @@ -11323,7 +11323,7 @@ SQLITE_PRIVATE void *sqlite3HashFind(const Hash *pH, const void *pKey, int nKey) ** If the "data" parameter to this function is NULL, then the ** element corresponding to "key" is removed from the hash table. */ -SQLITE_PRIVATE void *sqlite3HashInsert(Hash *pH, const void *pKey, int nKey, void *data){ +STQLITE_PRIVATE void *sqlite3HashInsert(Hash *pH, const void *pKey, int nKey, void *data){ int hraw; /* Raw hash value of the key */ int h; /* the hash of the key modulo hash table size */ HashElem *elem; /* Used to loop thru the element list */ @@ -11387,7 +11387,7 @@ SQLITE_PRIVATE void *sqlite3HashInsert(Hash *pH, const void *pKey, int nKey, voi /************** Begin file opcodes.c *****************************************/ /* Automatically generated. Do not edit */ /* See the mkopcodec.awk script for details. */ -#if !defined(SQLITE_OMIT_EXPLAIN) || !defined(NDEBUG) || defined(VDBE_PROFILE) || defined(SQLITE_DEBUG) +#if !defined(STQLITE_OMIT_EXPLAIN) || !defined(NDEBUG) || defined(VDBE_PROFILE) || defined(STQLITE_DEBUG) const char *const sqlite3OpcodeNames[] = { "?", /* 1 */ "MemLoad", /* 2 */ "VNext", @@ -11558,7 +11558,7 @@ const char *const sqlite3OpcodeNames[] = { "?", ** Macros used to determine whether or not to use threads. */ #if defined(THREADSAFE) && THREADSAFE -# define SQLITE_OS2_THREADS 1 +# define STQLITE_OS2_THREADS 1 #endif /* @@ -11588,11 +11588,11 @@ const char *const sqlite3OpcodeNames[] = { "?", /* ** At least two bugs have slipped in because we changed the MEMORY_DEBUG -** macro to SQLITE_DEBUG and some older makefiles have not yet made the +** macro to STQLITE_DEBUG and some older makefiles have not yet made the ** switch. The following code should catch this problem at compile-time. */ #ifdef MEMORY_DEBUG -# error "The MEMORY_DEBUG macro is obsolete. Use SQLITE_DEBUG instead." +# error "The MEMORY_DEBUG macro is obsolete. Use STQLITE_DEBUG instead." #endif @@ -11600,12 +11600,12 @@ const char *const sqlite3OpcodeNames[] = { "?", * When testing, this global variable stores the location of the * pending-byte in the database file. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST unsigned int sqlite3_pending_byte = 0x40000000; #endif int sqlite3_os_trace = 0; -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG #define OSTRACE1(X) if( sqlite3_os_trace ) sqlite3DebugPrintf(X) #define OSTRACE2(X,Y) if( sqlite3_os_trace ) sqlite3DebugPrintf(X,Y) #define OSTRACE3(X,Y,Z) if( sqlite3_os_trace ) sqlite3DebugPrintf(X,Y,Z) @@ -11629,7 +11629,7 @@ int sqlite3_os_trace = 0; ** Macros for performance tracing. Normally turned off. Only works ** on i486 hardware. */ -#ifdef SQLITE_PERFORMANCE_TRACE +#ifdef STQLITE_PERFORMANCE_TRACE __inline__ unsigned long long int hwtime(void){ unsigned long long int x; __asm__("rdtsc\n\t" @@ -11649,11 +11649,11 @@ static unsigned int elapse; #endif /* -** If we compile with the SQLITE_TEST macro set, then the following block +** If we compile with the STQLITE_TEST macro set, then the following block ** of code will give us the ability to simulate a disk I/O error. This ** is used for testing the I/O recovery logic. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_io_error_hit = 0; int sqlite3_io_error_pending = 0; int sqlite3_io_error_persist = 0; @@ -11687,7 +11687,7 @@ static void local_ioerr(){ /* ** When testing, keep a count of the number of open files. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_open_file_count = 0; #define OpenCounter(X) sqlite3_open_file_count+=(X) #else @@ -11712,8 +11712,8 @@ int sqlite3_open_file_count = 0; ** If neither memory-management or debugging is enabled, the second ** set of implementations is used instead. */ -#if defined(SQLITE_ENABLE_MEMORY_MANAGEMENT) || defined (SQLITE_MEMDEBUG) -SQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ +#if defined(STQLITE_ENABLE_MEMORY_MANAGEMENT) || defined (STQLITE_MEMDEBUG) +STQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ char *p = (char *)malloc(n+8); assert(n>0); assert(sizeof(int)<=8); @@ -11723,7 +11723,7 @@ SQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ } return (void *)p; } -SQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ +STQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ char *p2 = ((char *)p - 8); assert(n>0); p2 = (char*)realloc(p2, n+8); @@ -11733,29 +11733,29 @@ SQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ } return (void *)p2; } -SQLITE_PRIVATE void sqlite3GenericFree(void *p){ +STQLITE_PRIVATE void sqlite3GenericFree(void *p){ assert(p); free((void *)((char *)p - 8)); } -SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ +STQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return p ? *(int *)((char *)p - 8) : 0; } #else -SQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ +STQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ char *p = (char *)malloc(n); return (void *)p; } -SQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ +STQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ assert(n>0); p = realloc(p, n); return p; } -SQLITE_PRIVATE void sqlite3GenericFree(void *p){ +STQLITE_PRIVATE void sqlite3GenericFree(void *p){ assert(p); free(p); } /* Never actually used, but needed for the linker */ -SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } +STQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } #endif /* @@ -11783,26 +11783,26 @@ struct os2File { /* ** Do not include any of the File I/O interface procedures if the -** SQLITE_OMIT_DISKIO macro is defined (indicating that there database +** STQLITE_OMIT_DISKIO macro is defined (indicating that there database ** will be in-memory only) */ -#ifndef SQLITE_OMIT_DISKIO +#ifndef STQLITE_OMIT_DISKIO /* ** Delete the named file */ -SQLITE_PRIVATE int sqlite3Os2Delete( const char *zFilename ){ +STQLITE_PRIVATE int sqlite3Os2Delete( const char *zFilename ){ APIRET rc = NO_ERROR; rc = DosDelete( (PSZ)zFilename ); OSTRACE2( "DELETE \"%s\"\n", zFilename ); - return rc == NO_ERROR ? SQLITE_OK : SQLITE_IOERR; + return rc == NO_ERROR ? STQLITE_OK : STQLITE_IOERR; } /* ** Return TRUE if the named file exists. */ -SQLITE_PRIVATE int sqlite3Os2FileExists( const char *zFilename ){ +STQLITE_PRIVATE int sqlite3Os2FileExists( const char *zFilename ){ FILESTATUS3 fsts3ConfigInfo; memset(&fsts3ConfigInfo, 0, sizeof(fsts3ConfigInfo)); return DosQueryPathInfo( (PSZ)zFilename, FIL_STANDARD, @@ -11820,12 +11820,12 @@ int allocateOs2File( os2File *pInit, OsFile **pld ); ** On success, a handle for the open file is written to *id ** and *pReadonly is set to 0 if the file was opened for reading and ** writing or 1 if the file was opened read-only. The function returns -** SQLITE_OK. +** STQLITE_OK. ** -** On failure, the function returns SQLITE_CANTOPEN and leaves +** On failure, the function returns STQLITE_CANTOPEN and leaves ** *id and *pReadonly unchanged. */ -SQLITE_PRIVATE int sqlite3Os2OpenReadWrite( +STQLITE_PRIVATE int sqlite3Os2OpenReadWrite( const char *zFilename, OsFile **pld, int *pReadonly @@ -11848,7 +11848,7 @@ SQLITE_PRIVATE int sqlite3Os2OpenReadWrite( OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_RANDOM | OPEN_SHARE_DENYWRITE | OPEN_ACCESS_READONLY, (PEAOP2)NULL ); if( rc != NO_ERROR ){ - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } *pReadonly = 1; } @@ -11875,11 +11875,11 @@ SQLITE_PRIVATE int sqlite3Os2OpenReadWrite( ** If delFlag is true, then make arrangements to automatically delete ** the file when it is closed. ** -** On success, write the file handle into *id and return SQLITE_OK. +** On success, write the file handle into *id and return STQLITE_OK. ** -** On failure, return SQLITE_CANTOPEN. +** On failure, return STQLITE_CANTOPEN. */ -SQLITE_PRIVATE int sqlite3Os2OpenExclusive( const char *zFilename, OsFile **pld, int delFlag ){ +STQLITE_PRIVATE int sqlite3Os2OpenExclusive( const char *zFilename, OsFile **pld, int delFlag ){ os2File f; HFILE hf; ULONG ulAction; @@ -11891,7 +11891,7 @@ SQLITE_PRIVATE int sqlite3Os2OpenExclusive( const char *zFilename, OsFile **pld, OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_RANDOM | OPEN_SHARE_DENYREADWRITE | OPEN_ACCESS_READWRITE, (PEAOP2)NULL ); if( rc != NO_ERROR ){ - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } f.h = hf; @@ -11907,11 +11907,11 @@ SQLITE_PRIVATE int sqlite3Os2OpenExclusive( const char *zFilename, OsFile **pld, /* ** Attempt to open a new file for read-only access. ** -** On success, write the file handle into *id and return SQLITE_OK. +** On success, write the file handle into *id and return STQLITE_OK. ** -** On failure, return SQLITE_CANTOPEN. +** On failure, return STQLITE_CANTOPEN. */ -SQLITE_PRIVATE int sqlite3Os2OpenReadOnly( const char *zFilename, OsFile **pld ){ +STQLITE_PRIVATE int sqlite3Os2OpenReadOnly( const char *zFilename, OsFile **pld ){ os2File f; HFILE hf; ULONG ulAction; @@ -11923,7 +11923,7 @@ SQLITE_PRIVATE int sqlite3Os2OpenReadOnly( const char *zFilename, OsFile **pld ) OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_RANDOM | OPEN_SHARE_DENYWRITE | OPEN_ACCESS_READONLY, (PEAOP2)NULL ); if( rc != NO_ERROR ){ - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } f.h = hf; f.locktype = NO_LOCK; @@ -11944,27 +11944,27 @@ SQLITE_PRIVATE int sqlite3Os2OpenReadOnly( const char *zFilename, OsFile **pld ) ** OS/2 since OS/2 does not support hard links. ** ** On success, a handle for a previously open file is at *id is -** updated with the new directory file descriptor and SQLITE_OK is +** updated with the new directory file descriptor and STQLITE_OK is ** returned. ** -** On failure, the function returns SQLITE_CANTOPEN and leaves +** On failure, the function returns STQLITE_CANTOPEN and leaves ** *id unchanged. */ int os2OpenDirectory( OsFile *id, const char *zDirname ){ - return SQLITE_OK; + return STQLITE_OK; } /* ** Create a temporary file name in zBuf. zBuf must be big enough to -** hold at least SQLITE_TEMPNAME_SIZE characters. +** hold at least STQLITE_TEMPNAME_SIZE characters. */ -SQLITE_PRIVATE int sqlite3Os2TempFileName( char *zBuf ){ +STQLITE_PRIVATE int sqlite3Os2TempFileName( char *zBuf ){ static const unsigned char zChars[] = "abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" "0123456789"; int i, j; PSZ zTempPath = 0; @@ -11988,7 +11988,7 @@ SQLITE_PRIVATE int sqlite3Os2TempFileName( char *zBuf ){ if( !sqlite3OsFileExists( zBuf ) ) break; } OSTRACE2( "TEMP FILENAME: %s\n", zBuf ); - return SQLITE_OK; + return STQLITE_OK; } /* @@ -12008,40 +12008,40 @@ int os2Close( OsFile **pld ){ OpenCounter( -1 ); } - return rc == NO_ERROR ? SQLITE_OK : SQLITE_IOERR; + return rc == NO_ERROR ? STQLITE_OK : STQLITE_IOERR; } /* -** Read data from a file into a buffer. Return SQLITE_OK if all -** bytes were read successfully and SQLITE_IOERR if anything goes +** Read data from a file into a buffer. Return STQLITE_OK if all +** bytes were read successfully and STQLITE_IOERR if anything goes ** wrong. */ int os2Read( OsFile *id, void *pBuf, int amt ){ ULONG got; assert( id!=0 ); - SimulateIOError( return SQLITE_IOERR ); + SimulateIOError( return STQLITE_IOERR ); OSTRACE3( "READ %d lock=%d\n", ((os2File*)id)->h, ((os2File*)id)->locktype ); DosRead( ((os2File*)id)->h, pBuf, amt, &got ); if (got == (ULONG)amt) - return SQLITE_OK; + return STQLITE_OK; else if (got == 0) - return SQLITE_IOERR_READ; + return STQLITE_IOERR_READ; else { memset(&((char*)pBuf)[got], 0, amt-got); - return SQLITE_IOERR_SHORT_READ; + return STQLITE_IOERR_SHORT_READ; } } /* -** Write data from a buffer into a file. Return SQLITE_OK on success +** Write data from a buffer into a file. Return STQLITE_OK on success ** or some other error code on failure. */ int os2Write( OsFile *id, const void *pBuf, int amt ){ APIRET rc = NO_ERROR; ULONG wrote; assert( id!=0 ); - SimulateIOError( return SQLITE_IOERR ); - SimulateDiskfullError( return SQLITE_FULL ); + SimulateIOError( return STQLITE_IOERR ); + SimulateDiskfullError( return STQLITE_FULL ); OSTRACE3( "WRITE %d lock=%d\n", ((os2File*)id)->h, ((os2File*)id)->locktype ); while( amt > 0 && (rc = DosWrite( ((os2File*)id)->h, (PVOID)pBuf, amt, &wrote )) && wrote > 0 ){ @@ -12049,7 +12049,7 @@ int os2Write( OsFile *id, const void *pBuf, int amt ){ pBuf = &((char*)pBuf)[wrote]; } - return ( rc != NO_ERROR || amt > (int)wrote ) ? SQLITE_FULL : SQLITE_OK; + return ( rc != NO_ERROR || amt > (int)wrote ) ? STQLITE_FULL : STQLITE_OK; } /* @@ -12061,7 +12061,7 @@ int os2Seek( OsFile *id, i64 offset ){ assert( id!=0 ); rc = DosSetFilePtr( ((os2File*)id)->h, offset, FILE_BEGIN, &filePointer ); OSTRACE3( "SEEK %d %lld\n", ((os2File*)id)->h, offset ); - return rc == NO_ERROR ? SQLITE_OK : SQLITE_IOERR; + return rc == NO_ERROR ? STQLITE_OK : STQLITE_IOERR; } /* @@ -12070,16 +12070,16 @@ int os2Seek( OsFile *id, i64 offset ){ int os2Sync( OsFile *id, int dataOnly ){ assert( id!=0 ); OSTRACE3( "SYNC %d lock=%d\n", ((os2File*)id)->h, ((os2File*)id)->locktype ); - return DosResetBuffer( ((os2File*)id)->h ) == NO_ERROR ? SQLITE_OK : SQLITE_IOERR; + return DosResetBuffer( ((os2File*)id)->h ) == NO_ERROR ? STQLITE_OK : STQLITE_IOERR; } /* ** Sync the directory zDirname. This is a no-op on operating systems other ** than UNIX. */ -SQLITE_PRIVATE int sqlite3Os2SyncDirectory( const char *zDirname ){ - SimulateIOError( return SQLITE_IOERR ); - return SQLITE_OK; +STQLITE_PRIVATE int sqlite3Os2SyncDirectory( const char *zDirname ){ + SimulateIOError( return STQLITE_IOERR ); + return STQLITE_OK; } /* @@ -12090,13 +12090,13 @@ int os2Truncate( OsFile *id, i64 nByte ){ ULONG upperBits = nByte>>32; assert( id!=0 ); OSTRACE3( "TRUNCATE %d %lld\n", ((os2File*)id)->h, nByte ); - SimulateIOError( return SQLITE_IOERR ); + SimulateIOError( return STQLITE_IOERR ); rc = DosSetFilePtr( ((os2File*)id)->h, nByte, FILE_BEGIN, &upperBits ); if( rc != NO_ERROR ){ - return SQLITE_IOERR; + return STQLITE_IOERR; } rc = DosSetFilePtr( ((os2File*)id)->h, 0L, FILE_END, &upperBits ); - return rc == NO_ERROR ? SQLITE_OK : SQLITE_IOERR; + return rc == NO_ERROR ? STQLITE_OK : STQLITE_IOERR; } /* @@ -12107,14 +12107,14 @@ int os2FileSize( OsFile *id, i64 *pSize ){ FILESTATUS3 fsts3FileInfo; memset(&fsts3FileInfo, 0, sizeof(fsts3FileInfo)); assert( id!=0 ); - SimulateIOError( return SQLITE_IOERR ); + SimulateIOError( return STQLITE_IOERR ); rc = DosQueryFileInfo( ((os2File*)id)->h, FIL_STANDARD, &fsts3FileInfo, sizeof(FILESTATUS3) ); if( rc == NO_ERROR ){ *pSize = fsts3FileInfo.cbFile; - return SQLITE_OK; + return STQLITE_OK; } else{ - return SQLITE_IOERR; + return STQLITE_IOERR; } } @@ -12148,12 +12148,12 @@ static int unlockReadLock( os2File *id ){ return DosSetFileLocks( id->h, &UnlockArea, &LockArea, 2000L, 1L ); } -#ifndef SQLITE_OMIT_PAGER_PRAGMAS +#ifndef STQLITE_OMIT_PAGER_PRAGMAS /* ** Check that a given pathname is a directory and is writable ** */ -SQLITE_PRIVATE int sqlite3Os2IsDirWritable( char *zDirname ){ +STQLITE_PRIVATE int sqlite3Os2IsDirWritable( char *zDirname ){ FILESTATUS3 fsts3ConfigInfo; APIRET rc = NO_ERROR; memset(&fsts3ConfigInfo, 0, sizeof(fsts3ConfigInfo)); @@ -12165,7 +12165,7 @@ SQLITE_PRIVATE int sqlite3Os2IsDirWritable( char *zDirname ){ return 1; } -#endif /* SQLITE_OMIT_PAGER_PRAGMAS */ +#endif /* STQLITE_OMIT_PAGER_PRAGMAS */ /* ** Lock the file with the lock specified by parameter locktype - one @@ -12194,7 +12194,7 @@ SQLITE_PRIVATE int sqlite3Os2IsDirWritable( char *zDirname ){ ** must go straight to locking level 0. */ int os2Lock( OsFile *id, int locktype ){ - APIRET rc = SQLITE_OK; /* Return code from subroutines */ + APIRET rc = STQLITE_OK; /* Return code from subroutines */ APIRET res = NO_ERROR; /* Result of an OS/2 lock call */ int newLocktype; /* Set id->locktype to this value before exiting */ int gotPendingLock = 0;/* True if we acquired a PENDING lock this time */ @@ -12211,7 +12211,7 @@ int os2Lock( OsFile *id, int locktype ){ ** sqlite3OsEnterMutex() hasn't been called yet. */ if( pFile->locktype>=locktype ){ - return SQLITE_OK; + return STQLITE_OK; } /* Make sure the locking sequence is correct @@ -12309,11 +12309,11 @@ int os2Lock( OsFile *id, int locktype ){ ** return the appropriate result code. */ if( res == NO_ERROR ){ - rc = SQLITE_OK; + rc = STQLITE_OK; }else{ OSTRACE4( "LOCK FAILED %d trying for %d but got %d\n", pFile->h, locktype, newLocktype ); - rc = SQLITE_BUSY; + rc = STQLITE_BUSY; } pFile->locktype = newLocktype; return rc; @@ -12362,11 +12362,11 @@ int os2CheckReservedLock( OsFile *id ){ ** ** It is not possible for this routine to fail if the second argument ** is NO_LOCK. If the second argument is SHARED_LOCK then this routine -** might return SQLITE_IOERR; +** might return STQLITE_IOERR; */ int os2Unlock( OsFile *id, int locktype ){ int type; - APIRET rc = SQLITE_OK; + APIRET rc = STQLITE_OK; os2File *pFile = (os2File*)id; FILELOCK LockArea, UnlockArea; @@ -12385,7 +12385,7 @@ int os2Unlock( OsFile *id, int locktype ){ if( locktype==SHARED_LOCK && getReadLock(pFile) != NO_ERROR ){ /* This should never happen. We should always be able to ** reacquire the read lock */ - rc = SQLITE_IOERR; + rc = STQLITE_IOERR; } } if( type>=RESERVED_LOCK ){ @@ -12415,14 +12415,14 @@ int os2Unlock( OsFile *id, int locktype ){ ** The calling function is responsible for freeing this space once it ** is no longer needed. */ -SQLITE_PRIVATE char *sqlite3Os2FullPathname( const char *zRelative ){ +STQLITE_PRIVATE char *sqlite3Os2FullPathname( const char *zRelative ){ char *zFull = 0; if( strchr(zRelative, ':') ){ sqlite3SetString( &zFull, zRelative, (char*)0 ); }else{ ULONG ulDriveNum = 0; ULONG ulDriveMap = 0; - ULONG cbzBufLen = SQLITE_TEMPNAME_SIZE; + ULONG cbzBufLen = STQLITE_TEMPNAME_SIZE; char zDrive[2]; char *zBuff; @@ -12469,13 +12469,13 @@ static int os2LockState( OsFile *id ){ ** the specified file. This is almost always 512 bytes, but may be ** larger for some devices. ** -** SQLite code assumes this function cannot fail. It also assumes that +** STQLite code assumes this function cannot fail. It also assumes that ** if two files are created in the same file-system directory (i.e. ** a database and it's journal file) that the sector size will be the ** same for both. */ static int os2SectorSize(OsFile *id){ - return SQLITE_DEFAULT_SECTOR_SIZE; + return STQLITE_DEFAULT_SECTOR_SIZE; } /* @@ -12511,29 +12511,29 @@ int allocateOs2File( os2File *pInit, OsFile **pld ){ if( pNew==0 ){ DosClose( pInit->h ); *pld = 0; - return SQLITE_NOMEM; + return STQLITE_NOMEM; }else{ *pNew = *pInit; pNew->pMethod = &sqlite3Os2IoMethod; pNew->locktype = NO_LOCK; *pld = (OsFile*)pNew; OpenCounter(+1); - return SQLITE_OK; + return STQLITE_OK; } } -#endif /* SQLITE_OMIT_DISKIO */ +#endif /* STQLITE_OMIT_DISKIO */ /*************************************************************************** ** Everything above deals with file I/O. Everything that follows deals ** with other miscellanous aspects of the operating system interface ****************************************************************************/ -#ifndef SQLITE_OMIT_LOAD_EXTENSION +#ifndef STQLITE_OMIT_LOAD_EXTENSION /* ** Interfaces for opening a shared library, finding entry points ** within the shared library, and closing the shared library. */ -SQLITE_PRIVATE void *sqlite3Os2Dlopen(const char *zFilename){ +STQLITE_PRIVATE void *sqlite3Os2Dlopen(const char *zFilename){ UCHAR loadErr[256]; HMODULE hmod; APIRET rc; @@ -12541,7 +12541,7 @@ SQLITE_PRIVATE void *sqlite3Os2Dlopen(const char *zFilename){ if (rc != NO_ERROR) return 0; return (void*)hmod; } -SQLITE_PRIVATE void *sqlite3Os2Dlsym(void *pHandle, const char *zSymbol){ +STQLITE_PRIVATE void *sqlite3Os2Dlsym(void *pHandle, const char *zSymbol){ PFN pfn; APIRET rc; rc = DosQueryProcAddr((HMODULE)pHandle, 0L, zSymbol, &pfn); @@ -12556,10 +12556,10 @@ SQLITE_PRIVATE void *sqlite3Os2Dlsym(void *pHandle, const char *zSymbol){ if (rc != NO_ERROR) return 0; return (void *)pfn; } -SQLITE_PRIVATE int sqlite3Os2Dlclose(void *pHandle){ +STQLITE_PRIVATE int sqlite3Os2Dlclose(void *pHandle){ return DosFreeModule((HMODULE)pHandle); } -#endif /* SQLITE_OMIT_LOAD_EXTENSION */ +#endif /* STQLITE_OMIT_LOAD_EXTENSION */ /* @@ -12567,7 +12567,7 @@ SQLITE_PRIVATE int sqlite3Os2Dlclose(void *pHandle){ ** is written into the buffer zBuf[256]. The calling function must ** supply a sufficiently large buffer. */ -SQLITE_PRIVATE int sqlite3Os2RandomSeed( char *zBuf ){ +STQLITE_PRIVATE int sqlite3Os2RandomSeed( char *zBuf ){ /* We have to initialize zBuf to prevent valgrind from reporting ** errors. The reports issued by valgrind are incorrect - we would ** prefer that the randomness be increased by making use of the @@ -12582,13 +12582,13 @@ SQLITE_PRIVATE int sqlite3Os2RandomSeed( char *zBuf ){ */ memset( zBuf, 0, 256 ); DosGetDateTime( (PDATETIME)zBuf ); - return SQLITE_OK; + return STQLITE_OK; } /* ** Sleep for a little while. Return the amount of time slept. */ -SQLITE_PRIVATE int sqlite3Os2Sleep( int ms ){ +STQLITE_PRIVATE int sqlite3Os2Sleep( int ms ){ DosSleep( ms ); return ms; } @@ -12597,7 +12597,7 @@ SQLITE_PRIVATE int sqlite3Os2Sleep( int ms ){ ** Static variables used for thread synchronization */ static int inMutex = 0; -#ifdef SQLITE_OS2_THREADS +#ifdef STQLITE_OS2_THREADS static ULONG mutexOwner; #endif @@ -12606,11 +12606,11 @@ static ULONG mutexOwner; ** multi-threaded processes. Only a single thread is allowed to ** executed code that is surrounded by EnterMutex() and LeaveMutex(). ** -** SQLite uses only a single Mutex. There is not much critical +** STQLite uses only a single Mutex. There is not much critical ** code and what little there is executes quickly and without blocking. */ -SQLITE_PRIVATE void sqlite3Os2EnterMutex(){ -#ifdef SQLITE_OS2_THREADS +STQLITE_PRIVATE void sqlite3Os2EnterMutex(){ +#ifdef STQLITE_OS2_THREADS PTIB ptib; DosEnterCritSec(); DosGetInfoBlocks( &ptib, NULL ); @@ -12619,13 +12619,13 @@ SQLITE_PRIVATE void sqlite3Os2EnterMutex(){ assert( !inMutex ); inMutex = 1; } -SQLITE_PRIVATE void sqlite3Os2LeaveMutex(){ -#ifdef SQLITE_OS2_THREADS +STQLITE_PRIVATE void sqlite3Os2LeaveMutex(){ +#ifdef STQLITE_OS2_THREADS PTIB ptib; #endif assert( inMutex ); inMutex = 0; -#ifdef SQLITE_OS2_THREADS +#ifdef STQLITE_OS2_THREADS DosGetInfoBlocks( &ptib, NULL ); assert( mutexOwner == ptib->tib_ptib2->tib2_ultid ); DosExitCritSec(); @@ -12639,8 +12639,8 @@ SQLITE_PRIVATE void sqlite3Os2LeaveMutex(){ ** calling thread holds the mutex. If the parameter is false, return ** true if any thread holds the mutex. */ -SQLITE_PRIVATE int sqlite3Os2InMutex( int thisThreadOnly ){ -#ifdef SQLITE_OS2_THREADS +STQLITE_PRIVATE int sqlite3Os2InMutex( int thisThreadOnly ){ +#ifdef STQLITE_OS2_THREADS PTIB ptib; DosGetInfoBlocks( &ptib, NULL ); return inMutex>0 && (thisThreadOnly==0 || mutexOwner==ptib->tib_ptib2->tib2_ultid); @@ -12653,7 +12653,7 @@ SQLITE_PRIVATE int sqlite3Os2InMutex( int thisThreadOnly ){ ** The following variable, if set to a non-zero value, becomes the result ** returned from sqlite3OsCurrentTime(). This is used for testing. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_current_time = 0; #endif @@ -12662,7 +12662,7 @@ int sqlite3_current_time = 0; ** current time and date as a Julian Day number into *prNow and ** return 0. Return 1 if the time and date cannot be found. */ -SQLITE_PRIVATE int sqlite3Os2CurrentTime( double *prNow ){ +STQLITE_PRIVATE int sqlite3Os2CurrentTime( double *prNow ){ double now; USHORT second, minute, hour, day, month, year; @@ -12688,7 +12688,7 @@ SQLITE_PRIVATE int sqlite3Os2CurrentTime( double *prNow ){ now += minute/1440.0; now += second/86400.0; *prNow = now; -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST if( sqlite3_current_time ){ *prNow = sqlite3_current_time/86400.0 + 2440587.5; } @@ -12701,7 +12701,7 @@ SQLITE_PRIVATE int sqlite3Os2CurrentTime( double *prNow ){ ** Use this to verify that we are not leaking thread-specific-data. ** Ticket #1601 */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_tsd_count = 0; # define TSD_COUNTER_INCR InterlockedIncrement( &sqlite3_tsd_count ) # define TSD_COUNTER_DECR InterlockedDecrement( &sqlite3_tsd_count ) @@ -12724,7 +12724,7 @@ int sqlite3_tsd_count = 0; ** Return a pointer to the thread specific data or NULL if it is ** unallocated or gets deallocated. */ -SQLITE_PRIVATE ThreadData *sqlite3Os2ThreadSpecificData( int allocateFlag ){ +STQLITE_PRIVATE ThreadData *sqlite3Os2ThreadSpecificData( int allocateFlag ){ static ThreadData **s_ppTsd = NULL; static const ThreadData zeroData = {0, 0, 0}; ThreadData *pTsd; @@ -12781,14 +12781,14 @@ SQLITE_PRIVATE ThreadData *sqlite3Os2ThreadSpecificData( int allocateFlag ){ */ #if OS_UNIX /* This file is used on unix only */ -/* #define SQLITE_ENABLE_LOCKING_STYLE 0 */ +/* #define STQLITE_ENABLE_LOCKING_STYLE 0 */ /* ** These #defines should enable >2GB file support on Posix if the ** underlying operating system supports it. If the OS lacks ** large file support, these should be no-ops. ** -** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch +** Large file support can be disabled using the -DSTQLITE_DISABLE_LFS switch ** on the compiler command line. This is necessary if you are compiling ** on a recent machine (ex: RedHat 7.2) but you want your code to work ** on an older machine (ex: RedHat 6.0). If you compile on RedHat 7.2 @@ -12796,7 +12796,7 @@ SQLITE_PRIVATE ThreadData *sqlite3Os2ThreadSpecificData( int allocateFlag ){ ** in RedHat 6.0, so the code won't work. Hence, for maximum binary ** portability you should omit LFS. */ -#ifndef SQLITE_DISABLE_LFS +#ifndef STQLITE_DISABLE_LFS # define _LARGE_FILE 1 # ifndef _FILE_OFFSET_BITS # define _FILE_OFFSET_BITS 64 @@ -12813,29 +12813,29 @@ SQLITE_PRIVATE ThreadData *sqlite3Os2ThreadSpecificData( int allocateFlag ){ #include <unistd.h> #include <sys/time.h> #include <errno.h> -#ifdef SQLITE_ENABLE_LOCKING_STYLE +#ifdef STQLITE_ENABLE_LOCKING_STYLE #include <sys/ioctl.h> #include <sys/param.h> #include <sys/mount.h> -#endif /* SQLITE_ENABLE_LOCKING_STYLE */ +#endif /* STQLITE_ENABLE_LOCKING_STYLE */ /* ** If we are to be thread-safe, include the pthreads header and define -** the SQLITE_UNIX_THREADS macro. +** the STQLITE_UNIX_THREADS macro. */ #ifndef THREADSAFE # define THREADSAFE 1 #endif #if THREADSAFE # include <pthread.h> -# define SQLITE_UNIX_THREADS 1 +# define STQLITE_UNIX_THREADS 1 #endif /* ** Default permissions when creating a new file */ -#ifndef SQLITE_DEFAULT_FILE_PERMISSIONS -# define SQLITE_DEFAULT_FILE_PERMISSIONS 0644 +#ifndef STQLITE_DEFAULT_FILE_PERMISSIONS +# define STQLITE_DEFAULT_FILE_PERMISSIONS 0644 #endif @@ -12849,16 +12849,16 @@ struct unixFile { IoMethod const *pMethod; /* Always the first entry */ struct openCnt *pOpen; /* Info about all open fd's on this inode */ struct lockInfo *pLock; /* Info about locks on this inode */ -#ifdef SQLITE_ENABLE_LOCKING_STYLE +#ifdef STQLITE_ENABLE_LOCKING_STYLE void *lockingContext; /* Locking style specific state */ -#endif /* SQLITE_ENABLE_LOCKING_STYLE */ +#endif /* STQLITE_ENABLE_LOCKING_STYLE */ int h; /* The file descriptor */ unsigned char locktype; /* The type of lock held on this fd */ unsigned char isOpen; /* True if needs to be closed */ unsigned char fullSync; /* Use F_FULLSYNC if available */ int dirfd; /* File descriptor for the directory */ i64 offset; /* Seek offset */ -#ifdef SQLITE_UNIX_THREADS +#ifdef STQLITE_UNIX_THREADS pthread_t tid; /* The thread that "owns" this OsFile */ #endif }; @@ -12868,7 +12868,7 @@ struct unixFile { ** testing. This is used to simulate OS crashes to verify that ** commits are atomic even in the event of an OS crash. */ -#ifdef SQLITE_CRASH_TEST +#ifdef STQLITE_CRASH_TEST extern int sqlite3CrashTestEnable; extern int sqlite3CrashOpenReadWrite(const char*, OsFile**, int*); extern int sqlite3CrashOpenExclusive(const char*, OsFile**, int); @@ -12907,11 +12907,11 @@ struct unixFile { /* ** At least two bugs have slipped in because we changed the MEMORY_DEBUG -** macro to SQLITE_DEBUG and some older makefiles have not yet made the +** macro to STQLITE_DEBUG and some older makefiles have not yet made the ** switch. The following code should catch this problem at compile-time. */ #ifdef MEMORY_DEBUG -# error "The MEMORY_DEBUG macro is obsolete. Use SQLITE_DEBUG instead." +# error "The MEMORY_DEBUG macro is obsolete. Use STQLITE_DEBUG instead." #endif @@ -12919,12 +12919,12 @@ struct unixFile { * When testing, this global variable stores the location of the * pending-byte in the database file. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST unsigned int sqlite3_pending_byte = 0x40000000; #endif int sqlite3_os_trace = 0; -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG #define OSTRACE1(X) if( sqlite3_os_trace ) sqlite3DebugPrintf(X) #define OSTRACE2(X,Y) if( sqlite3_os_trace ) sqlite3DebugPrintf(X,Y) #define OSTRACE3(X,Y,Z) if( sqlite3_os_trace ) sqlite3DebugPrintf(X,Y,Z) @@ -12948,7 +12948,7 @@ int sqlite3_os_trace = 0; ** Macros for performance tracing. Normally turned off. Only works ** on i486 hardware. */ -#ifdef SQLITE_PERFORMANCE_TRACE +#ifdef STQLITE_PERFORMANCE_TRACE __inline__ unsigned long long int hwtime(void){ unsigned long long int x; __asm__("rdtsc\n\t" @@ -12968,11 +12968,11 @@ static unsigned int elapse; #endif /* -** If we compile with the SQLITE_TEST macro set, then the following block +** If we compile with the STQLITE_TEST macro set, then the following block ** of code will give us the ability to simulate a disk I/O error. This ** is used for testing the I/O recovery logic. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_io_error_hit = 0; int sqlite3_io_error_pending = 0; int sqlite3_io_error_persist = 0; @@ -13006,7 +13006,7 @@ static void local_ioerr(){ /* ** When testing, keep a count of the number of open files. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_open_file_count = 0; #define OpenCounter(X) sqlite3_open_file_count+=(X) #else @@ -13031,8 +13031,8 @@ int sqlite3_open_file_count = 0; ** If neither memory-management or debugging is enabled, the second ** set of implementations is used instead. */ -#if defined(SQLITE_ENABLE_MEMORY_MANAGEMENT) || defined (SQLITE_MEMDEBUG) -SQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ +#if defined(STQLITE_ENABLE_MEMORY_MANAGEMENT) || defined (STQLITE_MEMDEBUG) +STQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ char *p = (char *)malloc(n+8); assert(n>0); assert(sizeof(int)<=8); @@ -13042,7 +13042,7 @@ SQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ } return (void *)p; } -SQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ +STQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ char *p2 = ((char *)p - 8); assert(n>0); p2 = (char*)realloc(p2, n+8); @@ -13052,29 +13052,29 @@ SQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ } return (void *)p2; } -SQLITE_PRIVATE void sqlite3GenericFree(void *p){ +STQLITE_PRIVATE void sqlite3GenericFree(void *p){ assert(p); free((void *)((char *)p - 8)); } -SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ +STQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return p ? *(int *)((char *)p - 8) : 0; } #else -SQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ +STQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ char *p = (char *)malloc(n); return (void *)p; } -SQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ +STQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ assert(n>0); p = realloc(p, n); return p; } -SQLITE_PRIVATE void sqlite3GenericFree(void *p){ +STQLITE_PRIVATE void sqlite3GenericFree(void *p){ assert(p); free(p); } /* Never actually used, but needed for the linker */ -SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } +STQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } #endif /* @@ -13089,10 +13089,10 @@ SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } /* ** Do not include any of the File I/O interface procedures if the -** SQLITE_OMIT_DISKIO macro is defined (indicating that the database +** STQLITE_OMIT_DISKIO macro is defined (indicating that the database ** will be in-memory only) */ -#ifndef SQLITE_OMIT_DISKIO +#ifndef STQLITE_OMIT_DISKIO /* @@ -13101,7 +13101,7 @@ SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } #ifndef O_LARGEFILE # define O_LARGEFILE 0 #endif -#ifdef SQLITE_DISABLE_LFS +#ifdef STQLITE_DISABLE_LFS # undef O_LARGEFILE # define O_LARGEFILE 0 #endif @@ -13126,7 +13126,7 @@ SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } ** The threadid macro resolves to the thread-id or to 0. Used for ** testing and debugging only. */ -#ifdef SQLITE_UNIX_THREADS +#ifdef STQLITE_UNIX_THREADS #define threadid pthread_self() #else #define threadid 0 @@ -13148,7 +13148,7 @@ SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } ** recomputed because its key includes the thread-id. See the ** transferOwnership() function below for additional information */ -#if defined(SQLITE_UNIX_THREADS) +#if defined(STQLITE_UNIX_THREADS) # define SET_THREADID(X) (X)->tid = pthread_self() # define CHECK_THREADID(X) (threadsOverrideEachOthersLocks==0 && \ !pthread_equal((X)->tid, pthread_self())) @@ -13183,7 +13183,7 @@ SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } ** to synchronize access for threads in separate processes, but not ** threads within the same process. ** -** To work around the problem, SQLite has to manage file locks internally +** To work around the problem, STQLite has to manage file locks internally ** on its own. Whenever a new database is opened, we have to find the ** specific inode of the database file (the inode is determined by the ** st_dev and st_ino fields of the stat structure that fstat() fills in) @@ -13215,7 +13215,7 @@ SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } ** ** If you close a file descriptor that points to a file that has locks, ** all locks on that file that are owned by the current process are -** released. To work around this problem, each OsFile structure contains +** released. To work around this problem, each OsFile structure tqcontains ** a pointer to an openCnt structure. There is one openCnt structure ** per open inode, which means that multiple OsFiles can point to a single ** openCnt. When an attempt is made to close an OsFile, if there are @@ -13269,7 +13269,7 @@ SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } struct lockKey { dev_t dev; /* Device number */ ino_t ino; /* Inode number */ -#ifdef SQLITE_UNIX_THREADS +#ifdef STQLITE_UNIX_THREADS pthread_t tid; /* Thread ID or zero if threads can override each other */ #endif }; @@ -13320,12 +13320,12 @@ struct openCnt { ** openKey structures) into lockInfo and openCnt structures. Access to ** these hash tables must be protected by a mutex. */ -static Hash lockHash = {SQLITE_HASH_BINARY, 0, 0, 0, +static Hash lockHash = {STQLITE_HASH_BINARY, 0, 0, 0, sqlite3ThreadSafeMalloc, sqlite3ThreadSafeFree, 0, 0}; -static Hash openHash = {SQLITE_HASH_BINARY, 0, 0, 0, +static Hash openHash = {STQLITE_HASH_BINARY, 0, 0, 0, sqlite3ThreadSafeMalloc, sqlite3ThreadSafeFree, 0, 0}; -#ifdef SQLITE_ENABLE_LOCKING_STYLE +#ifdef STQLITE_ENABLE_LOCKING_STYLE /* ** The locking styles are associated with the different file locking ** capabilities supported by different file systems. @@ -13349,9 +13349,9 @@ typedef enum { noLockingStyle, /* useful for read-only file system */ unsupportedLockingStyle /* indicates unsupported file system */ } sqlite3LockingStyle; -#endif /* SQLITE_ENABLE_LOCKING_STYLE */ +#endif /* STQLITE_ENABLE_LOCKING_STYLE */ -#ifdef SQLITE_UNIX_THREADS +#ifdef STQLITE_UNIX_THREADS /* ** This variable records whether or not threads can override each others ** locks. @@ -13361,22 +13361,22 @@ typedef enum { ** -1: We don't know yet. ** ** On some systems, we know at compile-time if threads can override each -** others locks. On those systems, the SQLITE_THREAD_OVERRIDE_LOCK macro +** others locks. On those systems, the STQLITE_THREAD_OVERRIDE_LOCK macro ** will be set appropriately. On other systems, we have to check at -** runtime. On these latter systems, SQLTIE_THREAD_OVERRIDE_LOCK is +** runtime. On these latter systems, STQLTIE_THREAD_OVERRIDE_LOCK is ** undefined. ** ** This variable normally has file scope only. But during testing, we make ** it a global so that the test code can change its value in order to verify ** that the right stuff happens in either case. */ -#ifndef SQLITE_THREAD_OVERRIDE_LOCK -# define SQLITE_THREAD_OVERRIDE_LOCK -1 +#ifndef STQLITE_THREAD_OVERRIDE_LOCK +# define STQLITE_THREAD_OVERRIDE_LOCK -1 #endif -#ifdef SQLITE_TEST -int threadsOverrideEachOthersLocks = SQLITE_THREAD_OVERRIDE_LOCK; +#ifdef STQLITE_TEST +int threadsOverrideEachOthersLocks = STQLITE_THREAD_OVERRIDE_LOCK; #else -static int threadsOverrideEachOthersLocks = SQLITE_THREAD_OVERRIDE_LOCK; +static int threadsOverrideEachOthersLocks = STQLITE_THREAD_OVERRIDE_LOCK; #endif /* @@ -13389,12 +13389,12 @@ struct threadTestData { int result; /* Result of the locking operation */ }; -#ifdef SQLITE_LOCK_TRACE +#ifdef STQLITE_LOCK_TRACE /* ** Print out information about all locking operations. ** ** This routine is used for troubleshooting locks on multithreaded -** platforms. Enable by compiling with the -DSQLITE_LOCK_TRACE +** platforms. Enable by compiling with the -DSTQLITE_LOCK_TRACE ** command-line option on the compiler. This code is normally ** turned off. */ @@ -13446,7 +13446,7 @@ static int lockTrace(int fd, int op, struct flock *p){ return s; } #define fcntl lockTrace -#endif /* SQLITE_LOCK_TRACE */ +#endif /* STQLITE_LOCK_TRACE */ /* ** The testThreadLockingBehavior() routine launches two separate @@ -13488,7 +13488,7 @@ static void testThreadLockingBehavior(int fd_orig){ close(fd); threadsOverrideEachOthersLocks = d[0].result==0 && d[1].result==0; } -#endif /* SQLITE_UNIX_THREADS */ +#endif /* STQLITE_UNIX_THREADS */ /* ** Release a lockInfo structure previously allocated by findLockInfo(). @@ -13519,7 +13519,7 @@ static void releaseOpenCnt(struct openCnt *pOpen){ } } -#ifdef SQLITE_ENABLE_LOCKING_STYLE +#ifdef STQLITE_ENABLE_LOCKING_STYLE /* ** Tests a byte-range locking query to see if byte range locks are ** supported, if not we fall back to dotlockLockingStyle. @@ -13554,8 +13554,8 @@ static sqlite3LockingStyle sqlite3TestLockingStyle(const char *filePath, static sqlite3LockingStyle sqlite3DetectLockingStyle(const char *filePath, int fd) { -#ifdef SQLITE_FIXED_LOCKING_STYLE - return (sqlite3LockingStyle)SQLITE_FIXED_LOCKING_STYLE; +#ifdef STQLITE_FIXED_LOCKING_STYLE + return (sqlite3LockingStyle)STQLITE_FIXED_LOCKING_STYLE; #else struct statfs fsInfo; @@ -13585,10 +13585,10 @@ static sqlite3LockingStyle sqlite3DetectLockingStyle(const char *filePath, return unsupportedLockingStyle; return sqlite3TestLockingStyle(filePath, fd); -#endif /* SQLITE_FIXED_LOCKING_STYLE */ +#endif /* STQLITE_FIXED_LOCKING_STYLE */ } -#endif /* SQLITE_ENABLE_LOCKING_STYLE */ +#endif /* STQLITE_ENABLE_LOCKING_STYLE */ /* ** Given a file descriptor, locate lockInfo and openCnt structures that @@ -13615,7 +13615,7 @@ static int findLockInfo( memset(&key1, 0, sizeof(key1)); key1.dev = statbuf.st_dev; key1.ino = statbuf.st_ino; -#ifdef SQLITE_UNIX_THREADS +#ifdef STQLITE_UNIX_THREADS if( threadsOverrideEachOthersLocks<0 ){ testThreadLockingBehavior(fd); } @@ -13680,7 +13680,7 @@ exit_findlockinfo: return rc; } -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG /* ** Helper function for printing out trace information from debugging ** binaries. This returns the string represetation of the supplied @@ -13709,25 +13709,25 @@ static const char *locktypeName(int locktype){ ** ** Ownership transfer is only allowed if the unixFile is currently unlocked. ** If the unixFile is locked and an ownership is wrong, then return -** SQLITE_MISUSE. SQLITE_OK is returned if everything works. +** STQLITE_MISUSE. STQLITE_OK is returned if everything works. */ -#ifdef SQLITE_UNIX_THREADS +#ifdef STQLITE_UNIX_THREADS static int transferOwnership(unixFile *pFile){ int rc; pthread_t hSelf; if( threadsOverrideEachOthersLocks ){ /* Ownership transfers not needed on this system */ - return SQLITE_OK; + return STQLITE_OK; } hSelf = pthread_self(); if( pthread_equal(pFile->tid, hSelf) ){ /* We are still in the same thread */ OSTRACE1("No-transfer, same thread\n"); - return SQLITE_OK; + return STQLITE_OK; } if( pFile->locktype!=NO_LOCK ){ /* We cannot change ownership while we are holding a lock! */ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } OSTRACE4("Transfer ownership of %d from %d to %d\n", pFile->h, pFile->tid, hSelf); @@ -13740,27 +13740,27 @@ static int transferOwnership(unixFile *pFile){ locktypeName(pFile->pLock->locktype), pFile->pLock->cnt); return rc; } else { - return SQLITE_OK; + return STQLITE_OK; } } #else /* On single-threaded builds, ownership transfer is a no-op */ -# define transferOwnership(X) SQLITE_OK +# define transferOwnership(X) STQLITE_OK #endif /* ** Delete the named file */ -SQLITE_PRIVATE int sqlite3UnixDelete(const char *zFilename){ - SimulateIOError(return SQLITE_IOERR_DELETE); +STQLITE_PRIVATE int sqlite3UnixDelete(const char *zFilename){ + SimulateIOError(return STQLITE_IOERR_DELETE); unlink(zFilename); - return SQLITE_OK; + return STQLITE_OK; } /* ** Return TRUE if the named file exists. */ -SQLITE_PRIVATE int sqlite3UnixFileExists(const char *zFilename){ +STQLITE_PRIVATE int sqlite3UnixFileExists(const char *zFilename){ return access(zFilename, 0)==0; } @@ -13780,12 +13780,12 @@ static int allocateUnixFile( ** On success, a handle for the open file is written to *id ** and *pReadonly is set to 0 if the file was opened for reading and ** writing or 1 if the file was opened read-only. The function returns -** SQLITE_OK. +** STQLITE_OK. ** -** On failure, the function returns SQLITE_CANTOPEN and leaves +** On failure, the function returns STQLITE_CANTOPEN and leaves ** *id and *pReadonly unchanged. */ -SQLITE_PRIVATE int sqlite3UnixOpenReadWrite( +STQLITE_PRIVATE int sqlite3UnixOpenReadWrite( const char *zFilename, OsFile **pId, int *pReadonly @@ -13795,16 +13795,16 @@ SQLITE_PRIVATE int sqlite3UnixOpenReadWrite( CRASH_TEST_OVERRIDE(sqlite3CrashOpenReadWrite, zFilename, pId, pReadonly); assert( 0==*pId ); h = open(zFilename, O_RDWR|O_CREAT|O_LARGEFILE|O_BINARY, - SQLITE_DEFAULT_FILE_PERMISSIONS); + STQLITE_DEFAULT_FILE_PERMISSIONS); if( h<0 ){ #ifdef EISDIR if( errno==EISDIR ){ - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } #endif h = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY); if( h<0 ){ - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } *pReadonly = 1; }else{ @@ -13824,20 +13824,20 @@ SQLITE_PRIVATE int sqlite3UnixOpenReadWrite( ** If delFlag is true, then make arrangements to automatically delete ** the file when it is closed. ** -** On success, write the file handle into *id and return SQLITE_OK. +** On success, write the file handle into *id and return STQLITE_OK. ** -** On failure, return SQLITE_CANTOPEN. +** On failure, return STQLITE_CANTOPEN. */ -SQLITE_PRIVATE int sqlite3UnixOpenExclusive(const char *zFilename, OsFile **pId, int delFlag){ +STQLITE_PRIVATE int sqlite3UnixOpenExclusive(const char *zFilename, OsFile **pId, int delFlag){ int h; CRASH_TEST_OVERRIDE(sqlite3CrashOpenExclusive, zFilename, pId, delFlag); assert( 0==*pId ); h = open(zFilename, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW|O_LARGEFILE|O_BINARY, - delFlag ? 0600 : SQLITE_DEFAULT_FILE_PERMISSIONS); + delFlag ? 0600 : STQLITE_DEFAULT_FILE_PERMISSIONS); if( h<0 ){ - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } return allocateUnixFile(h, pId, zFilename, delFlag); } @@ -13845,18 +13845,18 @@ SQLITE_PRIVATE int sqlite3UnixOpenExclusive(const char *zFilename, OsFile **pId, /* ** Attempt to open a new file for read-only access. ** -** On success, write the file handle into *id and return SQLITE_OK. +** On success, write the file handle into *id and return STQLITE_OK. ** -** On failure, return SQLITE_CANTOPEN. +** On failure, return STQLITE_CANTOPEN. */ -SQLITE_PRIVATE int sqlite3UnixOpenReadOnly(const char *zFilename, OsFile **pId){ +STQLITE_PRIVATE int sqlite3UnixOpenReadOnly(const char *zFilename, OsFile **pId){ int h; CRASH_TEST_OVERRIDE(sqlite3CrashOpenReadOnly, zFilename, pId, 0); assert( 0==*pId ); h = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY); if( h<0 ){ - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } return allocateUnixFile(h, pId, zFilename, 0); } @@ -13874,10 +13874,10 @@ SQLITE_PRIVATE int sqlite3UnixOpenReadOnly(const char *zFilename, OsFile **pId){ ** a FULL_FSYNC sync applies to all pending disk operations. ** ** On success, a handle for a previously open file at *id is -** updated with the new directory file descriptor and SQLITE_OK is +** updated with the new directory file descriptor and STQLITE_OK is ** returned. ** -** On failure, the function returns SQLITE_CANTOPEN and leaves +** On failure, the function returns STQLITE_CANTOPEN and leaves ** *id unchanged. */ static int unixOpenDirectory( @@ -13891,20 +13891,20 @@ static int unixOpenDirectory( assert( pFile->dirfd<0 ); pFile->dirfd = h = open(zDirname, O_RDONLY|O_BINARY, 0); if( h<0 ){ - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } #ifdef FD_CLOEXEC fcntl(h, F_SETFD, fcntl(h, F_GETFD, 0) | FD_CLOEXEC); #endif OSTRACE3("OPENDIR %-3d %s\n", h, zDirname); - return SQLITE_OK; + return STQLITE_OK; } /* ** Create a temporary file name in zBuf. zBuf must be big enough to -** hold at least SQLITE_TEMPNAME_SIZE characters. +** hold at least STQLITE_TEMPNAME_SIZE characters. */ -SQLITE_PRIVATE int sqlite3UnixTempFileName(char *zBuf){ +STQLITE_PRIVATE int sqlite3UnixTempFileName(char *zBuf){ static const char *azDirs[] = { 0, "/var/tmp", @@ -13914,7 +13914,7 @@ SQLITE_PRIVATE int sqlite3UnixTempFileName(char *zBuf){ }; static const unsigned char zChars[] = "abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" "0123456789"; int i, j; struct stat buf; @@ -13929,7 +13929,7 @@ SQLITE_PRIVATE int sqlite3UnixTempFileName(char *zBuf){ break; } do{ - sqlite3_snprintf(SQLITE_TEMPNAME_SIZE, zBuf, "%s/"TEMP_FILE_PREFIX, zDir); + sqlite3_snprintf(STQLITE_TEMPNAME_SIZE, zBuf, "%s/"TEMP_FILE_PREFIX, zDir); j = strlen(zBuf); sqlite3Randomness(15, &zBuf[j]); for(i=0; i<15; i++, j++){ @@ -13937,22 +13937,22 @@ SQLITE_PRIVATE int sqlite3UnixTempFileName(char *zBuf){ } zBuf[j] = 0; }while( access(zBuf,0)==0 ); - return SQLITE_OK; + return STQLITE_OK; } /* ** Check that a given pathname is a directory and is writable ** */ -SQLITE_PRIVATE int sqlite3UnixIsDirWritable(char *zBuf){ -#ifndef SQLITE_OMIT_PAGER_PRAGMAS +STQLITE_PRIVATE int sqlite3UnixIsDirWritable(char *zBuf){ +#ifndef STQLITE_OMIT_PAGER_PRAGMAS struct stat buf; if( zBuf==0 ) return 0; if( zBuf[0]==0 ) return 0; if( stat(zBuf, &buf) ) return 0; if( !S_ISDIR(buf.st_mode) ) return 0; if( access(zBuf, 07) ) return 0; -#endif /* SQLITE_OMIT_PAGER_PRAGMAS */ +#endif /* STQLITE_OMIT_PAGER_PRAGMAS */ return 1; } @@ -13987,8 +13987,8 @@ static int seekAndRead(unixFile *id, void *pBuf, int cnt){ } /* -** Read data from a file into a buffer. Return SQLITE_OK if all -** bytes were read successfully and SQLITE_IOERR if anything goes +** Read data from a file into a buffer. Return STQLITE_OK if all +** bytes were read successfully and STQLITE_IOERR if anything goes ** wrong. */ static int unixRead(OsFile *id, void *pBuf, int amt){ @@ -13996,12 +13996,12 @@ static int unixRead(OsFile *id, void *pBuf, int amt){ assert( id ); got = seekAndRead((unixFile*)id, pBuf, amt); if( got==amt ){ - return SQLITE_OK; + return STQLITE_OK; }else if( got<0 ){ - return SQLITE_IOERR_READ; + return STQLITE_IOERR_READ; }else{ memset(&((char*)pBuf)[got], 0, amt-got); - return SQLITE_IOERR_SHORT_READ; + return STQLITE_IOERR_SHORT_READ; } } @@ -14034,7 +14034,7 @@ static int seekAndWrite(unixFile *id, const void *pBuf, int cnt){ /* -** Write data from a buffer into a file. Return SQLITE_OK on success +** Write data from a buffer into a file. Return STQLITE_OK on success ** or some other error code on failure. */ static int unixWrite(OsFile *id, const void *pBuf, int amt){ @@ -14049,12 +14049,12 @@ static int unixWrite(OsFile *id, const void *pBuf, int amt){ SimulateDiskfullError(( wrote=0, amt=1 )); if( amt>0 ){ if( wrote<0 ){ - return SQLITE_IOERR_WRITE; + return STQLITE_IOERR_WRITE; }else{ - return SQLITE_FULL; + return STQLITE_FULL; } } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -14062,14 +14062,14 @@ static int unixWrite(OsFile *id, const void *pBuf, int amt){ */ static int unixSeek(OsFile *id, i64 offset){ assert( id ); -#ifdef SQLITE_TEST - if( offset ) SimulateDiskfullError(return SQLITE_FULL); +#ifdef STQLITE_TEST + if( offset ) SimulateDiskfullError(return STQLITE_FULL); #endif ((unixFile*)id)->offset = offset; - return SQLITE_OK; + return STQLITE_OK; } -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST /* ** Count the number of fullsyncs and normal syncs. This is used to test ** that syncs and fullsyncs are occuring at the right times. @@ -14103,10 +14103,10 @@ int sqlite3_fullsync_count = 0; ** unix systems. The following procedure is an attempt to make ** it work better. ** -** The SQLITE_NO_SYNC macro disables all fsync()s. This is useful +** The STQLITE_NO_SYNC macro disables all fsync()s. This is useful ** for testing when we want to run through the test suite quickly. -** You are strongly advised *not* to deploy with SQLITE_NO_SYNC -** enabled, however, since with SQLITE_NO_SYNC enabled, an OS crash +** You are strongly advised *not* to deploy with STQLITE_NO_SYNC +** enabled, however, since with STQLITE_NO_SYNC enabled, an OS crash ** or power failure will likely corrupt the database file. */ static int full_fsync(int fd, int fullSync, int dataOnly){ @@ -14116,16 +14116,16 @@ static int full_fsync(int fd, int fullSync, int dataOnly){ ** FULLSYNC. This is used during testing to verify that this procedure ** gets called with the correct arguments. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST if( fullSync ) sqlite3_fullsync_count++; sqlite3_sync_count++; #endif - /* If we compiled with the SQLITE_NO_SYNC flag, then syncing is a + /* If we compiled with the STQLITE_NO_SYNC flag, then syncing is a ** no-op */ -#ifdef SQLITE_NO_SYNC - rc = SQLITE_OK; +#ifdef STQLITE_NO_SYNC + rc = STQLITE_OK; #else #if HAVE_FULLFSYNC @@ -14151,7 +14151,7 @@ static int full_fsync(int fd, int fullSync, int dataOnly){ rc = fsync(fd); } #endif /* HAVE_FULLFSYNC */ -#endif /* defined(SQLITE_NO_SYNC) */ +#endif /* defined(STQLITE_NO_SYNC) */ return rc; } @@ -14167,7 +14167,7 @@ static int full_fsync(int fd, int fullSync, int dataOnly){ ** has been created by fsync-ing the directory that contains the file. ** If we do not do this and we encounter a power failure, the directory ** entry for the journal might not exist after we reboot. The next -** SQLite to access the file will not know that the journal exists (because +** STQLite to access the file will not know that the journal exists (because ** the directory entry for the journal was never created) and the transaction ** will not roll back - possibly leading to database corruption. */ @@ -14179,12 +14179,12 @@ static int unixSync(OsFile *id, int dataOnly){ rc = full_fsync(pFile->h, pFile->fullSync, dataOnly); SimulateIOError( rc=1 ); if( rc ){ - return SQLITE_IOERR_FSYNC; + return STQLITE_IOERR_FSYNC; } if( pFile->dirfd>=0 ){ OSTRACE4("DIRSYNC %-3d (have_fullfsync=%d fullsync=%d)\n", pFile->dirfd, HAVE_FULLFSYNC, pFile->fullSync); -#ifndef SQLITE_DISABLE_DIRSYNC +#ifndef STQLITE_DISABLE_DIRSYNC /* The directory sync is only attempted if full_fsync is ** turned off or unavailable. If a full_fsync occurred above, ** then the directory sync is superfluous. @@ -14196,13 +14196,13 @@ static int unixSync(OsFile *id, int dataOnly){ ** A failed directory sync is not a big deal. So it seems ** better to ignore the error. Ticket #1657 */ - /* return SQLITE_IOERR; */ + /* return STQLITE_IOERR; */ } #endif close(pFile->dirfd); /* Only need to sync once, so close the directory */ pFile->dirfd = -1; /* when we are done. */ } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -14213,24 +14213,24 @@ static int unixSync(OsFile *id, int dataOnly){ ** before making changes to individual journals on a multi-database commit. ** The F_FULLFSYNC option is not needed here. */ -SQLITE_PRIVATE int sqlite3UnixSyncDirectory(const char *zDirname){ -#ifdef SQLITE_DISABLE_DIRSYNC - return SQLITE_OK; +STQLITE_PRIVATE int sqlite3UnixSyncDirectory(const char *zDirname){ +#ifdef STQLITE_DISABLE_DIRSYNC + return STQLITE_OK; #else int fd; int r; fd = open(zDirname, O_RDONLY|O_BINARY, 0); OSTRACE3("DIRSYNC %-3d (%s)\n", fd, zDirname); if( fd<0 ){ - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } r = fsync(fd); close(fd); SimulateIOError( r=1 ); if( r ){ - return SQLITE_IOERR_DIR_FSYNC; + return STQLITE_IOERR_DIR_FSYNC; }else{ - return SQLITE_OK; + return STQLITE_OK; } #endif } @@ -14244,9 +14244,9 @@ static int unixTruncate(OsFile *id, i64 nByte){ rc = ftruncate(((unixFile*)id)->h, (off_t)nByte); SimulateIOError( rc=1 ); if( rc ){ - return SQLITE_IOERR_TRUNCATE; + return STQLITE_IOERR_TRUNCATE; }else{ - return SQLITE_OK; + return STQLITE_OK; } } @@ -14260,10 +14260,10 @@ static int unixFileSize(OsFile *id, i64 *pSize){ rc = fstat(((unixFile*)id)->h, &buf); SimulateIOError( rc=1 ); if( rc!=0 ){ - return SQLITE_IOERR_FSTAT; + return STQLITE_IOERR_FSTAT; } *pSize = buf.st_size; - return SQLITE_OK; + return STQLITE_OK; } /* @@ -14332,7 +14332,7 @@ static int unixLock(OsFile *id, int locktype){ /* The following describes the implementation of the various locks and ** lock transitions in terms of the POSIX advisory shared and exclusive ** lock primitives (called read-locks and write-locks below, to avoid - ** confusion with SQLite lock names). The algorithms are complicated + ** confusion with STQLite lock names). The algorithms are complicated ** slightly in order to be compatible with windows systems simultaneously ** accessing the same database file, in case that is ever required. ** @@ -14367,7 +14367,7 @@ static int unixLock(OsFile *id, int locktype){ ** locking a random byte from a range, concurrent SHARED locks may exist ** even if the locking primitive used is always a write-lock. */ - int rc = SQLITE_OK; + int rc = STQLITE_OK; unixFile *pFile = (unixFile*)id; struct lockInfo *pLock = pFile->pLock; struct flock lock; @@ -14385,7 +14385,7 @@ static int unixLock(OsFile *id, int locktype){ if( pFile->locktype>=locktype ){ OSTRACE3("LOCK %d %s ok (already held)\n", pFile->h, locktypeName(locktype)); - return SQLITE_OK; + return STQLITE_OK; } /* Make sure the locking sequence is correct @@ -14401,7 +14401,7 @@ static int unixLock(OsFile *id, int locktype){ /* Make sure the current thread owns the pFile. */ rc = transferOwnership(pFile); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqlite3OsLeaveMutex(); return rc; } @@ -14413,13 +14413,13 @@ static int unixLock(OsFile *id, int locktype){ if( (pFile->locktype!=pLock->locktype && (pLock->locktype>=PENDING_LOCK || locktype>SHARED_LOCK)) ){ - rc = SQLITE_BUSY; + rc = STQLITE_BUSY; goto end_lock; } /* If a SHARED lock is requested, and some thread using this PID already ** has a SHARED or RESERVED lock, then increment reference counts and - ** return SQLITE_OK. + ** return STQLITE_OK. */ if( locktype==SHARED_LOCK && (pLock->locktype==SHARED_LOCK || pLock->locktype==RESERVED_LOCK) ){ @@ -14447,7 +14447,7 @@ static int unixLock(OsFile *id, int locktype){ lock.l_start = PENDING_BYTE; s = fcntl(pFile->h, F_SETLK, &lock); if( s==(-1) ){ - rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY; + rc = (errno==EINVAL) ? STQLITE_NOLFS : STQLITE_BUSY; goto end_lock; } } @@ -14470,11 +14470,11 @@ static int unixLock(OsFile *id, int locktype){ lock.l_len = 1L; lock.l_type = F_UNLCK; if( fcntl(pFile->h, F_SETLK, &lock)!=0 ){ - rc = SQLITE_IOERR_UNLOCK; /* This should never happen */ + rc = STQLITE_IOERR_UNLOCK; /* This should never happen */ goto end_lock; } if( s==(-1) ){ - rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY; + rc = (errno==EINVAL) ? STQLITE_NOLFS : STQLITE_BUSY; }else{ pFile->locktype = SHARED_LOCK; pFile->pOpen->nLock++; @@ -14483,7 +14483,7 @@ static int unixLock(OsFile *id, int locktype){ }else if( locktype==EXCLUSIVE_LOCK && pLock->cnt>1 ){ /* We are trying for an exclusive lock but another thread in this ** same process is still holding a shared lock. */ - rc = SQLITE_BUSY; + rc = STQLITE_BUSY; }else{ /* The request was for a RESERVED or EXCLUSIVE lock. It is ** assumed that there is a SHARED or greater lock on the file @@ -14504,11 +14504,11 @@ static int unixLock(OsFile *id, int locktype){ } s = fcntl(pFile->h, F_SETLK, &lock); if( s==(-1) ){ - rc = (errno==EINVAL) ? SQLITE_NOLFS : SQLITE_BUSY; + rc = (errno==EINVAL) ? STQLITE_NOLFS : STQLITE_BUSY; } } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ pFile->locktype = locktype; pLock->locktype = locktype; }else if( locktype==EXCLUSIVE_LOCK ){ @@ -14519,7 +14519,7 @@ static int unixLock(OsFile *id, int locktype){ end_lock: sqlite3OsLeaveMutex(); OSTRACE4("LOCK %d %s %s\n", pFile->h, locktypeName(locktype), - rc==SQLITE_OK ? "ok" : "failed"); + rc==STQLITE_OK ? "ok" : "failed"); return rc; } @@ -14533,7 +14533,7 @@ end_lock: static int unixUnlock(OsFile *id, int locktype){ struct lockInfo *pLock; struct flock lock; - int rc = SQLITE_OK; + int rc = STQLITE_OK; unixFile *pFile = (unixFile*)id; assert( pFile ); @@ -14542,10 +14542,10 @@ static int unixUnlock(OsFile *id, int locktype){ assert( locktype<=SHARED_LOCK ); if( pFile->locktype<=locktype ){ - return SQLITE_OK; + return STQLITE_OK; } if( CHECK_THREADID(pFile) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } sqlite3OsEnterMutex(); pLock = pFile->pLock; @@ -14559,7 +14559,7 @@ static int unixUnlock(OsFile *id, int locktype){ lock.l_len = SHARED_SIZE; if( fcntl(pFile->h, F_SETLK, &lock)==(-1) ){ /* This should never happen */ - rc = SQLITE_IOERR_RDLOCK; + rc = STQLITE_IOERR_RDLOCK; } } lock.l_type = F_UNLCK; @@ -14569,7 +14569,7 @@ static int unixUnlock(OsFile *id, int locktype){ if( fcntl(pFile->h, F_SETLK, &lock)!=(-1) ){ pLock->locktype = SHARED_LOCK; }else{ - rc = SQLITE_IOERR_UNLOCK; /* This should never happen */ + rc = STQLITE_IOERR_UNLOCK; /* This should never happen */ } } if( locktype==NO_LOCK ){ @@ -14587,7 +14587,7 @@ static int unixUnlock(OsFile *id, int locktype){ if( fcntl(pFile->h, F_SETLK, &lock)!=(-1) ){ pLock->locktype = NO_LOCK; }else{ - rc = SQLITE_IOERR_UNLOCK; /* This should never happen */ + rc = STQLITE_IOERR_UNLOCK; /* This should never happen */ } } @@ -14619,7 +14619,7 @@ static int unixUnlock(OsFile *id, int locktype){ static int unixClose(OsFile **pId){ unixFile *id = (unixFile*)*pId; - if( !id ) return SQLITE_OK; + if( !id ) return STQLITE_OK; unixUnlock(*pId, NO_LOCK); if( id->dirfd>=0 ) close(id->dirfd); id->dirfd = -1; @@ -14654,11 +14654,11 @@ static int unixClose(OsFile **pId){ OpenCounter(-1); sqlite3ThreadSafeFree(id); *pId = 0; - return SQLITE_OK; + return STQLITE_OK; } -#ifdef SQLITE_ENABLE_LOCKING_STYLE +#ifdef STQLITE_ENABLE_LOCKING_STYLE #pragma mark AFP Support /* @@ -14750,7 +14750,7 @@ static int afpUnixCheckReservedLock(OsFile *id){ ** function comments for details of lock management. */ static int afpUnixLock(OsFile *id, int locktype) { - int rc = SQLITE_OK; + int rc = STQLITE_OK; unixFile *pFile = (unixFile*)id; afpLockingContext *context = (afpLockingContext *) pFile->lockingContext; int gotPendingLock = 0; @@ -14765,7 +14765,7 @@ static int afpUnixLock(OsFile *id, int locktype) if( pFile->locktype>=locktype ){ OSTRACE3("LOCK %d %s ok (already held)\n", pFile->h, locktypeName(locktype)); - return SQLITE_OK; + return STQLITE_OK; } /* Make sure the locking sequence is correct @@ -14781,7 +14781,7 @@ static int afpUnixLock(OsFile *id, int locktype) /* Make sure the current thread owns the pFile. */ rc = transferOwnership(pFile); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqlite3OsLeaveMutex(); return rc; } @@ -14796,7 +14796,7 @@ static int afpUnixLock(OsFile *id, int locktype) int failed = _AFPFSSetLock(context->filePath, pFile->h, PENDING_BYTE, 1, 1); if (failed) { - rc = SQLITE_BUSY; + rc = STQLITE_BUSY; goto afp_end_lock; } } @@ -14817,12 +14817,12 @@ static int afpUnixLock(OsFile *id, int locktype) /* Drop the temporary PENDING lock */ if (_AFPFSSetLock(context->filePath, pFile->h, PENDING_BYTE, 1, 0)) { - rc = SQLITE_IOERR_UNLOCK; /* This should never happen */ + rc = STQLITE_IOERR_UNLOCK; /* This should never happen */ goto afp_end_lock; } if( failed ){ - rc = SQLITE_BUSY; + rc = STQLITE_BUSY; } else { pFile->locktype = SHARED_LOCK; } @@ -14850,19 +14850,19 @@ static int afpUnixLock(OsFile *id, int locktype) SHARED_SIZE, 1); if (failed && _AFPFSSetLock(context->filePath, pFile->h, SHARED_FIRST + context->sharedLockByte, 1, 1)) { - rc = SQLITE_IOERR_RDLOCK; /* this should never happen */ + rc = STQLITE_IOERR_RDLOCK; /* this should never happen */ } } else { /* */ - rc = SQLITE_IOERR_UNLOCK; /* this should never happen */ + rc = STQLITE_IOERR_UNLOCK; /* this should never happen */ } } - if( failed && rc == SQLITE_OK){ - rc = SQLITE_BUSY; + if( failed && rc == STQLITE_OK){ + rc = STQLITE_BUSY; } } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ pFile->locktype = locktype; }else if( locktype==EXCLUSIVE_LOCK ){ pFile->locktype = PENDING_LOCK; @@ -14871,7 +14871,7 @@ static int afpUnixLock(OsFile *id, int locktype) afp_end_lock: sqlite3OsLeaveMutex(); OSTRACE4("LOCK %d %s %s\n", pFile->h, locktypeName(locktype), - rc==SQLITE_OK ? "ok" : "failed"); + rc==STQLITE_OK ? "ok" : "failed"); return rc; } @@ -14884,7 +14884,7 @@ afp_end_lock: */ static int afpUnixUnlock(OsFile *id, int locktype) { struct flock lock; - int rc = SQLITE_OK; + int rc = STQLITE_OK; unixFile *pFile = (unixFile*)id; afpLockingContext *context = (afpLockingContext *) pFile->lockingContext; @@ -14894,10 +14894,10 @@ static int afpUnixUnlock(OsFile *id, int locktype) { assert( locktype<=SHARED_LOCK ); if( pFile->locktype<=locktype ){ - return SQLITE_OK; + return STQLITE_OK; } if( CHECK_THREADID(pFile) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } sqlite3OsEnterMutex(); if( pFile->locktype>SHARED_LOCK ){ @@ -14913,24 +14913,24 @@ static int afpUnixUnlock(OsFile *id, int locktype) { if (_AFPFSSetLock(context->filePath, pFile->h, SHARED_FIRST+ context->sharedLockByte, 1, 1)) { /* failed to re-establish our shared lock */ - rc = SQLITE_IOERR_RDLOCK; /* This should never happen */ + rc = STQLITE_IOERR_RDLOCK; /* This should never happen */ } } else { /* This should never happen - failed to unlock the exclusive range */ - rc = SQLITE_IOERR_UNLOCK; + rc = STQLITE_IOERR_UNLOCK; } } } - if (rc == SQLITE_OK && pFile->locktype>=PENDING_LOCK) { + if (rc == STQLITE_OK && pFile->locktype>=PENDING_LOCK) { if (_AFPFSSetLock(context->filePath, pFile->h, PENDING_BYTE, 1, 0)){ /* failed to release the pending lock */ - rc = SQLITE_IOERR_UNLOCK; /* This should never happen */ + rc = STQLITE_IOERR_UNLOCK; /* This should never happen */ } } - if (rc == SQLITE_OK && pFile->locktype>=RESERVED_LOCK) { + if (rc == STQLITE_OK && pFile->locktype>=RESERVED_LOCK) { if (_AFPFSSetLock(context->filePath, pFile->h, RESERVED_BYTE, 1, 0)) { /* failed to release the reserved lock */ - rc = SQLITE_IOERR_UNLOCK; /* This should never happen */ + rc = STQLITE_IOERR_UNLOCK; /* This should never happen */ } } } @@ -14938,10 +14938,10 @@ static int afpUnixUnlock(OsFile *id, int locktype) { int failed = _AFPFSSetLock(context->filePath, pFile->h, SHARED_FIRST + context->sharedLockByte, 1, 0); if (failed) { - rc = SQLITE_IOERR_UNLOCK; /* This should never happen */ + rc = STQLITE_IOERR_UNLOCK; /* This should never happen */ } } - if (rc == SQLITE_OK) + if (rc == STQLITE_OK) pFile->locktype = locktype; sqlite3OsLeaveMutex(); return rc; @@ -14953,7 +14953,7 @@ static int afpUnixUnlock(OsFile *id, int locktype) { static int afpUnixClose(OsFile **pId) { unixFile *id = (unixFile*)*pId; - if( !id ) return SQLITE_OK; + if( !id ) return STQLITE_OK; afpUnixUnlock(*pId, NO_LOCK); /* free the AFP locking structure */ if (id->lockingContext != NULL) { @@ -14970,7 +14970,7 @@ static int afpUnixClose(OsFile **pId) { OpenCounter(-1); sqlite3ThreadSafeFree(id); *pId = 0; - return SQLITE_OK; + return STQLITE_OK; } @@ -15005,18 +15005,18 @@ static int flockUnixLock(OsFile *id, int locktype) { ** Just adjust level and punt on outta here. */ if (pFile->locktype > NO_LOCK) { pFile->locktype = locktype; - return SQLITE_OK; + return STQLITE_OK; } /* grab an exclusive lock */ int rc = flock(pFile->h, LOCK_EX | LOCK_NB); if (rc) { /* didn't get, must be busy */ - return SQLITE_BUSY; + return STQLITE_BUSY; } else { /* got it, set the type and return ok */ pFile->locktype = locktype; - return SQLITE_OK; + return STQLITE_OK; } } @@ -15027,22 +15027,22 @@ static int flockUnixUnlock(OsFile *id, int locktype) { /* no-op if possible */ if( pFile->locktype==locktype ){ - return SQLITE_OK; + return STQLITE_OK; } /* shared can just be set because we always have an exclusive */ if (locktype==SHARED_LOCK) { pFile->locktype = locktype; - return SQLITE_OK; + return STQLITE_OK; } /* no, really, unlock. */ int rc = flock(pFile->h, LOCK_UN); if (rc) - return SQLITE_IOERR_UNLOCK; + return STQLITE_IOERR_UNLOCK; else { pFile->locktype = NO_LOCK; - return SQLITE_OK; + return STQLITE_OK; } } @@ -15052,7 +15052,7 @@ static int flockUnixUnlock(OsFile *id, int locktype) { static int flockUnixClose(OsFile **pId) { unixFile *id = (unixFile*)*pId; - if( !id ) return SQLITE_OK; + if( !id ) return STQLITE_OK; flockUnixUnlock(*pId, NO_LOCK); if( id->dirfd>=0 ) close(id->dirfd); @@ -15066,7 +15066,7 @@ static int flockUnixClose(OsFile **pId) { OpenCounter(-1); sqlite3ThreadSafeFree(id); *pId = 0; - return SQLITE_OK; + return STQLITE_OK; } #pragma mark Old-School .lock file based locking @@ -15111,26 +15111,26 @@ static int dotlockUnixLock(OsFile *id, int locktype) { /* Always update the timestamp on the old file */ utimes(context->lockPath,NULL); - return SQLITE_OK; + return STQLITE_OK; } /* check to see if lock file already exists */ struct stat statBuf; if (lstat(context->lockPath,&statBuf) == 0){ - return SQLITE_BUSY; /* it does, busy */ + return STQLITE_BUSY; /* it does, busy */ } /* grab an exclusive lock */ int fd = open(context->lockPath,O_RDONLY|O_CREAT|O_EXCL,0600); if (fd < 0) { /* failed to open/create the file, someone else may have stolen the lock */ - return SQLITE_BUSY; + return STQLITE_BUSY; } close(fd); /* got it, set the type and return ok */ pFile->locktype = locktype; - return SQLITE_OK; + return STQLITE_OK; } static int dotlockUnixUnlock(OsFile *id, int locktype) { @@ -15142,19 +15142,19 @@ static int dotlockUnixUnlock(OsFile *id, int locktype) { /* no-op if possible */ if( pFile->locktype==locktype ){ - return SQLITE_OK; + return STQLITE_OK; } /* shared can just be set because we always have an exclusive */ if (locktype==SHARED_LOCK) { pFile->locktype = locktype; - return SQLITE_OK; + return STQLITE_OK; } /* no, really, unlock. */ unlink(context->lockPath); pFile->locktype = NO_LOCK; - return SQLITE_OK; + return STQLITE_OK; } /* @@ -15163,7 +15163,7 @@ static int dotlockUnixUnlock(OsFile *id, int locktype) { static int dotlockUnixClose(OsFile **pId) { unixFile *id = (unixFile*)*pId; - if( !id ) return SQLITE_OK; + if( !id ) return STQLITE_OK; dotlockUnixUnlock(*pId, NO_LOCK); /* free the dotlock locking structure */ if (id->lockingContext != NULL) { @@ -15185,7 +15185,7 @@ static int dotlockUnixClose(OsFile **pId) { OpenCounter(-1); sqlite3ThreadSafeFree(id); *pId = 0; - return SQLITE_OK; + return STQLITE_OK; } @@ -15201,11 +15201,11 @@ static int nolockUnixCheckReservedLock(OsFile *id) { } static int nolockUnixLock(OsFile *id, int locktype) { - return SQLITE_OK; + return STQLITE_OK; } static int nolockUnixUnlock(OsFile *id, int locktype) { - return SQLITE_OK; + return STQLITE_OK; } /* @@ -15214,7 +15214,7 @@ static int nolockUnixUnlock(OsFile *id, int locktype) { static int nolockUnixClose(OsFile **pId) { unixFile *id = (unixFile*)*pId; - if( !id ) return SQLITE_OK; + if( !id ) return STQLITE_OK; if( id->dirfd>=0 ) close(id->dirfd); id->dirfd = -1; sqlite3OsEnterMutex(); @@ -15227,10 +15227,10 @@ static int nolockUnixClose(OsFile **pId) { OpenCounter(-1); sqlite3ThreadSafeFree(id); *pId = 0; - return SQLITE_OK; + return STQLITE_OK; } -#endif /* SQLITE_ENABLE_LOCKING_STYLE */ +#endif /* STQLITE_ENABLE_LOCKING_STYLE */ /* ** Turn a relative pathname into a full pathname. Return a pointer @@ -15238,7 +15238,7 @@ static int nolockUnixClose(OsFile **pId) { ** The calling function is responsible for freeing this space once it ** is no longer needed. */ -SQLITE_PRIVATE char *sqlite3UnixFullPathname(const char *zRelative){ +STQLITE_PRIVATE char *sqlite3UnixFullPathname(const char *zRelative){ char *zFull = 0; if( zRelative[0]=='/' ){ sqlite3SetString(&zFull, zRelative, (char*)0); @@ -15309,13 +15309,13 @@ static int unixLockState(OsFile *id){ ** the specified file. This is almost always 512 bytes, but may be ** larger for some devices. ** -** SQLite code assumes this function cannot fail. It also assumes that +** STQLite code assumes this function cannot fail. It also assumes that ** if two files are created in the same file-system directory (i.e. ** a database and it's journal file) that the sector size will be the ** same for both. */ static int unixSectorSize(OsFile *id){ - return SQLITE_DEFAULT_SECTOR_SIZE; + return STQLITE_DEFAULT_SECTOR_SIZE; } /* @@ -15340,7 +15340,7 @@ static const IoMethod sqlite3UnixIoMethod = { unixSectorSize, }; -#ifdef SQLITE_ENABLE_LOCKING_STYLE +#ifdef STQLITE_ENABLE_LOCKING_STYLE /* ** This vector defines all the methods that can operate on an OsFile ** for unix with AFP style file locking. @@ -15429,14 +15429,14 @@ static const IoMethod sqlite3NolockLockingUnixIoMethod = { unixSectorSize, }; -#endif /* SQLITE_ENABLE_LOCKING_STYLE */ +#endif /* STQLITE_ENABLE_LOCKING_STYLE */ /* ** Allocate memory for a new unixFile and initialize that unixFile. ** Write a pointer to the new unixFile into *pId. ** If we run out of memory, close the file and return an error. */ -#ifdef SQLITE_ENABLE_LOCKING_STYLE +#ifdef STQLITE_ENABLE_LOCKING_STYLE /* ** When locking extensions are enabled, the filepath and locking style ** are needed to determine the unixFile pMethod to use for locking operations. @@ -15463,7 +15463,7 @@ static int allocateUnixFile( if( rc ){ close(h); unlink(zFilename); - return SQLITE_NOMEM; + return STQLITE_NOMEM; } } else { /* pLock and pOpen are only used for posix advisory locking */ @@ -15484,7 +15484,7 @@ static int allocateUnixFile( releaseOpenCnt(f.pOpen); sqlite3OsLeaveMutex(); *pId = 0; - return SQLITE_NOMEM; + return STQLITE_NOMEM; }else{ *pNew = f; switch(lockingStyle) { @@ -15533,10 +15533,10 @@ static int allocateUnixFile( } *pId = (OsFile*)pNew; OpenCounter(+1); - return SQLITE_OK; + return STQLITE_OK; } } -#else /* SQLITE_ENABLE_LOCKING_STYLE */ +#else /* STQLITE_ENABLE_LOCKING_STYLE */ static int allocateUnixFile( int h, /* Open file descriptor on file being opened */ OsFile **pId, /* Write the resul unixFile structure here */ @@ -15559,7 +15559,7 @@ static int allocateUnixFile( } if( rc ){ close(h); - return SQLITE_NOMEM; + return STQLITE_NOMEM; } OSTRACE3("OPEN %-3d %s\n", h, zFilename); f.dirfd = -1; @@ -15573,47 +15573,47 @@ static int allocateUnixFile( releaseOpenCnt(f.pOpen); sqlite3OsLeaveMutex(); *pId = 0; - return SQLITE_NOMEM; + return STQLITE_NOMEM; }else{ *pNew = f; pNew->pMethod = &sqlite3UnixIoMethod; *pId = (OsFile*)pNew; OpenCounter(+1); - return SQLITE_OK; + return STQLITE_OK; } } -#endif /* SQLITE_ENABLE_LOCKING_STYLE */ +#endif /* STQLITE_ENABLE_LOCKING_STYLE */ -#endif /* SQLITE_OMIT_DISKIO */ +#endif /* STQLITE_OMIT_DISKIO */ /*************************************************************************** ** Everything above deals with file I/O. Everything that follows deals ** with other miscellanous aspects of the operating system interface ****************************************************************************/ -#ifndef SQLITE_OMIT_LOAD_EXTENSION +#ifndef STQLITE_OMIT_LOAD_EXTENSION /* ** Interfaces for opening a shared library, finding entry points ** within the shared library, and closing the shared library. */ #include <dlfcn.h> -SQLITE_PRIVATE void *sqlite3UnixDlopen(const char *zFilename){ +STQLITE_PRIVATE void *sqlite3UnixDlopen(const char *zFilename){ return dlopen(zFilename, RTLD_NOW | RTLD_GLOBAL); } -SQLITE_PRIVATE void *sqlite3UnixDlsym(void *pHandle, const char *zSymbol){ +STQLITE_PRIVATE void *sqlite3UnixDlsym(void *pHandle, const char *zSymbol){ return dlsym(pHandle, zSymbol); } -SQLITE_PRIVATE int sqlite3UnixDlclose(void *pHandle){ +STQLITE_PRIVATE int sqlite3UnixDlclose(void *pHandle){ return dlclose(pHandle); } -#endif /* SQLITE_OMIT_LOAD_EXTENSION */ +#endif /* STQLITE_OMIT_LOAD_EXTENSION */ /* ** Get information to seed the random number generator. The seed ** is written into the buffer zBuf[256]. The calling function must ** supply a sufficiently large buffer. */ -SQLITE_PRIVATE int sqlite3UnixRandomSeed(char *zBuf){ +STQLITE_PRIVATE int sqlite3UnixRandomSeed(char *zBuf){ /* We have to initialize zBuf to prevent valgrind from reporting ** errors. The reports issued by valgrind are incorrect - we would ** prefer that the randomness be increased by making use of the @@ -15627,7 +15627,7 @@ SQLITE_PRIVATE int sqlite3UnixRandomSeed(char *zBuf){ ** tests repeatable. */ memset(zBuf, 0, 256); -#if !defined(SQLITE_TEST) +#if !defined(STQLITE_TEST) { int pid, fd; fd = open("/dev/urandom", O_RDONLY); @@ -15643,14 +15643,14 @@ SQLITE_PRIVATE int sqlite3UnixRandomSeed(char *zBuf){ } } #endif - return SQLITE_OK; + return STQLITE_OK; } /* ** Sleep for a little while. Return the amount of time slept. ** The argument is the number of milliseconds we want to sleep. */ -SQLITE_PRIVATE int sqlite3UnixSleep(int ms){ +STQLITE_PRIVATE int sqlite3UnixSleep(int ms){ #if defined(HAVE_USLEEP) && HAVE_USLEEP usleep(ms*1000); return ms; @@ -15676,7 +15676,7 @@ SQLITE_PRIVATE int sqlite3UnixSleep(int ms){ ** access rules apply as for inMutex. ** ** mutexMain The main mutex. Hold this mutex in order to get exclusive -** access to SQLite data structures. +** access to STQLite data structures. ** ** mutexAux An auxiliary mutex needed to access variables defined above. ** @@ -15692,7 +15692,7 @@ SQLITE_PRIVATE int sqlite3UnixSleep(int ms){ ** safer to protect them using mutexAux. */ static int inMutex = 0; -#ifdef SQLITE_UNIX_THREADS +#ifdef STQLITE_UNIX_THREADS static pthread_t mutexOwner; /* Thread holding mutexMain */ static int mutexOwnerValid = 0; /* True if mutexOwner is valid */ static pthread_mutex_t mutexMain = PTHREAD_MUTEX_INITIALIZER; /* The mutex */ @@ -15704,13 +15704,13 @@ static pthread_mutex_t mutexAux = PTHREAD_MUTEX_INITIALIZER; /* Aux mutex */ ** multi-threaded processes. Only a single thread is allowed to ** executed code that is surrounded by EnterMutex() and LeaveMutex(). ** -** SQLite uses only a single Mutex. There is not much critical +** STQLite uses only a single Mutex. There is not much critical ** code and what little there is executes quickly and without blocking. ** ** As of version 3.3.2, this mutex must be recursive. */ -SQLITE_PRIVATE void sqlite3UnixEnterMutex(){ -#ifdef SQLITE_UNIX_THREADS +STQLITE_PRIVATE void sqlite3UnixEnterMutex(){ +#ifdef STQLITE_UNIX_THREADS pthread_mutex_lock(&mutexAux); if( !mutexOwnerValid || !pthread_equal(mutexOwner, pthread_self()) ){ pthread_mutex_unlock(&mutexAux); @@ -15727,9 +15727,9 @@ SQLITE_PRIVATE void sqlite3UnixEnterMutex(){ inMutex++; #endif } -SQLITE_PRIVATE void sqlite3UnixLeaveMutex(){ +STQLITE_PRIVATE void sqlite3UnixLeaveMutex(){ assert( inMutex>0 ); -#ifdef SQLITE_UNIX_THREADS +#ifdef STQLITE_UNIX_THREADS pthread_mutex_lock(&mutexAux); inMutex--; assert( pthread_equal(mutexOwner, pthread_self()) ); @@ -15751,8 +15751,8 @@ SQLITE_PRIVATE void sqlite3UnixLeaveMutex(){ ** calling thread holds the mutex. If the parameter is false, return ** true if any thread holds the mutex. */ -SQLITE_PRIVATE int sqlite3UnixInMutex(int thisThrd){ -#ifdef SQLITE_UNIX_THREADS +STQLITE_PRIVATE int sqlite3UnixInMutex(int thisThrd){ +#ifdef STQLITE_UNIX_THREADS int rc; pthread_mutex_lock(&mutexAux); rc = inMutex>0 && (thisThrd==0 || pthread_equal(mutexOwner,pthread_self())); @@ -15768,9 +15768,9 @@ SQLITE_PRIVATE int sqlite3UnixInMutex(int thisThrd){ ** Use this to verify that we are not leaking thread-specific-data. ** Ticket #1601 */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_tsd_count = 0; -# ifdef SQLITE_UNIX_THREADS +# ifdef STQLITE_UNIX_THREADS static pthread_mutex_t tsd_counter_mutex = PTHREAD_MUTEX_INITIALIZER; # define TSD_COUNTER(N) \ pthread_mutex_lock(&tsd_counter_mutex); \ @@ -15797,10 +15797,10 @@ int sqlite3_tsd_count = 0; ** Return a pointer to the thread specific data or NULL if it is ** unallocated or gets deallocated. */ -SQLITE_PRIVATE ThreadData *sqlite3UnixThreadSpecificData(int allocateFlag){ +STQLITE_PRIVATE ThreadData *sqlite3UnixThreadSpecificData(int allocateFlag){ static const ThreadData zeroData = {0}; /* Initializer to silence warnings ** from broken compilers */ -#ifdef SQLITE_UNIX_THREADS +#ifdef STQLITE_UNIX_THREADS static pthread_key_t key; static int keyInit = 0; ThreadData *pTsd; @@ -15825,7 +15825,7 @@ SQLITE_PRIVATE ThreadData *sqlite3UnixThreadSpecificData(int allocateFlag){ if( !sqlite3TestMallocFail() ){ pTsd = sqlite3OsMalloc(sizeof(zeroData)); } -#ifdef SQLITE_MEMDEBUG +#ifdef STQLITE_MEMDEBUG sqlite3_isFail = 0; #endif if( pTsd ){ @@ -15849,7 +15849,7 @@ SQLITE_PRIVATE ThreadData *sqlite3UnixThreadSpecificData(int allocateFlag){ if( !sqlite3TestMallocFail() ){ pTsd = sqlite3OsMalloc( sizeof(zeroData) ); } -#ifdef SQLITE_MEMDEBUG +#ifdef STQLITE_MEMDEBUG sqlite3_isFail = 0; #endif if( pTsd ){ @@ -15871,7 +15871,7 @@ SQLITE_PRIVATE ThreadData *sqlite3UnixThreadSpecificData(int allocateFlag){ ** The following variable, if set to a non-zero value, becomes the result ** returned from sqlite3OsCurrentTime(). This is used for testing. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_current_time = 0; #endif @@ -15880,7 +15880,7 @@ int sqlite3_current_time = 0; ** current time and date as a Julian Day number into *prNow and ** return 0. Return 1 if the time and date cannot be found. */ -SQLITE_PRIVATE int sqlite3UnixCurrentTime(double *prNow){ +STQLITE_PRIVATE int sqlite3UnixCurrentTime(double *prNow){ #ifdef NO_GETTOD time_t t; time(&t); @@ -15890,7 +15890,7 @@ SQLITE_PRIVATE int sqlite3UnixCurrentTime(double *prNow){ gettimeofday(&sNow, 0); *prNow = 2440587.5 + sNow.tv_sec/86400.0 + sNow.tv_usec/86400000000.0; #endif -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST if( sqlite3_current_time ){ *prNow = sqlite3_current_time/86400.0 + 2440587.5; } @@ -15928,7 +15928,7 @@ SQLITE_PRIVATE int sqlite3UnixCurrentTime(double *prNow){ ** Macros used to determine whether or not to use threads. */ #if defined(THREADSAFE) && THREADSAFE -# define SQLITE_W32_THREADS 1 +# define STQLITE_W32_THREADS 1 #endif /* @@ -15958,11 +15958,11 @@ SQLITE_PRIVATE int sqlite3UnixCurrentTime(double *prNow){ /* ** At least two bugs have slipped in because we changed the MEMORY_DEBUG -** macro to SQLITE_DEBUG and some older makefiles have not yet made the +** macro to STQLITE_DEBUG and some older makefiles have not yet made the ** switch. The following code should catch this problem at compile-time. */ #ifdef MEMORY_DEBUG -# error "The MEMORY_DEBUG macro is obsolete. Use SQLITE_DEBUG instead." +# error "The MEMORY_DEBUG macro is obsolete. Use STQLITE_DEBUG instead." #endif @@ -15970,12 +15970,12 @@ SQLITE_PRIVATE int sqlite3UnixCurrentTime(double *prNow){ * When testing, this global variable stores the location of the * pending-byte in the database file. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST unsigned int sqlite3_pending_byte = 0x40000000; #endif int sqlite3_os_trace = 0; -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG #define OSTRACE1(X) if( sqlite3_os_trace ) sqlite3DebugPrintf(X) #define OSTRACE2(X,Y) if( sqlite3_os_trace ) sqlite3DebugPrintf(X,Y) #define OSTRACE3(X,Y,Z) if( sqlite3_os_trace ) sqlite3DebugPrintf(X,Y,Z) @@ -15999,7 +15999,7 @@ int sqlite3_os_trace = 0; ** Macros for performance tracing. Normally turned off. Only works ** on i486 hardware. */ -#ifdef SQLITE_PERFORMANCE_TRACE +#ifdef STQLITE_PERFORMANCE_TRACE __inline__ unsigned long long int hwtime(void){ unsigned long long int x; __asm__("rdtsc\n\t" @@ -16019,11 +16019,11 @@ static unsigned int elapse; #endif /* -** If we compile with the SQLITE_TEST macro set, then the following block +** If we compile with the STQLITE_TEST macro set, then the following block ** of code will give us the ability to simulate a disk I/O error. This ** is used for testing the I/O recovery logic. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_io_error_hit = 0; int sqlite3_io_error_pending = 0; int sqlite3_io_error_persist = 0; @@ -16057,7 +16057,7 @@ static void local_ioerr(){ /* ** When testing, keep a count of the number of open files. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_open_file_count = 0; #define OpenCounter(X) sqlite3_open_file_count+=(X) #else @@ -16082,8 +16082,8 @@ int sqlite3_open_file_count = 0; ** If neither memory-management or debugging is enabled, the second ** set of implementations is used instead. */ -#if defined(SQLITE_ENABLE_MEMORY_MANAGEMENT) || defined (SQLITE_MEMDEBUG) -SQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ +#if defined(STQLITE_ENABLE_MEMORY_MANAGEMENT) || defined (STQLITE_MEMDEBUG) +STQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ char *p = (char *)malloc(n+8); assert(n>0); assert(sizeof(int)<=8); @@ -16093,7 +16093,7 @@ SQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ } return (void *)p; } -SQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ +STQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ char *p2 = ((char *)p - 8); assert(n>0); p2 = (char*)realloc(p2, n+8); @@ -16103,29 +16103,29 @@ SQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ } return (void *)p2; } -SQLITE_PRIVATE void sqlite3GenericFree(void *p){ +STQLITE_PRIVATE void sqlite3GenericFree(void *p){ assert(p); free((void *)((char *)p - 8)); } -SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ +STQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return p ? *(int *)((char *)p - 8) : 0; } #else -SQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ +STQLITE_PRIVATE void *sqlite3GenericMalloc(int n){ char *p = (char *)malloc(n); return (void *)p; } -SQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ +STQLITE_PRIVATE void *sqlite3GenericRealloc(void *p, int n){ assert(n>0); p = realloc(p, n); return p; } -SQLITE_PRIVATE void sqlite3GenericFree(void *p){ +STQLITE_PRIVATE void sqlite3GenericFree(void *p){ assert(p); free(p); } /* Never actually used, but needed for the linker */ -SQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } +STQLITE_PRIVATE int sqlite3GenericAllocationSize(void *p){ return 0; } #endif /* @@ -16184,10 +16184,10 @@ struct winFile { /* ** Do not include any of the File I/O interface procedures if the -** SQLITE_OMIT_DISKIO macro is defined (indicating that there database +** STQLITE_OMIT_DISKIO macro is defined (indicating that there database ** will be in-memory only) */ -#ifndef SQLITE_OMIT_DISKIO +#ifndef STQLITE_OMIT_DISKIO /* ** The following variable is (normally) set once and never changes @@ -16229,7 +16229,7 @@ int sqlite3_os_type = 0; #endif /* OS_WINCE */ /* -** Convert a UTF-8 string to microsoft unicode (UTF-16?). +** Convert a UTF-8 string to microsoft tqunicode (UTF-16?). ** ** Space to hold the returned string is obtained from sqliteMalloc. */ @@ -16251,10 +16251,10 @@ static WCHAR *utf8ToUnicode(const char *zFilename){ } /* -** Convert microsoft unicode to UTF-8. Space to hold the returned string is +** Convert microsoft tqunicode to UTF-8. Space to hold the returned string is ** obtained from sqliteMalloc(). */ -static char *unicodeToUtf8(const WCHAR *zWideFilename){ +static char *tqunicodeToUtf8(const WCHAR *zWideFilename){ int nByte; char *zFilename; @@ -16273,7 +16273,7 @@ static char *unicodeToUtf8(const WCHAR *zWideFilename){ } /* -** Convert an ansi string to microsoft unicode, based on the +** Convert an ansi string to microsoft tqunicode, based on the ** current codepage settings for file apis. ** ** Space to hold the returned string is obtained @@ -16298,13 +16298,13 @@ static WCHAR *mbcsToUnicode(const char *zFilename){ } /* -** Convert microsoft unicode to multibyte character string, based on the +** Convert microsoft tqunicode to multibyte character string, based on the ** user's Ansi codepage. ** ** Space to hold the returned string is obtained from ** sqliteMalloc(). */ -static char *unicodeToMbcs(const WCHAR *zWideFilename){ +static char *tqunicodeToMbcs(const WCHAR *zWideFilename){ int nByte; char *zFilename; int codepage = AreFileApisANSI() ? CP_ACP : CP_OEMCP; @@ -16335,7 +16335,7 @@ static char *mbcsToUtf8(const char *zFilename){ if( zTmpWide==0 ){ return 0; } - zFilenameUtf8 = unicodeToUtf8(zTmpWide); + zFilenameUtf8 = tqunicodeToUtf8(zTmpWide); sqliteFree(zTmpWide); return zFilenameUtf8; } @@ -16352,7 +16352,7 @@ static char *utf8ToMbcs(const char *zFilename){ if( zTmpWide==0 ){ return 0; } - zFilenameMbcs = unicodeToMbcs(zTmpWide); + zFilenameMbcs = tqunicodeToMbcs(zTmpWide); sqliteFree(zTmpWide); return zFilenameMbcs; } @@ -16698,14 +16698,14 @@ static void *convertUtf8Filename(const char *zFilename){ ** up and returning an error. */ #define MX_DELETION_ATTEMPTS 3 -SQLITE_PRIVATE int sqlite3WinDelete(const char *zFilename){ +STQLITE_PRIVATE int sqlite3WinDelete(const char *zFilename){ int cnt = 0; int rc; void *zConverted = convertUtf8Filename(zFilename); if( zConverted==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } - SimulateIOError(return SQLITE_IOERR_DELETE); + SimulateIOError(return STQLITE_IOERR_DELETE); if( isNT() ){ do{ rc = DeleteFileW(zConverted); @@ -16713,7 +16713,7 @@ SQLITE_PRIVATE int sqlite3WinDelete(const char *zFilename){ && cnt++ < MX_DELETION_ATTEMPTS && (Sleep(100), 1) ); }else{ #if OS_WINCE - return SQLITE_NOMEM; + return STQLITE_NOMEM; #else do{ rc = DeleteFileA(zConverted); @@ -16723,23 +16723,23 @@ SQLITE_PRIVATE int sqlite3WinDelete(const char *zFilename){ } sqliteFree(zConverted); OSTRACE2("DELETE \"%s\"\n", zFilename); - return rc!=0 ? SQLITE_OK : SQLITE_IOERR; + return rc!=0 ? STQLITE_OK : STQLITE_IOERR; } /* ** Return TRUE if the named file exists. */ -SQLITE_PRIVATE int sqlite3WinFileExists(const char *zFilename){ +STQLITE_PRIVATE int sqlite3WinFileExists(const char *zFilename){ int exists = 0; void *zConverted = convertUtf8Filename(zFilename); if( zConverted==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } if( isNT() ){ exists = GetFileAttributesW((WCHAR*)zConverted) != 0xffffffff; }else{ #if OS_WINCE - return SQLITE_NOMEM; + return STQLITE_NOMEM; #else exists = GetFileAttributesA((char*)zConverted) != 0xffffffff; #endif @@ -16759,12 +16759,12 @@ static int allocateWinFile(winFile *pInit, OsFile **pId); ** On success, a handle for the open file is written to *id ** and *pReadonly is set to 0 if the file was opened for reading and ** writing or 1 if the file was opened read-only. The function returns -** SQLITE_OK. +** STQLITE_OK. ** -** On failure, the function returns SQLITE_CANTOPEN and leaves +** On failure, the function returns STQLITE_CANTOPEN and leaves ** *id and *pReadonly unchanged. */ -SQLITE_PRIVATE int sqlite3WinOpenReadWrite( +STQLITE_PRIVATE int sqlite3WinOpenReadWrite( const char *zFilename, OsFile **pId, int *pReadonly @@ -16773,7 +16773,7 @@ SQLITE_PRIVATE int sqlite3WinOpenReadWrite( HANDLE h; void *zConverted = convertUtf8Filename(zFilename); if( zConverted==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } assert( *pId==0 ); @@ -16797,7 +16797,7 @@ SQLITE_PRIVATE int sqlite3WinOpenReadWrite( ); if( h==INVALID_HANDLE_VALUE ){ sqliteFree(zConverted); - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } *pReadonly = 1; }else{ @@ -16807,12 +16807,12 @@ SQLITE_PRIVATE int sqlite3WinOpenReadWrite( if (!winceCreateLock(zFilename, &f)){ CloseHandle(h); sqliteFree(zConverted); - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } #endif }else{ #if OS_WINCE - return SQLITE_NOMEM; + return STQLITE_NOMEM; #else h = CreateFileA((char*)zConverted, GENERIC_READ | GENERIC_WRITE, @@ -16833,7 +16833,7 @@ SQLITE_PRIVATE int sqlite3WinOpenReadWrite( ); if( h==INVALID_HANDLE_VALUE ){ sqliteFree(zConverted); - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } *pReadonly = 1; }else{ @@ -16863,9 +16863,9 @@ SQLITE_PRIVATE int sqlite3WinOpenReadWrite( ** If delFlag is true, then make arrangements to automatically delete ** the file when it is closed. ** -** On success, write the file handle into *id and return SQLITE_OK. +** On success, write the file handle into *id and return STQLITE_OK. ** -** On failure, return SQLITE_CANTOPEN. +** On failure, return STQLITE_CANTOPEN. ** ** Sometimes if we have just deleted a prior journal file, windows ** will fail to open a new one because there is a "pending delete". @@ -16873,13 +16873,13 @@ SQLITE_PRIVATE int sqlite3WinOpenReadWrite( ** a second open after the first one fails. The whole operation only ** fails if both open attempts are unsuccessful. */ -SQLITE_PRIVATE int sqlite3WinOpenExclusive(const char *zFilename, OsFile **pId, int delFlag){ +STQLITE_PRIVATE int sqlite3WinOpenExclusive(const char *zFilename, OsFile **pId, int delFlag){ winFile f; HANDLE h; DWORD fileflags; void *zConverted = convertUtf8Filename(zFilename); if( zConverted==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } assert( *pId == 0 ); fileflags = FILE_FLAG_RANDOM_ACCESS; @@ -16902,7 +16902,7 @@ SQLITE_PRIVATE int sqlite3WinOpenExclusive(const char *zFilename, OsFile **pId, }while( h==INVALID_HANDLE_VALUE && cnt++ < 2 && (Sleep(100), 1) ); }else{ #if OS_WINCE - return SQLITE_NOMEM; + return STQLITE_NOMEM; #else int cnt = 0; do{ @@ -16926,7 +16926,7 @@ SQLITE_PRIVATE int sqlite3WinOpenExclusive(const char *zFilename, OsFile **pId, #endif sqliteFree(zConverted); if( h==INVALID_HANDLE_VALUE ){ - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } f.h = h; OSTRACE3("OPEN EX %d \"%s\"\n", h, zFilename); @@ -16936,16 +16936,16 @@ SQLITE_PRIVATE int sqlite3WinOpenExclusive(const char *zFilename, OsFile **pId, /* ** Attempt to open a new file for read-only access. ** -** On success, write the file handle into *id and return SQLITE_OK. +** On success, write the file handle into *id and return STQLITE_OK. ** -** On failure, return SQLITE_CANTOPEN. +** On failure, return STQLITE_CANTOPEN. */ -SQLITE_PRIVATE int sqlite3WinOpenReadOnly(const char *zFilename, OsFile **pId){ +STQLITE_PRIVATE int sqlite3WinOpenReadOnly(const char *zFilename, OsFile **pId){ winFile f; HANDLE h; void *zConverted = convertUtf8Filename(zFilename); if( zConverted==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } assert( *pId==0 ); if( isNT() ){ @@ -16959,7 +16959,7 @@ SQLITE_PRIVATE int sqlite3WinOpenReadOnly(const char *zFilename, OsFile **pId){ ); }else{ #if OS_WINCE - return SQLITE_NOMEM; + return STQLITE_NOMEM; #else h = CreateFileA((char*)zConverted, GENERIC_READ, @@ -16973,7 +16973,7 @@ SQLITE_PRIVATE int sqlite3WinOpenReadOnly(const char *zFilename, OsFile **pId){ } sqliteFree(zConverted); if( h==INVALID_HANDLE_VALUE ){ - return SQLITE_CANTOPEN; + return STQLITE_CANTOPEN; } f.h = h; #if OS_WINCE @@ -16994,62 +16994,62 @@ SQLITE_PRIVATE int sqlite3WinOpenReadOnly(const char *zFilename, OsFile **pId){ ** windows since windows does not support hard links. ** ** On success, a handle for a previously open file is at *id is -** updated with the new directory file descriptor and SQLITE_OK is +** updated with the new directory file descriptor and STQLITE_OK is ** returned. ** -** On failure, the function returns SQLITE_CANTOPEN and leaves +** On failure, the function returns STQLITE_CANTOPEN and leaves ** *id unchanged. */ static int winOpenDirectory( OsFile *id, const char *zDirname ){ - return SQLITE_OK; + return STQLITE_OK; } /* ** Create a temporary file name in zBuf. zBuf must be big enough to -** hold at least SQLITE_TEMPNAME_SIZE characters. +** hold at least STQLITE_TEMPNAME_SIZE characters. */ -SQLITE_PRIVATE int sqlite3WinTempFileName(char *zBuf){ +STQLITE_PRIVATE int sqlite3WinTempFileName(char *zBuf){ static char zChars[] = "abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" "0123456789"; int i, j; - char zTempPath[SQLITE_TEMPNAME_SIZE]; + char zTempPath[STQLITE_TEMPNAME_SIZE]; if( sqlite3_temp_directory ){ - strncpy(zTempPath, sqlite3_temp_directory, SQLITE_TEMPNAME_SIZE-30); - zTempPath[SQLITE_TEMPNAME_SIZE-30] = 0; + strncpy(zTempPath, sqlite3_temp_directory, STQLITE_TEMPNAME_SIZE-30); + zTempPath[STQLITE_TEMPNAME_SIZE-30] = 0; }else if( isNT() ){ char *zMulti; - WCHAR zWidePath[SQLITE_TEMPNAME_SIZE]; - GetTempPathW(SQLITE_TEMPNAME_SIZE-30, zWidePath); - zMulti = unicodeToUtf8(zWidePath); + WCHAR zWidePath[STQLITE_TEMPNAME_SIZE]; + GetTempPathW(STQLITE_TEMPNAME_SIZE-30, zWidePath); + zMulti = tqunicodeToUtf8(zWidePath); if( zMulti ){ - strncpy(zTempPath, zMulti, SQLITE_TEMPNAME_SIZE-30); - zTempPath[SQLITE_TEMPNAME_SIZE-30] = 0; + strncpy(zTempPath, zMulti, STQLITE_TEMPNAME_SIZE-30); + zTempPath[STQLITE_TEMPNAME_SIZE-30] = 0; sqliteFree(zMulti); }else{ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } }else{ char *zUtf8; - char zMbcsPath[SQLITE_TEMPNAME_SIZE]; - GetTempPathA(SQLITE_TEMPNAME_SIZE-30, zMbcsPath); + char zMbcsPath[STQLITE_TEMPNAME_SIZE]; + GetTempPathA(STQLITE_TEMPNAME_SIZE-30, zMbcsPath); zUtf8 = mbcsToUtf8(zMbcsPath); if( zUtf8 ){ - strncpy(zTempPath, zUtf8, SQLITE_TEMPNAME_SIZE-30); - zTempPath[SQLITE_TEMPNAME_SIZE-30] = 0; + strncpy(zTempPath, zUtf8, STQLITE_TEMPNAME_SIZE-30); + zTempPath[STQLITE_TEMPNAME_SIZE-30] = 0; sqliteFree(zUtf8); }else{ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } } for(i=strlen(zTempPath); i>0 && zTempPath[i-1]=='\\'; i--){} zTempPath[i] = 0; for(;;){ - sqlite3_snprintf(SQLITE_TEMPNAME_SIZE, zBuf, + sqlite3_snprintf(STQLITE_TEMPNAME_SIZE, zBuf, "%s\\"TEMP_FILE_PREFIX, zTempPath); j = strlen(zBuf); sqlite3Randomness(15, &zBuf[j]); @@ -17060,7 +17060,7 @@ SQLITE_PRIVATE int sqlite3WinTempFileName(char *zBuf){ if( !sqlite3OsFileExists(zBuf) ) break; } OSTRACE2("TEMP FILENAME: %s\n", zBuf); - return SQLITE_OK; + return STQLITE_OK; } /* @@ -17090,40 +17090,40 @@ static int winClose(OsFile **pId){ sqliteFree(pFile); *pId = 0; } - return rc ? SQLITE_OK : SQLITE_IOERR; + return rc ? STQLITE_OK : STQLITE_IOERR; } /* -** Read data from a file into a buffer. Return SQLITE_OK if all -** bytes were read successfully and SQLITE_IOERR if anything goes +** Read data from a file into a buffer. Return STQLITE_OK if all +** bytes were read successfully and STQLITE_IOERR if anything goes ** wrong. */ static int winRead(OsFile *id, void *pBuf, int amt){ DWORD got; assert( id!=0 ); - SimulateIOError(return SQLITE_IOERR_READ); + SimulateIOError(return STQLITE_IOERR_READ); OSTRACE3("READ %d lock=%d\n", ((winFile*)id)->h, ((winFile*)id)->locktype); if( !ReadFile(((winFile*)id)->h, pBuf, amt, &got, 0) ){ - return SQLITE_IOERR_READ; + return STQLITE_IOERR_READ; } if( got==(DWORD)amt ){ - return SQLITE_OK; + return STQLITE_OK; }else{ memset(&((char*)pBuf)[got], 0, amt-got); - return SQLITE_IOERR_SHORT_READ; + return STQLITE_IOERR_SHORT_READ; } } /* -** Write data from a buffer into a file. Return SQLITE_OK on success +** Write data from a buffer into a file. Return STQLITE_OK on success ** or some other error code on failure. */ static int winWrite(OsFile *id, const void *pBuf, int amt){ int rc = 0; DWORD wrote; assert( id!=0 ); - SimulateIOError(return SQLITE_IOERR_READ); - SimulateDiskfullError(return SQLITE_FULL); + SimulateIOError(return STQLITE_IOERR_READ); + SimulateDiskfullError(return STQLITE_FULL); OSTRACE3("WRITE %d lock=%d\n", ((winFile*)id)->h, ((winFile*)id)->locktype); assert( amt>0 ); while( amt>0 && (rc = WriteFile(((winFile*)id)->h, pBuf, amt, &wrote, 0))!=0 @@ -17132,9 +17132,9 @@ static int winWrite(OsFile *id, const void *pBuf, int amt){ pBuf = &((char*)pBuf)[wrote]; } if( !rc || amt>(int)wrote ){ - return SQLITE_FULL; + return STQLITE_FULL; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -17152,15 +17152,15 @@ static int winSeek(OsFile *id, i64 offset){ LONG lowerBits = offset & 0xffffffff; DWORD rc; assert( id!=0 ); -#ifdef SQLITE_TEST - if( offset ) SimulateDiskfullError(return SQLITE_FULL); +#ifdef STQLITE_TEST + if( offset ) SimulateDiskfullError(return STQLITE_FULL); #endif rc = SetFilePointer(((winFile*)id)->h, lowerBits, &upperBits, FILE_BEGIN); OSTRACE3("SEEK %d %lld\n", ((winFile*)id)->h, offset); if( rc==INVALID_SET_FILE_POINTER && GetLastError()!=NO_ERROR ){ - return SQLITE_FULL; + return STQLITE_FULL; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -17170,9 +17170,9 @@ static int winSync(OsFile *id, int dataOnly){ assert( id!=0 ); OSTRACE3("SYNC %d lock=%d\n", ((winFile*)id)->h, ((winFile*)id)->locktype); if( FlushFileBuffers(((winFile*)id)->h) ){ - return SQLITE_OK; + return STQLITE_OK; }else{ - return SQLITE_IOERR; + return STQLITE_IOERR; } } @@ -17180,9 +17180,9 @@ static int winSync(OsFile *id, int dataOnly){ ** Sync the directory zDirname. This is a no-op on operating systems other ** than UNIX. */ -SQLITE_PRIVATE int sqlite3WinSyncDirectory(const char *zDirname){ - SimulateIOError(return SQLITE_IOERR_READ); - return SQLITE_OK; +STQLITE_PRIVATE int sqlite3WinSyncDirectory(const char *zDirname){ + SimulateIOError(return STQLITE_IOERR_READ); + return STQLITE_OK; } /* @@ -17192,10 +17192,10 @@ static int winTruncate(OsFile *id, i64 nByte){ LONG upperBits = nByte>>32; assert( id!=0 ); OSTRACE3("TRUNCATE %d %lld\n", ((winFile*)id)->h, nByte); - SimulateIOError(return SQLITE_IOERR_TRUNCATE); + SimulateIOError(return STQLITE_IOERR_TRUNCATE); SetFilePointer(((winFile*)id)->h, nByte, &upperBits, FILE_BEGIN); SetEndOfFile(((winFile*)id)->h); - return SQLITE_OK; + return STQLITE_OK; } /* @@ -17204,10 +17204,10 @@ static int winTruncate(OsFile *id, i64 nByte){ static int winFileSize(OsFile *id, i64 *pSize){ DWORD upperBits, lowerBits; assert( id!=0 ); - SimulateIOError(return SQLITE_IOERR_FSTAT); + SimulateIOError(return STQLITE_IOERR_FSTAT); lowerBits = GetFileSize(((winFile*)id)->h, &upperBits); *pSize = (((i64)upperBits)<<32) + lowerBits; - return SQLITE_OK; + return STQLITE_OK; } /* @@ -17252,12 +17252,12 @@ static int unlockReadLock(winFile *pFile){ return res; } -#ifndef SQLITE_OMIT_PAGER_PRAGMAS +#ifndef STQLITE_OMIT_PAGER_PRAGMAS /* ** Check that a given pathname is a directory and is writable ** */ -SQLITE_PRIVATE int sqlite3WinIsDirWritable(char *zDirname){ +STQLITE_PRIVATE int sqlite3WinIsDirWritable(char *zDirname){ int fileAttr; void *zConverted; if( zDirname==0 ) return 0; @@ -17265,7 +17265,7 @@ SQLITE_PRIVATE int sqlite3WinIsDirWritable(char *zDirname){ zConverted = convertUtf8Filename(zDirname); if( zConverted==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } if( isNT() ){ fileAttr = GetFileAttributesW((WCHAR*)zConverted); @@ -17283,7 +17283,7 @@ SQLITE_PRIVATE int sqlite3WinIsDirWritable(char *zDirname){ } return 1; } -#endif /* SQLITE_OMIT_PAGER_PRAGMAS */ +#endif /* STQLITE_OMIT_PAGER_PRAGMAS */ /* ** Lock the file with the lock specified by parameter locktype - one @@ -17312,7 +17312,7 @@ SQLITE_PRIVATE int sqlite3WinIsDirWritable(char *zDirname){ ** must go straight to locking level 0. */ static int winLock(OsFile *id, int locktype){ - int rc = SQLITE_OK; /* Return code from subroutines */ + int rc = STQLITE_OK; /* Return code from subroutines */ int res = 1; /* Result of a windows lock call */ int newLocktype; /* Set id->locktype to this value before exiting */ int gotPendingLock = 0;/* True if we acquired a PENDING lock this time */ @@ -17327,7 +17327,7 @@ static int winLock(OsFile *id, int locktype){ ** sqlite3OsEnterMutex() hasn't been called yet. */ if( pFile->locktype>=locktype ){ - return SQLITE_OK; + return STQLITE_OK; } /* Make sure the locking sequence is correct @@ -17408,11 +17408,11 @@ static int winLock(OsFile *id, int locktype){ ** return the appropriate result code. */ if( res ){ - rc = SQLITE_OK; + rc = STQLITE_OK; }else{ OSTRACE4("LOCK FAILED %d trying for %d but got %d\n", pFile->h, locktype, newLocktype); - rc = SQLITE_BUSY; + rc = STQLITE_BUSY; } pFile->locktype = newLocktype; return rc; @@ -17450,11 +17450,11 @@ static int winCheckReservedLock(OsFile *id){ ** ** It is not possible for this routine to fail if the second argument ** is NO_LOCK. If the second argument is SHARED_LOCK then this routine -** might return SQLITE_IOERR; +** might return STQLITE_IOERR; */ static int winUnlock(OsFile *id, int locktype){ int type; - int rc = SQLITE_OK; + int rc = STQLITE_OK; winFile *pFile = (winFile*)id; assert( pFile!=0 ); assert( locktype<=SHARED_LOCK ); @@ -17466,7 +17466,7 @@ static int winUnlock(OsFile *id, int locktype){ if( locktype==SHARED_LOCK && !getReadLock(pFile) ){ /* This should never happen. We should always be able to ** reacquire the read lock */ - rc = SQLITE_IOERR_UNLOCK; + rc = STQLITE_IOERR_UNLOCK; } } if( type>=RESERVED_LOCK ){ @@ -17488,7 +17488,7 @@ static int winUnlock(OsFile *id, int locktype){ ** The calling function is responsible for freeing this space once it ** is no longer needed. */ -SQLITE_PRIVATE char *sqlite3WinFullPathname(const char *zRelative){ +STQLITE_PRIVATE char *sqlite3WinFullPathname(const char *zRelative){ char *zFull; #if defined(__CYGWIN__) int nByte; @@ -17513,7 +17513,7 @@ SQLITE_PRIVATE char *sqlite3WinFullPathname(const char *zRelative){ } GetFullPathNameW((WCHAR*)zConverted, nByte, zTemp, 0); sqliteFree(zConverted); - zFull = unicodeToUtf8(zTemp); + zFull = tqunicodeToUtf8(zTemp); sqliteFree(zTemp); }else{ char *zTemp; @@ -17559,13 +17559,13 @@ static int winLockState(OsFile *id){ ** the specified file. This is almost always 512 bytes, but may be ** larger for some devices. ** -** SQLite code assumes this function cannot fail. It also assumes that +** STQLite code assumes this function cannot fail. It also assumes that ** if two files are created in the same file-system directory (i.e. ** a database and it's journal file) that the sector size will be the ** same for both. */ static int winSectorSize(OsFile *id){ - return SQLITE_DEFAULT_SECTOR_SIZE; + return STQLITE_DEFAULT_SECTOR_SIZE; } /* @@ -17604,7 +17604,7 @@ static int allocateWinFile(winFile *pInit, OsFile **pId){ sqliteFree(pInit->zDeleteOnClose); #endif *pId = 0; - return SQLITE_NOMEM; + return STQLITE_NOMEM; }else{ *pNew = *pInit; pNew->pMethod = &sqlite3WinIoMethod; @@ -17612,23 +17612,23 @@ static int allocateWinFile(winFile *pInit, OsFile **pId){ pNew->sharedLockByte = 0; *pId = (OsFile*)pNew; OpenCounter(+1); - return SQLITE_OK; + return STQLITE_OK; } } -#endif /* SQLITE_OMIT_DISKIO */ +#endif /* STQLITE_OMIT_DISKIO */ /*************************************************************************** ** Everything above deals with file I/O. Everything that follows deals ** with other miscellanous aspects of the operating system interface ****************************************************************************/ -#if !defined(SQLITE_OMIT_LOAD_EXTENSION) +#if !defined(STQLITE_OMIT_LOAD_EXTENSION) /* ** Interfaces for opening a shared library, finding entry points ** within the shared library, and closing the shared library. */ -SQLITE_PRIVATE void *sqlite3WinDlopen(const char *zFilename){ +STQLITE_PRIVATE void *sqlite3WinDlopen(const char *zFilename){ HANDLE h; void *zConverted = convertUtf8Filename(zFilename); if( zConverted==0 ){ @@ -17647,7 +17647,7 @@ SQLITE_PRIVATE void *sqlite3WinDlopen(const char *zFilename){ return (void*)h; } -SQLITE_PRIVATE void *sqlite3WinDlsym(void *pHandle, const char *zSymbol){ +STQLITE_PRIVATE void *sqlite3WinDlsym(void *pHandle, const char *zSymbol){ #if OS_WINCE /* The GetProcAddressA() routine is only available on wince. */ return GetProcAddressA((HANDLE)pHandle, zSymbol); @@ -17657,17 +17657,17 @@ SQLITE_PRIVATE void *sqlite3WinDlsym(void *pHandle, const char *zSymbol){ return GetProcAddress((HANDLE)pHandle, zSymbol); #endif } -SQLITE_PRIVATE int sqlite3WinDlclose(void *pHandle){ +STQLITE_PRIVATE int sqlite3WinDlclose(void *pHandle){ return FreeLibrary((HANDLE)pHandle); } -#endif /* !SQLITE_OMIT_LOAD_EXTENSION */ +#endif /* !STQLITE_OMIT_LOAD_EXTENSION */ /* ** Get information to seed the random number generator. The seed ** is written into the buffer zBuf[256]. The calling function must ** supply a sufficiently large buffer. */ -SQLITE_PRIVATE int sqlite3WinRandomSeed(char *zBuf){ +STQLITE_PRIVATE int sqlite3WinRandomSeed(char *zBuf){ /* We have to initialize zBuf to prevent valgrind from reporting ** errors. The reports issued by valgrind are incorrect - we would ** prefer that the randomness be increased by making use of the @@ -17682,13 +17682,13 @@ SQLITE_PRIVATE int sqlite3WinRandomSeed(char *zBuf){ */ memset(zBuf, 0, 256); GetSystemTime((LPSYSTEMTIME)zBuf); - return SQLITE_OK; + return STQLITE_OK; } /* ** Sleep for a little while. Return the amount of time slept. */ -SQLITE_PRIVATE int sqlite3WinSleep(int ms){ +STQLITE_PRIVATE int sqlite3WinSleep(int ms){ Sleep(ms); return ms; } @@ -17697,7 +17697,7 @@ SQLITE_PRIVATE int sqlite3WinSleep(int ms){ ** Static variables used for thread synchronization */ static int inMutex = 0; -#ifdef SQLITE_W32_THREADS +#ifdef STQLITE_W32_THREADS static DWORD mutexOwner; static CRITICAL_SECTION cs; #endif @@ -17707,14 +17707,14 @@ static int inMutex = 0; ** multi-threaded processes. Only a single thread is allowed to ** executed code that is surrounded by EnterMutex() and LeaveMutex(). ** -** SQLite uses only a single Mutex. There is not much critical +** STQLite uses only a single Mutex. There is not much critical ** code and what little there is executes quickly and without blocking. ** ** Version 3.3.1 and earlier used a simple mutex. Beginning with ** version 3.3.2, a recursive mutex is required. */ -SQLITE_PRIVATE void sqlite3WinEnterMutex(){ -#ifdef SQLITE_W32_THREADS +STQLITE_PRIVATE void sqlite3WinEnterMutex(){ +#ifdef STQLITE_W32_THREADS static int isInit = 0; while( !isInit ){ static long lock = 0; @@ -17730,10 +17730,10 @@ SQLITE_PRIVATE void sqlite3WinEnterMutex(){ #endif inMutex++; } -SQLITE_PRIVATE void sqlite3WinLeaveMutex(){ +STQLITE_PRIVATE void sqlite3WinLeaveMutex(){ assert( inMutex ); inMutex--; -#ifdef SQLITE_W32_THREADS +#ifdef STQLITE_W32_THREADS assert( mutexOwner==GetCurrentThreadId() ); LeaveCriticalSection(&cs); #endif @@ -17746,8 +17746,8 @@ SQLITE_PRIVATE void sqlite3WinLeaveMutex(){ ** calling thread holds the mutex. If the parameter is false, return ** true if any thread holds the mutex. */ -SQLITE_PRIVATE int sqlite3WinInMutex(int thisThreadOnly){ -#ifdef SQLITE_W32_THREADS +STQLITE_PRIVATE int sqlite3WinInMutex(int thisThreadOnly){ +#ifdef STQLITE_W32_THREADS return inMutex>0 && (thisThreadOnly==0 || mutexOwner==GetCurrentThreadId()); #else return inMutex>0; @@ -17759,7 +17759,7 @@ SQLITE_PRIVATE int sqlite3WinInMutex(int thisThreadOnly){ ** The following variable, if set to a non-zero value, becomes the result ** returned from sqlite3OsCurrentTime(). This is used for testing. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_current_time = 0; #endif @@ -17768,7 +17768,7 @@ int sqlite3_current_time = 0; ** current time and date as a Julian Day number into *prNow and ** return 0. Return 1 if the time and date cannot be found. */ -SQLITE_PRIVATE int sqlite3WinCurrentTime(double *prNow){ +STQLITE_PRIVATE int sqlite3WinCurrentTime(double *prNow){ FILETIME ft; /* FILETIME structure is a 64-bit value representing the number of 100-nanosecond intervals since January 1, 1601 (= JD 2305813.5). @@ -17783,7 +17783,7 @@ SQLITE_PRIVATE int sqlite3WinCurrentTime(double *prNow){ #endif now = ((double)ft.dwHighDateTime) * 4294967296.0; *prNow = (now + ft.dwLowDateTime)/864000000000.0 + 2305813.5; -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST if( sqlite3_current_time ){ *prNow = sqlite3_current_time/86400.0 + 2440587.5; } @@ -17796,7 +17796,7 @@ SQLITE_PRIVATE int sqlite3WinCurrentTime(double *prNow){ ** Use this to verify that we are not leaking thread-specific-data. ** Ticket #1601 */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_tsd_count = 0; # define TSD_COUNTER_INCR InterlockedIncrement(&sqlite3_tsd_count) # define TSD_COUNTER_DECR InterlockedDecrement(&sqlite3_tsd_count) @@ -17821,7 +17821,7 @@ int sqlite3_tsd_count = 0; ** Return a pointer to the thread specific data or NULL if it is ** unallocated or gets deallocated. */ -SQLITE_PRIVATE ThreadData *sqlite3WinThreadSpecificData(int allocateFlag){ +STQLITE_PRIVATE ThreadData *sqlite3WinThreadSpecificData(int allocateFlag){ static int key; static int keyInit = 0; static const ThreadData zeroData = {0}; @@ -17884,7 +17884,7 @@ SQLITE_PRIVATE ThreadData *sqlite3WinThreadSpecificData(int allocateFlag){ ** ** @(#) $Id: pager.c,v 1.351 2007/07/20 00:33:36 drh Exp $ */ -#ifndef SQLITE_OMIT_DISKIO +#ifndef STQLITE_OMIT_DISKIO /* ** Macros for troubleshooting. Normally turned off @@ -17970,7 +17970,7 @@ SQLITE_PRIVATE ThreadData *sqlite3WinThreadSpecificData(int allocateFlag){ #define PAGER_SYNCED 5 /* -** If the SQLITE_BUSY_RESERVED_LOCK macro is set to true at compile-time, +** If the STQLITE_BUSY_RESERVED_LOCK macro is set to true at compile-time, ** then failed attempts to get a reserved lock will invoke the busy callback. ** This is off by default. To see why, consider the following scenario: ** @@ -17982,8 +17982,8 @@ SQLITE_PRIVATE ThreadData *sqlite3WinThreadSpecificData(int allocateFlag){ ** (if it never invokes its busy callback) then the contention will be ** resolved quickly. */ -#ifndef SQLITE_BUSY_RESERVED_LOCK -# define SQLITE_BUSY_RESERVED_LOCK 0 +#ifndef STQLITE_BUSY_RESERVED_LOCK +# define STQLITE_BUSY_RESERVED_LOCK 0 #endif /* @@ -18097,7 +18097,7 @@ struct PgHdr { short int nRef; /* Number of users of this page */ PgHdr *pDirty, *pPrevDirty; /* Dirty pages */ u32 notUsed; /* Buffer space */ -#ifdef SQLITE_CHECK_PAGES +#ifdef STQLITE_CHECK_PAGES u32 pageHash; #endif /* pPager->pageSize bytes of page data follow this header */ @@ -18126,7 +18126,7 @@ struct PgHistory { /* ** A macro used for invoking the codec if there is one */ -#ifdef SQLITE_HAS_CODEC +#ifdef STQLITE_HAS_CODEC # define CODEC1(P,D,N,X) if( P->xCodec!=0 ){ P->xCodec(P->pCodecArg,D,N,X); } # define CODEC2(P,D,N,X) ((char*)(P->xCodec!=0?P->xCodec(P->pCodecArg,D,N,X):D)) #else @@ -18147,12 +18147,12 @@ struct PgHistory { /* ** A open page cache is an instance of the following structure. ** -** Pager.errCode may be set to SQLITE_IOERR, SQLITE_CORRUPT, or -** or SQLITE_FULL. Once one of the first three errors occurs, it persists +** Pager.errCode may be set to STQLITE_IOERR, STQLITE_CORRUPT, or +** or STQLITE_FULL. Once one of the first three errors occurs, it persists ** and is returned as the result of every major pager API call. The -** SQLITE_FULL return code is slightly different. It persists only until the +** STQLITE_FULL return code is slightly different. It persists only until the ** next successful rollback is performed on the pager cache. Also, -** SQLITE_FULL does not affect the sqlite3PagerGet() and sqlite3PagerLookup() +** STQLITE_FULL does not affect the sqlite3PagerGet() and sqlite3PagerLookup() ** APIs, they may still be used successfully. */ struct Pager { @@ -18209,19 +18209,19 @@ struct Pager { i64 stmtCksum; /* cksumInit when statement was started */ i64 stmtJSize; /* Size of journal at stmt_begin() */ int sectorSize; /* Assumed sector size during rollback */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int nHit, nMiss; /* Cache hits and missing */ int nRead, nWrite; /* Database pages read/written */ #endif void (*xDestructor)(DbPage*,int); /* Call this routine when freeing pages */ void (*xReiniter)(DbPage*,int); /* Call this routine when reloading pages */ -#ifdef SQLITE_HAS_CODEC +#ifdef STQLITE_HAS_CODEC void *(*xCodec)(void*,void*,Pgno,int); /* Routine for en/decoding data */ void *pCodecArg; /* First argument to xCodec() */ #endif int nHash; /* Size of the pager hash table */ PgHdr **aHash; /* Hash table to map page number to PgHdr */ -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT Pager *pNext; /* Linked list of pagers in this thread */ #endif char *pTmpSpace; /* Pager.pageSize bytes of space for tmp use */ @@ -18233,7 +18233,7 @@ struct Pager { ** testing purposes only. These variables do not exist in ** a non-testing build. These variables are not thread-safe. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_pager_readdb_count = 0; /* Number of full pages read from DB */ int sqlite3_pager_writedb_count = 0; /* Number of full pages written to DB */ int sqlite3_pager_writej_count = 0; /* Number of pages written to journal */ @@ -18287,18 +18287,18 @@ static const unsigned char aJournalMagic[] = { /* ** The macro MEMDB is true if we are dealing with an in-memory database. -** We do this as a macro so that if the SQLITE_OMIT_MEMORYDB macro is set, +** We do this as a macro so that if the STQLITE_OMIT_MEMORYDB macro is set, ** the value of MEMDB will be a constant and the compiler will optimize ** out code that would never execute. */ -#ifdef SQLITE_OMIT_MEMORYDB +#ifdef STQLITE_OMIT_MEMORYDB # define MEMDB 0 #else # define MEMDB pPager->memDb #endif /* -** Page number PAGER_MJ_PGNO is never used in an SQLite database (it is +** Page number PAGER_MJ_PGNO is never used in an STQLite database (it is ** reserved for working around a windows/posix incompatibility). It is ** used in the journal to signify that the remainder of the journal file ** is devoted to storing a master journal name - there are no more pages to @@ -18315,7 +18315,7 @@ static const unsigned char aJournalMagic[] = { /* ** Enable reference count tracking (for debugging) here: */ -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG int pager3_refinfo_enable = 0; static void pager_refinfo(PgHdr *p){ static int cnt = 0; @@ -18380,7 +18380,7 @@ static void pager_resize_hash_table(Pager *pPager, int N){ /* ** Read a 32-bit integer from the given file descriptor. Store the integer -** that is read in *pRes. Return SQLITE_OK if everything worked, or an +** that is read in *pRes. Return STQLITE_OK if everything worked, or an ** error code is something goes wrong. ** ** All values are stored on disk as big-endian. @@ -18388,7 +18388,7 @@ static void pager_resize_hash_table(Pager *pPager, int N){ static int read32bits(OsFile *fd, u32 *pRes){ unsigned char ac[4]; int rc = sqlite3OsRead(fd, ac, sizeof(ac)); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ *pRes = sqlite3Get4byte(ac); } return rc; @@ -18400,7 +18400,7 @@ static int read32bits(OsFile *fd, u32 *pRes){ #define put32bits(A,B) sqlite3Put4byte((u8*)A,B) /* -** Write a 32-bit integer into the given file descriptor. Return SQLITE_OK +** Write a 32-bit integer into the given file descriptor. Return STQLITE_OK ** on success or an error code is something goes wrong. */ static int write32bits(OsFile *fd, u32 val){ @@ -18415,17 +18415,17 @@ static int write32bits(OsFile *fd, u32 val){ ** second the error-code about to be returned by a pager API function. ** The value returned is a copy of the second argument to this function. ** -** If the second argument is SQLITE_IOERR, SQLITE_CORRUPT, or SQLITE_FULL +** If the second argument is STQLITE_IOERR, STQLITE_CORRUPT, or STQLITE_FULL ** the error becomes persistent. All subsequent API calls on this Pager ** will immediately return the same error code. */ static int pager_error(Pager *pPager, int rc){ int rc2 = rc & 0xff; - assert( pPager->errCode==SQLITE_FULL || pPager->errCode==SQLITE_OK ); + assert( pPager->errCode==STQLITE_FULL || pPager->errCode==STQLITE_OK ); if( - rc2==SQLITE_FULL || - rc2==SQLITE_IOERR || - rc2==SQLITE_CORRUPT + rc2==STQLITE_FULL || + rc2==STQLITE_IOERR || + rc2==STQLITE_CORRUPT ){ pPager->errCode = rc; } @@ -18433,11 +18433,11 @@ static int pager_error(Pager *pPager, int rc){ } /* -** If SQLITE_CHECK_PAGES is defined then we do some sanity checking +** If STQLITE_CHECK_PAGES is defined then we do some sanity checking ** on the cache using a hash function. This is used for testing ** and debugging only. */ -#ifdef SQLITE_CHECK_PAGES +#ifdef STQLITE_CHECK_PAGES /* ** Return a 32-bit hash of the page data for pPage. */ @@ -18455,7 +18455,7 @@ static u32 pager_pagehash(PgHdr *pPage){ } /* -** The CHECK_PAGE macro takes a PgHdr* as an argument. If SQLITE_CHECK_PAGES +** The CHECK_PAGE macro takes a PgHdr* as an argument. If STQLITE_CHECK_PAGES ** is defined, and NDEBUG is not defined, an assert() statement checks ** that the page is either dirty or still matches the calculated page-hash. */ @@ -18476,11 +18476,11 @@ static void checkPage(PgHdr *pPg){ ** When this is called the journal file for pager pPager must be open. ** The master journal file name is read from the end of the file and ** written into memory obtained from sqliteMalloc(). *pzMaster is -** set to point at the memory and SQLITE_OK returned. The caller must +** set to point at the memory and STQLITE_OK returned. The caller must ** sqliteFree() *pzMaster. ** ** If no master journal file name is present *pzMaster is set to 0 and -** SQLITE_OK returned. +** STQLITE_OK returned. */ static int readMasterJournal(OsFile *pJrnl, char **pzMaster){ int rc; @@ -18493,29 +18493,29 @@ static int readMasterJournal(OsFile *pJrnl, char **pzMaster){ *pzMaster = 0; rc = sqlite3OsFileSize(pJrnl, &szJ); - if( rc!=SQLITE_OK || szJ<16 ) return rc; + if( rc!=STQLITE_OK || szJ<16 ) return rc; rc = sqlite3OsSeek(pJrnl, szJ-16); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; rc = read32bits(pJrnl, &len); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; rc = read32bits(pJrnl, &cksum); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; rc = sqlite3OsRead(pJrnl, aMagic, 8); - if( rc!=SQLITE_OK || memcmp(aMagic, aJournalMagic, 8) ) return rc; + if( rc!=STQLITE_OK || memcmp(aMagic, aJournalMagic, 8) ) return rc; rc = sqlite3OsSeek(pJrnl, szJ-16-len); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; *pzMaster = (char *)sqliteMalloc(len+1); if( !*pzMaster ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } rc = sqlite3OsRead(pJrnl, *pzMaster, len); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqliteFree(*pzMaster); *pzMaster = 0; return rc; @@ -18528,7 +18528,7 @@ static int readMasterJournal(OsFile *pJrnl, char **pzMaster){ if( cksum ){ /* If the checksum doesn't add up, then one or more of the disk sectors ** containing the master journal filename is corrupted. This means - ** definitely roll back, so just return SQLITE_OK and report a (nul) + ** definitely roll back, so just return STQLITE_OK and report a (nul) ** master-journal filename. */ sqliteFree(*pzMaster); @@ -18537,7 +18537,7 @@ static int readMasterJournal(OsFile *pJrnl, char **pzMaster){ (*pzMaster)[len] = '\0'; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -18620,10 +18620,10 @@ static int writeJournalHdr(Pager *pPager){ /* The journal header has been written successfully. Seek the journal ** file descriptor to the end of the journal header sector. */ - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ IOTRACE(("JTAIL %p %lld\n", pPager, pPager->journalOff-1)) rc = sqlite3OsSeek(pPager->jfd, pPager->journalOff-1); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = sqlite3OsWrite(pPager->jfd, "\000", 1); } } @@ -18639,10 +18639,10 @@ static int writeJournalHdr(Pager *pPager){ ** If the header is read successfully, *nRec is set to the number of ** page records following this header and *dbSize is set to the size of the ** database before the transaction began, in pages. Also, pPager->cksumInit -** is set to the value read from the journal header. SQLITE_OK is returned +** is set to the value read from the journal header. STQLITE_OK is returned ** in this case. ** -** If the journal header file appears to be corrupted, SQLITE_DONE is +** If the journal header file appears to be corrupted, STQLITE_DONE is ** returned and *nRec and *dbSize are not set. If JOURNAL_HDR_SZ bytes ** cannot be read from the journal file an error code is returned. */ @@ -18659,14 +18659,14 @@ static int readJournalHdr( if( rc ) return rc; if( pPager->journalOff+JOURNAL_HDR_SZ(pPager) > journalSize ){ - return SQLITE_DONE; + return STQLITE_DONE; } rc = sqlite3OsRead(pPager->jfd, aMagic, sizeof(aMagic)); if( rc ) return rc; if( memcmp(aMagic, aJournalMagic, sizeof(aMagic))!=0 ){ - return SQLITE_DONE; + return STQLITE_DONE; } rc = read32bits(pPager->jfd, pNRec); @@ -18719,7 +18719,7 @@ static int writeMasterJournal(Pager *pPager, const char *zMaster){ u32 cksum = 0; char zBuf[sizeof(aJournalMagic)+2*4]; - if( !zMaster || pPager->setMaster) return SQLITE_OK; + if( !zMaster || pPager->setMaster) return STQLITE_OK; pPager->setMaster = 1; len = strlen(zMaster); @@ -18733,15 +18733,15 @@ static int writeMasterJournal(Pager *pPager, const char *zMaster){ */ if( pPager->fullSync ){ rc = seekJournalHdr(pPager); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; } pPager->journalOff += (len+20); rc = write32bits(pPager->jfd, PAGER_MJ_PGNO(pPager)); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; rc = sqlite3OsWrite(pPager->jfd, zMaster, len); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; put32bits(zBuf, len); put32bits(&zBuf[4], cksum); @@ -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 invalidated and subsequent attempts +** opened. Any outstanding pages are tqinvalidated and subsequent attempts ** to access those pages will likely result in a coredump. */ static void pager_reset(Pager *pPager){ @@ -18867,11 +18867,11 @@ static void pager_reset(Pager *pPager){ */ static int pager_end_transaction(Pager *pPager){ PgHdr *pPg; - int rc = SQLITE_OK; - int rc2 = SQLITE_OK; + int rc = STQLITE_OK; + int rc2 = STQLITE_OK; assert( !MEMDB ); if( pPager->state<PAGER_RESERVED ){ - return SQLITE_OK; + return STQLITE_OK; } sqlite3PagerStmtCommit(pPager); if( pPager->stmtOpen && !pPager->exclusiveMode ){ @@ -18880,14 +18880,14 @@ static int pager_end_transaction(Pager *pPager){ } if( pPager->journalOpen ){ if( pPager->exclusiveMode - && (rc = sqlite3OsTruncate(pPager->jfd, 0))==SQLITE_OK ){; + && (rc = sqlite3OsTruncate(pPager->jfd, 0))==STQLITE_OK ){; sqlite3OsSeek(pPager->jfd, 0); pPager->journalOff = 0; pPager->journalStarted = 0; }else{ sqlite3OsClose(&pPager->jfd); pPager->journalOpen = 0; - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = sqlite3OsDelete(pPager->zJournal); } } @@ -18898,7 +18898,7 @@ static int pager_end_transaction(Pager *pPager){ pPg->dirty = 0; pPg->needSync = 0; pPg->alwaysRollback = 0; -#ifdef SQLITE_CHECK_PAGES +#ifdef STQLITE_CHECK_PAGES pPg->pageHash = pager_pagehash(pPg); #endif } @@ -18922,7 +18922,7 @@ static int pager_end_transaction(Pager *pPager){ pPager->pFirstSynced = pPager->pFirst; pPager->dbSize = -1; - return (rc==SQLITE_OK?rc2:rc); + return (rc==STQLITE_OK?rc2:rc); } /* @@ -18980,9 +18980,9 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int useCksum){ assert( aData ); rc = read32bits(jfd, &pgno); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; rc = sqlite3OsRead(jfd, aData, pPager->pageSize); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; pPager->journalOff += pPager->pageSize + 4; /* Sanity checking on the page. This is more important that I originally @@ -18991,17 +18991,17 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int useCksum){ ** detect this invalid data (with high probability) and ignore it. */ if( pgno==0 || pgno==PAGER_MJ_PGNO(pPager) ){ - return SQLITE_DONE; + return STQLITE_DONE; } if( pgno>(unsigned)pPager->dbSize ){ - return SQLITE_OK; + return STQLITE_OK; } if( useCksum ){ rc = read32bits(jfd, &cksum); if( rc ) return rc; pPager->journalOff += 4; if( pager_cksum(pPager, aData)!=cksum ){ - return SQLITE_DONE; + return STQLITE_DONE; } } @@ -19040,7 +19040,7 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int useCksum){ PAGERID(pPager), pgno, pager_datahash(pPager->pageSize, aData)); if( pPager->state>=PAGER_EXCLUSIVE && (pPg==0 || pPg->needSync==0) ){ rc = sqlite3OsSeek(pPager->fd, (pgno-1)*(i64)pPager->pageSize); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = sqlite3OsWrite(pPager->fd, aData, pPager->pageSize); } if( pPg ){ @@ -19061,7 +19061,7 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int useCksum){ if( pPager->xReiniter ){ pPager->xReiniter(pPg, pPager->pageSize); } -#ifdef SQLITE_CHECK_PAGES +#ifdef STQLITE_CHECK_PAGES pPg->pageHash = pager_pagehash(pPg); #endif /* If this was page 1, then restore the value of Pager.dbFileVers. @@ -19084,7 +19084,7 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int useCksum){ ** ** The master journal file contains the names of all child journals. ** To tell if a master journal can be deleted, check to each of the -** children. If all children are either missing or do not refer to +** tqchildren. If all tqchildren are either missing or do not refer to ** a different master journal, then this master journal can be deleted. */ static int pager_delmaster(const char *zMaster){ @@ -19098,11 +19098,11 @@ static int pager_delmaster(const char *zMaster){ ** is running this routine also. Not that it makes too much difference. */ rc = sqlite3OsOpenReadOnly(zMaster, &master); - assert( rc!=SQLITE_OK || master ); - if( rc!=SQLITE_OK ) goto delmaster_out; + assert( rc!=STQLITE_OK || master ); + if( rc!=STQLITE_OK ) goto delmaster_out; master_open = 1; rc = sqlite3OsFileSize(master, &nMasterJournal); - if( rc!=SQLITE_OK ) goto delmaster_out; + if( rc!=STQLITE_OK ) goto delmaster_out; if( nMasterJournal>0 ){ char *zJournal; @@ -19113,11 +19113,11 @@ static int pager_delmaster(const char *zMaster){ */ zMasterJournal = (char *)sqliteMalloc(nMasterJournal); if( !zMasterJournal ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; goto delmaster_out; } rc = sqlite3OsRead(master, zMasterJournal, nMasterJournal); - if( rc!=SQLITE_OK ) goto delmaster_out; + if( rc!=STQLITE_OK ) goto delmaster_out; zJournal = zMasterJournal; while( (zJournal-zMasterJournal)<nMasterJournal ){ @@ -19130,14 +19130,14 @@ static int pager_delmaster(const char *zMaster){ int c; rc = sqlite3OsOpenReadOnly(zJournal, &journal); - assert( rc!=SQLITE_OK || journal ); - if( rc!=SQLITE_OK ){ + assert( rc!=STQLITE_OK || journal ); + if( rc!=STQLITE_OK ){ goto delmaster_out; } rc = readMasterJournal(journal, &zMasterPtr); sqlite3OsClose(&journal); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto delmaster_out; } @@ -19172,11 +19172,11 @@ static void pager_truncate_cache(Pager *pPager); ** indicated. Also truncate the cached representation of the file. */ static int pager_truncate(Pager *pPager, int nPage){ - int rc = SQLITE_OK; + int rc = STQLITE_OK; if( pPager->state>=PAGER_EXCLUSIVE ){ rc = sqlite3OsTruncate(pPager->fd, pPager->pageSize*(i64)nPage); } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ pPager->dbSize = nPage; pager_truncate_cache(pPager); } @@ -19243,7 +19243,7 @@ static void setSectorSize(Pager *pPager){ ** If the file opened as the journal file is not a well-formed ** journal file then all pages up to the first corrupted page are rolled ** back (or no pages if the journal header is corrupted). The journal file -** is then deleted and SQLITE_OK returned, just as if no corruption had +** is then deleted and STQLITE_OK returned, just as if no corruption had ** been encountered. ** ** If an I/O or malloc() error occurs, the journal-file is not deleted @@ -19262,7 +19262,7 @@ static int pager_playback(Pager *pPager, int isHot){ */ assert( pPager->journalOpen ); rc = sqlite3OsFileSize(pPager->jfd, &szJ); - if( rc!=SQLITE_OK || szJ==0 ){ + if( rc!=STQLITE_OK || szJ==0 ){ goto end_playback; } @@ -19272,18 +19272,18 @@ static int pager_playback(Pager *pPager, int isHot){ ** played back. */ rc = readMasterJournal(pPager->jfd, &zMaster); - assert( rc!=SQLITE_DONE ); - if( rc!=SQLITE_OK || (zMaster && !sqlite3OsFileExists(zMaster)) ){ + assert( rc!=STQLITE_DONE ); + if( rc!=STQLITE_OK || (zMaster && !sqlite3OsFileExists(zMaster)) ){ sqliteFree(zMaster); zMaster = 0; - if( rc==SQLITE_DONE ) rc = SQLITE_OK; + if( rc==STQLITE_DONE ) rc = STQLITE_OK; goto end_playback; } sqlite3OsSeek(pPager->jfd, 0); pPager->journalOff = 0; /* This loop terminates either when the readJournalHdr() call returns - ** SQLITE_DONE or an IO error occurs. */ + ** STQLITE_DONE or an IO error occurs. */ while( 1 ){ /* Read the next journal header from the journal file. If there are @@ -19292,9 +19292,9 @@ static int pager_playback(Pager *pPager, int isHot){ ** This indicates nothing more needs to be rolled back. */ rc = readJournalHdr(pPager, szJ, &nRec, &mxPg); - if( rc!=SQLITE_OK ){ - if( rc==SQLITE_DONE ){ - rc = SQLITE_OK; + if( rc!=STQLITE_OK ){ + if( rc==STQLITE_DONE ){ + rc = STQLITE_OK; } goto end_playback; } @@ -19322,7 +19322,7 @@ static int pager_playback(Pager *pPager, int isHot){ */ if( pPager->journalOff==JOURNAL_HDR_SZ(pPager) ){ rc = pager_truncate(pPager, mxPg); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto end_playback; } } @@ -19331,9 +19331,9 @@ static int pager_playback(Pager *pPager, int isHot){ */ for(i=0; i<nRec; i++){ rc = pager_playback_one_page(pPager, pPager->jfd, 1); - if( rc!=SQLITE_OK ){ - if( rc==SQLITE_DONE ){ - rc = SQLITE_OK; + if( rc!=STQLITE_OK ){ + if( rc==STQLITE_DONE ){ + rc = STQLITE_OK; pPager->journalOff = szJ; break; }else{ @@ -19346,14 +19346,14 @@ static int pager_playback(Pager *pPager, int isHot){ assert( 0 ); end_playback: - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = pager_end_transaction(pPager); } if( zMaster ){ /* If there was a master journal and this routine will return success, ** see if it is possible to delete the master journal. */ - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = pager_delmaster(zMaster); } sqliteFree(zMaster); @@ -19393,7 +19393,7 @@ static int pager_stmt_playback(Pager *pPager){ { i64 os_szJ; rc = sqlite3OsFileSize(pPager->jfd, &os_szJ); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; assert( szJ==os_szJ ); } #endif @@ -19427,8 +19427,8 @@ static int pager_stmt_playback(Pager *pPager){ */ for(i=nRec-1; i>=0; i--){ rc = pager_playback_one_page(pPager, pPager->stfd, 0); - assert( rc!=SQLITE_DONE ); - if( rc!=SQLITE_OK ) goto end_stmt_playback; + assert( rc!=STQLITE_DONE ); + if( rc!=STQLITE_OK ) goto end_stmt_playback; } /* Now roll some pages back from the transaction journal. Pager.stmtJSize @@ -19440,23 +19440,23 @@ static int pager_stmt_playback(Pager *pPager){ ** of the first journal header written during this statement transaction. */ rc = sqlite3OsSeek(pPager->jfd, pPager->stmtJSize); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto end_stmt_playback; } pPager->journalOff = pPager->stmtJSize; pPager->cksumInit = pPager->stmtCksum; while( pPager->journalOff < hdrOff ){ rc = pager_playback_one_page(pPager, pPager->jfd, 1); - assert( rc!=SQLITE_DONE ); - if( rc!=SQLITE_OK ) goto end_stmt_playback; + assert( rc!=STQLITE_DONE ); + if( rc!=STQLITE_OK ) goto end_stmt_playback; } while( pPager->journalOff < szJ ){ u32 nJRec; /* Number of Journal Records */ u32 dummy; rc = readJournalHdr(pPager, szJ, &nJRec, &dummy); - if( rc!=SQLITE_OK ){ - assert( rc!=SQLITE_DONE ); + if( rc!=STQLITE_OK ){ + assert( rc!=STQLITE_DONE ); goto end_stmt_playback; } if( nJRec==0 ){ @@ -19464,15 +19464,15 @@ static int pager_stmt_playback(Pager *pPager){ } for(i=nJRec-1; i>=0 && pPager->journalOff < szJ; i--){ rc = pager_playback_one_page(pPager, pPager->jfd, 1); - assert( rc!=SQLITE_DONE ); - if( rc!=SQLITE_OK ) goto end_stmt_playback; + assert( rc!=STQLITE_DONE ); + if( rc!=STQLITE_OK ) goto end_stmt_playback; } } pPager->journalOff = szJ; end_stmt_playback: - if( rc==SQLITE_OK) { + if( rc==STQLITE_OK) { pPager->journalOff = szJ; /* pager_reload_cache(pPager); */ } @@ -19482,7 +19482,7 @@ end_stmt_playback: /* ** Change the maximum number of in-memory pages that are allowed. */ -SQLITE_PRIVATE void sqlite3PagerSetCachesize(Pager *pPager, int mxPage){ +STQLITE_PRIVATE void sqlite3PagerSetCachesize(Pager *pPager, int mxPage){ if( mxPage>10 ){ pPager->mxPage = mxPage; }else{ @@ -19516,8 +19516,8 @@ SQLITE_PRIVATE void sqlite3PagerSetCachesize(Pager *pPager, int mxPage){ ** Numeric values associated with these states are OFF==1, NORMAL=2, ** and FULL=3. */ -#ifndef SQLITE_OMIT_PAGER_PRAGMAS -SQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(Pager *pPager, int level, int full_fsync){ +#ifndef STQLITE_OMIT_PAGER_PRAGMAS +STQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(Pager *pPager, int level, int full_fsync){ pPager->noSync = level==1 || pPager->tempFile; pPager->fullSync = level==3 && !pPager->tempFile; pPager->full_fsync = full_fsync; @@ -19530,14 +19530,14 @@ SQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(Pager *pPager, int level, int ful ** attempts to open a temporary file. This information is used for ** testing and analysis only. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_opentemp_count = 0; #endif /* ** Open a temporary file. ** -** Write the file descriptor into *fd. Return SQLITE_OK on success or some +** Write the file descriptor into *fd. Return STQLITE_OK on success or some ** other error code if we fail. ** ** The OS will automatically delete the temporary file when it is @@ -19546,17 +19546,17 @@ int sqlite3_opentemp_count = 0; static int sqlite3PagerOpentemp(OsFile **pFd){ int cnt = 8; int rc; - char zFile[SQLITE_TEMPNAME_SIZE]; + char zFile[STQLITE_TEMPNAME_SIZE]; -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST sqlite3_opentemp_count++; /* Used for testing and analysis only */ #endif do{ cnt--; sqlite3OsTempFileName(zFile); rc = sqlite3OsOpenExclusive(zFile, pFd, 1); - assert( rc!=SQLITE_OK || *pFd ); - }while( cnt>0 && rc!=SQLITE_OK && rc!=SQLITE_NOMEM ); + assert( rc!=STQLITE_OK || *pFd ); + }while( cnt>0 && rc!=STQLITE_OK && rc!=STQLITE_NOMEM ); return rc; } @@ -19574,7 +19574,7 @@ static int sqlite3PagerOpentemp(OsFile **pFd){ ** It is never written to disk. This can be used to implement an ** in-memory database. */ -SQLITE_PRIVATE int sqlite3PagerOpen( +STQLITE_PRIVATE int sqlite3PagerOpen( Pager **ppPager, /* Return the Pager structure here */ const char *zFilename, /* Name of the database file to open */ int nExtra, /* Extra bytes append to each in-memory page */ @@ -19584,15 +19584,15 @@ SQLITE_PRIVATE int sqlite3PagerOpen( char *zFullPathname = 0; int nameLen; /* Compiler is wrong. This is always initialized before use */ OsFile *fd = 0; - int rc = SQLITE_OK; + int rc = STQLITE_OK; int i; int tempFile = 0; int memDb = 0; int readOnly = 0; int useJournal = (flags & PAGER_OMIT_JOURNAL)==0; int noReadlock = (flags & PAGER_NO_READLOCK)!=0; - char zTemp[SQLITE_TEMPNAME_SIZE]; -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT + char zTemp[STQLITE_TEMPNAME_SIZE]; +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT /* A malloc() cannot fail in sqlite3ThreadData() as one or more calls to ** malloc() must have already been made by this thread before it gets ** to this point. This means the ThreadData must have been allocated already @@ -19605,10 +19605,10 @@ SQLITE_PRIVATE int sqlite3PagerOpen( #endif /* We used to test if malloc() had already failed before proceeding. - ** But the way this function is used in SQLite means that can never + ** But the way this function is used in STQLite means that can never ** happen. Furthermore, if the malloc-failed flag is already set, ** either the call to sqliteStrDup() or sqliteMalloc() below will - ** fail shortly and SQLITE_NOMEM returned anyway. + ** fail shortly and STQLITE_NOMEM returned anyway. */ *ppPager = 0; @@ -19616,7 +19616,7 @@ SQLITE_PRIVATE int sqlite3PagerOpen( ** memory containing the complete filename (i.e. including the directory). */ if( zFilename && zFilename[0] ){ -#ifndef SQLITE_OMIT_MEMORYDB +#ifndef STQLITE_OMIT_MEMORYDB if( strcmp(zFilename,":memory:")==0 ){ memDb = 1; zFullPathname = sqliteStrDup(""); @@ -19626,7 +19626,7 @@ SQLITE_PRIVATE int sqlite3PagerOpen( zFullPathname = sqlite3OsFullPathname(zFilename); if( zFullPathname ){ rc = sqlite3OsOpenReadWrite(zFullPathname, &fd, &readOnly); - assert( rc!=SQLITE_OK || fd ); + assert( rc!=STQLITE_OK || fd ); } } }else{ @@ -19634,7 +19634,7 @@ SQLITE_PRIVATE int sqlite3PagerOpen( sqlite3OsTempFileName(zTemp); zFilename = zTemp; zFullPathname = sqlite3OsFullPathname(zFilename); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ tempFile = 1; } } @@ -19646,8 +19646,8 @@ SQLITE_PRIVATE int sqlite3PagerOpen( if( zFullPathname ){ nameLen = strlen(zFullPathname); pPager = sqliteMalloc( sizeof(*pPager) + nameLen*3 + 30 ); - if( pPager && rc==SQLITE_OK ){ - pPager->pTmpSpace = (char *)sqliteMallocRaw(SQLITE_DEFAULT_PAGE_SIZE); + if( pPager && rc==STQLITE_OK ){ + pPager->pTmpSpace = (char *)sqliteMallocRaw(STQLITE_DEFAULT_PAGE_SIZE); } } @@ -19657,11 +19657,11 @@ SQLITE_PRIVATE int sqlite3PagerOpen( ** file. Since the pager is not allocated there is no need to set ** any Pager.errMask variables. */ - if( !pPager || !zFullPathname || !pPager->pTmpSpace || rc!=SQLITE_OK ){ + if( !pPager || !zFullPathname || !pPager->pTmpSpace || rc!=STQLITE_OK ){ sqlite3OsClose(&fd); sqliteFree(zFullPathname); sqliteFree(pPager); - return ((rc==SQLITE_OK)?SQLITE_NOMEM:rc); + return ((rc==STQLITE_OK)?STQLITE_NOMEM:rc); } PAGERTRACE3("OPEN %d %s\n", FILEHANDLEID(fd), zFullPathname); @@ -19685,12 +19685,12 @@ SQLITE_PRIVATE int sqlite3PagerOpen( /* pPager->stmtInUse = 0; */ /* pPager->nRef = 0; */ pPager->dbSize = memDb-1; - pPager->pageSize = SQLITE_DEFAULT_PAGE_SIZE; + pPager->pageSize = STQLITE_DEFAULT_PAGE_SIZE; /* pPager->stmtSize = 0; */ /* pPager->stmtJSize = 0; */ /* pPager->nPage = 0; */ pPager->mxPage = 100; - pPager->mxPgno = SQLITE_MAX_PAGE_COUNT; + pPager->mxPgno = STQLITE_MAX_PAGE_COUNT; assert( PAGER_UNLOCK==0 ); /* pPager->state = PAGER_UNLOCK; */ /* pPager->errMask = 0; */ @@ -19715,17 +19715,17 @@ SQLITE_PRIVATE int sqlite3PagerOpen( /* pPager->pBusyHandler = 0; */ /* memset(pPager->aHash, 0, sizeof(pPager->aHash)); */ *ppPager = pPager; -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT pPager->pNext = pTsd->pPager; pTsd->pPager = pPager; #endif - return SQLITE_OK; + return STQLITE_OK; } /* ** Set the busy handler function. */ -SQLITE_PRIVATE void sqlite3PagerSetBusyhandler(Pager *pPager, BusyHandler *pBusyHandler){ +STQLITE_PRIVATE void sqlite3PagerSetBusyhandler(Pager *pPager, BusyHandler *pBusyHandler){ pPager->pBusyHandler = pBusyHandler; } @@ -19737,7 +19737,7 @@ SQLITE_PRIVATE void sqlite3PagerSetBusyhandler(Pager *pPager, BusyHandler *pBusy ** The destructor is not called as a result sqlite3PagerClose(). ** Destructors are only called by sqlite3PagerUnref(). */ -SQLITE_PRIVATE void sqlite3PagerSetDestructor(Pager *pPager, void (*xDesc)(DbPage*,int)){ +STQLITE_PRIVATE void sqlite3PagerSetDestructor(Pager *pPager, void (*xDesc)(DbPage*,int)){ pPager->xDestructor = xDesc; } @@ -19748,7 +19748,7 @@ SQLITE_PRIVATE void sqlite3PagerSetDestructor(Pager *pPager, void (*xDesc)(DbPag ** an opportunity to restore the EXTRA section to agree with the restored ** page data. */ -SQLITE_PRIVATE void sqlite3PagerSetReiniter(Pager *pPager, void (*xReinit)(DbPage*,int)){ +STQLITE_PRIVATE void sqlite3PagerSetReiniter(Pager *pPager, void (*xReinit)(DbPage*,int)){ pPager->xReiniter = xReinit; } @@ -19757,8 +19757,8 @@ SQLITE_PRIVATE void sqlite3PagerSetReiniter(Pager *pPager, void (*xReinit)(DbPag ** size is inappropriate, then an alternative page size is selected ** and returned. */ -SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager *pPager, int pageSize){ - assert( pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE ); +STQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager *pPager, int pageSize){ + assert( pageSize>=512 && pageSize<=STQLITE_MAX_PAGE_SIZE ); if( !pPager->memDb && pPager->nRef==0 ){ pager_reset(pPager); pPager->pageSize = pageSize; @@ -19774,7 +19774,7 @@ SQLITE_PRIVATE int sqlite3PagerSetPagesize(Pager *pPager, int pageSize){ ** ** Regardless of mxPage, return the current maximum page count. */ -SQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager *pPager, int mxPage){ +STQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager *pPager, int mxPage){ if( mxPage>0 ){ pPager->mxPgno = mxPage; } @@ -19787,10 +19787,10 @@ SQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager *pPager, int mxPage){ ** I/O error mechanism. These routines are used to avoid simulated ** errors in places where we do not care about errors. ** -** Unless -DSQLITE_TEST=1 is used, these routines are all no-ops +** Unless -DSTQLITE_TEST=1 is used, these routines are all no-ops ** and generate no code. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST extern int sqlite3_io_error_pending; extern int sqlite3_io_error_hit; static int saved_cnt; @@ -19816,8 +19816,8 @@ void enable_simulated_io_errors(void){ ** response is to zero the memory at pDest and continue. A real IO error ** will presumably recur and be picked up later (Todo: Think about this). */ -SQLITE_PRIVATE int sqlite3PagerReadFileheader(Pager *pPager, int N, unsigned char *pDest){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3PagerReadFileheader(Pager *pPager, int N, unsigned char *pDest){ + int rc = STQLITE_OK; memset(pDest, 0, N); if( MEMDB==0 ){ disable_simulated_io_errors(); @@ -19825,8 +19825,8 @@ SQLITE_PRIVATE int sqlite3PagerReadFileheader(Pager *pPager, int N, unsigned cha enable_simulated_io_errors(); IOTRACE(("DBHDR %p 0 %d\n", pPager, N)) rc = sqlite3OsRead(pPager->fd, pDest, N); - if( rc==SQLITE_IOERR_SHORT_READ ){ - rc = SQLITE_OK; + if( rc==STQLITE_IOERR_SHORT_READ ){ + rc = STQLITE_OK; } } return rc; @@ -19841,7 +19841,7 @@ SQLITE_PRIVATE int sqlite3PagerReadFileheader(Pager *pPager, int N, unsigned cha ** PENDING_BYTE is byte 4096 (the first byte of page 5) and the size of the ** file is 4096 bytes, 5 is returned instead of 4. */ -SQLITE_PRIVATE int sqlite3PagerPagecount(Pager *pPager){ +STQLITE_PRIVATE int sqlite3PagerPagecount(Pager *pPager){ i64 n; int rc; assert( pPager!=0 ); @@ -19851,7 +19851,7 @@ SQLITE_PRIVATE int sqlite3PagerPagecount(Pager *pPager){ if( pPager->dbSize>=0 ){ n = pPager->dbSize; } else { - if( (rc = sqlite3OsFileSize(pPager->fd, &n))!=SQLITE_OK ){ + if( (rc = sqlite3OsFileSize(pPager->fd, &n))!=STQLITE_OK ){ pager_error(pPager, rc); return 0; } @@ -19874,7 +19874,7 @@ SQLITE_PRIVATE int sqlite3PagerPagecount(Pager *pPager){ } -#ifndef SQLITE_OMIT_MEMORYDB +#ifndef STQLITE_OMIT_MEMORYDB /* ** Clear a PgHistory block */ @@ -19995,7 +19995,7 @@ static void pager_truncate_cache(Pager *pPager){ ** is currently not available. Repeat until the busy callback returns ** false or until the lock succeeds. ** -** Return SQLITE_OK on success and an error code if we cannot obtain +** Return STQLITE_OK on success and an error code if we cannot obtain ** the lock. */ static int pager_wait_on_lock(Pager *pPager, int locktype){ @@ -20010,12 +20010,12 @@ static int pager_wait_on_lock(Pager *pPager, int locktype){ assert( pPager->state>=PAGER_SHARED || pPager->dbSize<0 || MEMDB ); if( pPager->state>=locktype ){ - rc = SQLITE_OK; + rc = STQLITE_OK; }else{ do { rc = sqlite3OsLock(pPager->fd, locktype); - }while( rc==SQLITE_BUSY && sqlite3InvokeBusyHandler(pPager->pBusyHandler) ); - if( rc==SQLITE_OK ){ + }while( rc==STQLITE_BUSY && sqlite3InvokeBusyHandler(pPager->pBusyHandler) ); + if( rc==STQLITE_OK ){ pPager->state = locktype; IOTRACE(("LOCK %p %d\n", pPager, locktype)) } @@ -20026,7 +20026,7 @@ static int pager_wait_on_lock(Pager *pPager, int locktype){ /* ** Truncate the file to the number of pages specified. */ -SQLITE_PRIVATE int sqlite3PagerTruncate(Pager *pPager, Pgno nPage){ +STQLITE_PRIVATE int sqlite3PagerTruncate(Pager *pPager, Pgno nPage){ int rc; assert( pPager->state>=PAGER_SHARED || MEMDB ); sqlite3PagerPagecount(pPager); @@ -20035,21 +20035,21 @@ SQLITE_PRIVATE int sqlite3PagerTruncate(Pager *pPager, Pgno nPage){ return rc; } if( nPage>=(unsigned)pPager->dbSize ){ - return SQLITE_OK; + return STQLITE_OK; } if( MEMDB ){ pPager->dbSize = nPage; pager_truncate_cache(pPager); - return SQLITE_OK; + return STQLITE_OK; } rc = syncJournal(pPager); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } /* Get an exclusive lock on the database before truncating. */ rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } @@ -20061,7 +20061,7 @@ SQLITE_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 invalidated +** transaction is rolled back. All outstanding pages are tqinvalidated ** 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. @@ -20071,8 +20071,8 @@ SQLITE_PRIVATE int sqlite3PagerTruncate(Pager *pPager, Pgno nPage){ ** a hot journal may be left in the filesystem but no error is returned ** to the caller. */ -SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager){ -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT +STQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager){ +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT /* A malloc() cannot fail in sqlite3ThreadData() as one or more calls to ** malloc() must have already been made by this thread before it gets ** to this point. This means the ThreadData must have been allocated already @@ -20106,7 +20106,7 @@ SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager){ ** } */ -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT +#ifdef STQLITE_ENABLE_MEMORY_MANAGEMENT /* Remove the pager from the linked list of pagers starting at ** ThreadData.pPager if memory-management is enabled. */ @@ -20121,14 +20121,14 @@ SQLITE_PRIVATE int sqlite3PagerClose(Pager *pPager){ sqliteFree(pPager->aHash); sqliteFree(pPager->pTmpSpace); sqliteFree(pPager); - return SQLITE_OK; + return STQLITE_OK; } -#if !defined(NDEBUG) || defined(SQLITE_TEST) +#if !defined(NDEBUG) || defined(STQLITE_TEST) /* ** Return the page number for the given page data. */ -SQLITE_PRIVATE Pgno sqlite3PagerPagenumber(DbPage *p){ +STQLITE_PRIVATE Pgno sqlite3PagerPagenumber(DbPage *p){ return p->pgno; } #endif @@ -20165,7 +20165,7 @@ static void _page_ref(PgHdr *pPg){ pPg->nRef++; REFINFO(pPg); } -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG static void page_ref(PgHdr *pPg){ if( pPg->nRef==0 ){ _page_ref(pPg); @@ -20182,9 +20182,9 @@ static void _page_ref(PgHdr *pPg){ ** Increment the reference count for a page. The input pointer is ** a reference to the page data. */ -SQLITE_PRIVATE int sqlite3PagerRef(DbPage *pPg){ +STQLITE_PRIVATE int sqlite3PagerRef(DbPage *pPg){ page_ref(pPg); - return SQLITE_OK; + return STQLITE_OK; } /* @@ -20209,7 +20209,7 @@ SQLITE_PRIVATE int sqlite3PagerRef(DbPage *pPg){ */ static int syncJournal(Pager *pPager){ PgHdr *pPg; - int rc = SQLITE_OK; + int rc = STQLITE_OK; /* Sync the journal before modifying the main database ** (assuming there is a journal and it needs to be synced.) @@ -20320,7 +20320,7 @@ static PgHdr *merge_pagelist(PgHdr *pA, PgHdr *pB){ */ #define N_SORT_BUCKET_ALLOC 25 #define N_SORT_BUCKET 25 -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_pager_n_sort_bucket = 0; #undef N_SORT_BUCKET #define N_SORT_BUCKET \ @@ -20368,7 +20368,7 @@ static int pager_write_pagelist(PgHdr *pList){ Pager *pPager; int rc; - if( pList==0 ) return SQLITE_OK; + if( pList==0 ) return STQLITE_OK; pPager = pList->pPager; /* At this point there may be either a RESERVED or EXCLUSIVE lock on the @@ -20388,7 +20388,7 @@ static int pager_write_pagelist(PgHdr *pList){ ** will require a journal playback. */ rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } @@ -20421,12 +20421,12 @@ static int pager_write_pagelist(PgHdr *pList){ #endif if( rc ) return rc; pList->dirty = 0; -#ifdef SQLITE_CHECK_PAGES +#ifdef STQLITE_CHECK_PAGES pList->pageHash = pager_pagehash(pList); #endif pList = pList->pDirty; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -20465,7 +20465,7 @@ static int hasHotJournal(Pager *pPager){ /* ** Try to find a page in the cache that can be recycled. ** -** This routine may return SQLITE_IOERR, SQLITE_FULL or SQLITE_OK. It +** This routine may return STQLITE_IOERR, STQLITE_FULL or STQLITE_OK. It ** does not set the pPager->errCode variable. */ static int pager_recycle(Pager *pPager, int syncOk, PgHdr **ppPg){ @@ -20507,7 +20507,7 @@ static int pager_recycle(Pager *pPager, int syncOk, PgHdr **ppPg){ pPg = pPager->pFirst; } if( pPg==0 ){ - return SQLITE_OK; + return STQLITE_OK; } assert( pPg->nRef==0 ); @@ -20521,7 +20521,7 @@ static int pager_recycle(Pager *pPager, int syncOk, PgHdr **ppPg){ pPg->dirty = 1; pPg->pDirty = 0; rc = pager_write_pagelist( pPg ); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } } @@ -20546,12 +20546,12 @@ static int pager_recycle(Pager *pPager, int syncOk, PgHdr **ppPg){ assert( pPg->pgno==0 ); *ppPg = pPg; - return SQLITE_OK; + return STQLITE_OK; } /* ** This function is called to free superfluous dynamically allocated memory -** held by the pager system. Memory in use by any SQLite pager allocated +** held by the pager system. Memory in use by any STQLite pager allocated ** by the current thread may be sqliteFree()ed. ** ** nReq is the number of bytes of memory required. Once this much has @@ -20559,8 +20559,8 @@ static int pager_recycle(Pager *pPager, int syncOk, PgHdr **ppPg){ ** free as much memory as possible. The return value is the total number ** of bytes of memory released. */ -#if defined(SQLITE_ENABLE_MEMORY_MANAGEMENT) && !defined(SQLITE_OMIT_DISKIO) -SQLITE_PRIVATE int sqlite3PagerReleaseMemory(int nReq){ +#if defined(STQLITE_ENABLE_MEMORY_MANAGEMENT) && !defined(STQLITE_OMIT_DISKIO) +STQLITE_PRIVATE int sqlite3PagerReleaseMemory(int nReq){ const ThreadData *pTsdro = sqlite3ThreadDataReadOnly(); int nReleased = 0; int i; @@ -20582,7 +20582,7 @@ SQLITE_PRIVATE int sqlite3PagerReleaseMemory(int nReq){ */ for(i=0; i<=1; i++){ - /* Loop through all the SQLite pagers opened by the current thread. */ + /* Loop through all the STQLite pagers opened by the current thread. */ Pager *pPager = pTsdro->pPager; for( ; pPager && (nReq<0 || nReleased<nReq); pPager=pPager->pNext){ PgHdr *pPg; @@ -20596,7 +20596,7 @@ SQLITE_PRIVATE int sqlite3PagerReleaseMemory(int nReq){ ** calling fsync() if this is the first iteration of the outermost ** loop). */ - while( SQLITE_OK==(rc = pager_recycle(pPager, i, &pPg)) && pPg) { + while( STQLITE_OK==(rc = pager_recycle(pPager, i, &pPg)) && pPg) { /* We've found a page to free. At this point the page has been ** removed from the page hash-table, free-list and synced-list ** (pFirstSynced). It is still in the all pages (pAll) list. @@ -20619,14 +20619,14 @@ SQLITE_PRIVATE int sqlite3PagerReleaseMemory(int nReq){ sqliteFree(pPg); } - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ /* An error occured whilst writing to the database file or ** journal in pager_recycle(). The error is not returned to the ** caller of this function. Instead, set the Pager.errCode variable. ** The error will be returned to the user (or users, in the case ** of a shared pager cache) of the pager for which the error occured. */ - assert( (rc&0xff)==SQLITE_IOERR || rc==SQLITE_FULL ); + assert( (rc&0xff)==STQLITE_IOERR || rc==STQLITE_FULL ); assert( pPager->state>=PAGER_RESERVED ); pager_error(pPager, rc); } @@ -20635,7 +20635,7 @@ SQLITE_PRIVATE int sqlite3PagerReleaseMemory(int nReq){ return nReleased; } -#endif /* SQLITE_ENABLE_MEMORY_MANAGEMENT && !SQLITE_OMIT_DISKIO */ +#endif /* STQLITE_ENABLE_MEMORY_MANAGEMENT && !STQLITE_OMIT_DISKIO */ /* ** Read the content of page pPg out of the database file. @@ -20644,7 +20644,7 @@ static int readDbPage(Pager *pPager, PgHdr *pPg, Pgno pgno){ int rc; assert( MEMDB==0 ); rc = sqlite3OsSeek(pPager->fd, (pgno-1)*(i64)pPager->pageSize); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = sqlite3OsRead(pPager->fd, PGHDR_TO_DATA(pPg), pPager->pageSize); } @@ -20672,14 +20672,14 @@ static int readDbPage(Pager *pPager, PgHdr *pPg, Pgno pgno){ ** is performed immediately. */ static int pagerSharedLock(Pager *pPager){ - int rc = SQLITE_OK; + int rc = STQLITE_OK; if( pPager->state==PAGER_UNLOCK ){ if( !MEMDB ){ assert( pPager->nRef==0 ); if( !pPager->noReadlock ){ rc = pager_wait_on_lock(pPager, SHARED_LOCK); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return pager_error(pPager, rc); } assert( pPager->state>=SHARED_LOCK ); @@ -20701,13 +20701,13 @@ static int pagerSharedLock(Pager *pPager){ ** obtain it's own EXCLUSIVE lock on the database file. */ rc = sqlite3OsLock(pPager->fd, EXCLUSIVE_LOCK); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ pager_unlock(pPager); return pager_error(pPager, rc); } pPager->state = PAGER_EXCLUSIVE; - /* Open the journal for reading only. Return SQLITE_BUSY if + /* Open the journal for reading only. Return STQLITE_BUSY if ** we are unable to open the journal file. ** ** The journal file does not need to be locked itself. The @@ -20721,20 +20721,20 @@ static int pagerSharedLock(Pager *pPager){ ** OsTruncate() call used in exclusive-access mode also requires ** a read/write file handle. */ - rc = SQLITE_BUSY; + rc = STQLITE_BUSY; if( sqlite3OsFileExists(pPager->zJournal) ){ int ro; assert( !pPager->tempFile ); rc = sqlite3OsOpenReadWrite(pPager->zJournal, &pPager->jfd, &ro); - assert( rc!=SQLITE_OK || pPager->jfd ); + assert( rc!=STQLITE_OK || pPager->jfd ); if( ro ){ - rc = SQLITE_BUSY; + rc = STQLITE_BUSY; sqlite3OsClose(&pPager->jfd); } } - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ pager_unlock(pPager); - return SQLITE_BUSY; + return STQLITE_BUSY; } pPager->journalOpen = 1; pPager->journalStarted = 0; @@ -20746,7 +20746,7 @@ static int pagerSharedLock(Pager *pPager){ ** lock and reacquire the read lock. */ rc = pager_playback(pPager, 1); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return pager_error(pPager, rc); } assert(pPager->state==PAGER_SHARED || @@ -20781,11 +20781,11 @@ static int pagerSharedLock(Pager *pPager){ if( pPager->dbSize>0 ){ IOTRACE(("CKVERS %p %d\n", pPager, sizeof(dbFileVers))); rc = sqlite3OsSeek(pPager->fd, 24); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } rc = sqlite3OsRead(pPager->fd, &dbFileVers, sizeof(dbFileVers)); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } }else{ @@ -20839,7 +20839,7 @@ static int pagerSharedLock(Pager *pPager){ ** allowed. */ static int pagerAllocatePage(Pager *pPager, PgHdr **ppPg){ - int rc = SQLITE_OK; + int rc = STQLITE_OK; PgHdr *pPg; /* Create a new PgHdr if any of the four conditions defined @@ -20853,7 +20853,7 @@ static int pagerAllocatePage(Pager *pPager, PgHdr **ppPg){ pager_resize_hash_table(pPager, pPager->nHash<256 ? 256 : pPager->nHash*2); if( pPager->nHash==0 ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; goto pager_allocate_out; } } @@ -20861,7 +20861,7 @@ static int pagerAllocatePage(Pager *pPager, PgHdr **ppPg){ + sizeof(u32) + pPager->nExtra + MEMDB*sizeof(PgHistory) ); if( pPg==0 ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; goto pager_allocate_out; } memset(pPg, 0, sizeof(*pPg)); @@ -20875,10 +20875,10 @@ static int pagerAllocatePage(Pager *pPager, PgHdr **ppPg){ }else{ /* Recycle an existing page with a zero ref-count. */ rc = pager_recycle(pPager, 1, &pPg); - if( rc==SQLITE_BUSY ){ - rc = SQLITE_IOERR_BLOCKED; + if( rc==STQLITE_BUSY ){ + rc = STQLITE_IOERR_BLOCKED; } - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto pager_allocate_out; } assert( pPager->state>=SHARED_LOCK ); @@ -20900,13 +20900,13 @@ pager_allocate_out: static int pager_get_content(PgHdr *pPg){ if( pPg->needRead ){ int rc = readDbPage(pPg->pPager, pPg, pPg->pgno); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ pPg->needRead = 0; }else{ return rc; } } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -20941,7 +20941,7 @@ static int pager_get_content(PgHdr *pPg){ ** called again with noContent==0, that means that the content is needed ** and the disk read should occur at that point. */ -SQLITE_PRIVATE int sqlite3PagerAcquire( +STQLITE_PRIVATE int sqlite3PagerAcquire( Pager *pPager, /* The pager open on the database file */ Pgno pgno, /* Page number to fetch */ DbPage **ppPage, /* Write a pointer to the page here */ @@ -20952,18 +20952,18 @@ SQLITE_PRIVATE int sqlite3PagerAcquire( assert( pPager->state==PAGER_UNLOCK || pPager->nRef>0 || pgno==1 ); - /* The maximum page number is 2^31. Return SQLITE_CORRUPT if a page + /* The maximum page number is 2^31. Return STQLITE_CORRUPT if a page ** number greater than this, or zero, is requested. */ if( pgno>PAGER_MAX_PGNO || pgno==0 || pgno==PAGER_MJ_PGNO(pPager) ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } /* Make sure we have not hit any critical errors. */ assert( pPager!=0 ); *ppPage = 0; - if( pPager->errCode && pPager->errCode!=SQLITE_FULL ){ + if( pPager->errCode && pPager->errCode!=STQLITE_FULL ){ return pPager->errCode; } @@ -20972,7 +20972,7 @@ SQLITE_PRIVATE int sqlite3PagerAcquire( ** a database lock is already held. */ rc = pagerSharedLock(pPager); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } assert( pPager->state!=PAGER_UNLOCK ); @@ -20984,7 +20984,7 @@ SQLITE_PRIVATE int sqlite3PagerAcquire( int h; PAGER_INCR(pPager->nMiss); rc = pagerAllocatePage(pPager, &pPg); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } @@ -21021,14 +21021,14 @@ SQLITE_PRIVATE int sqlite3PagerAcquire( if( nMax<(int)pgno || MEMDB || (noContent && !pPager->alwaysRollback) ){ if( pgno>pPager->mxPgno ){ sqlite3PagerUnref(pPg); - return SQLITE_FULL; + return STQLITE_FULL; } memset(PGHDR_TO_DATA(pPg), 0, pPager->pageSize); pPg->needRead = noContent && !pPager->alwaysRollback; IOTRACE(("ZERO %p %d\n", pPager, pgno)); }else{ rc = readDbPage(pPager, pPg, pgno); - if( rc!=SQLITE_OK && rc!=SQLITE_IOERR_SHORT_READ ){ + if( rc!=STQLITE_OK && rc!=STQLITE_IOERR_SHORT_READ ){ pPg->pgno = 0; sqlite3PagerUnref(pPg); return rc; @@ -21046,7 +21046,7 @@ SQLITE_PRIVATE int sqlite3PagerAcquire( pPg->pNextHash->pPrevHash = pPg; } -#ifdef SQLITE_CHECK_PAGES +#ifdef STQLITE_CHECK_PAGES pPg->pageHash = pager_pagehash(pPg); #endif }else{ @@ -21062,7 +21062,7 @@ SQLITE_PRIVATE int sqlite3PagerAcquire( page_ref(pPg); } *ppPage = pPg; - return SQLITE_OK; + return STQLITE_OK; } /* @@ -21076,7 +21076,7 @@ SQLITE_PRIVATE int sqlite3PagerAcquire( ** returns NULL if the page is not in cache or if a disk I/O error ** has ever happened. */ -SQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno){ +STQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno){ PgHdr *pPg; assert( pPager!=0 ); @@ -21086,7 +21086,7 @@ SQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno){ assert( !pPager->pAll || pPager->exclusiveMode ); return 0; } - if( pPager->errCode && pPager->errCode!=SQLITE_FULL ){ + if( pPager->errCode && pPager->errCode!=STQLITE_FULL ){ return 0; } pPg = pager_lookup(pPager, pgno); @@ -21103,7 +21103,7 @@ SQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno){ ** are released, a rollback occurs and the lock on the database is ** removed. */ -SQLITE_PRIVATE int sqlite3PagerUnref(DbPage *pPg){ +STQLITE_PRIVATE int sqlite3PagerUnref(DbPage *pPg){ /* Decrement the reference count for this page */ @@ -21143,14 +21143,14 @@ SQLITE_PRIVATE int sqlite3PagerUnref(DbPage *pPg){ pagerUnlockAndRollback(pPager); } } - return SQLITE_OK; + return STQLITE_OK; } /* ** Create a journal file for pPager. There should already be a RESERVED ** or EXCLUSIVE lock on the database file when this routine is called. ** -** Return SQLITE_OK if everything. Return an error code and release the +** Return STQLITE_OK if everything. Return an error code and release the ** write lock if anything goes wrong. */ static int pager_open_journal(Pager *pPager){ @@ -21163,17 +21163,17 @@ static int pager_open_journal(Pager *pPager){ sqlite3PagerPagecount(pPager); pPager->aInJournal = sqliteMalloc( pPager->dbSize/8 + 1 ); if( pPager->aInJournal==0 ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; goto failed_to_open_journal; } rc = sqlite3OsOpenExclusive(pPager->zJournal, &pPager->jfd, pPager->tempFile); - assert( rc!=SQLITE_OK || pPager->jfd ); + assert( rc!=STQLITE_OK || pPager->jfd ); pPager->journalOff = 0; pPager->setMaster = 0; pPager->journalHdr = 0; - if( rc!=SQLITE_OK ){ - if( rc==SQLITE_NOMEM ){ + if( rc!=STQLITE_OK ){ + if( rc==STQLITE_NOMEM ){ sqlite3OsDelete(pPager->zJournal); } goto failed_to_open_journal; @@ -21194,13 +21194,13 @@ static int pager_open_journal(Pager *pPager){ rc = writeJournalHdr(pPager); - if( pPager->stmtAutoopen && rc==SQLITE_OK ){ + if( pPager->stmtAutoopen && rc==STQLITE_OK ){ rc = sqlite3PagerStmtBegin(pPager); } - if( rc!=SQLITE_OK && rc!=SQLITE_NOMEM ){ + if( rc!=STQLITE_OK && rc!=STQLITE_NOMEM ){ rc = pager_end_transaction(pPager); - if( rc==SQLITE_OK ){ - rc = SQLITE_FULL; + if( rc==STQLITE_OK ){ + rc = STQLITE_FULL; } } return rc; @@ -21238,9 +21238,9 @@ failed_to_open_journal: ** immediately instead of waiting until we try to flush the cache. The ** exFlag is ignored if a transaction is already active. */ -SQLITE_PRIVATE int sqlite3PagerBegin(DbPage *pPg, int exFlag){ +STQLITE_PRIVATE int sqlite3PagerBegin(DbPage *pPg, int exFlag){ Pager *pPager = pPg->pPager; - int rc = SQLITE_OK; + int rc = STQLITE_OK; assert( pPg->nRef>0 ); assert( pPager->state!=PAGER_UNLOCK ); if( pPager->state==PAGER_SHARED ){ @@ -21250,13 +21250,13 @@ SQLITE_PRIVATE int sqlite3PagerBegin(DbPage *pPg, int exFlag){ pPager->origDbSize = pPager->dbSize; }else{ rc = sqlite3OsLock(pPager->fd, RESERVED_LOCK); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ pPager->state = PAGER_RESERVED; if( exFlag ){ rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK); } } - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } pPager->dirtyCache = 0; @@ -21277,13 +21277,13 @@ SQLITE_PRIVATE int sqlite3PagerBegin(DbPage *pPg, int exFlag){ sqlite3PagerPagecount(pPager); pPager->aInJournal = sqliteMalloc( pPager->dbSize/8 + 1 ); if( !pPager->aInJournal ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; }else{ pPager->origDbSize = pPager->dbSize; rc = writeJournalHdr(pPager); } } - assert( !pPager->journalOpen || pPager->journalOff>0 || rc!=SQLITE_OK ); + assert( !pPager->journalOpen || pPager->journalOff>0 || rc!=STQLITE_OK ); return rc; } @@ -21330,20 +21330,20 @@ static void makeClean(PgHdr *pPg){ ** ** The first time this routine is called, the pager creates a new ** journal and acquires a RESERVED lock on the database. If the RESERVED -** lock could not be acquired, this routine returns SQLITE_BUSY. The +** lock could not be acquired, this routine returns STQLITE_BUSY. The ** calling routine must check for that return value and be careful not to -** change any page data until this routine returns SQLITE_OK. +** change any page data until this routine returns STQLITE_OK. ** ** If the journal file could not be written because the disk is full, -** then this routine returns SQLITE_FULL and does an immediate rollback. -** All subsequent write attempts also return SQLITE_FULL until there +** then this routine returns STQLITE_FULL and does an immediate rollback. +** All subsequent write attempts also return STQLITE_FULL until there ** is a call to sqlite3PagerCommit() or sqlite3PagerRollback() to ** reset. */ static int pager_write(PgHdr *pPg){ void *pData = PGHDR_TO_DATA(pPg); Pager *pPager = pPg->pPager; - int rc = SQLITE_OK; + int rc = STQLITE_OK; /* Check for errors */ @@ -21351,7 +21351,7 @@ static int pager_write(PgHdr *pPg){ return pPager->errCode; } if( pPager->readOnly ){ - return SQLITE_PERM; + return STQLITE_PERM; } assert( !pPager->setMaster ); @@ -21388,13 +21388,13 @@ static int pager_write(PgHdr *pPg){ */ assert( pPager->state!=PAGER_UNLOCK ); rc = sqlite3PagerBegin(pPg, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } assert( pPager->state>=PAGER_RESERVED ); if( !pPager->journalOpen && pPager->useJournal ){ rc = pager_open_journal(pPager); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; } assert( pPager->journalOpen || !pPager->useJournal ); pPager->dirtyCache = 1; @@ -21441,7 +21441,7 @@ static int pager_write(PgHdr *pPg){ /* An error has occured writing to the journal file. The ** transaction will be rolled back by the layer above. */ - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } @@ -21488,7 +21488,7 @@ static int pager_write(PgHdr *pPg){ put32bits(pData2, pPg->pgno); rc = sqlite3OsWrite(pPager->stfd, pData2, pPager->pageSize+4); PAGERTRACE3("STMT-JOURNAL %d page %d\n", PAGERID(pPager), pPg->pgno); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } pPager->stmtNRec++; @@ -21520,8 +21520,8 @@ static int pager_write(PgHdr *pPg){ ** fit on a single disk sector. In this case all co-resident pages ** must have been written to the journal file before returning. */ -SQLITE_PRIVATE int sqlite3PagerWrite(DbPage *pDbPage){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3PagerWrite(DbPage *pDbPage){ + int rc = STQLITE_OK; PgHdr *pPg = pDbPage; Pager *pPager = pPg->pPager; @@ -21557,7 +21557,7 @@ SQLITE_PRIVATE int sqlite3PagerWrite(DbPage *pDbPage){ assert(pg1<=pPg->pgno); assert((pg1+nPage)>pPg->pgno); - for(ii=0; ii<nPage && rc==SQLITE_OK; ii++){ + for(ii=0; ii<nPage && rc==STQLITE_OK; ii++){ Pgno pg = pg1+ii; if( !pPager->aInJournal || pg==pPg->pgno || pg>pPager->origDbSize || !(pPager->aInJournal[pg/8]&(1<<(pg&7))) @@ -21565,7 +21565,7 @@ SQLITE_PRIVATE int sqlite3PagerWrite(DbPage *pDbPage){ if( pg!=PAGER_MJ_PGNO(pPager) ){ PgHdr *pPage; rc = sqlite3PagerGet(pPager, pg, &pPage); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = pager_write(pPage); sqlite3PagerUnref(pPage); } @@ -21587,24 +21587,24 @@ SQLITE_PRIVATE int sqlite3PagerWrite(DbPage *pDbPage){ ** to change the content of the page. */ #ifndef NDEBUG -SQLITE_PRIVATE int sqlite3PagerIswriteable(DbPage *pPg){ +STQLITE_PRIVATE int sqlite3PagerIswriteable(DbPage *pPg){ return pPg->dirty; } #endif -#ifndef SQLITE_OMIT_VACUUM +#ifndef STQLITE_OMIT_VACUUM /* ** Replace the content of a single page with the information in the third ** argument. */ -SQLITE_PRIVATE int sqlite3PagerOverwrite(Pager *pPager, Pgno pgno, void *pData){ +STQLITE_PRIVATE int sqlite3PagerOverwrite(Pager *pPager, Pgno pgno, void *pData){ PgHdr *pPg; int rc; rc = sqlite3PagerGet(pPager, pgno, &pPg); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = sqlite3PagerWrite(pPg); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ memcpy(sqlite3PagerGetData(pPg), pData, pPager->pageSize); } sqlite3PagerUnref(pPg); @@ -21637,7 +21637,7 @@ SQLITE_PRIVATE int sqlite3PagerOverwrite(Pager *pPager, Pgno pgno, void *pData){ ** page contains critical data, we still need to be sure it gets ** rolled back in spite of the sqlite3PagerDontRollback() call. */ -SQLITE_PRIVATE void sqlite3PagerDontWrite(DbPage *pDbPage){ +STQLITE_PRIVATE void sqlite3PagerDontWrite(DbPage *pDbPage){ PgHdr *pPg = pDbPage; Pager *pPager = pPg->pPager; @@ -21658,7 +21658,7 @@ SQLITE_PRIVATE void sqlite3PagerDontWrite(DbPage *pDbPage){ PAGERTRACE3("DONT_WRITE page %d of %d\n", pPg->pgno, PAGERID(pPager)); IOTRACE(("CLEAN %p %d\n", pPager, pPg->pgno)) makeClean(pPg); -#ifdef SQLITE_CHECK_PAGES +#ifdef STQLITE_CHECK_PAGES pPg->pageHash = pager_pagehash(pPg); #endif } @@ -21676,7 +21676,7 @@ SQLITE_PRIVATE void sqlite3PagerDontWrite(DbPage *pDbPage){ ** that we will never need to read the page content in the future. ** so the needRead flag can be cleared at this point. */ -SQLITE_PRIVATE void sqlite3PagerDontRollback(DbPage *pPg){ +STQLITE_PRIVATE void sqlite3PagerDontRollback(DbPage *pPg){ Pager *pPager = pPg->pPager; assert( pPager->state>=PAGER_RESERVED ); @@ -21716,9 +21716,9 @@ static int pager_incr_changecounter(Pager *pPager){ if( !pPager->changeCountDone ){ /* Open page 1 of the file for writing. */ rc = sqlite3PagerGet(pPager, 1, &pPgHdr); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; rc = sqlite3PagerWrite(pPgHdr); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; /* Increment the value just read and write it back to byte 24. */ change_counter = sqlite3Get4byte((u8*)pPager->dbFileVers); @@ -21728,7 +21728,7 @@ static int pager_incr_changecounter(Pager *pPager){ sqlite3PagerUnref(pPgHdr); pPager->changeCountDone = 1; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -21748,8 +21748,8 @@ static int pager_incr_changecounter(Pager *pPager){ ** If parameter nTrunc is non-zero, then the pager file is truncated to ** nTrunc pages (this is used by auto-vacuum databases). */ -SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager *pPager, const char *zMaster, Pgno nTrunc){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager *pPager, const char *zMaster, Pgno nTrunc){ + int rc = STQLITE_OK; PAGERTRACE4("DATABASE SYNC: File=%s zMaster=%s nTrunc=%d\n", pPager->zFilename, zMaster, nTrunc); @@ -21769,8 +21769,8 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager *pPager, const char *zMaster */ if( !pPager->setMaster ){ rc = pager_incr_changecounter(pPager); - if( rc!=SQLITE_OK ) goto sync_exit; -#ifndef SQLITE_OMIT_AUTOVACUUM + if( rc!=STQLITE_OK ) goto sync_exit; +#ifndef STQLITE_OMIT_AUTOVACUUM if( nTrunc!=0 ){ /* If this transaction has made the database smaller, then all pages ** being discarded by the truncation must be written to the journal @@ -21781,31 +21781,31 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager *pPager, const char *zMaster for( i=nTrunc+1; i<=pPager->origDbSize; i++ ){ if( !(pPager->aInJournal[i/8] & (1<<(i&7))) && i!=iSkip ){ rc = sqlite3PagerGet(pPager, i, &pPg); - if( rc!=SQLITE_OK ) goto sync_exit; + if( rc!=STQLITE_OK ) goto sync_exit; rc = sqlite3PagerWrite(pPg); sqlite3PagerUnref(pPg); - if( rc!=SQLITE_OK ) goto sync_exit; + if( rc!=STQLITE_OK ) goto sync_exit; } } } #endif rc = writeMasterJournal(pPager, zMaster); - if( rc!=SQLITE_OK ) goto sync_exit; + if( rc!=STQLITE_OK ) goto sync_exit; rc = syncJournal(pPager); - if( rc!=SQLITE_OK ) goto sync_exit; + if( rc!=STQLITE_OK ) goto sync_exit; } -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( nTrunc!=0 ){ rc = sqlite3PagerTruncate(pPager, nTrunc); - if( rc!=SQLITE_OK ) goto sync_exit; + if( rc!=STQLITE_OK ) goto sync_exit; } #endif /* Write all dirty pages to the database file */ pPg = pager_get_all_dirty_pages(pPager); rc = pager_write_pagelist(pPg); - if( rc!=SQLITE_OK ) goto sync_exit; + if( rc!=STQLITE_OK ) goto sync_exit; pPager->pDirty = 0; /* Sync the database file. */ @@ -21820,13 +21820,13 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager *pPager, const char *zMaster } sync_exit: - if( rc==SQLITE_IOERR_BLOCKED ){ + if( rc==STQLITE_IOERR_BLOCKED ){ /* pager_incr_changecounter() may attempt to obtain an exclusive * lock to spill the cache and return IOERR_BLOCKED. But since * there is no chance the cache is inconsistent, it's - * better to return SQLITE_BUSY. + * better to return STQLITE_BUSY. */ - rc = SQLITE_BUSY; + rc = STQLITE_BUSY; } return rc; } @@ -21836,10 +21836,10 @@ sync_exit: ** Commit all changes to the database and release the write lock. ** ** If the commit fails for any reason, a rollback attempt is made -** and an error code is returned. If the commit worked, SQLITE_OK +** and an error code is returned. If the commit worked, STQLITE_OK ** is returned. */ -SQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager *pPager){ +STQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager *pPager){ int rc; PgHdr *pPg; @@ -21847,7 +21847,7 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager *pPager){ return pPager->errCode; } if( pPager->state<PAGER_RESERVED ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } PAGERTRACE2("COMMIT %d\n", PAGERID(pPager)); if( MEMDB ){ @@ -21873,7 +21873,7 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager *pPager){ #endif pPager->pStmt = 0; pPager->state = PAGER_SHARED; - return SQLITE_OK; + return STQLITE_OK; } assert( pPager->journalOpen || !pPager->dirtyCache ); assert( pPager->state==PAGER_SYNCED || !pPager->dirtyCache ); @@ -21888,12 +21888,12 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager *pPager){ ** ** This routine cannot fail unless some other process is not following ** the correct locking protocol or unless some other -** process is writing trash into the journal file (SQLITE_CORRUPT) or -** unless a prior malloc() failed (SQLITE_NOMEM). Appropriate error +** process is writing trash into the journal file (STQLITE_CORRUPT) or +** unless a prior malloc() failed (STQLITE_NOMEM). Appropriate error ** codes are returned for all these occasions. Otherwise, -** SQLITE_OK is returned. +** STQLITE_OK is returned. */ -SQLITE_PRIVATE int sqlite3PagerRollback(Pager *pPager){ +STQLITE_PRIVATE int sqlite3PagerRollback(Pager *pPager){ int rc; PAGERTRACE2("ROLLBACK %d\n", PAGERID(pPager)); if( MEMDB ){ @@ -21929,7 +21929,7 @@ SQLITE_PRIVATE int sqlite3PagerRollback(Pager *pPager){ pager_truncate_cache(pPager); pPager->stmtInUse = 0; pPager->state = PAGER_SHARED; - return SQLITE_OK; + return STQLITE_OK; } if( !pPager->dirtyCache || !pPager->journalOpen ){ @@ -21937,7 +21937,7 @@ SQLITE_PRIVATE int sqlite3PagerRollback(Pager *pPager){ return rc; } - if( pPager->errCode && pPager->errCode!=SQLITE_FULL ){ + if( pPager->errCode && pPager->errCode!=STQLITE_FULL ){ if( pPager->state>=PAGER_EXCLUSIVE ){ pager_playback(pPager, 0); } @@ -21947,7 +21947,7 @@ SQLITE_PRIVATE int sqlite3PagerRollback(Pager *pPager){ int rc2; rc = pager_playback(pPager, 0); rc2 = pager_end_transaction(pPager); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = rc2; } }else{ @@ -21967,22 +21967,22 @@ SQLITE_PRIVATE int sqlite3PagerRollback(Pager *pPager){ ** Return TRUE if the database file is opened read-only. Return FALSE ** if the database is (in theory) writable. */ -SQLITE_PRIVATE int sqlite3PagerIsreadonly(Pager *pPager){ +STQLITE_PRIVATE int sqlite3PagerIsreadonly(Pager *pPager){ return pPager->readOnly; } /* ** Return the number of references to the pager. */ -SQLITE_PRIVATE int sqlite3PagerRefcount(Pager *pPager){ +STQLITE_PRIVATE int sqlite3PagerRefcount(Pager *pPager){ return pPager->nRef; } -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST /* ** This routine is used for testing and analysis only. */ -SQLITE_PRIVATE int *sqlite3PagerStats(Pager *pPager){ +STQLITE_PRIVATE int *sqlite3PagerStats(Pager *pPager){ static int a[11]; a[0] = pPager->nRef; a[1] = pPager->nPage; @@ -22006,7 +22006,7 @@ SQLITE_PRIVATE int *sqlite3PagerStats(Pager *pPager){ ** open. A new statement journal is created that can be used to rollback ** changes of a single SQL command within a larger transaction. */ -SQLITE_PRIVATE int sqlite3PagerStmtBegin(Pager *pPager){ +STQLITE_PRIVATE int sqlite3PagerStmtBegin(Pager *pPager){ int rc; assert( !pPager->stmtInUse ); assert( pPager->state>=PAGER_SHARED ); @@ -22015,17 +22015,17 @@ SQLITE_PRIVATE int sqlite3PagerStmtBegin(Pager *pPager){ if( MEMDB ){ pPager->stmtInUse = 1; pPager->stmtSize = pPager->dbSize; - return SQLITE_OK; + return STQLITE_OK; } if( !pPager->journalOpen ){ pPager->stmtAutoopen = 1; - return SQLITE_OK; + return STQLITE_OK; } assert( pPager->journalOpen ); pPager->aInStmt = sqliteMalloc( pPager->dbSize/8 + 1 ); if( pPager->aInStmt==0 ){ /* sqlite3OsLock(pPager->fd, SHARED_LOCK); */ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } #ifndef NDEBUG rc = sqlite3OsFileSize(pPager->jfd, &pPager->stmtJSize); @@ -22043,7 +22043,7 @@ SQLITE_PRIVATE int sqlite3PagerStmtBegin(Pager *pPager){ pPager->stmtNRec = 0; } pPager->stmtInUse = 1; - return SQLITE_OK; + return STQLITE_OK; stmt_begin_failed: if( pPager->aInStmt ){ @@ -22056,7 +22056,7 @@ stmt_begin_failed: /* ** Commit a statement. */ -SQLITE_PRIVATE int sqlite3PagerStmtCommit(Pager *pPager){ +STQLITE_PRIVATE int sqlite3PagerStmtCommit(Pager *pPager){ if( pPager->stmtInUse ){ PgHdr *pPg, *pNext; PAGERTRACE2("STMT-COMMIT %d\n", PAGERID(pPager)); @@ -22081,13 +22081,13 @@ SQLITE_PRIVATE int sqlite3PagerStmtCommit(Pager *pPager){ pPager->pStmt = 0; } pPager->stmtAutoopen = 0; - return SQLITE_OK; + return STQLITE_OK; } /* ** Rollback a statement. */ -SQLITE_PRIVATE int sqlite3PagerStmtRollback(Pager *pPager){ +STQLITE_PRIVATE int sqlite3PagerStmtRollback(Pager *pPager){ int rc; if( pPager->stmtInUse ){ PAGERTRACE2("STMT-ROLLBACK %d\n", PAGERID(pPager)); @@ -22104,13 +22104,13 @@ SQLITE_PRIVATE int sqlite3PagerStmtRollback(Pager *pPager){ } pPager->dbSize = pPager->stmtSize; pager_truncate_cache(pPager); - rc = SQLITE_OK; + rc = STQLITE_OK; }else{ rc = pager_stmt_playback(pPager); } sqlite3PagerStmtCommit(pPager); }else{ - rc = SQLITE_OK; + rc = STQLITE_OK; } pPager->stmtAutoopen = 0; return rc; @@ -22119,21 +22119,21 @@ SQLITE_PRIVATE int sqlite3PagerStmtRollback(Pager *pPager){ /* ** Return the full pathname of the database file. */ -SQLITE_PRIVATE const char *sqlite3PagerFilename(Pager *pPager){ +STQLITE_PRIVATE const char *sqlite3PagerFilename(Pager *pPager){ return pPager->zFilename; } /* ** Return the directory of the database file. */ -SQLITE_PRIVATE const char *sqlite3PagerDirname(Pager *pPager){ +STQLITE_PRIVATE const char *sqlite3PagerDirname(Pager *pPager){ return pPager->zDirectory; } /* ** Return the full pathname of the journal file. */ -SQLITE_PRIVATE const char *sqlite3PagerJournalname(Pager *pPager){ +STQLITE_PRIVATE const char *sqlite3PagerJournalname(Pager *pPager){ return pPager->zJournal; } @@ -22141,15 +22141,15 @@ SQLITE_PRIVATE const char *sqlite3PagerJournalname(Pager *pPager){ ** Return true if fsync() calls are disabled for this pager. Return FALSE ** if fsync()s are executed normally. */ -SQLITE_PRIVATE int sqlite3PagerNosync(Pager *pPager){ +STQLITE_PRIVATE int sqlite3PagerNosync(Pager *pPager){ return pPager->noSync; } -#ifdef SQLITE_HAS_CODEC +#ifdef STQLITE_HAS_CODEC /* ** Set the codec for this pager */ -SQLITE_PRIVATE void sqlite3PagerSetCodec( +STQLITE_PRIVATE void sqlite3PagerSetCodec( Pager *pPager, void *(*xCodec)(void*,void*,Pgno,int), void *pCodecArg @@ -22159,7 +22159,7 @@ SQLITE_PRIVATE void sqlite3PagerSetCodec( } #endif -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* ** Move the page pPg to location pgno in the file. ** @@ -22177,7 +22177,7 @@ SQLITE_PRIVATE void sqlite3PagerSetCodec( ** has been removed (CREATE INDEX needs to move a page when a statement ** transaction is active). */ -SQLITE_PRIVATE int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno){ +STQLITE_PRIVATE int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno){ PgHdr *pPgOld; /* The page being overwritten. */ int h; Pgno needSyncPgno = 0; @@ -22250,7 +22250,7 @@ SQLITE_PRIVATE int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno){ PgHdr *pPgHdr; assert( pPager->needSync ); rc = sqlite3PagerGet(pPager, needSyncPgno, &pPgHdr); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; pPager->needSync = 1; pPgHdr->needSync = 1; pPgHdr->inJournal = 1; @@ -22258,14 +22258,14 @@ SQLITE_PRIVATE int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno){ sqlite3PagerUnref(pPgHdr); } - return SQLITE_OK; + return STQLITE_OK; } #endif /* ** Return a pointer to the data for the specified page. */ -SQLITE_PRIVATE void *sqlite3PagerGetData(DbPage *pPg){ +STQLITE_PRIVATE void *sqlite3PagerGetData(DbPage *pPg){ return PGHDR_TO_DATA(pPg); } @@ -22273,26 +22273,26 @@ SQLITE_PRIVATE void *sqlite3PagerGetData(DbPage *pPg){ ** Return a pointer to the Pager.nExtra bytes of "extra" space ** allocated along with the specified page. */ -SQLITE_PRIVATE void *sqlite3PagerGetExtra(DbPage *pPg){ +STQLITE_PRIVATE void *sqlite3PagerGetExtra(DbPage *pPg){ Pager *pPager = pPg->pPager; return (pPager?PGHDR_TO_EXTRA(pPg, pPager):0); } /* ** Get/set the locking-mode for this pager. Parameter eMode must be one -** of PAGER_LOCKINGMODE_QUERY, PAGER_LOCKINGMODE_NORMAL or -** PAGER_LOCKINGMODE_EXCLUSIVE. If the parameter is not _QUERY, then +** of PAGER_LOCKINGMODE_TQUERY, PAGER_LOCKINGMODE_NORMAL or +** PAGER_LOCKINGMODE_EXCLUSIVE. If the parameter is not _TQUERY, then ** the locking-mode is set to the value specified. ** ** The returned value is either PAGER_LOCKINGMODE_NORMAL or ** PAGER_LOCKINGMODE_EXCLUSIVE, indicating the current (possibly updated) ** locking-mode. */ -SQLITE_PRIVATE int sqlite3PagerLockingMode(Pager *pPager, int eMode){ - assert( eMode==PAGER_LOCKINGMODE_QUERY +STQLITE_PRIVATE int sqlite3PagerLockingMode(Pager *pPager, int eMode){ + assert( eMode==PAGER_LOCKINGMODE_TQUERY || eMode==PAGER_LOCKINGMODE_NORMAL || eMode==PAGER_LOCKINGMODE_EXCLUSIVE ); - assert( PAGER_LOCKINGMODE_QUERY<0 ); + assert( PAGER_LOCKINGMODE_TQUERY<0 ); assert( PAGER_LOCKINGMODE_NORMAL>=0 && PAGER_LOCKINGMODE_EXCLUSIVE>=0 ); if( eMode>=0 && !pPager->tempFile ){ pPager->exclusiveMode = eMode; @@ -22300,22 +22300,22 @@ SQLITE_PRIVATE int sqlite3PagerLockingMode(Pager *pPager, int eMode){ return (int)pPager->exclusiveMode; } -#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST) +#if defined(STQLITE_DEBUG) || defined(STQLITE_TEST) /* ** Return the current state of the file lock for the given pager. ** The return value is one of NO_LOCK, SHARED_LOCK, RESERVED_LOCK, ** PENDING_LOCK, or EXCLUSIVE_LOCK. */ -SQLITE_PRIVATE int sqlite3PagerLockstate(Pager *pPager){ +STQLITE_PRIVATE int sqlite3PagerLockstate(Pager *pPager){ return sqlite3OsLockState(pPager->fd); } #endif -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG /* ** Print a listing of all referenced pages and their ref count. */ -SQLITE_PRIVATE void sqlite3PagerRefdump(Pager *pPager){ +STQLITE_PRIVATE void sqlite3PagerRefdump(Pager *pPager){ PgHdr *pPg; for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ if( pPg->nRef<=0 ) continue; @@ -22325,7 +22325,7 @@ SQLITE_PRIVATE void sqlite3PagerRefdump(Pager *pPager){ } #endif -#endif /* SQLITE_OMIT_DISKIO */ +#endif /* STQLITE_OMIT_DISKIO */ /************** End of pager.c ***********************************************/ /************** Begin file btree.c *******************************************/ @@ -22407,7 +22407,7 @@ SQLITE_PRIVATE void sqlite3PagerRefdump(Pager *pPager){ ** The format of the file header is as follows: ** ** OFFSET SIZE DESCRIPTION -** 0 16 Header string: "SQLite format 3\000" +** 0 16 Header string: "STQLite format 3\000" ** 16 2 Page size in bytes. ** 18 1 File format write version ** 19 1 File format read version @@ -22474,7 +22474,7 @@ SQLITE_PRIVATE void sqlite3PagerRefdump(Pager *pPager){ ** 8 4 Right child (the Ptr(N) value). Omitted on leaves. ** ** The flags define the format of this btree page. The leaf flag means that -** this page has no children. The zerodata flag means that this page carries +** this page has no tqchildren. The zerodata flag means that this page carries ** only keys and no data. The intkey flag means that the key is a integer ** which is stored in the key size entry of the cell header rather than in ** the payload area. @@ -22555,7 +22555,7 @@ SQLITE_PRIVATE void sqlite3PagerRefdump(Pager *pPager){ */ /* Round up a number to the next larger multiple of 8. This is used -** to force 8-byte alignment on 64-bit architectures. +** to force 8-byte tqalignment on 64-bit architectures. */ #define ROUND8(x) ((x+7)&~7) @@ -22577,18 +22577,18 @@ typedef struct BtLock BtLock; /* ** This is a magic string that appears at the beginning of every -** SQLite database in order to identify the file as a real database. +** STQLite database in order to identify the file as a real database. ** ** You can change this value at compile-time by specifying a -** -DSQLITE_FILE_HEADER="..." on the compiler command-line. The +** -DSTQLITE_FILE_HEADER="..." on the compiler command-line. The ** header must be exactly 16 bytes including the zero-terminator so ** the string itself should be 15 characters long. If you change ** the header, then your custom library will not be able to read ** databases generated by the standard tools and the standard tools ** will not be able to read databases created by your custom library. */ -#ifndef SQLITE_FILE_HEADER /* 123456789 123456 */ -# define SQLITE_FILE_HEADER "SQLite format 3" +#ifndef STQLITE_FILE_HEADER /* 123456789 123456 */ +# define STQLITE_FILE_HEADER "STQLite format 3" #endif /* @@ -22605,9 +22605,9 @@ typedef struct BtLock BtLock; ** structure is appended and initialized to zero. This structure stores ** information about the page that is decoded from the raw file page. ** -** The pParent field points back to the parent page. This allows us to +** The pParent field points back to the tqparent page. This allows us to ** walk up the BTree from any leaf to the root. Care must be taken to -** unref() the parent page pointer when this page is no longer referenced. +** unref() the tqparent page pointer when this page is no longer referenced. ** The pageDestructor() routine handles that chore. */ struct MemPage { @@ -22624,7 +22624,7 @@ struct MemPage { u16 maxLocal; /* Copy of Btree.maxLocal or Btree.maxLeaf */ u16 minLocal; /* Copy of Btree.minLocal or Btree.minLeaf */ u16 cellOffset; /* Index in aData of first cell pointer */ - u16 idxParent; /* Index in parent of this node */ + u16 idxParent; /* Index in tqparent of this node */ u16 nFree; /* Number of free bytes on the page */ u16 nCell; /* Number of cells on this page, local and ovfl */ struct _OvflCell { /* Cells that will not fit on aData[] */ @@ -22635,7 +22635,7 @@ struct MemPage { u8 *aData; /* Pointer back to the start of the page */ DbPage *pDbPage; /* Pager page handle */ Pgno pgno; /* Page number for this page */ - MemPage *pParent; /* The parent of this page. NULL for root */ + MemPage *pParent; /* The tqparent of this page. NULL for root */ }; /* @@ -22677,7 +22677,7 @@ struct BtShared { u8 minEmbedFrac; /* Minimum payload as % of total page size */ u8 minLeafFrac; /* Minimum leaf payload as % of total page size */ u8 pageSizeFixed; /* True if the page size can no longer be changed */ -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM u8 autoVacuum; /* True if auto-vacuum is enabled */ u8 incrVacuum; /* True if incr-vacuum is enabled */ Pgno nTrunc; /* Non-zero if the db will be truncated (incr vacuum) */ @@ -22694,7 +22694,7 @@ struct BtShared { int nTransaction; /* Number of open transactions (read + write) */ void *pSchema; /* Pointer to space allocated by sqlite3BtreeSchema() */ void (*xFreeSchema)(void*); /* Destructor for BtShared.pSchema */ -#ifndef SQLITE_OMIT_SHARED_CACHE +#ifndef STQLITE_OMIT_SHARED_CACHE BtLock *pLock; /* List of locks held on this shared-btree struct */ BtShared *pNext; /* Next in ThreadData.pBtree linked list */ #endif @@ -22736,7 +22736,7 @@ struct BtCursor { void *pKey; /* Saved key that was cursor's last known position */ i64 nKey; /* Size of pKey, or last integer key */ int skip; /* (skip<0) -> Prev() is a no-op. (skip>0) -> Next() is */ -#ifndef SQLITE_OMIT_INCRBLOB +#ifndef STQLITE_OMIT_INCRBLOB u8 isIncrblobHandle; /* True if this cursor is an incr. io handle */ Pgno *aOverflow; /* Cache of overflow page locations */ #endif @@ -22753,7 +22753,7 @@ struct BtCursor { ** because the table is empty or because BtreeCursorFirst() has not been ** called. ** -** CURSOR_REQUIRESEEK: +** CURSOR_RETQUIRESEEK: ** The table that this cursor was opened on still exists, but has been ** modified since the cursor was last used. The cursor position is saved ** in variables BtCursor.pKey and BtCursor.nKey. When a cursor is in @@ -22762,14 +22762,14 @@ struct BtCursor { */ #define CURSOR_INVALID 0 #define CURSOR_VALID 1 -#define CURSOR_REQUIRESEEK 2 +#define CURSOR_RETQUIRESEEK 2 /* ** The TRACE macro will print high-level status information about the ** btree operation when the global variable sqlite3_btree_trace is ** enabled. */ -#if SQLITE_TEST +#if STQLITE_TEST # define TRACE(X) if( sqlite3_btree_trace ){ printf X; fflush(stdout); } #else # define TRACE(X) @@ -22791,7 +22791,7 @@ struct BtCursor { ** If disk I/O is omitted (meaning that the database is stored purely ** in memory) then there is no pending byte. */ -#ifdef SQLITE_OMIT_DISKIO +#ifdef STQLITE_OMIT_DISKIO # define PENDING_BYTE_PAGE(pBt) 0x7fffffff #else # define PENDING_BYTE_PAGE(pBt) ((PENDING_BYTE/(pBt)->pageSize)+1) @@ -22835,18 +22835,18 @@ struct BtLock { #define PTRMAP_ISPAGE(pBt, pgno) (PTRMAP_PAGENO((pBt),(pgno))==(pgno)) /* -** The pointer map is a lookup table that identifies the parent page for -** each child page in the database file. The parent page is the page that -** contains a pointer to the child. Every page in the database contains -** 0 or 1 parent pages. (In this context 'database page' refers +** The pointer map is a lookup table that identifies the tqparent page for +** each child page in the database file. The tqparent page is the page that +** contains a pointer to the child. Every page in the database tqcontains +** 0 or 1 tqparent pages. (In this context 'database page' refers ** to any page that is not part of the pointer map itself.) Each pointer map -** entry consists of a single byte 'type' and a 4 byte parent page number. +** entry consists of a single byte 'type' and a 4 byte tqparent page number. ** The PTRMAP_XXX identifiers below are the valid types. ** ** The purpose of the pointer map is to facility moving pages from one ** position in the file to another as part of autovacuum. When a page -** is moved, the pointer in its parent must be updated to point to the -** new location. The pointer map is used to locate the parent page quickly. +** is moved, the pointer in its tqparent must be updated to point to the +** new location. The pointer map is used to locate the tqparent page quickly. ** ** PTRMAP_ROOTPAGE: The database page is a root-page. The page-number is not ** used in this case. @@ -22863,7 +22863,7 @@ struct BtLock { ** page in the overflow page list. ** ** PTRMAP_BTREE: The database page is a non-root btree page. The page number -** identifies the parent page in the btree. +** identifies the tqparent page in the btree. */ #define PTRMAP_ROOTPAGE 1 #define PTRMAP_FREEPAGE 2 @@ -22888,7 +22888,7 @@ struct BtLock { ** (sqliteMallocRaw), it is not possible to use conditional compilation. ** So, this macro is defined instead. */ -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM #define ISAUTOVACUUM (pBt->autoVacuum) #else #define ISAUTOVACUUM 0 @@ -22921,32 +22921,32 @@ struct IntegrityCk { /* ** Internal routines that should be accessed by the btree layer only. */ -SQLITE_PRIVATE int sqlite3BtreeGetPage(BtShared*, Pgno, MemPage**, int); -SQLITE_PRIVATE int sqlite3BtreeInitPage(MemPage *pPage, MemPage *pParent); -SQLITE_PRIVATE void sqlite3BtreeParseCellPtr(MemPage*, u8*, CellInfo*); -SQLITE_PRIVATE void sqlite3BtreeParseCell(MemPage*, int, CellInfo*); -SQLITE_PRIVATE u8 *sqlite3BtreeFindCell(MemPage *pPage, int iCell); -SQLITE_PRIVATE int sqlite3BtreeRestoreOrClearCursorPosition(BtCursor *pCur); -SQLITE_PRIVATE void sqlite3BtreeGetTempCursor(BtCursor *pCur, BtCursor *pTempCur); -SQLITE_PRIVATE void sqlite3BtreeReleaseTempCursor(BtCursor *pCur); -SQLITE_PRIVATE int sqlite3BtreeIsRootPage(MemPage *pPage); -SQLITE_PRIVATE void sqlite3BtreeMoveToParent(BtCursor *pCur); +STQLITE_PRIVATE int sqlite3BtreeGetPage(BtShared*, Pgno, MemPage**, int); +STQLITE_PRIVATE int sqlite3BtreeInitPage(MemPage *pPage, MemPage *pParent); +STQLITE_PRIVATE void sqlite3BtreeParseCellPtr(MemPage*, u8*, CellInfo*); +STQLITE_PRIVATE void sqlite3BtreeParseCell(MemPage*, int, CellInfo*); +STQLITE_PRIVATE u8 *sqlite3BtreeFindCell(MemPage *pPage, int iCell); +STQLITE_PRIVATE int sqlite3BtreeRestoreOrClearCursorPosition(BtCursor *pCur); +STQLITE_PRIVATE void sqlite3BtreeGetTempCursor(BtCursor *pCur, BtCursor *pTempCur); +STQLITE_PRIVATE void sqlite3BtreeReleaseTempCursor(BtCursor *pCur); +STQLITE_PRIVATE int sqlite3BtreeIsRootPage(MemPage *pPage); +STQLITE_PRIVATE void sqlite3BtreeMoveToParent(BtCursor *pCur); /************** End of btreeInt.h ********************************************/ /************** Continuing where we left off in btree.c **********************/ /* ** The header string that appears at the beginning of every -** SQLite database. +** STQLite database. */ -static const char zMagicHeader[] = SQLITE_FILE_HEADER; +static const char zMagicHeader[] = STQLITE_FILE_HEADER; /* ** Set this global variable to 1 to enable tracing using the TRACE ** macro. */ -#if SQLITE_TEST +#if STQLITE_TEST int sqlite3_btree_trace=0; /* True to enable tracing */ #endif @@ -22956,7 +22956,7 @@ int sqlite3_btree_trace=0; /* True to enable tracing */ static int checkReadLocks(Btree*,Pgno,BtCursor*); -#ifdef SQLITE_OMIT_SHARED_CACHE +#ifdef STQLITE_OMIT_SHARED_CACHE /* ** The functions queryTableLock(), lockTable() and unlockAllTables() ** manipulate entries in the BtShared.pLock linked list used to store @@ -22965,16 +22965,16 @@ static int checkReadLocks(Btree*,Pgno,BtCursor*); ** of each BtShared structure and so this locking is not necessary. ** So define the lock related functions as no-ops. */ - #define queryTableLock(a,b,c) SQLITE_OK - #define lockTable(a,b,c) SQLITE_OK + #define queryTableLock(a,b,c) STQLITE_OK + #define lockTable(a,b,c) STQLITE_OK #define unlockAllTables(a) #else /* ** Query to see if btree handle p may obtain a lock of type eLock ** (READ_LOCK or WRITE_LOCK) on the table with root-page iTab. Return -** SQLITE_OK if the lock may be obtained (by calling lockTable()), or -** SQLITE_LOCKED if not. +** STQLITE_OK if the lock may be obtained (by calling lockTable()), or +** STQLITE_LOCKED if not. */ static int queryTableLock(Btree *p, Pgno iTab, u8 eLock){ BtShared *pBt = p->pBt; @@ -22982,7 +22982,7 @@ static int queryTableLock(Btree *p, Pgno iTab, u8 eLock){ /* This is a no-op if the shared-cache is not enabled */ if( 0==sqlite3ThreadDataReadOnly()->useSharedData ){ - return SQLITE_OK; + return STQLITE_OK; } /* This (along with lockTable()) is where the ReadUncommitted flag is @@ -23001,18 +23001,18 @@ static int queryTableLock(Btree *p, Pgno iTab, u8 eLock){ */ if( !p->pSqlite || - 0==(p->pSqlite->flags&SQLITE_ReadUncommitted) || + 0==(p->pSqlite->flags&STQLITE_ReadUncommitted) || eLock==WRITE_LOCK || iTab==MASTER_ROOT ){ for(pIter=pBt->pLock; pIter; pIter=pIter->pNext){ if( pIter->pBtree!=p && pIter->iTable==iTab && (pIter->eLock!=eLock || eLock!=READ_LOCK) ){ - return SQLITE_LOCKED; + return STQLITE_LOCKED; } } } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -23020,8 +23020,8 @@ static int queryTableLock(Btree *p, Pgno iTab, u8 eLock){ ** by Btree handle p. Parameter eLock must be either READ_LOCK or ** WRITE_LOCK. ** -** SQLITE_OK is returned if the lock is added successfully. SQLITE_BUSY and -** SQLITE_NOMEM may also be returned. +** STQLITE_OK is returned if the lock is added successfully. STQLITE_BUSY and +** STQLITE_NOMEM may also be returned. */ static int lockTable(Btree *p, Pgno iTable, u8 eLock){ BtShared *pBt = p->pBt; @@ -23030,10 +23030,10 @@ static int lockTable(Btree *p, Pgno iTable, u8 eLock){ /* This is a no-op if the shared-cache is not enabled */ if( 0==sqlite3ThreadDataReadOnly()->useSharedData ){ - return SQLITE_OK; + return STQLITE_OK; } - assert( SQLITE_OK==queryTableLock(p, iTable, eLock) ); + assert( STQLITE_OK==queryTableLock(p, iTable, eLock) ); /* If the read-uncommitted flag is set and a read-lock is requested, ** return early without adding an entry to the BtShared.pLock list. See @@ -23042,11 +23042,11 @@ static int lockTable(Btree *p, Pgno iTable, u8 eLock){ */ if( (p->pSqlite) && - (p->pSqlite->flags&SQLITE_ReadUncommitted) && + (p->pSqlite->flags&STQLITE_ReadUncommitted) && (eLock==READ_LOCK) && iTable!=MASTER_ROOT ){ - return SQLITE_OK; + return STQLITE_OK; } /* First search the list for an existing lock on this table. */ @@ -23063,7 +23063,7 @@ static int lockTable(Btree *p, Pgno iTable, u8 eLock){ if( !pLock ){ pLock = (BtLock *)sqliteMalloc(sizeof(BtLock)); if( !pLock ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } pLock->iTable = iTable; pLock->pBtree = p; @@ -23080,7 +23080,7 @@ static int lockTable(Btree *p, Pgno iTable, u8 eLock){ pLock->eLock = eLock; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -23106,15 +23106,15 @@ static void unlockAllTables(Btree *p){ } } } -#endif /* SQLITE_OMIT_SHARED_CACHE */ +#endif /* STQLITE_OMIT_SHARED_CACHE */ static void releasePage(MemPage *pPage); /* Forward reference */ -#ifndef SQLITE_OMIT_INCRBLOB +#ifndef STQLITE_OMIT_INCRBLOB /* ** Invalidate the overflow page-list cache for cursor pCur, if any. */ -static void invalidateOverflowCache(BtCursor *pCur){ +static void tqinvalidateOverflowCache(BtCursor *pCur){ sqliteFree(pCur->aOverflow); pCur->aOverflow = 0; } @@ -23123,20 +23123,20 @@ static void invalidateOverflowCache(BtCursor *pCur){ ** Invalidate the overflow page-list cache for all cursors opened ** on the shared btree structure pBt. */ -static void invalidateAllOverflowCache(BtShared *pBt){ +static void tqinvalidateAllOverflowCache(BtShared *pBt){ BtCursor *p; for(p=pBt->pCursor; p; p=p->pNext){ - invalidateOverflowCache(p); + tqinvalidateOverflowCache(p); } } #else - #define invalidateOverflowCache(x) - #define invalidateAllOverflowCache(x) + #define tqinvalidateOverflowCache(x) + #define tqinvalidateAllOverflowCache(x) #endif /* ** Save the current cursor position in the variables BtCursor.nKey -** and BtCursor.pKey. The cursor's state is set to CURSOR_REQUIRESEEK. +** and BtCursor.pKey. The cursor's state is set to CURSOR_RETQUIRESEEK. */ static int saveCursorPosition(BtCursor *pCur){ int rc; @@ -23152,28 +23152,28 @@ static int saveCursorPosition(BtCursor *pCur){ ** table, then malloc space for and store the pCur->nKey bytes of key ** data. */ - if( rc==SQLITE_OK && 0==pCur->pPage->intKey){ + if( rc==STQLITE_OK && 0==pCur->pPage->intKey){ void *pKey = sqliteMalloc(pCur->nKey); if( pKey ){ rc = sqlite3BtreeKey(pCur, 0, pCur->nKey, pKey); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ pCur->pKey = pKey; }else{ sqliteFree(pKey); } }else{ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; } } assert( !pCur->pPage->intKey || !pCur->pKey ); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ releasePage(pCur->pPage); pCur->pPage = 0; - pCur->eState = CURSOR_REQUIRESEEK; + pCur->eState = CURSOR_RETQUIRESEEK; } - invalidateOverflowCache(pCur); + tqinvalidateOverflowCache(pCur); return rc; } @@ -23188,12 +23188,12 @@ static int saveAllCursors(BtShared *pBt, Pgno iRoot, BtCursor *pExcept){ if( p!=pExcept && (0==iRoot || p->pgnoRoot==iRoot) && p->eState==CURSOR_VALID ){ int rc = saveCursorPosition(p); - if( SQLITE_OK!=rc ){ + if( STQLITE_OK!=rc ){ return rc; } } } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -23216,17 +23216,17 @@ static void clearCursorPosition(BtCursor *pCur){ ** returning the cursor to it's saved position, any saved position is deleted ** and the cursor state set to CURSOR_INVALID. */ -SQLITE_PRIVATE int sqlite3BtreeRestoreOrClearCursorPosition(BtCursor *pCur){ +STQLITE_PRIVATE int sqlite3BtreeRestoreOrClearCursorPosition(BtCursor *pCur){ int rc; - assert( pCur->eState==CURSOR_REQUIRESEEK ); -#ifndef SQLITE_OMIT_INCRBLOB + assert( pCur->eState==CURSOR_RETQUIRESEEK ); +#ifndef STQLITE_OMIT_INCRBLOB if( pCur->isIncrblobHandle ){ - return SQLITE_ABORT; + return STQLITE_ABORT; } #endif pCur->eState = CURSOR_INVALID; rc = sqlite3BtreeMoveto(pCur, pCur->pKey, pCur->nKey, 0, &pCur->skip); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ sqliteFree(pCur->pKey); pCur->pKey = 0; assert( pCur->eState==CURSOR_VALID || pCur->eState==CURSOR_INVALID ); @@ -23235,11 +23235,11 @@ SQLITE_PRIVATE int sqlite3BtreeRestoreOrClearCursorPosition(BtCursor *pCur){ } #define restoreOrClearCursorPosition(p) \ - (p->eState==CURSOR_REQUIRESEEK ? \ + (p->eState==CURSOR_RETQUIRESEEK ? \ sqlite3BtreeRestoreOrClearCursorPosition(p) : \ - SQLITE_OK) + STQLITE_OK) -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* ** Given a page number of a regular database page, return the page ** number for the pointer-map page that contains the entry for the @@ -23259,10 +23259,10 @@ static Pgno ptrmapPageno(BtShared *pBt, Pgno pgno){ ** Write an entry into the pointer map. ** ** This routine updates the pointer map entry for page number 'key' -** so that it maps to type 'eType' and parent page number 'pgno'. -** An error code is returned if something goes wrong, otherwise SQLITE_OK. +** so that it maps to type 'eType' and tqparent page number 'pgno'. +** An error code is returned if something goes wrong, otherwise STQLITE_OK. */ -static int ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno parent){ +static int ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno tqparent){ DbPage *pDbPage; /* The pointer map page */ u8 *pPtrmap; /* The pointer map data */ Pgno iPtrmap; /* The pointer map page number */ @@ -23274,22 +23274,22 @@ static int ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno parent){ assert( pBt->autoVacuum ); if( key==0 ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } iPtrmap = PTRMAP_PAGENO(pBt, key); rc = sqlite3PagerGet(pBt->pPager, iPtrmap, &pDbPage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } offset = PTRMAP_PTROFFSET(pBt, key); pPtrmap = (u8 *)sqlite3PagerGetData(pDbPage); - if( eType!=pPtrmap[offset] || get4byte(&pPtrmap[offset+1])!=parent ){ - TRACE(("PTRMAP_UPDATE: %d->(%d,%d)\n", key, eType, parent)); + if( eType!=pPtrmap[offset] || get4byte(&pPtrmap[offset+1])!=tqparent ){ + TRACE(("PTRMAP_UPDATE: %d->(%d,%d)\n", key, eType, tqparent)); rc = sqlite3PagerWrite(pDbPage); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ pPtrmap[offset] = eType; - put4byte(&pPtrmap[offset+1], parent); + put4byte(&pPtrmap[offset+1], tqparent); } } @@ -23301,8 +23301,8 @@ static int ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno parent){ ** Read an entry from the pointer map. ** ** This routine retrieves the pointer map entry for page 'key', writing -** the type and parent page number to *pEType and *pPgno respectively. -** An error code is returned if something goes wrong, otherwise SQLITE_OK. +** the type and tqparent page number to *pEType and *pPgno respectively. +** An error code is returned if something goes wrong, otherwise STQLITE_OK. */ static int ptrmapGet(BtShared *pBt, Pgno key, u8 *pEType, Pgno *pPgno){ DbPage *pDbPage; /* The pointer map page */ @@ -23324,11 +23324,11 @@ static int ptrmapGet(BtShared *pBt, Pgno key, u8 *pEType, Pgno *pPgno){ if( pPgno ) *pPgno = get4byte(&pPtrmap[offset+1]); sqlite3PagerUnref(pDbPage); - if( *pEType<1 || *pEType>5 ) return SQLITE_CORRUPT_BKPT; - return SQLITE_OK; + if( *pEType<1 || *pEType>5 ) return STQLITE_CORRUPT_BKPT; + return STQLITE_OK; } -#endif /* SQLITE_OMIT_AUTOVACUUM */ +#endif /* STQLITE_OMIT_AUTOVACUUM */ /* ** Given a btree page and a cell index (0 means the first cell on @@ -23339,7 +23339,7 @@ static int ptrmapGet(BtShared *pBt, Pgno key, u8 *pEType, Pgno *pPgno){ */ #define findCell(pPage, iCell) \ ((pPage)->aData + get2byte(&(pPage)->aData[(pPage)->cellOffset+2*(iCell)])) -SQLITE_PRIVATE u8 *sqlite3BtreeFindCell(MemPage *pPage, int iCell){ +STQLITE_PRIVATE u8 *sqlite3BtreeFindCell(MemPage *pPage, int iCell){ assert( iCell>=0 ); assert( iCell<get2byte(&pPage->aData[pPage->hdrOffset+3]) ); return findCell(pPage, iCell); @@ -23375,7 +23375,7 @@ static u8 *findOverflowCell(MemPage *pPage, int iCell){ ** Within this file, the parseCell() macro can be called instead of ** sqlite3BtreeParseCellPtr(). Using some compilers, this will be faster. */ -SQLITE_PRIVATE void sqlite3BtreeParseCellPtr( +STQLITE_PRIVATE void sqlite3BtreeParseCellPtr( MemPage *pPage, /* Page containing the cell */ u8 *pCell, /* Pointer to the cell text. */ CellInfo *pInfo /* Fill in this structure */ @@ -23443,7 +23443,7 @@ SQLITE_PRIVATE void sqlite3BtreeParseCellPtr( } #define parseCell(pPage, iCell, pInfo) \ sqlite3BtreeParseCellPtr((pPage), findCell((pPage), (iCell)), (pInfo)) -SQLITE_PRIVATE void sqlite3BtreeParseCell( +STQLITE_PRIVATE void sqlite3BtreeParseCell( MemPage *pPage, /* Page containing the cell */ int iCell, /* The cell index. First cell is 0 */ CellInfo *pInfo /* Fill in this structure */ @@ -23470,7 +23470,7 @@ static int cellSizePtr(MemPage *pPage, u8 *pCell){ return info.nSize; } -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* ** If the cell pCell, part of page pPage contains a pointer ** to an overflow page, insert an entry into the pointer-map @@ -23486,7 +23486,7 @@ static int ptrmapPutOvflPtr(MemPage *pPage, u8 *pCell){ return ptrmapPut(pPage->pBt, ovfl, PTRMAP_OVERFLOW1, pPage->pgno); } } - return SQLITE_OK; + return STQLITE_OK; } /* ** If the cell with index iCell on page pPage contains a pointer @@ -23522,10 +23522,10 @@ static int defragmentPage(MemPage *pPage){ assert( sqlite3PagerIswriteable(pPage->pDbPage) ); assert( pPage->pBt!=0 ); - assert( pPage->pBt->usableSize <= SQLITE_MAX_PAGE_SIZE ); + assert( pPage->pBt->usableSize <= STQLITE_MAX_PAGE_SIZE ); assert( pPage->nOverflow==0 ); temp = sqliteMalloc( pPage->pBt->pageSize ); - if( temp==0 ) return SQLITE_NOMEM; + if( temp==0 ) return STQLITE_NOMEM; data = pPage->aData; hdr = pPage->hdrOffset; cellOffset = pPage->cellOffset; @@ -23553,7 +23553,7 @@ static int defragmentPage(MemPage *pPage){ addr = cellOffset+2*nCell; memset(&data[addr], 0, brk-addr); sqliteFree(temp); - return SQLITE_OK; + return STQLITE_OK; } /* @@ -23640,7 +23640,7 @@ static void freeSpace(MemPage *pPage, int start, int size){ assert( (start + size)<=pPage->pBt->usableSize ); if( size<4 ) size = 4; -#ifdef SQLITE_SECURE_DELETE +#ifdef STQLITE_SECURE_DELETE /* Overwrite deleted information with zeros when the SECURE_DELETE ** option is enabled at compile-time */ memset(&data[start], 0, size); @@ -23719,18 +23719,18 @@ static void decodeFlags(MemPage *pPage, int flagByte){ ** Initialize the auxiliary information for a disk block. ** ** The pParent parameter must be a pointer to the MemPage which -** is the parent of the page being initialized. The root of a -** BTree has no parent and so for that page, pParent==NULL. +** is the tqparent of the page being initialized. The root of a +** BTree has no tqparent and so for that page, pParent==NULL. ** -** Return SQLITE_OK on success. If we see that the page does +** Return STQLITE_OK on success. If we see that the page does ** not contain a well-formed database page, then return -** SQLITE_CORRUPT. Note that a return of SQLITE_OK does not +** STQLITE_CORRUPT. Note that a return of STQLITE_OK does not ** guarantee that the page is well-formed. It only shows that ** we failed to detect any corruption. */ -SQLITE_PRIVATE int sqlite3BtreeInitPage( +STQLITE_PRIVATE int sqlite3BtreeInitPage( MemPage *pPage, /* The page to be initialized */ - MemPage *pParent /* The parent. Might be NULL */ + MemPage *pParent /* The tqparent. Might be NULL */ ){ int pc; /* Address of a freeblock within pPage->aData[] */ int hdr; /* Offset to beginning of page header */ @@ -23747,10 +23747,10 @@ SQLITE_PRIVATE int sqlite3BtreeInitPage( assert( pPage->pgno==sqlite3PagerPagenumber(pPage->pDbPage) ); assert( pPage->aData == &((unsigned char*)pPage)[-pBt->pageSize] ); if( pPage->pParent!=pParent && (pPage->pParent!=0 || pPage->isInit) ){ - /* The parent page should never change unless the file is corrupt */ - return SQLITE_CORRUPT_BKPT; + /* The tqparent page should never change unless the file is corrupt */ + return STQLITE_CORRUPT_BKPT; } - if( pPage->isInit ) return SQLITE_OK; + if( pPage->isInit ) return STQLITE_OK; if( pPage->pParent==0 && pParent!=0 ){ pPage->pParent = pParent; sqlite3PagerRef(pParent->pDbPage); @@ -23766,11 +23766,11 @@ SQLITE_PRIVATE int sqlite3BtreeInitPage( pPage->nCell = get2byte(&data[hdr+3]); if( pPage->nCell>MX_CELL(pBt) ){ /* To many cells for a single page. The page must be corrupt */ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } if( pPage->nCell==0 && pParent!=0 && pParent->pgno!=1 ){ /* All pages must have at least one cell, except for root pages */ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } /* Compute the total free space on the page */ @@ -23780,13 +23780,13 @@ SQLITE_PRIVATE int sqlite3BtreeInitPage( int next, size; if( pc>usableSize-4 ){ /* Free block is off the page */ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } next = get2byte(&data[pc]); size = get2byte(&data[pc+2]); if( next>0 && next<=pc+size+3 ){ /* Free blocks must be in accending order */ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } nFree += size; pc = next; @@ -23794,11 +23794,11 @@ SQLITE_PRIVATE int sqlite3BtreeInitPage( pPage->nFree = nFree; if( nFree>=usableSize ){ /* Free space cannot exceed total page size */ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } pPage->isInit = 1; - return SQLITE_OK; + return STQLITE_OK; } /* @@ -23841,7 +23841,7 @@ static void zeroPage(MemPage *pPage, int flags){ ** means we have started to be concerned about content and the disk ** read should occur at that point. */ -SQLITE_PRIVATE int sqlite3BtreeGetPage( +STQLITE_PRIVATE int sqlite3BtreeGetPage( BtShared *pBt, /* The btree */ Pgno pgno, /* Number of the page to fetch */ MemPage **ppPage, /* Return the page in this parameter */ @@ -23860,7 +23860,7 @@ SQLITE_PRIVATE int sqlite3BtreeGetPage( pPage->pgno = pgno; pPage->hdrOffset = pPage->pgno==1 ? 100 : 0; *ppPage = pPage; - return SQLITE_OK; + return STQLITE_OK; } /* @@ -23876,10 +23876,10 @@ static int getAndInitPage( ){ int rc; if( pgno==0 ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } rc = sqlite3BtreeGetPage(pBt, pgno, ppPage, 0); - if( rc==SQLITE_OK && (*ppPage)->isInit==0 ){ + if( rc==STQLITE_OK && (*ppPage)->isInit==0 ){ rc = sqlite3BtreeInitPage(*ppPage, pParent); } return rc; @@ -23940,7 +23940,7 @@ static void pageReinit(DbPage *pData, int pageSize){ ** a new database with a random name is created. This randomly named ** database file will be deleted when sqlite3BtreeClose() is called. */ -SQLITE_PRIVATE int sqlite3BtreeOpen( +STQLITE_PRIVATE int sqlite3BtreeOpen( const char *zFilename, /* Name of the file containing the BTree database */ sqlite3 *pSqlite, /* Associated database handle */ Btree **ppBtree, /* Pointer to new Btree object written here */ @@ -23948,10 +23948,10 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( ){ BtShared *pBt; /* Shared part of btree structure */ Btree *p; /* Handle to return */ - int rc = SQLITE_OK; + int rc = STQLITE_OK; int nReserve; unsigned char zDbHeader[100]; -#if !defined(SQLITE_OMIT_SHARED_CACHE) && !defined(SQLITE_OMIT_DISKIO) +#if !defined(STQLITE_OMIT_SHARED_CACHE) && !defined(STQLITE_OMIT_DISKIO) const ThreadData *pTsdro; #endif @@ -23960,8 +23960,8 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( ** either of the shared-data or autovacuum features are compiled ** into the library. */ -#if !defined(SQLITE_OMIT_SHARED_CACHE) || !defined(SQLITE_OMIT_AUTOVACUUM) - #ifdef SQLITE_OMIT_MEMORYDB +#if !defined(STQLITE_OMIT_SHARED_CACHE) || !defined(STQLITE_OMIT_AUTOVACUUM) + #ifdef STQLITE_OMIT_MEMORYDB const int isMemdb = 0; #else const int isMemdb = zFilename && !strcmp(zFilename, ":memory:"); @@ -23970,19 +23970,19 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( p = sqliteMalloc(sizeof(Btree)); if( !p ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } p->inTrans = TRANS_NONE; p->pSqlite = pSqlite; /* Try to find an existing Btree structure opened on zFilename. */ -#if !defined(SQLITE_OMIT_SHARED_CACHE) && !defined(SQLITE_OMIT_DISKIO) +#if !defined(STQLITE_OMIT_SHARED_CACHE) && !defined(STQLITE_OMIT_DISKIO) pTsdro = sqlite3ThreadDataReadOnly(); if( pTsdro->useSharedData && zFilename && !isMemdb ){ char *zFullPathname = sqlite3OsFullPathname(zFilename); if( !zFullPathname ){ sqliteFree(p); - return SQLITE_NOMEM; + return STQLITE_NOMEM; } for(pBt=pTsdro->pBtree; pBt; pBt=pBt->pNext){ assert( pBt->nRef>0 ); @@ -23991,7 +23991,7 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( *ppBtree = p; pBt->nRef++; sqliteFree(zFullPathname); - return SQLITE_OK; + return STQLITE_OK; } } sqliteFree(zFullPathname); @@ -24011,14 +24011,14 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( pBt = sqliteMalloc( sizeof(*pBt) ); if( pBt==0 ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; goto btree_open_out; } rc = sqlite3PagerOpen(&pBt->pPager, zFilename, EXTRA_SIZE, flags); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = sqlite3PagerReadFileheader(pBt->pPager,sizeof(zDbHeader),zDbHeader); } - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto btree_open_out; } p->pBt = pBt; @@ -24029,22 +24029,22 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( pBt->pPage1 = 0; pBt->readOnly = sqlite3PagerIsreadonly(pBt->pPager); pBt->pageSize = get2byte(&zDbHeader[16]); - if( pBt->pageSize<512 || pBt->pageSize>SQLITE_MAX_PAGE_SIZE + if( pBt->pageSize<512 || pBt->pageSize>STQLITE_MAX_PAGE_SIZE || ((pBt->pageSize-1)&pBt->pageSize)!=0 ){ - pBt->pageSize = SQLITE_DEFAULT_PAGE_SIZE; + pBt->pageSize = STQLITE_DEFAULT_PAGE_SIZE; pBt->maxEmbedFrac = 64; /* 25% */ pBt->minEmbedFrac = 32; /* 12.5% */ pBt->minLeafFrac = 32; /* 12.5% */ -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* If the magic name ":memory:" will create an in-memory database, then ** leave the autoVacuum mode at 0 (do not auto-vacuum), even if - ** SQLITE_DEFAULT_AUTOVACUUM is true. On the other hand, if - ** SQLITE_OMIT_MEMORYDB has been defined, then ":memory:" is just a + ** STQLITE_DEFAULT_AUTOVACUUM is true. On the other hand, if + ** STQLITE_OMIT_MEMORYDB has been defined, then ":memory:" is just a ** regular file-name. In this case the auto-vacuum applies as per normal. */ if( zFilename && !isMemdb ){ - pBt->autoVacuum = (SQLITE_DEFAULT_AUTOVACUUM ? 1 : 0); - pBt->incrVacuum = (SQLITE_DEFAULT_AUTOVACUUM==2 ? 1 : 0); + pBt->autoVacuum = (STQLITE_DEFAULT_AUTOVACUUM ? 1 : 0); + pBt->incrVacuum = (STQLITE_DEFAULT_AUTOVACUUM==2 ? 1 : 0); } #endif nReserve = 0; @@ -24054,16 +24054,16 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( pBt->minEmbedFrac = zDbHeader[22]; pBt->minLeafFrac = zDbHeader[23]; pBt->pageSizeFixed = 1; -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM pBt->autoVacuum = (get4byte(&zDbHeader[36 + 4*4])?1:0); pBt->incrVacuum = (get4byte(&zDbHeader[36 + 7*4])?1:0); #endif } pBt->usableSize = pBt->pageSize - nReserve; - assert( (pBt->pageSize & 7)==0 ); /* 8-byte alignment of pageSize */ + assert( (pBt->pageSize & 7)==0 ); /* 8-byte tqalignment of pageSize */ sqlite3PagerSetPagesize(pBt->pPager, pBt->pageSize); -#if !defined(SQLITE_OMIT_SHARED_CACHE) && !defined(SQLITE_OMIT_DISKIO) +#if !defined(STQLITE_OMIT_SHARED_CACHE) && !defined(STQLITE_OMIT_DISKIO) /* Add the new btree to the linked list starting at ThreadData.pBtree. ** There is no chance that a malloc() may fail inside of the ** sqlite3ThreadData() call, as the ThreadData structure must have already @@ -24078,7 +24078,7 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( *ppBtree = p; btree_open_out: - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ if( pBt && pBt->pPager ){ sqlite3PagerClose(pBt->pPager); } @@ -24090,13 +24090,13 @@ btree_open_out: } /* -** Close an open database and invalidate all cursors. +** Close an open database and tqinvalidate all cursors. */ -SQLITE_PRIVATE int sqlite3BtreeClose(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeClose(Btree *p){ BtShared *pBt = p->pBt; BtCursor *pCur; -#ifndef SQLITE_OMIT_SHARED_CACHE +#ifndef STQLITE_OMIT_SHARED_CACHE ThreadData *pTsd; #endif @@ -24117,7 +24117,7 @@ SQLITE_PRIVATE int sqlite3BtreeClose(Btree *p){ sqlite3BtreeRollback(p); sqliteFree(p); -#ifndef SQLITE_OMIT_SHARED_CACHE +#ifndef STQLITE_OMIT_SHARED_CACHE /* If there are still other outstanding references to the shared-btree ** structure, return now. The remainder of this procedure cleans ** up the shared-btree. @@ -24125,7 +24125,7 @@ SQLITE_PRIVATE int sqlite3BtreeClose(Btree *p){ assert( pBt->nRef>0 ); pBt->nRef--; if( pBt->nRef ){ - return SQLITE_OK; + return STQLITE_OK; } /* Remove the shared-btree from the thread wide list. Call @@ -24154,17 +24154,17 @@ SQLITE_PRIVATE int sqlite3BtreeClose(Btree *p){ } sqliteFree(pBt->pSchema); sqliteFree(pBt); - return SQLITE_OK; + return STQLITE_OK; } /* ** Change the busy handler callback function. */ -SQLITE_PRIVATE int sqlite3BtreeSetBusyHandler(Btree *p, BusyHandler *pHandler){ +STQLITE_PRIVATE int sqlite3BtreeSetBusyHandler(Btree *p, BusyHandler *pHandler){ BtShared *pBt = p->pBt; pBt->pBusyHandler = pHandler; sqlite3PagerSetBusyhandler(pBt->pPager, pHandler); - return SQLITE_OK; + return STQLITE_OK; } /* @@ -24182,10 +24182,10 @@ SQLITE_PRIVATE int sqlite3BtreeSetBusyHandler(Btree *p, BusyHandler *pHandler){ ** Synchronous is on by default so database corruption is not ** normally a worry. */ -SQLITE_PRIVATE int sqlite3BtreeSetCacheSize(Btree *p, int mxPage){ +STQLITE_PRIVATE int sqlite3BtreeSetCacheSize(Btree *p, int mxPage){ BtShared *pBt = p->pBt; sqlite3PagerSetCachesize(pBt->pPager, mxPage); - return SQLITE_OK; + return STQLITE_OK; } /* @@ -24196,11 +24196,11 @@ SQLITE_PRIVATE int sqlite3BtreeSetCacheSize(Btree *p, int mxPage){ ** is a very low but non-zero probability of damage. Level 3 reduces the ** probability of damage to near zero but with a write performance reduction. */ -#ifndef SQLITE_OMIT_PAGER_PRAGMAS -SQLITE_PRIVATE int sqlite3BtreeSetSafetyLevel(Btree *p, int level, int fullSync){ +#ifndef STQLITE_OMIT_PAGER_PRAGMAS +STQLITE_PRIVATE int sqlite3BtreeSetSafetyLevel(Btree *p, int level, int fullSync){ BtShared *pBt = p->pBt; sqlite3PagerSetSafetyLevel(pBt->pPager, level, fullSync); - return SQLITE_OK; + return STQLITE_OK; } #endif @@ -24208,13 +24208,13 @@ SQLITE_PRIVATE int sqlite3BtreeSetSafetyLevel(Btree *p, int level, int fullSync) ** Return TRUE if the given btree is set to safety level 1. In other ** words, return TRUE if no sync() occurs on the disk files. */ -SQLITE_PRIVATE int sqlite3BtreeSyncDisabled(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeSyncDisabled(Btree *p){ BtShared *pBt = p->pBt; assert( pBt && pBt->pPager ); return sqlite3PagerNosync(pBt->pPager); } -#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) || !defined(SQLITE_OMIT_VACUUM) +#if !defined(STQLITE_OMIT_PAGER_PRAGMAS) || !defined(STQLITE_OMIT_VACUUM) /* ** Change the default pages size and the number of reserved bytes per page. ** @@ -24230,31 +24230,31 @@ SQLITE_PRIVATE int sqlite3BtreeSyncDisabled(Btree *p){ ** If parameter nReserve is less than zero, then the number of reserved ** bytes per page is left unchanged. */ -SQLITE_PRIVATE int sqlite3BtreeSetPageSize(Btree *p, int pageSize, int nReserve){ +STQLITE_PRIVATE int sqlite3BtreeSetPageSize(Btree *p, int pageSize, int nReserve){ BtShared *pBt = p->pBt; if( pBt->pageSizeFixed ){ - return SQLITE_READONLY; + return STQLITE_READONLY; } if( nReserve<0 ){ nReserve = pBt->pageSize - pBt->usableSize; } - if( pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE && + if( pageSize>=512 && pageSize<=STQLITE_MAX_PAGE_SIZE && ((pageSize-1)&pageSize)==0 ){ assert( (pageSize & 7)==0 ); assert( !pBt->pPage1 && !pBt->pCursor ); pBt->pageSize = sqlite3PagerSetPagesize(pBt->pPager, pageSize); } pBt->usableSize = pBt->pageSize - nReserve; - return SQLITE_OK; + return STQLITE_OK; } /* ** Return the currently defined page size */ -SQLITE_PRIVATE int sqlite3BtreeGetPageSize(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeGetPageSize(Btree *p){ return p->pBt->pageSize; } -SQLITE_PRIVATE int sqlite3BtreeGetReserve(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeGetReserve(Btree *p){ return p->pBt->pageSize - p->pBt->usableSize; } @@ -24263,28 +24263,28 @@ SQLITE_PRIVATE int sqlite3BtreeGetReserve(Btree *p){ ** No changes are made if mxPage is 0 or negative. ** Regardless of the value of mxPage, return the maximum page count. */ -SQLITE_PRIVATE int sqlite3BtreeMaxPageCount(Btree *p, int mxPage){ +STQLITE_PRIVATE int sqlite3BtreeMaxPageCount(Btree *p, int mxPage){ return sqlite3PagerMaxPageCount(p->pBt->pPager, mxPage); } -#endif /* !defined(SQLITE_OMIT_PAGER_PRAGMAS) || !defined(SQLITE_OMIT_VACUUM) */ +#endif /* !defined(STQLITE_OMIT_PAGER_PRAGMAS) || !defined(STQLITE_OMIT_VACUUM) */ /* ** Change the 'auto-vacuum' property of the database. If the 'autoVacuum' ** parameter is non-zero, then auto-vacuum mode is enabled. If zero, it ** is disabled. The default value for the auto-vacuum property is -** determined by the SQLITE_DEFAULT_AUTOVACUUM macro. +** determined by the STQLITE_DEFAULT_AUTOVACUUM macro. */ -SQLITE_PRIVATE int sqlite3BtreeSetAutoVacuum(Btree *p, int autoVacuum){ -#ifdef SQLITE_OMIT_AUTOVACUUM - return SQLITE_READONLY; +STQLITE_PRIVATE int sqlite3BtreeSetAutoVacuum(Btree *p, int autoVacuum){ +#ifdef STQLITE_OMIT_AUTOVACUUM + return STQLITE_READONLY; #else BtShared *pBt = p->pBt; int av = (autoVacuum?1:0); if( pBt->pageSizeFixed && av!=pBt->autoVacuum ){ - return SQLITE_READONLY; + return STQLITE_READONLY; } pBt->autoVacuum = av; - return SQLITE_OK; + return STQLITE_OK; #endif } @@ -24292,8 +24292,8 @@ SQLITE_PRIVATE int sqlite3BtreeSetAutoVacuum(Btree *p, int autoVacuum){ ** Return the value of the 'auto-vacuum' property. If auto-vacuum is ** enabled 1 is returned. Otherwise 0. */ -SQLITE_PRIVATE int sqlite3BtreeGetAutoVacuum(Btree *p){ -#ifdef SQLITE_OMIT_AUTOVACUUM +STQLITE_PRIVATE int sqlite3BtreeGetAutoVacuum(Btree *p){ +#ifdef STQLITE_OMIT_AUTOVACUUM return BTREE_AUTOVACUUM_NONE; #else return ( @@ -24309,23 +24309,23 @@ SQLITE_PRIVATE int sqlite3BtreeGetAutoVacuum(Btree *p){ ** Get a reference to pPage1 of the database file. This will ** also acquire a readlock on that file. ** -** SQLITE_OK is returned on success. If the file is not a -** well-formed database file, then SQLITE_CORRUPT is returned. -** SQLITE_BUSY is returned if the database is locked. SQLITE_NOMEM +** STQLITE_OK is returned on success. If the file is not a +** well-formed database file, then STQLITE_CORRUPT is returned. +** STQLITE_BUSY is returned if the database is locked. STQLITE_NOMEM ** is returned if we run out of memory. */ static int lockBtree(BtShared *pBt){ int rc, pageSize; MemPage *pPage1; - if( pBt->pPage1 ) return SQLITE_OK; + if( pBt->pPage1 ) return STQLITE_OK; rc = sqlite3BtreeGetPage(pBt, 1, &pPage1, 0); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; /* Do some checking to help insure the file we opened really is ** a valid database file. */ - rc = SQLITE_NOTADB; + rc = STQLITE_NOTADB; if( sqlite3PagerPagecount(pBt->pPager)>0 ){ u8 *page1 = pPage1->aData; if( memcmp(page1, zMagicHeader, 16)!=0 ){ @@ -24350,7 +24350,7 @@ static int lockBtree(BtShared *pBt){ pBt->maxEmbedFrac = page1[21]; pBt->minEmbedFrac = page1[22]; pBt->minLeafFrac = page1[23]; -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM pBt->autoVacuum = (get4byte(&page1[36 + 4*4])?1:0); pBt->incrVacuum = (get4byte(&page1[36 + 7*4])?1:0); #endif @@ -24378,7 +24378,7 @@ static int lockBtree(BtShared *pBt){ } assert( pBt->maxLeaf + 23 <= MX_CELL_SIZE(pBt) ); pBt->pPage1 = pPage1; - return SQLITE_OK; + return STQLITE_OK; page1_init_failed: releasePage(pPage1); @@ -24391,14 +24391,14 @@ page1_init_failed: ** busy callback if there is lock contention. */ static int lockBtreeWithRetry(Btree *pRef){ - int rc = SQLITE_OK; + int rc = STQLITE_OK; if( pRef->inTrans==TRANS_NONE ){ u8 inTransaction = pRef->pBt->inTransaction; btreeIntegrity(pRef); rc = sqlite3BtreeBeginTrans(pRef, 0); pRef->pBt->inTransaction = inTransaction; pRef->inTrans = TRANS_NONE; - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ pRef->pBt->nTransaction--; } btreeIntegrity(pRef); @@ -24441,7 +24441,7 @@ static int newDatabase(BtShared *pBt){ MemPage *pP1; unsigned char *data; int rc; - if( sqlite3PagerPagecount(pBt->pPager)>0 ) return SQLITE_OK; + if( sqlite3PagerPagecount(pBt->pPager)>0 ) return STQLITE_OK; pP1 = pBt->pPage1; assert( pP1!=0 ); data = pP1->aData; @@ -24459,13 +24459,13 @@ static int newDatabase(BtShared *pBt){ memset(&data[24], 0, 100-24); zeroPage(pP1, PTF_INTKEY|PTF_LEAF|PTF_LEAFDATA ); pBt->pageSizeFixed = 1; -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM assert( pBt->autoVacuum==1 || pBt->autoVacuum==0 ); assert( pBt->incrVacuum==1 || pBt->incrVacuum==0 ); put4byte(&data[36 + 4*4], pBt->autoVacuum); put4byte(&data[36 + 7*4], pBt->incrVacuum); #endif - return SQLITE_OK; + return STQLITE_OK; } /* @@ -24492,20 +24492,20 @@ static int newDatabase(BtShared *pBt){ ** If an initial attempt to acquire the lock fails because of lock contention ** and the database was previously unlocked, then invoke the busy handler ** if there is one. But if there was previously a read-lock, do not -** invoke the busy handler - just return SQLITE_BUSY. SQLITE_BUSY is +** invoke the busy handler - just return STQLITE_BUSY. STQLITE_BUSY is ** returned when there is already a read-lock in order to avoid a deadlock. ** ** Suppose there are two processes A and B. A has a read lock and B has ** a reserved lock. B tries to promote to exclusive but is blocked because ** of A's read lock. A tries to promote to reserved but is blocked by B. ** One or the other of the two processes must give way or there can be -** no progress. By returning SQLITE_BUSY and not invoking the busy callback +** no progress. By returning STQLITE_BUSY and not invoking the busy callback ** when A already has a read lock, we encourage A to give up and let B ** proceed. */ -SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag){ +STQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag){ BtShared *pBt = p->pBt; - int rc = SQLITE_OK; + int rc = STQLITE_OK; btreeIntegrity(p); @@ -24514,20 +24514,20 @@ SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag){ ** is requested, this is a no-op. */ if( p->inTrans==TRANS_WRITE || (p->inTrans==TRANS_READ && !wrflag) ){ - return SQLITE_OK; + return STQLITE_OK; } /* Write transactions are not possible on a read-only database */ if( pBt->readOnly && wrflag ){ - return SQLITE_READONLY; + return STQLITE_READONLY; } /* If another database handle has already opened a write transaction ** on this shared-btree structure and a second write transaction is - ** requested, return SQLITE_BUSY. + ** requested, return STQLITE_BUSY. */ if( pBt->inTransaction==TRANS_WRITE && wrflag ){ - return SQLITE_BUSY; + return STQLITE_BUSY; } do { @@ -24535,26 +24535,26 @@ SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag){ rc = lockBtree(pBt); } - if( rc==SQLITE_OK && wrflag ){ + if( rc==STQLITE_OK && wrflag ){ if( pBt->readOnly ){ - rc = SQLITE_READONLY; + rc = STQLITE_READONLY; }else{ rc = sqlite3PagerBegin(pBt->pPage1->pDbPage, wrflag>1); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = newDatabase(pBt); } } } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ if( wrflag ) pBt->inStmt = 0; }else{ unlockBtreeIfUnused(pBt); } - }while( rc==SQLITE_BUSY && pBt->inTransaction==TRANS_NONE && + }while( rc==STQLITE_BUSY && pBt->inTransaction==TRANS_NONE && sqlite3InvokeBusyHandler(pBt->pBusyHandler) ); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ if( p->inTrans==TRANS_NONE ){ pBt->nTransaction++; } @@ -24568,10 +24568,10 @@ SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag){ return rc; } -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* -** Set the pointer-map entries for all children of page pPage. Also, if +** Set the pointer-map entries for all tqchildren of page pPage. Also, if ** pPage contains cells that point to overflow pages, set the pointer ** map entries for the overflow pages as well. */ @@ -24584,7 +24584,7 @@ static int setChildPtrmaps(MemPage *pPage){ Pgno pgno = pPage->pgno; rc = sqlite3BtreeInitPage(pPage, pPage->pParent); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto set_child_ptrmaps_out; } nCell = pPage->nCell; @@ -24593,14 +24593,14 @@ static int setChildPtrmaps(MemPage *pPage){ u8 *pCell = findCell(pPage, i); rc = ptrmapPutOvflPtr(pPage, pCell); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto set_child_ptrmaps_out; } if( !pPage->leaf ){ Pgno childPgno = get4byte(pCell); rc = ptrmapPut(pBt, childPgno, PTRMAP_BTREE, pgno); - if( rc!=SQLITE_OK ) goto set_child_ptrmaps_out; + if( rc!=STQLITE_OK ) goto set_child_ptrmaps_out; } } @@ -24633,7 +24633,7 @@ static int modifyPagePointer(MemPage *pPage, Pgno iFrom, Pgno iTo, u8 eType){ if( eType==PTRMAP_OVERFLOW2 ){ /* The pointer is always the first 4 bytes of the page in this case. */ if( get4byte(pPage->aData)!=iFrom ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } put4byte(pPage->aData, iTo); }else{ @@ -24666,14 +24666,14 @@ static int modifyPagePointer(MemPage *pPage, Pgno iFrom, Pgno iTo, u8 eType){ if( i==nCell ){ if( eType!=PTRMAP_BTREE || get4byte(&pPage->aData[pPage->hdrOffset+8])!=iFrom ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } put4byte(&pPage->aData[pPage->hdrOffset+8], iTo); } pPage->isInit = isInitOrig; } - return SQLITE_OK; + return STQLITE_OK; } @@ -24700,7 +24700,7 @@ static int relocatePage( TRACE(("AUTOVACUUM: Moving %d to free page %d (ptr page %d type %d)\n", iDbPage, iFreePage, iPtrPage, eType)); rc = sqlite3PagerMovepage(pPager, pDbPage->pDbPage, iFreePage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } pDbPage->pgno = iFreePage; @@ -24715,14 +24715,14 @@ static int relocatePage( */ if( eType==PTRMAP_BTREE || eType==PTRMAP_ROOTPAGE ){ rc = setChildPtrmaps(pDbPage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } }else{ Pgno nextOvfl = get4byte(pDbPage->aData); if( nextOvfl!=0 ){ rc = ptrmapPut(pBt, nextOvfl, PTRMAP_OVERFLOW2, iFreePage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } } @@ -24734,17 +24734,17 @@ static int relocatePage( */ if( eType!=PTRMAP_ROOTPAGE ){ rc = sqlite3BtreeGetPage(pBt, iPtrPage, &pPtrPage, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } rc = sqlite3PagerWrite(pPtrPage->pDbPage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ releasePage(pPtrPage); return rc; } rc = modifyPagePointer(pPtrPage, iDbPage, iFreePage, eType); releasePage(pPtrPage); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = ptrmapPut(pBt, iFreePage, eType, iPtrPage); } } @@ -24756,8 +24756,8 @@ static int allocateBtreePage(BtShared *, MemPage **, Pgno *, Pgno, u8); /* ** Perform a single step of an incremental-vacuum. If successful, -** return SQLITE_OK. If there is no work to do (and therefore no -** point in calling this function again), return SQLITE_DONE. +** return STQLITE_OK. If there is no work to do (and therefore no +** point in calling this function again), return STQLITE_DONE. ** ** More specificly, this function attempts to re-organize the ** database so that the last page of the file currently in use @@ -24765,7 +24765,7 @@ static int allocateBtreePage(BtShared *, MemPage **, Pgno *, Pgno, u8); ** ** If the nFin parameter is non-zero, the implementation assumes ** that the caller will keep calling incrVacuumStep() until -** it returns SQLITE_DONE or an error, and that nFin is the +** it returns STQLITE_DONE or an error, and that nFin is the ** number of pages the database file will contain after this ** process is complete. */ @@ -24785,15 +24785,15 @@ static int incrVacuumStep(BtShared *pBt, Pgno nFin){ nFreeList = get4byte(&pBt->pPage1->aData[36]); if( nFreeList==0 || nFin==iLastPg ){ - return SQLITE_DONE; + return STQLITE_DONE; } rc = ptrmapGet(pBt, iLastPg, &eType, &iPtrPage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } if( eType==PTRMAP_ROOTPAGE ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } if( eType==PTRMAP_FREEPAGE ){ @@ -24806,7 +24806,7 @@ static int incrVacuumStep(BtShared *pBt, Pgno nFin){ Pgno iFreePg; MemPage *pFreePg; rc = allocateBtreePage(pBt, &pFreePg, &iFreePg, iLastPg, 1); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } assert( iFreePg==iLastPg ); @@ -24817,7 +24817,7 @@ static int incrVacuumStep(BtShared *pBt, Pgno nFin){ MemPage *pLastPg; rc = sqlite3BtreeGetPage(pBt, iLastPg, &pLastPg, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } @@ -24831,7 +24831,7 @@ static int incrVacuumStep(BtShared *pBt, Pgno nFin){ do { MemPage *pFreePg; rc = allocateBtreePage(pBt, &pFreePg, &iFreePg, 0, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ releasePage(pLastPg); return rc; } @@ -24840,12 +24840,12 @@ static int incrVacuumStep(BtShared *pBt, Pgno nFin){ assert( iFreePg<iLastPg ); rc = sqlite3PagerWrite(pLastPg->pDbPage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } rc = relocatePage(pBt, pLastPg, eType, iPtrPage, iFreePg); releasePage(pLastPg); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } } @@ -24855,7 +24855,7 @@ static int incrVacuumStep(BtShared *pBt, Pgno nFin){ while( pBt->nTrunc==PENDING_BYTE_PAGE(pBt)||PTRMAP_ISPAGE(pBt, pBt->nTrunc) ){ pBt->nTrunc--; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -24863,16 +24863,16 @@ static int incrVacuumStep(BtShared *pBt, Pgno nFin){ ** It performs a single unit of work towards an incremental vacuum. ** ** If the incremental vacuum is finished after this function has run, -** SQLITE_DONE is returned. If it is not finished, but no error occured, -** SQLITE_OK is returned. Otherwise an SQLite error code. +** STQLITE_DONE is returned. If it is not finished, but no error occured, +** STQLITE_OK is returned. Otherwise an STQLite error code. */ -SQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *p){ BtShared *pBt = p->pBt; assert( pBt->inTransaction==TRANS_WRITE && p->inTrans==TRANS_WRITE ); if( !pBt->autoVacuum ){ - return SQLITE_DONE; + return STQLITE_DONE; } - invalidateAllOverflowCache(pBt); + tqinvalidateAllOverflowCache(pBt); return incrVacuumStep(pBt, 0); } @@ -24880,19 +24880,19 @@ SQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *p){ ** This routine is called prior to sqlite3PagerCommit when a transaction ** is commited for an auto-vacuum database. ** -** If SQLITE_OK is returned, then *pnTrunc is set to the number of pages +** If STQLITE_OK is returned, then *pnTrunc is set to the number of pages ** the database file should be truncated to during the commit process. ** i.e. the database has been reorganized so that only the first *pnTrunc ** pages are in use. */ static int autoVacuumCommit(BtShared *pBt, Pgno *pnTrunc){ - int rc = SQLITE_OK; + int rc = STQLITE_OK; Pager *pPager = pBt->pPager; #ifndef NDEBUG int nRef = sqlite3PagerRefcount(pPager); #endif - invalidateAllOverflowCache(pBt); + tqinvalidateAllOverflowCache(pBt); assert(pBt->autoVacuum); if( !pBt->incrVacuum ){ Pgno nFin = 0; @@ -24904,7 +24904,7 @@ static int autoVacuumCommit(BtShared *pBt, Pgno *pnTrunc){ Pgno nOrig = sqlite3PagerPagecount(pBt->pPager); if( PTRMAP_ISPAGE(pBt, nOrig) ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } if( nOrig==PENDING_BYTE_PAGE(pBt) ){ nOrig--; @@ -24920,12 +24920,12 @@ static int autoVacuumCommit(BtShared *pBt, Pgno *pnTrunc){ } } - while( rc==SQLITE_OK ){ + while( rc==STQLITE_OK ){ rc = incrVacuumStep(pBt, nFin); } - if( rc==SQLITE_DONE ){ + if( rc==STQLITE_DONE ){ assert(nFin==0 || pBt->nTrunc==0 || nFin<=pBt->nTrunc); - rc = SQLITE_OK; + rc = STQLITE_OK; if( pBt->nTrunc ){ sqlite3PagerWrite(pBt->pPage1->pDbPage); put4byte(&pBt->pPage1->aData[32], 0); @@ -24933,12 +24933,12 @@ static int autoVacuumCommit(BtShared *pBt, Pgno *pnTrunc){ pBt->nTrunc = nFin; } } - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqlite3PagerRollback(pPager); } } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ *pnTrunc = pBt->nTrunc; pBt->nTrunc = 0; } @@ -24974,15 +24974,15 @@ static int autoVacuumCommit(BtShared *pBt, Pgno *pnTrunc){ ** Once this is routine has returned, the only thing required to commit ** the write-transaction for this database file is to delete the journal. */ -SQLITE_PRIVATE int sqlite3BtreeCommitPhaseOne(Btree *p, const char *zMaster){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3BtreeCommitPhaseOne(Btree *p, const char *zMaster){ + int rc = STQLITE_OK; if( p->inTrans==TRANS_WRITE ){ BtShared *pBt = p->pBt; Pgno nTrunc = 0; -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ rc = autoVacuumCommit(pBt, &nTrunc); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } } @@ -25006,7 +25006,7 @@ SQLITE_PRIVATE int sqlite3BtreeCommitPhaseOne(Btree *p, const char *zMaster){ ** This will release the write lock on the database file. If there ** are no active cursors, it also releases the read lock. */ -SQLITE_PRIVATE int sqlite3BtreeCommitPhaseTwo(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeCommitPhaseTwo(Btree *p){ BtShared *pBt = p->pBt; btreeIntegrity(p); @@ -25019,7 +25019,7 @@ SQLITE_PRIVATE int sqlite3BtreeCommitPhaseTwo(Btree *p){ assert( pBt->inTransaction==TRANS_WRITE ); assert( pBt->nTransaction>0 ); rc = sqlite3PagerCommitPhaseTwo(pBt->pPager); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } pBt->inTransaction = TRANS_READ; @@ -25046,16 +25046,16 @@ SQLITE_PRIVATE int sqlite3BtreeCommitPhaseTwo(Btree *p){ unlockBtreeIfUnused(pBt); btreeIntegrity(p); - return SQLITE_OK; + return STQLITE_OK; } /* ** Do both phases of a commit. */ -SQLITE_PRIVATE int sqlite3BtreeCommit(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeCommit(Btree *p){ int rc; rc = sqlite3BtreeCommitPhaseOne(p, 0); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = sqlite3BtreeCommitPhaseTwo(p); } return rc; @@ -25086,14 +25086,14 @@ static int countWriteCursors(BtShared *pBt){ ** This will release the write lock on the database file. If there ** are no active cursors, it also releases the read lock. */ -SQLITE_PRIVATE int sqlite3BtreeRollback(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeRollback(Btree *p){ int rc; BtShared *pBt = p->pBt; MemPage *pPage1; rc = saveAllCursors(pBt, 0, 0); -#ifndef SQLITE_OMIT_SHARED_CACHE - if( rc!=SQLITE_OK ){ +#ifndef STQLITE_OMIT_SHARED_CACHE + if( rc!=STQLITE_OK ){ /* This is a horrible situation. An IO or malloc() error occured whilst ** trying to save cursor positions. If this is an automatic rollback (as ** the result of a constraint, malloc() failure or IO error) then @@ -25115,20 +25115,20 @@ SQLITE_PRIVATE int sqlite3BtreeRollback(Btree *p){ if( p->inTrans==TRANS_WRITE ){ int rc2; -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM pBt->nTrunc = 0; #endif assert( TRANS_WRITE==pBt->inTransaction ); rc2 = sqlite3PagerRollback(pBt->pPager); - if( rc2!=SQLITE_OK ){ + if( rc2!=STQLITE_OK ){ rc = rc2; } /* The rollback may have destroyed the pPage1->aData value. So ** call sqlite3BtreeGetPage() on page 1 again to make ** sure pPage1->aData is set correctly. */ - if( sqlite3BtreeGetPage(pBt, 1, &pPage1, 0)==SQLITE_OK ){ + if( sqlite3BtreeGetPage(pBt, 1, &pPage1, 0)==STQLITE_OK ){ releasePage(pPage1); } assert( countWriteCursors(pBt)==0 ); @@ -25166,14 +25166,14 @@ SQLITE_PRIVATE int sqlite3BtreeRollback(Btree *p){ ** error occurs within the statement, the effect of that one statement ** can be rolled back without having to rollback the entire transaction. */ -SQLITE_PRIVATE int sqlite3BtreeBeginStmt(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeBeginStmt(Btree *p){ int rc; BtShared *pBt = p->pBt; if( (p->inTrans!=TRANS_WRITE) || pBt->inStmt ){ - return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; + return pBt->readOnly ? STQLITE_READONLY : STQLITE_ERROR; } assert( pBt->inTransaction==TRANS_WRITE ); - rc = pBt->readOnly ? SQLITE_OK : sqlite3PagerStmtBegin(pBt->pPager); + rc = pBt->readOnly ? STQLITE_OK : sqlite3PagerStmtBegin(pBt->pPager); pBt->inStmt = 1; return rc; } @@ -25183,13 +25183,13 @@ SQLITE_PRIVATE int sqlite3BtreeBeginStmt(Btree *p){ ** Commit the statment subtransaction currently in progress. If no ** subtransaction is active, this is a no-op. */ -SQLITE_PRIVATE int sqlite3BtreeCommitStmt(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeCommitStmt(Btree *p){ int rc; BtShared *pBt = p->pBt; if( pBt->inStmt && !pBt->readOnly ){ rc = sqlite3PagerStmtCommit(pBt->pPager); }else{ - rc = SQLITE_OK; + rc = STQLITE_OK; } pBt->inStmt = 0; return rc; @@ -25199,12 +25199,12 @@ SQLITE_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 invalidated by this operation. Any attempt +** All cursors will be tqinvalidated by this operation. Any attempt ** to use a cursor that was open at the beginning of this operation ** will result in an error. */ -SQLITE_PRIVATE int sqlite3BtreeRollbackStmt(Btree *p){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3BtreeRollbackStmt(Btree *p){ + int rc = STQLITE_OK; BtShared *pBt = p->pBt; sqlite3MallocDisallow(); if( pBt->inStmt && !pBt->readOnly ){ @@ -25266,7 +25266,7 @@ static int dfltCompare( ** default comparison function is used. The comparison function is ** always ignored for INTKEY tables. */ -SQLITE_PRIVATE int sqlite3BtreeCursor( +STQLITE_PRIVATE int sqlite3BtreeCursor( Btree *p, /* The btree */ int iTable, /* Root page of table to open */ int wrFlag, /* 1 to write. 0 read-only */ @@ -25281,34 +25281,34 @@ SQLITE_PRIVATE int sqlite3BtreeCursor( *ppCur = 0; if( wrFlag ){ if( pBt->readOnly ){ - return SQLITE_READONLY; + return STQLITE_READONLY; } if( checkReadLocks(p, iTable, 0) ){ - return SQLITE_LOCKED; + return STQLITE_LOCKED; } } if( pBt->pPage1==0 ){ rc = lockBtreeWithRetry(p); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } if( pBt->readOnly && wrFlag ){ - return SQLITE_READONLY; + return STQLITE_READONLY; } } pCur = sqliteMalloc( sizeof(*pCur) ); if( pCur==0 ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; goto create_cursor_exception; } pCur->pgnoRoot = (Pgno)iTable; if( iTable==1 && sqlite3PagerPagecount(pBt->pPager)==0 ){ - rc = SQLITE_EMPTY; + rc = STQLITE_EMPTY; goto create_cursor_exception; } rc = getAndInitPage(pBt, pCur->pgnoRoot, &pCur->pPage, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto create_cursor_exception; } @@ -25328,7 +25328,7 @@ SQLITE_PRIVATE int sqlite3BtreeCursor( pCur->eState = CURSOR_INVALID; *ppCur = pCur; - return SQLITE_OK; + return STQLITE_OK; create_cursor_exception: if( pCur ){ releasePage(pCur->pPage); @@ -25342,7 +25342,7 @@ create_cursor_exception: ** Close a cursor. The read lock on the database file is released ** when the last cursor is closed. */ -SQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){ +STQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){ BtShared *pBt = pCur->pBtree->pBt; clearCursorPosition(pCur); if( pCur->pPrev ){ @@ -25355,16 +25355,16 @@ SQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){ } releasePage(pCur->pPage); unlockBtreeIfUnused(pBt); - invalidateOverflowCache(pCur); + tqinvalidateOverflowCache(pCur); sqliteFree(pCur); - return SQLITE_OK; + return STQLITE_OK; } /* ** Make a temporary cursor by filling in the fields of pTempCur. ** The temporary cursor is not on the cursor list for the Btree. */ -SQLITE_PRIVATE void sqlite3BtreeGetTempCursor(BtCursor *pCur, BtCursor *pTempCur){ +STQLITE_PRIVATE void sqlite3BtreeGetTempCursor(BtCursor *pCur, BtCursor *pTempCur){ memcpy(pTempCur, pCur, sizeof(*pCur)); pTempCur->pNext = 0; pTempCur->pPrev = 0; @@ -25377,7 +25377,7 @@ SQLITE_PRIVATE void sqlite3BtreeGetTempCursor(BtCursor *pCur, BtCursor *pTempCur ** Delete a temporary cursor such as was made by the CreateTemporaryCursor() ** function above. */ -SQLITE_PRIVATE void sqlite3BtreeReleaseTempCursor(BtCursor *pCur){ +STQLITE_PRIVATE void sqlite3BtreeReleaseTempCursor(BtCursor *pCur){ if( pCur->pPage ){ sqlite3PagerUnref(pCur->pPage->pDbPage); } @@ -25435,9 +25435,9 @@ SQLITE_PRIVATE void sqlite3BtreeReleaseTempCursor(BtCursor *pCur){ ** For a table with the INTKEY flag set, this routine returns the key ** itself, not the number of bytes in the key. */ -SQLITE_PRIVATE int sqlite3BtreeKeySize(BtCursor *pCur, i64 *pSize){ +STQLITE_PRIVATE int sqlite3BtreeKeySize(BtCursor *pCur, i64 *pSize){ int rc = restoreOrClearCursorPosition(pCur); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ assert( pCur->eState==CURSOR_INVALID || pCur->eState==CURSOR_VALID ); if( pCur->eState==CURSOR_INVALID ){ *pSize = 0; @@ -25451,14 +25451,14 @@ SQLITE_PRIVATE int sqlite3BtreeKeySize(BtCursor *pCur, i64 *pSize){ /* ** Set *pSize to the number of bytes of data in the entry the -** cursor currently points to. Always return SQLITE_OK. +** cursor currently points to. Always return STQLITE_OK. ** Failure is not possible. If the cursor is not currently ** pointing to an entry (which can happen, for example, if ** the database is empty) then *pSize is set to 0. */ -SQLITE_PRIVATE int sqlite3BtreeDataSize(BtCursor *pCur, u32 *pSize){ +STQLITE_PRIVATE int sqlite3BtreeDataSize(BtCursor *pCur, u32 *pSize){ int rc = restoreOrClearCursorPosition(pCur); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ assert( pCur->eState==CURSOR_INVALID || pCur->eState==CURSOR_VALID ); if( pCur->eState==CURSOR_INVALID ){ /* Not pointing at a valid entry - set *pSize to 0. */ @@ -25477,7 +25477,7 @@ SQLITE_PRIVATE int sqlite3BtreeDataSize(BtCursor *pCur, u32 *pSize){ ** linked list of overflow pages. If possible, it uses the auto-vacuum ** pointer-map data instead of reading the content of page ovfl to do so. ** -** If an error occurs an SQLite error code is returned. Otherwise: +** If an error occurs an STQLite error code is returned. Otherwise: ** ** Unless pPgnoNext is NULL, the page number of the next overflow ** page in the linked list is written to *pPgnoNext. If page ovfl @@ -25507,7 +25507,7 @@ static int getOverflowPage( return sqlite3BtreeGetPage(pBt, ovfl, ppPage, 1); } -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* Try to find the next page in the overflow list using the ** autovacuum pointer-map pages. Guess that the next page in ** the overflow list is page number (ovfl+1). If that guess turns @@ -25525,7 +25525,7 @@ static int getOverflowPage( if( iGuess<=sqlite3PagerPagecount(pBt->pPager) ){ rc = ptrmapGet(pBt, iGuess, &eType, &pgno); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } if( eType==PTRMAP_OVERFLOW2 && pgno==ovfl ){ @@ -25539,8 +25539,8 @@ static int getOverflowPage( MemPage *pPage = 0; rc = sqlite3BtreeGetPage(pBt, ovfl, &pPage, next!=0); - assert(rc==SQLITE_OK || pPage==0); - if( next==0 && rc==SQLITE_OK ){ + assert(rc==STQLITE_OK || pPage==0); + if( next==0 && rc==STQLITE_OK ){ next = get4byte(pPage->aData); } @@ -25564,7 +25564,7 @@ static int getOverflowPage( ** then sqlite3PagerWrite() is called on pDbPage and nByte bytes ** of data are copied from the buffer pBuf to pPayload. ** -** SQLITE_OK is returned on success, otherwise an error code. +** STQLITE_OK is returned on success, otherwise an error code. */ static int copyPayload( void *pPayload, /* Pointer to page data */ @@ -25576,7 +25576,7 @@ static int copyPayload( if( eOp ){ /* Copy data from buffer to page (a write operation) */ int rc = sqlite3PagerWrite(pDbPage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } memcpy(pPayload, pBuf, nByte); @@ -25584,7 +25584,7 @@ static int copyPayload( /* Copy data from page to buffer (a read operation) */ memcpy(pBuf, pPayload, nByte); } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -25609,9 +25609,9 @@ 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 -** invalidated if some other cursor writes to the same table, or if +** tqinvalidated 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 invalidate an overflow page-list cache. +** mode, the following events may tqinvalidate an overflow page-list cache. ** ** * An incremental vacuum, ** * A commit in auto_vacuum="full" mode, @@ -25626,7 +25626,7 @@ static int accessPayload( int eOp /* zero to read. non-zero to write. */ ){ unsigned char *aPayload; - int rc = SQLITE_OK; + int rc = STQLITE_OK; u32 nKey; int iIdx = 0; MemPage *pPage = pCur->pPage; /* Btree page of current cursor entry */ @@ -25646,7 +25646,7 @@ static int accessPayload( } if( offset+amt > nKey+pCur->info.nData ){ /* Trying to read or write past the end of the data is an error */ - return SQLITE_ERROR; + return STQLITE_ERROR; } /* Check if data must be read/written to/from the btree page itself. */ @@ -25663,13 +25663,13 @@ static int accessPayload( offset -= pCur->info.nLocal; } - if( rc==SQLITE_OK && amt>0 ){ + if( rc==STQLITE_OK && amt>0 ){ const int ovflSize = pBt->usableSize - 4; /* Bytes content per ovfl page */ Pgno nextPage; nextPage = get4byte(&aPayload[pCur->info.nLocal]); -#ifndef SQLITE_OMIT_INCRBLOB +#ifndef STQLITE_OMIT_INCRBLOB /* If the isIncrblobHandle flag is set and the BtCursor.aOverflow[] ** has not been allocated, allocate it now. The array is sized at ** one entry for each overflow page in the overflow chain. The @@ -25681,7 +25681,7 @@ static int accessPayload( int nOvfl = (pCur->info.nPayload-pCur->info.nLocal+ovflSize-1)/ovflSize; pCur->aOverflow = (Pgno *)sqliteMalloc(sizeof(Pgno)*nOvfl); if( nOvfl && !pCur->aOverflow ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; } } @@ -25696,9 +25696,9 @@ static int accessPayload( } #endif - for( ; rc==SQLITE_OK && amt>0 && nextPage; iIdx++){ + for( ; rc==STQLITE_OK && amt>0 && nextPage; iIdx++){ -#ifndef SQLITE_OMIT_INCRBLOB +#ifndef STQLITE_OMIT_INCRBLOB /* If required, populate the overflow page-list cache. */ if( pCur->aOverflow ){ assert(!pCur->aOverflow[iIdx] || pCur->aOverflow[iIdx]==nextPage); @@ -25713,7 +25713,7 @@ static int accessPayload( ** page-list cache, if any, then fall back to the getOverflowPage() ** function. */ -#ifndef SQLITE_OMIT_INCRBLOB +#ifndef STQLITE_OMIT_INCRBLOB if( pCur->aOverflow && pCur->aOverflow[iIdx+1] ){ nextPage = pCur->aOverflow[iIdx+1]; } else @@ -25727,7 +25727,7 @@ static int accessPayload( DbPage *pDbPage; int a = amt; rc = sqlite3PagerGet(pBt->pPager, nextPage, &pDbPage); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ aPayload = sqlite3PagerGetData(pDbPage); nextPage = get4byte(aPayload); if( a + offset > ovflSize ){ @@ -25743,8 +25743,8 @@ static int accessPayload( } } - if( rc==SQLITE_OK && amt>0 ){ - return SQLITE_CORRUPT_BKPT; + if( rc==STQLITE_OK && amt>0 ){ + return STQLITE_CORRUPT_BKPT; } return rc; } @@ -25754,17 +25754,17 @@ static int accessPayload( ** "amt" bytes will be transfered into pBuf[]. The transfer ** begins at "offset". ** -** Return SQLITE_OK on success or an error code if anything goes +** Return STQLITE_OK on success or an error code if anything goes ** wrong. An error is returned if "offset+amt" is larger than ** the available payload. */ -SQLITE_PRIVATE int sqlite3BtreeKey(BtCursor *pCur, u32 offset, u32 amt, void *pBuf){ +STQLITE_PRIVATE int sqlite3BtreeKey(BtCursor *pCur, u32 offset, u32 amt, void *pBuf){ int rc = restoreOrClearCursorPosition(pCur); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ assert( pCur->eState==CURSOR_VALID ); assert( pCur->pPage!=0 ); if( pCur->pPage->intKey ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } assert( pCur->pPage->intKey==0 ); assert( pCur->idx>=0 && pCur->idx<pCur->pPage->nCell ); @@ -25778,13 +25778,13 @@ SQLITE_PRIVATE int sqlite3BtreeKey(BtCursor *pCur, u32 offset, u32 amt, void *pB ** "amt" bytes will be transfered into pBuf[]. The transfer ** begins at "offset". ** -** Return SQLITE_OK on success or an error code if anything goes +** Return STQLITE_OK on success or an error code if anything goes ** wrong. An error is returned if "offset+amt" is larger than ** the available payload. */ -SQLITE_PRIVATE int sqlite3BtreeData(BtCursor *pCur, u32 offset, u32 amt, void *pBuf){ +STQLITE_PRIVATE int sqlite3BtreeData(BtCursor *pCur, u32 offset, u32 amt, void *pBuf){ int rc = restoreOrClearCursorPosition(pCur); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ assert( pCur->eState==CURSOR_VALID ); assert( pCur->pPage!=0 ); assert( pCur->idx>=0 && pCur->idx<pCur->pPage->nCell ); @@ -25859,13 +25859,13 @@ static const unsigned char *fetchPayload( ** These routines is used to get quick access to key and data ** in the common case where no overflow pages are used. */ -SQLITE_PRIVATE const void *sqlite3BtreeKeyFetch(BtCursor *pCur, int *pAmt){ +STQLITE_PRIVATE const void *sqlite3BtreeKeyFetch(BtCursor *pCur, int *pAmt){ if( pCur->eState==CURSOR_VALID ){ return (const void*)fetchPayload(pCur, pAmt, 0); } return 0; } -SQLITE_PRIVATE const void *sqlite3BtreeDataFetch(BtCursor *pCur, int *pAmt){ +STQLITE_PRIVATE const void *sqlite3BtreeDataFetch(BtCursor *pCur, int *pAmt){ if( pCur->eState==CURSOR_VALID ){ return (const void*)fetchPayload(pCur, pAmt, 1); } @@ -25894,9 +25894,9 @@ static int moveToChild(BtCursor *pCur, u32 newPgno){ pCur->idx = 0; pCur->info.nSize = 0; if( pNewPage->nCell<1 ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -25908,7 +25908,7 @@ static int moveToChild(BtCursor *pCur, u32 newPgno){ ** virtual root page is the page that the right-pointer of page ** 1 is pointing to. */ -SQLITE_PRIVATE int sqlite3BtreeIsRootPage(MemPage *pPage){ +STQLITE_PRIVATE int sqlite3BtreeIsRootPage(MemPage *pPage){ MemPage *pParent = pPage->pParent; if( pParent==0 ) return 1; if( pParent->pgno>1 ) return 0; @@ -25917,14 +25917,14 @@ SQLITE_PRIVATE int sqlite3BtreeIsRootPage(MemPage *pPage){ } /* -** Move the cursor up to the parent page. +** Move the cursor up to the tqparent page. ** ** pCur->idx is set to the cell index that contains the pointer ** to the page we are coming from. If we are coming from the ** right-most child page then pCur->idx is set to one more than ** the largest cell index. */ -SQLITE_PRIVATE void sqlite3BtreeMoveToParent(BtCursor *pCur){ +STQLITE_PRIVATE void sqlite3BtreeMoveToParent(BtCursor *pCur){ MemPage *pParent; MemPage *pPage; int idxParent; @@ -25949,10 +25949,10 @@ SQLITE_PRIVATE void sqlite3BtreeMoveToParent(BtCursor *pCur){ */ static int moveToRoot(BtCursor *pCur){ MemPage *pRoot; - int rc = SQLITE_OK; + int rc = STQLITE_OK; BtShared *pBt = pCur->pBtree->pBt; - if( pCur->eState==CURSOR_REQUIRESEEK ){ + if( pCur->eState==CURSOR_RETQUIRESEEK ){ clearCursorPosition(pCur); } pRoot = pCur->pPage; @@ -25960,7 +25960,7 @@ static int moveToRoot(BtCursor *pCur){ assert( pRoot->isInit ); }else{ if( - SQLITE_OK!=(rc = getAndInitPage(pBt, pCur->pgnoRoot, &pRoot, 0)) + STQLITE_OK!=(rc = getAndInitPage(pBt, pCur->pgnoRoot, &pRoot, 0)) ){ pCur->eState = CURSOR_INVALID; return rc; @@ -26001,7 +26001,7 @@ static int moveToLeftmost(BtCursor *pCur){ rc = moveToChild(pCur, pgno); if( rc ) return rc; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -26028,21 +26028,21 @@ static int moveToRightmost(BtCursor *pCur){ } pCur->idx = pPage->nCell - 1; pCur->info.nSize = 0; - return SQLITE_OK; + return STQLITE_OK; } -/* Move the cursor to the first entry in the table. Return SQLITE_OK +/* Move the cursor to the first entry in the table. Return STQLITE_OK ** on success. Set *pRes to 0 if the cursor actually points to something ** or set *pRes to 1 if the table is empty. */ -SQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor *pCur, int *pRes){ +STQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor *pCur, int *pRes){ int rc; rc = moveToRoot(pCur); if( rc ) return rc; if( pCur->eState==CURSOR_INVALID ){ assert( pCur->pPage->nCell==0 ); *pRes = 1; - return SQLITE_OK; + return STQLITE_OK; } assert( pCur->pPage->nCell>0 ); *pRes = 0; @@ -26050,18 +26050,18 @@ SQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor *pCur, int *pRes){ return rc; } -/* Move the cursor to the last entry in the table. Return SQLITE_OK +/* Move the cursor to the last entry in the table. Return STQLITE_OK ** on success. Set *pRes to 0 if the cursor actually points to something ** or set *pRes to 1 if the table is empty. */ -SQLITE_PRIVATE int sqlite3BtreeLast(BtCursor *pCur, int *pRes){ +STQLITE_PRIVATE int sqlite3BtreeLast(BtCursor *pCur, int *pRes){ int rc; rc = moveToRoot(pCur); if( rc ) return rc; if( CURSOR_INVALID==pCur->eState ){ assert( pCur->pPage->nCell==0 ); *pRes = 1; - return SQLITE_OK; + return STQLITE_OK; } assert( pCur->eState==CURSOR_VALID ); *pRes = 0; @@ -26096,7 +26096,7 @@ SQLITE_PRIVATE int sqlite3BtreeLast(BtCursor *pCur, int *pRes){ ** *pRes>0 The cursor is left pointing at an entry that ** is larger than pKey. */ -SQLITE_PRIVATE int sqlite3BtreeMoveto( +STQLITE_PRIVATE int sqlite3BtreeMoveto( BtCursor *pCur, /* The cursor to be moved */ const void *pKey, /* The key content for indices. Not used by tables */ i64 nKey, /* Size of pKey. Or the key for tables */ @@ -26111,7 +26111,7 @@ SQLITE_PRIVATE int sqlite3BtreeMoveto( if( pCur->eState==CURSOR_INVALID ){ *pRes = -1; assert( pCur->pPage->nCell==0 ); - return SQLITE_OK; + return STQLITE_OK; } for(;;){ int lwr, upr; @@ -26121,7 +26121,7 @@ SQLITE_PRIVATE int sqlite3BtreeMoveto( lwr = 0; upr = pPage->nCell-1; if( !pPage->intKey && pKey==0 ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } if( biasRight ){ pCur->idx = upr; @@ -26155,7 +26155,7 @@ SQLITE_PRIVATE int sqlite3BtreeMoveto( c = pCur->xCompare(pCur->pArg, nCellKey, pCellKey, nKey, pKey); }else{ pCellKey = sqliteMallocRaw( nCellKey ); - if( pCellKey==0 ) return SQLITE_NOMEM; + if( pCellKey==0 ) return STQLITE_NOMEM; rc = sqlite3BtreeKey(pCur, 0, nCellKey, (void *)pCellKey); c = pCur->xCompare(pCur->pArg, nCellKey, pCellKey, nKey, pKey); sqliteFree(pCellKey); @@ -26169,7 +26169,7 @@ SQLITE_PRIVATE int sqlite3BtreeMoveto( break; }else{ if( pRes ) *pRes = 0; - return SQLITE_OK; + return STQLITE_OK; } } if( c<0 ){ @@ -26194,7 +26194,7 @@ SQLITE_PRIVATE int sqlite3BtreeMoveto( if( chldPg==0 ){ assert( pCur->idx>=0 && pCur->idx<pCur->pPage->nCell ); if( pRes ) *pRes = c; - return SQLITE_OK; + return STQLITE_OK; } pCur->idx = lwr; pCur->info.nSize = 0; @@ -26213,8 +26213,8 @@ SQLITE_PRIVATE int sqlite3BtreeMoveto( ** past the last entry in the table or sqlite3BtreePrev() moves past ** the first entry. TRUE is also returned if the table is empty. */ -SQLITE_PRIVATE int sqlite3BtreeEof(BtCursor *pCur){ - /* TODO: What if the cursor is in CURSOR_REQUIRESEEK but all table entries +STQLITE_PRIVATE int sqlite3BtreeEof(BtCursor *pCur){ + /* TODO: What if the cursor is in CURSOR_RETQUIRESEEK but all table entries ** have been deleted? This API will need to change to return an error code ** as well as the boolean result value. */ @@ -26227,24 +26227,24 @@ SQLITE_PRIVATE int sqlite3BtreeEof(BtCursor *pCur){ ** was already pointing to the last entry in the database before ** this routine was called, then set *pRes=1. */ -SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor *pCur, int *pRes){ +STQLITE_PRIVATE int sqlite3BtreeNext(BtCursor *pCur, int *pRes){ int rc; MemPage *pPage; rc = restoreOrClearCursorPosition(pCur); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } assert( pRes!=0 ); pPage = pCur->pPage; if( CURSOR_INVALID==pCur->eState ){ *pRes = 1; - return SQLITE_OK; + return STQLITE_OK; } if( pCur->skip>0 ){ pCur->skip = 0; *pRes = 0; - return SQLITE_OK; + return STQLITE_OK; } pCur->skip = 0; @@ -26265,7 +26265,7 @@ SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor *pCur, int *pRes){ if( sqlite3BtreeIsRootPage(pPage) ){ *pRes = 1; pCur->eState = CURSOR_INVALID; - return SQLITE_OK; + return STQLITE_OK; } sqlite3BtreeMoveToParent(pCur); pPage = pCur->pPage; @@ -26274,13 +26274,13 @@ SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor *pCur, int *pRes){ if( pPage->leafData ){ rc = sqlite3BtreeNext(pCur, pRes); }else{ - rc = SQLITE_OK; + rc = STQLITE_OK; } return rc; } *pRes = 0; if( pPage->leaf ){ - return SQLITE_OK; + return STQLITE_OK; } rc = moveToLeftmost(pCur); return rc; @@ -26292,23 +26292,23 @@ SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor *pCur, int *pRes){ ** was already pointing to the first entry in the database before ** this routine was called, then set *pRes=1. */ -SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){ +STQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){ int rc; Pgno pgno; MemPage *pPage; rc = restoreOrClearCursorPosition(pCur); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } if( CURSOR_INVALID==pCur->eState ){ *pRes = 1; - return SQLITE_OK; + return STQLITE_OK; } if( pCur->skip<0 ){ pCur->skip = 0; *pRes = 0; - return SQLITE_OK; + return STQLITE_OK; } pCur->skip = 0; @@ -26325,7 +26325,7 @@ SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){ if( sqlite3BtreeIsRootPage(pPage) ){ pCur->eState = CURSOR_INVALID; *pRes = 1; - return SQLITE_OK; + return STQLITE_OK; } sqlite3BtreeMoveToParent(pCur); pPage = pCur->pPage; @@ -26335,7 +26335,7 @@ SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){ if( pPage->leafData && !pPage->leaf ){ rc = sqlite3BtreePrevious(pCur, pRes); }else{ - rc = SQLITE_OK; + rc = STQLITE_OK; } } *pRes = 0; @@ -26350,7 +26350,7 @@ SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){ ** been referenced and the calling routine is responsible for calling ** sqlite3PagerUnref() on the new page when it is done. ** -** SQLITE_OK is returned on success. Any other return value indicates +** STQLITE_OK is returned on success. Any other return value indicates ** an error. *ppPage and *pPgno are undefined in the event of an error. ** Do not invoke sqlite3PagerUnref() on *ppPage if an error is returned. ** @@ -26388,7 +26388,7 @@ static int allocateBtreePage( ** shows that the page 'nearby' is somewhere on the free-list, then ** the entire-list will be searched for that page. */ -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( exact && nearby<=sqlite3PagerPagecount(pBt->pPager) ){ u8 eType; assert( nearby>0 ); @@ -26443,9 +26443,9 @@ static int allocateBtreePage( TRACE(("ALLOCATE: %d trunk - %d free pages left\n", *pPgno, n-1)); }else if( k>pBt->usableSize/4 - 8 ){ /* Value of k is out of range. Database corruption */ - rc = SQLITE_CORRUPT_BKPT; + rc = STQLITE_CORRUPT_BKPT; goto end_allocate_page; -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM }else if( searchList && nearby==iTrunk ){ /* The list is being searched and this trunk page is the page ** to allocate, regardless of whether it has leaves. @@ -26464,18 +26464,18 @@ static int allocateBtreePage( memcpy(&pPrevTrunk->aData[0], &pTrunk->aData[0], 4); } }else{ - /* The trunk page is required by the caller but it contains + /* The trunk page is required by the caller but it tqcontains ** pointers to free-list leaves. The first leaf becomes a trunk ** page in this case. */ MemPage *pNewTrunk; Pgno iNewTrunk = get4byte(&pTrunk->aData[8]); rc = sqlite3BtreeGetPage(pBt, iNewTrunk, &pNewTrunk, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto end_allocate_page; } rc = sqlite3PagerWrite(pNewTrunk->pDbPage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ releasePage(pNewTrunk); goto end_allocate_page; } @@ -26527,7 +26527,7 @@ static int allocateBtreePage( *pPgno = iPage; if( *pPgno>sqlite3PagerPagecount(pBt->pPager) ){ /* Free page off the end of the file */ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } TRACE(("ALLOCATE: %d was leaf %d of %d on trunk %d" ": %d more free pages\n", @@ -26537,10 +26537,10 @@ static int allocateBtreePage( } put4byte(&aData[4], k-1); rc = sqlite3BtreeGetPage(pBt, *pPgno, ppPage, 1); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ sqlite3PagerDontRollback((*ppPage)->pDbPage); rc = sqlite3PagerWrite((*ppPage)->pDbPage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ releasePage(*ppPage); } } @@ -26555,7 +26555,7 @@ static int allocateBtreePage( ** end of the file */ *pPgno = sqlite3PagerPagecount(pBt->pPager) + 1; -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->nTrunc ){ /* An incr-vacuum has already run within this transaction. So the ** page to allocate is not from the physical end of the file, but @@ -26584,7 +26584,7 @@ static int allocateBtreePage( rc = sqlite3BtreeGetPage(pBt, *pPgno, ppPage, 0); if( rc ) return rc; rc = sqlite3PagerWrite((*ppPage)->pDbPage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ releasePage(*ppPage); } TRACE(("ALLOCATE: %d from end of file\n", *pPgno)); @@ -26620,8 +26620,8 @@ static int freePage(MemPage *pPage){ n = get4byte(&pPage1->aData[36]); put4byte(&pPage1->aData[36], n+1); -#ifdef SQLITE_SECURE_DELETE - /* If the SQLITE_SECURE_DELETE compile-time option is enabled, then +#ifdef STQLITE_SECURE_DELETE + /* If the STQLITE_SECURE_DELETE compile-time option is enabled, then ** always fully overwrite deleted information with zeros. */ rc = sqlite3PagerWrite(pPage->pDbPage); @@ -26629,7 +26629,7 @@ static int freePage(MemPage *pPage){ memset(pPage->aData, 0, pPage->pBt->pageSize); #endif -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* If the database supports auto-vacuum, write an entry in the pointer-map ** to indicate that the page is free. */ @@ -26666,10 +26666,10 @@ static int freePage(MemPage *pPage){ }else{ /* Add the newly freed page as a leaf on the current trunk */ rc = sqlite3PagerWrite(pTrunk->pDbPage); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ put4byte(&pTrunk->aData[4], k+1); put4byte(&pTrunk->aData[8+k*4], pPage->pgno); -#ifndef SQLITE_SECURE_DELETE +#ifndef STQLITE_SECURE_DELETE sqlite3PagerDontWrite(pPage->pDbPage); #endif } @@ -26693,7 +26693,7 @@ static int clearCell(MemPage *pPage, unsigned char *pCell){ sqlite3BtreeParseCellPtr(pPage, pCell, &info); if( info.iOverflow==0 ){ - return SQLITE_OK; /* No overflow pages. Return without doing anything */ + return STQLITE_OK; /* No overflow pages. Return without doing anything */ } ovflPgno = get4byte(&pCell[info.iOverflow]); ovflPageSize = pBt->usableSize - 4; @@ -26702,7 +26702,7 @@ static int clearCell(MemPage *pPage, unsigned char *pCell){ while( nOvfl-- ){ MemPage *pOvfl; if( ovflPgno==0 || ovflPgno>sqlite3PagerPagecount(pBt->pPager) ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } rc = getOverflowPage(pBt, ovflPgno, &pOvfl, (nOvfl==0)?0:&ovflPgno); @@ -26711,7 +26711,7 @@ static int clearCell(MemPage *pPage, unsigned char *pCell){ sqlite3PagerUnref(pOvfl->pDbPage); if( rc ) return rc; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -26782,7 +26782,7 @@ static int fillInCell( while( nPayload>0 ){ if( spaceLeft==0 ){ int isExact = 0; -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM Pgno pgnoPtrmap = pgnoOvfl; /* Overflow page pointer-map entry page */ if( pBt->autoVacuum ){ do{ @@ -26796,7 +26796,7 @@ static int fillInCell( } #endif rc = allocateBtreePage(pBt, &pOvfl, &pgnoOvfl, pgnoOvfl, isExact); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* If the database supports auto-vacuum, and the second or subsequent ** overflow page is being allocated, add an entry to the pointer-map ** for that page now. @@ -26807,7 +26807,7 @@ static int fillInCell( ** may misinterpret the uninitialised values and delete the ** wrong pages from the database. */ - if( pBt->autoVacuum && rc==SQLITE_OK ){ + if( pBt->autoVacuum && rc==STQLITE_OK ){ u8 eType = (pgnoPtrmap?PTRMAP_OVERFLOW2:PTRMAP_OVERFLOW1); rc = ptrmapPut(pBt, pgnoOvfl, eType, pgnoPtrmap); if( rc ){ @@ -26847,7 +26847,7 @@ static int fillInCell( } } releasePage(pToRelease); - return SQLITE_OK; + return STQLITE_OK; } /* @@ -26860,7 +26860,7 @@ static int reparentPage(BtShared *pBt, Pgno pgno, MemPage *pNewParent, int idx){ DbPage *pDbPage; assert( pNewParent!=0 ); - if( pgno==0 ) return SQLITE_OK; + if( pgno==0 ) return STQLITE_OK; assert( pBt->pPager!=0 ); pDbPage = sqlite3PagerLookup(pBt->pPager, pgno); if( pDbPage ){ @@ -26877,22 +26877,22 @@ static int reparentPage(BtShared *pBt, Pgno pgno, MemPage *pNewParent, int idx){ sqlite3PagerUnref(pDbPage); } -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ return ptrmapPut(pBt, pgno, PTRMAP_BTREE, pNewParent->pgno); } #endif - return SQLITE_OK; + return STQLITE_OK; } /* -** Change the pParent pointer of all children of pPage to point back +** Change the pParent pointer of all tqchildren of pPage to point back ** to pPage. ** ** In other words, for every child of pPage, invoke reparentPage() -** to make sure that each child knows that pPage is its parent. +** to make sure that each child knows that pPage is its tqparent. ** ** This routine gets called after you memcpy() one page into ** another. @@ -26900,15 +26900,15 @@ static int reparentPage(BtShared *pBt, Pgno pgno, MemPage *pNewParent, int idx){ static int reparentChildPages(MemPage *pPage){ int i; BtShared *pBt = pPage->pBt; - int rc = SQLITE_OK; + int rc = STQLITE_OK; - if( pPage->leaf ) return SQLITE_OK; + if( pPage->leaf ) return STQLITE_OK; for(i=0; i<pPage->nCell; i++){ u8 *pCell = findCell(pPage, i); if( !pPage->leaf ){ rc = reparentPage(pBt, get4byte(pCell), pPage, i); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; } } if( !pPage->leaf ){ @@ -27008,7 +27008,7 @@ static int insertCell( ins = cellOffset + 2*i; if( end > top - sz ){ int rc = defragmentPage(pPage); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; top = get2byte(&data[hdr+5]); assert( end + sz <= top ); } @@ -27025,7 +27025,7 @@ static int insertCell( put2byte(&data[ins], idx); put2byte(&data[hdr+3], pPage->nCell); pPage->idxShift = 1; -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pPage->pBt->autoVacuum ){ /* The cell may contain a pointer to an overflow page. If so, write ** the entry for the overflow page into the pointer map. @@ -27036,13 +27036,13 @@ static int insertCell( if( (info.nData+(pPage->intKey?0:info.nKey))>info.nLocal ){ Pgno pgnoOvfl = get4byte(&pCell[info.iOverflow]); int rc = ptrmapPut(pPage->pBt, pgnoOvfl, PTRMAP_OVERFLOW1, pPage->pgno); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; } } #endif } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -27107,7 +27107,7 @@ static void assemblePage( /* Forward reference */ static int balance(MemPage*, int); -#ifndef SQLITE_OMIT_QUICKBALANCE +#ifndef STQLITE_OMIT_TQUICKBALANCE /* ** This version of balance() handles the common special case where ** a new entry is being inserted on the extreme right-end of the @@ -27122,7 +27122,7 @@ static int balance(MemPage*, int); ** fill up. On average. ** ** pPage is the leaf page which is the right-most page in the tree. -** pParent is its parent. pPage must have a single overflow entry +** pParent is its tqparent. pPage must have a single overflow entry ** which is also the right-most entry on the page. */ static int balance_quick(MemPage *pPage, MemPage *pParent){ @@ -27133,15 +27133,15 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){ int szCell; CellInfo info; BtShared *pBt = pPage->pBt; - 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 */ + 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 */ /* Allocate a new page. Insert the overflow cell from pPage ** into it. Then remove the overflow cell from pPage. */ rc = allocateBtreePage(pBt, &pNew, &pgnoNew, 0, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } pCell = pPage->aOvfl[0].pCell; @@ -27150,7 +27150,7 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){ assemblePage(pNew, 1, &pCell, &szCell); pPage->nOverflow = 0; - /* Set the parent of the newly allocated page to pParent. */ + /* Set the tqparent of the newly allocated page to pParent. */ pNew->pParent = pParent; sqlite3PagerRef(pParent->pDbPage); @@ -27161,49 +27161,49 @@ 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, parentCell, 0, info.nKey, 0, 0, 0, &parentSize); - if( rc!=SQLITE_OK ){ + rc = fillInCell(pParent, tqparentCell, 0, info.nKey, 0, 0, 0, &tqparentSize); + if( rc!=STQLITE_OK ){ return rc; } - assert( parentSize<64 ); - rc = insertCell(pParent, parentIdx, parentCell, parentSize, 0, 4); - if( rc!=SQLITE_OK ){ + assert( tqparentSize<64 ); + rc = insertCell(pParent, tqparentIdx, tqparentCell, tqparentSize, 0, 4); + if( rc!=STQLITE_OK ){ return rc; } - put4byte(findOverflowCell(pParent,parentIdx), pPage->pgno); + put4byte(findOverflowCell(pParent,tqparentIdx), pPage->pgno); put4byte(&pParent->aData[pParent->hdrOffset+8], pgnoNew); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* If this is an auto-vacuum database, update the pointer map ** with entries for the new page, and any pointer from the ** cell on the page to an overflow page. */ if( pBt->autoVacuum ){ rc = ptrmapPut(pBt, pgnoNew, PTRMAP_BTREE, pParent->pgno); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = ptrmapPutOvfl(pNew, 0); } - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ releasePage(pNew); return rc; } } #endif - /* Release the reference to the new page and balance the parent page, + /* Release the reference to the new page and balance the tqparent page, ** in case the divider cell inserted caused it to become overfull. */ releasePage(pNew); return balance(pParent, 0); } -#endif /* SQLITE_OMIT_QUICKBALANCE */ +#endif /* STQLITE_OMIT_TQUICKBALANCE */ /* ** This routine redistributes Cells on pPage and up to NN*2 siblings ** of pPage so that all pages have about the same amount of free space. ** Usually NN siblings on either side of pPage is used in the balancing, ** though more siblings might come from one side if pPage is the first -** or last child of its parent. If pPage has fewer than 2*NN siblings +** or last child of its tqparent. If pPage has fewer than 2*NN siblings ** (something which can only happen if pPage is the root page or a ** child of root) then all available siblings participate in the balancing. ** @@ -27219,16 +27219,16 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){ ** if the page is overfull. Part of the job of this routine is to ** make sure all Cells for pPage once again fit in pPage->aData[]. ** -** In the course of balancing the siblings of pPage, the parent of pPage +** In the course of balancing the siblings of pPage, the tqparent of pPage ** might become overfull or underfull. If that happens, then this routine -** is called recursively on the parent. +** is called recursively on the tqparent. ** ** If this routine fails for any reason, it might leave the database ** in a corrupted state. So if this routine fails, the database should ** be rolled back. */ static int balance_nonroot(MemPage *pPage){ - MemPage *pParent; /* The parent of pPage */ + MemPage *pParent; /* The tqparent of pPage */ BtShared *pBt; /* The whole database */ int nCell = 0; /* Number of cells in apCell[] */ int nMaxCells = 0; /* Allocated size of apCell, szCell, aFrom. */ @@ -27257,24 +27257,24 @@ static int balance_nonroot(MemPage *pPage){ int *szCell; /* Local size of all cells in apCell[] */ u8 *aCopy[NB]; /* Space for holding data of apCopy[] */ u8 *aSpace; /* Space to hold copies of dividers cells */ -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM u8 *aFrom = 0; #endif /* - ** Find the parent page. + ** Find the tqparent page. */ assert( pPage->isInit ); assert( sqlite3PagerIswriteable(pPage->pDbPage) ); pBt = pPage->pBt; pParent = pPage->pParent; assert( pParent ); - if( SQLITE_OK!=(rc = sqlite3PagerWrite(pParent->pDbPage)) ){ + if( STQLITE_OK!=(rc = sqlite3PagerWrite(pParent->pDbPage)) ){ return rc; } TRACE(("BALANCE: begin page %d child of %d\n", pPage->pgno, pParent->pgno)); -#ifndef SQLITE_OMIT_QUICKBALANCE +#ifndef STQLITE_OMIT_TQUICKBALANCE /* ** A special case: If a new entry has just been inserted into a ** table (that is, a btree with integer keys and all data at the leaves) @@ -27300,7 +27300,7 @@ static int balance_nonroot(MemPage *pPage){ #endif /* - ** Find the cell in the parent page whose left child points back + ** Find the cell in the tqparent page whose left child points back ** to pPage. The "idx" variable is the index of that cell. If pPage ** is the rightmost child of pParent then set idx to pParent->nCell */ @@ -27331,7 +27331,7 @@ static int balance_nonroot(MemPage *pPage){ ** the siblings. An attempt is made to find NN siblings on either ** side of pPage. More siblings are taken from one side, however, if ** pPage there are fewer than NN siblings on the other side. If pParent - ** has NB or fewer children then all children of pParent are taken. + ** has NB or fewer tqchildren then all tqchildren of pParent are taken. */ nxDiv = idx - NN; if( nxDiv + NB > pParent->nCell ){ @@ -27362,7 +27362,7 @@ static int balance_nonroot(MemPage *pPage){ } /* Make nMaxCells a multiple of 2 in order to preserve 8-byte - ** alignment */ + ** tqalignment */ nMaxCells = (nMaxCells + 1)&~1; /* @@ -27376,19 +27376,19 @@ static int balance_nonroot(MemPage *pPage){ + (ISAUTOVACUUM ? nMaxCells : 0) /* aFrom */ ); if( apCell==0 ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; goto balance_cleanup; } szCell = (int*)&apCell[nMaxCells]; aCopy[0] = (u8*)&szCell[nMaxCells]; - assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ + assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ for(i=1; i<NB; i++){ aCopy[i] = &aCopy[i-1][pBt->pageSize+ROUND8(sizeof(MemPage))]; - assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ + assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ } aSpace = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))]; - assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ -#ifndef SQLITE_OMIT_AUTOVACUUM + assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ aFrom = &aSpace[5*pBt->pageSize]; } @@ -27435,7 +27435,7 @@ static int balance_nonroot(MemPage *pPage){ assert( nCell<nMaxCells ); apCell[nCell] = findOverflowCell(pOld, j); szCell[nCell] = cellSizePtr(pOld, apCell[nCell]); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ int a; aFrom[nCell] = i; @@ -27467,7 +27467,7 @@ static int balance_nonroot(MemPage *pPage){ assert( iSpace<=pBt->pageSize*5 ); memcpy(pTemp, apDiv[i], sz); apCell[nCell] = pTemp+leafCorrection; -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ aFrom[nCell] = 0xFF; } @@ -27653,10 +27653,10 @@ static int balance_nonroot(MemPage *pPage){ assert( pNew->nCell>0 || (nNew==1 && cntNew[0]==0) ); assert( pNew->nOverflow==0 ); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* If this is an auto-vacuum database, update the pointer map entries ** that point to the siblings that were rearranged. These can be: left - ** children of cells, the right-child of the page, or overflow pages + ** tqchildren of cells, the right-child of the page, or overflow pages ** pointed to by cells. */ if( pBt->autoVacuum ){ @@ -27664,7 +27664,7 @@ static int balance_nonroot(MemPage *pPage){ assert( k<nMaxCells ); if( aFrom[k]==0xFF || apCopy[aFrom[k]]->pgno!=pNew->pgno ){ rc = ptrmapPutOvfl(pNew, k-j); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto balance_cleanup; } } @@ -27675,7 +27675,7 @@ static int balance_nonroot(MemPage *pPage){ j = cntNew[i]; /* If the sibling page assembled above was not the right-most sibling, - ** insert a divider cell into the parent page. + ** insert a divider cell into the tqparent page. */ if( i<nNew-1 && j<nCell ){ u8 *pCell; @@ -27714,7 +27714,7 @@ static int balance_nonroot(MemPage *pPage){ ** any cell). But it's important to pass the correct size to ** insertCell(), so reparse the cell now. ** - ** Note that this can never happen in an SQLite data file, as all + ** Note that this can never happen in an STQLite data file, as all ** cells are at least 4 bytes. It only happens in b-trees used ** to evaluate "IN (SELECT ...)" and similar clauses. */ @@ -27724,16 +27724,16 @@ static int balance_nonroot(MemPage *pPage){ } } rc = insertCell(pParent, nxDiv, pCell, sz, pTemp, 4); - if( rc!=SQLITE_OK ) goto balance_cleanup; + if( rc!=STQLITE_OK ) goto balance_cleanup; put4byte(findOverflowCell(pParent,nxDiv), pNew->pgno); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* If this is an auto-vacuum database, and not a leaf-data tree, ** then update the pointer map with an entry for the overflow page ** that the cell just inserted points to (if any). */ if( pBt->autoVacuum && !leafData ){ rc = ptrmapPutOvfl(pParent, nxDiv); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto balance_cleanup; } } @@ -27758,19 +27758,19 @@ static int balance_nonroot(MemPage *pPage){ } /* - ** Reparent children of all cells. + ** Retqparent tqchildren of all cells. */ for(i=0; i<nNew; i++){ rc = reparentChildPages(apNew[i]); - if( rc!=SQLITE_OK ) goto balance_cleanup; + if( rc!=STQLITE_OK ) goto balance_cleanup; } rc = reparentChildPages(pParent); - if( rc!=SQLITE_OK ) goto balance_cleanup; + if( rc!=STQLITE_OK ) goto balance_cleanup; /* - ** Balance the parent page. Note that the current page (pPage) might + ** Balance the tqparent page. Note that the current page (pPage) might ** have been added to the freelist so it might no longer be initialized. - ** But the parent page will always be initialized. + ** But the tqparent page will always be initialized. */ assert( pParent->isInit ); rc = balance(pParent, 0); @@ -27800,7 +27800,7 @@ balance_cleanup: static int balance_shallower(MemPage *pPage){ MemPage *pChild; /* The only child page of pPage */ Pgno pgnoChild; /* Page number for pChild */ - int rc = SQLITE_OK; /* Return code from subprocedures */ + int rc = STQLITE_OK; /* Return code from subprocedures */ BtShared *pBt; /* The main BTree structure */ int mxCellPerPage; /* Maximum number of cells per page */ u8 **apCell; /* All cells from pages being balanced */ @@ -27811,7 +27811,7 @@ static int balance_shallower(MemPage *pPage){ pBt = pPage->pBt; mxCellPerPage = MX_CELL(pBt); apCell = sqliteMallocRaw( mxCellPerPage*(sizeof(u8*)+sizeof(int)) ); - if( apCell==0 ) return SQLITE_NOMEM; + if( apCell==0 ) return STQLITE_NOMEM; szCell = (int*)&apCell[mxCellPerPage]; if( pPage->leaf ){ /* The table is completely empty */ @@ -27848,7 +27848,7 @@ static int balance_shallower(MemPage *pPage){ szCell[i] = cellSizePtr(pChild, apCell[i]); } assemblePage(pPage, pChild->nCell, apCell, szCell); - /* Copy the right-pointer of the child to the parent. */ + /* Copy the right-pointer of the child to the tqparent. */ put4byte(&pPage->aData[pPage->hdrOffset+8], get4byte(&pChild->aData[pChild->hdrOffset+8])); freePage(pChild); @@ -27863,25 +27863,25 @@ static int balance_shallower(MemPage *pPage){ pPage->isInit = 0; pPage->pParent = 0; rc = sqlite3BtreeInitPage(pPage, 0); - assert( rc==SQLITE_OK ); + assert( rc==STQLITE_OK ); freePage(pChild); TRACE(("BALANCE: transfer child %d into root %d\n", pChild->pgno, pPage->pgno)); } rc = reparentChildPages(pPage); assert( pPage->nOverflow==0 ); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ int i; for(i=0; i<pPage->nCell; i++){ rc = ptrmapPutOvfl(pPage, i); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto end_shallow_balance; } } } #endif - if( rc!=SQLITE_OK ) goto end_shallow_balance; + if( rc!=STQLITE_OK ) goto end_shallow_balance; releasePage(pChild); } end_shallow_balance: @@ -27905,10 +27905,10 @@ static int balance_deeper(MemPage *pPage){ Pgno pgnoChild; /* Page number of the new child page */ BtShared *pBt; /* The BTree */ int usableSize; /* Total usable size of a page */ - u8 *data; /* Content of the parent page */ + u8 *data; /* Content of the tqparent page */ u8 *cdata; /* Content of the child page */ - int hdr; /* Offset to page header in parent */ - int brk; /* Offset to content of first cell in parent */ + int hdr; /* Offset to page header in tqparent */ + int brk; /* Offset to content of first cell in tqparent */ assert( pPage->pParent==0 ); assert( pPage->nOverflow>0 ); @@ -27935,14 +27935,14 @@ static int balance_deeper(MemPage *pPage){ zeroPage(pPage, pChild->aData[0] & ~PTF_LEAF); put4byte(&pPage->aData[pPage->hdrOffset+8], pgnoChild); TRACE(("BALANCE: copy root %d into %d\n", pPage->pgno, pChild->pgno)); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ int i; rc = ptrmapPut(pBt, pChild->pgno, PTRMAP_BTREE, pPage->pgno); if( rc ) goto balancedeeper_out; for(i=0; i<pChild->nCell; i++){ rc = ptrmapPutOvfl(pChild, i); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } } @@ -27960,12 +27960,12 @@ balancedeeper_out: ** required, call the appropriate balancing routine. */ static int balance(MemPage *pPage, int insert){ - int rc = SQLITE_OK; + int rc = STQLITE_OK; if( pPage->pParent==0 ){ if( pPage->nOverflow>0 ){ rc = balance_deeper(pPage); } - if( rc==SQLITE_OK && pPage->nCell==0 ){ + if( rc==STQLITE_OK && pPage->nCell==0 ){ rc = balance_shallower(pPage); } }else{ @@ -27983,7 +27983,7 @@ static int balance(MemPage *pPage, int insert){ ** database connection (a database connection that shares the pager ** cache with the current connection) and that other connection ** is not in the ReadUncommmitted state, then this routine returns -** SQLITE_LOCKED. +** STQLITE_LOCKED. ** ** In addition to checking for read-locks (where a read-lock ** means a cursor opened with wrFlag==0) this routine also moves @@ -28004,14 +28004,14 @@ static int checkReadLocks(Btree *pBtree, Pgno pgnoRoot, BtCursor *pExclude){ if( p->wrFlag==0 ){ sqlite3 *dbOther = p->pBtree->pSqlite; if( dbOther==0 || - (dbOther!=db && (dbOther->flags & SQLITE_ReadUncommitted)==0) ){ - return SQLITE_LOCKED; + (dbOther!=db && (dbOther->flags & STQLITE_ReadUncommitted)==0) ){ + return STQLITE_LOCKED; } }else if( p->pPage->pgno!=p->pgnoRoot ){ moveToRoot(p); } } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -28023,7 +28023,7 @@ static int checkReadLocks(Btree *pBtree, Pgno pgnoRoot, BtCursor *pExclude){ ** For an INTKEY table, only the nKey value of the key is used. pKey is ** ignored. For a ZERODATA table, the pData and nData are both ignored. */ -SQLITE_PRIVATE int sqlite3BtreeInsert( +STQLITE_PRIVATE int sqlite3BtreeInsert( BtCursor *pCur, /* Insert data into the table of this cursor */ const void *pKey, i64 nKey, /* The key of the new record */ const void *pData, int nData, /* The data of the new record */ @@ -28040,21 +28040,21 @@ SQLITE_PRIVATE int sqlite3BtreeInsert( if( pBt->inTransaction!=TRANS_WRITE ){ /* Must start a transaction before doing an insert */ - return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; + return pBt->readOnly ? STQLITE_READONLY : STQLITE_ERROR; } assert( !pBt->readOnly ); if( !pCur->wrFlag ){ - return SQLITE_PERM; /* Cursor not open for writing */ + return STQLITE_PERM; /* Cursor not open for writing */ } if( checkReadLocks(pCur->pBtree, pCur->pgnoRoot, pCur) ){ - return SQLITE_LOCKED; /* The table pCur points to has a read lock */ + return STQLITE_LOCKED; /* The table pCur points to has a read lock */ } /* Save the positions of any other cursors open on this table */ clearCursorPosition(pCur); if( - SQLITE_OK!=(rc = saveAllCursors(pBt, pCur->pgnoRoot, pCur)) || - SQLITE_OK!=(rc = sqlite3BtreeMoveto(pCur, pKey, nKey, appendBias, &loc)) + STQLITE_OK!=(rc = saveAllCursors(pBt, pCur->pgnoRoot, pCur)) || + STQLITE_OK!=(rc = sqlite3BtreeMoveto(pCur, pKey, nKey, appendBias, &loc)) ){ return rc; } @@ -28069,7 +28069,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert( rc = sqlite3PagerWrite(pPage->pDbPage); if( rc ) return rc; newCell = sqliteMallocRaw( MX_CELL_SIZE(pBt) ); - if( newCell==0 ) return SQLITE_NOMEM; + if( newCell==0 ) return STQLITE_NOMEM; rc = fillInCell(pPage, newCell, pKey, nKey, pData, nData, nZero, &szNew); if( rc ) goto end_insert; assert( szNew==cellSizePtr(pPage, newCell) ); @@ -28093,11 +28093,11 @@ SQLITE_PRIVATE int sqlite3BtreeInsert( assert( pPage->leaf ); } rc = insertCell(pPage, pCur->idx, newCell, szNew, 0, 0); - if( rc!=SQLITE_OK ) goto end_insert; + if( rc!=STQLITE_OK ) goto end_insert; rc = balance(pPage, 1); /* sqlite3BtreePageDump(pCur->pBt, pCur->pgnoRoot, 1); */ /* fflush(stdout); */ - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ moveToRoot(pCur); } end_insert: @@ -28109,7 +28109,7 @@ end_insert: ** Delete the entry that the cursor is pointing to. The cursor ** is left pointing at a random location. */ -SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur){ +STQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur){ MemPage *pPage = pCur->pPage; unsigned char *pCell; int rc; @@ -28119,21 +28119,21 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur){ assert( pPage->isInit ); if( pBt->inTransaction!=TRANS_WRITE ){ /* Must start a transaction before doing a delete */ - return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; + return pBt->readOnly ? STQLITE_READONLY : STQLITE_ERROR; } assert( !pBt->readOnly ); if( pCur->idx >= pPage->nCell ){ - return SQLITE_ERROR; /* The cursor is not pointing to anything */ + return STQLITE_ERROR; /* The cursor is not pointing to anything */ } if( !pCur->wrFlag ){ - return SQLITE_PERM; /* Did not open this cursor for writing */ + return STQLITE_PERM; /* Did not open this cursor for writing */ } if( checkReadLocks(pCur->pBtree, pCur->pgnoRoot, pCur) ){ - return SQLITE_LOCKED; /* The table pCur points to has a read lock */ + return STQLITE_LOCKED; /* The table pCur points to has a read lock */ } /* Restore the current cursor position (a no-op if the cursor is not in - ** CURSOR_REQUIRESEEK state) and save the positions of any other cursors + ** CURSOR_RETQUIRESEEK state) and save the positions of any other cursors ** open on the same table. Then call sqlite3PagerWrite() on the page ** that the entry will be deleted from. */ @@ -28174,10 +28174,10 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur){ assert( !pPage->leafData ); sqlite3BtreeGetTempCursor(pCur, &leafCur); rc = sqlite3BtreeNext(&leafCur, ¬Used); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = sqlite3PagerWrite(leafCur.pPage->pDbPage); } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ TRACE(("DELETE: table=%d delete internal from %d replace from leaf %d\n", pCur->pgnoRoot, pPage->pgno, leafCur.pPage->pgno)); dropCell(pPage, pCur->idx, cellSizePtr(pPage, pCell)); @@ -28186,17 +28186,17 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur){ assert( MX_CELL_SIZE(pBt)>=szNext+4 ); tempCell = sqliteMallocRaw( MX_CELL_SIZE(pBt) ); if( tempCell==0 ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; } } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = insertCell(pPage, pCur->idx, pNext-4, szNext+4, tempCell, 0); } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ put4byte(findOverflowCell(pPage, pCur->idx), pgnoChild); rc = balance(pPage, 0); } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ dropCell(leafCur.pPage, leafCur.idx, szNext); rc = balance(leafCur.pPage, 0); } @@ -28208,7 +28208,7 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur){ dropCell(pPage, pCur->idx, cellSizePtr(pPage, pCell)); rc = balance(pPage, 0); } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ moveToRoot(pCur); } return rc; @@ -28225,18 +28225,18 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur){ ** BTREE_INTKEY|BTREE_LEAFDATA Used for SQL tables with rowid keys ** BTREE_ZERODATA Used for SQL indices */ -SQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree *p, int *piTable, int flags){ +STQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree *p, int *piTable, int flags){ BtShared *pBt = p->pBt; MemPage *pRoot; Pgno pgnoRoot; int rc; if( pBt->inTransaction!=TRANS_WRITE ){ /* Must start a transaction first */ - return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; + return pBt->readOnly ? STQLITE_READONLY : STQLITE_ERROR; } assert( !pBt->readOnly ); -#ifdef SQLITE_OMIT_AUTOVACUUM +#ifdef STQLITE_OMIT_AUTOVACUUM rc = allocateBtreePage(pBt, &pRoot, &pgnoRoot, 1, 0); if( rc ) return rc; #else @@ -28249,14 +28249,14 @@ SQLITE_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. */ - invalidateAllOverflowCache(pBt); + tqinvalidateAllOverflowCache(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 ** created so far, so the new root-page is (meta[3]+1). */ rc = sqlite3BtreeGetMeta(p, 4, &pgnoRoot); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; pgnoRoot++; /* The new root-page may not be allocated on a pointer-map page, or the @@ -28273,7 +28273,7 @@ SQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree *p, int *piTable, int flags){ ** to reside at pgnoRoot). */ rc = allocateBtreePage(pBt, &pPageMove, &pgnoMove, pgnoRoot, 1); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } @@ -28291,18 +28291,18 @@ SQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree *p, int *piTable, int flags){ /* Move the page currently at pgnoRoot to pgnoMove. */ rc = sqlite3BtreeGetPage(pBt, pgnoRoot, &pRoot, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } rc = ptrmapGet(pBt, pgnoRoot, &eType, &iPtrPage); - if( rc!=SQLITE_OK || eType==PTRMAP_ROOTPAGE || eType==PTRMAP_FREEPAGE ){ + if( rc!=STQLITE_OK || eType==PTRMAP_ROOTPAGE || eType==PTRMAP_FREEPAGE ){ releasePage(pRoot); return rc; } assert( eType!=PTRMAP_ROOTPAGE ); assert( eType!=PTRMAP_FREEPAGE ); rc = sqlite3PagerWrite(pRoot->pDbPage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ releasePage(pRoot); return rc; } @@ -28310,15 +28310,15 @@ SQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree *p, int *piTable, int flags){ releasePage(pRoot); /* Obtain the page at pgnoRoot */ - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } rc = sqlite3BtreeGetPage(pBt, pgnoRoot, &pRoot, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } rc = sqlite3PagerWrite(pRoot->pDbPage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ releasePage(pRoot); return rc; } @@ -28347,11 +28347,11 @@ SQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree *p, int *piTable, int flags){ zeroPage(pRoot, flags | PTF_LEAF); sqlite3PagerUnref(pRoot->pDbPage); *piTable = (int)pgnoRoot; - return SQLITE_OK; + return STQLITE_OK; } /* -** Erase the given database page and all its children. Return +** Erase the given database page and all its tqchildren. Return ** the page to the freelist. */ static int clearDatabasePage( @@ -28366,7 +28366,7 @@ static int clearDatabasePage( int i; if( pgno>sqlite3PagerPagecount(pBt->pPager) ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } rc = getAndInitPage(pBt, pgno, &pPage, pParent); @@ -28400,15 +28400,15 @@ cleardatabasepage_out: ** the page number of the root of the table. After this routine returns, ** the root page is empty, but still exists. ** -** This routine will fail with SQLITE_LOCKED if there are any open +** This routine will fail with STQLITE_LOCKED if there are any open ** read cursors on the table. Open write cursors are moved to the ** root of the table. */ -SQLITE_PRIVATE int sqlite3BtreeClearTable(Btree *p, int iTable){ +STQLITE_PRIVATE int sqlite3BtreeClearTable(Btree *p, int iTable){ int rc; BtShared *pBt = p->pBt; if( p->inTrans!=TRANS_WRITE ){ - return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; + return pBt->readOnly ? STQLITE_READONLY : STQLITE_ERROR; } rc = checkReadLocks(p, iTable, 0); if( rc ){ @@ -28416,7 +28416,7 @@ SQLITE_PRIVATE int sqlite3BtreeClearTable(Btree *p, int iTable){ } /* Save the position of all cursors open on this table */ - if( SQLITE_OK!=(rc = saveAllCursors(pBt, iTable, 0)) ){ + if( STQLITE_OK!=(rc = saveAllCursors(pBt, iTable, 0)) ){ return rc; } @@ -28428,7 +28428,7 @@ SQLITE_PRIVATE int sqlite3BtreeClearTable(Btree *p, int iTable){ ** the freelist. Except, the root of the principle table (the one on ** page 1) is never added to the freelist. ** -** This routine will fail with SQLITE_LOCKED if there are any open +** This routine will fail with STQLITE_LOCKED if there are any open ** cursors on the table. ** ** If AUTOVACUUM is enabled and the page at iTable is not the last @@ -28443,13 +28443,13 @@ SQLITE_PRIVATE int sqlite3BtreeClearTable(Btree *p, int iTable){ ** The last root page is recorded in meta[3] and the value of ** meta[3] is updated by this procedure. */ -SQLITE_PRIVATE int sqlite3BtreeDropTable(Btree *p, int iTable, int *piMoved){ +STQLITE_PRIVATE int sqlite3BtreeDropTable(Btree *p, int iTable, int *piMoved){ int rc; MemPage *pPage = 0; BtShared *pBt = p->pBt; if( p->inTrans!=TRANS_WRITE ){ - return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; + return pBt->readOnly ? STQLITE_READONLY : STQLITE_ERROR; } /* It is illegal to drop a table if any cursors are open on the @@ -28459,7 +28459,7 @@ SQLITE_PRIVATE int sqlite3BtreeDropTable(Btree *p, int iTable, int *piMoved){ ** occur. */ if( pBt->pCursor ){ - return SQLITE_LOCKED; + return STQLITE_LOCKED; } rc = sqlite3BtreeGetPage(pBt, (Pgno)iTable, &pPage, 0); @@ -28473,14 +28473,14 @@ SQLITE_PRIVATE int sqlite3BtreeDropTable(Btree *p, int iTable, int *piMoved){ *piMoved = 0; if( iTable>1 ){ -#ifdef SQLITE_OMIT_AUTOVACUUM +#ifdef STQLITE_OMIT_AUTOVACUUM rc = freePage(pPage); releasePage(pPage); #else if( pBt->autoVacuum ){ Pgno maxRootPgno; rc = sqlite3BtreeGetMeta(p, 4, &maxRootPgno); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ releasePage(pPage); return rc; } @@ -28491,7 +28491,7 @@ SQLITE_PRIVATE int sqlite3BtreeDropTable(Btree *p, int iTable, int *piMoved){ */ rc = freePage(pPage); releasePage(pPage); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } }else{ @@ -28502,21 +28502,21 @@ SQLITE_PRIVATE int sqlite3BtreeDropTable(Btree *p, int iTable, int *piMoved){ MemPage *pMove; releasePage(pPage); rc = sqlite3BtreeGetPage(pBt, maxRootPgno, &pMove, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } rc = relocatePage(pBt, pMove, PTRMAP_ROOTPAGE, 0, iTable); releasePage(pMove); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } rc = sqlite3BtreeGetPage(pBt, maxRootPgno, &pMove, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } rc = freePage(pMove); releasePage(pMove); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } *piMoved = maxRootPgno; @@ -28561,7 +28561,7 @@ SQLITE_PRIVATE int sqlite3BtreeDropTable(Btree *p, int iTable, int *piMoved){ ** layer (and the SetCookie and ReadCookie opcodes) the number of ** free pages is not visible. So Cookie[0] is the same as Meta[1]. */ -SQLITE_PRIVATE int sqlite3BtreeGetMeta(Btree *p, int idx, u32 *pMeta){ +STQLITE_PRIVATE int sqlite3BtreeGetMeta(Btree *p, int idx, u32 *pMeta){ DbPage *pDbPage; int rc; unsigned char *pP1; @@ -28569,11 +28569,11 @@ SQLITE_PRIVATE int sqlite3BtreeGetMeta(Btree *p, int idx, u32 *pMeta){ /* Reading a meta-data value requires a read-lock on page 1 (and hence ** the sqlite_master table. We grab this lock regardless of whether or - ** not the SQLITE_ReadUncommitted flag is set (the table rooted at page + ** not the STQLITE_ReadUncommitted flag is set (the table rooted at page ** 1 is treated as a special case by queryTableLock() and lockTable()). */ rc = queryTableLock(p, 1, READ_LOCK); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } @@ -28587,7 +28587,7 @@ SQLITE_PRIVATE int sqlite3BtreeGetMeta(Btree *p, int idx, u32 *pMeta){ /* If autovacuumed is disabled in this build but we are trying to ** access an autovacuumed database, then make the database readonly. */ -#ifdef SQLITE_OMIT_AUTOVACUUM +#ifdef STQLITE_OMIT_AUTOVACUUM if( idx==4 && *pMeta>0 ) pBt->readOnly = 1; #endif @@ -28600,13 +28600,13 @@ SQLITE_PRIVATE int sqlite3BtreeGetMeta(Btree *p, int idx, u32 *pMeta){ ** Write meta-information back into the database. Meta[0] is ** read-only and may not be written. */ -SQLITE_PRIVATE int sqlite3BtreeUpdateMeta(Btree *p, int idx, u32 iMeta){ +STQLITE_PRIVATE int sqlite3BtreeUpdateMeta(Btree *p, int idx, u32 iMeta){ BtShared *pBt = p->pBt; unsigned char *pP1; int rc; assert( idx>=1 && idx<=15 ); if( p->inTrans!=TRANS_WRITE ){ - return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; + return pBt->readOnly ? STQLITE_READONLY : STQLITE_ERROR; } assert( pBt->pPage1!=0 ); pP1 = pBt->pPage1->aData; @@ -28618,15 +28618,15 @@ SQLITE_PRIVATE int sqlite3BtreeUpdateMeta(Btree *p, int idx, u32 iMeta){ assert( iMeta==0 || iMeta==1 ); pBt->incrVacuum = iMeta; } - return SQLITE_OK; + return STQLITE_OK; } /* ** Return the flag byte at the beginning of the page that the cursor ** is currently pointing to. */ -SQLITE_PRIVATE int sqlite3BtreeFlags(BtCursor *pCur){ - /* TODO: What about CURSOR_REQUIRESEEK state? Probably need to call +STQLITE_PRIVATE int sqlite3BtreeFlags(BtCursor *pCur){ + /* TODO: What about CURSOR_RETQUIRESEEK state? Probably need to call ** restoreOrClearCursorPosition() here. */ MemPage *pPage = pCur->pPage; @@ -28638,11 +28638,11 @@ SQLITE_PRIVATE int sqlite3BtreeFlags(BtCursor *pCur){ ** Return the pager associated with a BTree. This routine is used for ** testing and debugging only. */ -SQLITE_PRIVATE Pager *sqlite3BtreePager(Btree *p){ +STQLITE_PRIVATE Pager *sqlite3BtreePager(Btree *p){ return p->pBt->pPager; } -#ifndef SQLITE_OMIT_INTEGRITY_CHECK +#ifndef STQLITE_OMIT_INTEGRITY_CHECK /* ** Append a message to the error message string. */ @@ -28671,9 +28671,9 @@ static void checkAppendMsg( } sqliteFree(zMsg2); } -#endif /* SQLITE_OMIT_INTEGRITY_CHECK */ +#endif /* STQLITE_OMIT_INTEGRITY_CHECK */ -#ifndef SQLITE_OMIT_INTEGRITY_CHECK +#ifndef STQLITE_OMIT_INTEGRITY_CHECK /* ** Add 1 to the reference count for page iPage. If this is the second ** reference to the page, add an error message to pCheck->zErrMsg. @@ -28695,7 +28695,7 @@ static int checkRef(IntegrityCk *pCheck, int iPage, char *zContext){ return (pCheck->anRef[iPage]++)>1; } -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* ** Check that the entry in the pointer-map for page iChild maps to ** page iParent, pointer type ptrType. If not, append an error message @@ -28705,7 +28705,7 @@ static void checkPtrmap( IntegrityCk *pCheck, /* Integrity check context */ Pgno iChild, /* Child page number */ u8 eType, /* Expected pointer map type */ - Pgno iParent, /* Expected pointer map parent page number */ + Pgno iParent, /* Expected pointer map tqparent page number */ char *zContext /* Context description (used for error msg) */ ){ int rc; @@ -28713,7 +28713,7 @@ static void checkPtrmap( Pgno iPtrmapParent; rc = ptrmapGet(pCheck->pBt, iChild, &ePtrmapType, &iPtrmapParent); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ checkAppendMsg(pCheck, zContext, "Failed to read ptrmap key=%d", iChild); return; } @@ -28757,7 +28757,7 @@ static void checkList( pOvflData = (unsigned char *)sqlite3PagerGetData(pOvflPage); if( isFreeList ){ int n = get4byte(&pOvflData[4]); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pCheck->pBt->autoVacuum ){ checkPtrmap(pCheck, iPage, PTRMAP_FREEPAGE, 0, zContext); } @@ -28769,7 +28769,7 @@ static void checkList( }else{ for(i=0; i<n; i++){ Pgno iFreePage = get4byte(&pOvflData[8+i*4]); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pCheck->pBt->autoVacuum ){ checkPtrmap(pCheck, iFreePage, PTRMAP_FREEPAGE, 0, zContext); } @@ -28779,7 +28779,7 @@ static void checkList( N -= n; } } -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM else{ /* If this database supports auto-vacuum and iPage is not the last ** page in this overflow list, check that the pointer-map entry for @@ -28795,9 +28795,9 @@ static void checkList( sqlite3PagerUnref(pOvflPage); } } -#endif /* SQLITE_OMIT_INTEGRITY_CHECK */ +#endif /* STQLITE_OMIT_INTEGRITY_CHECK */ -#ifndef SQLITE_OMIT_INTEGRITY_CHECK +#ifndef STQLITE_OMIT_INTEGRITY_CHECK /* ** Do various sanity checks on a single page of a tree. Return ** the tree depth. Root pages return 0. Parents of root pages @@ -28811,8 +28811,8 @@ static void checkList( ** NO 3. Make sure no key is less than or equal to zLowerBound. ** NO 4. Make sure no key is greater than or equal to zUpperBound. ** 5. Check the integrity of overflow pages. -** 6. Recursively call checkTreePage on all children. -** 7. Verify that the depth of all children is the same. +** 6. Recursively call checkTreePage on all tqchildren. +** 7. Verify that the depth of all tqchildren is the same. ** 8. Make sure this page is at least 33% full or else it is ** the root of the tree. */ @@ -28872,7 +28872,7 @@ static int checkTreePage( if( sz>info.nLocal ){ int nPage = (sz - info.nLocal + usableSize - 5)/(usableSize - 4); Pgno pgnoOvfl = get4byte(&pCell[info.iOverflow]); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ checkPtrmap(pCheck, pgnoOvfl, PTRMAP_OVERFLOW1, iPage, zContext); } @@ -28884,7 +28884,7 @@ static int checkTreePage( */ if( !pPage->leaf ){ pgno = get4byte(pCell); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ checkPtrmap(pCheck, pgno, PTRMAP_BTREE, iPage, zContext); } @@ -28900,7 +28900,7 @@ static int checkTreePage( pgno = get4byte(&pPage->aData[pPage->hdrOffset+8]); sqlite3_snprintf(sizeof(zContext), zContext, "On page %d at right child: ", iPage); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ checkPtrmap(pCheck, pgno, PTRMAP_BTREE, iPage, 0); } @@ -28960,9 +28960,9 @@ static int checkTreePage( releasePage(pPage); return depth+1; } -#endif /* SQLITE_OMIT_INTEGRITY_CHECK */ +#endif /* STQLITE_OMIT_INTEGRITY_CHECK */ -#ifndef SQLITE_OMIT_INTEGRITY_CHECK +#ifndef STQLITE_OMIT_INTEGRITY_CHECK /* ** This routine does a complete check of the given BTree file. aRoot[] is ** an array of pages numbers were each page number is the root page of @@ -28973,7 +28973,7 @@ static int checkTreePage( ** and a pointer to that error message is returned. The calling function ** is responsible for freeing the error message when it is done. */ -SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck( +STQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck( Btree *p, /* The btree to be checked */ int *aRoot, /* An array of root pages numbers for individual trees */ int nRoot, /* Number of entries in aRoot[] */ @@ -28986,7 +28986,7 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck( BtShared *pBt = p->pBt; nRef = sqlite3PagerRefcount(pBt->pPager); - if( lockBtreeWithRetry(p)!=SQLITE_OK ){ + if( lockBtreeWithRetry(p)!=STQLITE_OK ){ return sqliteStrDup("Unable to acquire a read lock on the database"); } sCheck.pBt = pBt; @@ -28995,7 +28995,7 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck( sCheck.mxErr = mxErr; sCheck.nErr = 0; *pnErr = 0; -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->nTrunc!=0 ){ sCheck.nPage = pBt->nTrunc; } @@ -29027,7 +29027,7 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck( */ for(i=0; i<nRoot && sCheck.mxErr; i++){ if( aRoot[i]==0 ) continue; -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum && aRoot[i]>1 ){ checkPtrmap(&sCheck, aRoot[i], PTRMAP_ROOTPAGE, 0, 0); } @@ -29038,7 +29038,7 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck( /* Make sure every page in the file is referenced */ for(i=1; i<=sCheck.nPage && sCheck.mxErr; i++){ -#ifdef SQLITE_OMIT_AUTOVACUUM +#ifdef STQLITE_OMIT_AUTOVACUUM if( sCheck.anRef[i]==0 ){ checkAppendMsg(&sCheck, 0, "Page %d is never used", i); } @@ -29073,12 +29073,12 @@ SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck( *pnErr = sCheck.nErr; return sCheck.zErrMsg; } -#endif /* SQLITE_OMIT_INTEGRITY_CHECK */ +#endif /* STQLITE_OMIT_INTEGRITY_CHECK */ /* ** Return the full pathname of the underlying database file. */ -SQLITE_PRIVATE const char *sqlite3BtreeGetFilename(Btree *p){ +STQLITE_PRIVATE const char *sqlite3BtreeGetFilename(Btree *p){ assert( p->pBt->pPager!=0 ); return sqlite3PagerFilename(p->pBt->pPager); } @@ -29086,7 +29086,7 @@ SQLITE_PRIVATE const char *sqlite3BtreeGetFilename(Btree *p){ /* ** Return the pathname of the directory that contains the database file. */ -SQLITE_PRIVATE const char *sqlite3BtreeGetDirname(Btree *p){ +STQLITE_PRIVATE const char *sqlite3BtreeGetDirname(Btree *p){ assert( p->pBt->pPager!=0 ); return sqlite3PagerDirname(p->pBt->pPager); } @@ -29096,12 +29096,12 @@ SQLITE_PRIVATE const char *sqlite3BtreeGetDirname(Btree *p){ ** value of this routine is the same regardless of whether the journal file ** has been created or not. */ -SQLITE_PRIVATE const char *sqlite3BtreeGetJournalname(Btree *p){ +STQLITE_PRIVATE const char *sqlite3BtreeGetJournalname(Btree *p){ assert( p->pBt->pPager!=0 ); return sqlite3PagerJournalname(p->pBt->pPager); } -#ifndef SQLITE_OMIT_VACUUM +#ifndef STQLITE_OMIT_VACUUM /* ** Copy the complete content of pBtFrom into pBtTo. A transaction ** must be active for both files. @@ -29109,21 +29109,21 @@ SQLITE_PRIVATE const char *sqlite3BtreeGetJournalname(Btree *p){ ** The size of file pBtFrom may be reduced by this operation. ** If anything goes wrong, the transaction on pBtFrom is rolled back. */ -SQLITE_PRIVATE int sqlite3BtreeCopyFile(Btree *pTo, Btree *pFrom){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3BtreeCopyFile(Btree *pTo, Btree *pFrom){ + int rc = STQLITE_OK; Pgno i, nPage, nToPage, iSkip; BtShared *pBtTo = pTo->pBt; BtShared *pBtFrom = pFrom->pBt; if( pTo->inTrans!=TRANS_WRITE || pFrom->inTrans!=TRANS_WRITE ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } - if( pBtTo->pCursor ) return SQLITE_BUSY; + if( pBtTo->pCursor ) return STQLITE_BUSY; nToPage = sqlite3PagerPagecount(pBtTo->pPager); nPage = sqlite3PagerPagecount(pBtFrom->pPager); iSkip = PENDING_BYTE_PAGE(pBtTo); - for(i=1; rc==SQLITE_OK && i<=nPage; i++){ + for(i=1; rc==STQLITE_OK && i<=nPage; i++){ DbPage *pDbPage; if( i==iSkip ) continue; rc = sqlite3PagerGet(pBtFrom->pPager, i, &pDbPage); @@ -29135,7 +29135,7 @@ SQLITE_PRIVATE int sqlite3BtreeCopyFile(Btree *pTo, Btree *pFrom){ /* If the file is shrinking, journal the pages that are being truncated ** so that they can be rolled back if the commit fails. */ - for(i=nPage+1; rc==SQLITE_OK && i<=nToPage; i++){ + for(i=nPage+1; rc==STQLITE_OK && i<=nToPage; i++){ DbPage *pDbPage; if( i==iSkip ) continue; rc = sqlite3PagerGet(pBtTo->pPager, i, &pDbPage); @@ -29161,26 +29161,26 @@ SQLITE_PRIVATE int sqlite3BtreeCopyFile(Btree *pTo, Btree *pFrom){ } return rc; } -#endif /* SQLITE_OMIT_VACUUM */ +#endif /* STQLITE_OMIT_VACUUM */ /* ** Return non-zero if a transaction is active. */ -SQLITE_PRIVATE int sqlite3BtreeIsInTrans(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeIsInTrans(Btree *p){ return (p && (p->inTrans==TRANS_WRITE)); } /* ** Return non-zero if a statement transaction is active. */ -SQLITE_PRIVATE int sqlite3BtreeIsInStmt(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeIsInStmt(Btree *p){ return (p->pBt && p->pBt->inStmt); } /* ** Return non-zero if a read (or write) transaction is active. */ -SQLITE_PRIVATE int sqlite3BtreeIsInReadTrans(Btree *p){ +STQLITE_PRIVATE int sqlite3BtreeIsInReadTrans(Btree *p){ return (p && (p->inTrans!=TRANS_NONE)); } @@ -29200,7 +29200,7 @@ SQLITE_PRIVATE int sqlite3BtreeIsInReadTrans(Btree *p){ ** blob of allocated memory. This function should not call sqliteFree() ** on the memory, the btree layer does that. */ -SQLITE_PRIVATE void *sqlite3BtreeSchema(Btree *p, int nBytes, void(*xFree)(void *)){ +STQLITE_PRIVATE void *sqlite3BtreeSchema(Btree *p, int nBytes, void(*xFree)(void *)){ BtShared *pBt = p->pBt; if( !pBt->pSchema ){ pBt->pSchema = sqliteMalloc(nBytes); @@ -29213,29 +29213,29 @@ SQLITE_PRIVATE void *sqlite3BtreeSchema(Btree *p, int nBytes, void(*xFree)(void ** Return true if another user of the same shared btree as the argument ** handle holds an exclusive lock on the sqlite_master table. */ -SQLITE_PRIVATE int sqlite3BtreeSchemaLocked(Btree *p){ - return (queryTableLock(p, MASTER_ROOT, READ_LOCK)!=SQLITE_OK); +STQLITE_PRIVATE int sqlite3BtreeSchemaLocked(Btree *p){ + return (queryTableLock(p, MASTER_ROOT, READ_LOCK)!=STQLITE_OK); } -#ifndef SQLITE_OMIT_SHARED_CACHE +#ifndef STQLITE_OMIT_SHARED_CACHE /* ** Obtain a lock on the table whose root page is iTab. The ** lock is a write lock if isWritelock is true or a read lock ** if it is false. */ -SQLITE_PRIVATE int sqlite3BtreeLockTable(Btree *p, int iTab, u8 isWriteLock){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3BtreeLockTable(Btree *p, int iTab, u8 isWriteLock){ + int rc = STQLITE_OK; u8 lockType = (isWriteLock?WRITE_LOCK:READ_LOCK); rc = queryTableLock(p, iTab, lockType); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = lockTable(p, iTab, lockType); } return rc; } #endif -#ifndef SQLITE_OMIT_INCRBLOB +#ifndef STQLITE_OMIT_INCRBLOB /* ** Argument pCsr must be a cursor opened for writing on an ** INTKEY table currently pointing at a valid table entry. @@ -29243,11 +29243,11 @@ SQLITE_PRIVATE int sqlite3BtreeLockTable(Btree *p, int iTab, u8 isWriteLock){ ** Only the data content may only be modified, it is not possible ** to change the length of the data stored. */ -SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void *z){ +STQLITE_PRIVATE int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void *z){ assert(pCsr->isIncrblobHandle); - if( pCsr->eState==CURSOR_REQUIRESEEK ){ - return SQLITE_ABORT; + if( pCsr->eState==CURSOR_RETQUIRESEEK ){ + return STQLITE_ABORT; } /* Check some preconditions: @@ -29256,15 +29256,15 @@ SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void ** (c) the cursor points at a valid row of an intKey table. */ if( !pCsr->wrFlag ){ - return SQLITE_READONLY; + return STQLITE_READONLY; } assert( !pCsr->pBtree->pBt->readOnly && pCsr->pBtree->pBt->inTransaction==TRANS_WRITE ); if( checkReadLocks(pCsr->pBtree, pCsr->pgnoRoot, pCsr) ){ - return SQLITE_LOCKED; /* The table pCur points to has a read lock */ + return STQLITE_LOCKED; /* The table pCur points to has a read lock */ } if( pCsr->eState==CURSOR_INVALID || !pCsr->pPage->intKey ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } return accessPayload(pCsr, offset, amt, (unsigned char *)z, 0, 1); @@ -29280,7 +29280,7 @@ SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void ** accessPayload() (the worker function for sqlite3BtreeData() and ** sqlite3BtreePutData()). */ -SQLITE_PRIVATE void sqlite3BtreeCacheOverflow(BtCursor *pCur){ +STQLITE_PRIVATE void sqlite3BtreeCacheOverflow(BtCursor *pCur){ assert(!pCur->isIncrblobHandle); assert(!pCur->aOverflow); pCur->isIncrblobHandle = 1; @@ -29326,44 +29326,44 @@ static FifoPage *allocateFifoPage(int nEntry){ /* ** Initialize a Fifo structure. */ -SQLITE_PRIVATE void sqlite3VdbeFifoInit(Fifo *pFifo){ +STQLITE_PRIVATE void sqlite3VdbeFifoInit(Fifo *pFifo){ memset(pFifo, 0, sizeof(*pFifo)); } /* -** Push a single 64-bit integer value into the Fifo. Return SQLITE_OK -** normally. SQLITE_NOMEM is returned if we are unable to allocate +** Push a single 64-bit integer value into the Fifo. Return STQLITE_OK +** normally. STQLITE_NOMEM is returned if we are unable to allocate ** memory. */ -SQLITE_PRIVATE int sqlite3VdbeFifoPush(Fifo *pFifo, i64 val){ +STQLITE_PRIVATE int sqlite3VdbeFifoPush(Fifo *pFifo, i64 val){ FifoPage *pPage; pPage = pFifo->pLast; if( pPage==0 ){ pPage = pFifo->pLast = pFifo->pFirst = allocateFifoPage(20); if( pPage==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } }else if( pPage->iWrite>=pPage->nSlot ){ pPage->pNext = allocateFifoPage(pFifo->nEntry); if( pPage->pNext==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } pPage = pFifo->pLast = pPage->pNext; } pPage->aSlot[pPage->iWrite++] = val; pFifo->nEntry++; - return SQLITE_OK; + return STQLITE_OK; } /* ** Extract a single 64-bit integer value from the Fifo. The integer ** extracted is the one least recently inserted. If the Fifo is empty -** return SQLITE_DONE. +** return STQLITE_DONE. */ -SQLITE_PRIVATE int sqlite3VdbeFifoPop(Fifo *pFifo, i64 *pVal){ +STQLITE_PRIVATE int sqlite3VdbeFifoPop(Fifo *pFifo, i64 *pVal){ FifoPage *pPage; if( pFifo->nEntry==0 ){ - return SQLITE_DONE; + return STQLITE_DONE; } assert( pFifo->nEntry>0 ); pPage = pFifo->pFirst; @@ -29386,14 +29386,14 @@ SQLITE_PRIVATE int sqlite3VdbeFifoPop(Fifo *pFifo, i64 *pVal){ }else{ assert( pFifo->nEntry>0 ); } - return SQLITE_OK; + return STQLITE_OK; } /* ** Delete all information from a Fifo object. Free all memory held ** by the Fifo. */ -SQLITE_PRIVATE void sqlite3VdbeFifoClear(Fifo *pFifo){ +STQLITE_PRIVATE void sqlite3VdbeFifoClear(Fifo *pFifo){ FifoPage *pPage, *pNextPage; for(pPage=pFifo->pFirst; pPage; pPage=pNextPage){ pNextPage = pPage->pNext; @@ -29431,33 +29431,33 @@ SQLITE_PRIVATE void sqlite3VdbeFifoClear(Fifo *pFifo){ /* ** If pMem is an object with a valid string representation, this routine ** ensures the internal encoding for the string representation is -** 'desiredEnc', one of SQLITE_UTF8, SQLITE_UTF16LE or SQLITE_UTF16BE. +** 'desiredEnc', one of STQLITE_UTF8, STQLITE_UTF16LE or STQLITE_UTF16BE. ** ** If pMem is not a string object, or the encoding of the string ** representation is already stored using the requested encoding, then this ** routine is a no-op. ** -** SQLITE_OK is returned if the conversion is successful (or not required). -** SQLITE_NOMEM may be returned if a malloc() fails during conversion +** STQLITE_OK is returned if the conversion is successful (or not required). +** STQLITE_NOMEM may be returned if a malloc() fails during conversion ** between formats. */ -SQLITE_PRIVATE int sqlite3VdbeChangeEncoding(Mem *pMem, int desiredEnc){ +STQLITE_PRIVATE int sqlite3VdbeChangeEncoding(Mem *pMem, int desiredEnc){ int rc; if( !(pMem->flags&MEM_Str) || pMem->enc==desiredEnc ){ - return SQLITE_OK; + return STQLITE_OK; } -#ifdef SQLITE_OMIT_UTF16 - return SQLITE_ERROR; +#ifdef STQLITE_OMIT_UTF16 + return STQLITE_ERROR; #else - /* MemTranslate() may return SQLITE_OK or SQLITE_NOMEM. If NOMEM is returned, + /* MemTranslate() may return STQLITE_OK or STQLITE_NOMEM. If NOMEM is returned, ** then the encoding of the value may not have changed. */ rc = sqlite3VdbeMemTranslate(pMem, desiredEnc); - assert(rc==SQLITE_OK || rc==SQLITE_NOMEM); - assert(rc==SQLITE_OK || pMem->enc!=desiredEnc); - assert(rc==SQLITE_NOMEM || pMem->enc==desiredEnc); + assert(rc==STQLITE_OK || rc==STQLITE_NOMEM); + assert(rc==STQLITE_OK || pMem->enc!=desiredEnc); + assert(rc==STQLITE_NOMEM || pMem->enc==desiredEnc); return rc; #endif } @@ -29465,21 +29465,21 @@ SQLITE_PRIVATE int sqlite3VdbeChangeEncoding(Mem *pMem, int desiredEnc){ /* ** Make the given Mem object MEM_Dyn. ** -** Return SQLITE_OK on success or SQLITE_NOMEM if malloc fails. +** Return STQLITE_OK on success or STQLITE_NOMEM if malloc fails. */ -SQLITE_PRIVATE int sqlite3VdbeMemDynamicify(Mem *pMem){ +STQLITE_PRIVATE int sqlite3VdbeMemDynamicify(Mem *pMem){ int n; u8 *z; expandBlob(pMem); if( (pMem->flags & (MEM_Ephem|MEM_Static|MEM_Short))==0 ){ - return SQLITE_OK; + return STQLITE_OK; } assert( (pMem->flags & MEM_Dyn)==0 ); n = pMem->n; assert( pMem->flags & (MEM_Str|MEM_Blob) ); z = sqliteMallocRaw( n+2 ); if( z==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } pMem->flags |= MEM_Dyn|MEM_Term; pMem->xDel = 0; @@ -29488,15 +29488,15 @@ SQLITE_PRIVATE int sqlite3VdbeMemDynamicify(Mem *pMem){ z[n+1] = 0; pMem->z = (char*)z; pMem->flags &= ~(MEM_Ephem|MEM_Static|MEM_Short); - return SQLITE_OK; + return STQLITE_OK; } /* ** If the given Mem* has a zero-filled tail, turn it into an ordinary ** blob stored in dynamically allocated space. */ -#ifndef SQLITE_OMIT_INCRBLOB -SQLITE_PRIVATE int sqlite3VdbeMemExpandBlob(Mem *pMem){ +#ifndef STQLITE_OMIT_INCRBLOB +STQLITE_PRIVATE int sqlite3VdbeMemExpandBlob(Mem *pMem){ if( pMem->flags & MEM_Zero ){ char *pNew; int nByte; @@ -29505,7 +29505,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemExpandBlob(Mem *pMem){ if( nByte<=0 ) nByte = 1; pNew = sqliteMalloc(nByte); if( pNew==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } memcpy(pNew, pMem->z, pMem->n); memset(&pNew[pMem->n], 0, pMem->u.i); @@ -29516,7 +29516,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemExpandBlob(Mem *pMem){ pMem->flags &= ~(MEM_Zero|MEM_Static|MEM_Ephem|MEM_Short|MEM_Term); pMem->flags |= MEM_Dyn; } - return SQLITE_OK; + return STQLITE_OK; } #endif @@ -29525,14 +29525,14 @@ SQLITE_PRIVATE int sqlite3VdbeMemExpandBlob(Mem *pMem){ ** Make the given Mem object either MEM_Short or MEM_Dyn so that bytes ** of the Mem.z[] array can be modified. ** -** Return SQLITE_OK on success or SQLITE_NOMEM if malloc fails. +** Return STQLITE_OK on success or STQLITE_NOMEM if malloc fails. */ -SQLITE_PRIVATE int sqlite3VdbeMemMakeWriteable(Mem *pMem){ +STQLITE_PRIVATE int sqlite3VdbeMemMakeWriteable(Mem *pMem){ int n; u8 *z; expandBlob(pMem); if( (pMem->flags & (MEM_Ephem|MEM_Static))==0 ){ - return SQLITE_OK; + return STQLITE_OK; } assert( (pMem->flags & MEM_Dyn)==0 ); assert( pMem->flags & (MEM_Str|MEM_Blob) ); @@ -29542,7 +29542,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemMakeWriteable(Mem *pMem){ }else{ z = sqliteMallocRaw( n+2 ); if( z==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } pMem->flags |= MEM_Dyn|MEM_Term; pMem->xDel = 0; @@ -29553,15 +29553,15 @@ SQLITE_PRIVATE int sqlite3VdbeMemMakeWriteable(Mem *pMem){ pMem->z = (char*)z; pMem->flags &= ~(MEM_Ephem|MEM_Static); assert(0==(1&(int)pMem->z)); - return SQLITE_OK; + return STQLITE_OK; } /* ** Make sure the given Mem is \u0000 terminated. */ -SQLITE_PRIVATE int sqlite3VdbeMemNulTerminate(Mem *pMem){ +STQLITE_PRIVATE int sqlite3VdbeMemNulTerminate(Mem *pMem){ if( (pMem->flags & MEM_Term)!=0 || (pMem->flags & MEM_Str)==0 ){ - return SQLITE_OK; /* Nothing to do */ + return STQLITE_OK; /* Nothing to do */ } if( pMem->flags & (MEM_Static|MEM_Ephem) ){ return sqlite3VdbeMemMakeWriteable(pMem); @@ -29570,7 +29570,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemNulTerminate(Mem *pMem){ sqlite3VdbeMemExpandBlob(pMem); z = sqliteMalloc(pMem->n+2); - if( !z ) return SQLITE_NOMEM; + if( !z ) return STQLITE_NOMEM; memcpy(z, pMem->z, pMem->n); z[pMem->n] = 0; z[pMem->n+1] = 0; @@ -29583,7 +29583,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemNulTerminate(Mem *pMem){ pMem->z = z; pMem->flags |= MEM_Term; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -29591,7 +29591,7 @@ SQLITE_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* invalidated. +** Existing representations MEM_Int and MEM_Real are *not* tqinvalidated. ** ** 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 @@ -29599,8 +29599,8 @@ SQLITE_PRIVATE int sqlite3VdbeMemNulTerminate(Mem *pMem){ ** keys are strings. In the former case a NULL pointer is returned the ** user and the later is an internal programming error. */ -SQLITE_PRIVATE int sqlite3VdbeMemStringify(Mem *pMem, int enc){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3VdbeMemStringify(Mem *pMem, int enc){ + int rc = STQLITE_OK; int fg = pMem->flags; char *z = pMem->zShort; @@ -29622,7 +29622,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemStringify(Mem *pMem, int enc){ } pMem->n = strlen(z); pMem->z = z; - pMem->enc = SQLITE_UTF8; + pMem->enc = STQLITE_UTF8; pMem->flags |= MEM_Str | MEM_Short | MEM_Term; sqlite3VdbeChangeEncoding(pMem, enc); return rc; @@ -29633,11 +29633,11 @@ SQLITE_PRIVATE int sqlite3VdbeMemStringify(Mem *pMem, int enc){ ** This routine calls the finalize method for that function. The ** result of the aggregate is stored back into pMem. ** -** Return SQLITE_ERROR if the finalizer reports an error. SQLITE_OK +** Return STQLITE_ERROR if the finalizer reports an error. STQLITE_OK ** otherwise. */ -SQLITE_PRIVATE int sqlite3VdbeMemFinalize(Mem *pMem, FuncDef *pFunc){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3VdbeMemFinalize(Mem *pMem, FuncDef *pFunc){ + int rc = STQLITE_OK; if( pFunc && pFunc->xFinalize ){ sqlite3_context ctx; assert( (pMem->flags & MEM_Null)!=0 || pFunc==pMem->u.pDef ); @@ -29655,7 +29655,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemFinalize(Mem *pMem, FuncDef *pFunc){ pMem->z = pMem->zShort; } if( ctx.isError ){ - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } } return rc; @@ -29664,9 +29664,9 @@ SQLITE_PRIVATE int sqlite3VdbeMemFinalize(Mem *pMem, FuncDef *pFunc){ /* ** Release any memory held by the Mem. This may leave the Mem in an ** inconsistent state, for example with (Mem.z==0) and -** (Mem.type==SQLITE_TEXT). +** (Mem.type==STQLITE_TEXT). */ -SQLITE_PRIVATE void sqlite3VdbeMemRelease(Mem *p){ +STQLITE_PRIVATE void sqlite3VdbeMemRelease(Mem *p){ if( p->flags & (MEM_Dyn|MEM_Agg) ){ if( p->xDel ){ if( p->flags & MEM_Agg ){ @@ -29694,7 +29694,7 @@ SQLITE_PRIVATE void sqlite3VdbeMemRelease(Mem *p){ ** ** If pMem is a string, its encoding might be changed. */ -SQLITE_PRIVATE i64 sqlite3VdbeIntValue(Mem *pMem){ +STQLITE_PRIVATE i64 sqlite3VdbeIntValue(Mem *pMem){ int flags = pMem->flags; if( flags & MEM_Int ){ return pMem->u.i; @@ -29703,7 +29703,7 @@ SQLITE_PRIVATE i64 sqlite3VdbeIntValue(Mem *pMem){ }else if( flags & (MEM_Str|MEM_Blob) ){ i64 value; pMem->flags |= MEM_Str; - if( sqlite3VdbeChangeEncoding(pMem, SQLITE_UTF8) + if( sqlite3VdbeChangeEncoding(pMem, STQLITE_UTF8) || sqlite3VdbeMemNulTerminate(pMem) ){ return 0; } @@ -29721,7 +29721,7 @@ SQLITE_PRIVATE i64 sqlite3VdbeIntValue(Mem *pMem){ ** value. If it is a string or blob, try to convert it to a double. ** If it is a NULL, return 0.0. */ -SQLITE_PRIVATE double sqlite3VdbeRealValue(Mem *pMem){ +STQLITE_PRIVATE double sqlite3VdbeRealValue(Mem *pMem){ if( pMem->flags & MEM_Real ){ return pMem->r; }else if( pMem->flags & MEM_Int ){ @@ -29729,7 +29729,7 @@ SQLITE_PRIVATE double sqlite3VdbeRealValue(Mem *pMem){ }else if( pMem->flags & (MEM_Str|MEM_Blob) ){ double val = 0.0; pMem->flags |= MEM_Str; - if( sqlite3VdbeChangeEncoding(pMem, SQLITE_UTF8) + if( sqlite3VdbeChangeEncoding(pMem, STQLITE_UTF8) || sqlite3VdbeMemNulTerminate(pMem) ){ return 0.0; } @@ -29745,7 +29745,7 @@ SQLITE_PRIVATE double sqlite3VdbeRealValue(Mem *pMem){ ** The MEM structure is already a MEM_Real. Try to also make it a ** MEM_Int if we can. */ -SQLITE_PRIVATE void sqlite3VdbeIntegerAffinity(Mem *pMem){ +STQLITE_PRIVATE void sqlite3VdbeIntegerAffinity(Mem *pMem){ assert( pMem->flags & MEM_Real ); pMem->u.i = pMem->r; if( ((double)pMem->u.i)==pMem->r ){ @@ -29756,29 +29756,29 @@ SQLITE_PRIVATE void sqlite3VdbeIntegerAffinity(Mem *pMem){ /* ** Convert pMem to type integer. Invalidate any prior representations. */ -SQLITE_PRIVATE int sqlite3VdbeMemIntegerify(Mem *pMem){ +STQLITE_PRIVATE int sqlite3VdbeMemIntegerify(Mem *pMem){ pMem->u.i = sqlite3VdbeIntValue(pMem); sqlite3VdbeMemRelease(pMem); pMem->flags = MEM_Int; - return SQLITE_OK; + return STQLITE_OK; } /* ** Convert pMem so that it is of type MEM_Real. ** Invalidate any prior representations. */ -SQLITE_PRIVATE int sqlite3VdbeMemRealify(Mem *pMem){ +STQLITE_PRIVATE int sqlite3VdbeMemRealify(Mem *pMem){ pMem->r = sqlite3VdbeRealValue(pMem); sqlite3VdbeMemRelease(pMem); pMem->flags = MEM_Real; - return SQLITE_OK; + return STQLITE_OK; } /* ** Convert pMem so that it has types MEM_Real or MEM_Int or both. ** Invalidate any prior representations. */ -SQLITE_PRIVATE int sqlite3VdbeMemNumerify(Mem *pMem){ +STQLITE_PRIVATE int sqlite3VdbeMemNumerify(Mem *pMem){ double r1, r2; i64 i; assert( (pMem->flags & (MEM_Int|MEM_Real|MEM_Null))==0 ); @@ -29793,16 +29793,16 @@ SQLITE_PRIVATE int sqlite3VdbeMemNumerify(Mem *pMem){ pMem->flags = MEM_Real; sqlite3VdbeMemRelease(pMem); } - return SQLITE_OK; + return STQLITE_OK; } /* ** Delete any previous value and set the value stored in *pMem to NULL. */ -SQLITE_PRIVATE void sqlite3VdbeMemSetNull(Mem *pMem){ +STQLITE_PRIVATE void sqlite3VdbeMemSetNull(Mem *pMem){ sqlite3VdbeMemRelease(pMem); pMem->flags = MEM_Null; - pMem->type = SQLITE_NULL; + pMem->type = STQLITE_NULL; pMem->n = 0; } @@ -29810,54 +29810,54 @@ SQLITE_PRIVATE void sqlite3VdbeMemSetNull(Mem *pMem){ ** Delete any previous value and set the value to be a BLOB of length ** n containing all zeros. */ -SQLITE_PRIVATE void sqlite3VdbeMemSetZeroBlob(Mem *pMem, int n){ +STQLITE_PRIVATE void sqlite3VdbeMemSetZeroBlob(Mem *pMem, int n){ sqlite3VdbeMemRelease(pMem); pMem->flags = MEM_Blob|MEM_Zero|MEM_Short; - pMem->type = SQLITE_BLOB; + pMem->type = STQLITE_BLOB; pMem->n = 0; if( n<0 ) n = 0; pMem->u.i = n; pMem->z = pMem->zShort; - pMem->enc = SQLITE_UTF8; + pMem->enc = STQLITE_UTF8; } /* ** Delete any previous value and set the value stored in *pMem to val, ** manifest type INTEGER. */ -SQLITE_PRIVATE void sqlite3VdbeMemSetInt64(Mem *pMem, i64 val){ +STQLITE_PRIVATE void sqlite3VdbeMemSetInt64(Mem *pMem, i64 val){ sqlite3VdbeMemRelease(pMem); pMem->u.i = val; pMem->flags = MEM_Int; - pMem->type = SQLITE_INTEGER; + pMem->type = STQLITE_INTEGER; } /* ** Delete any previous value and set the value stored in *pMem to val, ** manifest type REAL. */ -SQLITE_PRIVATE void sqlite3VdbeMemSetDouble(Mem *pMem, double val){ +STQLITE_PRIVATE void sqlite3VdbeMemSetDouble(Mem *pMem, double val){ if( sqlite3_isnan(val) ){ sqlite3VdbeMemSetNull(pMem); }else{ sqlite3VdbeMemRelease(pMem); pMem->r = val; pMem->flags = MEM_Real; - pMem->type = SQLITE_FLOAT; + pMem->type = STQLITE_FLOAT; } } /* ** Return true if the Mem object contains a TEXT or BLOB that is -** too large - whose size exceeds SQLITE_MAX_LENGTH. +** too large - whose size exceeds STQLITE_MAX_LENGTH. */ -SQLITE_PRIVATE int sqlite3VdbeMemTooBig(Mem *p){ +STQLITE_PRIVATE int sqlite3VdbeMemTooBig(Mem *p){ if( p->flags & (MEM_Str|MEM_Blob) ){ int n = p->n; if( p->flags & MEM_Zero ){ n += p->u.i; } - return n>SQLITE_MAX_LENGTH; + return n>STQLITE_MAX_LENGTH; } return 0; } @@ -29868,7 +29868,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemTooBig(Mem *p){ ** pFrom->z is used, then pTo->z points to the same thing as pFrom->z ** and flags gets srcType (either MEM_Ephem or MEM_Static). */ -SQLITE_PRIVATE void sqlite3VdbeMemShallowCopy(Mem *pTo, const Mem *pFrom, int srcType){ +STQLITE_PRIVATE void sqlite3VdbeMemShallowCopy(Mem *pTo, const Mem *pFrom, int srcType){ memcpy(pTo, pFrom, sizeof(*pFrom)-sizeof(pFrom->zShort)); pTo->xDel = 0; if( pTo->flags & (MEM_Str|MEM_Blob) ){ @@ -29882,7 +29882,7 @@ SQLITE_PRIVATE void sqlite3VdbeMemShallowCopy(Mem *pTo, const Mem *pFrom, int sr ** Make a full copy of pFrom into pTo. Prior contents of pTo are ** freed before the copy is made. */ -SQLITE_PRIVATE int sqlite3VdbeMemCopy(Mem *pTo, const Mem *pFrom){ +STQLITE_PRIVATE int sqlite3VdbeMemCopy(Mem *pTo, const Mem *pFrom){ int rc; if( pTo->flags & MEM_Dyn ){ sqlite3VdbeMemRelease(pTo); @@ -29891,7 +29891,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemCopy(Mem *pTo, const Mem *pFrom){ if( pTo->flags & MEM_Ephem ){ rc = sqlite3VdbeMemMakeWriteable(pTo); }else{ - rc = SQLITE_OK; + rc = STQLITE_OK; } return rc; } @@ -29900,11 +29900,11 @@ SQLITE_PRIVATE int sqlite3VdbeMemCopy(Mem *pTo, const Mem *pFrom){ ** Transfer the contents of pFrom to pTo. Any existing value in pTo is ** freed. If pFrom contains ephemeral data, a copy is made. ** -** pFrom contains an SQL NULL when this routine returns. SQLITE_NOMEM +** pFrom contains an SQL NULL when this routine returns. STQLITE_NOMEM ** might be returned if pFrom held ephemeral data and we were unable ** to allocate enough space to make a copy. */ -SQLITE_PRIVATE int sqlite3VdbeMemMove(Mem *pTo, Mem *pFrom){ +STQLITE_PRIVATE int sqlite3VdbeMemMove(Mem *pTo, Mem *pFrom){ int rc; if( pTo->flags & MEM_Dyn ){ sqlite3VdbeMemRelease(pTo); @@ -29918,7 +29918,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemMove(Mem *pTo, Mem *pFrom){ if( pTo->flags & MEM_Ephem ){ rc = sqlite3VdbeMemMakeWriteable(pTo); }else{ - rc = SQLITE_OK; + rc = STQLITE_OK; } return rc; } @@ -29926,7 +29926,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemMove(Mem *pTo, Mem *pFrom){ /* ** Change the value of a Mem to be a string or a BLOB. */ -SQLITE_PRIVATE int sqlite3VdbeMemSetStr( +STQLITE_PRIVATE int sqlite3VdbeMemSetStr( Mem *pMem, /* Memory cell to set to string value */ const char *z, /* String pointer */ int n, /* Bytes in string, or negative */ @@ -29936,14 +29936,14 @@ SQLITE_PRIVATE int sqlite3VdbeMemSetStr( sqlite3VdbeMemRelease(pMem); if( !z ){ pMem->flags = MEM_Null; - pMem->type = SQLITE_NULL; - return SQLITE_OK; + pMem->type = STQLITE_NULL; + return STQLITE_OK; } pMem->z = (char *)z; - if( xDel==SQLITE_STATIC ){ + if( xDel==STQLITE_STATIC ){ pMem->flags = MEM_Static; - }else if( xDel==SQLITE_TRANSIENT ){ + }else if( xDel==STQLITE_TRANSIENT ){ pMem->flags = MEM_Ephem; }else{ pMem->flags = MEM_Dyn; @@ -29951,18 +29951,18 @@ SQLITE_PRIVATE int sqlite3VdbeMemSetStr( } pMem->enc = enc; - pMem->type = enc==0 ? SQLITE_BLOB : SQLITE_TEXT; + pMem->type = enc==0 ? STQLITE_BLOB : STQLITE_TEXT; pMem->n = n; - assert( enc==0 || enc==SQLITE_UTF8 || enc==SQLITE_UTF16LE - || enc==SQLITE_UTF16BE ); + assert( enc==0 || enc==STQLITE_UTF8 || enc==STQLITE_UTF16LE + || enc==STQLITE_UTF16BE ); switch( enc ){ case 0: pMem->flags |= MEM_Blob; - pMem->enc = SQLITE_UTF8; + pMem->enc = STQLITE_UTF8; break; - case SQLITE_UTF8: + case STQLITE_UTF8: pMem->flags |= MEM_Str; if( n<0 ){ pMem->n = strlen(z); @@ -29970,23 +29970,23 @@ SQLITE_PRIVATE int sqlite3VdbeMemSetStr( } break; -#ifndef SQLITE_OMIT_UTF16 - case SQLITE_UTF16LE: - case SQLITE_UTF16BE: +#ifndef STQLITE_OMIT_UTF16 + case STQLITE_UTF16LE: + case STQLITE_UTF16BE: pMem->flags |= MEM_Str; if( pMem->n<0 ){ pMem->n = sqlite3Utf16ByteLen(pMem->z,-1); pMem->flags |= MEM_Term; } if( sqlite3VdbeMemHandleBom(pMem) ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ } if( pMem->flags&MEM_Ephem ){ return sqlite3VdbeMemMakeWriteable(pMem); } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -29998,7 +29998,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemSetStr( ** ** Two NULL values are considered equal by this function. */ -SQLITE_PRIVATE int sqlite3MemCompare(const Mem *pMem1, const Mem *pMem2, const CollSeq *pColl){ +STQLITE_PRIVATE int sqlite3MemCompare(const Mem *pMem1, const Mem *pMem2, const CollSeq *pColl){ int rc; int f1, f2; int combined_flags; @@ -30064,8 +30064,8 @@ SQLITE_PRIVATE int sqlite3MemCompare(const Mem *pMem1, const Mem *pMem2, const C } assert( pMem1->enc==pMem2->enc ); - assert( pMem1->enc==SQLITE_UTF8 || - pMem1->enc==SQLITE_UTF16LE || pMem1->enc==SQLITE_UTF16BE ); + assert( pMem1->enc==STQLITE_UTF8 || + pMem1->enc==STQLITE_UTF16LE || pMem1->enc==STQLITE_UTF16BE ); /* The collation sequence must be defined at this point, even if ** the user deletes the collation sequence after the vdbe program is @@ -30123,7 +30123,7 @@ SQLITE_PRIVATE int sqlite3MemCompare(const Mem *pMem1, const Mem *pMem2, const C ** If this routine fails for any reason (malloc returns NULL or unable ** to read from the disk) then the pMem is left in an inconsistent state. */ -SQLITE_PRIVATE int sqlite3VdbeMemFromBtree( +STQLITE_PRIVATE int sqlite3VdbeMemFromBtree( BtCursor *pCur, /* Cursor pointing at record to retrieve. */ int offset, /* Offset from the start of data to return bytes from. */ int amt, /* Number of bytes to return. */ @@ -30149,7 +30149,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemFromBtree( if( amt>NBFS-2 ){ zData = (char *)sqliteMallocRaw(amt+2); if( !zData ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } pMem->flags = MEM_Blob|MEM_Dyn|MEM_Term; pMem->xDel = 0; @@ -30159,7 +30159,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemFromBtree( } pMem->z = zData; pMem->enc = 0; - pMem->type = SQLITE_BLOB; + pMem->type = STQLITE_BLOB; if( key ){ rc = sqlite3BtreeKey(pCur, offset, amt, zData); @@ -30168,7 +30168,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemFromBtree( } zData[amt] = 0; zData[amt+1] = 0; - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ if( amt>NBFS-2 ){ assert( zData!=pMem->zShort ); assert( pMem->flags & MEM_Dyn ); @@ -30181,7 +30181,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemFromBtree( } } - return SQLITE_OK; + return STQLITE_OK; } #ifndef NDEBUG @@ -30189,7 +30189,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemFromBtree( ** Perform various checks on the memory cell pMem. An assert() will ** fail if pMem is internally inconsistent. */ -SQLITE_PRIVATE void sqlite3VdbeMemSanity(Mem *pMem){ +STQLITE_PRIVATE void sqlite3VdbeMemSanity(Mem *pMem){ int flags = pMem->flags; assert( flags!=0 ); /* Must define some type */ if( flags & (MEM_Str|MEM_Blob) ){ @@ -30204,9 +30204,9 @@ SQLITE_PRIVATE void sqlite3VdbeMemSanity(Mem *pMem){ assert( pMem->xDel==0 || (pMem->flags & MEM_Dyn)!=0 ); if( (flags & MEM_Str) ){ - assert( pMem->enc==SQLITE_UTF8 || - pMem->enc==SQLITE_UTF16BE || - pMem->enc==SQLITE_UTF16LE + assert( pMem->enc==STQLITE_UTF8 || + pMem->enc==STQLITE_UTF16BE || + pMem->enc==STQLITE_UTF16LE ); /* If the string is UTF-8 encoded and nul terminated, then pMem->n ** must be the length of the string. (Later:) If the database file @@ -30214,7 +30214,7 @@ SQLITE_PRIVATE void sqlite3VdbeMemSanity(Mem *pMem){ ** into the middle of the string. In that case, the strlen() might ** be less. */ - if( pMem->enc==SQLITE_UTF8 && (flags & MEM_Term) ){ + if( pMem->enc==STQLITE_UTF8 && (flags & MEM_Term) ){ assert( strlen(pMem->z)<=pMem->n ); assert( pMem->z[pMem->n]==0 ); } @@ -30236,16 +30236,16 @@ SQLITE_PRIVATE void sqlite3VdbeMemSanity(Mem *pMem){ /* This function is only available internally, it is not part of the ** external API. It works in a similar way to sqlite3_value_text(), ** except the data returned is in the encoding specified by the second -** parameter, which must be one of SQLITE_UTF16BE, SQLITE_UTF16LE or -** SQLITE_UTF8. +** parameter, which must be one of STQLITE_UTF16BE, STQLITE_UTF16LE or +** STQLITE_UTF8. ** -** (2006-02-16:) The enc value can be or-ed with SQLITE_UTF16_ALIGNED. +** (2006-02-16:) The enc value can be or-ed with STQLITE_UTF16_ALIGNED. ** If that is the case, then the result must be aligned on an even byte ** boundary. */ -SQLITE_PRIVATE const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){ +STQLITE_PRIVATE const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){ if( !pVal ) return 0; - assert( (enc&3)==(enc&~SQLITE_UTF16_ALIGNED) ); + assert( (enc&3)==(enc&~STQLITE_UTF16_ALIGNED) ); if( pVal->flags&MEM_Null ){ return 0; @@ -30254,10 +30254,10 @@ SQLITE_PRIVATE const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){ pVal->flags |= (pVal->flags & MEM_Blob)>>3; expandBlob(pVal); if( pVal->flags&MEM_Str ){ - sqlite3VdbeChangeEncoding(pVal, enc & ~SQLITE_UTF16_ALIGNED); - if( (enc & SQLITE_UTF16_ALIGNED)!=0 && 1==(1&(int)pVal->z) ){ + sqlite3VdbeChangeEncoding(pVal, enc & ~STQLITE_UTF16_ALIGNED); + if( (enc & STQLITE_UTF16_ALIGNED)!=0 && 1==(1&(int)pVal->z) ){ assert( (pVal->flags & (MEM_Ephem|MEM_Static))!=0 ); - if( sqlite3VdbeMemMakeWriteable(pVal)!=SQLITE_OK ){ + if( sqlite3VdbeMemMakeWriteable(pVal)!=STQLITE_OK ){ return 0; } } @@ -30267,8 +30267,8 @@ SQLITE_PRIVATE const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){ sqlite3VdbeMemStringify(pVal, enc); assert( 0==(1&(int)pVal->z) ); } - assert(pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) || sqlite3MallocFailed() ); - if( pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) ){ + assert(pVal->enc==(enc & ~STQLITE_UTF16_ALIGNED) || sqlite3MallocFailed() ); + if( pVal->enc==(enc & ~STQLITE_UTF16_ALIGNED) ){ return pVal->z; }else{ return 0; @@ -30278,11 +30278,11 @@ SQLITE_PRIVATE const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){ /* ** Create a new sqlite3_value object. */ -SQLITE_PRIVATE sqlite3_value *sqlite3ValueNew(void){ +STQLITE_PRIVATE sqlite3_value *sqlite3ValueNew(void){ Mem *p = sqliteMalloc(sizeof(*p)); if( p ){ p->flags = MEM_Null; - p->type = SQLITE_NULL; + p->type = STQLITE_NULL; } return p; } @@ -30297,7 +30297,7 @@ SQLITE_PRIVATE sqlite3_value *sqlite3ValueNew(void){ ** the value by passing it to sqlite3ValueFree() later on. If the expression ** cannot be converted to a value, then *ppVal is set to NULL. */ -SQLITE_PRIVATE int sqlite3ValueFromExpr( +STQLITE_PRIVATE int sqlite3ValueFromExpr( Expr *pExpr, u8 enc, u8 affinity, @@ -30309,7 +30309,7 @@ SQLITE_PRIVATE int sqlite3ValueFromExpr( if( !pExpr ){ *ppVal = 0; - return SQLITE_OK; + return STQLITE_OK; } op = pExpr->op; @@ -30318,19 +30318,19 @@ SQLITE_PRIVATE int sqlite3ValueFromExpr( pVal = sqlite3ValueNew(); if( !zVal || !pVal ) goto no_mem; sqlite3Dequote(zVal); - sqlite3ValueSetStr(pVal, -1, zVal, SQLITE_UTF8, sqlite3FreeX); - if( (op==TK_INTEGER || op==TK_FLOAT ) && affinity==SQLITE_AFF_NONE ){ - sqlite3ValueApplyAffinity(pVal, SQLITE_AFF_NUMERIC, enc); + sqlite3ValueSetStr(pVal, -1, zVal, STQLITE_UTF8, sqlite3FreeX); + if( (op==TK_INTEGER || op==TK_FLOAT ) && affinity==STQLITE_AFF_NONE ){ + sqlite3ValueApplyAffinity(pVal, STQLITE_AFF_NUMERIC, enc); }else{ sqlite3ValueApplyAffinity(pVal, affinity, enc); } }else if( op==TK_UMINUS ) { - if( SQLITE_OK==sqlite3ValueFromExpr(pExpr->pLeft, enc, affinity, &pVal) ){ + if( STQLITE_OK==sqlite3ValueFromExpr(pExpr->pLeft, enc, affinity, &pVal) ){ pVal->u.i = -1 * pVal->u.i; pVal->r = -1.0 * pVal->r; } } -#ifndef SQLITE_OMIT_BLOB_LITERAL +#ifndef STQLITE_OMIT_BLOB_LITERAL else if( op==TK_BLOB ){ int nVal; pVal = sqlite3ValueNew(); @@ -30344,19 +30344,19 @@ SQLITE_PRIVATE int sqlite3ValueFromExpr( #endif *ppVal = pVal; - return SQLITE_OK; + return STQLITE_OK; no_mem: sqliteFree(zVal); sqlite3ValueFree(pVal); *ppVal = 0; - return SQLITE_NOMEM; + return STQLITE_NOMEM; } /* ** Change the string value of an sqlite3_value object */ -SQLITE_PRIVATE void sqlite3ValueSetStr( +STQLITE_PRIVATE void sqlite3ValueSetStr( sqlite3_value *v, int n, const void *z, @@ -30369,9 +30369,9 @@ SQLITE_PRIVATE void sqlite3ValueSetStr( /* ** Free an sqlite3_value object */ -SQLITE_PRIVATE void sqlite3ValueFree(sqlite3_value *v){ +STQLITE_PRIVATE void sqlite3ValueFree(sqlite3_value *v){ if( !v ) return; - sqlite3ValueSetStr(v, 0, 0, SQLITE_UTF8, SQLITE_STATIC); + sqlite3ValueSetStr(v, 0, 0, STQLITE_UTF8, STQLITE_STATIC); sqliteFree(v); } @@ -30379,7 +30379,7 @@ SQLITE_PRIVATE void sqlite3ValueFree(sqlite3_value *v){ ** Return the number of bytes in the sqlite3_value object assuming ** that it uses the encoding "enc" */ -SQLITE_PRIVATE int sqlite3ValueBytes(sqlite3_value *pVal, u8 enc){ +STQLITE_PRIVATE int sqlite3ValueBytes(sqlite3_value *pVal, u8 enc){ Mem *p = (Mem*)pVal; if( (p->flags & MEM_Blob)!=0 || sqlite3ValueText(pVal, enc) ){ if( p->flags & MEM_Zero ){ @@ -30416,7 +30416,7 @@ SQLITE_PRIVATE int sqlite3ValueBytes(sqlite3_value *pVal, u8 enc){ ** set the sqlite3_vdbe_addop_trace to 1 and all opcodes will be printed ** as they are added to the instruction stream. */ -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG int sqlite3_vdbe_addop_trace = 0; #endif @@ -30424,7 +30424,7 @@ int sqlite3_vdbe_addop_trace = 0; /* ** Create a new virtual database engine. */ -SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(sqlite3 *db){ +STQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(sqlite3 *db){ Vdbe *p; p = sqliteMalloc( sizeof(Vdbe) ); if( p==0 ) return 0; @@ -30442,7 +30442,7 @@ SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(sqlite3 *db){ /* ** Remember the SQL string for a prepared statement. */ -SQLITE_PRIVATE void sqlite3VdbeSetSql(Vdbe *p, const char *z, int n){ +STQLITE_PRIVATE void sqlite3VdbeSetSql(Vdbe *p, const char *z, int n){ if( p==0 ) return; assert( p->zSql==0 ); p->zSql = sqlite3StrNDup(z, n); @@ -30451,14 +30451,14 @@ SQLITE_PRIVATE void sqlite3VdbeSetSql(Vdbe *p, const char *z, int n){ /* ** Return the SQL associated with a prepared statement */ -SQLITE_PRIVATE const char *sqlite3VdbeGetSql(Vdbe *p){ +STQLITE_PRIVATE const char *sqlite3VdbeGetSql(Vdbe *p){ return p->zSql; } /* ** Swap all content between two VDBE structures. */ -SQLITE_PRIVATE void sqlite3VdbeSwap(Vdbe *pA, Vdbe *pB){ +STQLITE_PRIVATE void sqlite3VdbeSwap(Vdbe *pA, Vdbe *pB){ Vdbe tmp, *pTmp; char *zTmp; int nTmp; @@ -30479,11 +30479,11 @@ SQLITE_PRIVATE void sqlite3VdbeSwap(Vdbe *pA, Vdbe *pB){ pB->nSql = nTmp; } -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG /* ** Turn tracing on or off */ -SQLITE_PRIVATE void sqlite3VdbeTrace(Vdbe *p, FILE *trace){ +STQLITE_PRIVATE void sqlite3VdbeTrace(Vdbe *p, FILE *trace){ p->trace = trace; } #endif @@ -30533,7 +30533,7 @@ static void resizeOpArray(Vdbe *p, int N){ ** the sqlite3VdbeChangeP3() function to change the value of the P3 ** operand. */ -SQLITE_PRIVATE int sqlite3VdbeAddOp(Vdbe *p, int op, int p1, int p2){ +STQLITE_PRIVATE int sqlite3VdbeAddOp(Vdbe *p, int op, int p1, int p2){ int i; VdbeOp *pOp; @@ -30553,7 +30553,7 @@ SQLITE_PRIVATE int sqlite3VdbeAddOp(Vdbe *p, int op, int p1, int p2){ pOp->p3 = 0; pOp->p3type = P3_NOTUSED; p->expired = 0; -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG if( sqlite3_vdbe_addop_trace ) sqlite3VdbePrintOp(0, i, &p->aOp[i]); #endif return i; @@ -30562,7 +30562,7 @@ SQLITE_PRIVATE int sqlite3VdbeAddOp(Vdbe *p, int op, int p1, int p2){ /* ** Add an opcode that includes the p3 value. */ -SQLITE_PRIVATE int sqlite3VdbeOp3(Vdbe *p, int op, int p1, int p2, const char *zP3,int p3type){ +STQLITE_PRIVATE int sqlite3VdbeOp3(Vdbe *p, int op, int p1, int p2, const char *zP3,int p3type){ int addr = sqlite3VdbeAddOp(p, op, p1, p2); sqlite3VdbeChangeP3(p, addr, zP3, p3type); return addr; @@ -30582,7 +30582,7 @@ SQLITE_PRIVATE int sqlite3VdbeOp3(Vdbe *p, int op, int p1, int p2, const char *z ** ** Zero is returned if a malloc() fails. */ -SQLITE_PRIVATE int sqlite3VdbeMakeLabel(Vdbe *p){ +STQLITE_PRIVATE int sqlite3VdbeMakeLabel(Vdbe *p){ int i; i = p->nLabel++; assert( p->magic==VDBE_MAGIC_INIT ); @@ -30602,7 +30602,7 @@ SQLITE_PRIVATE int sqlite3VdbeMakeLabel(Vdbe *p){ ** be inserted. The parameter "x" must have been obtained from ** a prior call to sqlite3VdbeMakeLabel(). */ -SQLITE_PRIVATE void sqlite3VdbeResolveLabel(Vdbe *p, int x){ +STQLITE_PRIVATE void sqlite3VdbeResolveLabel(Vdbe *p, int x){ int j = -1-x; assert( p->magic==VDBE_MAGIC_INIT ); assert( j>=0 && j<p->nLabel ); @@ -30617,7 +30617,7 @@ SQLITE_PRIVATE void sqlite3VdbeResolveLabel(Vdbe *p, int x){ */ static int opcodeNoPush(u8 op){ /* The 10 NOPUSH_MASK_n constants are defined in the automatically - ** generated header file opcodes.h. Each is a 16-bit bitmask, one + ** generated header file opcodes.h. Each is a 16-bit bittqmask, one ** bit corresponding to each opcode implemented by the virtual ** machine in vdbe.c. The bit is true if the word "no-push" appears ** in a comment on the same line as the "case OP_XXX:" in @@ -30627,16 +30627,16 @@ static int opcodeNoPush(u8 op){ ** to grow the stack when it is executed. Otherwise, it may grow the ** stack by at most one entry. ** - ** NOPUSH_MASK_0 corresponds to opcodes 0 to 15. NOPUSH_MASK_1 contains + ** 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 bitmasks (rather than 32-bit) are specified in opcodes.h + ** 16-bit bittqmasks (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 masks[5] = { + static const u32 tqmasks[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,11 +30644,11 @@ static int opcodeNoPush(u8 op){ NOPUSH_MASK_8 + (((unsigned)NOPUSH_MASK_9)<<16) }; assert( op<32*5 ); - return (masks[op>>5] & (1<<(op&0x1F))); + return (tqmasks[op>>5] & (1<<(op&0x1F))); } #ifndef NDEBUG -SQLITE_PRIVATE int sqlite3VdbeOpcodeNoPush(u8 op){ +STQLITE_PRIVATE int sqlite3VdbeOpcodeNoPush(u8 op){ return opcodeNoPush(op); } #endif @@ -30668,7 +30668,7 @@ SQLITE_PRIVATE int sqlite3VdbeOpcodeNoPush(u8 op){ ** entries that static analysis reveals this program might need. ** ** This routine also does the following optimization: It scans for -** Halt instructions where P1==SQLITE_CONSTRAINT or P2==OE_Abort or for +** Halt instructions where P1==STQLITE_CONSTRAINT or P2==OE_Abort or for ** IdxInsert instructions where P2!=0. If no such instruction is ** found, then every Statement instruction is changed to a Noop. In ** this way, we avoid creating the statement journal file unnecessarily. @@ -30685,19 +30685,19 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs, int *pMaxStack){ u8 opcode = pOp->opcode; if( opcode==OP_Function || opcode==OP_AggStep -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE || opcode==OP_VUpdate #endif ){ if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2; } if( opcode==OP_Halt ){ - if( pOp->p1==SQLITE_CONSTRAINT && pOp->p2==OE_Abort ){ + if( pOp->p1==STQLITE_CONSTRAINT && pOp->p2==OE_Abort ){ doesStatementRollback = 1; } }else if( opcode==OP_Statement ){ hasStatementBegin = 1; -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE }else if( opcode==OP_VUpdate || opcode==OP_VRename ){ doesStatementRollback = 1; }else if( opcode==OP_VFilter ){ @@ -30739,7 +30739,7 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs, int *pMaxStack){ /* ** Return the address of the next instruction to be inserted. */ -SQLITE_PRIVATE int sqlite3VdbeCurrentAddr(Vdbe *p){ +STQLITE_PRIVATE int sqlite3VdbeCurrentAddr(Vdbe *p){ assert( p->magic==VDBE_MAGIC_INIT ); return p->nOp; } @@ -30748,7 +30748,7 @@ SQLITE_PRIVATE int sqlite3VdbeCurrentAddr(Vdbe *p){ ** Add a whole list of operations to the operation stack. Return the ** address of the first operation added. */ -SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp){ +STQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp){ int addr; assert( p->magic==VDBE_MAGIC_INIT ); resizeOpArray(p, p->nOp + nOp); @@ -30767,7 +30767,7 @@ SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp) pOut->p2 = p2<0 ? addr + ADDR(p2) : p2; pOut->p3 = pIn->p3; pOut->p3type = pIn->p3 ? P3_STATIC : P3_NOTUSED; -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG if( sqlite3_vdbe_addop_trace ){ sqlite3VdbePrintOp(0, i+addr, &p->aOp[i+addr]); } @@ -30784,7 +30784,7 @@ SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp) ** static array using sqlite3VdbeAddOpList but we want to make a ** few minor changes to the program. */ -SQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe *p, int addr, int val){ +STQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe *p, int addr, int val){ assert( p==0 || p->magic==VDBE_MAGIC_INIT ); if( p && addr>=0 && p->nOp>addr && p->aOp ){ p->aOp[addr].p1 = val; @@ -30795,7 +30795,7 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe *p, int addr, int val){ ** Change the value of the P2 operand for a specific instruction. ** This routine is useful for setting a jump destination. */ -SQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe *p, int addr, int val){ +STQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe *p, int addr, int val){ assert( val>=0 ); assert( p==0 || p->magic==VDBE_MAGIC_INIT ); if( p && addr>=0 && p->nOp>addr && p->aOp ){ @@ -30807,7 +30807,7 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe *p, int addr, int val){ ** Change the P2 operand of instruction addr so that it points to ** the address of the next instruction to be coded. */ -SQLITE_PRIVATE void sqlite3VdbeJumpHere(Vdbe *p, int addr){ +STQLITE_PRIVATE void sqlite3VdbeJumpHere(Vdbe *p, int addr){ sqlite3VdbeChangeP2(p, addr, p->nOp); } @@ -30817,7 +30817,7 @@ SQLITE_PRIVATE void sqlite3VdbeJumpHere(Vdbe *p, int addr){ ** the FuncDef is not ephermal, then do nothing. */ static void freeEphemeralFunction(FuncDef *pDef){ - if( pDef && (pDef->flags & SQLITE_FUNC_EPHEM)!=0 ){ + if( pDef && (pDef->flags & STQLITE_FUNC_EPHEM)!=0 ){ sqliteFree(pDef); } } @@ -30861,7 +30861,7 @@ static void freeP3(int p3type, void *p3){ /* ** Change N opcodes starting at addr to No-ops. */ -SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe *p, int addr, int N){ +STQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe *p, int addr, int N){ if( p && p->aOp ){ VdbeOp *pOp = &p->aOp[addr]; while( N-- ){ @@ -30898,7 +30898,7 @@ SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe *p, int addr, int N){ ** ** If addr<0 then change P3 on the most recently inserted instruction. */ -SQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe *p, int addr, const char *zP3, int n){ +STQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe *p, int addr, const char *zP3, int n){ Op *pOp; assert( p==0 || p->magic==VDBE_MAGIC_INIT ); if( p==0 || p->aOp==0 || sqlite3MallocFailed() ){ @@ -30955,7 +30955,7 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe *p, int addr, const char *zP3, int ** Replace the P3 field of the most recently coded instruction with ** comment text. */ -SQLITE_PRIVATE void sqlite3VdbeComment(Vdbe *p, const char *zFormat, ...){ +STQLITE_PRIVATE void sqlite3VdbeComment(Vdbe *p, const char *zFormat, ...){ va_list ap; assert( p->nOp>0 || p->aOp==0 ); assert( p->aOp==0 || p->aOp[p->nOp-1].p3==0 || sqlite3MallocFailed() ); @@ -30968,14 +30968,14 @@ SQLITE_PRIVATE void sqlite3VdbeComment(Vdbe *p, const char *zFormat, ...){ /* ** Return the opcode for a given address. */ -SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe *p, int addr){ +STQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe *p, int addr){ assert( p->magic==VDBE_MAGIC_INIT ); assert( (addr>=0 && addr<p->nOp) || sqlite3MallocFailed() ); return ((addr>=0 && addr<p->nOp)?(&p->aOp[addr]):0); } -#if !defined(SQLITE_OMIT_EXPLAIN) || !defined(NDEBUG) \ - || defined(VDBE_PROFILE) || defined(SQLITE_DEBUG) +#if !defined(STQLITE_OMIT_EXPLAIN) || !defined(NDEBUG) \ + || defined(VDBE_PROFILE) || defined(STQLITE_DEBUG) /* ** Compute a string that describes the P3 parameter for an opcode. ** Use zTemp for any required temporary buffer space. @@ -31026,7 +31026,7 @@ static char *displayP3(Op *pOp, char *zTemp, int nTemp){ zP3 = zTemp; break; } -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE case P3_VTAB: { sqlite3_vtab *pVtab = (sqlite3_vtab*)pOp->p3; sqlite3_snprintf(nTemp, zTemp, "vtab:%p:%p", pVtab, pVtab->pModule); @@ -31047,11 +31047,11 @@ static char *displayP3(Op *pOp, char *zTemp, int nTemp){ #endif -#if defined(VDBE_PROFILE) || defined(SQLITE_DEBUG) +#if defined(VDBE_PROFILE) || defined(STQLITE_DEBUG) /* ** Print a single opcode. This routine is used for debugging only. */ -SQLITE_PRIVATE void sqlite3VdbePrintOp(FILE *pOut, int pc, Op *pOp){ +STQLITE_PRIVATE void sqlite3VdbePrintOp(FILE *pOut, int pc, Op *pOp){ char *zP3; char zPtr[50]; static const char *zFormat1 = "%4d %-13s %4d %4d %s\n"; @@ -31074,7 +31074,7 @@ static void releaseMemArray(Mem *p, int N){ } } -#ifndef SQLITE_OMIT_EXPLAIN +#ifndef STQLITE_OMIT_EXPLAIN /* ** Give a listing of the program in the virtual machine. ** @@ -31082,17 +31082,17 @@ static void releaseMemArray(Mem *p, int N){ ** running the code, it invokes the callback once for each instruction. ** This feature is used to implement "EXPLAIN". */ -SQLITE_PRIVATE int sqlite3VdbeList( +STQLITE_PRIVATE int sqlite3VdbeList( Vdbe *p /* The VDBE */ ){ sqlite3 *db = p->db; int i; - int rc = SQLITE_OK; + int rc = STQLITE_OK; assert( p->explain ); - if( p->magic!=VDBE_MAGIC_RUN ) return SQLITE_MISUSE; - assert( db->magic==SQLITE_MAGIC_BUSY ); - assert( p->rc==SQLITE_OK || p->rc==SQLITE_BUSY ); + if( p->magic!=VDBE_MAGIC_RUN ) return STQLITE_MISUSE; + assert( db->magic==STQLITE_MAGIC_BUSY ); + assert( p->rc==STQLITE_OK || p->rc==STQLITE_BUSY ); /* Even though this opcode does not put dynamic strings onto the ** the stack, they may become dynamic if the user calls @@ -31107,17 +31107,17 @@ SQLITE_PRIVATE int sqlite3VdbeList( i = p->pc++; }while( i<p->nOp && p->explain==2 && p->aOp[i].opcode!=OP_Explain ); if( i>=p->nOp ){ - p->rc = SQLITE_OK; - rc = SQLITE_DONE; + p->rc = STQLITE_OK; + rc = STQLITE_DONE; }else if( db->u1.isInterrupted ){ - p->rc = SQLITE_INTERRUPT; - rc = SQLITE_ERROR; + p->rc = STQLITE_INTERRUPT; + rc = STQLITE_ERROR; sqlite3SetString(&p->zErrMsg, sqlite3ErrStr(p->rc), (char*)0); }else{ Op *pOp = &p->aOp[i]; Mem *pMem = p->aStack; pMem->flags = MEM_Int; - pMem->type = SQLITE_INTEGER; + pMem->type = STQLITE_INTEGER; pMem->u.i = i; /* Program counter */ pMem++; @@ -31125,42 +31125,42 @@ SQLITE_PRIVATE int sqlite3VdbeList( pMem->z = (char*)sqlite3OpcodeNames[pOp->opcode]; /* Opcode */ assert( pMem->z!=0 ); pMem->n = strlen(pMem->z); - pMem->type = SQLITE_TEXT; - pMem->enc = SQLITE_UTF8; + pMem->type = STQLITE_TEXT; + pMem->enc = STQLITE_UTF8; pMem++; pMem->flags = MEM_Int; pMem->u.i = pOp->p1; /* P1 */ - pMem->type = SQLITE_INTEGER; + pMem->type = STQLITE_INTEGER; pMem++; pMem->flags = MEM_Int; pMem->u.i = pOp->p2; /* P2 */ - pMem->type = SQLITE_INTEGER; + pMem->type = STQLITE_INTEGER; pMem++; pMem->flags = MEM_Ephem|MEM_Str|MEM_Term; /* P3 */ pMem->z = displayP3(pOp, pMem->zShort, sizeof(pMem->zShort)); assert( pMem->z!=0 ); pMem->n = strlen(pMem->z); - pMem->type = SQLITE_TEXT; - pMem->enc = SQLITE_UTF8; + pMem->type = STQLITE_TEXT; + pMem->enc = STQLITE_UTF8; p->nResColumn = 5 - 2*(p->explain-1); p->pTos = pMem; - p->rc = SQLITE_OK; + p->rc = STQLITE_OK; p->resOnStack = 1; - rc = SQLITE_ROW; + rc = STQLITE_ROW; } return rc; } -#endif /* SQLITE_OMIT_EXPLAIN */ +#endif /* STQLITE_OMIT_EXPLAIN */ -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG /* ** Print the SQL that was used to generate a VDBE program. */ -SQLITE_PRIVATE void sqlite3VdbePrintSql(Vdbe *p){ +STQLITE_PRIVATE void sqlite3VdbePrintSql(Vdbe *p){ int nOp = p->nOp; VdbeOp *pOp; if( nOp<1 ) return; @@ -31173,11 +31173,11 @@ SQLITE_PRIVATE void sqlite3VdbePrintSql(Vdbe *p){ } #endif -#if !defined(SQLITE_OMIT_TRACE) && defined(SQLITE_ENABLE_IOTRACE) +#if !defined(STQLITE_OMIT_TRACE) && defined(STQLITE_ENABLE_IOTRACE) /* ** Print an IOTRACE message showing SQL content. */ -SQLITE_PRIVATE void sqlite3VdbeIOTraceSql(Vdbe *p){ +STQLITE_PRIVATE void sqlite3VdbeIOTraceSql(Vdbe *p){ int nOp = p->nOp; VdbeOp *pOp; if( sqlite3_io_trace==0 ) return; @@ -31201,7 +31201,7 @@ SQLITE_PRIVATE void sqlite3VdbeIOTraceSql(Vdbe *p){ sqliteFree(z); } } -#endif /* !SQLITE_OMIT_TRACE && SQLITE_ENABLE_IOTRACE */ +#endif /* !STQLITE_OMIT_TRACE && STQLITE_ENABLE_IOTRACE */ /* @@ -31213,7 +31213,7 @@ SQLITE_PRIVATE void sqlite3VdbeIOTraceSql(Vdbe *p){ ** This is the only way to move a VDBE from VDBE_MAGIC_INIT to ** VDBE_MAGIC_RUN. */ -SQLITE_PRIVATE void sqlite3VdbeMakeReady( +STQLITE_PRIVATE void sqlite3VdbeMakeReady( Vdbe *p, /* The VDBE */ int nVar, /* Number of '?' see in the SQL statement */ int nMem, /* Number of memory cells to allocate */ @@ -31284,7 +31284,7 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady( p->pTos = &p->aStack[-1]; p->pc = -1; - p->rc = SQLITE_OK; + p->rc = STQLITE_OK; p->uniqueCnt = 0; p->returnDepth = 0; p->errorAction = OE_Abort; @@ -31310,7 +31310,7 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady( ** Close a cursor and release all the resources that cursor happens ** to hold. */ -SQLITE_PRIVATE void sqlite3VdbeFreeCursor(Vdbe *p, Cursor *pCx){ +STQLITE_PRIVATE void sqlite3VdbeFreeCursor(Vdbe *p, Cursor *pCx){ if( pCx==0 ){ return; } @@ -31320,7 +31320,7 @@ SQLITE_PRIVATE void sqlite3VdbeFreeCursor(Vdbe *p, Cursor *pCx){ if( pCx->pBt ){ sqlite3BtreeClose(pCx->pBt); } -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( pCx->pVtabCursor ){ sqlite3_vtab_cursor *pVtabCursor = pCx->pVtabCursor; const sqlite3_module *pModule = pCx->pModule; @@ -31386,7 +31386,7 @@ static void Cleanup(Vdbe *p){ ** execution of the vdbe program so that sqlite3_column_count() can ** be called on an SQL statement before sqlite3_step(). */ -SQLITE_PRIVATE void sqlite3VdbeSetNumCols(Vdbe *p, int nResColumn){ +STQLITE_PRIVATE void sqlite3VdbeSetNumCols(Vdbe *p, int nResColumn){ Mem *pColName; int n; releaseMemArray(p->aColName, p->nResColumn*COLNAME_N); @@ -31411,20 +31411,20 @@ SQLITE_PRIVATE void sqlite3VdbeSetNumCols(Vdbe *p, int nResColumn){ ** the string is freed using sqliteFree() when the vdbe is finished with ** it. Otherwise, N bytes of zName are copied. */ -SQLITE_PRIVATE int sqlite3VdbeSetColName(Vdbe *p, int idx, int var, const char *zName, int N){ +STQLITE_PRIVATE int sqlite3VdbeSetColName(Vdbe *p, int idx, int var, const char *zName, int N){ int rc; Mem *pColName; assert( idx<p->nResColumn ); assert( var<COLNAME_N ); - if( sqlite3MallocFailed() ) return SQLITE_NOMEM; + if( sqlite3MallocFailed() ) return STQLITE_NOMEM; assert( p->aColName!=0 ); pColName = &(p->aColName[idx+var*p->nResColumn]); if( N==P3_DYNAMIC || N==P3_STATIC ){ - rc = sqlite3VdbeMemSetStr(pColName, zName, -1, SQLITE_UTF8, SQLITE_STATIC); + rc = sqlite3VdbeMemSetStr(pColName, zName, -1, STQLITE_UTF8, STQLITE_STATIC); }else{ - rc = sqlite3VdbeMemSetStr(pColName, zName, N, SQLITE_UTF8,SQLITE_TRANSIENT); + rc = sqlite3VdbeMemSetStr(pColName, zName, N, STQLITE_UTF8,STQLITE_TRANSIENT); } - if( rc==SQLITE_OK && N==P3_DYNAMIC ){ + if( rc==STQLITE_OK && N==P3_DYNAMIC ){ pColName->flags = (pColName->flags&(~MEM_Static))|MEM_Dyn; pColName->xDel = 0; } @@ -31440,7 +31440,7 @@ SQLITE_PRIVATE int sqlite3VdbeSetColName(Vdbe *p, int idx, int var, const char * static int vdbeCommit(sqlite3 *db){ int i; int nTrans = 0; /* Number of databases with an active write-transaction */ - int rc = SQLITE_OK; + int rc = STQLITE_OK; int needXcommit = 0; /* Before doing anything else, call the xSync() callback for any @@ -31450,7 +31450,7 @@ static int vdbeCommit(sqlite3 *db){ ** to the transaction. */ rc = sqlite3VtabSync(db, rc); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } @@ -31474,7 +31474,7 @@ static int vdbeCommit(sqlite3 *db){ rc = db->xCommitCallback(db->pCommitArg); sqlite3SafetyOn(db); if( rc ){ - return SQLITE_CONSTRAINT; + return STQLITE_CONSTRAINT; } } @@ -31488,7 +31488,7 @@ static int vdbeCommit(sqlite3 *db){ ** too. */ if( 0==strlen(sqlite3BtreeGetFilename(db->aDb[0].pBt)) || nTrans<=1 ){ - for(i=0; rc==SQLITE_OK && i<db->nDb; i++){ + for(i=0; rc==STQLITE_OK && i<db->nDb; i++){ Btree *pBt = db->aDb[i].pBt; if( pBt ){ rc = sqlite3BtreeCommitPhaseOne(pBt, 0); @@ -31500,13 +31500,13 @@ static int vdbeCommit(sqlite3 *db){ ** IO error while deleting or truncating a journal file. It is unlikely, ** but could happen. In this case abandon processing and return the error. */ - for(i=0; rc==SQLITE_OK && i<db->nDb; i++){ + for(i=0; rc==STQLITE_OK && i<db->nDb; i++){ Btree *pBt = db->aDb[i].pBt; if( pBt ){ rc = sqlite3BtreeCommitPhaseTwo(pBt); } } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ sqlite3VtabCommit(db); } } @@ -31515,7 +31515,7 @@ static int vdbeCommit(sqlite3 *db){ ** This requires a master journal file to ensure the transaction is ** committed atomicly. */ -#ifndef SQLITE_OMIT_DISKIO +#ifndef STQLITE_OMIT_DISKIO else{ int needSync = 0; char *zMaster = 0; /* File-name for the master journal */ @@ -31529,13 +31529,13 @@ static int vdbeCommit(sqlite3 *db){ sqlite3Randomness(sizeof(random), &random); zMaster = sqlite3MPrintf("%s-mj%08X", zMainFile, random&0x7fffffff); if( !zMaster ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } }while( sqlite3OsFileExists(zMaster) ); /* Open the master journal. */ rc = sqlite3OsOpenExclusive(zMaster, &master, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqliteFree(zMaster); return rc; } @@ -31556,7 +31556,7 @@ static int vdbeCommit(sqlite3 *db){ needSync = 1; } rc = sqlite3OsWrite(master, zFile, strlen(zFile)+1); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqlite3OsClose(&master); sqlite3OsDelete(zMaster); sqliteFree(zMaster); @@ -31571,8 +31571,8 @@ static int vdbeCommit(sqlite3 *db){ */ zMainFile = sqlite3BtreeGetDirname(db->aDb[0].pBt); rc = sqlite3OsOpenDirectory(master, zMainFile); - if( rc!=SQLITE_OK || - (needSync && (rc=sqlite3OsSync(master,0))!=SQLITE_OK) ){ + if( rc!=STQLITE_OK || + (needSync && (rc=sqlite3OsSync(master,0))!=STQLITE_OK) ){ sqlite3OsClose(&master); sqlite3OsDelete(zMaster); sqliteFree(zMaster); @@ -31589,14 +31589,14 @@ static int vdbeCommit(sqlite3 *db){ ** in case the master journal file name was written into the journal ** file before the failure occured. */ - for(i=0; rc==SQLITE_OK && i<db->nDb; i++){ + for(i=0; rc==STQLITE_OK && i<db->nDb; i++){ Btree *pBt = db->aDb[i].pBt; if( pBt && sqlite3BtreeIsInTrans(pBt) ){ rc = sqlite3BtreeCommitPhaseOne(pBt, zMaster); } } sqlite3OsClose(&master); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqliteFree(zMaster); return rc; } @@ -31612,7 +31612,7 @@ static int vdbeCommit(sqlite3 *db){ return rc; } rc = sqlite3OsSyncDirectory(zMainFile); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ /* This is not good. The master journal file has been deleted, but ** the directory sync failed. There is no completely safe course of ** action from here. The individual journals contain the name of the @@ -31679,7 +31679,7 @@ static void checkActiveVdbeCnt(sqlite3 *db){ ** aborted so that they do not have data rolled out from underneath ** them leading to a segfault. */ -SQLITE_PRIVATE void sqlite3AbortOtherActiveVdbes(sqlite3 *db, Vdbe *pExcept){ +STQLITE_PRIVATE void sqlite3AbortOtherActiveVdbes(sqlite3 *db, Vdbe *pExcept){ Vdbe *pOther; for(pOther=db->pVdbe; pOther; pOther=pOther->pNext){ if( pOther==pExcept ) continue; @@ -31697,17 +31697,17 @@ SQLITE_PRIVATE void sqlite3AbortOtherActiveVdbes(sqlite3 *db, Vdbe *pExcept){ ** changes. If a rollback is needed, then do the rollback. ** ** This routine is the only way to move the state of a VM from -** SQLITE_MAGIC_RUN to SQLITE_MAGIC_HALT. +** STQLITE_MAGIC_RUN to STQLITE_MAGIC_HALT. ** ** Return an error code. If the commit could not complete because of -** lock contention, return SQLITE_BUSY. If SQLITE_BUSY is returned, it +** lock contention, return STQLITE_BUSY. If STQLITE_BUSY is returned, it ** means the close did not happen and needs to be repeated. */ -SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ +STQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ sqlite3 *db = p->db; int i; int (*xFunc)(Btree *pBt) = 0; /* Function to call on each btree backend */ - int isSpecialError; /* Set to true if SQLITE_NOMEM or IOERR */ + int isSpecialError; /* Set to true if STQLITE_NOMEM or IOERR */ /* This function contains the logic that determines if a statement or ** transaction will be committed or rolled back as a result of the @@ -31715,13 +31715,13 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ ** ** Special errors: ** - ** If an SQLITE_NOMEM error has occured in a statement that writes to + ** If an STQLITE_NOMEM error has occured in a statement that writes to ** the database, then either a statement or transaction must be rolled ** back to ensure the tree-structures are in a consistent state. A ** statement transaction is rolled back if one is open, otherwise the ** entire transaction must be rolled back. ** - ** If an SQLITE_IOERR error has occured in a statement that writes to + ** If an STQLITE_IOERR error has occured in a statement that writes to ** the database, then the entire transaction must be rolled back. The ** I/O error may have caused garbage to be written to the journal ** file. Were the transaction to continue and eventually be rolled @@ -31738,15 +31738,15 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ */ if( sqlite3MallocFailed() ){ - p->rc = SQLITE_NOMEM; + p->rc = STQLITE_NOMEM; } if( p->magic!=VDBE_MAGIC_RUN ){ /* Already halted. Nothing to do. */ assert( p->magic==VDBE_MAGIC_HALT ); -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE closeAllCursors(p); #endif - return SQLITE_OK; + return STQLITE_OK; } closeAllCursors(p); checkActiveVdbeCnt(db); @@ -31754,10 +31754,10 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ /* No commit or rollback needed if the program never started */ if( p->pc>=0 ){ int mrc; /* Primary error code from p->rc */ - /* Check for one of the special errors - SQLITE_NOMEM or SQLITE_IOERR */ + /* Check for one of the special errors - STQLITE_NOMEM or STQLITE_IOERR */ mrc = p->rc & 0xff; isSpecialError = ( - (mrc==SQLITE_NOMEM || mrc==SQLITE_IOERR || mrc==SQLITE_INTERRUPT)?1:0); + (mrc==STQLITE_NOMEM || mrc==STQLITE_IOERR || mrc==STQLITE_INTERRUPT)?1:0); if( isSpecialError ){ /* This loop does static analysis of the query to see which of the ** following three categories it falls into: @@ -31781,14 +31781,14 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ /* This is a bit strange. If we hit a malloc() or IO error and ** the statement did not open a statement transaction, we will ** rollback any active transaction and abort all other active - ** statements. Or, if this is an SQLITE_INTERRUPT error, we + ** statements. Or, if this is an STQLITE_INTERRUPT error, we ** will only rollback if the interrupted statement was a write. ** ** It could be argued that read-only statements should never ** rollback anything. But careful analysis is required before ** making this change */ - if( p->aOp[i].p2 || mrc!=SQLITE_INTERRUPT ){ + if( p->aOp[i].p2 || mrc!=STQLITE_INTERRUPT ){ isReadOnly = 0; } break; @@ -31802,10 +31802,10 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ ** proceed with the special handling. */ if( !isReadOnly ){ - if( p->rc==SQLITE_IOERR_BLOCKED && isStatement ){ + if( p->rc==STQLITE_IOERR_BLOCKED && isStatement ){ xFunc = sqlite3BtreeRollbackStmt; - p->rc = SQLITE_BUSY; - } else if( p->rc==SQLITE_NOMEM && isStatement ){ + p->rc = STQLITE_BUSY; + } else if( p->rc==STQLITE_NOMEM && isStatement ){ xFunc = sqlite3BtreeRollbackStmt; }else{ /* We are forced to roll back the active transaction. Before doing @@ -31825,15 +31825,15 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ ** above has occured. */ if( db->autoCommit && db->activeVdbeCnt==1 ){ - if( p->rc==SQLITE_OK || (p->errorAction==OE_Fail && !isSpecialError) ){ + if( p->rc==STQLITE_OK || (p->errorAction==OE_Fail && !isSpecialError) ){ /* The auto-commit flag is true, and the vdbe program was ** successful or hit an 'OR FAIL' constraint. This means a commit ** is required. */ int rc = vdbeCommit(db); - if( rc==SQLITE_BUSY ){ - return SQLITE_BUSY; - }else if( rc!=SQLITE_OK ){ + if( rc==STQLITE_BUSY ){ + return STQLITE_BUSY; + }else if( rc!=STQLITE_OK ){ p->rc = rc; sqlite3RollbackAll(db); }else{ @@ -31843,7 +31843,7 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ sqlite3RollbackAll(db); } }else if( !xFunc ){ - if( p->rc==SQLITE_OK || p->errorAction==OE_Fail ){ + if( p->rc==STQLITE_OK || p->errorAction==OE_Fail ){ if( p->openedStatement ){ xFunc = sqlite3BtreeCommitStmt; } @@ -31858,7 +31858,7 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ /* If xFunc is not NULL, then it is one of sqlite3BtreeRollbackStmt or ** sqlite3BtreeCommitStmt. Call it once on each backend. If an error occurs - ** and the return code is still SQLITE_OK, set the return code to the new + ** and the return code is still STQLITE_OK, set the return code to the new ** error value. */ assert(!xFunc || @@ -31870,7 +31870,7 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ Btree *pBt = db->aDb[i].pBt; if( pBt ){ rc = xFunc(pBt); - if( rc && (p->rc==SQLITE_OK || p->rc==SQLITE_CONSTRAINT) ){ + if( rc && (p->rc==STQLITE_OK || p->rc==STQLITE_CONSTRAINT) ){ p->rc = rc; sqlite3SetString(&p->zErrMsg, 0); } @@ -31890,9 +31890,9 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ } /* Rollback or commit any schema changes that occurred. */ - if( p->rc!=SQLITE_OK && db->flags&SQLITE_InternChanges ){ + if( p->rc!=STQLITE_OK && db->flags&STQLITE_InternChanges ){ sqlite3ResetInternalSchema(db, 0); - db->flags = (db->flags | SQLITE_InternChanges); + db->flags = (db->flags | STQLITE_InternChanges); } } @@ -31903,15 +31903,15 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){ p->magic = VDBE_MAGIC_HALT; checkActiveVdbeCnt(db); - return SQLITE_OK; + return STQLITE_OK; } /* ** Each VDBE holds the result of the most recent sqlite3_step() call -** in p->rc. This routine sets that result back to SQLITE_OK. +** in p->rc. This routine sets that result back to STQLITE_OK. */ -SQLITE_PRIVATE void sqlite3VdbeResetStepResult(Vdbe *p){ - p->rc = SQLITE_OK; +STQLITE_PRIVATE void sqlite3VdbeResetStepResult(Vdbe *p){ + p->rc = STQLITE_OK; } /* @@ -31925,7 +31925,7 @@ SQLITE_PRIVATE void sqlite3VdbeResetStepResult(Vdbe *p){ ** virtual machine from VDBE_MAGIC_RUN or VDBE_MAGIC_HALT back to ** VDBE_MAGIC_INIT. */ -SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){ +STQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){ sqlite3 *db; db = p->db; @@ -31944,13 +31944,13 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){ */ if( p->pc>=0 ){ if( p->zErrMsg ){ - sqlite3ValueSetStr(db->pErr, -1, p->zErrMsg, SQLITE_UTF8, sqlite3FreeX); + sqlite3ValueSetStr(db->pErr, -1, p->zErrMsg, STQLITE_UTF8, sqlite3FreeX); db->errCode = p->rc; p->zErrMsg = 0; }else if( p->rc ){ sqlite3Error(db, p->rc, 0); }else{ - sqlite3Error(db, SQLITE_OK, 0); + sqlite3Error(db, STQLITE_OK, 0); } }else if( p->rc && p->expired ){ /* The expired flag was set on the VDBE before the first call @@ -31991,7 +31991,7 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){ #endif p->magic = VDBE_MAGIC_INIT; p->aborted = 0; - if( p->rc==SQLITE_SCHEMA ){ + if( p->rc==STQLITE_SCHEMA ){ sqlite3ResetInternalSchema(db, 0); } return p->rc & db->errMask; @@ -32001,13 +32001,13 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){ ** Clean up and delete a VDBE after execution. Return an integer which is ** the result code. Write any error message text into *pzErrMsg. */ -SQLITE_PRIVATE int sqlite3VdbeFinalize(Vdbe *p){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3VdbeFinalize(Vdbe *p){ + int rc = STQLITE_OK; if( p->magic==VDBE_MAGIC_RUN || p->magic==VDBE_MAGIC_HALT ){ rc = sqlite3VdbeReset(p); assert( (rc & p->db->errMask)==rc ); }else if( p->magic!=VDBE_MAGIC_INIT ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } sqlite3VdbeDelete(p); return rc; @@ -32015,15 +32015,15 @@ SQLITE_PRIVATE int sqlite3VdbeFinalize(Vdbe *p){ /* ** Call the destructor for each auxdata entry in pVdbeFunc for which -** the corresponding bit in mask is clear. Auxdata entries beyond 31 +** the corresponding bit in tqmask is clear. Auxdata entries beyond 31 ** are always destroyed. To destroy all auxdata entries, call this -** routine with mask==0. +** routine with tqmask==0. */ -SQLITE_PRIVATE void sqlite3VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int mask){ +STQLITE_PRIVATE void sqlite3VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int tqmask){ int i; for(i=0; i<pVdbeFunc->nAux; i++){ struct AuxData *pAux = &pVdbeFunc->apAux[i]; - if( (i>31 || !(mask&(1<<i))) && pAux->pAux ){ + if( (i>31 || !(tqmask&(1<<i))) && pAux->pAux ){ if( pAux->xDelete ){ pAux->xDelete(pAux->pAux); } @@ -32035,7 +32035,7 @@ SQLITE_PRIVATE void sqlite3VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int mask){ /* ** Delete an entire VDBE. */ -SQLITE_PRIVATE void sqlite3VdbeDelete(Vdbe *p){ +STQLITE_PRIVATE void sqlite3VdbeDelete(Vdbe *p){ int i; if( p==0 ) return; Cleanup(p); @@ -32068,12 +32068,12 @@ SQLITE_PRIVATE void sqlite3VdbeDelete(Vdbe *p){ /* ** If a MoveTo operation is pending on the given cursor, then do that ** MoveTo now. Return an error code. If no MoveTo is pending, this -** routine does nothing and returns SQLITE_OK. +** routine does nothing and returns STQLITE_OK. */ -SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(Cursor *p){ +STQLITE_PRIVATE int sqlite3VdbeCursorMoveto(Cursor *p){ if( p->deferredMoveto ){ int res, rc; -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST extern int sqlite3_search_count; #endif assert( p->isTable ); @@ -32086,13 +32086,13 @@ SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(Cursor *p){ rc = sqlite3BtreeNext(p->pCursor, &res); if( rc ) return rc; } -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST sqlite3_search_count++; #endif p->deferredMoveto = 0; - p->cacheStatus = CACHE_STALE; + p->cachetqStatus = CACHE_STALE; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -32104,12 +32104,12 @@ SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(Cursor *p){ ** sqlite3VdbeSerialLen() ** sqlite3VdbeSerialWrite() ** -** encapsulate the code that serializes values for storage in SQLite +** encapsulate the code that serializes values for storage in STQLite ** data and index records. Each serialized value consists of a ** 'serial-type' and a blob of data. The serial type is an 8-byte unsigned ** integer, stored as a varint. ** -** In an SQLite index record, the serial type is stored directly before +** In an STQLite index record, the serial type is stored directly before ** the blob of data that it corresponds to. In a table record, all serial ** types are stored at the start of the record, and the blobs of data at ** the end. Hence these functions allow the caller to handle the @@ -32134,13 +32134,13 @@ SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(Cursor *p){ ** N>=13 and odd (N-13)/2 text ** ** The 8 and 9 types were added in 3.3.0, file format 4. Prior versions -** of SQLite will not understand those serial types. +** of STQLite will not understand those serial types. */ /* ** Return the serial-type for the value stored in pMem. */ -SQLITE_PRIVATE u32 sqlite3VdbeSerialType(Mem *pMem, int file_format){ +STQLITE_PRIVATE u32 sqlite3VdbeSerialType(Mem *pMem, int file_format){ int flags = pMem->flags; int n; @@ -32178,7 +32178,7 @@ SQLITE_PRIVATE u32 sqlite3VdbeSerialType(Mem *pMem, int file_format){ /* ** Return the length of the data corresponding to the supplied serial-type. */ -SQLITE_PRIVATE int sqlite3VdbeSerialTypeLen(u32 serial_type){ +STQLITE_PRIVATE int sqlite3VdbeSerialTypeLen(u32 serial_type){ if( serial_type>=12 ){ return (serial_type-12)/2; }else{ @@ -32203,12 +32203,12 @@ SQLITE_PRIVATE int sqlite3VdbeSerialTypeLen(u32 serial_type){ ** I am also told that newer versions of GCC that follow a different ** ABI get the byte order right. ** -** Developers using SQLite on an ARM7 should compile and run their -** application using -DSQLITE_DEBUG=1 at least once. With DEBUG +** Developers using STQLite on an ARM7 should compile and run their +** application using -DSTQLITE_DEBUG=1 at least once. With DEBUG ** enabled, some asserts below will ensure that the byte order of ** floating point values is correct. */ -#ifdef SQLITE_MIXED_ENDIAN_64BIT_FLOAT +#ifdef STQLITE_MIXED_ENDIAN_64BIT_FLOAT static double floatSwap(double in){ union { double r; @@ -32245,7 +32245,7 @@ static double floatSwap(double in){ ** of bytes in the zero-filled tail is included in the return value only ** if those bytes were zeroed in buf[]. */ -SQLITE_PRIVATE int sqlite3VdbeSerialPut(u8 *buf, int nBuf, Mem *pMem, int file_format){ +STQLITE_PRIVATE int sqlite3VdbeSerialPut(u8 *buf, int nBuf, Mem *pMem, int file_format){ u32 serial_type = sqlite3VdbeSerialType(pMem, file_format); int len; @@ -32294,7 +32294,7 @@ SQLITE_PRIVATE int sqlite3VdbeSerialPut(u8 *buf, int nBuf, Mem *pMem, int file_f ** Deserialize the data blob pointed to by buf as serial type serial_type ** and store the result in pMem. Return the number of bytes read. */ -SQLITE_PRIVATE int sqlite3VdbeSerialGet( +STQLITE_PRIVATE int sqlite3VdbeSerialGet( const unsigned char *buf, /* Buffer to deserialize from */ u32 serial_type, /* Serial type to deserialize */ Mem *pMem /* Memory cell to write value into */ @@ -32338,9 +32338,9 @@ SQLITE_PRIVATE int sqlite3VdbeSerialGet( case 7: { /* IEEE floating point */ u64 x; u32 y; -#if !defined(NDEBUG) && !defined(SQLITE_OMIT_FLOATING_POINT) +#if !defined(NDEBUG) && !defined(STQLITE_OMIT_FLOATING_POINT) /* Verify that integers and floating point values use the same - ** byte order. Or, that if SQLITE_MIXED_ENDIAN_64BIT_FLOAT is + ** byte order. Or, that if STQLITE_MIXED_ENDIAN_64BIT_FLOAT is ** defined that 64-bit floating point values really are mixed ** endian. */ @@ -32411,7 +32411,7 @@ SQLITE_PRIVATE int sqlite3VdbeSerialGet( ** greater than {nKey2, pKey2}. Both Key1 and Key2 must be byte strings ** composed by the OP_MakeRecord opcode of the VDBE. */ -SQLITE_PRIVATE int sqlite3VdbeRecordCompare( +STQLITE_PRIVATE int sqlite3VdbeRecordCompare( void *userData, int nKey1, const void *pKey1, int nKey2, const void *pKey2 @@ -32488,7 +32488,7 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompare( ** an integer rowid). This routine returns the number of bytes in ** that integer. */ -SQLITE_PRIVATE int sqlite3VdbeIdxRowidLen(const u8 *aKey){ +STQLITE_PRIVATE int sqlite3VdbeIdxRowidLen(const u8 *aKey){ u32 szHdr; /* Size of the header */ u32 typeRowid; /* Serial type of the rowid */ @@ -32501,9 +32501,9 @@ SQLITE_PRIVATE int sqlite3VdbeIdxRowidLen(const u8 *aKey){ /* ** pCur points at an index entry created using the OP_MakeRecord opcode. ** Read the rowid (the last field in the record) and store it in *rowid. -** Return SQLITE_OK if everything works, or an error code otherwise. +** Return STQLITE_OK if everything works, or an error code otherwise. */ -SQLITE_PRIVATE int sqlite3VdbeIdxRowid(BtCursor *pCur, i64 *rowid){ +STQLITE_PRIVATE int sqlite3VdbeIdxRowid(BtCursor *pCur, i64 *rowid){ i64 nCellKey = 0; int rc; u32 szHdr; /* Size of the header */ @@ -32513,7 +32513,7 @@ SQLITE_PRIVATE int sqlite3VdbeIdxRowid(BtCursor *pCur, i64 *rowid){ sqlite3BtreeKeySize(pCur, &nCellKey); if( nCellKey<=0 ){ - return SQLITE_CORRUPT_BKPT; + return STQLITE_CORRUPT_BKPT; } rc = sqlite3VdbeMemFromBtree(pCur, 0, nCellKey, 1, &m); if( rc ){ @@ -32525,20 +32525,20 @@ SQLITE_PRIVATE int sqlite3VdbeIdxRowid(BtCursor *pCur, i64 *rowid){ sqlite3VdbeSerialGet((u8*)&m.z[m.n-lenRowid], typeRowid, &v); *rowid = v.u.i; sqlite3VdbeMemRelease(&m); - return SQLITE_OK; + return STQLITE_OK; } /* ** Compare the key of the index entry that cursor pC is point to against ** the key string in pKey (of length nKey). Write into *pRes a number ** that is negative, zero, or positive if pC is less than, equal to, -** or greater than pKey. Return SQLITE_OK on success. +** or greater than pKey. Return STQLITE_OK on success. ** ** pKey is either created without a rowid or is truncated so that it ** omits the rowid at the end. The rowid at the end of the index entry ** is ignored as well. */ -SQLITE_PRIVATE int sqlite3VdbeIdxKeyCompare( +STQLITE_PRIVATE int sqlite3VdbeIdxKeyCompare( Cursor *pC, /* The cursor to compare against */ int nKey, const u8 *pKey, /* The key to compare */ int *res /* Write the comparison result here */ @@ -32552,7 +32552,7 @@ SQLITE_PRIVATE int sqlite3VdbeIdxKeyCompare( sqlite3BtreeKeySize(pCur, &nCellKey); if( nCellKey<=0 ){ *res = 0; - return SQLITE_OK; + return STQLITE_OK; } rc = sqlite3VdbeMemFromBtree(pC->pCursor, 0, nCellKey, 1, &m); if( rc ){ @@ -32561,14 +32561,14 @@ SQLITE_PRIVATE int sqlite3VdbeIdxKeyCompare( lenRowid = sqlite3VdbeIdxRowidLen((u8*)m.z); *res = sqlite3VdbeRecordCompare(pC->pKeyInfo, m.n-lenRowid, m.z, nKey, pKey); sqlite3VdbeMemRelease(&m); - return SQLITE_OK; + return STQLITE_OK; } /* ** This routine sets the value to be returned by subsequent calls to ** sqlite3_changes() on the database handle 'db'. */ -SQLITE_PRIVATE void sqlite3VdbeSetChanges(sqlite3 *db, int nChange){ +STQLITE_PRIVATE void sqlite3VdbeSetChanges(sqlite3 *db, int nChange){ db->nChange = nChange; db->nTotalChange += nChange; } @@ -32577,7 +32577,7 @@ SQLITE_PRIVATE void sqlite3VdbeSetChanges(sqlite3 *db, int nChange){ ** Set a flag in the vdbe to update the change counter when it is finalised ** or reset. */ -SQLITE_PRIVATE void sqlite3VdbeCountChanges(Vdbe *v){ +STQLITE_PRIVATE void sqlite3VdbeCountChanges(Vdbe *v){ v->changeCntOn = 1; } @@ -32591,7 +32591,7 @@ SQLITE_PRIVATE void sqlite3VdbeCountChanges(Vdbe *v){ ** sequences, or changing an authorization function are the types of ** things that make prepared statements obsolete. */ -SQLITE_PRIVATE void sqlite3ExpirePreparedStatements(sqlite3 *db){ +STQLITE_PRIVATE void sqlite3ExpirePreparedStatements(sqlite3 *db){ Vdbe *p; for(p = db->pVdbe; p; p=p->pNext){ p->expired = 1; @@ -32601,7 +32601,7 @@ SQLITE_PRIVATE void sqlite3ExpirePreparedStatements(sqlite3 *db){ /* ** Return the database associated with the Vdbe. */ -SQLITE_PRIVATE sqlite3 *sqlite3VdbeDb(Vdbe *v){ +STQLITE_PRIVATE sqlite3 *sqlite3VdbeDb(Vdbe *v){ return v->db; } @@ -32631,7 +32631,7 @@ SQLITE_PRIVATE sqlite3 *sqlite3VdbeDb(Vdbe *v){ ** collating sequences are registered or if an authorizer function is ** added or changed. */ -SQLITE_API int sqlite3_expired(sqlite3_stmt *pStmt){ +STQLITE_API int sqlite3_expired(sqlite3_stmt *pStmt){ Vdbe *p = (Vdbe*)pStmt; return p==0 || p->expired; } @@ -32652,10 +32652,10 @@ const void *sqlite3_value_blob(sqlite3_value *pVal){ } } int sqlite3_value_bytes(sqlite3_value *pVal){ - return sqlite3ValueBytes(pVal, SQLITE_UTF8); + return sqlite3ValueBytes(pVal, STQLITE_UTF8); } int sqlite3_value_bytes16(sqlite3_value *pVal){ - return sqlite3ValueBytes(pVal, SQLITE_UTF16NATIVE); + return sqlite3ValueBytes(pVal, STQLITE_UTF16NATIVE); } double sqlite3_value_double(sqlite3_value *pVal){ return sqlite3VdbeRealValue((Mem*)pVal); @@ -32667,19 +32667,19 @@ sqlite_int64 sqlite3_value_int64(sqlite3_value *pVal){ return sqlite3VdbeIntValue((Mem*)pVal); } const unsigned char *sqlite3_value_text(sqlite3_value *pVal){ - return (const unsigned char *)sqlite3ValueText(pVal, SQLITE_UTF8); + return (const unsigned char *)sqlite3ValueText(pVal, STQLITE_UTF8); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 const void *sqlite3_value_text16(sqlite3_value* pVal){ - return sqlite3ValueText(pVal, SQLITE_UTF16NATIVE); + return sqlite3ValueText(pVal, STQLITE_UTF16NATIVE); } const void *sqlite3_value_text16be(sqlite3_value *pVal){ - return sqlite3ValueText(pVal, SQLITE_UTF16BE); + return sqlite3ValueText(pVal, STQLITE_UTF16BE); } const void *sqlite3_value_text16le(sqlite3_value *pVal){ - return sqlite3ValueText(pVal, SQLITE_UTF16LE); + return sqlite3ValueText(pVal, STQLITE_UTF16LE); } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ int sqlite3_value_type(sqlite3_value* pVal){ return pVal->type; } @@ -32703,12 +32703,12 @@ void sqlite3_result_double(sqlite3_context *pCtx, double rVal){ } void sqlite3_result_error(sqlite3_context *pCtx, const char *z, int n){ pCtx->isError = 1; - sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF8, SQLITE_TRANSIENT); + sqlite3VdbeMemSetStr(&pCtx->s, z, n, STQLITE_UTF8, STQLITE_TRANSIENT); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 void sqlite3_result_error16(sqlite3_context *pCtx, const void *z, int n){ pCtx->isError = 1; - sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF16NATIVE, SQLITE_TRANSIENT); + sqlite3VdbeMemSetStr(&pCtx->s, z, n, STQLITE_UTF16NATIVE, STQLITE_TRANSIENT); } #endif void sqlite3_result_int(sqlite3_context *pCtx, int iVal){ @@ -32726,16 +32726,16 @@ void sqlite3_result_text( int n, void (*xDel)(void *) ){ - sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF8, xDel); + sqlite3VdbeMemSetStr(&pCtx->s, z, n, STQLITE_UTF8, xDel); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 void sqlite3_result_text16( sqlite3_context *pCtx, const void *z, int n, void (*xDel)(void *) ){ - sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF16NATIVE, xDel); + sqlite3VdbeMemSetStr(&pCtx->s, z, n, STQLITE_UTF16NATIVE, xDel); } void sqlite3_result_text16be( sqlite3_context *pCtx, @@ -32743,7 +32743,7 @@ void sqlite3_result_text16be( int n, void (*xDel)(void *) ){ - sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF16BE, xDel); + sqlite3VdbeMemSetStr(&pCtx->s, z, n, STQLITE_UTF16BE, xDel); } void sqlite3_result_text16le( sqlite3_context *pCtx, @@ -32751,9 +32751,9 @@ void sqlite3_result_text16le( int n, void (*xDel)(void *) ){ - sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF16LE, xDel); + sqlite3VdbeMemSetStr(&pCtx->s, z, n, STQLITE_UTF16LE, xDel); } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ void sqlite3_result_value(sqlite3_context *pCtx, sqlite3_value *pValue){ sqlite3VdbeMemCopy(&pCtx->s, pValue); } @@ -32761,9 +32761,9 @@ void sqlite3_result_zeroblob(sqlite3_context *pCtx, int n){ sqlite3VdbeMemSetZeroBlob(&pCtx->s, n); } -/* Force an SQLITE_TOOBIG error. */ +/* Force an STQLITE_TOOBIG error. */ void sqlite3_result_error_toobig(sqlite3_context *pCtx){ - sqlite3VdbeMemSetZeroBlob(&pCtx->s, SQLITE_MAX_LENGTH+1); + sqlite3VdbeMemSetZeroBlob(&pCtx->s, STQLITE_MAX_LENGTH+1); } @@ -32784,22 +32784,22 @@ static int sqlite3Step(Vdbe *p){ assert( !sqlite3MallocFailed() ); if( p==0 || p->magic!=VDBE_MAGIC_RUN ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } if( p->aborted ){ - return SQLITE_ABORT; + return STQLITE_ABORT; } if( p->pc<=0 && p->expired ){ - if( p->rc==SQLITE_OK ){ - p->rc = SQLITE_SCHEMA; + if( p->rc==STQLITE_OK ){ + p->rc = STQLITE_SCHEMA; } - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; goto end_of_step; } db = p->db; if( sqlite3SafetyOn(db) ){ - p->rc = SQLITE_MISUSE; - return SQLITE_MISUSE; + p->rc = STQLITE_MISUSE; + return STQLITE_MISUSE; } if( p->pc<0 ){ /* If there are no other statements currently running, then @@ -32810,7 +32810,7 @@ static int sqlite3Step(Vdbe *p){ db->u1.isInterrupted = 0; } -#ifndef SQLITE_OMIT_TRACE +#ifndef STQLITE_OMIT_TRACE /* Invoke the trace callback if there is one */ if( db->xTrace && !db->init.busy ){ @@ -32821,8 +32821,8 @@ static int sqlite3Step(Vdbe *p){ sqlite3SafetyOff(db); db->xTrace(db->pTraceArg, p->aOp[p->nOp-1].p3); if( sqlite3SafetyOn(db) ){ - p->rc = SQLITE_MISUSE; - return SQLITE_MISUSE; + p->rc = STQLITE_MISUSE; + return STQLITE_MISUSE; } } if( db->xProfile && !db->init.busy ){ @@ -32832,35 +32832,35 @@ static int sqlite3Step(Vdbe *p){ } #endif - /* Print a copy of SQL as it is executed if the SQL_TRACE pragma is turned + /* Print a copy of SQL as it is executed if the STQL_TRACE pragma is turned ** on in debugging mode. */ -#ifdef SQLITE_DEBUG - if( (db->flags & SQLITE_SqlTrace)!=0 ){ +#ifdef STQLITE_DEBUG + if( (db->flags & STQLITE_SqlTrace)!=0 ){ sqlite3DebugPrintf("SQL-trace: %s\n", p->aOp[p->nOp-1].p3); } -#endif /* SQLITE_DEBUG */ +#endif /* STQLITE_DEBUG */ db->activeVdbeCnt++; p->pc = 0; } -#ifndef SQLITE_OMIT_EXPLAIN +#ifndef STQLITE_OMIT_EXPLAIN if( p->explain ){ rc = sqlite3VdbeList(p); }else -#endif /* SQLITE_OMIT_EXPLAIN */ +#endif /* STQLITE_OMIT_EXPLAIN */ { rc = sqlite3VdbeExec(p); } if( sqlite3SafetyOff(db) ){ - rc = SQLITE_MISUSE; + rc = STQLITE_MISUSE; } -#ifndef SQLITE_OMIT_TRACE +#ifndef STQLITE_OMIT_TRACE /* Invoke the profile callback if there is one */ - if( rc!=SQLITE_ROW && db->xProfile && !db->init.busy ){ + if( rc!=STQLITE_ROW && db->xProfile && !db->init.busy ){ double rNow; u64 elapseTime; @@ -32878,14 +32878,14 @@ static int sqlite3Step(Vdbe *p){ p->rc = sqlite3ApiExit(p->db, p->rc); end_of_step: assert( (rc&0xff)==rc ); - if( p->zSql && (rc&0xff)<SQLITE_ROW ){ + if( p->zSql && (rc&0xff)<STQLITE_ROW ){ /* This behavior occurs if sqlite3_prepare_v2() was used to build ** the prepared statement. Return error codes directly */ sqlite3Error(p->db, p->rc, 0); return p->rc; }else{ /* This is for legacy sqlite3_prepare() builds and when the code - ** is SQLITE_ROW or SQLITE_DONE */ + ** is STQLITE_ROW or STQLITE_DONE */ return rc; } } @@ -32895,16 +32895,16 @@ end_of_step: ** sqlite3Step() to do most of the work. If a schema error occurs, ** call sqlite3Reprepare() and try again. */ -#ifdef SQLITE_OMIT_PARSER -SQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){ +#ifdef STQLITE_OMIT_PARSER +STQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){ return sqlite3Step((Vdbe*)pStmt); } #else -SQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){ +STQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){ int cnt = 0; int rc; Vdbe *v = (Vdbe*)pStmt; - while( (rc = sqlite3Step(v))==SQLITE_SCHEMA + while( (rc = sqlite3Step(v))==STQLITE_SCHEMA && cnt++ < 5 && sqlite3Reprepare(v) ){ sqlite3_reset(pStmt); @@ -32931,7 +32931,7 @@ void *sqlite3_user_data(sqlite3_context *p){ ** for name resolution but are actually overloaded by the xFindFunction ** method of virtual tables. */ -SQLITE_PRIVATE void sqlite3InvalidFunction( +STQLITE_PRIVATE void sqlite3InvalidFunction( sqlite3_context *context, /* The function calling context */ int argc, /* Number of arguments to the function */ sqlite3_value **argv /* Value of each argument */ @@ -33061,8 +33061,8 @@ static Mem *columnMem(sqlite3_stmt *pStmt, int i){ Vdbe *pVm = (Vdbe *)pStmt; int vals = sqlite3_data_count(pStmt); if( pVm==0 || pVm->resOnStack==0 || i>=pVm->nResColumn || i<0 ){ - static const Mem nullMem = {{0}, 0.0, "", 0, MEM_Null, SQLITE_NULL }; - sqlite3Error(pVm->db, SQLITE_RANGE, 0); + static const Mem nullMem = {{0}, 0.0, "", 0, MEM_Null, STQLITE_NULL }; + sqlite3Error(pVm->db, STQLITE_RANGE, 0); return (Mem*)&nullMem; } return &pVm->pTos[(1-vals)+i]; @@ -33073,7 +33073,7 @@ static Mem *columnMem(sqlite3_stmt *pStmt, int i){ ** column value (i.e. a value returned by evaluating an SQL expression in the ** select list of a SELECT statement) that may cause a malloc() failure. If ** malloc() has failed, the threads mallocFailed flag is cleared and the result -** code of statement pStmt set to SQLITE_NOMEM. +** code of statement pStmt set to STQLITE_NOMEM. ** ** Specificly, this is called from within: ** @@ -33091,7 +33091,7 @@ static void columnMallocFailure(sqlite3_stmt *pStmt) { /* If malloc() failed during an encoding conversion within an ** sqlite3_column_XXX API, then set the return code of the statement to - ** SQLITE_NOMEM. The next call to _step() (if any) will return SQLITE_ERROR + ** STQLITE_NOMEM. The next call to _step() (if any) will return STQLITE_ERROR ** and _finalize() will return NOMEM. */ Vdbe *p = (Vdbe *)pStmt; @@ -33145,13 +33145,13 @@ const unsigned char *sqlite3_column_text(sqlite3_stmt *pStmt, int i){ sqlite3_value *sqlite3_column_value(sqlite3_stmt *pStmt, int i){ return columnMem(pStmt, i); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 const void *sqlite3_column_text16(sqlite3_stmt *pStmt, int i){ const void *val = sqlite3_value_text16( columnMem(pStmt,i) ); columnMallocFailure(pStmt); return val; } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ int sqlite3_column_type(sqlite3_stmt *pStmt, int i){ return sqlite3_value_type( columnMem(pStmt,i) ); } @@ -33210,7 +33210,7 @@ const char *sqlite3_column_name(sqlite3_stmt *pStmt, int N){ return columnName( pStmt, N, (const void*(*)(Mem*))sqlite3_value_text, COLNAME_NAME); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 const void *sqlite3_column_name16(sqlite3_stmt *pStmt, int N){ return columnName( pStmt, N, (const void*(*)(Mem*))sqlite3_value_text16, COLNAME_NAME); @@ -33225,14 +33225,14 @@ const char *sqlite3_column_decltype(sqlite3_stmt *pStmt, int N){ return columnName( pStmt, N, (const void*(*)(Mem*))sqlite3_value_text, COLNAME_DECLTYPE); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 const void *sqlite3_column_decltype16(sqlite3_stmt *pStmt, int N){ return columnName( pStmt, N, (const void*(*)(Mem*))sqlite3_value_text16, COLNAME_DECLTYPE); } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ -#ifdef SQLITE_ENABLE_COLUMN_METADATA +#ifdef STQLITE_ENABLE_COLUMN_METADATA /* ** Return the name of the database from which a result column derives. ** NULL is returned if the result column is an expression or constant or @@ -33242,12 +33242,12 @@ const char *sqlite3_column_database_name(sqlite3_stmt *pStmt, int N){ return columnName( pStmt, N, (const void*(*)(Mem*))sqlite3_value_text, COLNAME_DATABASE); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 const void *sqlite3_column_database_name16(sqlite3_stmt *pStmt, int N){ return columnName( pStmt, N, (const void*(*)(Mem*))sqlite3_value_text16, COLNAME_DATABASE); } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ /* ** Return the name of the table from which a result column derives. @@ -33258,12 +33258,12 @@ const char *sqlite3_column_table_name(sqlite3_stmt *pStmt, int N){ return columnName( pStmt, N, (const void*(*)(Mem*))sqlite3_value_text, COLNAME_TABLE); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 const void *sqlite3_column_table_name16(sqlite3_stmt *pStmt, int N){ return columnName( pStmt, N, (const void*(*)(Mem*))sqlite3_value_text16, COLNAME_TABLE); } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ /* ** Return the name of the table column from which a result column derives. @@ -33274,13 +33274,13 @@ const char *sqlite3_column_origin_name(sqlite3_stmt *pStmt, int N){ return columnName( pStmt, N, (const void*(*)(Mem*))sqlite3_value_text, COLNAME_COLUMN); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 const void *sqlite3_column_origin_name16(sqlite3_stmt *pStmt, int N){ return columnName( pStmt, N, (const void*(*)(Mem*))sqlite3_value_text16, COLNAME_COLUMN); } -#endif /* SQLITE_OMIT_UTF16 */ -#endif /* SQLITE_ENABLE_COLUMN_METADATA */ +#endif /* STQLITE_OMIT_UTF16 */ +#endif /* STQLITE_ENABLE_COLUMN_METADATA */ /******************************* sqlite3_bind_ *************************** @@ -33290,7 +33290,7 @@ const void *sqlite3_column_origin_name16(sqlite3_stmt *pStmt, int N){ /* ** Unbind the value bound to variable i in virtual machine p. This is the ** the same as binding a NULL value to the column. If the "i" parameter is -** out of range, then SQLITE_RANGE is returned. Othewise SQLITE_OK. +** out of range, then STQLITE_RANGE is returned. Othewise STQLITE_OK. ** ** The error code stored in database p->db is overwritten with the return ** value in any case. @@ -33298,19 +33298,19 @@ const void *sqlite3_column_origin_name16(sqlite3_stmt *pStmt, int N){ static int vdbeUnbind(Vdbe *p, int i){ Mem *pVar; if( p==0 || p->magic!=VDBE_MAGIC_RUN || p->pc>=0 ){ - if( p ) sqlite3Error(p->db, SQLITE_MISUSE, 0); - return SQLITE_MISUSE; + if( p ) sqlite3Error(p->db, STQLITE_MISUSE, 0); + return STQLITE_MISUSE; } if( i<1 || i>p->nVar ){ - sqlite3Error(p->db, SQLITE_RANGE, 0); - return SQLITE_RANGE; + sqlite3Error(p->db, STQLITE_RANGE, 0); + return STQLITE_RANGE; } i--; pVar = &p->aVar[i]; sqlite3VdbeMemRelease(pVar); pVar->flags = MEM_Null; - sqlite3Error(p->db, SQLITE_OK, 0); - return SQLITE_OK; + sqlite3Error(p->db, STQLITE_OK, 0); + return STQLITE_OK; } /* @@ -33334,7 +33334,7 @@ static int bindText( } pVar = &p->aVar[i-1]; rc = sqlite3VdbeMemSetStr(pVar, zData, nData, encoding, xDel); - if( rc==SQLITE_OK && encoding!=0 ){ + if( rc==STQLITE_OK && encoding!=0 ){ rc = sqlite3VdbeChangeEncoding(pVar, ENC(p->db)); } @@ -33359,7 +33359,7 @@ int sqlite3_bind_double(sqlite3_stmt *pStmt, int i, double rValue){ int rc; Vdbe *p = (Vdbe *)pStmt; rc = vdbeUnbind(p, i); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ sqlite3VdbeMemSetDouble(&p->aVar[i-1], rValue); } return rc; @@ -33371,7 +33371,7 @@ int sqlite3_bind_int64(sqlite3_stmt *pStmt, int i, sqlite_int64 iValue){ int rc; Vdbe *p = (Vdbe *)pStmt; rc = vdbeUnbind(p, i); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ sqlite3VdbeMemSetInt64(&p->aVar[i-1], iValue); } return rc; @@ -33386,9 +33386,9 @@ int sqlite3_bind_text( int nData, void (*xDel)(void*) ){ - return bindText(pStmt, i, zData, nData, xDel, SQLITE_UTF8); + return bindText(pStmt, i, zData, nData, xDel, STQLITE_UTF8); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 int sqlite3_bind_text16( sqlite3_stmt *pStmt, int i, @@ -33396,14 +33396,14 @@ int sqlite3_bind_text16( int nData, void (*xDel)(void*) ){ - return bindText(pStmt, i, zData, nData, xDel, SQLITE_UTF16NATIVE); + return bindText(pStmt, i, zData, nData, xDel, STQLITE_UTF16NATIVE); } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ int sqlite3_bind_value(sqlite3_stmt *pStmt, int i, const sqlite3_value *pValue){ int rc; Vdbe *p = (Vdbe *)pStmt; rc = vdbeUnbind(p, i); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ sqlite3VdbeMemCopy(&p->aVar[i-1], pValue); } return rc; @@ -33412,7 +33412,7 @@ int sqlite3_bind_zeroblob(sqlite3_stmt *pStmt, int i, int n){ int rc; Vdbe *p = (Vdbe *)pStmt; rc = vdbeUnbind(p, i); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ sqlite3VdbeMemSetZeroBlob(&p->aVar[i-1], n); } return rc; @@ -33420,7 +33420,7 @@ int sqlite3_bind_zeroblob(sqlite3_stmt *pStmt, int i, int n){ /* ** Return the number of wildcards that can be potentially bound to. -** This routine is added to support DBD::SQLite. +** This routine is added to support DBD::STQLite. */ int sqlite3_bind_parameter_count(sqlite3_stmt *pStmt){ Vdbe *p = (Vdbe*)pStmt; @@ -33487,25 +33487,25 @@ int sqlite3_bind_parameter_index(sqlite3_stmt *pStmt, const char *zName){ /* ** Transfer all bindings from the first statement over to the second. ** If the two statements contain a different number of bindings, then -** an SQLITE_ERROR is returned. +** an STQLITE_ERROR is returned. */ int sqlite3_transfer_bindings(sqlite3_stmt *pFromStmt, sqlite3_stmt *pToStmt){ Vdbe *pFrom = (Vdbe*)pFromStmt; Vdbe *pTo = (Vdbe*)pToStmt; - int i, rc = SQLITE_OK; + int i, rc = STQLITE_OK; if( (pFrom->magic!=VDBE_MAGIC_RUN && pFrom->magic!=VDBE_MAGIC_HALT) || (pTo->magic!=VDBE_MAGIC_RUN && pTo->magic!=VDBE_MAGIC_HALT) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } if( pFrom->nVar!=pTo->nVar ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } - for(i=0; rc==SQLITE_OK && i<pFrom->nVar; i++){ + for(i=0; rc==STQLITE_OK && i<pFrom->nVar; i++){ sqlite3MallocDisallow(); rc = sqlite3VdbeMemMove(&pTo->aVar[i], &pFrom->aVar[i]); sqlite3MallocAllow(); } - assert( rc==SQLITE_OK || rc==SQLITE_NOMEM ); + assert( rc==STQLITE_OK || rc==STQLITE_NOMEM ); return rc; } @@ -33576,7 +33576,7 @@ sqlite3 *sqlite3_db_handle(sqlite3_stmt *pStmt){ ** working correctly. This variable has no function other than to ** help verify the correct operation of the library. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_search_count = 0; #endif @@ -33588,7 +33588,7 @@ int sqlite3_search_count = 0; ** This facility is used for testing purposes only. It does not function ** in an ordinary build. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_interrupt_count = 0; #endif @@ -33599,7 +33599,7 @@ int sqlite3_interrupt_count = 0; ** has no function other than to help verify the correct operation of the ** library. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_sort_count = 0; #endif @@ -33610,7 +33610,7 @@ int sqlite3_sort_count = 0; ** is working correctly. This variable has no function other than to ** help verify the correct operation of the library. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_max_blobsize = 0; #endif @@ -33655,7 +33655,7 @@ int sqlite3_max_blobsize = 0; #define GetVarint(A,B) ((B = *(A))<=0x7f ? 1 : sqlite3GetVarint32(A, &B)) /* -** An ephemeral string value (signified by the MEM_Ephem flag) contains +** An ephemeral string value (signified by the MEM_Ephem flag) tqcontains ** a pointer to a dynamically allocated string where some other entity ** is responsible for deallocating that string. Because the stack entry ** does not control the string, it might be deleted without the stack @@ -33686,18 +33686,18 @@ int sqlite3_max_blobsize = 0; static void _storeTypeInfo(Mem *pMem){ int flags = pMem->flags; if( flags & MEM_Null ){ - pMem->type = SQLITE_NULL; + pMem->type = STQLITE_NULL; } else if( flags & MEM_Int ){ - pMem->type = SQLITE_INTEGER; + pMem->type = STQLITE_INTEGER; } else if( flags & MEM_Real ){ - pMem->type = SQLITE_FLOAT; + pMem->type = STQLITE_FLOAT; } else if( flags & MEM_Str ){ - pMem->type = SQLITE_TEXT; + pMem->type = STQLITE_TEXT; }else{ - pMem->type = SQLITE_BLOB; + pMem->type = STQLITE_BLOB; } } @@ -33744,7 +33744,7 @@ static void applyNumericAffinity(Mem *pRec){ if( (pRec->flags&MEM_Str) && sqlite3IsNumber(pRec->z, &realnum, pRec->enc) ){ i64 value; - sqlite3VdbeChangeEncoding(pRec, SQLITE_UTF8); + sqlite3VdbeChangeEncoding(pRec, STQLITE_UTF8); if( !realnum && sqlite3Atoi64(pRec->z, &value) ){ sqlite3VdbeMemRelease(pRec); pRec->u.i = value; @@ -33759,23 +33759,23 @@ static void applyNumericAffinity(Mem *pRec){ /* ** Processing is determine by the affinity parameter: ** -** SQLITE_AFF_INTEGER: -** SQLITE_AFF_REAL: -** SQLITE_AFF_NUMERIC: +** STQLITE_AFF_INTEGER: +** STQLITE_AFF_REAL: +** STQLITE_AFF_NUMERIC: ** Try to convert pRec to an integer representation or a ** floating-point representation if an integer representation ** is not possible. Note that the integer representation is ** always preferred, even if the affinity is REAL, because ** an integer representation is more space efficient on disk. ** -** SQLITE_AFF_TEXT: +** STQLITE_AFF_TEXT: ** Convert pRec to a text representation. ** -** SQLITE_AFF_NONE: +** STQLITE_AFF_NONE: ** No-op. pRec is unchanged. */ static void applyAffinity(Mem *pRec, char affinity, u8 enc){ - if( affinity==SQLITE_AFF_TEXT ){ + if( affinity==STQLITE_AFF_TEXT ){ /* Only attempt the conversion to TEXT if there is an integer or real ** representation (blob and NULL do not get converted) but no string ** representation. @@ -33784,9 +33784,9 @@ static void applyAffinity(Mem *pRec, char affinity, u8 enc){ sqlite3VdbeMemStringify(pRec, enc); } pRec->flags &= ~(MEM_Real|MEM_Int); - }else if( affinity!=SQLITE_AFF_NONE ){ - assert( affinity==SQLITE_AFF_INTEGER || affinity==SQLITE_AFF_REAL - || affinity==SQLITE_AFF_NUMERIC ); + }else if( affinity!=STQLITE_AFF_NONE ){ + assert( affinity==STQLITE_AFF_INTEGER || affinity==STQLITE_AFF_REAL + || affinity==STQLITE_AFF_NUMERIC ); applyNumericAffinity(pRec); if( pRec->flags & MEM_Real ){ sqlite3VdbeIntegerAffinity(pRec); @@ -33813,16 +33813,16 @@ int sqlite3_value_numeric_type(sqlite3_value *pVal){ ** Exported version of applyAffinity(). This one works on sqlite3_value*, ** not the internal Mem* type. */ -SQLITE_PRIVATE void sqlite3ValueApplyAffinity(sqlite3_value *pVal, u8 affinity, u8 enc){ +STQLITE_PRIVATE void sqlite3ValueApplyAffinity(sqlite3_value *pVal, u8 affinity, u8 enc){ applyAffinity((Mem *)pVal, affinity, enc); } -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG /* ** Write a nice string representation of the contents of cell pMem ** into buffer zBuf, length nBuf. */ -SQLITE_PRIVATE void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf){ +STQLITE_PRIVATE void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf){ char *zCsr = zBuf; int f = pMem->flags; @@ -33940,34 +33940,34 @@ __inline__ unsigned long long int hwtime(void){ ** ** Whenever a row or result data is available, this routine will either ** invoke the result callback (if there is one) or return with -** SQLITE_ROW. +** STQLITE_ROW. ** ** If an attempt is made to open a locked database, then this routine ** will either invoke the busy callback (if there is one) or it will -** return SQLITE_BUSY. +** return STQLITE_BUSY. ** ** If an error occurs, an error message is written to memory obtained ** from sqliteMalloc() and p->zErrMsg is made to point to that memory. -** The error code is stored in p->rc and this routine returns SQLITE_ERROR. +** The error code is stored in p->rc and this routine returns STQLITE_ERROR. ** ** If the callback ever returns non-zero, then the program exits ** immediately. There will be no error message but the p->rc field is -** set to SQLITE_ABORT and this routine will return SQLITE_ERROR. +** set to STQLITE_ABORT and this routine will return STQLITE_ERROR. ** -** A memory allocation error causes p->rc to be set to SQLITE_NOMEM and this -** routine to return SQLITE_ERROR. +** A memory allocation error causes p->rc to be set to STQLITE_NOMEM and this +** routine to return STQLITE_ERROR. ** -** Other fatal errors return SQLITE_ERROR. +** Other fatal errors return STQLITE_ERROR. ** ** After this routine has finished, sqlite3VdbeFinalize() should be ** used to clean up the mess that was left behind. */ -SQLITE_PRIVATE int sqlite3VdbeExec( +STQLITE_PRIVATE int sqlite3VdbeExec( Vdbe *p /* The VDBE */ ){ int pc; /* The program counter */ Op *pOp; /* Current operation */ - int rc = SQLITE_OK; /* Value to return */ + int rc = STQLITE_OK; /* Value to return */ sqlite3 *db = p->db; /* The database */ u8 encoding = ENC(db); /* The database encoding */ Mem *pTos; /* Top entry in the operand stack */ @@ -33975,23 +33975,23 @@ SQLITE_PRIVATE int sqlite3VdbeExec( unsigned long long start; /* CPU clock count at start of opcode */ int origPc; /* Program counter at start of opcode */ #endif -#ifndef SQLITE_OMIT_PROGRESS_CALLBACK +#ifndef STQLITE_OMIT_PROGRESS_CALLBACK int nProgressOps = 0; /* Opcodes executed since progress callback. */ #endif #ifndef NDEBUG Mem *pStackLimit; #endif - if( p->magic!=VDBE_MAGIC_RUN ) return SQLITE_MISUSE; - assert( db->magic==SQLITE_MAGIC_BUSY ); + if( p->magic!=VDBE_MAGIC_RUN ) return STQLITE_MISUSE; + assert( db->magic==STQLITE_MAGIC_BUSY ); pTos = p->pTos; - if( p->rc==SQLITE_NOMEM ){ + if( p->rc==STQLITE_NOMEM ){ /* This happens if a malloc() inside a call to sqlite3_column_text() or ** sqlite3_column_text16() failed. */ goto no_mem; } - assert( p->rc==SQLITE_OK || p->rc==SQLITE_BUSY ); - p->rc = SQLITE_OK; + assert( p->rc==STQLITE_OK || p->rc==STQLITE_BUSY ); + p->rc = STQLITE_OK; assert( p->explain==0 ); if( p->popStack ){ popStack(&pTos, p->popStack); @@ -34001,8 +34001,8 @@ SQLITE_PRIVATE int sqlite3VdbeExec( db->busyHandler.nBusy = 0; CHECK_FOR_INTERRUPT; sqlite3VdbeIOTraceSql(p); -#ifdef SQLITE_DEBUG - if( (p->db->flags & SQLITE_VdbeListing)!=0 +#ifdef STQLITE_DEBUG + if( (p->db->flags & STQLITE_VdbeListing)!=0 || sqlite3OsFileExists("vdbe_explain") ){ int i; @@ -34016,7 +34016,7 @@ SQLITE_PRIVATE int sqlite3VdbeExec( p->trace = stdout; } #endif - for(pc=p->pc; rc==SQLITE_OK; pc++){ + for(pc=p->pc; rc==STQLITE_OK; pc++){ assert( pc>=0 && pc<p->nOp ); assert( pTos<=&p->aStack[pc] ); if( sqlite3MallocFailed() ) goto no_mem; @@ -34026,9 +34026,9 @@ SQLITE_PRIVATE int sqlite3VdbeExec( #endif pOp = &p->aOp[pc]; - /* Only allow tracing if SQLITE_DEBUG is defined. + /* Only allow tracing if STQLITE_DEBUG is defined. */ -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG if( p->trace ){ if( pc==0 ){ printf("VDBE Execution Trace:\n"); @@ -34045,7 +34045,7 @@ SQLITE_PRIVATE int sqlite3VdbeExec( /* Check to see if we need to simulate an interrupt. This only happens ** if we have a special test build. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST if( sqlite3_interrupt_count>0 ){ sqlite3_interrupt_count--; if( sqlite3_interrupt_count==0 ){ @@ -34054,12 +34054,12 @@ SQLITE_PRIVATE int sqlite3VdbeExec( } #endif -#ifndef SQLITE_OMIT_PROGRESS_CALLBACK +#ifndef STQLITE_OMIT_PROGRESS_CALLBACK /* Call the progress callback if it is configured and the required number ** of VDBE ops have been executed (either since this invocation of ** sqlite3VdbeExec() or since last time the progress callback was called). ** If the progress callback returns non-zero, exit the virtual machine with - ** a return code SQLITE_ABORT. + ** a return code STQLITE_ABORT. */ if( db->xProgress ){ if( db->nProgressOps==nProgressOps ){ @@ -34068,7 +34068,7 @@ SQLITE_PRIVATE int sqlite3VdbeExec( prc =db->xProgress(db->pProgressArg); if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse; if( prc!=0 ){ - rc = SQLITE_INTERRUPT; + rc = STQLITE_INTERRUPT; goto vdbe_halt; } nProgressOps = 0; @@ -34105,7 +34105,7 @@ SQLITE_PRIVATE int sqlite3VdbeExec( ** big comment (similar to this one) will mark the point in the code where ** we transition back to normal indentation. ** -** The formatting of each case is important. The makefile for SQLite +** The formatting of each case is important. The makefile for STQLite ** generates two C files "opcodes.h" and "opcodes.c" by scanning this ** file looking for lines that begin with "case OP_". The opcodes.h files ** will be filled with #defines that give unique integer values to each @@ -34114,7 +34114,7 @@ SQLITE_PRIVATE int sqlite3VdbeExec( ** case statement is followed by a comment of the form "/# same as ... #/" ** that comment is used to determine the particular value of the opcode. ** -** If a comment on the same line as the "case OP_" construction contains +** If a comment on the same line as the "case OP_" construction tqcontains ** the word "no-push", then the opcode is guarenteed not to grow the ** vdbe stack when it is executed. See function opcode() in ** vdbeaux.c for details. @@ -34180,7 +34180,7 @@ case OP_Return: { /* no-push */ ** automatically. ** ** P1 is the result code returned by sqlite3_exec(), sqlite3_reset(), -** or sqlite3_finalize(). For a normal halt, this should be SQLITE_OK (0). +** or sqlite3_finalize(). For a normal halt, this should be STQLITE_OK (0). ** For errors, it can be some other value. If P1!=0 then P2 will determine ** whether or not to rollback the current transaction. Do not rollback ** if P2==OE_Fail. Do the rollback if P2==OE_Rollback. If P2==OE_Abort, @@ -34202,12 +34202,12 @@ case OP_Halt: { /* no-push */ sqlite3SetString(&p->zErrMsg, pOp->p3, (char*)0); } rc = sqlite3VdbeHalt(p); - assert( rc==SQLITE_BUSY || rc==SQLITE_OK ); - if( rc==SQLITE_BUSY ){ - p->rc = SQLITE_BUSY; - return SQLITE_BUSY; + assert( rc==STQLITE_BUSY || rc==STQLITE_OK ); + if( rc==STQLITE_BUSY ){ + p->rc = STQLITE_BUSY; + return STQLITE_BUSY; } - return p->rc ? SQLITE_ERROR : SQLITE_DONE; + return p->rc ? STQLITE_ERROR : STQLITE_DONE; } /* Opcode: Integer P1 * * @@ -34232,7 +34232,7 @@ case OP_Int64: { pTos->flags = MEM_Str|MEM_Static|MEM_Term; pTos->z = pOp->p3; pTos->n = strlen(pTos->z); - pTos->enc = SQLITE_UTF8; + pTos->enc = STQLITE_UTF8; pTos->u.i = sqlite3VdbeIntValue(pTos); pTos->flags |= MEM_Int; break; @@ -34247,7 +34247,7 @@ case OP_Real: { /* same as TK_FLOAT, */ pTos->flags = MEM_Str|MEM_Static|MEM_Term; pTos->z = pOp->p3; pTos->n = strlen(pTos->z); - pTos->enc = SQLITE_UTF8; + pTos->enc = STQLITE_UTF8; pTos->r = sqlite3VdbeRealValue(pTos); pTos->flags |= MEM_Real; sqlite3VdbeChangeEncoding(pTos, encoding); @@ -34263,15 +34263,15 @@ case OP_String8: { /* same as TK_STRING */ assert( pOp->p3!=0 ); pOp->opcode = OP_String; pOp->p1 = strlen(pOp->p3); - assert( SQLITE_MAX_SQL_LENGTH < SQLITE_MAX_LENGTH ); - assert( pOp->p1 < SQLITE_MAX_LENGTH ); + assert( STQLITE_MAX_STQL_LENGTH < STQLITE_MAX_LENGTH ); + assert( pOp->p1 < STQLITE_MAX_LENGTH ); -#ifndef SQLITE_OMIT_UTF16 - if( encoding!=SQLITE_UTF8 ){ +#ifndef STQLITE_OMIT_UTF16 + if( encoding!=STQLITE_UTF8 ){ pTos++; - sqlite3VdbeMemSetStr(pTos, pOp->p3, -1, SQLITE_UTF8, SQLITE_STATIC); - if( SQLITE_OK!=sqlite3VdbeChangeEncoding(pTos, encoding) ) goto no_mem; - if( SQLITE_OK!=sqlite3VdbeMemDynamicify(pTos) ) goto no_mem; + sqlite3VdbeMemSetStr(pTos, pOp->p3, -1, STQLITE_UTF8, STQLITE_STATIC); + if( STQLITE_OK!=sqlite3VdbeChangeEncoding(pTos, encoding) ) goto no_mem; + if( STQLITE_OK!=sqlite3VdbeMemDynamicify(pTos) ) goto no_mem; pTos->flags &= ~(MEM_Dyn); pTos->flags |= MEM_Static; if( pOp->p3type==P3_DYNAMIC ){ @@ -34280,7 +34280,7 @@ case OP_String8: { /* same as TK_STRING */ pOp->p3type = P3_DYNAMIC; pOp->p3 = pTos->z; pOp->p1 = pTos->n; - assert( pOp->p1 < SQLITE_MAX_LENGTH ); /* Due to SQLITE_MAX_SQL_LENGTH */ + assert( pOp->p1 < STQLITE_MAX_LENGTH ); /* Due to STQLITE_MAX_STQL_LENGTH */ break; } #endif @@ -34292,7 +34292,7 @@ case OP_String8: { /* same as TK_STRING */ ** The string value P3 of length P1 (bytes) is pushed onto the stack. */ case OP_String: { - assert( pOp->p1 < SQLITE_MAX_LENGTH ); /* Due to SQLITE_MAX_SQL_LENGTH */ + assert( pOp->p1 < STQLITE_MAX_LENGTH ); /* Due to STQLITE_MAX_STQL_LENGTH */ pTos++; assert( pOp->p3!=0 ); pTos->flags = MEM_Str|MEM_Static|MEM_Term; @@ -34314,7 +34314,7 @@ case OP_Null: { } -#ifndef SQLITE_OMIT_BLOB_LITERAL +#ifndef STQLITE_OMIT_BLOB_LITERAL /* Opcode: HexBlob * * P3 ** ** P3 is an UTF-8 SQL hex encoding of a blob. The blob is pushed onto the @@ -34326,8 +34326,8 @@ case OP_Null: { case OP_HexBlob: { /* same as TK_BLOB */ pOp->opcode = OP_Blob; pOp->p1 = strlen(pOp->p3)/2; - assert( SQLITE_MAX_SQL_LENGTH < SQLITE_MAX_LENGTH ); - assert( pOp->p1 < SQLITE_MAX_LENGTH ); + assert( STQLITE_MAX_STQL_LENGTH < STQLITE_MAX_LENGTH ); + assert( pOp->p1 < STQLITE_MAX_LENGTH ); if( pOp->p1 ){ char *zBlob = sqlite3HexToBlob(pOp->p3); if( !zBlob ) goto no_mem; @@ -34358,12 +34358,12 @@ case OP_HexBlob: { /* same as TK_BLOB */ */ case OP_Blob: { pTos++; - assert( pOp->p1 < SQLITE_MAX_LENGTH ); /* Due to SQLITE_MAX_SQL_LENGTH */ + assert( pOp->p1 < STQLITE_MAX_LENGTH ); /* Due to STQLITE_MAX_STQL_LENGTH */ sqlite3VdbeMemSetStr(pTos, pOp->p3, pOp->p1, 0, 0); pTos->enc = encoding; break; } -#endif /* SQLITE_OMIT_BLOB_LITERAL */ +#endif /* STQLITE_OMIT_BLOB_LITERAL */ /* Opcode: Variable P1 * * ** @@ -34480,7 +34480,7 @@ case OP_Push: { /* no-push */ ** ** The top P1 values on the stack represent a single result row from ** a query. This opcode causes the sqlite3_step() call to terminate -** with an SQLITE_ROW return code and it sets up the sqlite3_stmt +** with an STQLITE_ROW return code and it sets up the sqlite3_stmt ** structure to provide access to the top P1 values as the result ** row. When the sqlite3_step() function is run again, the top P1 ** values will be automatically popped from the stack before the next @@ -34522,7 +34522,7 @@ case OP_Callback: { /* no-push */ p->popStack = pOp->p1; p->pc = pc + 1; p->pTos = pTos; - return SQLITE_ROW; + return STQLITE_ROW; } /* Opcode: Concat P1 P2 * @@ -34571,7 +34571,7 @@ case OP_Concat: { /* same as TK_CONCAT */ /* Otherwise malloc() space for the result and concatenate all the ** stack values. */ - if( nByte+2>SQLITE_MAX_LENGTH ){ + if( nByte+2>STQLITE_MAX_LENGTH ){ goto too_big; } zNew = sqliteMallocRaw( nByte+2 ); @@ -34760,7 +34760,7 @@ case OP_CollSeq: { /* no-push */ ** defines the function) with P2 arguments taken from the stack. Pop all ** arguments from the stack and push back the result. ** -** P1 is a 32-bit bitmask indicating whether or not each argument to the +** P1 is a 32-bit bittqmask indicating whether or not each argument to the ** function was determined to be constant at compile time. If the first ** argument was constant then bit 0 of P1 is set. This is used to determine ** whether meta data associated with a user function argument using the @@ -34822,7 +34822,7 @@ case OP_Function: { /* If the function returned an error, throw an exception */ if( ctx.isError ){ sqlite3SetString(&p->zErrMsg, sqlite3_value_text(&ctx.s), (char*)0); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } /* Copy the result of the function to the top of the stack */ @@ -34922,7 +34922,7 @@ case OP_AddImm: { /* no-push */ case OP_ForceInt: { /* no-push */ i64 v; assert( pTos>=p->aStack ); - applyAffinity(pTos, SQLITE_AFF_NUMERIC, encoding); + applyAffinity(pTos, STQLITE_AFF_NUMERIC, encoding); if( (pTos->flags & (MEM_Int|MEM_Real))==0 ){ Release(pTos); pTos--; @@ -34949,7 +34949,7 @@ case OP_ForceInt: { /* no-push */ ** Force the top of the stack to be an integer. If the top of the ** stack is not an integer and cannot be converted into an integer ** with out data loss, then jump immediately to P2, or if P2==0 -** raise an SQLITE_MISMATCH exception. +** raise an STQLITE_MISMATCH exception. ** ** If the top of the stack is not an integer and P2 is not zero and ** P1 is 1, then the stack is popped. In all other cases, the depth @@ -34957,10 +34957,10 @@ case OP_ForceInt: { /* no-push */ */ case OP_MustBeInt: { /* no-push */ assert( pTos>=p->aStack ); - applyAffinity(pTos, SQLITE_AFF_NUMERIC, encoding); + applyAffinity(pTos, STQLITE_AFF_NUMERIC, encoding); if( (pTos->flags & MEM_Int)==0 ){ if( pOp->p2==0 ){ - rc = SQLITE_MISMATCH; + rc = STQLITE_MISMATCH; goto abort_due_to_error; }else{ if( pOp->p1 ) popStack(&pTos, 1); @@ -34990,7 +34990,7 @@ case OP_RealAffinity: { /* no-push */ break; } -#ifndef SQLITE_OMIT_CAST +#ifndef STQLITE_OMIT_CAST /* Opcode: ToText * * * ** ** Force the value on the top of the stack to be text. @@ -35005,7 +35005,7 @@ case OP_ToText: { /* same as TK_TO_TEXT, no-push */ if( pTos->flags & MEM_Null ) break; assert( MEM_Str==(MEM_Blob>>3) ); pTos->flags |= (pTos->flags&MEM_Blob)>>3; - applyAffinity(pTos, SQLITE_AFF_TEXT, encoding); + applyAffinity(pTos, STQLITE_AFF_TEXT, encoding); rc = ExpandBlob(pTos); assert( pTos->flags & MEM_Str ); pTos->flags &= ~(MEM_Int|MEM_Real|MEM_Blob); @@ -35025,7 +35025,7 @@ case OP_ToBlob: { /* same as TK_TO_BLOB, no-push */ assert( pTos>=p->aStack ); if( pTos->flags & MEM_Null ) break; if( (pTos->flags & MEM_Blob)==0 ){ - applyAffinity(pTos, SQLITE_AFF_TEXT, encoding); + applyAffinity(pTos, STQLITE_AFF_TEXT, encoding); assert( pTos->flags & MEM_Str ); pTos->flags |= MEM_Blob; } @@ -35050,7 +35050,7 @@ case OP_ToNumeric: { /* same as TK_TO_NUMERIC, no-push */ } break; } -#endif /* SQLITE_OMIT_CAST */ +#endif /* STQLITE_OMIT_CAST */ /* Opcode: ToInt * * * ** @@ -35069,7 +35069,7 @@ case OP_ToInt: { /* same as TK_TO_INT, no-push */ break; } -#ifndef SQLITE_OMIT_CAST +#ifndef STQLITE_OMIT_CAST /* Opcode: ToReal * * * ** ** Force the value on the top of the stack to be a floating point number. @@ -35086,7 +35086,7 @@ case OP_ToReal: { /* same as TK_TO_REAL, no-push */ } break; } -#endif /* SQLITE_OMIT_CAST */ +#endif /* STQLITE_OMIT_CAST */ /* Opcode: Eq P1 P2 P3 ** @@ -35104,8 +35104,8 @@ case OP_ToReal: { /* same as TK_TO_REAL, no-push */ ** whereas it would normally be NULL. Similarly, NULL==123 is false when ** 0x200 is set but is NULL when the 0x200 bit of P1 is clear. ** -** The least significant byte of P1 (mask 0xff) must be an affinity character - -** SQLITE_AFF_TEXT, SQLITE_AFF_INTEGER, and so forth. An attempt is made +** The least significant byte of P1 (tqmask 0xff) must be an affinity character - +** STQLITE_AFF_TEXT, STQLITE_AFF_INTEGER, and so forth. An attempt is made ** to coerce both values ** according to the affinity before the comparison is made. If the byte is ** 0x00, then numeric affinity is used. @@ -35357,7 +35357,7 @@ case OP_BitNot: { /* same as TK_BITNOT, no-push */ */ /* ** The magic Explain opcode are only inserted when explain==2 (which -** is to say when the EXPLAIN QUERY PLAN syntax is used.) +** is to say when the EXPLAIN TQUERY PLAN syntax is used.) ** This opcode records information from the optimizer. It is the ** the same as a no-op. This opcodesnever appears in a real VM program. */ @@ -35393,7 +35393,7 @@ case OP_IfNot: { /* no-push */ if( pTos->flags & MEM_Null ){ c = pOp->p1; }else{ -#ifdef SQLITE_OMIT_FLOATING_POINT +#ifdef STQLITE_OMIT_FLOATING_POINT c = sqlite3VdbeIntValue(pTos); #else c = sqlite3VdbeRealValue(pTos)!=0.0; @@ -35517,7 +35517,7 @@ case OP_Column: { ** which is the number of records. */ pC = p->apCsr[p1]; -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE assert( pC->pVtabCursor==0 ); #endif assert( pC!=0 ); @@ -35529,7 +35529,7 @@ case OP_Column: { pCrsr = pC->pCursor; if( pC->nullRow ){ payloadSize = 0; - }else if( pC->cacheStatus==p->cacheCtr ){ + }else if( pC->cachetqStatus==p->cacheCtr ){ payloadSize = pC->payloadSize; zRec = (char*)pC->aRow; }else if( pC->isIndex ){ @@ -35544,7 +35544,7 @@ case OP_Column: { /* The record is the sole entry of a pseudo-table */ payloadSize = pC->nData; zRec = pC->pData; - pC->cacheStatus = CACHE_STALE; + pC->cachetqStatus = CACHE_STALE; assert( payloadSize==0 || zRec!=0 ); nField = pC->nField; pCrsr = 0; @@ -35560,7 +35560,7 @@ case OP_Column: { assert( pTos->flags==MEM_Null ); break; } - if( payloadSize>SQLITE_MAX_LENGTH ){ + if( payloadSize>STQLITE_MAX_LENGTH ){ goto too_big; } @@ -35569,7 +35569,7 @@ case OP_Column: { /* Read and parse the table header. Store the results of the parse ** into the record header cache fields of the cursor. */ - if( pC && pC->cacheStatus==p->cacheCtr ){ + if( pC && pC->cachetqStatus==p->cacheCtr ){ aType = pC->aType; aOffset = pC->aOffset; }else{ @@ -35588,7 +35588,7 @@ case OP_Column: { } pC->aOffset = aOffset = &aType[nField]; pC->payloadSize = payloadSize; - pC->cacheStatus = p->cacheCtr; + pC->cachetqStatus = p->cacheCtr; /* Figure out how many bytes are in the header */ if( zRec ){ @@ -35624,7 +35624,7 @@ case OP_Column: { */ if( !zRec && avail<offset ){ rc = sqlite3VdbeMemFromBtree(pCrsr, 0, offset, pC->isIndex, &sMem); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto op_column_out; } zData = sMem.z; @@ -35660,7 +35660,7 @@ case OP_Column: { ** record, then we must be dealing with a corrupt database. */ if( zIdx>zEndHdr || offset>payloadSize ){ - rc = SQLITE_CORRUPT_BKPT; + rc = STQLITE_CORRUPT_BKPT; goto op_column_out; } } @@ -35672,13 +35672,13 @@ case OP_Column: { ** a pointer to a Mem object. */ if( aOffset[p2] ){ - assert( rc==SQLITE_OK ); + assert( rc==STQLITE_OK ); if( zRec ){ zData = &zRec[aOffset[p2]]; }else{ len = sqlite3VdbeSerialTypeLen(aType[p2]); rc = sqlite3VdbeMemFromBtree(pCrsr, aOffset[p2], len, pC->isIndex,&sMem); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto op_column_out; } zData = sMem.z; @@ -35737,7 +35737,7 @@ op_column_out: ** field of the index key (i.e. the first character of P3 corresponds to the ** lowest element on the stack). ** -** The mapping from character to affinity is given by the SQLITE_AFF_ +** The mapping from character to affinity is given by the STQLITE_AFF_ ** macros defined in sqliteInt.h. ** ** If P3 is NULL then all index fields have the affinity NONE. @@ -35846,7 +35846,7 @@ case OP_MakeRecord: { nHdr++; } nByte = nHdr+nData-nZero; - if( nByte>SQLITE_MAX_LENGTH ){ + if( nByte>STQLITE_MAX_LENGTH ){ goto too_big; } @@ -35898,7 +35898,7 @@ case OP_MakeRecord: { pTos->u.i = nZero; pTos->flags |= MEM_Zero; } - pTos->enc = SQLITE_UTF8; /* In case the blob is ever converted to text */ + pTos->enc = STQLITE_UTF8; /* In case the blob is ever converted to text */ /* If a NULL was encountered and jumpIfNull is non-zero, take the jump. */ if( jumpIfNull && containsNull ){ @@ -35956,7 +35956,7 @@ case OP_AutoCommit: { /* no-push */ */ sqlite3SetString(&p->zErrMsg, "cannot ", rollback?"rollback":"commit", " transaction - SQL statements in progress", (char*)0); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; }else if( i!=db->autoCommit ){ if( pOp->p2 ){ assert( i==1 ); @@ -35964,18 +35964,18 @@ case OP_AutoCommit: { /* no-push */ db->autoCommit = 1; }else{ db->autoCommit = i; - if( sqlite3VdbeHalt(p)==SQLITE_BUSY ){ + if( sqlite3VdbeHalt(p)==STQLITE_BUSY ){ p->pTos = pTos; p->pc = pc; db->autoCommit = 1-i; - p->rc = SQLITE_BUSY; - return SQLITE_BUSY; + p->rc = STQLITE_BUSY; + return STQLITE_BUSY; } } - if( p->rc==SQLITE_OK ){ - return SQLITE_DONE; + if( p->rc==STQLITE_OK ){ + return STQLITE_DONE; }else{ - return SQLITE_ERROR; + return STQLITE_ERROR; } }else{ sqlite3SetString(&p->zErrMsg, @@ -35983,7 +35983,7 @@ case OP_AutoCommit: { /* no-push */ (rollback)?"cannot rollback - no transaction is active": "cannot commit - no transaction is active"), (char*)0); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } break; } @@ -36017,13 +36017,13 @@ case OP_Transaction: { /* no-push */ if( pBt ){ rc = sqlite3BtreeBeginTrans(pBt, pOp->p2); - if( rc==SQLITE_BUSY ){ + if( rc==STQLITE_BUSY ){ p->pc = pc; - p->rc = SQLITE_BUSY; + p->rc = STQLITE_BUSY; p->pTos = pTos; - return SQLITE_BUSY; + return STQLITE_BUSY; } - if( rc!=SQLITE_OK && rc!=SQLITE_READONLY /* && rc!=SQLITE_BUSY */ ){ + if( rc!=STQLITE_OK && rc!=STQLITE_READONLY /* && rc!=STQLITE_BUSY */ ){ goto abort_due_to_error; } } @@ -36052,7 +36052,7 @@ case OP_ReadCookie: { int iDb = pOp->p1; int iCookie = pOp->p2; - assert( pOp->p2<SQLITE_N_BTREE_META ); + assert( pOp->p2<STQLITE_N_BTREE_META ); if( iDb<0 ){ iDb = (-1*(iDb+1)); iCookie *= -1; @@ -36085,7 +36085,7 @@ case OP_ReadCookie: { */ case OP_SetCookie: { /* no-push */ Db *pDb; - assert( pOp->p2<SQLITE_N_BTREE_META ); + assert( pOp->p2<STQLITE_N_BTREE_META ); assert( pOp->p1>=0 && pOp->p1<db->nDb ); pDb = &db->aDb[pOp->p1]; assert( pDb->pBt!=0 ); @@ -36096,7 +36096,7 @@ case OP_SetCookie: { /* no-push */ if( pOp->p2==0 ){ /* When the schema cookie changes, record the new cookie internally */ pDb->pSchema->schema_cookie = pTos->u.i; - db->flags |= SQLITE_InternChanges; + db->flags |= STQLITE_InternChanges; }else if( pOp->p2==1 ){ /* Record changes in the file format */ pDb->pSchema->file_format = pTos->u.i; @@ -36135,22 +36135,22 @@ case OP_VerifyCookie: { /* no-push */ if( pBt ){ rc = sqlite3BtreeGetMeta(pBt, 1, (u32 *)&iMeta); }else{ - rc = SQLITE_OK; + rc = STQLITE_OK; iMeta = 0; } - if( rc==SQLITE_OK && iMeta!=pOp->p2 ){ + if( rc==STQLITE_OK && iMeta!=pOp->p2 ){ sqlite3SetString(&p->zErrMsg, "database schema has changed", (char*)0); /* If the schema-cookie from the database file matches the cookie ** stored with the in-memory representation of the schema, do ** not reload the schema from the database file. ** ** If virtual-tables are in use, this is not just an optimisation. - ** Often, v-tables store their data in other SQLite tables, which + ** Often, v-tables store their data in other STQLite tables, which ** are queried from within xNext() and other v-table methods using ** 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 invalidated whenever sqlite3_step() is called from within + ** to be tqinvalidated whenever sqlite3_step() is called from within ** a v-table method. */ if( db->aDb[pOp->p1].pSchema->schema_cookie!=iMeta ){ @@ -36158,7 +36158,7 @@ case OP_VerifyCookie: { /* no-push */ } sqlite3ExpirePreparedStatements(db); - rc = SQLITE_SCHEMA; + rc = STQLITE_SCHEMA; } break; } @@ -36182,7 +36182,7 @@ case OP_VerifyCookie: { /* no-push */ ** any other process from modifying the database. The read lock is ** released when all cursors are closed. If this instruction attempts ** to get a read lock but fails, the script terminates with an -** SQLITE_BUSY error code. +** STQLITE_BUSY error code. ** ** The P3 value is a pointer to a KeyInfo structure that defines the ** content and collating sequence of indices. P3 is NULL for cursors @@ -36259,22 +36259,22 @@ case OP_OpenWrite: { /* no-push */ pCur->pIncrKey = &pCur->bogusIncrKey; } switch( rc ){ - case SQLITE_BUSY: { + case STQLITE_BUSY: { p->pc = pc; - p->rc = SQLITE_BUSY; + p->rc = STQLITE_BUSY; p->pTos = &pTos[1 + (pOp->p2<=0)]; /* Operands must remain on stack */ - return SQLITE_BUSY; + return STQLITE_BUSY; } - case SQLITE_OK: { + case STQLITE_OK: { int flags = sqlite3BtreeFlags(pCur->pCursor); /* Sanity checking. Only the lower four bits of the flags byte should - ** be used. Bit 3 (mask 0x08) is unpreditable. The lower 3 bits - ** (mask 0x07) should be either 5 (intkey+leafdata for tables) or + ** be used. Bit 3 (tqmask 0x08) is unpreditable. The lower 3 bits + ** (tqmask 0x07) should be either 5 (intkey+leafdata for tables) or ** 2 (zerodata for indices). If these conditions are not met it can ** only mean that we are dealing with a corrupt database file */ if( (flags & 0xf0)!=0 || ((flags & 0x07)!=5 && (flags & 0x07)!=2) ){ - rc = SQLITE_CORRUPT_BKPT; + rc = STQLITE_CORRUPT_BKPT; goto abort_due_to_error; } pCur->isTable = (flags & BTREE_INTKEY)!=0; @@ -36285,15 +36285,15 @@ case OP_OpenWrite: { /* no-push */ */ if( (pCur->isTable && pOp->p3type==P3_KEYINFO) || (pCur->isIndex && pOp->p3type!=P3_KEYINFO) ){ - rc = SQLITE_CORRUPT_BKPT; + rc = STQLITE_CORRUPT_BKPT; goto abort_due_to_error; } break; } - case SQLITE_EMPTY: { + case STQLITE_EMPTY: { pCur->isTable = pOp->p3type!=P3_KEYINFO; pCur->isIndex = !pCur->isTable; - rc = SQLITE_OK; + rc = STQLITE_OK; break; } default: { @@ -36328,11 +36328,11 @@ case OP_OpenEphemeral: { /* no-push */ pCx = allocateCursor(p, i, -1); if( pCx==0 ) goto no_mem; pCx->nullRow = 1; - rc = sqlite3BtreeFactory(db, 0, 1, SQLITE_DEFAULT_TEMP_CACHE_SIZE, &pCx->pBt); - if( rc==SQLITE_OK ){ + rc = sqlite3BtreeFactory(db, 0, 1, STQLITE_DEFAULT_TEMP_CACHE_SIZE, &pCx->pBt); + if( rc==STQLITE_OK ){ rc = sqlite3BtreeBeginTrans(pCx->pBt, 1); } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ /* If a transient index is required, create it by calling ** sqlite3BtreeCreateTable() with the BTREE_ZERODATA flag before ** opening it. If a transient table is required, just use the @@ -36342,7 +36342,7 @@ case OP_OpenEphemeral: { /* no-push */ int pgno; assert( pOp->p3type==P3_KEYINFO ); rc = sqlite3BtreeCreateTable(pCx->pBt, &pgno, BTREE_ZERODATA); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ assert( pgno==MASTER_ROOT+1 ); rc = sqlite3BtreeCursor(pCx->pBt, pgno, 1, sqlite3VdbeRecordCompare, pOp->p3, &pCx->pCursor); @@ -36470,7 +36470,7 @@ case OP_MoveGt: { /* no-push */ break; } rc = sqlite3BtreeMoveto(pC->pCursor, 0, (u64)iKey, 0, &res); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto abort_due_to_error; } pC->lastRowid = pTos->u.i; @@ -36479,21 +36479,21 @@ case OP_MoveGt: { /* no-push */ assert( pTos->flags & MEM_Blob ); ExpandBlob(pTos); rc = sqlite3BtreeMoveto(pC->pCursor, pTos->z, pTos->n, 0, &res); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto abort_due_to_error; } pC->rowidIsValid = 0; } pC->deferredMoveto = 0; - pC->cacheStatus = CACHE_STALE; + pC->cachetqStatus = CACHE_STALE; *pC->pIncrKey = 0; -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST sqlite3_search_count++; #endif if( oc==OP_MoveGe || oc==OP_MoveGt ){ if( res<0 ){ rc = sqlite3BtreeNext(pC->pCursor, &res); - if( rc!=SQLITE_OK ) goto abort_due_to_error; + if( rc!=STQLITE_OK ) goto abort_due_to_error; pC->rowidIsValid = 0; }else{ res = 0; @@ -36502,7 +36502,7 @@ case OP_MoveGt: { /* no-push */ assert( oc==OP_MoveLt || oc==OP_MoveLe ); if( res>=0 ){ rc = sqlite3BtreePrevious(pC->pCursor, &res); - if( rc!=SQLITE_OK ) goto abort_due_to_error; + if( rc!=STQLITE_OK ) goto abort_due_to_error; pC->rowidIsValid = 0; }else{ /* res might be negative because the table is empty. Check to @@ -36587,9 +36587,9 @@ case OP_Found: { /* no-push */ assert( pTos->flags & MEM_Blob ); Stringify(pTos, encoding); rx = sqlite3BtreeMoveto(pC->pCursor, pTos->z, pTos->n, 0, &res); - alreadyExists = rx==SQLITE_OK && res==0; + alreadyExists = rx==STQLITE_OK && res==0; pC->deferredMoveto = 0; - pC->cacheStatus = CACHE_STALE; + pC->cachetqStatus = CACHE_STALE; } if( pOp->opcode==OP_Found ){ if( alreadyExists ) pc = pOp->p2 - 1; @@ -36664,9 +36664,9 @@ case OP_IsUnique: { /* no-push */ ** If there is no such entry, jump immediately to P2. */ assert( pCx->deferredMoveto==0 ); - pCx->cacheStatus = CACHE_STALE; + pCx->cachetqStatus = CACHE_STALE; rc = sqlite3BtreeMoveto(pCrsr, zKey, len, 0, &res); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto abort_due_to_error; } if( res<0 ){ @@ -36677,7 +36677,7 @@ case OP_IsUnique: { /* no-push */ } } rc = sqlite3VdbeIdxKeyCompare(pCx, len, (u8*)zKey, &res); - if( rc!=SQLITE_OK ) goto abort_due_to_error; + if( rc!=STQLITE_OK ) goto abort_due_to_error; if( res>0 ){ pc = pOp->p2 - 1; break; @@ -36689,7 +36689,7 @@ case OP_IsUnique: { /* no-push */ ** immediately to P2. */ rc = sqlite3VdbeIdxRowid(pCrsr, &v); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto abort_due_to_error; } if( v==R ){ @@ -36698,7 +36698,7 @@ case OP_IsUnique: { /* no-push */ } /* The final varint of the key is different from R. Push it onto - ** the stack. (The record number of an entry that violates a UNIQUE + ** the stack. (The record number of an entry that violates a UNITQUE ** constraint.) */ pTos++; @@ -36739,8 +36739,8 @@ case OP_NotExists: { /* no-push */ pC->lastRowid = pTos->u.i; pC->rowidIsValid = res==0; pC->nullRow = 0; - pC->cacheStatus = CACHE_STALE; - /* res might be uninitialized if rc!=SQLITE_OK. But if rc!=SQLITE_OK + pC->cachetqStatus = CACHE_STALE; + /* res might be uninitialized if rc!=STQLITE_OK. But if rc!=STQLITE_OK ** processing is about to abort so we really do not care whether or not ** the following jump is taken. (In other words, do not stress over ** the error that valgrind sometimes shows on the next statement when @@ -36767,7 +36767,7 @@ case OP_Sequence: { assert( i>=0 && i<p->nCursor ); assert( p->apCsr[i]!=0 ); pTos++; - pTos->u.i = p->apCsr[i]->seqCount++; + pTos->u.i = p->apCsr[i]->setqCount++; pTos->flags = MEM_Int; break; } @@ -36782,7 +36782,7 @@ case OP_Sequence: { ** ** If P2>0 then P2 is a memory cell that holds the largest previously ** generated record number. No new record numbers are allowed to be less -** than this value. When this value reaches its maximum, a SQLITE_FULL +** than this value. When this value reaches its maximum, a STQLITE_FULL ** error is generated. The P2 memory cell is updated with the generated ** record number. This P2 mechanism is used to help implement the ** AUTOINCREMENT feature. @@ -36819,7 +36819,7 @@ case OP_NewRowid: { ** source of random numbers. Is a library function like lrand48() ** good enough? Maybe. Maybe not. It's hard to know whether there ** might be subtle bugs is some implementations of lrand48() that - ** could cause problems. To avoid uncertainty, SQLite uses its own + ** could cause problems. To avoid uncertainty, STQLite uses its own ** random number generator based on the RC4 algorithm. ** ** To promote locality of reference for repetitive inserts, the @@ -36827,18 +36827,18 @@ case OP_NewRowid: { ** larger than the previous rowid. This has been shown experimentally ** to double the speed of the COPY operation. */ - int res, rx=SQLITE_OK, cnt; + int res, rx=STQLITE_OK, cnt; i64 x; cnt = 0; if( (sqlite3BtreeFlags(pC->pCursor)&(BTREE_INTKEY|BTREE_ZERODATA)) != BTREE_INTKEY ){ - rc = SQLITE_CORRUPT_BKPT; + rc = STQLITE_CORRUPT_BKPT; goto abort_due_to_error; } assert( (sqlite3BtreeFlags(pC->pCursor) & BTREE_INTKEY)!=0 ); assert( (sqlite3BtreeFlags(pC->pCursor) & BTREE_ZERODATA)==0 ); -#ifdef SQLITE_32BIT_ROWID +#ifdef STQLITE_32BIT_ROWID # define MAX_ROWID 0x7fffffff #else /* Some compilers complain about constants of the form 0x7fffffffffffffff. @@ -36853,7 +36853,7 @@ case OP_NewRowid: { v = pC->nextRowid; }else{ rc = sqlite3BtreeLast(pC->pCursor, &res); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto abort_due_to_error; } if( res ){ @@ -36869,7 +36869,7 @@ case OP_NewRowid: { } } -#ifndef SQLITE_OMIT_AUTOINCREMENT +#ifndef STQLITE_OMIT_AUTOINCREMENT if( pOp->p2 ){ Mem *pMem; assert( pOp->p2>0 && pOp->p2<p->nMem ); /* P2 is a valid memory cell */ @@ -36877,7 +36877,7 @@ case OP_NewRowid: { sqlite3VdbeMemIntegerify(pMem); assert( (pMem->flags & MEM_Int)!=0 ); /* mem(P2) holds an integer */ if( pMem->u.i==MAX_ROWID || pC->useRandomRowid ){ - rc = SQLITE_FULL; + rc = STQLITE_FULL; goto abort_due_to_error; } if( v<pMem->u.i+1 ){ @@ -36895,7 +36895,7 @@ case OP_NewRowid: { } } if( pC->useRandomRowid ){ - assert( pOp->p2==0 ); /* SQLITE_FULL must have occurred prior to this */ + assert( pOp->p2==0 ); /* STQLITE_FULL must have occurred prior to this */ v = db->priorNewRowid; cnt = 0; do{ @@ -36911,16 +36911,16 @@ case OP_NewRowid: { x = intToKey(v); rx = sqlite3BtreeMoveto(pC->pCursor, 0, (u64)x, 0, &res); cnt++; - }while( cnt<1000 && rx==SQLITE_OK && res==0 ); + }while( cnt<1000 && rx==STQLITE_OK && res==0 ); db->priorNewRowid = v; - if( rx==SQLITE_OK && res==0 ){ - rc = SQLITE_FULL; + if( rx==STQLITE_OK && res==0 ){ + rc = STQLITE_FULL; goto abort_due_to_error; } } pC->rowidIsValid = 0; pC->deferredMoveto = 0; - pC->cacheStatus = CACHE_STALE; + pC->cachetqStatus = CACHE_STALE; } pTos++; pTos->u.i = v; @@ -37002,13 +37002,13 @@ case OP_Insert: { /* no-push */ pC->rowidIsValid = 0; pC->deferredMoveto = 0; - pC->cacheStatus = CACHE_STALE; + pC->cachetqStatus = CACHE_STALE; /* Invoke the update-hook if required. */ - if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p3 ){ + if( rc==STQLITE_OK && db->xUpdateCallback && pOp->p3 ){ const char *zDb = db->aDb[pC->iDb].zName; const char *zTbl = pOp->p3; - int op = ((pOp->p2 & OPFLAG_ISUPDATE) ? SQLITE_UPDATE : SQLITE_INSERT); + int op = ((pOp->p2 & OPFLAG_ISUPDATE) ? STQLITE_UPDATE : STQLITE_INSERT); assert( pC->isTable ); db->xUpdateCallback(db->pUpdateArg, op, zDb, zTbl, iKey); assert( pC->iDb>=0 ); @@ -37062,13 +37062,13 @@ case OP_Delete: { /* no-push */ if( rc ) goto abort_due_to_error; rc = sqlite3BtreeDelete(pC->pCursor); pC->nextRowidValid = 0; - pC->cacheStatus = CACHE_STALE; + pC->cachetqStatus = CACHE_STALE; /* Invoke the update-hook if required. */ - if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p3 ){ + if( rc==STQLITE_OK && db->xUpdateCallback && pOp->p3 ){ const char *zDb = db->aDb[pC->iDb].zName; const char *zTbl = pOp->p3; - db->xUpdateCallback(db->pUpdateArg, SQLITE_DELETE, zDb, zTbl, iKey); + db->xUpdateCallback(db->pUpdateArg, STQLITE_DELETE, zDb, zTbl, iKey); assert( pC->iDb>=0 ); } } @@ -37135,14 +37135,14 @@ case OP_RowData: { i64 n64; assert( !pC->isTable ); sqlite3BtreeKeySize(pCrsr, &n64); - if( n64>SQLITE_MAX_LENGTH ){ + if( n64>STQLITE_MAX_LENGTH ){ goto too_big; } n = n64; }else{ sqlite3BtreeDataSize(pCrsr, &n); } - if( n>SQLITE_MAX_LENGTH ){ + if( n>STQLITE_MAX_LENGTH ){ goto too_big; } pTos->n = n; @@ -37163,13 +37163,13 @@ case OP_RowData: { } }else if( pC->pseudoTable ){ pTos->n = pC->nData; - assert( pC->nData<=SQLITE_MAX_LENGTH ); + assert( pC->nData<=STQLITE_MAX_LENGTH ); pTos->z = pC->pData; pTos->flags = MEM_Blob|MEM_Ephem; }else{ pTos->flags = MEM_Null; } - pTos->enc = SQLITE_UTF8; /* In case the blob is ever cast to text */ + pTos->enc = STQLITE_UTF8; /* In case the blob is ever cast to text */ break; } @@ -37245,7 +37245,7 @@ case OP_Last: { /* no-push */ rc = sqlite3BtreeLast(pCrsr, &res); pC->nullRow = res; pC->deferredMoveto = 0; - pC->cacheStatus = CACHE_STALE; + pC->cachetqStatus = CACHE_STALE; if( res && pOp->p2>0 ){ pc = pOp->p2 - 1; } @@ -37269,7 +37269,7 @@ case OP_Last: { /* no-push */ ** correctly optimizing out sorts. */ case OP_Sort: { /* no-push */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST sqlite3_sort_count++; sqlite3_search_count--; #endif @@ -37296,7 +37296,7 @@ case OP_Rewind: { /* no-push */ rc = sqlite3BtreeFirst(pCrsr, &res); pC->atFirst = res==0; pC->deferredMoveto = 0; - pC->cacheStatus = CACHE_STALE; + pC->cachetqStatus = CACHE_STALE; }else{ res = 1; } @@ -37343,11 +37343,11 @@ case OP_Next: { /* no-push */ rc = pOp->opcode==OP_Next ? sqlite3BtreeNext(pCrsr, &res) : sqlite3BtreePrevious(pCrsr, &res); pC->nullRow = res; - pC->cacheStatus = CACHE_STALE; + pC->cachetqStatus = CACHE_STALE; } if( res==0 ){ pc = pOp->p2 - 1; -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST sqlite3_search_count++; #endif } @@ -37381,12 +37381,12 @@ case OP_IdxInsert: { /* no-push */ if( (pCrsr = (pC = p->apCsr[i])->pCursor)!=0 ){ assert( pC->isTable==0 ); rc = ExpandBlob(pTos); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ int nKey = pTos->n; const char *zKey = pTos->z; rc = sqlite3BtreeInsert(pCrsr, zKey, nKey, "", 0, 0, pOp->p2); assert( pC->deferredMoveto==0 ); - pC->cacheStatus = CACHE_STALE; + pC->cachetqStatus = CACHE_STALE; } } Release(pTos); @@ -37411,11 +37411,11 @@ case OP_IdxDelete: { /* no-push */ if( (pCrsr = (pC = p->apCsr[i])->pCursor)!=0 ){ int res; rc = sqlite3BtreeMoveto(pCrsr, pTos->z, pTos->n, 0, &res); - if( rc==SQLITE_OK && res==0 ){ + if( rc==STQLITE_OK && res==0 ){ rc = sqlite3BtreeDelete(pCrsr); } assert( pC->deferredMoveto==0 ); - pC->cacheStatus = CACHE_STALE; + pC->cachetqStatus = CACHE_STALE; } Release(pTos); pTos--; @@ -37448,7 +37448,7 @@ case OP_IdxRowid: { pTos->flags = MEM_Null; }else{ rc = sqlite3VdbeIdxRowid(pCrsr, &rowid); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto abort_due_to_error; } pTos->flags = MEM_Int; @@ -37521,7 +37521,7 @@ case OP_IdxGE: { /* no-push */ assert( pOp->p3==0 || pOp->opcode!=OP_IdxGT ); rc = sqlite3VdbeIdxKeyCompare(pC, pTos->n, (u8*)pTos->z, &res); *pC->pIncrKey = 0; - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ break; } if( pOp->opcode==OP_IdxLT ){ @@ -37561,7 +37561,7 @@ case OP_IdxGE: { /* no-push */ case OP_Destroy: { int iMoved; int iCnt; -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE Vdbe *pVdbe; iCnt = 0; for(pVdbe=db->pVdbe; pVdbe; pVdbe=pVdbe->pNext){ @@ -37573,15 +37573,15 @@ case OP_Destroy: { iCnt = db->activeVdbeCnt; #endif if( iCnt>1 ){ - rc = SQLITE_LOCKED; + rc = STQLITE_LOCKED; }else{ assert( iCnt==1 ); rc = sqlite3BtreeDropTable(db->aDb[pOp->p2].pBt, pOp->p1, &iMoved); pTos++; pTos->flags = MEM_Int; pTos->u.i = iMoved; -#ifndef SQLITE_OMIT_AUTOVACUUM - if( rc==SQLITE_OK && iMoved!=0 ){ +#ifndef STQLITE_OMIT_AUTOVACUUM + if( rc==STQLITE_OK && iMoved!=0 ){ sqlite3RootPageMoved(&db->aDb[pOp->p2], iMoved, pOp->p1); } #endif @@ -37603,7 +37603,7 @@ case OP_Destroy: { */ case OP_Clear: { /* no-push */ - /* For consistency with the way other features of SQLite operate + /* For consistency with the way other features of STQLite operate ** with a truncate, we will also skip the update callback. */ #if 0 @@ -37615,12 +37615,12 @@ case OP_Clear: { /* no-push */ int fin = 0; rc = sqlite3BtreeCursor(pBt, pOp->p1, 0, 0, 0, &pCur); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto abort_due_to_error; } for( rc=sqlite3BtreeFirst(pCur, &fin); - rc==SQLITE_OK && !fin; + rc==STQLITE_OK && !fin; rc=sqlite3BtreeNext(pCur, &fin) ){ i64 iKey; @@ -37629,10 +37629,10 @@ case OP_Clear: { /* no-push */ break; } iKey = keyToInt(iKey); - db->xUpdateCallback(db->pUpdateArg, SQLITE_DELETE, zDb, zTbl, iKey); + db->xUpdateCallback(db->pUpdateArg, STQLITE_DELETE, zDb, zTbl, iKey); } sqlite3BtreeCloseCursor(pCur); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto abort_due_to_error; } } @@ -37677,7 +37677,7 @@ case OP_CreateTable: { } rc = sqlite3BtreeCreateTable(pDb->pBt, &pgno, flags); pTos++; - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ pTos->u.i = pgno; pTos->flags = MEM_Int; }else{ @@ -37688,11 +37688,11 @@ case OP_CreateTable: { /* Opcode: ParseSchema P1 P2 P3 ** -** Read and parse all entries from the SQLITE_MASTER table of database P1 +** Read and parse all entries from the STQLITE_MASTER table of database P1 ** that match the WHERE clause P3. P2 is the "force" flag. Always do ** the parsing if P2 is true. If P2 is false, then this routine is a ** no-op if the schema is not currently loaded. In other words, if P2 -** is false, the SQLITE_MASTER table is only parsed if the rest of the +** is false, the STQLITE_MASTER table is only parsed if the rest of the ** schema is already loaded into the symbol table. ** ** This opcode invokes the parser to create a new virtual machine, @@ -37721,18 +37721,18 @@ case OP_ParseSchema: { /* no-push */ db->init.busy = 1; assert( !sqlite3MallocFailed() ); rc = sqlite3_exec(db, zSql, sqlite3InitCallback, &initData, 0); - if( rc==SQLITE_ABORT ) rc = initData.rc; + if( rc==STQLITE_ABORT ) rc = initData.rc; sqliteFree(zSql); db->init.busy = 0; sqlite3SafetyOn(db); - if( rc==SQLITE_NOMEM ){ + if( rc==STQLITE_NOMEM ){ sqlite3FailedMalloc(); goto no_mem; } break; } -#if !defined(SQLITE_OMIT_ANALYZE) && !defined(SQLITE_OMIT_PARSER) +#if !defined(STQLITE_OMIT_ANALYZE) && !defined(STQLITE_OMIT_PARSER) /* Opcode: LoadAnalysis P1 * * ** ** Read the sqlite_stat1 table for database P1 and load the content @@ -37745,7 +37745,7 @@ case OP_LoadAnalysis: { /* no-push */ rc = sqlite3AnalysisLoad(db, iDb); break; } -#endif /* !defined(SQLITE_OMIT_ANALYZE) && !defined(SQLITE_OMIT_PARSER) */ +#endif /* !defined(STQLITE_OMIT_ANALYZE) && !defined(STQLITE_OMIT_PARSER) */ /* Opcode: DropTable P1 * P3 ** @@ -37784,7 +37784,7 @@ case OP_DropTrigger: { /* no-push */ } -#ifndef SQLITE_OMIT_INTEGRITY_CHECK +#ifndef STQLITE_OMIT_INTEGRITY_CHECK /* Opcode: IntegrityCk P1 P2 * ** ** Do an analysis of the currently open database. Push onto the @@ -37841,12 +37841,12 @@ case OP_IntegrityCk: { pTos->flags = MEM_Str | MEM_Dyn | MEM_Term; pTos->xDel = 0; } - pTos->enc = SQLITE_UTF8; + pTos->enc = STQLITE_UTF8; sqlite3VdbeChangeEncoding(pTos, encoding); sqliteFree(aRoot); break; } -#endif /* SQLITE_OMIT_INTEGRITY_CHECK */ +#endif /* STQLITE_OMIT_INTEGRITY_CHECK */ /* Opcode: FifoWrite * * * ** @@ -37871,7 +37871,7 @@ case OP_FifoWrite: { /* no-push */ case OP_FifoRead: { i64 v; CHECK_FOR_INTERRUPT; - if( sqlite3VdbeFifoPop(&p->sFifo, &v)==SQLITE_DONE ){ + if( sqlite3VdbeFifoPop(&p->sFifo, &v)==STQLITE_DONE ){ pc = pOp->p2 - 1; }else{ pTos++; @@ -37881,7 +37881,7 @@ case OP_FifoRead: { break; } -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER /* Opcode: ContextPush * * * ** ** Save the current Vdbe context such that it can be restored by a ContextPop @@ -37923,7 +37923,7 @@ case OP_ContextPop: { /* no-push */ p->sFifo = pContext->sFifo; break; } -#endif /* #ifndef SQLITE_OMIT_TRIGGER */ +#endif /* #ifndef STQLITE_OMIT_TRIGGER */ /* Opcode: MemStore P1 P2 * ** @@ -37965,7 +37965,7 @@ case OP_MemLoad: { break; } -#ifndef SQLITE_OMIT_AUTOINCREMENT +#ifndef STQLITE_OMIT_AUTOINCREMENT /* Opcode: MemMax P1 * * ** ** Set the value of memory cell P1 to the maximum of its current value @@ -37987,7 +37987,7 @@ case OP_MemMax: { /* no-push */ } break; } -#endif /* SQLITE_OMIT_AUTOINCREMENT */ +#endif /* STQLITE_OMIT_AUTOINCREMENT */ /* Opcode: MemIncr P1 P2 * ** @@ -38140,7 +38140,7 @@ case OP_AggStep: { /* no-push */ popStack(&pTos, n); if( ctx.isError ){ sqlite3SetString(&p->zErrMsg, sqlite3_value_text(&ctx.s), (char*)0); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } sqlite3VdbeMemRelease(&ctx.s); break; @@ -38164,7 +38164,7 @@ case OP_AggFinal: { /* no-push */ pMem = &p->aMem[pOp->p1]; assert( (pMem->flags & ~(MEM_Null|MEM_Agg))==0 ); rc = sqlite3VdbeMemFinalize(pMem, (FuncDef*)pOp->p3); - if( rc==SQLITE_ERROR ){ + if( rc==STQLITE_ERROR ){ sqlite3SetString(&p->zErrMsg, sqlite3_value_text(pMem), (char*)0); } if( sqlite3VdbeMemTooBig(pMem) ){ @@ -38174,7 +38174,7 @@ case OP_AggFinal: { /* no-push */ } -#if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH) +#if !defined(STQLITE_OMIT_VACUUM) && !defined(STQLITE_OMIT_ATTACH) /* Opcode: Vacuum * * * ** ** Vacuum the entire database. This opcode will cause other virtual @@ -38189,7 +38189,7 @@ case OP_Vacuum: { /* no-push */ } #endif -#if !defined(SQLITE_OMIT_AUTOVACUUM) +#if !defined(STQLITE_OMIT_AUTOVACUUM) /* Opcode: IncrVacuum P1 P2 * ** ** Perform a single step of the incremental vacuum procedure on @@ -38202,9 +38202,9 @@ case OP_IncrVacuum: { /* no-push */ assert( pOp->p1>=0 && pOp->p1<db->nDb ); pBt = db->aDb[pOp->p1].pBt; rc = sqlite3BtreeIncrVacuum(pBt); - if( rc==SQLITE_DONE ){ + if( rc==STQLITE_DONE ){ pc = pOp->p2 - 1; - rc = SQLITE_OK; + rc = STQLITE_OK; } break; } @@ -38213,7 +38213,7 @@ case OP_IncrVacuum: { /* no-push */ /* Opcode: Expire P1 * * ** ** Cause precompiled statements to become expired. An expired statement -** fails with an error code of SQLITE_SCHEMA if it is ever executed +** fails with an error code of STQLITE_SCHEMA if it is ever executed ** (via sqlite3_step()). ** ** If P1 is 0, then all SQL statements become expired. If P1 is non-zero, @@ -38228,7 +38228,7 @@ case OP_Expire: { /* no-push */ break; } -#ifndef SQLITE_OMIT_SHARED_CACHE +#ifndef STQLITE_OMIT_SHARED_CACHE /* Opcode: TableLock P1 P2 P3 ** ** Obtain a lock on a particular table. This instruction is only used when @@ -38252,15 +38252,15 @@ case OP_TableLock: { /* no-push */ p1 = (-1*p1)-1; } rc = sqlite3BtreeLockTable(db->aDb[p1].pBt, pOp->p2, isWriteLock); - if( rc==SQLITE_LOCKED ){ + if( rc==STQLITE_LOCKED ){ const char *z = (const char *)pOp->p3; sqlite3SetString(&p->zErrMsg, "database table is locked: ", z, (char*)0); } break; } -#endif /* SQLITE_OMIT_SHARED_CACHE */ +#endif /* STQLITE_OMIT_SHARED_CACHE */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Opcode: VBegin * * P3 ** ** P3 a pointer to an sqlite3_vtab structure. Call the xBegin method @@ -38270,9 +38270,9 @@ case OP_VBegin: { /* no-push */ rc = sqlite3VtabBegin(db, (sqlite3_vtab *)pOp->p3); break; } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Opcode: VCreate P1 * P3 ** ** P3 is the name of a virtual table in database P1. Call the xCreate method @@ -38282,9 +38282,9 @@ case OP_VCreate: { /* no-push */ rc = sqlite3VtabCallCreate(db, pOp->p1, pOp->p3, &p->zErrMsg); break; } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Opcode: VDestroy P1 * P3 ** ** P3 is the name of a virtual table in database P1. Call the xDestroy method @@ -38296,9 +38296,9 @@ case OP_VDestroy: { /* no-push */ p->inVtabMethod = 0; break; } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Opcode: VOpen P1 * P3 ** ** P3 is a pointer to a virtual table object, an sqlite3_vtab structure. @@ -38316,7 +38316,7 @@ case OP_VOpen: { /* no-push */ if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse; rc = pModule->xOpen(pVtab, &pVtabCursor); if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse; - if( SQLITE_OK==rc ){ + if( STQLITE_OK==rc ){ /* Initialise sqlite3_vtab_cursor base class */ pVtabCursor->pVtab = pVtab; @@ -38331,9 +38331,9 @@ case OP_VOpen: { /* no-push */ } break; } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Opcode: VFilter P1 P2 P3 ** ** P1 is a cursor opened using VOpen. P2 is an address to jump to if @@ -38384,7 +38384,7 @@ case OP_VFilter: { /* no-push */ p->inVtabMethod = 1; rc = pModule->xFilter(pCur->pVtabCursor, pTos->u.i, pOp->p3, nArg, apArg); p->inVtabMethod = 0; - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ res = pModule->xEof(pCur->pVtabCursor); } if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse; @@ -38398,9 +38398,9 @@ case OP_VFilter: { /* no-push */ popStack(&pTos, 2+nArg); break; } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Opcode: VRowid P1 * * ** ** Push an integer onto the stack which is the rowid of @@ -38414,7 +38414,7 @@ case OP_VRowid: { pModule = pCur->pVtabCursor->pVtab->pModule; if( pModule->xRowid==0 ){ sqlite3SetString(&p->zErrMsg, "Unsupported module operation: xRowid", 0); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } else { sqlite_int64 iRow; @@ -38429,9 +38429,9 @@ case OP_VRowid: { break; } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Opcode: VColumn P1 P2 * ** ** Push onto the stack the value of the P2-th column of @@ -38445,7 +38445,7 @@ case OP_VColumn: { pModule = pCur->pVtabCursor->pVtab->pModule; if( pModule->xColumn==0 ){ sqlite3SetString(&p->zErrMsg, "Unsupported module operation: xColumn", 0); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } else { sqlite3_context sContext; memset(&sContext, 0, sizeof(sContext)); @@ -38472,9 +38472,9 @@ case OP_VColumn: { break; } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Opcode: VNext P1 P2 * ** ** Advance virtual table P1 to the next row in its result set and @@ -38490,7 +38490,7 @@ case OP_VNext: { /* no-push */ pModule = pCur->pVtabCursor->pVtab->pModule; if( pModule->xNext==0 ){ sqlite3SetString(&p->zErrMsg, "Unsupported module operation: xNext", 0); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } else { /* Invoke the xNext() method of the module. There is no way for the ** underlying implementation to return an error if one occurs during @@ -38502,7 +38502,7 @@ case OP_VNext: { /* no-push */ p->inVtabMethod = 1; rc = pModule->xNext(pCur->pVtabCursor); p->inVtabMethod = 0; - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ res = pModule->xEof(pCur->pVtabCursor); } if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse; @@ -38515,9 +38515,9 @@ case OP_VNext: { /* no-push */ break; } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Opcode: VRename * * P3 ** ** P3 is a pointer to a virtual table object, an sqlite3_vtab structure. @@ -38542,7 +38542,7 @@ case OP_VRename: { /* no-push */ } #endif -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Opcode: VUpdate P1 P2 P3 ** ** P3 is a pointer to a virtual table object, an sqlite3_vtab structure. @@ -38573,7 +38573,7 @@ case OP_VUpdate: { /* no-push */ assert( pOp->p3type==P3_VTAB ); if( pModule->xUpdate==0 ){ sqlite3SetString(&p->zErrMsg, "read-only table", 0); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; }else{ int i; sqlite_int64 rowid; @@ -38588,7 +38588,7 @@ case OP_VUpdate: { /* no-push */ rc = pModule->xUpdate(pVtab, nArg, apArg, &rowid); sqlite3VtabUnlock(db, pVtab); if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse; - if( pOp->p1 && rc==SQLITE_OK ){ + if( pOp->p1 && rc==STQLITE_OK ){ assert( nArg>1 && apArg[0] && (apArg[0]->flags&MEM_Null) ); db->lastRowid = rowid; } @@ -38596,7 +38596,7 @@ case OP_VUpdate: { /* no-push */ popStack(&pTos, nArg); break; } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ /* An other opcode is illegal... */ @@ -38628,7 +38628,7 @@ default: { } #endif -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST /* Keep track of the size of the largest BLOB or STR that has appeared ** on the top of the VDBE stack. */ @@ -38655,7 +38655,7 @@ default: { } assert( pc>=-1 && pc<p->nOp ); -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG /* Code for tracing the vdbe stack. */ if( p->trace && pTos>=p->aStack ){ int i; @@ -38679,7 +38679,7 @@ default: { if( rc!=0 ) fprintf(p->trace," rc=%d",rc); fprintf(p->trace,"\n"); } -#endif /* SQLITE_DEBUG */ +#endif /* STQLITE_DEBUG */ #endif /* NDEBUG */ } /* The end of the for(;;) loop the loops through opcodes */ @@ -38688,33 +38688,33 @@ default: { vdbe_halt: if( rc ){ p->rc = rc; - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; }else{ - rc = SQLITE_DONE; + rc = STQLITE_DONE; } sqlite3VdbeHalt(p); p->pTos = pTos; return rc; - /* Jump to here if a string or blob larger than SQLITE_MAX_LENGTH + /* Jump to here if a string or blob larger than STQLITE_MAX_LENGTH ** is encountered. */ too_big: sqlite3SetString(&p->zErrMsg, "string or blob too big", (char*)0); - rc = SQLITE_TOOBIG; + rc = STQLITE_TOOBIG; goto vdbe_halt; /* Jump to here if a malloc() fails. */ no_mem: sqlite3SetString(&p->zErrMsg, "out of memory", (char*)0); - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; goto vdbe_halt; - /* Jump to here for an SQLITE_MISUSE error. + /* Jump to here for an STQLITE_MISUSE error. */ abort_due_to_misuse: - rc = SQLITE_MISUSE; + rc = STQLITE_MISUSE; /* Fall thru into abort_due_to_error */ /* Jump to here for any other kind of fatal error. The "rc" variable @@ -38722,7 +38722,7 @@ abort_due_to_misuse: */ abort_due_to_error: if( p->zErrMsg==0 ){ - if( sqlite3MallocFailed() ) rc = SQLITE_NOMEM; + if( sqlite3MallocFailed() ) rc = STQLITE_NOMEM; sqlite3SetString(&p->zErrMsg, sqlite3ErrStr(rc), (char*)0); } goto vdbe_halt; @@ -38732,10 +38732,10 @@ abort_due_to_error: */ abort_due_to_interrupt: assert( db->u1.isInterrupted ); - if( db->magic!=SQLITE_MAGIC_BUSY ){ - rc = SQLITE_MISUSE; + if( db->magic!=STQLITE_MAGIC_BUSY ){ + rc = STQLITE_MISUSE; }else{ - rc = SQLITE_INTERRUPT; + rc = STQLITE_INTERRUPT; } p->rc = rc; sqlite3SetString(&p->zErrMsg, sqlite3ErrStr(rc), (char*)0); @@ -38762,7 +38762,7 @@ abort_due_to_interrupt: */ -#ifndef SQLITE_OMIT_INCRBLOB +#ifndef STQLITE_OMIT_INCRBLOB /* ** Valid sqlite3_blob* handles point to Incrblob structures. @@ -38827,7 +38827,7 @@ int sqlite3_blob_open( }; Vdbe *v = 0; - int rc = SQLITE_OK; + int rc = STQLITE_OK; char zErr[128]; zErr[0] = 0; @@ -38839,7 +38839,7 @@ int sqlite3_blob_open( sParse.db = db; rc = sqlite3SafetyOn(db); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } @@ -38849,7 +38849,7 @@ int sqlite3_blob_open( sqlite3_snprintf(sizeof(zErr), zErr, "%s", sParse.zErrMsg); } sqliteFree(sParse.zErrMsg); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; sqlite3SafetyOff(db); goto blob_open_out; } @@ -38862,7 +38862,7 @@ int sqlite3_blob_open( } if( iCol==pTab->nCol ){ sqlite3_snprintf(sizeof(zErr), zErr, "no such column: \"%s\"", zColumn); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; sqlite3SafetyOff(db); goto blob_open_out; } @@ -38879,7 +38879,7 @@ int sqlite3_blob_open( if( pIdx->aiColumn[j]==iCol ){ sqlite3_snprintf(sizeof(zErr), zErr, "cannot open indexed column for writing"); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; sqlite3SafetyOff(db); goto blob_open_out; } @@ -38923,23 +38923,23 @@ int sqlite3_blob_open( } rc = sqlite3SafetyOff(db); - if( rc!=SQLITE_OK || sqlite3MallocFailed() ){ + if( rc!=STQLITE_OK || sqlite3MallocFailed() ){ goto blob_open_out; } sqlite3_bind_int64((sqlite3_stmt *)v, 1, iRow); rc = sqlite3_step((sqlite3_stmt *)v); - if( rc!=SQLITE_ROW ){ + if( rc!=STQLITE_ROW ){ nAttempt++; rc = sqlite3_finalize((sqlite3_stmt *)v); sqlite3_snprintf(sizeof(zErr), zErr, sqlite3_errmsg(db)); v = 0; } - } while( nAttempt<5 && rc==SQLITE_SCHEMA ); + } while( nAttempt<5 && rc==STQLITE_SCHEMA ); - if( rc==SQLITE_ROW ){ + if( rc==STQLITE_ROW ){ /* The row-record has been opened successfully. Check that the - ** column in question contains text or a blob. If it contains + ** column in question contains text or a blob. If it tqcontains ** text, it is up to the caller to get the encoding right. */ Incrblob *pBlob; @@ -38949,7 +38949,7 @@ int sqlite3_blob_open( sqlite3_snprintf(sizeof(zErr), zErr, "cannot open value of type %s", type==0?"null": type==7?"real": "integer" ); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; goto blob_open_out; } pBlob = (Incrblob *)sqliteMalloc(sizeof(Incrblob)); @@ -38964,18 +38964,18 @@ int sqlite3_blob_open( pBlob->iOffset = v->apCsr[0]->aOffset[iCol]; pBlob->nByte = sqlite3VdbeSerialTypeLen(type); *ppBlob = (sqlite3_blob *)pBlob; - rc = SQLITE_OK; - }else if( rc==SQLITE_OK ){ + rc = STQLITE_OK; + }else if( rc==STQLITE_OK ){ sqlite3_snprintf(sizeof(zErr), zErr, "no such rowid: %lld", iRow); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } blob_open_out: zErr[sizeof(zErr)-1] = '\0'; - if( rc!=SQLITE_OK || sqlite3MallocFailed() ){ + if( rc!=STQLITE_OK || sqlite3MallocFailed() ){ sqlite3_finalize((sqlite3_stmt *)v); } - sqlite3Error(db, rc, (rc==SQLITE_OK?0:zErr)); + sqlite3Error(db, rc, (rc==STQLITE_OK?0:zErr)); return sqlite3ApiExit(db, rc); } @@ -39004,21 +39004,21 @@ static int blobReadWrite( sqlite3 *db; /* If there is no statement handle, then the blob-handle has - ** already been invalidated. Return SQLITE_ABORT in this case. + ** already been tqinvalidated. Return STQLITE_ABORT in this case. */ - if( !v ) return SQLITE_ABORT; + if( !v ) return STQLITE_ABORT; /* Request is out of range. Return a transient error. */ if( (iOffset+n)>p->nByte ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } - /* Call either BtreeData() or BtreePutData(). If SQLITE_ABORT is + /* Call either BtreeData() or BtreePutData(). If STQLITE_ABORT is ** returned, clean-up the statement handle. */ db = v->db; rc = xCall(p->pCsr, iOffset+p->iOffset, n, z); - if( rc==SQLITE_ABORT ){ + if( rc==STQLITE_ABORT ){ sqlite3VdbeFinalize(v); p->pStmt = 0; }else{ @@ -39051,7 +39051,7 @@ int sqlite3_blob_bytes(sqlite3_blob *pBlob){ return p->nByte; } -#endif /* #ifndef SQLITE_OMIT_INCRBLOB */ +#endif /* #ifndef STQLITE_OMIT_INCRBLOB */ /************** End of vdbeblob.c ********************************************/ /************** Begin file expr.c ********************************************/ @@ -39067,7 +39067,7 @@ int sqlite3_blob_bytes(sqlite3_blob *pBlob){ ** ************************************************************************* ** This file contains routines used for analyzing expressions and -** for generating VDBE code that evaluates expressions in SQLite. +** for generating VDBE code that evaluates expressions in STQLite. ** ** $Id: expr.c,v 1.300 2007/06/25 16:29:34 danielk1977 Exp $ */ @@ -39088,12 +39088,12 @@ int sqlite3_blob_bytes(sqlite3_blob *pBlob){ ** SELECT a AS b FROM t1 WHERE b; ** SELECT * FROM t1 WHERE (select a from t1); */ -SQLITE_PRIVATE char sqlite3ExprAffinity(Expr *pExpr){ +STQLITE_PRIVATE char sqlite3ExprAffinity(Expr *pExpr){ int op = pExpr->op; if( op==TK_SELECT ){ return sqlite3ExprAffinity(pExpr->pSelect->pEList->a[0].pExpr); } -#ifndef SQLITE_OMIT_CAST +#ifndef STQLITE_OMIT_CAST if( op==TK_CAST ){ return sqlite3AffinityType(&pExpr->token); } @@ -39108,7 +39108,7 @@ SQLITE_PRIVATE char sqlite3ExprAffinity(Expr *pExpr){ ** flag. An explicit collating sequence will override implicit ** collating sequences. */ -SQLITE_PRIVATE Expr *sqlite3ExprSetColl(Parse *pParse, Expr *pExpr, Token *pName){ +STQLITE_PRIVATE Expr *sqlite3ExprSetColl(Parse *pParse, Expr *pExpr, Token *pName){ CollSeq *pColl; if( pExpr==0 ) return 0; pColl = sqlite3LocateCollSeq(pParse, (char*)pName->z, pName->n); @@ -39123,7 +39123,7 @@ SQLITE_PRIVATE Expr *sqlite3ExprSetColl(Parse *pParse, Expr *pExpr, Token *pName ** Return the default collation sequence for the expression pExpr. If ** there is no default collation type, return 0. */ -SQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){ +STQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){ CollSeq *pColl = 0; if( pExpr ){ int op; @@ -39144,22 +39144,22 @@ SQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){ ** type affinity of the other operand. This routine returns the ** type affinity that should be used for the comparison operator. */ -SQLITE_PRIVATE char sqlite3CompareAffinity(Expr *pExpr, char aff2){ +STQLITE_PRIVATE char sqlite3CompareAffinity(Expr *pExpr, char aff2){ char aff1 = sqlite3ExprAffinity(pExpr); if( aff1 && aff2 ){ /* Both sides of the comparison are columns. If one has numeric ** affinity, use that. Otherwise use no affinity. */ if( sqlite3IsNumericAffinity(aff1) || sqlite3IsNumericAffinity(aff2) ){ - return SQLITE_AFF_NUMERIC; + return STQLITE_AFF_NUMERIC; }else{ - return SQLITE_AFF_NONE; + return STQLITE_AFF_NONE; } }else if( !aff1 && !aff2 ){ /* Neither side of the comparison is a column. Compare the ** results directly. */ - return SQLITE_AFF_NONE; + return STQLITE_AFF_NONE; }else{ /* One side is a column, the other is not. Use the columns affinity. */ assert( aff1==0 || aff2==0 ); @@ -39185,7 +39185,7 @@ static char comparisonAffinity(Expr *pExpr){ aff = sqlite3CompareAffinity(pExpr->pSelect->pEList->a[0].pExpr, aff); } else if( !aff ){ - aff = SQLITE_AFF_NONE; + aff = STQLITE_AFF_NONE; } return aff; } @@ -39196,13 +39196,13 @@ static char comparisonAffinity(Expr *pExpr){ ** if the index with affinity idx_affinity may be used to implement ** the comparison in pExpr. */ -SQLITE_PRIVATE int sqlite3IndexAffinityOk(Expr *pExpr, char idx_affinity){ +STQLITE_PRIVATE int sqlite3IndexAffinityOk(Expr *pExpr, char idx_affinity){ char aff = comparisonAffinity(pExpr); switch( aff ){ - case SQLITE_AFF_NONE: + case STQLITE_AFF_NONE: return 1; - case SQLITE_AFF_TEXT: - return idx_affinity==SQLITE_AFF_TEXT; + case STQLITE_AFF_TEXT: + return idx_affinity==STQLITE_AFF_TEXT; default: return sqlite3IsNumericAffinity(idx_affinity); } @@ -39275,7 +39275,7 @@ static int codeCompare( ** for this node is obtained from sqliteMalloc(). The calling function ** is responsible for making sure the node eventually gets freed. */ -SQLITE_PRIVATE Expr *sqlite3Expr(int op, Expr *pLeft, Expr *pRight, const Token *pToken){ +STQLITE_PRIVATE Expr *sqlite3Expr(int op, Expr *pLeft, Expr *pRight, const Token *pToken){ Expr *pNew; pNew = sqliteMalloc( sizeof(Expr) ); if( pNew==0 ){ @@ -39316,7 +39316,7 @@ SQLITE_PRIVATE Expr *sqlite3Expr(int op, Expr *pLeft, Expr *pRight, const Token ** Works like sqlite3Expr() but frees its pLeft and pRight arguments ** if it fails due to a malloc problem. */ -SQLITE_PRIVATE Expr *sqlite3ExprOrFree(int op, Expr *pLeft, Expr *pRight, const Token *pToken){ +STQLITE_PRIVATE Expr *sqlite3ExprOrFree(int op, Expr *pLeft, Expr *pRight, const Token *pToken){ Expr *pNew = sqlite3Expr(op, pLeft, pRight, pToken); if( pNew==0 ){ sqlite3ExprDelete(pLeft); @@ -39336,7 +39336,7 @@ SQLITE_PRIVATE Expr *sqlite3ExprOrFree(int op, Expr *pLeft, Expr *pRight, const ** The returns an expression that will code to extract the value from ** that memory location as needed. */ -SQLITE_PRIVATE Expr *sqlite3RegisterExpr(Parse *pParse, Token *pToken){ +STQLITE_PRIVATE Expr *sqlite3RegisterExpr(Parse *pParse, Token *pToken){ Vdbe *v = pParse->pVdbe; Expr *p; int depth; @@ -39360,7 +39360,7 @@ SQLITE_PRIVATE Expr *sqlite3RegisterExpr(Parse *pParse, Token *pToken){ ** Join two expressions using an AND operator. If either expression is ** NULL, then just return the other expression. */ -SQLITE_PRIVATE Expr *sqlite3ExprAnd(Expr *pLeft, Expr *pRight){ +STQLITE_PRIVATE Expr *sqlite3ExprAnd(Expr *pLeft, Expr *pRight){ if( pLeft==0 ){ return pRight; }else if( pRight==0 ){ @@ -39374,7 +39374,7 @@ SQLITE_PRIVATE Expr *sqlite3ExprAnd(Expr *pLeft, Expr *pRight){ ** Set the Expr.span field of the given expression to span all ** text between the two given tokens. */ -SQLITE_PRIVATE void sqlite3ExprSpan(Expr *pExpr, Token *pLeft, Token *pRight){ +STQLITE_PRIVATE void sqlite3ExprSpan(Expr *pExpr, Token *pLeft, Token *pRight){ assert( pRight!=0 ); assert( pLeft!=0 ); if( !sqlite3MallocFailed() && pRight->z && pLeft->z ){ @@ -39392,7 +39392,7 @@ SQLITE_PRIVATE void sqlite3ExprSpan(Expr *pExpr, Token *pLeft, Token *pRight){ ** Construct a new expression node for a function with multiple ** arguments. */ -SQLITE_PRIVATE Expr *sqlite3ExprFunction(ExprList *pList, Token *pToken){ +STQLITE_PRIVATE Expr *sqlite3ExprFunction(ExprList *pList, Token *pToken){ Expr *pNew; assert( pToken ); pNew = sqliteMalloc( sizeof(Expr) ); @@ -39426,7 +39426,7 @@ SQLITE_PRIVATE Expr *sqlite3ExprFunction(ExprList *pList, Token *pToken){ ** instance of the wildcard, the next sequenial variable number is ** assigned. */ -SQLITE_PRIVATE void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){ +STQLITE_PRIVATE void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){ Token *pToken; if( pExpr==0 ) return; pToken = &pExpr->token; @@ -39441,9 +39441,9 @@ SQLITE_PRIVATE void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){ ** use it as the variable number */ int i; pExpr->iTable = i = atoi((char*)&pToken->z[1]); - if( i<1 || i>SQLITE_MAX_VARIABLE_NUMBER ){ + if( i<1 || i>STQLITE_MAX_VARIABLE_NUMBER ){ sqlite3ErrorMsg(pParse, "variable number must be between ?1 and ?%d", - SQLITE_MAX_VARIABLE_NUMBER); + STQLITE_MAX_VARIABLE_NUMBER); } if( i>pParse->nVar ){ pParse->nVar = i; @@ -39477,7 +39477,7 @@ SQLITE_PRIVATE void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){ } } } - if( !pParse->nErr && pParse->nVar>SQLITE_MAX_VARIABLE_NUMBER ){ + if( !pParse->nErr && pParse->nVar>STQLITE_MAX_VARIABLE_NUMBER ){ sqlite3ErrorMsg(pParse, "too many SQL variables"); } } @@ -39485,7 +39485,7 @@ SQLITE_PRIVATE void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){ /* ** Recursively delete an expression tree. */ -SQLITE_PRIVATE void sqlite3ExprDelete(Expr *p){ +STQLITE_PRIVATE void sqlite3ExprDelete(Expr *p){ if( p==0 ) return; if( p->span.dyn ) sqliteFree((char*)p->span.z); if( p->token.dyn ) sqliteFree((char*)p->token.z); @@ -39500,7 +39500,7 @@ SQLITE_PRIVATE void sqlite3ExprDelete(Expr *p){ ** The Expr.token field might be a string literal that is quoted. ** If so, remove the quotation marks. */ -SQLITE_PRIVATE void sqlite3DequoteExpr(Expr *p){ +STQLITE_PRIVATE void sqlite3DequoteExpr(Expr *p){ if( ExprHasAnyProperty(p, EP_Dequoted) ){ return; } @@ -39524,7 +39524,7 @@ SQLITE_PRIVATE void sqlite3DequoteExpr(Expr *p){ ** ** Any tables that the SrcList might point to are not duplicated. */ -SQLITE_PRIVATE Expr *sqlite3ExprDup(Expr *p){ +STQLITE_PRIVATE Expr *sqlite3ExprDup(Expr *p){ Expr *pNew; if( p==0 ) return 0; pNew = sqliteMallocRaw( sizeof(*p) ); @@ -39543,7 +39543,7 @@ SQLITE_PRIVATE Expr *sqlite3ExprDup(Expr *p){ pNew->pSelect = sqlite3SelectDup(p->pSelect); return pNew; } -SQLITE_PRIVATE void sqlite3TokenCopy(Token *pTo, Token *pFrom){ +STQLITE_PRIVATE void sqlite3TokenCopy(Token *pTo, Token *pFrom){ if( pTo->dyn ) sqliteFree((char*)pTo->z); if( pFrom->z ){ pTo->n = pFrom->n; @@ -39553,7 +39553,7 @@ SQLITE_PRIVATE void sqlite3TokenCopy(Token *pTo, Token *pFrom){ pTo->z = 0; } } -SQLITE_PRIVATE ExprList *sqlite3ExprListDup(ExprList *p){ +STQLITE_PRIVATE ExprList *sqlite3ExprListDup(ExprList *p){ ExprList *pNew; struct ExprList_item *pItem, *pOldItem; int i; @@ -39593,9 +39593,9 @@ SQLITE_PRIVATE ExprList *sqlite3ExprListDup(ExprList *p){ ** sqlite3SelectDup(), can be called. sqlite3SelectDup() is sometimes ** called with a NULL argument. */ -#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER) \ - || !defined(SQLITE_OMIT_SUBQUERY) -SQLITE_PRIVATE SrcList *sqlite3SrcListDup(SrcList *p){ +#if !defined(STQLITE_OMIT_VIEW) || !defined(STQLITE_OMIT_TRIGGER) \ + || !defined(STQLITE_OMIT_SUBTQUERY) +STQLITE_PRIVATE SrcList *sqlite3SrcListDup(SrcList *p){ SrcList *pNew; int i; int nByte; @@ -39625,7 +39625,7 @@ SQLITE_PRIVATE SrcList *sqlite3SrcListDup(SrcList *p){ } return pNew; } -SQLITE_PRIVATE IdList *sqlite3IdListDup(IdList *p){ +STQLITE_PRIVATE IdList *sqlite3IdListDup(IdList *p){ IdList *pNew; int i; if( p==0 ) return 0; @@ -39645,7 +39645,7 @@ SQLITE_PRIVATE IdList *sqlite3IdListDup(IdList *p){ } return pNew; } -SQLITE_PRIVATE Select *sqlite3SelectDup(Select *p){ +STQLITE_PRIVATE Select *sqlite3SelectDup(Select *p){ Select *pNew; if( p==0 ) return 0; pNew = sqliteMallocRaw( sizeof(*p) ); @@ -39674,7 +39674,7 @@ SQLITE_PRIVATE Select *sqlite3SelectDup(Select *p){ return pNew; } #else -SQLITE_PRIVATE Select *sqlite3SelectDup(Select *p){ +STQLITE_PRIVATE Select *sqlite3SelectDup(Select *p){ assert( p==0 ); return 0; } @@ -39685,7 +39685,7 @@ SQLITE_PRIVATE Select *sqlite3SelectDup(Select *p){ ** Add a new element to the end of an expression list. If pList is ** initially NULL, then create a new expression list. */ -SQLITE_PRIVATE ExprList *sqlite3ExprListAppend(ExprList *pList, Expr *pExpr, Token *pName){ +STQLITE_PRIVATE ExprList *sqlite3ExprListAppend(ExprList *pList, Expr *pExpr, Token *pName){ if( pList==0 ){ pList = sqliteMalloc( sizeof(ExprList) ); if( pList==0 ){ @@ -39723,7 +39723,7 @@ no_mem: ** If the expression list pEList contains more than iLimit elements, ** leave an error message in pParse. */ -SQLITE_PRIVATE void sqlite3ExprListCheckLength( +STQLITE_PRIVATE void sqlite3ExprListCheckLength( Parse *pParse, ExprList *pEList, int iLimit, @@ -39735,7 +39735,7 @@ SQLITE_PRIVATE void sqlite3ExprListCheckLength( } -#if SQLITE_MAX_EXPR_DEPTH>0 +#if STQLITE_MAX_EXPR_DEPTH>0 /* The following three functions, heightOfExpr(), heightOfExprList() ** and heightOfSelect(), are used to determine the maximum height ** of any expression tree referenced by the structure passed as the @@ -39775,12 +39775,12 @@ static void heightOfSelect(Select *p, int *pnHeight){ /* ** Set the Expr.nHeight variable in the structure passed as an -** argument. An expression with no children, Expr.pList or +** argument. An expression with no tqchildren, Expr.pList or ** Expr.pSelect member has a height of 1. Any other expression ** has a height equal to the maximum height of any other ** referenced Expr plus one. */ -SQLITE_PRIVATE void sqlite3ExprSetHeight(Expr *p){ +STQLITE_PRIVATE void sqlite3ExprSetHeight(Expr *p){ int nHeight = 0; heightOfExpr(p->pLeft, &nHeight); heightOfExpr(p->pRight, &nHeight); @@ -39793,7 +39793,7 @@ SQLITE_PRIVATE void sqlite3ExprSetHeight(Expr *p){ ** Return the maximum height of any expression tree referenced ** by the select statement passed as an argument. */ -SQLITE_PRIVATE int sqlite3SelectExprHeight(Select *p){ +STQLITE_PRIVATE int sqlite3SelectExprHeight(Select *p){ int nHeight = 0; heightOfSelect(p, &nHeight); return nHeight; @@ -39803,7 +39803,7 @@ SQLITE_PRIVATE int sqlite3SelectExprHeight(Select *p){ /* ** Delete an entire expression list. */ -SQLITE_PRIVATE void sqlite3ExprListDelete(ExprList *pList){ +STQLITE_PRIVATE void sqlite3ExprListDelete(ExprList *pList){ int i; struct ExprList_item *pItem; if( pList==0 ) return; @@ -39821,7 +39821,7 @@ SQLITE_PRIVATE void sqlite3ExprListDelete(ExprList *pList){ ** Walk an expression tree. Call xFunc for each node visited. ** ** The return value from xFunc determines whether the tree walk continues. -** 0 means continue walking the tree. 1 means do not walk children +** 0 means continue walking the tree. 1 means do not walk tqchildren ** of the current node but continue with siblings. 2 means abandon ** the tree walk completely. ** @@ -39909,7 +39909,7 @@ static int exprNodeIsConstant(void *pArg, Expr *pExpr){ case TK_DOT: case TK_AGG_FUNCTION: case TK_AGG_COLUMN: -#ifndef SQLITE_OMIT_SUBQUERY +#ifndef STQLITE_OMIT_SUBTQUERY case TK_SELECT: case TK_EXISTS: #endif @@ -39933,7 +39933,7 @@ static int exprNodeIsConstant(void *pArg, Expr *pExpr){ ** is considered a variable but a single-quoted string (ex: 'abc') is ** a constant. */ -SQLITE_PRIVATE int sqlite3ExprIsConstant(Expr *p){ +STQLITE_PRIVATE int sqlite3ExprIsConstant(Expr *p){ int isConst = 1; walkExprTree(p, exprNodeIsConstant, &isConst); return isConst; @@ -39945,7 +39945,7 @@ SQLITE_PRIVATE int sqlite3ExprIsConstant(Expr *p){ ** Return 0 if it involves variables or function calls or terms from ** an ON or USING clause. */ -SQLITE_PRIVATE int sqlite3ExprIsConstantNotJoin(Expr *p){ +STQLITE_PRIVATE int sqlite3ExprIsConstantNotJoin(Expr *p){ int isConst = 3; walkExprTree(p, exprNodeIsConstant, &isConst); return isConst!=0; @@ -39960,7 +39960,7 @@ SQLITE_PRIVATE int sqlite3ExprIsConstantNotJoin(Expr *p){ ** is considered a variable but a single-quoted string (ex: 'abc') is ** a constant. */ -SQLITE_PRIVATE int sqlite3ExprIsConstantOrFunction(Expr *p){ +STQLITE_PRIVATE int sqlite3ExprIsConstantOrFunction(Expr *p){ int isConst = 2; walkExprTree(p, exprNodeIsConstant, &isConst); return isConst!=0; @@ -39972,7 +39972,7 @@ SQLITE_PRIVATE int sqlite3ExprIsConstantOrFunction(Expr *p){ ** in *pValue. If the expression is not an integer or if it is too big ** to fit in a signed 32-bit integer, return 0 and leave *pValue unchanged. */ -SQLITE_PRIVATE int sqlite3ExprIsInteger(Expr *p, int *pValue){ +STQLITE_PRIVATE int sqlite3ExprIsInteger(Expr *p, int *pValue){ switch( p->op ){ case TK_INTEGER: { if( sqlite3GetInt32((char*)p->token.z, pValue) ){ @@ -39999,7 +39999,7 @@ SQLITE_PRIVATE int sqlite3ExprIsInteger(Expr *p, int *pValue){ /* ** Return TRUE if the given string is a row-id column name. */ -SQLITE_PRIVATE int sqlite3IsRowid(const char *z){ +STQLITE_PRIVATE int sqlite3IsRowid(const char *z){ if( sqlite3StrICmp(z, "_ROWID_")==0 ) return 1; if( sqlite3StrICmp(z, "ROWID")==0 ) return 1; if( sqlite3StrICmp(z, "OID")==0 ) return 1; @@ -40130,7 +40130,7 @@ static int lookupName( } } -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER /* If we have not already resolved the name, then maybe ** it is a new.* or old.* trigger argument reference */ @@ -40168,7 +40168,7 @@ static int lookupName( } } } -#endif /* !defined(SQLITE_OMIT_TRIGGER) */ +#endif /* !defined(STQLITE_OMIT_TRIGGER) */ /* ** Perhaps the name is a reference to the ROWID @@ -40176,7 +40176,7 @@ static int lookupName( if( cnt==0 && cntTab==1 && sqlite3IsRowid(zCol) ){ cnt = 1; pExpr->iColumn = -1; - pExpr->affinity = SQLITE_AFF_INTEGER; + pExpr->affinity = STQLITE_AFF_INTEGER; } /* @@ -40260,18 +40260,18 @@ static int lookupName( } /* If a column from a table in pSrcList is referenced, then record - ** this fact in the pSrcList.a[].colUsed bitmask. Column 0 causes + ** this fact in the pSrcList.a[].colUsed bittqmask. Column 0 causes ** bit 0 to be set. Column 1 sets bit 1. And so forth. If the - ** column number is greater than the number of bits in the bitmask - ** then set the high-order bit of the bitmask. + ** column number is greater than the number of bits in the bittqmask + ** then set the high-order bit of the bittqmask. */ if( pExpr->iColumn>=0 && pMatch!=0 ){ int n = pExpr->iColumn; - if( n>=sizeof(Bitmask)*8 ){ - n = sizeof(Bitmask)*8-1; + if( n>=sizeof(Bittqmask)*8 ){ + n = sizeof(Bittqmask)*8-1; } assert( pMatch->iCursor==pExpr->iTable ); - pMatch->colUsed |= ((Bitmask)1)<<n; + pMatch->colUsed |= ((Bittqmask)1)<<n; } lookupname_end: @@ -40406,11 +40406,11 @@ static int nameResolverStep(void *pArg, Expr *pExpr){ }else{ is_agg = pDef->xFunc==0; } -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION if( pDef ){ - auth = sqlite3AuthCheck(pParse, SQLITE_FUNCTION, 0, pDef->zName, 0); - if( auth!=SQLITE_OK ){ - if( auth==SQLITE_DENY ){ + auth = sqlite3AuthCheck(pParse, STQLITE_FUNCTION, 0, pDef->zName, 0); + if( auth!=STQLITE_OK ){ + if( auth==STQLITE_DENY ){ sqlite3ErrorMsg(pParse, "not authorized to use function: %s", pDef->zName); pNC->nErr++; @@ -40446,14 +40446,14 @@ static int nameResolverStep(void *pArg, Expr *pExpr){ */ return is_agg; } -#ifndef SQLITE_OMIT_SUBQUERY +#ifndef STQLITE_OMIT_SUBTQUERY case TK_SELECT: case TK_EXISTS: #endif case TK_IN: { if( pExpr->pSelect ){ int nRef = pNC->nRef; -#ifndef SQLITE_OMIT_CHECK +#ifndef STQLITE_OMIT_CHECK if( pNC->isCheck ){ sqlite3ErrorMsg(pParse,"subqueries prohibited in CHECK constraints"); } @@ -40466,7 +40466,7 @@ static int nameResolverStep(void *pArg, Expr *pExpr){ } break; } -#ifndef SQLITE_OMIT_CHECK +#ifndef STQLITE_OMIT_CHECK case TK_VARIABLE: { if( pNC->isCheck ){ sqlite3ErrorMsg(pParse,"parameters prohibited in CHECK constraints"); @@ -40499,17 +40499,17 @@ static int nameResolverStep(void *pArg, Expr *pExpr){ ** If the expression contains aggregate functions then set the EP_Agg ** property on the expression. */ -SQLITE_PRIVATE int sqlite3ExprResolveNames( +STQLITE_PRIVATE int sqlite3ExprResolveNames( NameContext *pNC, /* Namespace to resolve expressions in. */ Expr *pExpr /* The expression to be analyzed. */ ){ int savedHasAgg; if( pExpr==0 ) return 0; -#if SQLITE_MAX_EXPR_DEPTH>0 - if( (pExpr->nHeight+pNC->pParse->nHeight)>SQLITE_MAX_EXPR_DEPTH ){ +#if STQLITE_MAX_EXPR_DEPTH>0 + if( (pExpr->nHeight+pNC->pParse->nHeight)>STQLITE_MAX_EXPR_DEPTH ){ sqlite3ErrorMsg(pNC->pParse, "Expression tree is too large (maximum depth %d)", - SQLITE_MAX_EXPR_DEPTH + STQLITE_MAX_EXPR_DEPTH ); return 1; } @@ -40518,7 +40518,7 @@ SQLITE_PRIVATE int sqlite3ExprResolveNames( savedHasAgg = pNC->hasAgg; pNC->hasAgg = 0; walkExprTree(pExpr, nameResolverStep, pNC); -#if SQLITE_MAX_EXPR_DEPTH>0 +#if STQLITE_MAX_EXPR_DEPTH>0 pNC->pParse->nHeight -= pExpr->nHeight; #endif if( pNC->nErr>0 ){ @@ -40555,8 +40555,8 @@ struct QueryCoder { ** The pExpr parameter describes the expression that contains the IN ** operator or subquery. */ -#ifndef SQLITE_OMIT_SUBQUERY -SQLITE_PRIVATE void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){ +#ifndef STQLITE_OMIT_SUBTQUERY +STQLITE_PRIVATE void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){ int testAddr = 0; /* One-time test address */ Vdbe *v = sqlite3GetVdbe(pParse); if( v==0 ) return; @@ -40637,7 +40637,7 @@ SQLITE_PRIVATE void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){ struct ExprList_item *pItem; if( !affinity ){ - affinity = SQLITE_AFF_NONE; + affinity = STQLITE_AFF_NONE; } keyInfo.aColl[0] = pExpr->pLeft->pColl; @@ -40702,7 +40702,7 @@ SQLITE_PRIVATE void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){ return; } -#endif /* SQLITE_OMIT_SUBQUERY */ +#endif /* STQLITE_OMIT_SUBTQUERY */ /* ** Generate an instruction that will put the integer describe by @@ -40729,7 +40729,7 @@ static void codeInteger(Vdbe *v, const char *z, int n){ ** is an open cursor to pTab in iTable. If iColumn<0 then ** code is generated that extracts the rowid. */ -SQLITE_PRIVATE void sqlite3ExprCodeGetColumn(Vdbe *v, Table *pTab, int iColumn, int iTable){ +STQLITE_PRIVATE void sqlite3ExprCodeGetColumn(Vdbe *v, Table *pTab, int iColumn, int iTable){ if( iColumn<0 ){ int op = (pTab && IsVirtual(pTab)) ? OP_VRowid : OP_Rowid; sqlite3VdbeAddOp(v, op, iTable, 0); @@ -40739,8 +40739,8 @@ SQLITE_PRIVATE void sqlite3ExprCodeGetColumn(Vdbe *v, Table *pTab, int iColumn, int op = IsVirtual(pTab) ? OP_VColumn : OP_Column; sqlite3VdbeAddOp(v, op, iTable, iColumn); sqlite3ColumnDefault(v, pTab, iColumn); -#ifndef SQLITE_OMIT_FLOATING_POINT - if( pTab->aCol[iColumn].affinity==SQLITE_AFF_REAL ){ +#ifndef STQLITE_OMIT_FLOATING_POINT + if( pTab->aCol[iColumn].affinity==STQLITE_AFF_REAL ){ sqlite3VdbeAddOp(v, OP_RealAffinity, 0, 0); } #endif @@ -40757,7 +40757,7 @@ SQLITE_PRIVATE void sqlite3ExprCodeGetColumn(Vdbe *v, Table *pTab, int iColumn, ** the make process cause these values to align. Assert()s in the code ** below verify that the numbers are aligned correctly. */ -SQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ +STQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ Vdbe *v = pParse->pVdbe; int op; int stackChng = 1; /* Amount of change to stack depth */ @@ -40808,7 +40808,7 @@ SQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ sqlite3VdbeAddOp(v, OP_Null, 0, 0); break; } -#ifndef SQLITE_OMIT_BLOB_LITERAL +#ifndef STQLITE_OMIT_BLOB_LITERAL case TK_BLOB: { int n; const char *z; @@ -40834,23 +40834,23 @@ SQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ sqlite3VdbeAddOp(v, OP_MemLoad, pExpr->iTable, 0); break; } -#ifndef SQLITE_OMIT_CAST +#ifndef STQLITE_OMIT_CAST case TK_CAST: { /* Expressions of the form: CAST(pLeft AS token) */ int aff, to_op; sqlite3ExprCode(pParse, pExpr->pLeft); aff = sqlite3AffinityType(&pExpr->token); - to_op = aff - SQLITE_AFF_TEXT + OP_ToText; - assert( to_op==OP_ToText || aff!=SQLITE_AFF_TEXT ); - assert( to_op==OP_ToBlob || aff!=SQLITE_AFF_NONE ); - assert( to_op==OP_ToNumeric || aff!=SQLITE_AFF_NUMERIC ); - assert( to_op==OP_ToInt || aff!=SQLITE_AFF_INTEGER ); - assert( to_op==OP_ToReal || aff!=SQLITE_AFF_REAL ); + to_op = aff - STQLITE_AFF_TEXT + OP_ToText; + assert( to_op==OP_ToText || aff!=STQLITE_AFF_TEXT ); + assert( to_op==OP_ToBlob || aff!=STQLITE_AFF_NONE ); + assert( to_op==OP_ToNumeric || aff!=STQLITE_AFF_NUMERIC ); + assert( to_op==OP_ToInt || aff!=STQLITE_AFF_INTEGER ); + assert( to_op==OP_ToReal || aff!=STQLITE_AFF_REAL ); sqlite3VdbeAddOp(v, to_op, 0, 0); stackChng = 0; break; } -#endif /* SQLITE_OMIT_CAST */ +#endif /* STQLITE_OMIT_CAST */ case TK_LT: case TK_LE: case TK_GT: @@ -40962,7 +40962,7 @@ SQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ pDef = sqlite3FindFunction(pParse->db, zId, nId, nExpr, enc, 0); assert( pDef!=0 ); nExpr = sqlite3ExprCodeExprList(pParse, pList); -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Possibly overload the function if the first argument is ** a virtual table column. ** @@ -40997,7 +40997,7 @@ SQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ stackChng = 1-nExpr; break; } -#ifndef SQLITE_OMIT_SUBQUERY +#ifndef STQLITE_OMIT_SUBTQUERY case TK_EXISTS: case TK_SELECT: { if( pExpr->iColumn==0 ){ @@ -41102,7 +41102,7 @@ SQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ sqlite3VdbeResolveLabel(v, expr_end_label); break; } -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER case TK_RAISE: { if( !pParse->trigStack ){ sqlite3ErrorMsg(pParse, @@ -41114,7 +41114,7 @@ SQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ pExpr->iColumn == OE_Abort || pExpr->iColumn == OE_Fail ); sqlite3DequoteExpr(pExpr); - sqlite3VdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, pExpr->iColumn, + sqlite3VdbeOp3(v, OP_Halt, STQLITE_CONSTRAINT, pExpr->iColumn, (char*)pExpr->token.z, pExpr->token.n); } else { assert( pExpr->iColumn == OE_Ignore ); @@ -41134,7 +41134,7 @@ SQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ } } -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER /* ** Generate code that evalutes the given expression and leaves the result ** on the stack. See also sqlite3ExprCode(). @@ -41145,7 +41145,7 @@ SQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ ** not cached. If the expression is cached, its result is stored in a ** memory location. */ -SQLITE_PRIVATE void sqlite3ExprCodeAndCache(Parse *pParse, Expr *pExpr){ +STQLITE_PRIVATE void sqlite3ExprCodeAndCache(Parse *pParse, Expr *pExpr){ Vdbe *v = pParse->pVdbe; int iMem; int addr1, addr2; @@ -41167,7 +41167,7 @@ SQLITE_PRIVATE void sqlite3ExprCodeAndCache(Parse *pParse, Expr *pExpr){ ** ** Return the number of elements pushed onto the stack. */ -SQLITE_PRIVATE int sqlite3ExprCodeExprList( +STQLITE_PRIVATE int sqlite3ExprCodeExprList( Parse *pParse, /* Parsing context */ ExprList *pList /* The expression list to be coded */ ){ @@ -41195,7 +41195,7 @@ SQLITE_PRIVATE int sqlite3ExprCodeExprList( ** the make process cause these values to align. Assert()s in the code ** below verify that the numbers are aligned correctly. */ -SQLITE_PRIVATE void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){ +STQLITE_PRIVATE void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){ Vdbe *v = pParse->pVdbe; int op = 0; int ckOffset = pParse->ckOffset; @@ -41284,7 +41284,7 @@ SQLITE_PRIVATE void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int ** If the expression evaluates to NULL (neither true nor false) then ** jump if jumpIfNull is true or fall through if jumpIfNull is false. */ -SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){ +STQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){ Vdbe *v = pParse->pVdbe; int op = 0; int ckOffset = pParse->ckOffset; @@ -41310,7 +41310,7 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int */ op = ((pExpr->op+(TK_ISNULL&1))^1)-(TK_ISNULL&1); - /* Verify correct alignment of TK_ and OP_ constants + /* Verify correct tqalignment of TK_ and OP_ constants */ assert( pExpr->op!=TK_ISNULL || op==OP_NotNull ); assert( pExpr->op!=TK_NOTNULL || op==OP_IsNull ); @@ -41401,7 +41401,7 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int ** just might result in some slightly slower code. But returning ** an incorrect TRUE could lead to a malfunction. */ -SQLITE_PRIVATE int sqlite3ExprCompare(Expr *pA, Expr *pB){ +STQLITE_PRIVATE int sqlite3ExprCompare(Expr *pA, Expr *pB){ int i; if( pA==0||pB==0 ){ return pB==pA; @@ -41611,7 +41611,7 @@ static int analyzeAggregate(void *pArg, Expr *pExpr){ ** If errors are seen, leave an error message in zErrMsg and return ** the number of errors. */ -SQLITE_PRIVATE int sqlite3ExprAnalyzeAggregates(NameContext *pNC, Expr *pExpr){ +STQLITE_PRIVATE int sqlite3ExprAnalyzeAggregates(NameContext *pNC, Expr *pExpr){ int nErr = pNC->pParse->nErr; walkExprTree(pExpr, analyzeAggregate, pNC); return pNC->pParse->nErr - nErr; @@ -41623,7 +41623,7 @@ SQLITE_PRIVATE int sqlite3ExprAnalyzeAggregates(NameContext *pNC, Expr *pExpr){ ** ** If an error is found, the analysis is cut short. */ -SQLITE_PRIVATE int sqlite3ExprAnalyzeAggList(NameContext *pNC, ExprList *pList){ +STQLITE_PRIVATE int sqlite3ExprAnalyzeAggList(NameContext *pNC, ExprList *pList){ struct ExprList_item *pItem; int i; int nErr = 0; @@ -41658,7 +41658,7 @@ SQLITE_PRIVATE int sqlite3ExprAnalyzeAggList(NameContext *pNC, ExprList *pList){ ** The code in this file only exists if we are not omitting the ** ALTER TABLE logic from the build. */ -#ifndef SQLITE_OMIT_ALTERTABLE +#ifndef STQLITE_OMIT_ALTERTABLE /* @@ -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 parenthesis - TK_LP - or "USING" TK_USING. + ** followed by a left tqparenthesis - TK_LP - or "USING" TK_USING. */ if( zSql ){ do { @@ -41719,7 +41719,7 @@ static void renameTableFunc( } } -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER /* This function is used by SQL generated to implement the ** ALTER TABLE command. The first argument is the text of a CREATE TRIGGER ** statement. The second is a table name. The table name in the CREATE @@ -41791,19 +41791,19 @@ static void renameTriggerFunc( sqlite3_result_text(context, zRet, -1, sqlite3FreeX); } } -#endif /* !SQLITE_OMIT_TRIGGER */ +#endif /* !STQLITE_OMIT_TRIGGER */ /* ** Register built-in functions used to help implement ALTER TABLE */ -SQLITE_PRIVATE void sqlite3AlterFunctions(sqlite3 *db){ +STQLITE_PRIVATE void sqlite3AlterFunctions(sqlite3 *db){ static const struct { char *zName; signed char nArg; void (*xFunc)(sqlite3_context*,int,sqlite3_value **); } aFuncs[] = { { "sqlite_rename_table", 2, renameTableFunc}, -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER { "sqlite_rename_trigger", 2, renameTriggerFunc}, #endif }; @@ -41811,7 +41811,7 @@ SQLITE_PRIVATE void sqlite3AlterFunctions(sqlite3 *db){ for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){ sqlite3CreateFunc(db, aFuncs[i].zName, aFuncs[i].nArg, - SQLITE_UTF8, 0, aFuncs[i].xFunc, 0, 0); + STQLITE_UTF8, 0, aFuncs[i].xFunc, 0, 0); } } @@ -41860,7 +41860,7 @@ static void reloadTableSchema(Parse *pParse, Table *pTab, const char *zName){ Vdbe *v; char *zWhere; int iDb; /* Index of database containing pTab */ -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER Trigger *pTrig; #endif @@ -41869,7 +41869,7 @@ static void reloadTableSchema(Parse *pParse, Table *pTab, const char *zName){ iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema); assert( iDb>=0 ); -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER /* Drop any table triggers from the internal schema. */ for(pTrig=pTab->pTrigger; pTrig; pTrig=pTrig->pNext){ int iTrigDb = sqlite3SchemaToIndex(pParse->db, pTrig->pSchema); @@ -41886,9 +41886,9 @@ static void reloadTableSchema(Parse *pParse, Table *pTab, const char *zName){ if( !zWhere ) return; sqlite3VdbeOp3(v, OP_ParseSchema, iDb, 0, zWhere, P3_DYNAMIC); -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER /* Now, if the table is not stored in the temp database, reload any temp - ** triggers. Don't use IN(...) in case SQLITE_OMIT_SUBQUERY is defined. + ** triggers. Don't use IN(...) in case STQLITE_OMIT_SUBTQUERY is defined. */ if( (zWhere=whereTempTriggers(pParse, pTab))!=0 ){ sqlite3VdbeOp3(v, OP_ParseSchema, 1, 0, zWhere, P3_DYNAMIC); @@ -41900,7 +41900,7 @@ static void reloadTableSchema(Parse *pParse, Table *pTab, const char *zName){ ** Generate code to implement the "ALTER TABLE xxx RENAME TO yyy" ** command. */ -SQLITE_PRIVATE void sqlite3AlterRenameTable( +STQLITE_PRIVATE void sqlite3AlterRenameTable( Parse *pParse, /* Parser context. */ SrcList *pSrc, /* The table to rename. */ Token *pName /* The new table name. */ @@ -41913,7 +41913,7 @@ SQLITE_PRIVATE void sqlite3AlterRenameTable( int nTabName; /* Number of UTF-8 characters in zTabName */ const char *zTabName; /* Original name of the table */ Vdbe *v; -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER char *zWhere = 0; /* Where clause to locate temp triggers */ #endif int isVirtualRename = 0; /* True if this is a v-table with an xRename() */ @@ -41946,18 +41946,18 @@ SQLITE_PRIVATE void sqlite3AlterRenameTable( sqlite3ErrorMsg(pParse, "table %s may not be altered", pTab->zName); goto exit_rename_table; } - if( SQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){ + if( STQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){ goto exit_rename_table; } -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION /* Invoke the authorization callback. */ - if( sqlite3AuthCheck(pParse, SQLITE_ALTER_TABLE, zDb, pTab->zName, 0) ){ + if( sqlite3AuthCheck(pParse, STQLITE_ALTER_TABLE, zDb, pTab->zName, 0) ){ goto exit_rename_table; } #endif -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( sqlite3ViewGetColumnNames(pParse, pTab) ){ goto exit_rename_table; } @@ -41981,9 +41981,9 @@ SQLITE_PRIVATE void sqlite3AlterRenameTable( /* If this is a virtual table, invoke the xRename() function if ** one is defined. The xRename() callback will modify the names ** of any resources used by the v-table implementation (including other - ** SQLite tables) that are identified by the name of the virtual table. + ** STQLite tables) that are identified by the name of the virtual table. */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( isVirtualRename ){ sqlite3VdbeOp3(v, OP_String8, 0, 0, zName, 0); sqlite3VdbeOp3(v, OP_VRename, 0, 0, (const char*)pTab->pVtab, P3_VTAB); @@ -41997,7 +41997,7 @@ SQLITE_PRIVATE void sqlite3AlterRenameTable( /* Modify the sqlite_master table to use the new table name. */ sqlite3NestedParse(pParse, "UPDATE %Q.%s SET " -#ifdef SQLITE_OMIT_TRIGGER +#ifdef STQLITE_OMIT_TRIGGER "sql = sqlite_rename_table(sql, %Q), " #else "sql = CASE " @@ -42013,13 +42013,13 @@ SQLITE_PRIVATE void sqlite3AlterRenameTable( "WHERE tbl_name=%Q AND " "(type='table' OR type='index' OR type='trigger');", zDb, SCHEMA_TABLE(iDb), zName, zName, zName, -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER zName, #endif zName, nTabName, zTabName ); -#ifndef SQLITE_OMIT_AUTOINCREMENT +#ifndef STQLITE_OMIT_AUTOINCREMENT /* If the sqlite_sequence table exists in this database, then update ** it with the new table name. */ @@ -42030,7 +42030,7 @@ SQLITE_PRIVATE void sqlite3AlterRenameTable( } #endif -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER /* If there are TEMP triggers on this table, modify the sqlite_temp_master ** table. Don't do this if the table being ALTERed is itself located in ** the temp database. @@ -42062,7 +42062,7 @@ exit_rename_table: ** The Table structure pParse->pNewTable was extended to include ** the new column during parsing. */ -SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ +STQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ Table *pNew; /* Copy of pParse->pNewTable */ Table *pTab; /* Table being altered */ int iDb; /* Database number */ @@ -42084,9 +42084,9 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ pTab = sqlite3FindTable(pParse->db, zTab, zDb); assert( pTab ); -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION /* Invoke the authorization callback. */ - if( sqlite3AuthCheck(pParse, SQLITE_ALTER_TABLE, zDb, pTab->zName, 0) ){ + if( sqlite3AuthCheck(pParse, STQLITE_ALTER_TABLE, zDb, pTab->zName, 0) ){ return; } #endif @@ -42099,7 +42099,7 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ pDflt = 0; } - /* Check that the new column is not specified as PRIMARY KEY or UNIQUE. + /* Check that the new column is not specified as PRIMARY KEY or UNITQUE. ** If there is a NOT NULL constraint, then the default value for the ** column must not be NULL. */ @@ -42108,7 +42108,7 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ return; } if( pNew->pIndex ){ - sqlite3ErrorMsg(pParse, "Cannot add a UNIQUE column"); + sqlite3ErrorMsg(pParse, "Cannot add a UNITQUE column"); return; } if( pCol->notNull && !pDflt ){ @@ -42122,7 +42122,7 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ */ if( pDflt ){ sqlite3_value *pVal; - if( sqlite3ValueFromExpr(pDflt, SQLITE_UTF8, SQLITE_AFF_NONE, &pVal) ){ + if( sqlite3ValueFromExpr(pDflt, STQLITE_UTF8, STQLITE_AFF_NONE, &pVal) ){ /* malloc() has failed */ return; } @@ -42175,7 +42175,7 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ ** Routine sqlite3AlterFinishAddColumn() will be called to complete ** coding the "ALTER TABLE ... ADD" statement. */ -SQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){ +STQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){ Table *pNew; Table *pTab; Vdbe *v; @@ -42189,7 +42189,7 @@ SQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){ pTab = sqlite3LocateTable(pParse, pSrc->a[0].zName, pSrc->a[0].zDatabase); if( !pTab ) goto exit_begin_add_column; -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( IsVirtual(pTab) ){ sqlite3ErrorMsg(pParse, "virtual tables may not be altered"); goto exit_begin_add_column; @@ -42243,7 +42243,7 @@ exit_begin_add_column: sqlite3SrcListDelete(pSrc); return; } -#endif /* SQLITE_ALTER_TABLE */ +#endif /* STQLITE_ALTER_TABLE */ /************** End of alter.c ***********************************************/ /************** Begin file analyze.c *****************************************/ @@ -42262,7 +42262,7 @@ exit_begin_add_column: ** ** @(#) $Id: analyze.c,v 1.19 2007/06/20 13:37:31 drh Exp $ */ -#ifndef SQLITE_OMIT_ANALYZE +#ifndef STQLITE_OMIT_ANALYZE /* ** This routine generates code that opens the sqlite_stat1 table on cursor @@ -42351,8 +42351,8 @@ static void analyzeOneTable( iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema); assert( iDb>=0 ); -#ifndef SQLITE_OMIT_AUTHORIZATION - if( sqlite3AuthCheck(pParse, SQLITE_ANALYZE, pTab->zName, 0, +#ifndef STQLITE_OMIT_AUTHORIZATION + if( sqlite3AuthCheck(pParse, STQLITE_ANALYZE, pTab->zName, 0, pParse->db->aDb[iDb].zName ) ){ return; } @@ -42526,7 +42526,7 @@ static void analyzeTable(Parse *pParse, Table *pTab){ ** Form 2 analyzes all indices the single database named. ** Form 3 analyzes all indices associated with the named table. */ -SQLITE_PRIVATE void sqlite3Analyze(Parse *pParse, Token *pName1, Token *pName2){ +STQLITE_PRIVATE void sqlite3Analyze(Parse *pParse, Token *pName1, Token *pName2){ sqlite3 *db = pParse->db; int iDb; int i; @@ -42536,7 +42536,7 @@ SQLITE_PRIVATE void sqlite3Analyze(Parse *pParse, Token *pName1, Token *pName2){ /* Read the database schema. If an error occurs, leave an error message ** and code in pParse and return NULL. */ - if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){ + if( STQLITE_OK!=sqlite3ReadSchema(pParse) ){ return; } @@ -42624,7 +42624,7 @@ static int analysisLoader(void *pData, int argc, char **argv, char **azNotUsed){ /* ** Load the content of the sqlite_stat1 table into the index hash tables. */ -SQLITE_PRIVATE int sqlite3AnalysisLoad(sqlite3 *db, int iDb){ +STQLITE_PRIVATE int sqlite3AnalysisLoad(sqlite3 *db, int iDb){ analysisInfo sInfo; HashElem *i; char *zSql; @@ -42640,7 +42640,7 @@ SQLITE_PRIVATE int sqlite3AnalysisLoad(sqlite3 *db, int iDb){ sInfo.db = db; sInfo.zDatabase = db->aDb[iDb].zName; if( sqlite3FindTable(db, "sqlite_stat1", sInfo.zDatabase)==0 ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } @@ -42655,7 +42655,7 @@ SQLITE_PRIVATE int sqlite3AnalysisLoad(sqlite3 *db, int iDb){ } -#endif /* SQLITE_OMIT_ANALYZE */ +#endif /* STQLITE_OMIT_ANALYZE */ /************** End of analyze.c *********************************************/ /************** Begin file attach.c ******************************************/ @@ -42675,7 +42675,7 @@ SQLITE_PRIVATE int sqlite3AnalysisLoad(sqlite3 *db, int iDb){ ** $Id: attach.c,v 1.60 2007/05/09 20:31:30 drh Exp $ */ -#ifndef SQLITE_OMIT_ATTACH +#ifndef STQLITE_OMIT_ATTACH /* ** Resolve an expression that was part of an ATTACH or DETACH statement. This ** is slightly different from resolving a normal SQL expression, because simple @@ -42696,13 +42696,13 @@ SQLITE_PRIVATE int sqlite3AnalysisLoad(sqlite3 *db, int iDb){ */ static int resolveAttachExpr(NameContext *pName, Expr *pExpr) { - int rc = SQLITE_OK; + int rc = STQLITE_OK; if( pExpr ){ if( pExpr->op!=TK_ID ){ rc = sqlite3ExprResolveNames(pName, pExpr); - if( rc==SQLITE_OK && !sqlite3ExprIsConstant(pExpr) ){ + if( rc==STQLITE_OK && !sqlite3ExprIsConstant(pExpr) ){ sqlite3ErrorMsg(pName->pParse, "invalid name: \"%T\"", &pExpr->span); - return SQLITE_ERROR; + return STQLITE_ERROR; } }else{ pExpr->op = TK_STRING; @@ -42747,10 +42747,10 @@ static void attachFunc( ** * Transaction currently open ** * Specified database name already being used. */ - if( db->nDb>=SQLITE_MAX_ATTACHED+2 ){ + if( db->nDb>=STQLITE_MAX_ATTACHED+2 ){ sqlite3_snprintf( sizeof(zErr), zErr, "too many attached databases - max %d", - SQLITE_MAX_ATTACHED + STQLITE_MAX_ATTACHED ); goto attach_error; } @@ -42790,11 +42790,11 @@ static void attachFunc( ** it to obtain the database schema. At this point the schema may ** or may not be initialised. */ - rc = sqlite3BtreeFactory(db, zFile, 0, SQLITE_DEFAULT_CACHE_SIZE, &aNew->pBt); - if( rc==SQLITE_OK ){ + rc = sqlite3BtreeFactory(db, zFile, 0, STQLITE_DEFAULT_CACHE_SIZE, &aNew->pBt); + if( rc==STQLITE_OK ){ aNew->pSchema = sqlite3SchemaGet(aNew->pBt); if( !aNew->pSchema ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; }else if( aNew->pSchema->file_format && aNew->pSchema->enc!=ENC(db) ){ sqlite3_snprintf(sizeof(zErr), zErr, "attached databases must use the same text encoding as main database"); @@ -42805,7 +42805,7 @@ static void attachFunc( aNew->zName = sqliteStrDup(zName); aNew->safety_level = 3; -#if SQLITE_HAS_CODEC +#if STQLITE_HAS_CODEC { extern int sqlite3CodecAttach(sqlite3*, int, const void*, int); extern void sqlite3CodecGetKey(sqlite3*, int, void**, int*); @@ -42813,20 +42813,20 @@ static void attachFunc( char *zKey; int t = sqlite3_value_type(argv[2]); switch( t ){ - case SQLITE_INTEGER: - case SQLITE_FLOAT: + case STQLITE_INTEGER: + case STQLITE_FLOAT: zErrDyn = sqliteStrDup("Invalid key value"); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; break; - case SQLITE_TEXT: - case SQLITE_BLOB: + case STQLITE_TEXT: + case STQLITE_BLOB: nKey = sqlite3_value_bytes(argv[2]); zKey = (char *)sqlite3_value_blob(argv[2]); sqlite3CodecAttach(db, db->nDb-1, zKey, nKey); break; - case SQLITE_NULL: + case STQLITE_NULL: /* No key specified. Use the key from the main database */ sqlite3CodecGetKey(db, 0, (void**)&zKey, &nKey); sqlite3CodecAttach(db, db->nDb-1, zKey, nKey); @@ -42840,7 +42840,7 @@ static void attachFunc( ** remove the entry from the db->aDb[] array. i.e. put everything back the way ** we found it. */ - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ sqlite3SafetyOn(db); rc = sqlite3Init(db, &zErrDyn); sqlite3SafetyOff(db); @@ -42855,7 +42855,7 @@ static void attachFunc( } sqlite3ResetInternalSchema(db, 0); db->nDb = iDb; - if( rc==SQLITE_NOMEM ){ + if( rc==STQLITE_NOMEM ){ sqlite3FailedMalloc(); sqlite3_snprintf(sizeof(zErr),zErr, "out of memory"); }else{ @@ -42937,7 +42937,7 @@ detach_error: */ static void codeAttach( Parse *pParse, /* The parser context */ - int type, /* Either SQLITE_ATTACH or SQLITE_DETACH */ + int type, /* Either STQLITE_ATTACH or STQLITE_DETACH */ const char *zFunc, /* Either "sqlite_attach" or "sqlite_detach */ int nFunc, /* Number of args to pass to zFunc */ Expr *pAuthArg, /* Expression to pass to authorization callback */ @@ -42951,7 +42951,7 @@ static void codeAttach( FuncDef *pFunc; sqlite3* db = pParse->db; -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION assert( sqlite3MallocFailed() || pAuthArg ); if( pAuthArg ){ char *zAuthArg = sqlite3NameFromToken(&pAuthArg->span); @@ -42960,19 +42960,19 @@ static void codeAttach( } rc = sqlite3AuthCheck(pParse, type, zAuthArg, 0, 0); sqliteFree(zAuthArg); - if(rc!=SQLITE_OK ){ + if(rc!=STQLITE_OK ){ goto attach_end; } } -#endif /* SQLITE_OMIT_AUTHORIZATION */ +#endif /* STQLITE_OMIT_AUTHORIZATION */ memset(&sName, 0, sizeof(NameContext)); sName.pParse = pParse; if( - SQLITE_OK!=(rc = resolveAttachExpr(&sName, pFilename)) || - SQLITE_OK!=(rc = resolveAttachExpr(&sName, pDbname)) || - SQLITE_OK!=(rc = resolveAttachExpr(&sName, pKey)) + STQLITE_OK!=(rc = resolveAttachExpr(&sName, pFilename)) || + STQLITE_OK!=(rc = resolveAttachExpr(&sName, pDbname)) || + STQLITE_OK!=(rc = resolveAttachExpr(&sName, pKey)) ){ pParse->nErr++; goto attach_end; @@ -42986,14 +42986,14 @@ static void codeAttach( assert( v || sqlite3MallocFailed() ); if( v ){ sqlite3VdbeAddOp(v, OP_Function, 0, nFunc); - pFunc = sqlite3FindFunction(db, zFunc, strlen(zFunc), nFunc, SQLITE_UTF8,0); + pFunc = sqlite3FindFunction(db, zFunc, strlen(zFunc), nFunc, STQLITE_UTF8,0); sqlite3VdbeChangeP3(v, -1, (char *)pFunc, P3_FUNCDEF); /* Code an OP_Expire. For an ATTACH statement, set P1 to true (expire this ** statement only). For DETACH, set it to false (expire all existing ** statements). */ - sqlite3VdbeAddOp(v, OP_Expire, (type==SQLITE_ATTACH), 0); + sqlite3VdbeAddOp(v, OP_Expire, (type==STQLITE_ATTACH), 0); } attach_end: @@ -43007,8 +43007,8 @@ attach_end: ** ** DETACH pDbname */ -SQLITE_PRIVATE void sqlite3Detach(Parse *pParse, Expr *pDbname){ - codeAttach(pParse, SQLITE_DETACH, "sqlite_detach", 1, pDbname, 0, 0, pDbname); +STQLITE_PRIVATE void sqlite3Detach(Parse *pParse, Expr *pDbname){ + codeAttach(pParse, STQLITE_DETACH, "sqlite_detach", 1, pDbname, 0, 0, pDbname); } /* @@ -43016,17 +43016,17 @@ SQLITE_PRIVATE void sqlite3Detach(Parse *pParse, Expr *pDbname){ ** ** ATTACH p AS pDbname KEY pKey */ -SQLITE_PRIVATE void sqlite3Attach(Parse *pParse, Expr *p, Expr *pDbname, Expr *pKey){ - codeAttach(pParse, SQLITE_ATTACH, "sqlite_attach", 3, p, p, pDbname, pKey); +STQLITE_PRIVATE void sqlite3Attach(Parse *pParse, Expr *p, Expr *pDbname, Expr *pKey){ + codeAttach(pParse, STQLITE_ATTACH, "sqlite_attach", 3, p, p, pDbname, pKey); } -#endif /* SQLITE_OMIT_ATTACH */ +#endif /* STQLITE_OMIT_ATTACH */ /* ** Register the functions sqlite_attach and sqlite_detach. */ -SQLITE_PRIVATE void sqlite3AttachFunctions(sqlite3 *db){ -#ifndef SQLITE_OMIT_ATTACH - static const int enc = SQLITE_UTF8; +STQLITE_PRIVATE void sqlite3AttachFunctions(sqlite3 *db){ +#ifndef STQLITE_OMIT_ATTACH + static const int enc = STQLITE_UTF8; sqlite3CreateFunc(db, "sqlite_attach", 3, enc, db, attachFunc, 0, 0); sqlite3CreateFunc(db, "sqlite_detach", 1, enc, db, detachFunc, 0, 0); #endif @@ -43039,7 +43039,7 @@ SQLITE_PRIVATE void sqlite3AttachFunctions(sqlite3 *db){ ** The return value indicates whether or not fixation is required. TRUE ** means we do need to fix the database references, FALSE means we do not. */ -SQLITE_PRIVATE int sqlite3FixInit( +STQLITE_PRIVATE int sqlite3FixInit( DbFixer *pFix, /* The fixer to be initialized */ Parse *pParse, /* Error messages will be written here */ int iDb, /* This is the database that must be used */ @@ -43072,7 +43072,7 @@ SQLITE_PRIVATE int sqlite3FixInit( ** pParse->zErrMsg and these routines return non-zero. If everything ** checks out, these routines return 0. */ -SQLITE_PRIVATE int sqlite3FixSrcList( +STQLITE_PRIVATE int sqlite3FixSrcList( DbFixer *pFix, /* Context of the fixation */ SrcList *pList /* The Source list to check and modify */ ){ @@ -43091,15 +43091,15 @@ SQLITE_PRIVATE int sqlite3FixSrcList( pFix->zType, pFix->pName, pItem->zDatabase); return 1; } -#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER) +#if !defined(STQLITE_OMIT_VIEW) || !defined(STQLITE_OMIT_TRIGGER) if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1; if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1; #endif } return 0; } -#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER) -SQLITE_PRIVATE int sqlite3FixSelect( +#if !defined(STQLITE_OMIT_VIEW) || !defined(STQLITE_OMIT_TRIGGER) +STQLITE_PRIVATE int sqlite3FixSelect( DbFixer *pFix, /* Context of the fixation */ Select *pSelect /* The SELECT statement to be fixed to one database */ ){ @@ -43120,7 +43120,7 @@ SQLITE_PRIVATE int sqlite3FixSelect( } return 0; } -SQLITE_PRIVATE int sqlite3FixExpr( +STQLITE_PRIVATE int sqlite3FixExpr( DbFixer *pFix, /* Context of the fixation */ Expr *pExpr /* The expression to be fixed to one database */ ){ @@ -43138,7 +43138,7 @@ SQLITE_PRIVATE int sqlite3FixExpr( } return 0; } -SQLITE_PRIVATE int sqlite3FixExprList( +STQLITE_PRIVATE int sqlite3FixExprList( DbFixer *pFix, /* Context of the fixation */ ExprList *pList /* The expression to be fixed to one database */ ){ @@ -43154,8 +43154,8 @@ SQLITE_PRIVATE int sqlite3FixExprList( } #endif -#ifndef SQLITE_OMIT_TRIGGER -SQLITE_PRIVATE int sqlite3FixTriggerStep( +#ifndef STQLITE_OMIT_TRIGGER +STQLITE_PRIVATE int sqlite3FixTriggerStep( DbFixer *pFix, /* Context of the fixation */ TriggerStep *pStep /* The trigger step be fixed to one database */ ){ @@ -43191,7 +43191,7 @@ SQLITE_PRIVATE int sqlite3FixTriggerStep( ** This file contains code used to implement the sqlite3_set_authorizer() ** API. This facility is an optional feature of the library. Embedded ** systems that do not need this facility may omit it by recompiling -** the library with -DSQLITE_OMIT_AUTHORIZATION=1 +** the library with -DSTQLITE_OMIT_AUTHORIZATION=1 ** ** $Id: auth.c,v 1.26 2007/05/14 11:34:47 drh Exp $ */ @@ -43200,7 +43200,7 @@ SQLITE_PRIVATE int sqlite3FixTriggerStep( ** All of the code in this file may be omitted by defining a single ** macro. */ -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION /* ** Set or clear the access authorization function. @@ -43211,36 +43211,36 @@ SQLITE_PRIVATE int sqlite3FixTriggerStep( ** is a copy of the 3rd argument to this routine. The second argument ** to the auth function is one of these constants: ** -** SQLITE_CREATE_INDEX -** SQLITE_CREATE_TABLE -** SQLITE_CREATE_TEMP_INDEX -** SQLITE_CREATE_TEMP_TABLE -** SQLITE_CREATE_TEMP_TRIGGER -** SQLITE_CREATE_TEMP_VIEW -** SQLITE_CREATE_TRIGGER -** SQLITE_CREATE_VIEW -** SQLITE_DELETE -** SQLITE_DROP_INDEX -** SQLITE_DROP_TABLE -** SQLITE_DROP_TEMP_INDEX -** SQLITE_DROP_TEMP_TABLE -** SQLITE_DROP_TEMP_TRIGGER -** SQLITE_DROP_TEMP_VIEW -** SQLITE_DROP_TRIGGER -** SQLITE_DROP_VIEW -** SQLITE_INSERT -** SQLITE_PRAGMA -** SQLITE_READ -** SQLITE_SELECT -** SQLITE_TRANSACTION -** SQLITE_UPDATE +** STQLITE_CREATE_INDEX +** STQLITE_CREATE_TABLE +** STQLITE_CREATE_TEMP_INDEX +** STQLITE_CREATE_TEMP_TABLE +** STQLITE_CREATE_TEMP_TRIGGER +** STQLITE_CREATE_TEMP_VIEW +** STQLITE_CREATE_TRIGGER +** STQLITE_CREATE_VIEW +** STQLITE_DELETE +** STQLITE_DROP_INDEX +** STQLITE_DROP_TABLE +** STQLITE_DROP_TEMP_INDEX +** STQLITE_DROP_TEMP_TABLE +** STQLITE_DROP_TEMP_TRIGGER +** STQLITE_DROP_TEMP_VIEW +** STQLITE_DROP_TRIGGER +** STQLITE_DROP_VIEW +** STQLITE_INSERT +** STQLITE_PRAGMA +** STQLITE_READ +** STQLITE_SELECT +** STQLITE_TRANSACTION +** STQLITE_UPDATE ** ** The third and fourth arguments to the auth function are the name of ** the table and the column that are being accessed. The auth function -** should return either SQLITE_OK, SQLITE_DENY, or SQLITE_IGNORE. If -** SQLITE_OK is returned, it means that access is allowed. SQLITE_DENY +** should return either STQLITE_OK, STQLITE_DENY, or STQLITE_IGNORE. If +** STQLITE_OK is returned, it means that access is allowed. STQLITE_DENY ** means that the SQL statement will never-run - the sqlite3_exec() call -** will return with an error. SQLITE_IGNORE means that the SQL statement +** will return with an error. STQLITE_IGNORE means that the SQL statement ** should run but attempts to read the specified column will return NULL ** and attempts to write the column will be ignored. ** @@ -43255,7 +43255,7 @@ int sqlite3_set_authorizer( db->xAuth = xAuth; db->pAuthArg = pArg; sqlite3ExpirePreparedStatements(db); - return SQLITE_OK; + return STQLITE_OK; } /* @@ -43264,9 +43264,9 @@ int sqlite3_set_authorizer( */ static void sqliteAuthBadReturnCode(Parse *pParse, int rc){ sqlite3ErrorMsg(pParse, "illegal return value (%d) from the " - "authorization function - should be SQLITE_OK, SQLITE_IGNORE, " - "or SQLITE_DENY", rc); - pParse->rc = SQLITE_ERROR; + "authorization function - should be STQLITE_OK, STQLITE_IGNORE, " + "or STQLITE_DENY", rc); + pParse->rc = STQLITE_ERROR; } /* @@ -43274,11 +43274,11 @@ static void sqliteAuthBadReturnCode(Parse *pParse, int rc){ ** is in pTabList or else it is the NEW or OLD table of a trigger. ** Check to see if it is OK to read this particular column. ** -** If the auth function returns SQLITE_IGNORE, change the TK_COLUMN -** instruction into a TK_NULL. If the auth function returns SQLITE_DENY, +** If the auth function returns STQLITE_IGNORE, change the TK_COLUMN +** instruction into a TK_NULL. If the auth function returns STQLITE_DENY, ** then generate an error. */ -SQLITE_PRIVATE void sqlite3AuthRead( +STQLITE_PRIVATE void sqlite3AuthRead( Parse *pParse, /* The parser context */ Expr *pExpr, /* The expression to check authorization on */ SrcList *pTabList /* All table that pExpr might refer to */ @@ -43326,30 +43326,30 @@ SQLITE_PRIVATE void sqlite3AuthRead( } assert( iDb>=0 && iDb<db->nDb ); zDBase = db->aDb[iDb].zName; - rc = db->xAuth(db->pAuthArg, SQLITE_READ, pTab->zName, zCol, zDBase, + rc = db->xAuth(db->pAuthArg, STQLITE_READ, pTab->zName, zCol, zDBase, pParse->zAuthContext); - if( rc==SQLITE_IGNORE ){ + if( rc==STQLITE_IGNORE ){ pExpr->op = TK_NULL; - }else if( rc==SQLITE_DENY ){ + }else if( rc==STQLITE_DENY ){ if( db->nDb>2 || iDb!=0 ){ sqlite3ErrorMsg(pParse, "access to %s.%s.%s is prohibited", zDBase, pTab->zName, zCol); }else{ sqlite3ErrorMsg(pParse, "access to %s.%s is prohibited",pTab->zName,zCol); } - pParse->rc = SQLITE_AUTH; - }else if( rc!=SQLITE_OK ){ + pParse->rc = STQLITE_AUTH; + }else if( rc!=STQLITE_OK ){ sqliteAuthBadReturnCode(pParse, rc); } } /* ** Do an authorization check using the code and arguments given. Return -** either SQLITE_OK (zero) or SQLITE_IGNORE or SQLITE_DENY. If SQLITE_DENY +** either STQLITE_OK (zero) or STQLITE_IGNORE or STQLITE_DENY. If STQLITE_DENY ** is returned, then the error count and error message in pParse are ** modified appropriately. */ -SQLITE_PRIVATE int sqlite3AuthCheck( +STQLITE_PRIVATE int sqlite3AuthCheck( Parse *pParse, int code, const char *zArg1, @@ -43363,18 +43363,18 @@ SQLITE_PRIVATE int sqlite3AuthCheck( ** or if the parser is being invoked from within sqlite3_declare_vtab. */ if( db->init.busy || IN_DECLARE_VTAB ){ - return SQLITE_OK; + return STQLITE_OK; } if( db->xAuth==0 ){ - return SQLITE_OK; + return STQLITE_OK; } rc = db->xAuth(db->pAuthArg, code, zArg1, zArg2, zArg3, pParse->zAuthContext); - if( rc==SQLITE_DENY ){ + if( rc==STQLITE_DENY ){ sqlite3ErrorMsg(pParse, "not authorized"); - pParse->rc = SQLITE_AUTH; - }else if( rc!=SQLITE_OK && rc!=SQLITE_IGNORE ){ - rc = SQLITE_DENY; + pParse->rc = STQLITE_AUTH; + }else if( rc!=STQLITE_OK && rc!=STQLITE_IGNORE ){ + rc = STQLITE_DENY; sqliteAuthBadReturnCode(pParse, rc); } return rc; @@ -43385,7 +43385,7 @@ SQLITE_PRIVATE int sqlite3AuthCheck( ** zArg3 argument to authorization callbacks will be zContext until ** popped. Or if pParse==0, this routine is a no-op. */ -SQLITE_PRIVATE void sqlite3AuthContextPush( +STQLITE_PRIVATE void sqlite3AuthContextPush( Parse *pParse, AuthContext *pContext, const char *zContext @@ -43401,14 +43401,14 @@ SQLITE_PRIVATE void sqlite3AuthContextPush( ** Pop an authorization context that was previously pushed ** by sqlite3AuthContextPush */ -SQLITE_PRIVATE void sqlite3AuthContextPop(AuthContext *pContext){ +STQLITE_PRIVATE void sqlite3AuthContextPop(AuthContext *pContext){ if( pContext->pParse ){ pContext->pParse->zAuthContext = pContext->zAuthContext; pContext->pParse = 0; } } -#endif /* SQLITE_OMIT_AUTHORIZATION */ +#endif /* STQLITE_OMIT_AUTHORIZATION */ /************** End of auth.c ************************************************/ /************** Begin file build.c *******************************************/ @@ -43423,7 +43423,7 @@ SQLITE_PRIVATE void sqlite3AuthContextPop(AuthContext *pContext){ ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file contains C code routines that are called by the SQLite parser +** This file contains C code routines that are called by the STQLite parser ** when syntax rules are reduced. The routines in this file handle the ** following kinds of SQL syntax: ** @@ -43443,12 +43443,12 @@ SQLITE_PRIVATE void sqlite3AuthContextPop(AuthContext *pContext){ ** This routine is called when a new SQL statement is beginning to ** be parsed. Initialize the pParse structure as needed. */ -SQLITE_PRIVATE void sqlite3BeginParse(Parse *pParse, int explainFlag){ +STQLITE_PRIVATE void sqlite3BeginParse(Parse *pParse, int explainFlag){ pParse->explain = explainFlag; pParse->nVar = 0; } -#ifndef SQLITE_OMIT_SHARED_CACHE +#ifndef STQLITE_OMIT_SHARED_CACHE /* ** The TableLock structure is only used by the sqlite3TableLock() and ** codeTableLocks() functions. @@ -43470,7 +43470,7 @@ struct TableLock { ** code to make the lock occur is generated by a later call to ** codeTableLocks() which occurs during sqlite3FinishCoding(). */ -SQLITE_PRIVATE void sqlite3TableLock( +STQLITE_PRIVATE void sqlite3TableLock( Parse *pParse, /* Parsing context */ int iDb, /* Index of the database containing the table to lock */ int iTab, /* Root page number of the table to be locked */ @@ -43540,15 +43540,15 @@ static void codeTableLocks(Parse *pParse){ ** Note that if an error occurred, it might be the case that ** no VDBE code was generated. */ -SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){ +STQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){ sqlite3 *db; Vdbe *v; if( sqlite3MallocFailed() ) return; if( pParse->nested ) return; if( !pParse->pVdbe ){ - if( pParse->rc==SQLITE_OK && pParse->nErr ){ - pParse->rc = SQLITE_ERROR; + if( pParse->rc==STQLITE_OK && pParse->nErr ){ + pParse->rc = STQLITE_ERROR; return; } } @@ -43561,22 +43561,22 @@ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){ if( v ){ sqlite3VdbeAddOp(v, OP_Halt, 0, 0); - /* The cookie mask contains one bit for each database file open. + /* The cookie tqmask contains one bit for each database file open. ** (Bit 0 is for main, bit 1 is for temp, and so forth.) Bits are ** set for each database that is used. Generate code to start a ** transaction on each used database and to verify the schema cookie ** on each used database. */ if( pParse->cookieGoto>0 ){ - u32 mask; + u32 tqmask; int iDb; sqlite3VdbeJumpHere(v, pParse->cookieGoto-1); - for(iDb=0, mask=1; iDb<db->nDb; mask<<=1, iDb++){ - if( (mask & pParse->cookieMask)==0 ) continue; - sqlite3VdbeAddOp(v, OP_Transaction, iDb, (mask & pParse->writeMask)!=0); + for(iDb=0, tqmask=1; iDb<db->nDb; tqmask<<=1, iDb++){ + if( (tqmask & pParse->cookieMask)==0 ) continue; + sqlite3VdbeAddOp(v, OP_Transaction, iDb, (tqmask & pParse->writeMask)!=0); sqlite3VdbeAddOp(v, OP_VerifyCookie, iDb, pParse->cookieValue[iDb]); } -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( pParse->pVirtualLock ){ char *vtab = (char *)pParse->pVirtualLock->pVtab; sqlite3VdbeOp3(v, OP_VBegin, 0, 0, vtab, P3_VTAB); @@ -43591,7 +43591,7 @@ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){ sqlite3VdbeAddOp(v, OP_Goto, 0, pParse->cookieGoto); } -#ifndef SQLITE_OMIT_TRACE +#ifndef STQLITE_OMIT_TRACE /* Add a No-op that contains the complete text of the compiled SQL ** statement as its P3 argument. This does not change the functionality ** of the program. @@ -43599,23 +43599,23 @@ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){ ** This is used to implement sqlite3_trace(). */ sqlite3VdbeOp3(v, OP_Noop, 0, 0, pParse->zSql, pParse->zTail-pParse->zSql); -#endif /* SQLITE_OMIT_TRACE */ +#endif /* STQLITE_OMIT_TRACE */ } /* Get the VDBE program ready for execution */ if( v && pParse->nErr==0 && !sqlite3MallocFailed() ){ -#ifdef SQLITE_DEBUG - FILE *trace = (db->flags & SQLITE_VdbeTrace)!=0 ? stdout : 0; +#ifdef STQLITE_DEBUG + FILE *trace = (db->flags & STQLITE_VdbeTrace)!=0 ? stdout : 0; sqlite3VdbeTrace(v, trace); #endif sqlite3VdbeMakeReady(v, pParse->nVar, pParse->nMem+3, pParse->nTab+3, pParse->explain); - pParse->rc = SQLITE_DONE; + pParse->rc = STQLITE_DONE; pParse->colNamesSet = 0; - }else if( pParse->rc==SQLITE_OK ){ - pParse->rc = SQLITE_ERROR; + }else if( pParse->rc==STQLITE_OK ){ + pParse->rc = STQLITE_ERROR; } pParse->nTab = 0; pParse->nMem = 0; @@ -43634,10 +43634,10 @@ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){ ** outermost parser. ** ** Not everything is nestable. This facility is designed to permit -** INSERT, UPDATE, and DELETE operations against SQLITE_MASTER. Use +** INSERT, UPDATE, and DELETE operations against STQLITE_MASTER. Use ** care if you decide to try to use this routine for some other purposes. */ -SQLITE_PRIVATE void sqlite3NestedParse(Parse *pParse, const char *zFormat, ...){ +STQLITE_PRIVATE void sqlite3NestedParse(Parse *pParse, const char *zFormat, ...){ va_list ap; char *zSql; # define SAVE_SZ (sizeof(Parse) - offsetof(Parse,nVar)) @@ -43672,7 +43672,7 @@ SQLITE_PRIVATE void sqlite3NestedParse(Parse *pParse, const char *zFormat, ...){ ** ** See also sqlite3LocateTable(). */ -SQLITE_PRIVATE Table *sqlite3FindTable(sqlite3 *db, const char *zName, const char *zDatabase){ +STQLITE_PRIVATE Table *sqlite3FindTable(sqlite3 *db, const char *zName, const char *zDatabase){ Table *p = 0; int i; assert( zName!=0 ); @@ -43695,12 +43695,12 @@ SQLITE_PRIVATE Table *sqlite3FindTable(sqlite3 *db, const char *zName, const cha ** routine leaves an error message in pParse->zErrMsg where ** sqlite3FindTable() does not. */ -SQLITE_PRIVATE Table *sqlite3LocateTable(Parse *pParse, const char *zName, const char *zDbase){ +STQLITE_PRIVATE Table *sqlite3LocateTable(Parse *pParse, const char *zName, const char *zDbase){ Table *p; /* Read the database schema. If an error occurs, leave an error message ** and code in pParse and return NULL. */ - if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){ + if( STQLITE_OK!=sqlite3ReadSchema(pParse) ){ return 0; } @@ -43728,7 +43728,7 @@ SQLITE_PRIVATE Table *sqlite3LocateTable(Parse *pParse, const char *zName, const ** TEMP first, then MAIN, then any auxiliary databases added ** using the ATTACH command. */ -SQLITE_PRIVATE Index *sqlite3FindIndex(sqlite3 *db, const char *zName, const char *zDb){ +STQLITE_PRIVATE Index *sqlite3FindIndex(sqlite3 *db, const char *zName, const char *zDb){ Index *p = 0; int i; for(i=OMIT_TEMPDB; i<db->nDb; i++){ @@ -43775,7 +43775,7 @@ static void sqliteDeleteIndex(Index *p){ ** the index hash table and free all memory structures associated ** with the index. */ -SQLITE_PRIVATE void sqlite3UnlinkAndDeleteIndex(sqlite3 *db, int iDb, const char *zIdxName){ +STQLITE_PRIVATE void sqlite3UnlinkAndDeleteIndex(sqlite3 *db, int iDb, const char *zIdxName){ Index *pIndex; int len; Hash *pHash = &db->aDb[iDb].pSchema->idxHash; @@ -43794,7 +43794,7 @@ SQLITE_PRIVATE void sqlite3UnlinkAndDeleteIndex(sqlite3 *db, int iDb, const char } freeIndex(pIndex); } - db->flags |= SQLITE_InternChanges; + db->flags |= STQLITE_InternChanges; } /* @@ -43808,7 +43808,7 @@ SQLITE_PRIVATE void sqlite3UnlinkAndDeleteIndex(sqlite3 *db, int iDb, const char ** files. If iDb>=2 then reset the internal schema for only the ** single file indicated. */ -SQLITE_PRIVATE void sqlite3ResetInternalSchema(sqlite3 *db, int iDb){ +STQLITE_PRIVATE void sqlite3ResetInternalSchema(sqlite3 *db, int iDb){ int i, j; assert( iDb>=0 && iDb<db->nDb ); @@ -43820,7 +43820,7 @@ SQLITE_PRIVATE void sqlite3ResetInternalSchema(sqlite3 *db, int iDb){ if( iDb>0 ) return; } assert( iDb==0 ); - db->flags &= ~SQLITE_InternChanges; + db->flags &= ~STQLITE_InternChanges; /* If one or more of the auxiliary database files has been closed, ** then remove them from the auxiliary database list. We take the @@ -43859,8 +43859,8 @@ SQLITE_PRIVATE void sqlite3ResetInternalSchema(sqlite3 *db, int iDb){ /* ** This routine is called when a commit occurs. */ -SQLITE_PRIVATE void sqlite3CommitInternalChanges(sqlite3 *db){ - db->flags &= ~SQLITE_InternChanges; +STQLITE_PRIVATE void sqlite3CommitInternalChanges(sqlite3 *db){ + db->flags &= ~STQLITE_InternChanges; } /* @@ -43893,7 +43893,7 @@ static void sqliteResetColumnNames(Table *pTable){ ** memory structures of the indices and foreign keys associated with ** the table. */ -SQLITE_PRIVATE void sqlite3DeleteTable(Table *pTable){ +STQLITE_PRIVATE void sqlite3DeleteTable(Table *pTable){ Index *pIndex, *pNext; FKey *pFKey, *pNextFKey; @@ -43914,7 +43914,7 @@ SQLITE_PRIVATE void sqlite3DeleteTable(Table *pTable){ sqliteDeleteIndex(pIndex); } -#ifndef SQLITE_OMIT_FOREIGN_KEY +#ifndef STQLITE_OMIT_FOREIGN_KEY /* Delete all foreign keys associated with this table. The keys ** should have already been unlinked from the pSchema->aFKey hash table */ @@ -43932,7 +43932,7 @@ SQLITE_PRIVATE void sqlite3DeleteTable(Table *pTable){ sqliteFree(pTable->zName); sqliteFree(pTable->zColAff); sqlite3SelectDelete(pTable->pSelect); -#ifndef SQLITE_OMIT_CHECK +#ifndef STQLITE_OMIT_CHECK sqlite3ExprDelete(pTable->pCheck); #endif sqlite3VtabClear(pTable); @@ -43943,7 +43943,7 @@ SQLITE_PRIVATE void sqlite3DeleteTable(Table *pTable){ ** Unlink the given table from the hash tables and the delete the ** table structure with all its indices and foreign keys. */ -SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTable(sqlite3 *db, int iDb, const char *zTabName){ +STQLITE_PRIVATE void sqlite3UnlinkAndDeleteTable(sqlite3 *db, int iDb, const char *zTabName){ Table *p; FKey *pF1, *pF2; Db *pDb; @@ -43954,7 +43954,7 @@ SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTable(sqlite3 *db, int iDb, const char pDb = &db->aDb[iDb]; p = sqlite3HashInsert(&pDb->pSchema->tblHash, zTabName, strlen(zTabName)+1,0); if( p ){ -#ifndef SQLITE_OMIT_FOREIGN_KEY +#ifndef STQLITE_OMIT_FOREIGN_KEY for(pF1=p->pFKey; pF1; pF1=pF1->pNextFrom){ int nTo = strlen(pF1->zTo) + 1; pF2 = sqlite3HashFind(&pDb->pSchema->aFKey, pF1->zTo, nTo); @@ -43970,7 +43970,7 @@ SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTable(sqlite3 *db, int iDb, const char #endif sqlite3DeleteTable(p); } - db->flags |= SQLITE_InternChanges; + db->flags |= STQLITE_InternChanges; } /* @@ -43983,7 +43983,7 @@ SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTable(sqlite3 *db, int iDb, const char ** are not \000 terminated and are not persistent. The returned string ** is \000 terminated and is persistent. */ -SQLITE_PRIVATE char *sqlite3NameFromToken(Token *pName){ +STQLITE_PRIVATE char *sqlite3NameFromToken(Token *pName){ char *zName; if( pName ){ zName = sqliteStrNDup((char*)pName->z, pName->n); @@ -43998,7 +43998,7 @@ SQLITE_PRIVATE char *sqlite3NameFromToken(Token *pName){ ** Open the sqlite_master table stored in database number iDb for ** writing. The table is opened using cursor 0. */ -SQLITE_PRIVATE void sqlite3OpenMasterTable(Parse *p, int iDb){ +STQLITE_PRIVATE void sqlite3OpenMasterTable(Parse *p, int iDb){ Vdbe *v = sqlite3GetVdbe(p); sqlite3TableLock(p, iDb, MASTER_ROOT, 1, SCHEMA_TABLE(iDb)); sqlite3VdbeAddOp(v, OP_Integer, iDb, 0); @@ -44012,7 +44012,7 @@ SQLITE_PRIVATE void sqlite3OpenMasterTable(Parse *p, int iDb){ ** index of the named database in db->aDb[], or -1 if the named db ** does not exist. */ -SQLITE_PRIVATE int sqlite3FindDb(sqlite3 *db, Token *pName){ +STQLITE_PRIVATE int sqlite3FindDb(sqlite3 *db, Token *pName){ int i = -1; /* Database number */ int n; /* Number of characters in the name */ Db *pDb; /* A database whose name space is being searched */ @@ -44048,7 +44048,7 @@ SQLITE_PRIVATE int sqlite3FindDb(sqlite3 *db, Token *pName){ ** pName2) that stores the unqualified table name. The index of the ** database "xxx" is returned. */ -SQLITE_PRIVATE int sqlite3TwoPartName( +STQLITE_PRIVATE int sqlite3TwoPartName( Parse *pParse, /* Parsing and code generating context */ Token *pName1, /* The "xxx" in the name "xxx.yyy" or "xxx" */ Token *pName2, /* The "yyy" in the name "xxx.yyy" */ @@ -44081,14 +44081,14 @@ SQLITE_PRIVATE int sqlite3TwoPartName( ** "sqlite_" (in upper, lower or mixed case). This portion of the namespace ** is reserved for internal use. */ -SQLITE_PRIVATE int sqlite3CheckObjectName(Parse *pParse, const char *zName){ +STQLITE_PRIVATE int sqlite3CheckObjectName(Parse *pParse, const char *zName){ if( !pParse->db->init.busy && pParse->nested==0 - && (pParse->db->flags & SQLITE_WriteSchema)==0 + && (pParse->db->flags & STQLITE_WriteSchema)==0 && 0==sqlite3StrNICmp(zName, "sqlite_", 7) ){ sqlite3ErrorMsg(pParse, "object name reserved for internal use: %s", zName); - return SQLITE_ERROR; + return STQLITE_ERROR; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -44107,7 +44107,7 @@ SQLITE_PRIVATE int sqlite3CheckObjectName(Parse *pParse, const char *zName){ ** At the end of the CREATE TABLE statement, the sqlite3EndTable() routine ** is called to complete the construction of the new table record. */ -SQLITE_PRIVATE void sqlite3StartTable( +STQLITE_PRIVATE void sqlite3StartTable( Parse *pParse, /* Parser context */ Token *pName1, /* First part of the name of the table or view */ Token *pName2, /* Second part of the name of the table or view */ @@ -44152,29 +44152,29 @@ SQLITE_PRIVATE void sqlite3StartTable( pParse->sNameToken = *pName; zName = sqlite3NameFromToken(pName); if( zName==0 ) return; - if( SQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){ + if( STQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){ goto begin_table_error; } if( db->init.iDb==1 ) isTemp = 1; -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION assert( (isTemp & 1)==isTemp ); { int code; char *zDb = db->aDb[iDb].zName; - if( sqlite3AuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(isTemp), 0, zDb) ){ + if( sqlite3AuthCheck(pParse, STQLITE_INSERT, SCHEMA_TABLE(isTemp), 0, zDb) ){ goto begin_table_error; } if( isView ){ if( !OMIT_TEMPDB && isTemp ){ - code = SQLITE_CREATE_TEMP_VIEW; + code = STQLITE_CREATE_TEMP_VIEW; }else{ - code = SQLITE_CREATE_VIEW; + code = STQLITE_CREATE_VIEW; } }else{ if( !OMIT_TEMPDB && isTemp ){ - code = SQLITE_CREATE_TEMP_TABLE; + code = STQLITE_CREATE_TEMP_TABLE; }else{ - code = SQLITE_CREATE_TABLE; + code = STQLITE_CREATE_TABLE; } } if( !isVirtual && sqlite3AuthCheck(pParse, code, zName, 0, zDb) ){ @@ -44191,7 +44191,7 @@ SQLITE_PRIVATE void sqlite3StartTable( ** collisions. */ if( !IN_DECLARE_VTAB ){ - if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){ + if( STQLITE_OK!=sqlite3ReadSchema(pParse) ){ goto begin_table_error; } pTable = sqlite3FindTable(db, zName, db->aDb[iDb].zName); @@ -44209,7 +44209,7 @@ SQLITE_PRIVATE void sqlite3StartTable( pTable = sqliteMalloc( sizeof(Table) ); if( pTable==0 ){ - pParse->rc = SQLITE_NOMEM; + pParse->rc = STQLITE_NOMEM; pParse->nErr++; goto begin_table_error; } @@ -44224,16 +44224,16 @@ SQLITE_PRIVATE void sqlite3StartTable( ** then record a pointer to this table in the main database structure ** so that INSERT can find the table easily. */ -#ifndef SQLITE_OMIT_AUTOINCREMENT +#ifndef STQLITE_OMIT_AUTOINCREMENT if( !pParse->nested && strcmp(zName, "sqlite_sequence")==0 ){ pTable->pSchema->pSeqTab = pTable; } #endif /* Begin generating the code that will insert the table record into - ** the SQLITE_MASTER table. Note in particular that we must go ahead + ** the STQLITE_MASTER table. Note in particular that we must go ahead ** and allocate the record number for the table entry now. Before any - ** PRIMARY KEY or UNIQUE keywords are parsed. Those keywords will cause + ** PRIMARY KEY or UNITQUE keywords are parsed. Those keywords will cause ** indices to be created and the table record must come before the ** indices. Hence, the record number for the table must be allocated ** now. @@ -44243,7 +44243,7 @@ SQLITE_PRIVATE void sqlite3StartTable( int fileFormat; sqlite3BeginWriteOperation(pParse, 0, iDb); -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( isVirtual ){ sqlite3VdbeAddOp(v, OP_VBegin, 0, 0); } @@ -44255,8 +44255,8 @@ SQLITE_PRIVATE void sqlite3StartTable( sqlite3VdbeAddOp(v, OP_ReadCookie, iDb, 1); /* file_format */ lbl = sqlite3VdbeMakeLabel(v); sqlite3VdbeAddOp(v, OP_If, 0, lbl); - fileFormat = (db->flags & SQLITE_LegacyFileFmt)!=0 ? - 1 : SQLITE_MAX_FILE_FORMAT; + fileFormat = (db->flags & STQLITE_LegacyFileFmt)!=0 ? + 1 : STQLITE_MAX_FILE_FORMAT; sqlite3VdbeAddOp(v, OP_Integer, fileFormat, 0); sqlite3VdbeAddOp(v, OP_SetCookie, iDb, 1); sqlite3VdbeAddOp(v, OP_Integer, ENC(db), 0); @@ -44271,7 +44271,7 @@ SQLITE_PRIVATE void sqlite3StartTable( ** The rowid value is needed by the code that sqlite3EndTable will ** generate. */ -#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE) +#if !defined(STQLITE_OMIT_VIEW) || !defined(STQLITE_OMIT_VIRTUALTABLE) if( isView || isVirtual ){ sqlite3VdbeAddOp(v, OP_Integer, 0, 0); }else @@ -44318,13 +44318,13 @@ sqlite3UpperToLower[*(unsigned char *)(y)] \ ** first to get things going. Then this routine is called for each ** column. */ -SQLITE_PRIVATE void sqlite3AddColumn(Parse *pParse, Token *pName){ +STQLITE_PRIVATE void sqlite3AddColumn(Parse *pParse, Token *pName){ Table *p; int i; char *z; Column *pCol; if( (p = pParse->pNewTable)==0 ) return; - if( p->nCol+1>SQLITE_MAX_COLUMN ){ + if( p->nCol+1>STQLITE_MAX_COLUMN ){ sqlite3ErrorMsg(pParse, "too many columns on %s", p->zName); return; } @@ -44354,7 +44354,7 @@ SQLITE_PRIVATE void sqlite3AddColumn(Parse *pParse, Token *pName){ ** 'NONE'. If there is a type specified, then sqlite3AddColumnType() will ** be called next to set pCol->affinity correctly. */ - pCol->affinity = SQLITE_AFF_NONE; + pCol->affinity = STQLITE_AFF_NONE; p->nCol++; } @@ -44364,7 +44364,7 @@ SQLITE_PRIVATE void sqlite3AddColumn(Parse *pParse, Token *pName){ ** been seen on a column. This routine sets the notNull flag on ** the column currently under construction. */ -SQLITE_PRIVATE void sqlite3AddNotNull(Parse *pParse, int onError){ +STQLITE_PRIVATE void sqlite3AddNotNull(Parse *pParse, int onError){ Table *p; int i; if( (p = pParse->pNewTable)==0 ) return; @@ -44378,28 +44378,28 @@ SQLITE_PRIVATE void sqlite3AddNotNull(Parse *pParse, int onError){ ** ** This routine does a case-independent search of zType for the ** substrings in the following table. If one of the substrings is -** found, the corresponding affinity is returned. If zType contains +** found, the corresponding affinity is returned. If zType tqcontains ** more than one of the substrings, entries toward the top of ** the table take priority. For example, if zType is 'BLOBINT', -** SQLITE_AFF_INTEGER is returned. +** STQLITE_AFF_INTEGER is returned. ** ** Substring | Affinity ** -------------------------------- -** 'INT' | SQLITE_AFF_INTEGER -** 'CHAR' | SQLITE_AFF_TEXT -** 'CLOB' | SQLITE_AFF_TEXT -** 'TEXT' | SQLITE_AFF_TEXT -** 'BLOB' | SQLITE_AFF_NONE -** 'REAL' | SQLITE_AFF_REAL -** 'FLOA' | SQLITE_AFF_REAL -** 'DOUB' | SQLITE_AFF_REAL +** 'INT' | STQLITE_AFF_INTEGER +** 'CHAR' | STQLITE_AFF_TEXT +** 'CLOB' | STQLITE_AFF_TEXT +** 'TEXT' | STQLITE_AFF_TEXT +** 'BLOB' | STQLITE_AFF_NONE +** 'REAL' | STQLITE_AFF_REAL +** 'FLOA' | STQLITE_AFF_REAL +** 'DOUB' | STQLITE_AFF_REAL ** ** If none of the substrings in the above table are found, -** SQLITE_AFF_NUMERIC is returned. +** STQLITE_AFF_NUMERIC is returned. */ -SQLITE_PRIVATE char sqlite3AffinityType(const Token *pType){ +STQLITE_PRIVATE char sqlite3AffinityType(const Token *pType){ u32 h = 0; - char aff = SQLITE_AFF_NUMERIC; + char aff = STQLITE_AFF_NUMERIC; const unsigned char *zIn = pType->z; const unsigned char *zEnd = &pType->z[pType->n]; @@ -44407,27 +44407,27 @@ SQLITE_PRIVATE char sqlite3AffinityType(const Token *pType){ h = (h<<8) + sqlite3UpperToLower[*zIn]; zIn++; if( h==(('c'<<24)+('h'<<16)+('a'<<8)+'r') ){ /* CHAR */ - aff = SQLITE_AFF_TEXT; + aff = STQLITE_AFF_TEXT; }else if( h==(('c'<<24)+('l'<<16)+('o'<<8)+'b') ){ /* CLOB */ - aff = SQLITE_AFF_TEXT; + aff = STQLITE_AFF_TEXT; }else if( h==(('t'<<24)+('e'<<16)+('x'<<8)+'t') ){ /* TEXT */ - aff = SQLITE_AFF_TEXT; + aff = STQLITE_AFF_TEXT; }else if( h==(('b'<<24)+('l'<<16)+('o'<<8)+'b') /* BLOB */ - && (aff==SQLITE_AFF_NUMERIC || aff==SQLITE_AFF_REAL) ){ - aff = SQLITE_AFF_NONE; -#ifndef SQLITE_OMIT_FLOATING_POINT + && (aff==STQLITE_AFF_NUMERIC || aff==STQLITE_AFF_REAL) ){ + aff = STQLITE_AFF_NONE; +#ifndef STQLITE_OMIT_FLOATING_POINT }else if( h==(('r'<<24)+('e'<<16)+('a'<<8)+'l') /* REAL */ - && aff==SQLITE_AFF_NUMERIC ){ - aff = SQLITE_AFF_REAL; + && aff==STQLITE_AFF_NUMERIC ){ + aff = STQLITE_AFF_REAL; }else if( h==(('f'<<24)+('l'<<16)+('o'<<8)+'a') /* FLOA */ - && aff==SQLITE_AFF_NUMERIC ){ - aff = SQLITE_AFF_REAL; + && aff==STQLITE_AFF_NUMERIC ){ + aff = STQLITE_AFF_REAL; }else if( h==(('d'<<24)+('o'<<16)+('u'<<8)+'b') /* DOUB */ - && aff==SQLITE_AFF_NUMERIC ){ - aff = SQLITE_AFF_REAL; + && aff==STQLITE_AFF_NUMERIC ){ + aff = STQLITE_AFF_REAL; #endif }else if( (h&0x00FFFFFF)==(('i'<<16)+('n'<<8)+'t') ){ /* INT */ - aff = SQLITE_AFF_INTEGER; + aff = STQLITE_AFF_INTEGER; break; } } @@ -44444,7 +44444,7 @@ SQLITE_PRIVATE char sqlite3AffinityType(const Token *pType){ ** that contains the typename of the column and store that string ** in zType. */ -SQLITE_PRIVATE void sqlite3AddColumnType(Parse *pParse, Token *pType){ +STQLITE_PRIVATE void sqlite3AddColumnType(Parse *pParse, Token *pType){ Table *p; int i; Column *pCol; @@ -44468,7 +44468,7 @@ SQLITE_PRIVATE void sqlite3AddColumnType(Parse *pParse, Token *pType){ ** This routine is called by the parser while in the middle of ** parsing a CREATE TABLE statement. */ -SQLITE_PRIVATE void sqlite3AddDefaultValue(Parse *pParse, Expr *pExpr){ +STQLITE_PRIVATE void sqlite3AddDefaultValue(Parse *pParse, Expr *pExpr){ Table *p; Column *pCol; if( (p = pParse->pNewTable)!=0 ){ @@ -44506,12 +44506,12 @@ SQLITE_PRIVATE void sqlite3AddDefaultValue(Parse *pParse, Expr *pExpr){ ** If the key is not an INTEGER PRIMARY KEY, then create a unique ** index for the key. No index is created for INTEGER PRIMARY KEYs. */ -SQLITE_PRIVATE void sqlite3AddPrimaryKey( +STQLITE_PRIVATE void sqlite3AddPrimaryKey( Parse *pParse, /* Parsing context */ ExprList *pList, /* List of field names to be indexed */ int onError, /* What to do with a uniqueness conflict */ int autoInc, /* True if the AUTOINCREMENT keyword is present */ - int sortOrder /* SQLITE_SO_ASC or SQLITE_SO_DESC */ + int sortOrder /* STQLITE_SO_ASC or STQLITE_SO_DESC */ ){ Table *pTab = pParse->pNewTable; char *zType = 0; @@ -44543,12 +44543,12 @@ SQLITE_PRIVATE void sqlite3AddPrimaryKey( zType = pTab->aCol[iCol].zType; } if( zType && sqlite3StrICmp(zType, "INTEGER")==0 - && sortOrder==SQLITE_SO_ASC ){ + && sortOrder==STQLITE_SO_ASC ){ pTab->iPKey = iCol; pTab->keyConf = onError; pTab->autoInc = autoInc; }else if( autoInc ){ -#ifndef SQLITE_OMIT_AUTOINCREMENT +#ifndef STQLITE_OMIT_AUTOINCREMENT sqlite3ErrorMsg(pParse, "AUTOINCREMENT is only allowed on an " "INTEGER PRIMARY KEY"); #endif @@ -44565,11 +44565,11 @@ primary_key_exit: /* ** Add a new CHECK constraint to the table currently under construction. */ -SQLITE_PRIVATE void sqlite3AddCheckConstraint( +STQLITE_PRIVATE void sqlite3AddCheckConstraint( Parse *pParse, /* Parsing context */ Expr *pCheckExpr /* The check expression */ ){ -#ifndef SQLITE_OMIT_CHECK +#ifndef STQLITE_OMIT_CHECK Table *pTab = pParse->pNewTable; if( pTab && !IN_DECLARE_VTAB ){ /* The CHECK expression must be duplicated so that tokens refer @@ -44585,7 +44585,7 @@ SQLITE_PRIVATE void sqlite3AddCheckConstraint( ** Set the collation function of the most recently parsed table column ** to the CollSeq given. */ -SQLITE_PRIVATE void sqlite3AddCollateType(Parse *pParse, const char *zType, int nType){ +STQLITE_PRIVATE void sqlite3AddCollateType(Parse *pParse, const char *zType, int nType){ Table *p; int i; @@ -44627,7 +44627,7 @@ SQLITE_PRIVATE void sqlite3AddCollateType(Parse *pParse, const char *zType, int ** invokes the collation factory if the named collation cannot be found ** and generates an error message. */ -SQLITE_PRIVATE CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char *zName, int nName){ +STQLITE_PRIVATE CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char *zName, int nName){ sqlite3 *db = pParse->db; u8 enc = ENC(db); u8 initbusy = db->init.busy; @@ -44665,7 +44665,7 @@ SQLITE_PRIVATE CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char *zName, i ** and the probability of hitting the same cookie value is only ** 1 chance in 2^32. So we're safe enough. */ -SQLITE_PRIVATE void sqlite3ChangeCookie(sqlite3 *db, Vdbe *v, int iDb){ +STQLITE_PRIVATE void sqlite3ChangeCookie(sqlite3 *db, Vdbe *v, int iDb){ sqlite3VdbeAddOp(v, OP_Integer, db->aDb[iDb].pSchema->schema_cookie+1, 0); sqlite3VdbeAddOp(v, OP_SetCookie, iDb, 0); } @@ -44781,7 +44781,7 @@ static char *createTableStmt(Table *p, int isTemp){ ** "CREATE TABLE ... AS SELECT ..." statement. The column names of ** the new table will match the result set of the SELECT. */ -SQLITE_PRIVATE void sqlite3EndTable( +STQLITE_PRIVATE void sqlite3EndTable( Parse *pParse, /* Parse context */ Token *pCons, /* The ',' token after the last column defn. */ Token *pEnd, /* The final ')' token in the CREATE TABLE */ @@ -44801,7 +44801,7 @@ SQLITE_PRIVATE void sqlite3EndTable( iDb = sqlite3SchemaToIndex(db, p->pSchema); -#ifndef SQLITE_OMIT_CHECK +#ifndef STQLITE_OMIT_CHECK /* Resolve names in all CHECK constraint expressions. */ if( p->pCheck ){ @@ -44821,7 +44821,7 @@ SQLITE_PRIVATE void sqlite3EndTable( return; } } -#endif /* !defined(SQLITE_OMIT_CHECK) */ +#endif /* !defined(STQLITE_OMIT_CHECK) */ /* If the db->init.busy is 1 it means we are reading the SQL off the ** "sqlite_master" or "sqlite_temp_master" table on the disk. @@ -44834,7 +44834,7 @@ SQLITE_PRIVATE void sqlite3EndTable( } /* If not initializing, then create a record for the new table - ** in the SQLITE_MASTER table of the database. The record number + ** in the STQLITE_MASTER table of the database. The record number ** for the new table entry should already be on the stack. ** ** If this is a TEMPORARY table, write the entry into the auxiliary @@ -44860,7 +44860,7 @@ SQLITE_PRIVATE void sqlite3EndTable( /* A regular table */ zType = "table"; zType2 = "TABLE"; -#ifndef SQLITE_OMIT_VIEW +#ifndef STQLITE_OMIT_VIEW }else{ /* A view */ zType = "view"; @@ -44910,7 +44910,7 @@ SQLITE_PRIVATE void sqlite3EndTable( } /* A slot for the record has already been allocated in the - ** SQLITE_MASTER table. We just need to update that slot with all + ** STQLITE_MASTER table. We just need to update that slot with all ** the information we've collected. The rowid for the preallocated ** slot is the 2nd item on the stack. The top of the stack is the ** root page for the new table (or a 0 if this is a view). @@ -44928,7 +44928,7 @@ SQLITE_PRIVATE void sqlite3EndTable( sqliteFree(zStmt); sqlite3ChangeCookie(db, v, iDb); -#ifndef SQLITE_OMIT_AUTOINCREMENT +#ifndef STQLITE_OMIT_AUTOINCREMENT /* Check to see if we need to create an sqlite_sequence table for ** keeping track of autoincrement keys. */ @@ -44960,7 +44960,7 @@ SQLITE_PRIVATE void sqlite3EndTable( assert( p==pOld ); /* Malloc must have failed inside HashInsert() */ return; } -#ifndef SQLITE_OMIT_FOREIGN_KEY +#ifndef STQLITE_OMIT_FOREIGN_KEY for(pFKey=p->pFKey; pFKey; pFKey=pFKey->pNextFrom){ int nTo = strlen(pFKey->zTo) + 1; pFKey->pNextTo = sqlite3HashFind(&pSchema->aFKey, pFKey->zTo, nTo); @@ -44969,9 +44969,9 @@ SQLITE_PRIVATE void sqlite3EndTable( #endif pParse->pNewTable = 0; db->nTable++; - db->flags |= SQLITE_InternChanges; + db->flags |= STQLITE_InternChanges; -#ifndef SQLITE_OMIT_ALTERTABLE +#ifndef STQLITE_OMIT_ALTERTABLE if( !p->pSelect ){ const char *zName = (const char *)pParse->sNameToken.z; int nName; @@ -44986,11 +44986,11 @@ SQLITE_PRIVATE void sqlite3EndTable( } } -#ifndef SQLITE_OMIT_VIEW +#ifndef STQLITE_OMIT_VIEW /* ** The parser calls this routine in order to create a new VIEW */ -SQLITE_PRIVATE void sqlite3CreateView( +STQLITE_PRIVATE void sqlite3CreateView( Parse *pParse, /* The parsing context */ Token *pBegin, /* The CREATE token that begins the statement */ Token *pName1, /* The token that holds the name of the view */ @@ -45055,19 +45055,19 @@ SQLITE_PRIVATE void sqlite3CreateView( sEnd.z = &z[n-1]; sEnd.n = 1; - /* Use sqlite3EndTable() to add the view to the SQLITE_MASTER table */ + /* Use sqlite3EndTable() to add the view to the STQLITE_MASTER table */ sqlite3EndTable(pParse, 0, &sEnd, 0); return; } -#endif /* SQLITE_OMIT_VIEW */ +#endif /* STQLITE_OMIT_VIEW */ -#if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE) +#if !defined(STQLITE_OMIT_VIEW) || !defined(STQLITE_OMIT_VIRTUALTABLE) /* ** The Table structure pTable is really a VIEW. Fill in the names of ** the columns of the view in the pTable structure. Return the number ** of errors. If an error is seen leave an error message in pParse->zErrMsg. */ -SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){ +STQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){ Table *pSelTab; /* A fake table from which we get the result set */ Select *pSel; /* Copy of the SELECT that implements the view */ int nErr = 0; /* Number of errors encountered */ @@ -45075,14 +45075,14 @@ SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){ assert( pTable ); -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( sqlite3VtabCallConnect(pParse, pTable) ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } if( IsVirtual(pTable) ) return 0; #endif -#ifndef SQLITE_OMIT_VIEW +#ifndef STQLITE_OMIT_VIEW /* A positive nCol means the columns names for this view are ** already known. */ @@ -45135,12 +45135,12 @@ SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){ } else { nErr++; } -#endif /* SQLITE_OMIT_VIEW */ +#endif /* STQLITE_OMIT_VIEW */ return nErr; } -#endif /* !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE) */ +#endif /* !defined(STQLITE_OMIT_VIEW) || !defined(STQLITE_OMIT_VIRTUALTABLE) */ -#ifndef SQLITE_OMIT_VIEW +#ifndef STQLITE_OMIT_VIEW /* ** Clear the column names from every VIEW in database idx. */ @@ -45157,11 +45157,11 @@ static void sqliteViewResetAll(sqlite3 *db, int idx){ } #else # define sqliteViewResetAll(A,B) -#endif /* SQLITE_OMIT_VIEW */ +#endif /* STQLITE_OMIT_VIEW */ /* ** This function is called by the VDBE to adjust the internal schema -** used by SQLite when the btree layer moves a table root page. The +** used by STQLite when the btree layer moves a table root page. The ** root-page of a table or index in database iDb has changed from iFrom ** to iTo. ** @@ -45176,8 +45176,8 @@ static void sqliteViewResetAll(sqlite3 *db, int idx){ ** rootpage==iFrom have been converted to have a rootpage of iTo ** in order to be certain that we got the right one. */ -#ifndef SQLITE_OMIT_AUTOVACUUM -SQLITE_PRIVATE void sqlite3RootPageMoved(Db *pDb, int iFrom, int iTo){ +#ifndef STQLITE_OMIT_AUTOVACUUM +STQLITE_PRIVATE void sqlite3RootPageMoved(Db *pDb, int iFrom, int iTo){ HashElem *pElem; Hash *pHash; @@ -45207,7 +45207,7 @@ SQLITE_PRIVATE void sqlite3RootPageMoved(Db *pDb, int iFrom, int iTo){ static void destroyRootPage(Parse *pParse, int iTable, int iDb){ Vdbe *v = sqlite3GetVdbe(pParse); sqlite3VdbeAddOp(v, OP_Destroy, iTable, iDb); -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* OP_Destroy pushes an integer onto the stack. If this integer ** is non-zero, then it is the root page number of a table moved to ** location iTable. The following code modifies the sqlite_master table to @@ -45229,7 +45229,7 @@ static void destroyRootPage(Parse *pParse, int iTable, int iDb){ ** is also added (this can happen with an auto-vacuum database). */ static void destroyTable(Parse *pParse, Table *pTab){ -#ifdef SQLITE_OMIT_AUTOVACUUM +#ifdef STQLITE_OMIT_AUTOVACUUM Index *pIdx; int iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema); destroyRootPage(pParse, pTab->tnum, iDb); @@ -45237,7 +45237,7 @@ static void destroyTable(Parse *pParse, Table *pTab){ destroyRootPage(pParse, pIdx->tnum, iDb); } #else - /* If the database may be auto-vacuum capable (if SQLITE_OMIT_AUTOVACUUM + /* If the database may be auto-vacuum capable (if STQLITE_OMIT_AUTOVACUUM ** is not defined), then it is important to call OP_Destroy on the ** table and index root-pages in order, starting with the numerically ** largest root-page number. This guarantees that none of the root-pages @@ -45285,7 +45285,7 @@ static void destroyTable(Parse *pParse, Table *pTab){ ** This routine is called to do the work of a DROP TABLE statement. ** pName is the name of the table to be dropped. */ -SQLITE_PRIVATE void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, int noErr){ +STQLITE_PRIVATE void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, int noErr){ Table *pTab; Vdbe *v; sqlite3 *db = pParse->db; @@ -45305,40 +45305,40 @@ SQLITE_PRIVATE void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, } iDb = sqlite3SchemaToIndex(db, pTab->pSchema); assert( iDb>=0 && iDb<db->nDb ); -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION { int code; const char *zTab = SCHEMA_TABLE(iDb); const char *zDb = db->aDb[iDb].zName; const char *zArg2 = 0; - if( sqlite3AuthCheck(pParse, SQLITE_DELETE, zTab, 0, zDb)){ + if( sqlite3AuthCheck(pParse, STQLITE_DELETE, zTab, 0, zDb)){ goto exit_drop_table; } if( isView ){ if( !OMIT_TEMPDB && iDb==1 ){ - code = SQLITE_DROP_TEMP_VIEW; + code = STQLITE_DROP_TEMP_VIEW; }else{ - code = SQLITE_DROP_VIEW; + code = STQLITE_DROP_VIEW; } -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE }else if( IsVirtual(pTab) ){ if( sqlite3ViewGetColumnNames(pParse, pTab) ){ goto exit_drop_table; } - code = SQLITE_DROP_VTABLE; + code = STQLITE_DROP_VTABLE; zArg2 = pTab->pMod->zName; #endif }else{ if( !OMIT_TEMPDB && iDb==1 ){ - code = SQLITE_DROP_TEMP_TABLE; + code = STQLITE_DROP_TEMP_TABLE; }else{ - code = SQLITE_DROP_TABLE; + code = STQLITE_DROP_TABLE; } } if( sqlite3AuthCheck(pParse, code, pTab->zName, zArg2, zDb) ){ goto exit_drop_table; } - if( sqlite3AuthCheck(pParse, SQLITE_DELETE, pTab->zName, 0, zDb) ){ + if( sqlite3AuthCheck(pParse, STQLITE_DELETE, pTab->zName, 0, zDb) ){ goto exit_drop_table; } } @@ -45348,7 +45348,7 @@ SQLITE_PRIVATE void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, goto exit_drop_table; } -#ifndef SQLITE_OMIT_VIEW +#ifndef STQLITE_OMIT_VIEW /* Ensure DROP TABLE is not used on a view, and DROP VIEW is not used ** on a table. */ @@ -45371,7 +45371,7 @@ SQLITE_PRIVATE void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, Db *pDb = &db->aDb[iDb]; sqlite3BeginWriteOperation(pParse, 0, iDb); -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( IsVirtual(pTab) ){ Vdbe *v = sqlite3GetVdbe(pParse); if( v ){ @@ -45392,7 +45392,7 @@ SQLITE_PRIVATE void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, pTrigger = pTrigger->pNext; } -#ifndef SQLITE_OMIT_AUTOINCREMENT +#ifndef STQLITE_OMIT_AUTOINCREMENT /* Remove any entries of the sqlite_sequence table associated with ** the table being dropped. This is done before the table is dropped ** at the btree level, in case the sqlite_sequence table needs to @@ -45406,7 +45406,7 @@ SQLITE_PRIVATE void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, } #endif - /* Drop all SQLITE_MASTER table and index entries that refer to the + /* Drop all STQLITE_MASTER table and index entries that refer to the ** table. The program name loops through the master table and deletes ** every row that refers to a table of the same name as the one being ** dropped. Triggers are handled seperately because a trigger can be @@ -45420,7 +45420,7 @@ SQLITE_PRIVATE void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, destroyTable(pParse, pTab); } - /* Remove the table entry from SQLite's internal schema and modify + /* Remove the table entry from STQLite's internal schema and modify ** the schema cookie. */ if( IsVirtual(pTab) ){ @@ -45453,14 +45453,14 @@ exit_drop_table: ** The foreign key is set for IMMEDIATE processing. A subsequent call ** to sqlite3DeferForeignKey() might change this to DEFERRED. */ -SQLITE_PRIVATE void sqlite3CreateForeignKey( +STQLITE_PRIVATE void sqlite3CreateForeignKey( Parse *pParse, /* Parsing context */ ExprList *pFromCol, /* Columns in this table that point to other table */ Token *pTo, /* Name of the other table */ ExprList *pToCol, /* Columns in the other table */ int flags /* Conflict resolution algorithms. */ ){ -#ifndef SQLITE_OMIT_FOREIGN_KEY +#ifndef STQLITE_OMIT_FOREIGN_KEY FKey *pFKey = 0; Table *p = pParse->pNewTable; int nByte; @@ -45547,7 +45547,7 @@ SQLITE_PRIVATE void sqlite3CreateForeignKey( fk_end: sqliteFree(pFKey); -#endif /* !defined(SQLITE_OMIT_FOREIGN_KEY) */ +#endif /* !defined(STQLITE_OMIT_FOREIGN_KEY) */ sqlite3ExprListDelete(pFromCol); sqlite3ExprListDelete(pToCol); } @@ -45559,8 +45559,8 @@ fk_end: ** The behavior of the most recently created foreign key is adjusted ** accordingly. */ -SQLITE_PRIVATE void sqlite3DeferForeignKey(Parse *pParse, int isDeferred){ -#ifndef SQLITE_OMIT_FOREIGN_KEY +STQLITE_PRIVATE void sqlite3DeferForeignKey(Parse *pParse, int isDeferred){ +#ifndef STQLITE_OMIT_FOREIGN_KEY Table *pTab; FKey *pFKey; if( (pTab = pParse->pNewTable)==0 || (pFKey = pTab->pFKey)==0 ) return; @@ -45589,8 +45589,8 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){ KeyInfo *pKey; /* KeyInfo for index */ int iDb = sqlite3SchemaToIndex(pParse->db, pIndex->pSchema); -#ifndef SQLITE_OMIT_AUTHORIZATION - if( sqlite3AuthCheck(pParse, SQLITE_REINDEX, pIndex->zName, 0, +#ifndef STQLITE_OMIT_AUTHORIZATION + if( sqlite3AuthCheck(pParse, STQLITE_REINDEX, pIndex->zName, 0, pParse->db->aDb[iDb].zName ) ){ return; } @@ -45621,7 +45621,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){ sqlite3VdbeAddOp(v, OP_Rowid, iTab, 0); sqlite3VdbeAddOp(v, OP_AddImm, 1, 0); sqlite3VdbeAddOp(v, OP_IsUnique, iIdx, addr2); - sqlite3VdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, OE_Abort, + sqlite3VdbeOp3(v, OP_Halt, STQLITE_CONSTRAINT, OE_Abort, "indexed columns are not unique", P3_STATIC); assert( sqlite3MallocFailed() || addr2==sqlite3VdbeCurrentAddr(v) ); } @@ -45636,7 +45636,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){ ** Create a new index for an SQL table. pName1.pName2 is the name of the index ** and pTblList is the name of the table that is to be indexed. Both will ** be NULL for a primary key or an index that is created to satisfy a -** UNIQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable +** UNITQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable ** as the table to be indexed. pParse->pNewTable is a table that is ** currently being constructed by a CREATE TABLE statement. ** @@ -45644,7 +45644,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){ ** is a primary key or unique-constraint on the most recent column added ** to the table currently under construction. */ -SQLITE_PRIVATE void sqlite3CreateIndex( +STQLITE_PRIVATE void sqlite3CreateIndex( Parse *pParse, /* All information about this parse */ Token *pName1, /* First part of index name. May be NULL */ Token *pName2, /* Second part of index name. May be NULL */ @@ -45690,7 +45690,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex( iDb = sqlite3TwoPartName(pParse, pName1, pName2, &pName); if( iDb<0 ) goto exit_create_index; -#ifndef SQLITE_OMIT_TEMPDB +#ifndef STQLITE_OMIT_TEMPDB /* If the index name was unqualified, check if the the table ** is a temp table. If so, set the database to 1. */ @@ -45724,13 +45724,13 @@ SQLITE_PRIVATE void sqlite3CreateIndex( sqlite3ErrorMsg(pParse, "table %s may not be indexed", pTab->zName); goto exit_create_index; } -#ifndef SQLITE_OMIT_VIEW +#ifndef STQLITE_OMIT_VIEW if( pTab->pSelect ){ sqlite3ErrorMsg(pParse, "views may not be indexed"); goto exit_create_index; } #endif -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( IsVirtual(pTab) ){ sqlite3ErrorMsg(pParse, "virtual tables may not be indexed"); goto exit_create_index; @@ -45747,18 +45747,18 @@ SQLITE_PRIVATE void sqlite3CreateIndex( ** index, then we will continue to process this index. ** ** If pName==0 it means that we are - ** dealing with a primary key or UNIQUE constraint. We have to invent our + ** dealing with a primary key or UNITQUE constraint. We have to invent our ** own name. */ if( pName ){ zName = sqlite3NameFromToken(pName); - if( SQLITE_OK!=sqlite3ReadSchema(pParse) ) goto exit_create_index; + if( STQLITE_OK!=sqlite3ReadSchema(pParse) ) goto exit_create_index; if( zName==0 ) goto exit_create_index; - if( SQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){ + if( STQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){ goto exit_create_index; } if( !db->init.busy ){ - if( SQLITE_OK!=sqlite3ReadSchema(pParse) ) goto exit_create_index; + if( STQLITE_OK!=sqlite3ReadSchema(pParse) ) goto exit_create_index; if( sqlite3FindTable(db, zName, 0)!=0 ){ sqlite3ErrorMsg(pParse, "there is already a table named %s", zName); goto exit_create_index; @@ -45783,14 +45783,14 @@ SQLITE_PRIVATE void sqlite3CreateIndex( /* Check for authorization to create an index. */ -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION { const char *zDb = pDb->zName; - if( sqlite3AuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(iDb), 0, zDb) ){ + if( sqlite3AuthCheck(pParse, STQLITE_INSERT, SCHEMA_TABLE(iDb), 0, zDb) ){ goto exit_create_index; } - i = SQLITE_CREATE_INDEX; - if( !OMIT_TEMPDB && iDb==1 ) i = SQLITE_CREATE_TEMP_INDEX; + i = STQLITE_CREATE_INDEX; + if( !OMIT_TEMPDB && iDb==1 ) i = STQLITE_CREATE_TEMP_INDEX; if( sqlite3AuthCheck(pParse, i, zName, pTab->zName, zDb) ){ goto exit_create_index; } @@ -45902,12 +45902,12 @@ SQLITE_PRIVATE void sqlite3CreateIndex( if( pTab==pParse->pNewTable ){ /* This routine has been called to create an automatic index as a - ** result of a PRIMARY KEY or UNIQUE clause on a column definition, or - ** a PRIMARY KEY or UNIQUE clause following the column definitions. + ** result of a PRIMARY KEY or UNITQUE clause on a column definition, or + ** a PRIMARY KEY or UNITQUE clause following the column definitions. ** i.e. one of: ** ** CREATE TABLE t(x PRIMARY KEY, y); - ** CREATE TABLE t(x, y, UNIQUE(x, y)); + ** CREATE TABLE t(x, y, UNITQUE(x, y)); ** ** Either way, check to see if the table already has such an index. If ** so, don't bother creating this one. This only applies to @@ -45962,7 +45962,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex( assert( p==pIndex ); /* Malloc must have failed */ goto exit_create_index; } - db->flags |= SQLITE_InternChanges; + db->flags |= STQLITE_InternChanges; if( pTblName!=0 ){ pIndex->tnum = db->init.newTnum; } @@ -45979,7 +45979,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex( ** we don't want to recreate it. ** ** If pTblName==0 it means this index is generated as a primary key - ** or UNIQUE constraint of a CREATE TABLE statement. Since the table + ** or UNITQUE constraint of a CREATE TABLE statement. Since the table ** has just been created, it contains no data and the index initialization ** step can be skipped. */ @@ -46004,11 +46004,11 @@ SQLITE_PRIVATE void sqlite3CreateIndex( if( pStart && pEnd ){ /* A named index with an explicit CREATE INDEX statement */ zStmt = sqlite3MPrintf("CREATE%s INDEX %.*s", - onError==OE_None ? "" : " UNIQUE", + onError==OE_None ? "" : " UNITQUE", pEnd->z - pName->z + 1, pName->z); }else{ - /* An automatic index created by a PRIMARY KEY or UNIQUE constraint */ + /* An automatic index created by a PRIMARY KEY or UNITQUE constraint */ /* zStmt = sqlite3MPrintf(""); */ zStmt = 0; } @@ -46026,7 +46026,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex( sqliteFree(zStmt); /* Fill the index with data and reparse the schema. Code an OP_Expire - ** to invalidate all pre-compiled statements. + ** to tqinvalidate all pre-compiled statements. */ if( pTblName ){ sqlite3RefillIndex(pParse, pIndex, iMem); @@ -46073,7 +46073,7 @@ exit_create_index: ** Generate code to make sure the file format number is at least minFormat. ** The generated code will increase the file format number if necessary. */ -SQLITE_PRIVATE void sqlite3MinimumFileFormat(Parse *pParse, int iDb, int minFormat){ +STQLITE_PRIVATE void sqlite3MinimumFileFormat(Parse *pParse, int iDb, int minFormat){ Vdbe *v; v = sqlite3GetVdbe(pParse); if( v ){ @@ -46103,7 +46103,7 @@ SQLITE_PRIVATE void sqlite3MinimumFileFormat(Parse *pParse, int iDb, int minForm ** how aiRowEst[] should be initialized. The numbers generated here ** are based on typical values found in actual indices. */ -SQLITE_PRIVATE void sqlite3DefaultRowEst(Index *pIdx){ +STQLITE_PRIVATE void sqlite3DefaultRowEst(Index *pIdx){ unsigned *a = pIdx->aiRowEst; int i; assert( a!=0 ); @@ -46124,7 +46124,7 @@ SQLITE_PRIVATE void sqlite3DefaultRowEst(Index *pIdx){ ** This routine will drop an existing named index. This routine ** implements the DROP INDEX statement. */ -SQLITE_PRIVATE void sqlite3DropIndex(Parse *pParse, SrcList *pName, int ifExists){ +STQLITE_PRIVATE void sqlite3DropIndex(Parse *pParse, SrcList *pName, int ifExists){ Index *pIndex; Vdbe *v; sqlite3 *db = pParse->db; @@ -46134,7 +46134,7 @@ SQLITE_PRIVATE void sqlite3DropIndex(Parse *pParse, SrcList *pName, int ifExists goto exit_drop_index; } assert( pName->nSrc==1 ); - if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){ + if( STQLITE_OK!=sqlite3ReadSchema(pParse) ){ goto exit_drop_index; } pIndex = sqlite3FindIndex(db, pName->a[0].zName, pName->a[0].zDatabase); @@ -46146,21 +46146,21 @@ SQLITE_PRIVATE void sqlite3DropIndex(Parse *pParse, SrcList *pName, int ifExists goto exit_drop_index; } if( pIndex->autoIndex ){ - sqlite3ErrorMsg(pParse, "index associated with UNIQUE " + sqlite3ErrorMsg(pParse, "index associated with UNITQUE " "or PRIMARY KEY constraint cannot be dropped", 0); goto exit_drop_index; } iDb = sqlite3SchemaToIndex(db, pIndex->pSchema); -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION { - int code = SQLITE_DROP_INDEX; + int code = STQLITE_DROP_INDEX; Table *pTab = pIndex->pTable; const char *zDb = db->aDb[iDb].zName; const char *zTab = SCHEMA_TABLE(iDb); - if( sqlite3AuthCheck(pParse, SQLITE_DELETE, zTab, 0, zDb) ){ + if( sqlite3AuthCheck(pParse, STQLITE_DELETE, zTab, 0, zDb) ){ goto exit_drop_index; } - if( !OMIT_TEMPDB && iDb ) code = SQLITE_DROP_TEMP_INDEX; + if( !OMIT_TEMPDB && iDb ) code = STQLITE_DROP_TEMP_INDEX; if( sqlite3AuthCheck(pParse, code, pIndex->zName, pTab->zName, zDb) ){ goto exit_drop_index; } @@ -46199,7 +46199,7 @@ exit_drop_index: ** might be the same as the pArray parameter or it might be a different ** pointer if the array was resized. */ -SQLITE_PRIVATE void *sqlite3ArrayAllocate( +STQLITE_PRIVATE void *sqlite3ArrayAllocate( void *pArray, /* Array of objects. Might be reallocated */ int szEntry, /* Size of each object in the array */ int initSize, /* Suggested initial allocation, in elements */ @@ -46233,7 +46233,7 @@ SQLITE_PRIVATE void *sqlite3ArrayAllocate( ** ** A new IdList is returned, or NULL if malloc() fails. */ -SQLITE_PRIVATE IdList *sqlite3IdListAppend(IdList *pList, Token *pToken){ +STQLITE_PRIVATE IdList *sqlite3IdListAppend(IdList *pList, Token *pToken){ int i; if( pList==0 ){ pList = sqliteMalloc( sizeof(IdList) ); @@ -46259,7 +46259,7 @@ SQLITE_PRIVATE IdList *sqlite3IdListAppend(IdList *pList, Token *pToken){ /* ** Delete an IdList. */ -SQLITE_PRIVATE void sqlite3IdListDelete(IdList *pList){ +STQLITE_PRIVATE void sqlite3IdListDelete(IdList *pList){ int i; if( pList==0 ) return; for(i=0; i<pList->nId; i++){ @@ -46273,7 +46273,7 @@ SQLITE_PRIVATE void sqlite3IdListDelete(IdList *pList){ ** Return the index in pList of the identifier named zId. Return -1 ** if not found. */ -SQLITE_PRIVATE int sqlite3IdListIndex(IdList *pList, const char *zName){ +STQLITE_PRIVATE int sqlite3IdListIndex(IdList *pList, const char *zName){ int i; if( pList==0 ) return -1; for(i=0; i<pList->nId; i++){ @@ -46307,7 +46307,7 @@ SQLITE_PRIVATE int sqlite3IdListIndex(IdList *pList, const char *zName){ ** ** Then C is the table name and B is the database name. */ -SQLITE_PRIVATE SrcList *sqlite3SrcListAppend(SrcList *pList, Token *pTable, Token *pDatabase){ +STQLITE_PRIVATE SrcList *sqlite3SrcListAppend(SrcList *pList, Token *pTable, Token *pDatabase){ struct SrcList_item *pItem; if( pList==0 ){ pList = sqliteMalloc( sizeof(SrcList) ); @@ -46346,7 +46346,7 @@ SQLITE_PRIVATE SrcList *sqlite3SrcListAppend(SrcList *pList, Token *pTable, Toke /* ** Assign cursors to all tables in a SrcList */ -SQLITE_PRIVATE void sqlite3SrcListAssignCursors(Parse *pParse, SrcList *pList){ +STQLITE_PRIVATE void sqlite3SrcListAssignCursors(Parse *pParse, SrcList *pList){ int i; struct SrcList_item *pItem; assert(pList || sqlite3MallocFailed() ); @@ -46364,7 +46364,7 @@ SQLITE_PRIVATE void sqlite3SrcListAssignCursors(Parse *pParse, SrcList *pList){ /* ** Delete an entire SrcList including all its substructure. */ -SQLITE_PRIVATE void sqlite3SrcListDelete(SrcList *pList){ +STQLITE_PRIVATE void sqlite3SrcListDelete(SrcList *pList){ int i; struct SrcList_item *pItem; if( pList==0 ) return; @@ -46396,7 +46396,7 @@ SQLITE_PRIVATE void sqlite3SrcListDelete(SrcList *pList){ ** Return a new SrcList which encodes is the FROM with the new ** term added. */ -SQLITE_PRIVATE SrcList *sqlite3SrcListAppendFromTerm( +STQLITE_PRIVATE SrcList *sqlite3SrcListAppendFromTerm( SrcList *p, /* The left part of the FROM clause already seen */ Token *pTable, /* Name of the table to add to the FROM clause */ Token *pDatabase, /* Name of the database containing pTable */ @@ -46438,7 +46438,7 @@ SQLITE_PRIVATE SrcList *sqlite3SrcListAppendFromTerm( ** in p->a[0] and p->a[1], respectively. The parser initially stores the ** operator with A. This routine shifts that operator over to B. */ -SQLITE_PRIVATE void sqlite3SrcListShiftJoinType(SrcList *p){ +STQLITE_PRIVATE void sqlite3SrcListShiftJoinType(SrcList *p){ if( p && p->a ){ int i; for(i=p->nSrc-1; i>0; i--){ @@ -46451,14 +46451,14 @@ SQLITE_PRIVATE void sqlite3SrcListShiftJoinType(SrcList *p){ /* ** Begin a transaction */ -SQLITE_PRIVATE void sqlite3BeginTransaction(Parse *pParse, int type){ +STQLITE_PRIVATE void sqlite3BeginTransaction(Parse *pParse, int type){ sqlite3 *db; Vdbe *v; int i; if( pParse==0 || (db=pParse->db)==0 || db->aDb[0].pBt==0 ) return; if( pParse->nErr || sqlite3MallocFailed() ) return; - if( sqlite3AuthCheck(pParse, SQLITE_TRANSACTION, "BEGIN", 0, 0) ) return; + if( sqlite3AuthCheck(pParse, STQLITE_TRANSACTION, "BEGIN", 0, 0) ) return; v = sqlite3GetVdbe(pParse); if( !v ) return; @@ -46473,13 +46473,13 @@ SQLITE_PRIVATE void sqlite3BeginTransaction(Parse *pParse, int type){ /* ** Commit a transaction */ -SQLITE_PRIVATE void sqlite3CommitTransaction(Parse *pParse){ +STQLITE_PRIVATE void sqlite3CommitTransaction(Parse *pParse){ sqlite3 *db; Vdbe *v; if( pParse==0 || (db=pParse->db)==0 || db->aDb[0].pBt==0 ) return; if( pParse->nErr || sqlite3MallocFailed() ) return; - if( sqlite3AuthCheck(pParse, SQLITE_TRANSACTION, "COMMIT", 0, 0) ) return; + if( sqlite3AuthCheck(pParse, STQLITE_TRANSACTION, "COMMIT", 0, 0) ) return; v = sqlite3GetVdbe(pParse); if( v ){ @@ -46490,13 +46490,13 @@ SQLITE_PRIVATE void sqlite3CommitTransaction(Parse *pParse){ /* ** Rollback a transaction */ -SQLITE_PRIVATE void sqlite3RollbackTransaction(Parse *pParse){ +STQLITE_PRIVATE void sqlite3RollbackTransaction(Parse *pParse){ sqlite3 *db; Vdbe *v; if( pParse==0 || (db=pParse->db)==0 || db->aDb[0].pBt==0 ) return; if( pParse->nErr || sqlite3MallocFailed() ) return; - if( sqlite3AuthCheck(pParse, SQLITE_TRANSACTION, "ROLLBACK", 0, 0) ) return; + if( sqlite3AuthCheck(pParse, STQLITE_TRANSACTION, "ROLLBACK", 0, 0) ) return; v = sqlite3GetVdbe(pParse); if( v ){ @@ -46508,12 +46508,12 @@ SQLITE_PRIVATE void sqlite3RollbackTransaction(Parse *pParse){ ** Make sure the TEMP database is open and available for use. Return ** the number of errors. Leave any error messages in the pParse structure. */ -SQLITE_PRIVATE int sqlite3OpenTempDatabase(Parse *pParse){ +STQLITE_PRIVATE int sqlite3OpenTempDatabase(Parse *pParse){ sqlite3 *db = pParse->db; if( db->aDb[1].pBt==0 && !pParse->explain ){ - int rc = sqlite3BtreeFactory(db, 0, 0, SQLITE_DEFAULT_CACHE_SIZE, + int rc = sqlite3BtreeFactory(db, 0, 0, STQLITE_DEFAULT_CACHE_SIZE, &db->aDb[1].pBt); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqlite3ErrorMsg(pParse, "unable to open a temporary database " "file for storing temporary tables"); pParse->rc = rc; @@ -46521,7 +46521,7 @@ SQLITE_PRIVATE int sqlite3OpenTempDatabase(Parse *pParse){ } if( db->flags & !db->autoCommit ){ rc = sqlite3BtreeBeginTrans(db->aDb[1].pBt, 1); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqlite3ErrorMsg(pParse, "unable to get a write lock on " "the temporary database file"); pParse->rc = rc; @@ -46555,10 +46555,10 @@ SQLITE_PRIVATE int sqlite3OpenTempDatabase(Parse *pParse){ ** schema on any databases. This can be used to position the OP_Goto ** early in the code, before we know if any database tables will be used. */ -SQLITE_PRIVATE void sqlite3CodeVerifySchema(Parse *pParse, int iDb){ +STQLITE_PRIVATE void sqlite3CodeVerifySchema(Parse *pParse, int iDb){ sqlite3 *db; Vdbe *v; - int mask; + int tqmask; v = sqlite3GetVdbe(pParse); if( v==0 ) return; /* This only happens if there was a prior error */ @@ -46569,10 +46569,10 @@ SQLITE_PRIVATE void sqlite3CodeVerifySchema(Parse *pParse, int iDb){ if( iDb>=0 ){ assert( iDb<db->nDb ); assert( db->aDb[iDb].pBt!=0 || iDb==1 ); - assert( iDb<SQLITE_MAX_ATTACHED+2 ); - mask = 1<<iDb; - if( (pParse->cookieMask & mask)==0 ){ - pParse->cookieMask |= mask; + assert( iDb<STQLITE_MAX_ATTACHED+2 ); + tqmask = 1<<iDb; + if( (pParse->cookieMask & tqmask)==0 ){ + pParse->cookieMask |= tqmask; pParse->cookieValue[iDb] = db->aDb[iDb].pSchema->schema_cookie; if( !OMIT_TEMPDB && iDb==1 ){ sqlite3OpenTempDatabase(pParse); @@ -46599,7 +46599,7 @@ SQLITE_PRIVATE void sqlite3CodeVerifySchema(Parse *pParse, int iDb){ ** iDb==1 then only the temp database is made writable. If iDb>1 then the ** specified auxiliary database and the temp database are made writable. */ -SQLITE_PRIVATE void sqlite3BeginWriteOperation(Parse *pParse, int setStatement, int iDb){ +STQLITE_PRIVATE void sqlite3BeginWriteOperation(Parse *pParse, int setStatement, int iDb){ Vdbe *v = sqlite3GetVdbe(pParse); if( v==0 ) return; sqlite3CodeVerifySchema(pParse, iDb); @@ -46616,7 +46616,7 @@ SQLITE_PRIVATE void sqlite3BeginWriteOperation(Parse *pParse, int setStatement, ** Check to see if pIndex uses the collating sequence pColl. Return ** true if it does and false if it does not. */ -#ifndef SQLITE_OMIT_REINDEX +#ifndef STQLITE_OMIT_REINDEX static int collationMatch(const char *zColl, Index *pIndex){ int i; for(i=0; i<pIndex->nColumn; i++){ @@ -46633,7 +46633,7 @@ static int collationMatch(const char *zColl, Index *pIndex){ ** Recompute all indices of pTab that use the collating sequence pColl. ** If pColl==0 then recompute all indices of pTab. */ -#ifndef SQLITE_OMIT_REINDEX +#ifndef STQLITE_OMIT_REINDEX static void reindexTable(Parse *pParse, Table *pTab, char const *zColl){ Index *pIndex; /* An index associated with pTab */ @@ -46652,7 +46652,7 @@ static void reindexTable(Parse *pParse, Table *pTab, char const *zColl){ ** indices use the collating sequence pColl. If pColl==0 then recompute ** all indices everywhere. */ -#ifndef SQLITE_OMIT_REINDEX +#ifndef STQLITE_OMIT_REINDEX static void reindexDatabases(Parse *pParse, char const *zColl){ Db *pDb; /* A single database */ int iDb; /* The database index number */ @@ -46683,8 +46683,8 @@ static void reindexDatabases(Parse *pParse, char const *zColl){ ** collating function. Forms 3 and 4 rebuild the named index or all ** indices associated with the named table. */ -#ifndef SQLITE_OMIT_REINDEX -SQLITE_PRIVATE void sqlite3Reindex(Parse *pParse, Token *pName1, Token *pName2){ +#ifndef STQLITE_OMIT_REINDEX +STQLITE_PRIVATE void sqlite3Reindex(Parse *pParse, Token *pName1, Token *pName2){ CollSeq *pColl; /* Collating sequence to be reindexed, or NULL */ char *z; /* Name of a table or index */ const char *zDb; /* Name of the database */ @@ -46696,7 +46696,7 @@ SQLITE_PRIVATE void sqlite3Reindex(Parse *pParse, Token *pName1, Token *pName2){ /* Read the database schema. If an error occurs, leave an error message ** and code in pParse and return NULL. */ - if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){ + if( STQLITE_OK!=sqlite3ReadSchema(pParse) ){ return; } @@ -46747,7 +46747,7 @@ SQLITE_PRIVATE void sqlite3Reindex(Parse *pParse, Token *pName1, Token *pName2){ ** sequence), NULL is returned and the state of pParse updated to reflect ** the error. */ -SQLITE_PRIVATE KeyInfo *sqlite3IndexKeyinfo(Parse *pParse, Index *pIdx){ +STQLITE_PRIVATE KeyInfo *sqlite3IndexKeyinfo(Parse *pParse, Index *pIdx){ int i; int nCol = pIdx->nColumn; int nBytes = sizeof(KeyInfo) + (nCol-1)*sizeof(CollSeq*) + nCol; @@ -46807,12 +46807,12 @@ static void callCollNeeded(sqlite3 *db, const char *zName, int nName){ db->xCollNeeded(db->pCollNeededArg, db, (int)ENC(db), zExternal); sqliteFree(zExternal); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 if( db->xCollNeeded16 ){ char const *zExternal; sqlite3_value *pTmp = sqlite3ValueNew(); - sqlite3ValueSetStr(pTmp, nName, zName, SQLITE_UTF8, SQLITE_STATIC); - zExternal = sqlite3ValueText(pTmp, SQLITE_UTF16NATIVE); + sqlite3ValueSetStr(pTmp, nName, zName, STQLITE_UTF8, STQLITE_STATIC); + zExternal = sqlite3ValueText(pTmp, STQLITE_UTF16NATIVE); if( zExternal ){ db->xCollNeeded16(db->pCollNeededArg, db, (int)ENC(db), zExternal); } @@ -46833,16 +46833,16 @@ static int synthCollSeq(sqlite3 *db, CollSeq *pColl){ char *z = pColl->zName; int n = strlen(z); int i; - static const u8 aEnc[] = { SQLITE_UTF16BE, SQLITE_UTF16LE, SQLITE_UTF8 }; + static const u8 aEnc[] = { STQLITE_UTF16BE, STQLITE_UTF16LE, STQLITE_UTF8 }; for(i=0; i<3; i++){ pColl2 = sqlite3FindCollSeq(db, aEnc[i], z, n, 0); if( pColl2->xCmp!=0 ){ memcpy(pColl, pColl2, sizeof(CollSeq)); pColl->xDel = 0; /* Do not copy the destructor */ - return SQLITE_OK; + return STQLITE_OK; } } - return SQLITE_ERROR; + return STQLITE_ERROR; } /* @@ -46858,7 +46858,7 @@ static int synthCollSeq(sqlite3 *db, CollSeq *pColl){ ** db for collation type name zName, length nName, or NULL, if no collation ** sequence can be found. */ -SQLITE_PRIVATE CollSeq *sqlite3GetCollSeq( +STQLITE_PRIVATE CollSeq *sqlite3GetCollSeq( sqlite3* db, CollSeq *pColl, const char *zName, @@ -46895,7 +46895,7 @@ SQLITE_PRIVATE CollSeq *sqlite3GetCollSeq( ** an equivalent collating sequence that uses a text encoding different ** from the main database is substituted, if one is available. */ -SQLITE_PRIVATE int sqlite3CheckCollSeq(Parse *pParse, CollSeq *pColl){ +STQLITE_PRIVATE int sqlite3CheckCollSeq(Parse *pParse, CollSeq *pColl){ if( pColl ){ const char *zName = pColl->zName; CollSeq *p = sqlite3GetCollSeq(pParse->db, pColl, zName, -1); @@ -46904,11 +46904,11 @@ SQLITE_PRIVATE int sqlite3CheckCollSeq(Parse *pParse, CollSeq *pColl){ sqlite3ErrorMsg(pParse, "no such collation sequence: %s", zName); } pParse->nErr++; - return SQLITE_ERROR; + return STQLITE_ERROR; } assert( p==pColl ); } - return SQLITE_OK; + return STQLITE_OK; } @@ -46941,11 +46941,11 @@ static CollSeq *findCollSeqEntry( if( pColl ){ CollSeq *pDel = 0; pColl[0].zName = (char*)&pColl[3]; - pColl[0].enc = SQLITE_UTF8; + pColl[0].enc = STQLITE_UTF8; pColl[1].zName = (char*)&pColl[3]; - pColl[1].enc = SQLITE_UTF16LE; + pColl[1].enc = STQLITE_UTF16LE; pColl[2].zName = (char*)&pColl[3]; - pColl[2].enc = SQLITE_UTF16BE; + pColl[2].enc = STQLITE_UTF16BE; memcpy(pColl[0].zName, zName, nName); pColl[0].zName[nName] = 0; pDel = sqlite3HashInsert(&db->aCollSeq, pColl[0].zName, nName, pColl); @@ -46977,7 +46977,7 @@ static CollSeq *findCollSeqEntry( ** if necessary and generates an error message if the collating sequence ** cannot be found. */ -SQLITE_PRIVATE CollSeq *sqlite3FindCollSeq( +STQLITE_PRIVATE CollSeq *sqlite3FindCollSeq( sqlite3 *db, u8 enc, const char *zName, @@ -46990,8 +46990,8 @@ SQLITE_PRIVATE CollSeq *sqlite3FindCollSeq( }else{ pColl = db->pDfltColl; } - assert( SQLITE_UTF8==1 && SQLITE_UTF16LE==2 && SQLITE_UTF16BE==3 ); - assert( enc>=SQLITE_UTF8 && enc<=SQLITE_UTF16BE ); + assert( STQLITE_UTF8==1 && STQLITE_UTF16LE==2 && STQLITE_UTF16BE==3 ); + assert( enc>=STQLITE_UTF8 && enc<=STQLITE_UTF16BE ); if( pColl ) pColl += enc-1; return pColl; } @@ -47016,7 +47016,7 @@ SQLITE_PRIVATE CollSeq *sqlite3FindCollSeq( ** number of arguments may be returned even if the eTextRep flag does not ** match that requested. */ -SQLITE_PRIVATE FuncDef *sqlite3FindFunction( +STQLITE_PRIVATE FuncDef *sqlite3FindFunction( sqlite3 *db, /* An open database */ const char *zName, /* Name of the function. Not null-terminated */ int nName, /* Number of characters in the name */ @@ -47030,7 +47030,7 @@ SQLITE_PRIVATE FuncDef *sqlite3FindFunction( int bestmatch = 0; - assert( enc==SQLITE_UTF8 || enc==SQLITE_UTF16LE || enc==SQLITE_UTF16BE ); + assert( enc==STQLITE_UTF8 || enc==STQLITE_UTF16LE || enc==STQLITE_UTF16BE ); if( nArg<-1 ) nArg = -1; pFirst = (FuncDef*)sqlite3HashFind(&db->aFunc, zName, nName); @@ -47061,8 +47061,8 @@ SQLITE_PRIVATE FuncDef *sqlite3FindFunction( if( enc==p->iPrefEnc ){ match += 2; } - else if( (enc==SQLITE_UTF16LE && p->iPrefEnc==SQLITE_UTF16BE) || - (enc==SQLITE_UTF16BE && p->iPrefEnc==SQLITE_UTF16LE) ){ + else if( (enc==STQLITE_UTF16LE && p->iPrefEnc==STQLITE_UTF16BE) || + (enc==STQLITE_UTF16BE && p->iPrefEnc==STQLITE_UTF16LE) ){ match += 1; } @@ -47102,7 +47102,7 @@ SQLITE_PRIVATE FuncDef *sqlite3FindFunction( ** pointer itself, it just cleans up subsiduary resources (i.e. the contents ** of the schema hash tables). */ -SQLITE_PRIVATE void sqlite3SchemaFree(void *p){ +STQLITE_PRIVATE void sqlite3SchemaFree(void *p){ Hash temp1; Hash temp2; HashElem *pElem; @@ -47110,14 +47110,14 @@ SQLITE_PRIVATE void sqlite3SchemaFree(void *p){ temp1 = pSchema->tblHash; temp2 = pSchema->trigHash; - sqlite3HashInit(&pSchema->trigHash, SQLITE_HASH_STRING, 0); + sqlite3HashInit(&pSchema->trigHash, STQLITE_HASH_STRING, 0); sqlite3HashClear(&pSchema->aFKey); sqlite3HashClear(&pSchema->idxHash); for(pElem=sqliteHashFirst(&temp2); pElem; pElem=sqliteHashNext(pElem)){ sqlite3DeleteTrigger((Trigger*)sqliteHashData(pElem)); } sqlite3HashClear(&temp2); - sqlite3HashInit(&pSchema->tblHash, SQLITE_HASH_STRING, 0); + sqlite3HashInit(&pSchema->tblHash, STQLITE_HASH_STRING, 0); for(pElem=sqliteHashFirst(&temp1); pElem; pElem=sqliteHashNext(pElem)){ Table *pTab = sqliteHashData(pElem); sqlite3DeleteTable(pTab); @@ -47131,7 +47131,7 @@ SQLITE_PRIVATE void sqlite3SchemaFree(void *p){ ** Find and return the schema associated with a BTree. Create ** a new one if necessary. */ -SQLITE_PRIVATE Schema *sqlite3SchemaGet(Btree *pBt){ +STQLITE_PRIVATE Schema *sqlite3SchemaGet(Btree *pBt){ Schema * p; if( pBt ){ p = (Schema *)sqlite3BtreeSchema(pBt,sizeof(Schema),sqlite3SchemaFree); @@ -47139,11 +47139,11 @@ SQLITE_PRIVATE Schema *sqlite3SchemaGet(Btree *pBt){ p = (Schema *)sqliteMalloc(sizeof(Schema)); } if( p && 0==p->file_format ){ - sqlite3HashInit(&p->tblHash, SQLITE_HASH_STRING, 0); - sqlite3HashInit(&p->idxHash, SQLITE_HASH_STRING, 0); - sqlite3HashInit(&p->trigHash, SQLITE_HASH_STRING, 0); - sqlite3HashInit(&p->aFKey, SQLITE_HASH_STRING, 1); - p->enc = SQLITE_UTF8; + sqlite3HashInit(&p->tblHash, STQLITE_HASH_STRING, 0); + sqlite3HashInit(&p->idxHash, STQLITE_HASH_STRING, 0); + sqlite3HashInit(&p->trigHash, STQLITE_HASH_STRING, 0); + sqlite3HashInit(&p->aFKey, STQLITE_HASH_STRING, 1); + p->enc = STQLITE_UTF8; } return p; } @@ -47170,7 +47170,7 @@ SQLITE_PRIVATE Schema *sqlite3SchemaGet(Btree *pBt){ ** ** $Id: complete.c,v 1.3 2006/01/18 15:25:17 danielk1977 Exp $ */ -#ifndef SQLITE_OMIT_COMPLETE +#ifndef STQLITE_OMIT_COMPLETE /* ** This is defined in tokenize.c. We just have to import the definition. @@ -47238,15 +47238,15 @@ extern const char sqlite3IsIdChar[]; ** ** Whitespace never causes a state transition and is always ignored. ** -** If we compile with SQLITE_OMIT_TRIGGER, all of the computation needed +** If we compile with STQLITE_OMIT_TRIGGER, all of the computation needed ** to recognize the end of a trigger can be omitted. All we have to do ** is look for a semicolon that is not part of an string or comment. */ -SQLITE_API int sqlite3_complete(const char *zSql){ +STQLITE_API int sqlite3_complete(const char *zSql){ u8 state = 0; /* Current state, using numbers defined in header comment */ u8 token; /* Value of the next token */ -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER /* A complex statement machine used to detect the end of a CREATE TRIGGER ** statement. This is the normal case. */ @@ -47271,7 +47271,7 @@ SQLITE_API int sqlite3_complete(const char *zSql){ /* 0 START: */ { 0, 0, 1, }, /* 1 NORMAL: */ { 0, 1, 1, }, }; -#endif /* SQLITE_OMIT_TRIGGER */ +#endif /* STQLITE_OMIT_TRIGGER */ while( *zSql ){ switch( *zSql ){ @@ -47332,7 +47332,7 @@ SQLITE_API int sqlite3_complete(const char *zSql){ /* Keywords and unquoted identifiers */ int nId; for(nId=1; IdChar(zSql[nId]); nId++){} -#ifdef SQLITE_OMIT_TRIGGER +#ifdef STQLITE_OMIT_TRIGGER token = tkOTHER; #else switch( *zSql ){ @@ -47360,7 +47360,7 @@ SQLITE_API int sqlite3_complete(const char *zSql){ if( nId==3 && sqlite3StrNICmp(zSql, "end", 3)==0 ){ token = tkEND; }else -#ifndef SQLITE_OMIT_EXPLAIN +#ifndef STQLITE_OMIT_EXPLAIN if( nId==7 && sqlite3StrNICmp(zSql, "explain", 7)==0 ){ token = tkEXPLAIN; }else @@ -47375,7 +47375,7 @@ SQLITE_API int sqlite3_complete(const char *zSql){ break; } } -#endif /* SQLITE_OMIT_TRIGGER */ +#endif /* STQLITE_OMIT_TRIGGER */ zSql += nId-1; }else{ /* Operators and special symbols */ @@ -47390,28 +47390,28 @@ SQLITE_API int sqlite3_complete(const char *zSql){ return state==0; } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 /* ** This routine is the same as the sqlite3_complete() routine described ** above, except that the parameter is required to be UTF-16 encoded, not ** UTF-8. */ -SQLITE_API int sqlite3_complete16(const void *zSql){ +STQLITE_API int sqlite3_complete16(const void *zSql){ sqlite3_value *pVal; char const *zSql8; int rc = 0; pVal = sqlite3ValueNew(); - sqlite3ValueSetStr(pVal, -1, zSql, SQLITE_UTF16NATIVE, SQLITE_STATIC); - zSql8 = sqlite3ValueText(pVal, SQLITE_UTF8); + sqlite3ValueSetStr(pVal, -1, zSql, STQLITE_UTF16NATIVE, STQLITE_STATIC); + zSql8 = sqlite3ValueText(pVal, STQLITE_UTF8); if( zSql8 ){ rc = sqlite3_complete(zSql8); } sqlite3ValueFree(pVal); return sqlite3ApiExit(0, rc); } -#endif /* SQLITE_OMIT_UTF16 */ -#endif /* SQLITE_OMIT_COMPLETE */ +#endif /* STQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_COMPLETE */ /************** End of complete.c ********************************************/ /************** Begin file delete.c ******************************************/ @@ -47437,7 +47437,7 @@ SQLITE_API int sqlite3_complete16(const void *zSql){ ** add an error message to pParse->zErrMsg and return NULL. If all tables ** are found, return a pointer to the last table. */ -SQLITE_PRIVATE Table *sqlite3SrcListLookup(Parse *pParse, SrcList *pSrc){ +STQLITE_PRIVATE Table *sqlite3SrcListLookup(Parse *pParse, SrcList *pSrc){ Table *pTab = 0; int i; struct SrcList_item *pItem; @@ -47457,17 +47457,17 @@ SQLITE_PRIVATE Table *sqlite3SrcListLookup(Parse *pParse, SrcList *pSrc){ ** writable, generate an error message and return 1. If it is ** writable return 0; */ -SQLITE_PRIVATE int sqlite3IsReadOnly(Parse *pParse, Table *pTab, int viewOk){ - if( (pTab->readOnly && (pParse->db->flags & SQLITE_WriteSchema)==0 +STQLITE_PRIVATE int sqlite3IsReadOnly(Parse *pParse, Table *pTab, int viewOk){ + if( (pTab->readOnly && (pParse->db->flags & STQLITE_WriteSchema)==0 && pParse->nested==0) -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE || (pTab->pMod && pTab->pMod->pModule->xUpdate==0) #endif ){ sqlite3ErrorMsg(pParse, "table %s may not be modified", pTab->zName); return 1; } -#ifndef SQLITE_OMIT_VIEW +#ifndef STQLITE_OMIT_VIEW if( !viewOk && pTab->pSelect ){ sqlite3ErrorMsg(pParse,"cannot modify %s because it is a view",pTab->zName); return 1; @@ -47479,7 +47479,7 @@ SQLITE_PRIVATE int sqlite3IsReadOnly(Parse *pParse, Table *pTab, int viewOk){ /* ** Generate code that will open a table for reading. */ -SQLITE_PRIVATE void sqlite3OpenTable( +STQLITE_PRIVATE void sqlite3OpenTable( Parse *p, /* Generate code into this VDBE */ int iCur, /* The cursor number of the table */ int iDb, /* The database index in sqlite3.aDb[] */ @@ -47505,7 +47505,7 @@ SQLITE_PRIVATE void sqlite3OpenTable( ** \________/ \________________/ ** pTabList pWhere */ -SQLITE_PRIVATE void sqlite3DeleteFrom( +STQLITE_PRIVATE void sqlite3DeleteFrom( Parse *pParse, /* The parser context */ SrcList *pTabList, /* The table from which we should delete things */ Expr *pWhere /* The WHERE clause. May be null */ @@ -47525,7 +47525,7 @@ SQLITE_PRIVATE void sqlite3DeleteFrom( int iDb; /* Database number */ int memCnt = 0; /* Memory cell used for change counting */ -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER int isView; /* True if attempting to delete from a view */ int triggers_exist = 0; /* True if any triggers exist */ #endif @@ -47548,14 +47548,14 @@ SQLITE_PRIVATE void sqlite3DeleteFrom( /* Figure out if we have any triggers and if the table being ** deleted from is a view */ -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER triggers_exist = sqlite3TriggersExist(pParse, pTab, TK_DELETE, 0); isView = pTab->pSelect!=0; #else # define triggers_exist 0 # define isView 0 #endif -#ifdef SQLITE_OMIT_VIEW +#ifdef STQLITE_OMIT_VIEW # undef isView # define isView 0 #endif @@ -47566,7 +47566,7 @@ SQLITE_PRIVATE void sqlite3DeleteFrom( iDb = sqlite3SchemaToIndex(db, pTab->pSchema); assert( iDb<db->nDb ); zDb = db->aDb[iDb].zName; - if( sqlite3AuthCheck(pParse, SQLITE_DELETE, pTab->zName, 0, zDb) ){ + if( sqlite3AuthCheck(pParse, STQLITE_DELETE, pTab->zName, 0, zDb) ){ goto delete_from_cleanup; } @@ -47620,7 +47620,7 @@ SQLITE_PRIVATE void sqlite3DeleteFrom( /* Initialize the counter of the number of rows deleted, if ** we are counting rows. */ - if( db->flags & SQLITE_CountRows ){ + if( db->flags & STQLITE_CountRows ){ memCnt = pParse->nMem++; sqlite3VdbeAddOp(v, OP_MemInt, 0, memCnt); } @@ -47630,7 +47630,7 @@ SQLITE_PRIVATE void sqlite3DeleteFrom( ** this means that the row change count will be incorrect. */ if( pWhere==0 && !triggers_exist && !IsVirtual(pTab) ){ - if( db->flags & SQLITE_CountRows ){ + if( db->flags & STQLITE_CountRows ){ /* If counting rows deleted, just count the total number of ** entries in the table. */ int endOfLoop = sqlite3VdbeMakeLabel(v); @@ -47668,7 +47668,7 @@ SQLITE_PRIVATE void sqlite3DeleteFrom( */ sqlite3VdbeAddOp(v, IsVirtual(pTab) ? OP_VRowid : OP_Rowid, iCur, 0); sqlite3VdbeAddOp(v, OP_FifoWrite, 0, 0); - if( db->flags & SQLITE_CountRows ){ + if( db->flags & STQLITE_CountRows ){ sqlite3VdbeAddOp(v, OP_MemIncr, 1, memCnt); } @@ -47727,7 +47727,7 @@ SQLITE_PRIVATE void sqlite3DeleteFrom( } /* Delete the row */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( IsVirtual(pTab) ){ pParse->pVirtualLock = pTab; sqlite3VdbeOp3(v, OP_VUpdate, 0, 1, (const char*)pTab->pVtab, P3_VTAB); @@ -47771,7 +47771,7 @@ SQLITE_PRIVATE void sqlite3DeleteFrom( ** generating code because of a call to sqlite3NestedParse(), do not ** invoke the callback function. */ - if( db->flags & SQLITE_CountRows && pParse->nested==0 && !pParse->trigStack ){ + if( db->flags & STQLITE_CountRows && pParse->nested==0 && !pParse->trigStack ){ sqlite3VdbeAddOp(v, OP_MemLoad, memCnt, 0); sqlite3VdbeAddOp(v, OP_Callback, 1, 0); sqlite3VdbeSetNumCols(v, 1); @@ -47805,7 +47805,7 @@ delete_from_cleanup: ** and then generates code to remove both the table record and all index ** entries that point to that record. */ -SQLITE_PRIVATE void sqlite3GenerateRowDelete( +STQLITE_PRIVATE void sqlite3GenerateRowDelete( sqlite3 *db, /* The database containing the index */ Vdbe *v, /* Generate code into this VDBE */ Table *pTab, /* Table containing the row to be deleted */ @@ -47838,7 +47838,7 @@ SQLITE_PRIVATE void sqlite3GenerateRowDelete( ** 3. The "iCur" cursor must be pointing to the row that is to be ** deleted. */ -SQLITE_PRIVATE void sqlite3GenerateRowIndexDelete( +STQLITE_PRIVATE void sqlite3GenerateRowIndexDelete( Vdbe *v, /* Generate code into this VDBE */ Table *pTab, /* Table containing the row to be deleted */ int iCur, /* Cursor number for the table */ @@ -47860,7 +47860,7 @@ SQLITE_PRIVATE void sqlite3GenerateRowIndexDelete( ** iCur is the index of a cursor open on the pTab table and pointing to ** the entry that needs indexing. */ -SQLITE_PRIVATE void sqlite3GenerateIndexKey( +STQLITE_PRIVATE void sqlite3GenerateIndexKey( Vdbe *v, /* Generate code into this VDBE */ Index *pIdx, /* The index for which to generate a key */ int iCur /* Cursor number for the pIdx->pTable table */ @@ -47896,7 +47896,7 @@ SQLITE_PRIVATE void sqlite3GenerateIndexKey( ** ************************************************************************* ** This file contains the C functions that implement various SQL -** functions of SQLite. +** functions of STQLite. ** ** There is only one exported symbol in this file - the function ** sqliteRegisterBuildinFunctions() found at the bottom of the file. @@ -47922,20 +47922,20 @@ static void minmaxFunc( sqlite3_value **argv ){ int i; - int mask; /* 0 for min() or 0xffffffff for max() */ + int tqmask; /* 0 for min() or 0xffffffff for max() */ int iBest; CollSeq *pColl; if( argc==0 ) return; - mask = sqlite3_user_data(context)==0 ? 0 : -1; + tqmask = sqlite3_user_data(context)==0 ? 0 : -1; pColl = sqlite3GetFuncCollSeq(context); assert( pColl ); - assert( mask==-1 || mask==0 ); + assert( tqmask==-1 || tqmask==0 ); iBest = 0; - if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return; + if( sqlite3_value_type(argv[0])==STQLITE_NULL ) return; for(i=1; i<argc; i++){ - if( sqlite3_value_type(argv[i])==SQLITE_NULL ) return; - if( (sqlite3MemCompare(argv[iBest], argv[i], pColl)^mask)>=0 ){ + if( sqlite3_value_type(argv[i])==STQLITE_NULL ) return; + if( (sqlite3MemCompare(argv[iBest], argv[i], pColl)^tqmask)>=0 ){ iBest = i; } } @@ -47952,13 +47952,13 @@ static void typeofFunc( ){ const char *z = 0; switch( sqlite3_value_type(argv[0]) ){ - case SQLITE_NULL: z = "null"; break; - case SQLITE_INTEGER: z = "integer"; break; - case SQLITE_TEXT: z = "text"; break; - case SQLITE_FLOAT: z = "real"; break; - case SQLITE_BLOB: z = "blob"; break; + case STQLITE_NULL: z = "null"; break; + case STQLITE_INTEGER: z = "integer"; break; + case STQLITE_TEXT: z = "text"; break; + case STQLITE_FLOAT: z = "real"; break; + case STQLITE_BLOB: z = "blob"; break; } - sqlite3_result_text(context, z, -1, SQLITE_STATIC); + sqlite3_result_text(context, z, -1, STQLITE_STATIC); } @@ -47974,19 +47974,19 @@ static void lengthFunc( assert( argc==1 ); switch( sqlite3_value_type(argv[0]) ){ - case SQLITE_BLOB: - case SQLITE_INTEGER: - case SQLITE_FLOAT: { + case STQLITE_BLOB: + case STQLITE_INTEGER: + case STQLITE_FLOAT: { sqlite3_result_int(context, sqlite3_value_bytes(argv[0])); break; } - case SQLITE_TEXT: { + case STQLITE_TEXT: { const unsigned char *z = sqlite3_value_text(argv[0]); if( z==0 ) return; len = 0; while( *z ){ len++; - SQLITE_SKIP_UTF8(z); + STQLITE_SKIP_UTF8(z); } sqlite3_result_int(context, len); break; @@ -48004,7 +48004,7 @@ static void lengthFunc( static void absFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ assert( argc==1 ); switch( sqlite3_value_type(argv[0]) ){ - case SQLITE_INTEGER: { + case STQLITE_INTEGER: { i64 iVal = sqlite3_value_int64(argv[0]); if( iVal<0 ){ if( (iVal<<1)==0 ){ @@ -48016,7 +48016,7 @@ static void absFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ sqlite3_result_int64(context, iVal); break; } - case SQLITE_NULL: { + case STQLITE_NULL: { sqlite3_result_null(context); break; } @@ -48052,7 +48052,7 @@ static void substrFunc( assert( argc==3 ); p0type = sqlite3_value_type(argv[0]); - if( p0type==SQLITE_BLOB ){ + if( p0type==STQLITE_BLOB ){ len = sqlite3_value_bytes(argv[0]); z = sqlite3_value_blob(argv[0]); if( z==0 ) return; @@ -48062,7 +48062,7 @@ static void substrFunc( if( z==0 ) return; len = 0; for(z2=z; *z2; len++){ - SQLITE_SKIP_UTF8(z2); + STQLITE_SKIP_UTF8(z2); } } p1 = sqlite3_value_int(argv[1]); @@ -48079,18 +48079,18 @@ static void substrFunc( if( p1+p2>len ){ p2 = len-p1; } - if( p0type!=SQLITE_BLOB ){ + if( p0type!=STQLITE_BLOB ){ while( *z && p1 ){ - SQLITE_SKIP_UTF8(z); + STQLITE_SKIP_UTF8(z); p1--; } for(z2=z; *z2 && p2; p2--){ - SQLITE_SKIP_UTF8(z2); + STQLITE_SKIP_UTF8(z2); } - sqlite3_result_text(context, (char*)z, z2-z, SQLITE_TRANSIENT); + sqlite3_result_text(context, (char*)z, z2-z, STQLITE_TRANSIENT); }else{ if( p2<0 ) p2 = 0; - sqlite3_result_blob(context, (char*)&z[p1], p2, SQLITE_TRANSIENT); + sqlite3_result_blob(context, (char*)&z[p1], p2, STQLITE_TRANSIENT); } } @@ -48103,12 +48103,12 @@ static void roundFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ char zBuf[500]; /* larger than the %f representation of the largest double */ assert( argc==1 || argc==2 ); if( argc==2 ){ - if( SQLITE_NULL==sqlite3_value_type(argv[1]) ) return; + if( STQLITE_NULL==sqlite3_value_type(argv[1]) ) return; n = sqlite3_value_int(argv[1]); if( n>30 ) n = 30; if( n<0 ) n = 0; } - if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return; + if( sqlite3_value_type(argv[0])==STQLITE_NULL ) return; r = sqlite3_value_double(argv[0]); sqlite3_snprintf(sizeof(zBuf),zBuf,"%.*f",n,r); sqlite3AtoF(zBuf, &r); @@ -48122,10 +48122,10 @@ static void upperFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ char *z1; const char *z2; int i, n; - if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return; + if( argc<1 || STQLITE_NULL==sqlite3_value_type(argv[0]) ) return; z2 = (char*)sqlite3_value_text(argv[0]); n = sqlite3_value_bytes(argv[0]); - /* Verify that the call to _bytes() does not invalidate the _text() pointer */ + /* Verify that the call to _bytes() does not tqinvalidate the _text() pointer */ assert( z2==(char*)sqlite3_value_text(argv[0]) ); if( z2 ){ z1 = sqlite3_malloc(n+1); @@ -48142,10 +48142,10 @@ static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ char *z1; const char *z2; int i, n; - if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return; + if( argc<1 || STQLITE_NULL==sqlite3_value_type(argv[0]) ) return; z2 = (char*)sqlite3_value_text(argv[0]); n = sqlite3_value_bytes(argv[0]); - /* Verify that the call to _bytes() does not invalidate the _text() pointer */ + /* Verify that the call to _bytes() does not tqinvalidate the _text() pointer */ assert( z2==(char*)sqlite3_value_text(argv[0]) ); if( z2 ){ z1 = sqlite3_malloc(n+1); @@ -48171,7 +48171,7 @@ static void ifnullFunc( ){ int i; for(i=0; i<argc; i++){ - if( SQLITE_NULL!=sqlite3_value_type(argv[i]) ){ + if( STQLITE_NULL!=sqlite3_value_type(argv[i]) ){ sqlite3_result_value(context, argv[i]); break; } @@ -48209,7 +48209,7 @@ static void randomBlob( if( n<1 ){ n = 1; } - if( n>SQLITE_MAX_LENGTH ){ + if( n>STQLITE_MAX_LENGTH ){ sqlite3_result_error_toobig(context); return; } @@ -48273,16 +48273,16 @@ static const struct compareInfo globInfo = { '*', '?', '[', 0 }; /* The correct SQL-92 behavior is for the LIKE operator to ignore ** case. Thus 'a' LIKE 'A' would be true. */ static const struct compareInfo likeInfoNorm = { '%', '_', 0, 1 }; -/* If SQLITE_CASE_SENSITIVE_LIKE is defined, then the LIKE operator +/* If STQLITE_CASE_SENSITIVE_LIKE is defined, then the LIKE operator ** is case sensitive causing 'a' LIKE 'A' to be false */ static const struct compareInfo likeInfoAlt = { '%', '_', 0, 0 }; /* ** Read a single UTF-8 character and return its value. */ -SQLITE_PRIVATE u32 sqlite3ReadUtf8(const unsigned char *z){ +STQLITE_PRIVATE u32 sqlite3ReadUtf8(const unsigned char *z){ u32 c; - SQLITE_READ_UTF8(z, c); + STQLITE_READ_UTF8(z, c); return c; } @@ -48335,20 +48335,20 @@ static int patternCompare( while( (c=zPattern[1]) == matchAll || c == matchOne ){ if( c==matchOne ){ if( *zString==0 ) return 0; - SQLITE_SKIP_UTF8(zString); + STQLITE_SKIP_UTF8(zString); } zPattern++; } if( c && esc && sqlite3ReadUtf8(&zPattern[1])==esc ){ u8 const *zTemp = &zPattern[1]; - SQLITE_SKIP_UTF8(zTemp); + STQLITE_SKIP_UTF8(zTemp); c = *zTemp; } if( c==0 ) return 1; if( c==matchSet ){ assert( esc==0 ); /* This is GLOB, not LIKE */ while( *zString && patternCompare(&zPattern[1],zString,pInfo,esc)==0 ){ - SQLITE_SKIP_UTF8(zString); + STQLITE_SKIP_UTF8(zString); } return *zString!=0; }else{ @@ -48362,13 +48362,13 @@ static int patternCompare( } if( c2==0 ) return 0; if( patternCompare(&zPattern[1],zString,pInfo,esc) ) return 1; - SQLITE_SKIP_UTF8(zString); + STQLITE_SKIP_UTF8(zString); } return 0; } }else if( !prevEscape && c==matchOne ){ if( *zString==0 ) return 0; - SQLITE_SKIP_UTF8(zString); + STQLITE_SKIP_UTF8(zString); zPattern++; }else if( c==matchSet ){ int prior_c = 0; @@ -48395,14 +48395,14 @@ static int patternCompare( }else{ prior_c = c2; } - SQLITE_SKIP_UTF8(zPattern); + STQLITE_SKIP_UTF8(zPattern); } if( c2==0 || (seen ^ invert)==0 ) return 0; - SQLITE_SKIP_UTF8(zString); + STQLITE_SKIP_UTF8(zString); zPattern++; }else if( esc && !prevEscape && sqlite3ReadUtf8(zPattern)==esc){ prevEscape = 1; - SQLITE_SKIP_UTF8(zPattern); + STQLITE_SKIP_UTF8(zPattern); }else{ if( noCase ){ if( sqlite3UpperToLower[c] != sqlite3UpperToLower[*zString] ) return 0; @@ -48422,7 +48422,7 @@ static int patternCompare( ** just a variation of LIKE) gets called. This is used for testing ** only. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST int sqlite3_like_count = 0; #endif @@ -48453,7 +48453,7 @@ static void likeFunc( /* Limit the length of the LIKE or GLOB pattern to avoid problems ** of deep recursion and N*N behavior in patternCompare(). */ - if( sqlite3_value_bytes(argv[0])>SQLITE_MAX_LIKE_PATTERN_LENGTH ){ + if( sqlite3_value_bytes(argv[0])>STQLITE_MAX_LIKE_PATTERN_LENGTH ){ sqlite3_result_error(context, "LIKE or GLOB pattern too complex", -1); return; } @@ -48474,7 +48474,7 @@ static void likeFunc( } if( zA && zB ){ struct compareInfo *pInfo = sqlite3_user_data(context); -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST sqlite3_like_count++; #endif @@ -48500,14 +48500,14 @@ static void nullifFunc( /* ** Implementation of the VERSION(*) function. The result is the version -** of the SQLite library that is running. +** of the STQLite library that is running. */ static void versionFunc( sqlite3_context *context, int argc, sqlite3_value **argv ){ - sqlite3_result_text(context, sqlite3_version, -1, SQLITE_STATIC); + sqlite3_result_text(context, sqlite3_version, -1, STQLITE_STATIC); } /* Array for converting from half-bytes (nybbles) into ASCII hex @@ -48522,7 +48522,7 @@ static const char hexdigits[] = { ** change. This function may disappear. Do not write code that depends ** on this function. ** -** Implementation of the QUOTE() function. This function takes a single +** Implementation of the TQUOTE() function. This function takes a single ** argument. If the argument is numeric, the return value is the same as ** the argument. If the argument is NULL, the return value is the string ** "NULL". Otherwise, the argument is enclosed in single quotes with @@ -48531,22 +48531,22 @@ static const char hexdigits[] = { static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ if( argc<1 ) return; switch( sqlite3_value_type(argv[0]) ){ - case SQLITE_NULL: { - sqlite3_result_text(context, "NULL", 4, SQLITE_STATIC); + case STQLITE_NULL: { + sqlite3_result_text(context, "NULL", 4, STQLITE_STATIC); break; } - case SQLITE_INTEGER: - case SQLITE_FLOAT: { + case STQLITE_INTEGER: + case STQLITE_FLOAT: { sqlite3_result_value(context, argv[0]); break; } - case SQLITE_BLOB: { + case STQLITE_BLOB: { char *zText = 0; char const *zBlob = sqlite3_value_blob(argv[0]); int nBlob = sqlite3_value_bytes(argv[0]); assert( zBlob==sqlite3_value_blob(argv[0]) ); /* No encoding change */ - if( 2*nBlob+4>SQLITE_MAX_LENGTH ){ + if( 2*nBlob+4>STQLITE_MAX_LENGTH ){ sqlite3_result_error_toobig(context); return; } @@ -48563,12 +48563,12 @@ static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ zText[(nBlob*2)+3] = '\0'; zText[0] = 'X'; zText[1] = '\''; - sqlite3_result_text(context, zText, -1, SQLITE_TRANSIENT); + sqlite3_result_text(context, zText, -1, STQLITE_TRANSIENT); sqliteFree(zText); } break; } - case SQLITE_TEXT: { + case STQLITE_TEXT: { int i,j; u64 n; const unsigned char *zArg = sqlite3_value_text(argv[0]); @@ -48576,7 +48576,7 @@ static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ if( zArg==0 ) return; for(i=0, n=0; zArg[i]; i++){ if( zArg[i]=='\'' ) n++; } - if( i+n+3>SQLITE_MAX_LENGTH ){ + if( i+n+3>STQLITE_MAX_LENGTH ){ sqlite3_result_error_toobig(context); return; } @@ -48591,7 +48591,7 @@ static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ } z[j++] = '\''; z[j] = 0; - sqlite3_result_text(context, z, j, SQLITE_TRANSIENT); + sqlite3_result_text(context, z, j, STQLITE_TRANSIENT); sqliteFree(z); } } @@ -48612,7 +48612,7 @@ static void hexFunc( assert( argc==1 ); pBlob = sqlite3_value_blob(argv[0]); n = sqlite3_value_bytes(argv[0]); - if( n*2+1>SQLITE_MAX_LENGTH ){ + if( n*2+1>STQLITE_MAX_LENGTH ){ sqlite3_result_error_toobig(context); return; } @@ -48639,7 +48639,7 @@ static void zeroblobFunc( i64 n; assert( argc==1 ); n = sqlite3_value_int64(argv[0]); - if( n>SQLITE_MAX_LENGTH ){ + if( n>STQLITE_MAX_LENGTH ){ sqlite3_result_error_toobig(context); }else{ sqlite3_result_zeroblob(context, n); @@ -48647,7 +48647,7 @@ static void zeroblobFunc( } /* -** The replace() function. Three arguments are all strings: call +** The tqreplace() function. Three arguments are all strings: call ** them A, B, and C. The result is also a string which is derived ** from A by replacing every occurance of B with C. The match ** must be exact. Collating sequences are not used. @@ -48682,7 +48682,7 @@ static void replaceFunc( nRep = sqlite3_value_bytes(argv[2]); assert( zRep==sqlite3_value_text(argv[2]) ); nOut = nStr + 1; - assert( nOut<SQLITE_MAX_LENGTH ); + assert( nOut<STQLITE_MAX_LENGTH ); zOut = sqlite3_malloc((int)nOut); if( zOut==0 ){ return; @@ -48693,7 +48693,7 @@ static void replaceFunc( zOut[j++] = zStr[i]; }else{ nOut += nRep - nPattern; - if( nOut>=SQLITE_MAX_LENGTH ){ + if( nOut>=STQLITE_MAX_LENGTH ){ sqlite3_result_error_toobig(context); sqlite3_free(zOut); return; @@ -48733,7 +48733,7 @@ static void trimFunc( const unsigned char **azChar; /* Individual characters in zCharSet */ int nChar; /* Number of characters in zCharSet */ - if( sqlite3_value_type(argv[0])==SQLITE_NULL ){ + if( sqlite3_value_type(argv[0])==STQLITE_NULL ){ return; } zIn = sqlite3_value_text(argv[0]); @@ -48752,7 +48752,7 @@ static void trimFunc( }else{ const unsigned char *z; for(z=zCharSet, nChar=0; *z; nChar++){ - SQLITE_SKIP_UTF8(z); + STQLITE_SKIP_UTF8(z); } if( nChar>0 ){ azChar = sqlite3_malloc( nChar*(sizeof(char*)+1) ); @@ -48762,7 +48762,7 @@ static void trimFunc( aLen = (unsigned char*)&azChar[nChar]; for(z=zCharSet, nChar=0; *z; nChar++){ azChar[nChar] = z; - SQLITE_SKIP_UTF8(z); + STQLITE_SKIP_UTF8(z); aLen[nChar] = z - azChar[nChar]; } } @@ -48796,10 +48796,10 @@ static void trimFunc( sqlite3_free(azChar); } } - sqlite3_result_text(context, (char*)zIn, nIn, SQLITE_TRANSIENT); + sqlite3_result_text(context, (char*)zIn, nIn, STQLITE_TRANSIENT); } -#ifdef SQLITE_SOUNDEX +#ifdef STQLITE_SOUNDEX /* ** Compute the soundex encoding of a word. */ @@ -48843,14 +48843,14 @@ static void soundexFunc( zResult[j++] = '0'; } zResult[j] = 0; - sqlite3_result_text(context, zResult, 4, SQLITE_TRANSIENT); + sqlite3_result_text(context, zResult, 4, STQLITE_TRANSIENT); }else{ - sqlite3_result_text(context, "?000", 4, SQLITE_STATIC); + sqlite3_result_text(context, "?000", 4, STQLITE_STATIC); } } #endif -#ifndef SQLITE_OMIT_LOAD_EXTENSION +#ifndef STQLITE_OMIT_LOAD_EXTENSION /* ** A function that loads a shared-library extension then returns NULL. */ @@ -48872,7 +48872,7 @@ static void loadExt(sqlite3_context *context, int argc, sqlite3_value **argv){ } #endif -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST /* ** This function generates a string of random characters. Used for ** generating test data. @@ -48880,7 +48880,7 @@ static void loadExt(sqlite3_context *context, int argc, sqlite3_value **argv){ static void randStr(sqlite3_context *context, int argc, sqlite3_value **argv){ static const unsigned char zSrc[] = "abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" "0123456789" ".-!,:*^+=_|?/<> "; int iMin, iMax, n, r, i; @@ -48911,11 +48911,11 @@ static void randStr(sqlite3_context *context, int argc, sqlite3_value **argv){ zBuf[i] = zSrc[zBuf[i]%(sizeof(zSrc)-1)]; } zBuf[n] = 0; - sqlite3_result_text(context, (char*)zBuf, n, SQLITE_TRANSIENT); + sqlite3_result_text(context, (char*)zBuf, n, STQLITE_TRANSIENT); } -#endif /* SQLITE_TEST */ +#endif /* STQLITE_TEST */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST /* ** The following two SQL functions are used to test returning a text ** result with a destructor. Function 'test_destructor' takes one argument @@ -48946,7 +48946,7 @@ static void test_destructor( test_destructor_count_var++; assert( nArg==1 ); - if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return; + if( sqlite3_value_type(argv[0])==STQLITE_NULL ) return; len = sqlite3ValueBytes(argv[0], ENC(db)); zVal = sqliteMalloc(len+3); zVal[len] = 0; @@ -48954,14 +48954,14 @@ static void test_destructor( assert( zVal ); zVal++; memcpy(zVal, sqlite3ValueText(argv[0], ENC(db)), len); - if( ENC(db)==SQLITE_UTF8 ){ + if( ENC(db)==STQLITE_UTF8 ){ sqlite3_result_text(pCtx, zVal, -1, destructor); -#ifndef SQLITE_OMIT_UTF16 - }else if( ENC(db)==SQLITE_UTF16LE ){ +#ifndef STQLITE_OMIT_UTF16 + }else if( ENC(db)==STQLITE_UTF16LE ){ sqlite3_result_text16le(pCtx, zVal, -1, destructor); }else{ sqlite3_result_text16be(pCtx, zVal, -1, destructor); -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ } } static void test_destructor_count( @@ -48971,9 +48971,9 @@ static void test_destructor_count( ){ sqlite3_result_int(pCtx, test_destructor_count_var); } -#endif /* SQLITE_TEST */ +#endif /* STQLITE_TEST */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST /* ** Routines for testing the sqlite3_get_auxdata() and sqlite3_set_auxdata() ** interface. @@ -49014,9 +49014,9 @@ static void test_auxdata( } sqlite3_result_text(pCtx, zRet, 2*nArg-1, free_test_auxdata); } -#endif /* SQLITE_TEST */ +#endif /* STQLITE_TEST */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST /* ** A function to test error reporting from user functions. This function ** returns a copy of it's first argument as an error. @@ -49028,7 +49028,7 @@ static void test_error( ){ sqlite3_result_error(pCtx, (char*)sqlite3_value_text(argv[0]), 0); } -#endif /* SQLITE_TEST */ +#endif /* STQLITE_TEST */ /* ** An instance of the following structure holds the context of a @@ -49059,9 +49059,9 @@ static void sumStep(sqlite3_context *context, int argc, sqlite3_value **argv){ assert( argc==1 ); p = sqlite3_aggregate_context(context, sizeof(*p)); type = sqlite3_value_numeric_type(argv[0]); - if( p && type!=SQLITE_NULL ){ + if( p && type!=STQLITE_NULL ){ p->cnt++; - if( type==SQLITE_INTEGER ){ + if( type==STQLITE_INTEGER ){ i64 v = sqlite3_value_int64(argv[0]); p->rSum += v; if( (p->approx|p->overflow)==0 ){ @@ -49119,7 +49119,7 @@ struct CountCtx { static void countStep(sqlite3_context *context, int argc, sqlite3_value **argv){ CountCtx *p; p = sqlite3_aggregate_context(context, sizeof(*p)); - if( (argc==0 || SQLITE_NULL!=sqlite3_value_type(argv[0])) && p ){ + if( (argc==0 || STQLITE_NULL!=sqlite3_value_type(argv[0])) && p ){ p->n++; } } @@ -49136,7 +49136,7 @@ static void minmaxStep(sqlite3_context *context, int argc, sqlite3_value **argv) Mem *pArg = (Mem *)argv[0]; Mem *pBest; - if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return; + if( sqlite3_value_type(argv[0])==STQLITE_NULL ) return; pBest = (Mem *)sqlite3_aggregate_context(context, sizeof(*pBest)); if( !pBest ) return; @@ -49178,7 +49178,7 @@ static void minMaxFinalize(sqlite3_context *context){ ** functions. This should be the only routine in this file with ** external linkage. */ -SQLITE_PRIVATE void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ +STQLITE_PRIVATE void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ static const struct { char *zName; signed char nArg; @@ -49187,52 +49187,52 @@ SQLITE_PRIVATE void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ u8 needCollSeq; void (*xFunc)(sqlite3_context*,int,sqlite3_value **); } aFuncs[] = { - { "min", -1, 0, SQLITE_UTF8, 1, minmaxFunc }, - { "min", 0, 0, SQLITE_UTF8, 1, 0 }, - { "max", -1, 1, SQLITE_UTF8, 1, minmaxFunc }, - { "max", 0, 1, SQLITE_UTF8, 1, 0 }, - { "typeof", 1, 0, SQLITE_UTF8, 0, typeofFunc }, - { "length", 1, 0, SQLITE_UTF8, 0, lengthFunc }, - { "substr", 3, 0, SQLITE_UTF8, 0, substrFunc }, - { "abs", 1, 0, SQLITE_UTF8, 0, absFunc }, - { "round", 1, 0, SQLITE_UTF8, 0, roundFunc }, - { "round", 2, 0, SQLITE_UTF8, 0, roundFunc }, - { "upper", 1, 0, SQLITE_UTF8, 0, upperFunc }, - { "lower", 1, 0, SQLITE_UTF8, 0, lowerFunc }, - { "coalesce", -1, 0, SQLITE_UTF8, 0, ifnullFunc }, - { "coalesce", 0, 0, SQLITE_UTF8, 0, 0 }, - { "coalesce", 1, 0, SQLITE_UTF8, 0, 0 }, - { "hex", 1, 0, SQLITE_UTF8, 0, hexFunc }, - { "ifnull", 2, 0, SQLITE_UTF8, 1, ifnullFunc }, - { "random", -1, 0, SQLITE_UTF8, 0, randomFunc }, - { "randomblob", 1, 0, SQLITE_UTF8, 0, randomBlob }, - { "nullif", 2, 0, SQLITE_UTF8, 1, nullifFunc }, - { "sqlite_version", 0, 0, SQLITE_UTF8, 0, versionFunc}, - { "quote", 1, 0, SQLITE_UTF8, 0, quoteFunc }, - { "last_insert_rowid", 0, 0xff, SQLITE_UTF8, 0, last_insert_rowid }, - { "changes", 0, 0xff, SQLITE_UTF8, 0, changes }, - { "total_changes", 0, 0xff, SQLITE_UTF8, 0, total_changes }, - { "replace", 3, 0, SQLITE_UTF8, 0, replaceFunc }, - { "ltrim", 1, 1, SQLITE_UTF8, 0, trimFunc }, - { "ltrim", 2, 1, SQLITE_UTF8, 0, trimFunc }, - { "rtrim", 1, 2, SQLITE_UTF8, 0, trimFunc }, - { "rtrim", 2, 2, SQLITE_UTF8, 0, trimFunc }, - { "trim", 1, 3, SQLITE_UTF8, 0, trimFunc }, - { "trim", 2, 3, SQLITE_UTF8, 0, trimFunc }, - { "zeroblob", 1, 0, SQLITE_UTF8, 0, zeroblobFunc }, -#ifdef SQLITE_SOUNDEX - { "soundex", 1, 0, SQLITE_UTF8, 0, soundexFunc}, -#endif -#ifndef SQLITE_OMIT_LOAD_EXTENSION - { "load_extension", 1, 0xff, SQLITE_UTF8, 0, loadExt }, - { "load_extension", 2, 0xff, SQLITE_UTF8, 0, loadExt }, -#endif -#ifdef SQLITE_TEST - { "randstr", 2, 0, SQLITE_UTF8, 0, randStr }, - { "test_destructor", 1, 0xff, SQLITE_UTF8, 0, test_destructor}, - { "test_destructor_count", 0, 0, SQLITE_UTF8, 0, test_destructor_count}, - { "test_auxdata", -1, 0, SQLITE_UTF8, 0, test_auxdata}, - { "test_error", 1, 0, SQLITE_UTF8, 0, test_error}, + { "min", -1, 0, STQLITE_UTF8, 1, minmaxFunc }, + { "min", 0, 0, STQLITE_UTF8, 1, 0 }, + { "max", -1, 1, STQLITE_UTF8, 1, minmaxFunc }, + { "max", 0, 1, STQLITE_UTF8, 1, 0 }, + { "typeof", 1, 0, STQLITE_UTF8, 0, typeofFunc }, + { "length", 1, 0, STQLITE_UTF8, 0, lengthFunc }, + { "substr", 3, 0, STQLITE_UTF8, 0, substrFunc }, + { "abs", 1, 0, STQLITE_UTF8, 0, absFunc }, + { "round", 1, 0, STQLITE_UTF8, 0, roundFunc }, + { "round", 2, 0, STQLITE_UTF8, 0, roundFunc }, + { "upper", 1, 0, STQLITE_UTF8, 0, upperFunc }, + { "lower", 1, 0, STQLITE_UTF8, 0, lowerFunc }, + { "coalesce", -1, 0, STQLITE_UTF8, 0, ifnullFunc }, + { "coalesce", 0, 0, STQLITE_UTF8, 0, 0 }, + { "coalesce", 1, 0, STQLITE_UTF8, 0, 0 }, + { "hex", 1, 0, STQLITE_UTF8, 0, hexFunc }, + { "ifnull", 2, 0, STQLITE_UTF8, 1, ifnullFunc }, + { "random", -1, 0, STQLITE_UTF8, 0, randomFunc }, + { "randomblob", 1, 0, STQLITE_UTF8, 0, randomBlob }, + { "nullif", 2, 0, STQLITE_UTF8, 1, nullifFunc }, + { "sqlite_version", 0, 0, STQLITE_UTF8, 0, versionFunc}, + { "quote", 1, 0, STQLITE_UTF8, 0, quoteFunc }, + { "last_insert_rowid", 0, 0xff, STQLITE_UTF8, 0, last_insert_rowid }, + { "changes", 0, 0xff, STQLITE_UTF8, 0, changes }, + { "total_changes", 0, 0xff, STQLITE_UTF8, 0, total_changes }, + { "tqreplace", 3, 0, STQLITE_UTF8, 0, replaceFunc }, + { "ltrim", 1, 1, STQLITE_UTF8, 0, trimFunc }, + { "ltrim", 2, 1, STQLITE_UTF8, 0, trimFunc }, + { "rtrim", 1, 2, STQLITE_UTF8, 0, trimFunc }, + { "rtrim", 2, 2, STQLITE_UTF8, 0, trimFunc }, + { "trim", 1, 3, STQLITE_UTF8, 0, trimFunc }, + { "trim", 2, 3, STQLITE_UTF8, 0, trimFunc }, + { "zeroblob", 1, 0, STQLITE_UTF8, 0, zeroblobFunc }, +#ifdef STQLITE_SOUNDEX + { "soundex", 1, 0, STQLITE_UTF8, 0, soundexFunc}, +#endif +#ifndef STQLITE_OMIT_LOAD_EXTENSION + { "load_extension", 1, 0xff, STQLITE_UTF8, 0, loadExt }, + { "load_extension", 2, 0xff, STQLITE_UTF8, 0, loadExt }, +#endif +#ifdef STQLITE_TEST + { "randstr", 2, 0, STQLITE_UTF8, 0, randStr }, + { "test_destructor", 1, 0xff, STQLITE_UTF8, 0, test_destructor}, + { "test_destructor_count", 0, 0, STQLITE_UTF8, 0, test_destructor_count}, + { "test_auxdata", -1, 0, STQLITE_UTF8, 0, test_auxdata}, + { "test_error", 1, 0, STQLITE_UTF8, 0, test_error}, #endif }; static const struct { @@ -49271,19 +49271,19 @@ SQLITE_PRIVATE void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ } } } -#ifndef SQLITE_OMIT_ALTERTABLE +#ifndef STQLITE_OMIT_ALTERTABLE sqlite3AlterFunctions(db); #endif -#ifndef SQLITE_OMIT_PARSER +#ifndef STQLITE_OMIT_PARSER sqlite3AttachFunctions(db); #endif for(i=0; i<sizeof(aAggs)/sizeof(aAggs[0]); i++){ void *pArg = (void*)(int)aAggs[i].argType; - sqlite3CreateFunc(db, aAggs[i].zName, aAggs[i].nArg, SQLITE_UTF8, + sqlite3CreateFunc(db, aAggs[i].zName, aAggs[i].nArg, STQLITE_UTF8, pArg, 0, aAggs[i].xStep, aAggs[i].xFinalize); if( aAggs[i].needCollSeq ){ FuncDef *pFunc = sqlite3FindFunction( db, aAggs[i].zName, - strlen(aAggs[i].zName), aAggs[i].nArg, SQLITE_UTF8, 0); + strlen(aAggs[i].zName), aAggs[i].nArg, STQLITE_UTF8, 0); if( pFunc && aAggs[i].needCollSeq ){ pFunc->needCollSeq = 1; } @@ -49292,15 +49292,15 @@ SQLITE_PRIVATE void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ sqlite3RegisterDateTimeFunctions(db); if( !sqlite3MallocFailed() ){ int rc = sqlite3_overload_function(db, "MATCH", 2); - assert( rc==SQLITE_NOMEM || rc==SQLITE_OK ); - if( rc==SQLITE_NOMEM ){ + assert( rc==STQLITE_NOMEM || rc==STQLITE_OK ); + if( rc==STQLITE_NOMEM ){ sqlite3FailedMalloc(); } } -#ifdef SQLITE_SSE +#ifdef STQLITE_SSE (void)sqlite3SseFunctions(db); #endif -#ifdef SQLITE_CASE_SENSITIVE_LIKE +#ifdef STQLITE_CASE_SENSITIVE_LIKE sqlite3RegisterLikeFunctions(db, 1); #else sqlite3RegisterLikeFunctions(db, 0); @@ -49312,7 +49312,7 @@ SQLITE_PRIVATE void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ */ static void setLikeOptFlag(sqlite3 *db, const char *zName, int flagVal){ FuncDef *pDef; - pDef = sqlite3FindFunction(db, zName, strlen(zName), 2, SQLITE_UTF8, 0); + pDef = sqlite3FindFunction(db, zName, strlen(zName), 2, STQLITE_UTF8, 0); if( pDef ){ pDef->flags = flagVal; } @@ -49323,20 +49323,20 @@ static void setLikeOptFlag(sqlite3 *db, const char *zName, int flagVal){ ** parameter determines whether or not the LIKE operator is case ** sensitive. GLOB is always case sensitive. */ -SQLITE_PRIVATE void sqlite3RegisterLikeFunctions(sqlite3 *db, int caseSensitive){ +STQLITE_PRIVATE void sqlite3RegisterLikeFunctions(sqlite3 *db, int caseSensitive){ struct compareInfo *pInfo; if( caseSensitive ){ pInfo = (struct compareInfo*)&likeInfoAlt; }else{ pInfo = (struct compareInfo*)&likeInfoNorm; } - sqlite3CreateFunc(db, "like", 2, SQLITE_UTF8, pInfo, likeFunc, 0, 0); - sqlite3CreateFunc(db, "like", 3, SQLITE_UTF8, pInfo, likeFunc, 0, 0); - sqlite3CreateFunc(db, "glob", 2, SQLITE_UTF8, + sqlite3CreateFunc(db, "like", 2, STQLITE_UTF8, pInfo, likeFunc, 0, 0); + sqlite3CreateFunc(db, "like", 3, STQLITE_UTF8, pInfo, likeFunc, 0, 0); + sqlite3CreateFunc(db, "glob", 2, STQLITE_UTF8, (struct compareInfo*)&globInfo, likeFunc, 0,0); - setLikeOptFlag(db, "glob", SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE); + setLikeOptFlag(db, "glob", STQLITE_FUNC_LIKE | STQLITE_FUNC_CASE); setLikeOptFlag(db, "like", - caseSensitive ? (SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE) : SQLITE_FUNC_LIKE); + caseSensitive ? (STQLITE_FUNC_LIKE | STQLITE_FUNC_CASE) : STQLITE_FUNC_LIKE); } /* @@ -49346,7 +49346,7 @@ SQLITE_PRIVATE void sqlite3RegisterLikeFunctions(sqlite3 *db, int caseSensitive) ** return TRUE. If the function is not a LIKE-style function then ** return FALSE. */ -SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocase, char *aWc){ +STQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocase, char *aWc){ FuncDef *pDef; if( pExpr->op!=TK_FUNCTION || !pExpr->pList ){ return 0; @@ -49355,8 +49355,8 @@ SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocas return 0; } pDef = sqlite3FindFunction(db, (char*)pExpr->token.z, pExpr->token.n, 2, - SQLITE_UTF8, 0); - if( pDef==0 || (pDef->flags & SQLITE_FUNC_LIKE)==0 ){ + STQLITE_UTF8, 0); + if( pDef==0 || (pDef->flags & STQLITE_FUNC_LIKE)==0 ){ return 0; } @@ -49368,7 +49368,7 @@ SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocas assert( (char*)&likeInfoAlt == (char*)&likeInfoAlt.matchAll ); assert( &((char*)&likeInfoAlt)[1] == (char*)&likeInfoAlt.matchOne ); assert( &((char*)&likeInfoAlt)[2] == (char*)&likeInfoAlt.matchSet ); - *pIsNocase = (pDef->flags & SQLITE_FUNC_CASE)==0; + *pIsNocase = (pDef->flags & STQLITE_FUNC_CASE)==0; return 1; } @@ -49386,7 +49386,7 @@ SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocas ** ************************************************************************* ** This file contains C code routines that are called by the parser -** to handle INSERT statements in SQLite. +** to handle INSERT statements in STQLite. ** ** $Id: insert.c,v 1.187 2007/06/26 10:38:55 danielk1977 Exp $ */ @@ -49404,7 +49404,7 @@ SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocas ** 'd' INTEGER ** 'e' REAL */ -SQLITE_PRIVATE void sqlite3IndexAffinityStr(Vdbe *v, Index *pIdx){ +STQLITE_PRIVATE void sqlite3IndexAffinityStr(Vdbe *v, Index *pIdx){ if( !pIdx->zColAff ){ /* The first time a column affinity string for a particular index is ** required, it is allocated and populated here. It is then stored as @@ -49443,7 +49443,7 @@ SQLITE_PRIVATE void sqlite3IndexAffinityStr(Vdbe *v, Index *pIdx){ ** 'd' INTEGER ** 'e' REAL */ -SQLITE_PRIVATE void sqlite3TableAffinityStr(Vdbe *v, Table *pTab){ +STQLITE_PRIVATE void sqlite3TableAffinityStr(Vdbe *v, Table *pTab){ /* The first time a column affinity string for a particular table ** is required, it is allocated and populated here. It is then ** stored as a member of the Table structure for subsequent use. @@ -49493,7 +49493,7 @@ static int selectReadsTable(Select *p, Schema *pSchema, int iTab){ return 0; } -#ifndef SQLITE_OMIT_AUTOINCREMENT +#ifndef STQLITE_OMIT_AUTOINCREMENT /* ** Write out code to initialize the autoincrement logic. This code ** looks up the current autoincrement value in the sqlite_sequence @@ -49502,7 +49502,7 @@ static int selectReadsTable(Select *p, Schema *pSchema, int iTab){ ** rowid value. Code generated by autoIncEnd() will write the new ** largest value of the counter back into the sqlite_sequence table. ** -** This routine returns the index of the mem[] cell that contains +** This routine returns the index of the mem[] cell that tqcontains ** the maximum rowid counter. ** ** Two memory cells are allocated. The next memory cell after the @@ -49586,13 +49586,13 @@ static void autoIncEnd( } #else /* -** If SQLITE_OMIT_AUTOINCREMENT is defined, then the three routines +** If STQLITE_OMIT_AUTOINCREMENT is defined, then the three routines ** above are all no-ops */ # define autoIncBegin(A,B,C) (0) # define autoIncStep(A,B) # define autoIncEnd(A,B,C,D) -#endif /* SQLITE_OMIT_AUTOINCREMENT */ +#endif /* STQLITE_OMIT_AUTOINCREMENT */ /* Forward declaration */ @@ -49692,7 +49692,7 @@ static int xferOptimization( ** end the loop ** cleanup */ -SQLITE_PRIVATE void sqlite3Insert( +STQLITE_PRIVATE void sqlite3Insert( Parse *pParse, /* Parser context */ SrcList *pTabList, /* Name of table into which we are inserting */ ExprList *pList, /* List of values to be inserted */ @@ -49726,7 +49726,7 @@ SQLITE_PRIVATE void sqlite3Insert( int nHidden = 0; -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER int isView; /* True if attempting to insert into a view */ int triggers_exist = 0; /* True if there are FOR EACH ROW triggers */ #endif @@ -49749,21 +49749,21 @@ SQLITE_PRIVATE void sqlite3Insert( assert( iDb<db->nDb ); pDb = &db->aDb[iDb]; zDb = pDb->zName; - if( sqlite3AuthCheck(pParse, SQLITE_INSERT, pTab->zName, 0, zDb) ){ + if( sqlite3AuthCheck(pParse, STQLITE_INSERT, pTab->zName, 0, zDb) ){ goto insert_cleanup; } /* Figure out if we have any triggers and if the table being ** inserted into is a view */ -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER triggers_exist = sqlite3TriggersExist(pParse, pTab, TK_INSERT, 0); isView = pTab->pSelect!=0; #else # define triggers_exist 0 # define isView 0 #endif -#ifdef SQLITE_OMIT_VIEW +#ifdef STQLITE_OMIT_VIEW # undef isView # define isView 0 #endif @@ -49797,7 +49797,7 @@ SQLITE_PRIVATE void sqlite3Insert( newIdx = pParse->nTab++; } -#ifndef SQLITE_OMIT_XFER_OPT +#ifndef STQLITE_OMIT_XFER_OPT /* If the statement is of the form ** ** INSERT INTO <table1> SELECT * FROM <table2>; @@ -49810,7 +49810,7 @@ SQLITE_PRIVATE void sqlite3Insert( assert( pList==0 ); goto insert_cleanup; } -#endif /* SQLITE_OMIT_XFER_OPT */ +#endif /* STQLITE_OMIT_XFER_OPT */ /* If this is an AUTOINCREMENT table, look up the sequence number in the ** sqlite_sequence table and store it in memory cell counterMem. Also @@ -49973,7 +49973,7 @@ SQLITE_PRIVATE void sqlite3Insert( /* Initialize the count of rows to be inserted */ - if( db->flags & SQLITE_CountRows ){ + if( db->flags & STQLITE_CountRows ){ iCntMem = pParse->nMem++; sqlite3VdbeAddOp(v, OP_MemInt, 0, iCntMem); } @@ -50156,7 +50156,7 @@ SQLITE_PRIVATE void sqlite3Insert( /* Generate code to check constraints and generate index keys and ** do the insertion. */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( IsVirtual(pTab) ){ pParse->pVirtualLock = pTab; sqlite3VdbeOp3(v, OP_VUpdate, 1, pTab->nCol+2, @@ -50174,7 +50174,7 @@ SQLITE_PRIVATE void sqlite3Insert( /* Update the count of rows that are inserted */ - if( (db->flags & SQLITE_CountRows)!=0 ){ + if( (db->flags & STQLITE_CountRows)!=0 ){ sqlite3VdbeAddOp(v, OP_MemIncr, 1, iCntMem); } @@ -50226,7 +50226,7 @@ SQLITE_PRIVATE void sqlite3Insert( ** generating code because of a call to sqlite3NestedParse(), do not ** invoke the callback function. */ - if( db->flags & SQLITE_CountRows && pParse->nested==0 && !pParse->trigStack ){ + if( db->flags & STQLITE_CountRows && pParse->nested==0 && !pParse->trigStack ){ sqlite3VdbeAddOp(v, OP_MemLoad, iCntMem, 0); sqlite3VdbeAddOp(v, OP_Callback, 1, 0); sqlite3VdbeSetNumCols(v, 1); @@ -50243,7 +50243,7 @@ insert_cleanup: /* ** Generate code to do a constraint check prior to an INSERT or an UPDATE. ** -** When this routine is called, the stack contains (from bottom to top) +** When this routine is called, the stack tqcontains (from bottom to top) ** the following values: ** ** 1. The rowid of the row to be updated before the update. This @@ -50269,7 +50269,7 @@ insert_cleanup: ** aIdxUsed!=0 and aIdxUsed[i]!=0. ** ** This routine also generates code to check constraints. NOT NULL, -** CHECK, and UNIQUE constraints are all checked. If a constraint fails, +** CHECK, and UNITQUE constraints are all checked. If a constraint fails, ** then the appropriate action is performed. There are five possible ** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE. ** @@ -50277,15 +50277,15 @@ insert_cleanup: ** --------------- ---------- ---------------------------------------- ** any ROLLBACK The current transaction is rolled back and ** sqlite3_exec() returns immediately with a -** return code of SQLITE_CONSTRAINT. +** return code of STQLITE_CONSTRAINT. ** ** any ABORT Back out changes from the current command ** only (do not do a complete rollback) then ** cause sqlite3_exec() to return immediately -** with SQLITE_CONSTRAINT. +** with STQLITE_CONSTRAINT. ** ** any FAIL Sqlite_exec() returns immediately with a -** return code of SQLITE_CONSTRAINT. The +** return code of STQLITE_CONSTRAINT. The ** transaction is not rolled back and any ** prior changes are retained. ** @@ -50297,7 +50297,7 @@ insert_cleanup: ** value for that column. If the default value ** is NULL, the action is the same as ABORT. ** -** UNIQUE REPLACE The other row that conflicts with the row +** UNITQUE REPLACE The other row that conflicts with the row ** being inserted is removed. ** ** CHECK REPLACE Illegal. The results in an exception. @@ -50319,7 +50319,7 @@ insert_cleanup: ** is still pointing at the same entry after the routine returns. ** Without the isUpdate flag, the "base" cursor might be moved. */ -SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( +STQLITE_PRIVATE void sqlite3GenerateConstraintChecks( Parse *pParse, /* The parser context */ Table *pTab, /* the table into which we are inserting */ int base, /* Index of a read/write cursor pointing at pTab */ @@ -50371,7 +50371,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( case OE_Abort: case OE_Fail: { char *zMsg = 0; - sqlite3VdbeAddOp(v, OP_Halt, SQLITE_CONSTRAINT, onError); + sqlite3VdbeAddOp(v, OP_Halt, STQLITE_CONSTRAINT, onError); sqlite3SetString(&zMsg, pTab->zName, ".", pTab->aCol[i].zName, " may not be NULL", (char*)0); sqlite3VdbeChangeP3(v, -1, zMsg, P3_DYNAMIC); @@ -50393,8 +50393,8 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( /* Test all CHECK constraints */ -#ifndef SQLITE_OMIT_CHECK - if( pTab->pCheck && (pParse->db->flags & SQLITE_IgnoreChecks)==0 ){ +#ifndef STQLITE_OMIT_CHECK + if( pTab->pCheck && (pParse->db->flags & STQLITE_IgnoreChecks)==0 ){ int allOk = sqlite3VdbeMakeLabel(v); assert( pParse->ckOffset==0 ); pParse->ckOffset = nCol; @@ -50406,11 +50406,11 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( sqlite3VdbeAddOp(v, OP_Pop, nCol+1+hasTwoRowids, 0); sqlite3VdbeAddOp(v, OP_Goto, 0, ignoreDest); }else{ - sqlite3VdbeAddOp(v, OP_Halt, SQLITE_CONSTRAINT, onError); + sqlite3VdbeAddOp(v, OP_Halt, STQLITE_CONSTRAINT, onError); } sqlite3VdbeResolveLabel(v, allOk); } -#endif /* !defined(SQLITE_OMIT_CHECK) */ +#endif /* !defined(STQLITE_OMIT_CHECK) */ /* If we have an INTEGER PRIMARY KEY, make sure the primary key ** of the new record does not previously exist. Except, if this @@ -50439,7 +50439,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( case OE_Rollback: case OE_Abort: case OE_Fail: { - sqlite3VdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, onError, + sqlite3VdbeOp3(v, OP_Halt, STQLITE_CONSTRAINT, onError, "PRIMARY KEY must be unique", P3_STATIC); break; } @@ -50467,7 +50467,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( } } - /* Test all UNIQUE constraints by creating entries for each UNIQUE + /* Test all UNITQUE constraints by creating entries for each UNITQUE ** index and making sure that duplicate entries do not already exist. ** Add the new records to the indices as we go. */ @@ -50491,7 +50491,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( /* Find out what action to take in case there is an indexing conflict */ onError = pIdx->onError; - if( onError==OE_None ) continue; /* pIdx is not a UNIQUE index */ + if( onError==OE_None ) continue; /* pIdx is not a UNITQUE index */ if( overrideError!=OE_Default ){ onError = overrideError; }else if( onError==OE_Default ){ @@ -50537,7 +50537,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( } sqlite3_snprintf(sizeof(zErrMsg)-n1, &zErrMsg[n1], pIdx->nColumn>1 ? " are not unique" : " is not unique"); - sqlite3VdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, onError, zErrMsg, 0); + sqlite3VdbeOp3(v, OP_Halt, STQLITE_CONSTRAINT, onError, zErrMsg, 0); break; } case OE_Ignore: { @@ -50556,7 +50556,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( break; } } -#if NULL_DISTINCT_FOR_UNIQUE +#if NULL_DISTINCT_FOR_UNITQUE sqlite3VdbeJumpHere(v, jumpInst1); #endif sqlite3VdbeJumpHere(v, jumpInst2); @@ -50573,7 +50573,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( ** The arguments to this routine should be the same as the first six ** arguments to sqlite3GenerateConstraintChecks. */ -SQLITE_PRIVATE void sqlite3CompleteInsertion( +STQLITE_PRIVATE void sqlite3CompleteInsertion( Parse *pParse, /* The parser context */ Table *pTab, /* the table into which we are inserting */ int base, /* Index of a read/write cursor pointing at pTab */ @@ -50599,7 +50599,7 @@ SQLITE_PRIVATE void sqlite3CompleteInsertion( } sqlite3VdbeAddOp(v, OP_MakeRecord, pTab->nCol, 0); sqlite3TableAffinityStr(v, pTab); -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER if( newIdx>=0 ){ sqlite3VdbeAddOp(v, OP_Dup, 1, 0); sqlite3VdbeAddOp(v, OP_Dup, 1, 0); @@ -50630,7 +50630,7 @@ SQLITE_PRIVATE void sqlite3CompleteInsertion( ** indices of that table. The "base" parameter is the cursor number used ** for the table. Indices are opened on subsequent cursors. */ -SQLITE_PRIVATE void sqlite3OpenTableAndIndices( +STQLITE_PRIVATE void sqlite3OpenTableAndIndices( Parse *pParse, /* Parsing context */ Table *pTab, /* Table to be opened */ int base, /* Cursor number assigned to the table */ @@ -50659,7 +50659,7 @@ SQLITE_PRIVATE void sqlite3OpenTableAndIndices( } -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST /* ** The following global variable is incremented whenever the ** transfer optimization is used. This is used for testing @@ -50667,10 +50667,10 @@ SQLITE_PRIVATE void sqlite3OpenTableAndIndices( ** is happening when it is suppose to. */ int sqlite3_xferopt_count; -#endif /* SQLITE_TEST */ +#endif /* STQLITE_TEST */ -#ifndef SQLITE_OMIT_XFER_OPT +#ifndef STQLITE_OMIT_XFER_OPT /* ** Check to collation names to see if they are compatible. */ @@ -50772,7 +50772,7 @@ static int xferOptimization( Vdbe *v; /* The VDBE we are building */ KeyInfo *pKey; /* Key information for an index */ int counterMem; /* Memory register used by AUTOINC */ - int destHasUniqueIdx = 0; /* True if pDest has a UNIQUE index */ + int destHasUniqueIdx = 0; /* True if pDest has a UNITQUE index */ if( pSelect==0 ){ return 0; /* Must be of the form INSERT INTO ... SELECT ... */ @@ -50780,7 +50780,7 @@ static int xferOptimization( if( pDest->pTrigger ){ return 0; /* tab1 must not have triggers */ } -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( pDest->isVirtual ){ return 0; /* tab1 must not be a virtual table */ } @@ -50843,7 +50843,7 @@ static int xferOptimization( if( pSrc==pDest ){ return 0; /* tab1 and tab2 may not be the same table */ } -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( pSrc->isVirtual ){ return 0; /* tab2 must not be a virtual table */ } @@ -50879,7 +50879,7 @@ static int xferOptimization( return 0; /* pDestIdx has no corresponding index in pSrc */ } } -#ifndef SQLITE_OMIT_CHECK +#ifndef STQLITE_OMIT_CHECK if( pDest->pCheck && !sqlite3ExprCompare(pSrc->pCheck, pDest->pCheck) ){ return 0; /* Tables have different CHECK constraints. Ticket #2252 */ } @@ -50893,7 +50893,7 @@ static int xferOptimization( ** * We can conditionally do the transfer if the destination ** table is empty. */ -#ifdef SQLITE_TEST +#ifdef STQLITE_TEST sqlite3_xferopt_count++; #endif iDbSrc = sqlite3SchemaToIndex(pParse->db, pSrc->pSchema); @@ -50908,7 +50908,7 @@ static int xferOptimization( ** we have to disallow the transfer optimization because the ** the rowids might change which will mess up indexing. ** - ** Or if the destination has a UNIQUE index and is not empty, + ** Or if the destination has a UNITQUE index and is not empty, ** we also disallow the transfer optimization because we cannot ** insure that all entries in the union of DEST and SRC will be ** unique. @@ -50925,7 +50925,7 @@ static int xferOptimization( addr1 = sqlite3VdbeAddOp(v, OP_Rowid, iSrc, 0); sqlite3VdbeAddOp(v, OP_Dup, 0, 0); addr2 = sqlite3VdbeAddOp(v, OP_NotExists, iDest, 0); - sqlite3VdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, onError, + sqlite3VdbeOp3(v, OP_Halt, STQLITE_CONSTRAINT, onError, "PRIMARY KEY must be unique", P3_STATIC); sqlite3VdbeJumpHere(v, addr2); autoIncStep(pParse, counterMem); @@ -50968,7 +50968,7 @@ static int xferOptimization( sqlite3VdbeAddOp(v, OP_Close, iSrc, 0); sqlite3VdbeAddOp(v, OP_Close, iDest, 0); if( emptyDestTest ){ - sqlite3VdbeAddOp(v, OP_Halt, SQLITE_OK, 0); + sqlite3VdbeAddOp(v, OP_Halt, STQLITE_OK, 0); sqlite3VdbeJumpHere(v, emptyDestTest); sqlite3VdbeAddOp(v, OP_Close, iDest, 0); return 0; @@ -50976,7 +50976,7 @@ static int xferOptimization( return 1; } } -#endif /* SQLITE_OMIT_XFER_OPT */ +#endif /* STQLITE_OMIT_XFER_OPT */ /************** End of insert.c **********************************************/ /************** Begin file legacy.c ******************************************/ @@ -50991,9 +50991,9 @@ static int xferOptimization( ** May you share freely, never taking more than you give. ** ************************************************************************* -** Main file for the SQLite library. The routines in this file +** Main file for the STQLite library. The routines in this file ** implement the programmer interface to the library. Routines in -** other files are for internal use by SQLite and should not be +** other files are for internal use by STQLite and should not be ** accessed by users of the library. ** ** $Id: legacy.c,v 1.18 2007/05/04 13:15:56 drh Exp $ @@ -51001,7 +51001,7 @@ static int xferOptimization( /* -** Execute SQL code. Return one of the SQLITE_ success/failure +** Execute SQL code. Return one of the STQLITE_ success/failure ** codes. Also write an error message into memory obtained from ** malloc() and make *pzErrMsg point to that message. ** @@ -51010,14 +51010,14 @@ static int xferOptimization( ** argument to xCallback(). If xCallback=NULL then no callback ** is invoked, even for queries. */ -SQLITE_API int sqlite3_exec( +STQLITE_API int sqlite3_exec( sqlite3 *db, /* The database on which the SQL executes */ const char *zSql, /* The SQL to be executed */ sqlite3_callback xCallback, /* Invoke this callback routine */ void *pArg, /* First argument to xCallback() */ char **pzErrMsg /* Write error messages here */ ){ - int rc = SQLITE_OK; + int rc = STQLITE_OK; const char *zLeftover; sqlite3_stmt *pStmt = 0; char **azCols = 0; @@ -51025,15 +51025,15 @@ SQLITE_API int sqlite3_exec( int nRetry = 0; int nCallback; - if( zSql==0 ) return SQLITE_OK; - while( (rc==SQLITE_OK || (rc==SQLITE_SCHEMA && (++nRetry)<2)) && zSql[0] ){ + if( zSql==0 ) return STQLITE_OK; + while( (rc==STQLITE_OK || (rc==STQLITE_SCHEMA && (++nRetry)<2)) && zSql[0] ){ int nCol; char **azVals = 0; pStmt = 0; rc = sqlite3_prepare(db, zSql, -1, &pStmt, &zLeftover); - assert( rc==SQLITE_OK || pStmt==0 ); - if( rc!=SQLITE_OK ){ + assert( rc==STQLITE_OK || pStmt==0 ); + if( rc!=STQLITE_OK ){ continue; } if( !pStmt ){ @@ -51055,30 +51055,30 @@ SQLITE_API int sqlite3_exec( rc = sqlite3_step(pStmt); /* Invoke the callback function if required */ - if( xCallback && (SQLITE_ROW==rc || - (SQLITE_DONE==rc && !nCallback && db->flags&SQLITE_NullCallback)) ){ + if( xCallback && (STQLITE_ROW==rc || + (STQLITE_DONE==rc && !nCallback && db->flags&STQLITE_NullCallback)) ){ if( 0==nCallback ){ for(i=0; i<nCol; i++){ azCols[i] = (char *)sqlite3_column_name(pStmt, i); } nCallback++; } - if( rc==SQLITE_ROW ){ + if( rc==STQLITE_ROW ){ azVals = &azCols[nCol]; for(i=0; i<nCol; i++){ azVals[i] = (char *)sqlite3_column_text(pStmt, i); } } if( xCallback(pArg, nCol, azVals, azCols) ){ - rc = SQLITE_ABORT; + rc = STQLITE_ABORT; goto exec_out; } } - if( rc!=SQLITE_ROW ){ + if( rc!=STQLITE_ROW ){ rc = sqlite3_finalize(pStmt); pStmt = 0; - if( rc!=SQLITE_SCHEMA ){ + if( rc!=STQLITE_SCHEMA ){ nRetry = 0; zSql = zLeftover; while( isspace((unsigned char)zSql[0]) ) zSql++; @@ -51096,7 +51096,7 @@ exec_out: if( azCols ) sqliteFree(azCols); rc = sqlite3ApiExit(0, rc); - if( rc!=SQLITE_OK && rc==sqlite3_errcode(db) && pzErrMsg ){ + if( rc!=STQLITE_OK && rc==sqlite3_errcode(db) && pzErrMsg ){ int nErrMsg = 1 + strlen(sqlite3_errmsg(db)); *pzErrMsg = sqlite3_malloc(nErrMsg); if( *pzErrMsg ){ @@ -51124,11 +51124,11 @@ exec_out: ** ************************************************************************* ** This file contains code used to dynamically load extensions into -** the SQLite library. +** the STQLite library. */ -#ifndef SQLITE_OMIT_LOAD_EXTENSION +#ifndef STQLITE_OMIT_LOAD_EXTENSION -#define SQLITE_CORE 1 /* Disable the API redefinition in sqlite3ext.h */ +#define STQLITE_CORE 1 /* Disable the API redefinition in sqlite3ext.h */ /************** Include sqlite3ext.h in the middle of loadext.c **************/ /************** Begin file sqlite3ext.h **************************************/ /* @@ -51142,27 +51142,27 @@ exec_out: ** May you share freely, never taking more than you give. ** ************************************************************************* -** This header file defines the SQLite interface for use by +** This header file defines the STQLite interface for use by ** shared libraries that want to be imported as extensions into -** an SQLite instance. Shared libraries that intend to be loaded -** as extensions by SQLite should #include this file instead of +** an STQLite instance. Shared libraries that intend to be loaded +** as extensions by STQLite should #include this file instead of ** sqlite3.h. ** ** @(#) $Id: sqlite3ext.h,v 1.12 2007/07/20 10:48:36 drh Exp $ */ -#ifndef _SQLITE3EXT_H_ -#define _SQLITE3EXT_H_ +#ifndef _STQLITE3EXT_H_ +#define _STQLITE3EXT_H_ typedef struct sqlite3_api_routines sqlite3_api_routines; /* -** The following structure hold pointers to all of the SQLite API +** The following structure hold pointers to all of the STQLite API ** routines. ** ** WARNING: In order to maintain backwards compatibility, add new ** interfaces to the end of this structure only. If you insert new ** interfaces in the middle of this structure, then older different -** versions of SQLite will not be able to load each others shared +** versions of STQLite will not be able to load each others shared ** libraries! */ struct sqlite3_api_routines { @@ -51293,13 +51293,13 @@ struct sqlite3_api_routines { ** redirected throught the global sqlite3_api structure. ** ** This header file is also used by the loadext.c source file -** (part of the main SQLite library - not an extension) so that +** (part of the main STQLite library - not an extension) so that ** it can get access to the sqlite3_api_routines structure ** definition. But the main library does not want to redefine ** the API. So the redefinition macros are only valid if the -** SQLITE_CORE macros is undefined. +** STQLITE_CORE macros is undefined. */ -#ifndef SQLITE_CORE +#ifndef STQLITE_CORE #define sqlite3_aggregate_context sqlite3_api->aggregate_context #define sqlite3_aggregate_count sqlite3_api->aggregate_count #define sqlite3_bind_blob sqlite3_api->bind_blob @@ -51422,22 +51422,22 @@ struct sqlite3_api_routines { #define sqlite3_prepare_v2 sqlite3_api->prepare_v2 #define sqlite3_prepare16_v2 sqlite3_api->prepare16_v2 #define sqlite3_clear_bindings sqlite3_api->clear_bindings -#endif /* SQLITE_CORE */ +#endif /* STQLITE_CORE */ -#define SQLITE_EXTENSION_INIT1 const sqlite3_api_routines *sqlite3_api; -#define SQLITE_EXTENSION_INIT2(v) sqlite3_api = v; +#define STQLITE_EXTENSION_INIT1 const sqlite3_api_routines *sqlite3_api; +#define STQLITE_EXTENSION_INIT2(v) sqlite3_api = v; -#endif /* _SQLITE3EXT_H_ */ +#endif /* _STQLITE3EXT_H_ */ /************** End of sqlite3ext.h ******************************************/ /************** Continuing where we left off in loadext.c ********************/ /* ** Some API routines are omitted when various features are -** excluded from a build of SQLite. Substitute a NULL pointer +** excluded from a build of STQLite. Substitute a NULL pointer ** for any missing APIs. */ -#ifndef SQLITE_ENABLE_COLUMN_METADATA +#ifndef STQLITE_ENABLE_COLUMN_METADATA # define sqlite3_column_database_name 0 # define sqlite3_column_database_name16 0 # define sqlite3_column_table_name 0 @@ -51447,11 +51447,11 @@ struct sqlite3_api_routines { # define sqlite3_table_column_metadata 0 #endif -#ifdef SQLITE_OMIT_AUTHORIZATION +#ifdef STQLITE_OMIT_AUTHORIZATION # define sqlite3_set_authorizer 0 #endif -#ifdef SQLITE_OMIT_UTF16 +#ifdef STQLITE_OMIT_UTF16 # define sqlite3_bind_text16 0 # define sqlite3_collation_needed16 0 # define sqlite3_column_decltype16 0 @@ -51476,39 +51476,39 @@ struct sqlite3_api_routines { # define sqlite3_column_origin_name16 0 #endif -#ifdef SQLITE_OMIT_COMPLETE +#ifdef STQLITE_OMIT_COMPLETE # define sqlite3_complete 0 # define sqlite3_complete16 0 #endif -#ifdef SQLITE_OMIT_PROGRESS_CALLBACK +#ifdef STQLITE_OMIT_PROGRESS_CALLBACK # define sqlite3_progress_handler 0 #endif -#ifdef SQLITE_OMIT_VIRTUALTABLE +#ifdef STQLITE_OMIT_VIRTUALTABLE # define sqlite3_create_module 0 # define sqlite3_create_module_v2 0 # define sqlite3_declare_vtab 0 #endif -#ifdef SQLITE_OMIT_SHARED_CACHE +#ifdef STQLITE_OMIT_SHARED_CACHE # define sqlite3_enable_shared_cache 0 #endif -#ifdef SQLITE_OMIT_TRACE +#ifdef STQLITE_OMIT_TRACE # define sqlite3_profile 0 # define sqlite3_trace 0 #endif -#ifdef SQLITE_OMIT_GET_TABLE +#ifdef STQLITE_OMIT_GET_TABLE # define sqlite3_free_table 0 # define sqlite3_get_table 0 #endif /* -** The following structure contains pointers to all SQLite API routines. +** The following structure contains pointers to all STQLite API routines. ** A pointer to this structure is passed into extensions when they are -** loaded so that the extension can make calls back into the SQLite +** loaded so that the extension can make calls back into the STQLite ** library. ** ** When adding new APIs, add them to the bottom of this structure @@ -51661,12 +51661,12 @@ const sqlite3_api_routines sqlite3_apis = { }; /* -** Attempt to load an SQLite extension library contained in the file +** Attempt to load an STQLite extension library contained in the file ** zFile. The entry point is zProc. zProc may be 0 in which case a ** default entry point name (sqlite3_extension_init) is used. Use ** of the default name is recommended. ** -** Return SQLITE_OK on success and SQLITE_ERROR if something goes wrong. +** Return STQLITE_OK on success and STQLITE_ERROR if something goes wrong. ** ** If an error occurs and pzErrMsg is not 0, then fill *pzErrMsg with ** error message text. The calling function should free this memory @@ -51684,16 +51684,16 @@ int sqlite3_load_extension( void **aHandle; /* Ticket #1863. To avoid a creating security problems for older - ** applications that relink against newer versions of SQLite, the + ** applications that relink against newer versions of STQLite, the ** ability to run load_extension is turned off by default. One ** must call sqlite3_enable_load_extension() to turn on extension ** loading. Otherwise you get the following error. */ - if( (db->flags & SQLITE_LoadExtension)==0 ){ + if( (db->flags & STQLITE_LoadExtension)==0 ){ if( pzErrMsg ){ *pzErrMsg = sqlite3_mprintf("not authorized"); } - return SQLITE_ERROR; + return STQLITE_ERROR; } if( zProc==0 ){ @@ -51705,7 +51705,7 @@ int sqlite3_load_extension( if( pzErrMsg ){ *pzErrMsg = sqlite3_mprintf("unable to open shared library [%s]", zFile); } - return SQLITE_ERROR; + return STQLITE_ERROR; } xInit = (int(*)(sqlite3*,char**,const sqlite3_api_routines*)) sqlite3OsDlsym(handle, zProc); @@ -51715,21 +51715,21 @@ int sqlite3_load_extension( zProc, zFile); } sqlite3OsDlclose(handle); - return SQLITE_ERROR; + return STQLITE_ERROR; }else if( xInit(db, &zErrmsg, &sqlite3_apis) ){ if( pzErrMsg ){ *pzErrMsg = sqlite3_mprintf("error during initialization: %s", zErrmsg); } sqlite3_free(zErrmsg); sqlite3OsDlclose(handle); - return SQLITE_ERROR; + return STQLITE_ERROR; } /* Append the new shared library handle to the db->aExtension array. */ db->nExtension++; aHandle = sqliteMalloc(sizeof(handle)*db->nExtension); if( aHandle==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } if( db->nExtension>0 ){ memcpy(aHandle, db->aExtension, sizeof(handle)*(db->nExtension-1)); @@ -51738,14 +51738,14 @@ int sqlite3_load_extension( db->aExtension = aHandle; db->aExtension[db->nExtension-1] = handle; - return SQLITE_OK; + return STQLITE_OK; } /* ** Call this routine when the database connection is closing in order ** to clean up loaded extensions */ -SQLITE_PRIVATE void sqlite3CloseExtensions(sqlite3 *db){ +STQLITE_PRIVATE void sqlite3CloseExtensions(sqlite3 *db){ int i; for(i=0; i<db->nExtension; i++){ sqlite3OsDlclose(db->aExtension[i]); @@ -51759,11 +51759,11 @@ SQLITE_PRIVATE void sqlite3CloseExtensions(sqlite3 *db){ */ int sqlite3_enable_load_extension(sqlite3 *db, int onoff){ if( onoff ){ - db->flags |= SQLITE_LoadExtension; + db->flags |= STQLITE_LoadExtension; }else{ - db->flags &= ~SQLITE_LoadExtension; + db->flags &= ~STQLITE_LoadExtension; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -51782,7 +51782,7 @@ static void **aAutoExtension = 0; */ int sqlite3_auto_extension(void *xInit){ int i; - int rc = SQLITE_OK; + int rc = STQLITE_OK; sqlite3OsEnterMutex(); for(i=0; i<nAutoExtension; i++){ if( aAutoExtension[i]==xInit ) break; @@ -51793,7 +51793,7 @@ int sqlite3_auto_extension(void *xInit){ nAutoExtension*sizeof(aAutoExtension[0]) ); if( aAutoExtension==0 ){ nAutoExtension = 0; - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; }else{ aAutoExtension[nAutoExtension-1] = xInit; } @@ -51817,15 +51817,15 @@ void sqlite3_reset_auto_extension(void){ /* ** Load all automatic extensions. */ -SQLITE_PRIVATE int sqlite3AutoLoadExtensions(sqlite3 *db){ +STQLITE_PRIVATE int sqlite3AutoLoadExtensions(sqlite3 *db){ int i; int go = 1; - int rc = SQLITE_OK; + int rc = STQLITE_OK; int (*xInit)(sqlite3*,char**,const sqlite3_api_routines*); if( nAutoExtension==0 ){ /* Common case: early out without every having to acquire a mutex */ - return SQLITE_OK; + return STQLITE_OK; } for(i=0; go; i++){ char *zErrmsg = 0; @@ -51839,16 +51839,16 @@ SQLITE_PRIVATE int sqlite3AutoLoadExtensions(sqlite3 *db){ } sqlite3OsLeaveMutex(); if( xInit && xInit(db, &zErrmsg, &sqlite3_apis) ){ - sqlite3Error(db, SQLITE_ERROR, + sqlite3Error(db, STQLITE_ERROR, "automatic extension loading failed: %s", zErrmsg); go = 0; - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } } return rc; } -#endif /* SQLITE_OMIT_LOAD_EXTENSION */ +#endif /* STQLITE_OMIT_LOAD_EXTENSION */ /************** End of loadext.c *********************************************/ /************** Begin file pragma.c ******************************************/ @@ -51870,9 +51870,9 @@ SQLITE_PRIVATE int sqlite3AutoLoadExtensions(sqlite3 *db){ /* Ignore this whole file if pragmas are disabled */ -#if !defined(SQLITE_OMIT_PRAGMA) && !defined(SQLITE_OMIT_PARSER) +#if !defined(STQLITE_OMIT_PRAGMA) && !defined(STQLITE_OMIT_PARSER) -#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST) +#if defined(STQLITE_DEBUG) || defined(STQLITE_TEST) #endif /* @@ -51919,10 +51919,10 @@ static int getLockingMode(const char *z){ if( 0==sqlite3StrICmp(z, "exclusive") ) return PAGER_LOCKINGMODE_EXCLUSIVE; if( 0==sqlite3StrICmp(z, "normal") ) return PAGER_LOCKINGMODE_NORMAL; } - return PAGER_LOCKINGMODE_QUERY; + return PAGER_LOCKINGMODE_TQUERY; } -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM /* ** Interpret the given string as an auto-vacuum mode value. ** @@ -51937,9 +51937,9 @@ static int getAutoVacuum(const char *z){ i = atoi(z); return ((i>=0&&i<=2)?i:0); } -#endif /* ifndef SQLITE_OMIT_AUTOVACUUM */ +#endif /* ifndef STQLITE_OMIT_AUTOVACUUM */ -#ifndef SQLITE_OMIT_PAGER_PRAGMAS +#ifndef STQLITE_OMIT_PAGER_PRAGMAS /* ** Interpret the given string as a temp db location. Return 1 for file ** backed temporary databases, 2 for the Red-Black tree in memory database @@ -51956,30 +51956,30 @@ static int getTempStore(const char *z){ return 0; } } -#endif /* SQLITE_PAGER_PRAGMAS */ +#endif /* STQLITE_PAGER_PRAGMAS */ -#ifndef SQLITE_OMIT_PAGER_PRAGMAS +#ifndef STQLITE_OMIT_PAGER_PRAGMAS /* ** Invalidate temp storage, either when the temp storage is changed ** from default, or when 'file' and the temp_store_directory has changed */ -static int invalidateTempStorage(Parse *pParse){ +static int tqinvalidateTempStorage(Parse *pParse){ sqlite3 *db = pParse->db; if( db->aDb[1].pBt!=0 ){ if( !db->autoCommit ){ sqlite3ErrorMsg(pParse, "temporary storage cannot be changed " "from within a transaction"); - return SQLITE_ERROR; + return STQLITE_ERROR; } sqlite3BtreeClose(db->aDb[1].pBt); db->aDb[1].pBt = 0; sqlite3ResetInternalSchema(db, 0); } - return SQLITE_OK; + return STQLITE_OK; } -#endif /* SQLITE_PAGER_PRAGMAS */ +#endif /* STQLITE_PAGER_PRAGMAS */ -#ifndef SQLITE_OMIT_PAGER_PRAGMAS +#ifndef STQLITE_OMIT_PAGER_PRAGMAS /* ** If the TEMP database is open, close it and mark the database schema ** as needing reloading. This must be done when using the TEMP_STORE @@ -51988,14 +51988,14 @@ static int invalidateTempStorage(Parse *pParse){ static int changeTempStorage(Parse *pParse, const char *zStorageType){ int ts = getTempStore(zStorageType); sqlite3 *db = pParse->db; - if( db->temp_store==ts ) return SQLITE_OK; - if( invalidateTempStorage( pParse ) != SQLITE_OK ){ - return SQLITE_ERROR; + if( db->temp_store==ts ) return STQLITE_OK; + if( tqinvalidateTempStorage( pParse ) != STQLITE_OK ){ + return STQLITE_ERROR; } db->temp_store = ts; - return SQLITE_OK; + return STQLITE_OK; } -#endif /* SQLITE_PAGER_PRAGMAS */ +#endif /* STQLITE_PAGER_PRAGMAS */ /* ** Generate code to return a single integer value. @@ -52010,7 +52010,7 @@ static void returnSingleInt(Parse *pParse, const char *zLabel, int value){ sqlite3VdbeAddOp(v, OP_Callback, 1, 0); } -#ifndef SQLITE_OMIT_FLAG_PRAGMAS +#ifndef STQLITE_OMIT_FLAG_PRAGMAS /* ** Check to see if zRight and zLeft refer to a pragma that queries ** or changes one of the flags in db->flags. Return 1 if so and 0 if not. @@ -52019,29 +52019,29 @@ static void returnSingleInt(Parse *pParse, const char *zLabel, int value){ static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){ static const struct sPragmaType { const char *zName; /* Name of the pragma */ - int mask; /* Mask for the db->flags value */ + int tqmask; /* Mask for the db->flags value */ } aPragma[] = { - { "full_column_names", SQLITE_FullColNames }, - { "short_column_names", SQLITE_ShortColNames }, - { "count_changes", SQLITE_CountRows }, - { "empty_result_callbacks", SQLITE_NullCallback }, - { "legacy_file_format", SQLITE_LegacyFileFmt }, - { "fullfsync", SQLITE_FullFSync }, -#ifdef SQLITE_DEBUG - { "sql_trace", SQLITE_SqlTrace }, - { "vdbe_listing", SQLITE_VdbeListing }, - { "vdbe_trace", SQLITE_VdbeTrace }, -#endif -#ifndef SQLITE_OMIT_CHECK - { "ignore_check_constraints", SQLITE_IgnoreChecks }, + { "full_column_names", STQLITE_FullColNames }, + { "short_column_names", STQLITE_ShortColNames }, + { "count_changes", STQLITE_CountRows }, + { "empty_result_callbacks", STQLITE_NullCallback }, + { "legacy_file_format", STQLITE_LegacyFileFmt }, + { "fullfsync", STQLITE_FullFSync }, +#ifdef STQLITE_DEBUG + { "sql_trace", STQLITE_SqlTrace }, + { "vdbe_listing", STQLITE_VdbeListing }, + { "vdbe_trace", STQLITE_VdbeTrace }, +#endif +#ifndef STQLITE_OMIT_CHECK + { "ignore_check_constraints", STQLITE_IgnoreChecks }, #endif /* The following is VERY experimental */ - { "writable_schema", SQLITE_WriteSchema|SQLITE_RecoveryMode }, - { "omit_readlock", SQLITE_NoReadlock }, + { "writable_schema", STQLITE_WriteSchema|STQLITE_RecoveryMode }, + { "omit_readlock", STQLITE_NoReadlock }, /* TODO: Maybe it shouldn't be possible to change the ReadUncommitted ** flag if there are any active statements. */ - { "read_uncommitted", SQLITE_ReadUncommitted }, + { "read_uncommitted", STQLITE_ReadUncommitted }, }; int i; const struct sPragmaType *p; @@ -52052,12 +52052,12 @@ static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){ v = sqlite3GetVdbe(pParse); if( v ){ if( zRight==0 ){ - returnSingleInt(pParse, p->zName, (db->flags & p->mask)!=0 ); + returnSingleInt(pParse, p->zName, (db->flags & p->tqmask)!=0 ); }else{ if( getBoolean(zRight) ){ - db->flags |= p->mask; + db->flags |= p->tqmask; }else{ - db->flags &= ~p->mask; + db->flags &= ~p->tqmask; } } } @@ -52066,7 +52066,7 @@ static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){ } return 0; } -#endif /* SQLITE_OMIT_FLAG_PRAGMAS */ +#endif /* STQLITE_OMIT_FLAG_PRAGMAS */ /* ** Process a pragma statement. @@ -52083,7 +52083,7 @@ static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){ ** and pId2 is the id. If the left side is just "id" then pId1 is the ** id and pId2 is any empty string. */ -SQLITE_PRIVATE void sqlite3Pragma( +STQLITE_PRIVATE void sqlite3Pragma( Parse *pParse, Token *pId1, /* First part of [database.]id field */ Token *pId2, /* Second part of [database.]id field, or NULL */ @@ -52122,11 +52122,11 @@ SQLITE_PRIVATE void sqlite3Pragma( } zDb = ((iDb>0)?pDb->zName:0); - if( sqlite3AuthCheck(pParse, SQLITE_PRAGMA, zLeft, zRight, zDb) ){ + if( sqlite3AuthCheck(pParse, STQLITE_PRAGMA, zLeft, zRight, zDb) ){ goto pragma_out; } -#ifndef SQLITE_OMIT_PAGER_PRAGMAS +#ifndef STQLITE_OMIT_PAGER_PRAGMAS /* ** PRAGMA [database.]default_cache_size ** PRAGMA [database.]default_cache_size=N @@ -52160,7 +52160,7 @@ SQLITE_PRIVATE void sqlite3Pragma( sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "cache_size", P3_STATIC); addr = sqlite3VdbeAddOpList(v, ArraySize(getCacheSize), getCacheSize); sqlite3VdbeChangeP1(v, addr, iDb); - sqlite3VdbeChangeP1(v, addr+5, SQLITE_DEFAULT_CACHE_SIZE); + sqlite3VdbeChangeP1(v, addr+5, STQLITE_DEFAULT_CACHE_SIZE); }else{ int size = atoi(zRight); if( size<0 ) size = -size; @@ -52224,7 +52224,7 @@ SQLITE_PRIVATE void sqlite3Pragma( const char *zRet = "normal"; int eMode = getLockingMode(zRight); - if( pId2->n==0 && eMode==PAGER_LOCKINGMODE_QUERY ){ + if( pId2->n==0 && eMode==PAGER_LOCKINGMODE_TQUERY ){ /* Simple "PRAGMA locking_mode;" statement. This is a query for ** the current default locking mode (which may be different to ** the locking-mode of the main database). @@ -52262,7 +52262,7 @@ SQLITE_PRIVATE void sqlite3Pragma( sqlite3VdbeOp3(v, OP_String8, 0, 0, zRet, 0); sqlite3VdbeAddOp(v, OP_Callback, 1, 0); }else -#endif /* SQLITE_OMIT_PAGER_PRAGMAS */ +#endif /* STQLITE_OMIT_PAGER_PRAGMAS */ /* ** PRAGMA [database.]auto_vacuum @@ -52270,7 +52270,7 @@ SQLITE_PRIVATE void sqlite3Pragma( ** ** Get or set the (boolean) value of the database 'auto-vacuum' parameter. */ -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( sqlite3StrICmp(zLeft,"auto_vacuum")==0 ){ Btree *pBt = pDb->pBt; if( sqlite3ReadSchema(pParse) ){ @@ -52278,7 +52278,7 @@ SQLITE_PRIVATE void sqlite3Pragma( } if( !zRight ){ int auto_vacuum = - pBt ? sqlite3BtreeGetAutoVacuum(pBt) : SQLITE_DEFAULT_AUTOVACUUM; + pBt ? sqlite3BtreeGetAutoVacuum(pBt) : STQLITE_DEFAULT_AUTOVACUUM; returnSingleInt(pParse, "auto_vacuum", auto_vacuum); }else{ int eAuto = getAutoVacuum(zRight); @@ -52289,7 +52289,7 @@ SQLITE_PRIVATE void sqlite3Pragma( ** as an auto-vacuum capable db. */ int rc = sqlite3BtreeSetAutoVacuum(pBt, eAuto); - if( rc==SQLITE_OK && (eAuto==1 || eAuto==2) ){ + if( rc==STQLITE_OK && (eAuto==1 || eAuto==2) ){ /* When setting the auto_vacuum mode to either "full" or ** "incremental", write the value of meta[6] in the database ** file. Before writing to meta[6], check that meta[3] indicates @@ -52299,7 +52299,7 @@ SQLITE_PRIVATE void sqlite3Pragma( { OP_Transaction, 0, 1, 0}, /* 0 */ { OP_ReadCookie, 0, 3, 0}, /* 1 */ { OP_If, 0, 0, 0}, /* 2 */ - { OP_Halt, SQLITE_OK, OE_Abort, 0}, /* 3 */ + { OP_Halt, STQLITE_OK, OE_Abort, 0}, /* 3 */ { OP_Integer, 0, 0, 0}, /* 4 */ { OP_SetCookie, 0, 6, 0}, /* 5 */ }; @@ -52321,7 +52321,7 @@ SQLITE_PRIVATE void sqlite3Pragma( ** ** Do N steps of incremental vacuuming on a database. */ -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM if( sqlite3StrICmp(zLeft,"incremental_vacuum")==0 ){ int iLimit, addr; if( sqlite3ReadSchema(pParse) ){ @@ -52340,7 +52340,7 @@ SQLITE_PRIVATE void sqlite3Pragma( }else #endif -#ifndef SQLITE_OMIT_PAGER_PRAGMAS +#ifndef STQLITE_OMIT_PAGER_PRAGMAS /* ** PRAGMA [database.]cache_size ** PRAGMA [database.]cache_size=N @@ -52393,7 +52393,7 @@ SQLITE_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 invalidateTempStorage. + ** If temporary directory is changed, then tqinvalidateTempStorage. ** */ if( sqlite3StrICmp(zLeft, "temp_store_directory")==0 ){ @@ -52414,7 +52414,7 @@ SQLITE_PRIVATE void sqlite3Pragma( || (TEMP_STORE==1 && db->temp_store<=1) || (TEMP_STORE==2 && db->temp_store==1) ){ - invalidateTempStorage(pParse); + tqinvalidateTempStorage(pParse); } sqliteFree(sqlite3_temp_directory); if( zRight[0] ){ @@ -52448,16 +52448,16 @@ SQLITE_PRIVATE void sqlite3Pragma( } } }else -#endif /* SQLITE_OMIT_PAGER_PRAGMAS */ +#endif /* STQLITE_OMIT_PAGER_PRAGMAS */ -#ifndef SQLITE_OMIT_FLAG_PRAGMAS +#ifndef STQLITE_OMIT_FLAG_PRAGMAS if( flagPragma(pParse, zLeft, zRight) ){ /* The flagPragma() subroutine also generates any necessary code ** there is nothing more to do here */ }else -#endif /* SQLITE_OMIT_FLAG_PRAGMAS */ +#endif /* STQLITE_OMIT_FLAG_PRAGMAS */ -#ifndef SQLITE_OMIT_SCHEMA_PRAGMAS +#ifndef STQLITE_OMIT_SCHEMA_PRAGMAS /* ** PRAGMA table_info(<table>) ** @@ -52588,9 +52588,9 @@ SQLITE_PRIVATE void sqlite3Pragma( sqlite3VdbeAddOp(v, OP_Callback, 2, 0); } }else -#endif /* SQLITE_OMIT_SCHEMA_PRAGMAS */ +#endif /* STQLITE_OMIT_SCHEMA_PRAGMAS */ -#ifndef SQLITE_OMIT_FOREIGN_KEY +#ifndef STQLITE_OMIT_FOREIGN_KEY if( sqlite3StrICmp(zLeft, "foreign_key_list")==0 && zRight ){ FKey *pFK; Table *pTab; @@ -52625,7 +52625,7 @@ SQLITE_PRIVATE void sqlite3Pragma( } } }else -#endif /* !defined(SQLITE_OMIT_FOREIGN_KEY) */ +#endif /* !defined(STQLITE_OMIT_FOREIGN_KEY) */ #ifndef NDEBUG if( sqlite3StrICmp(zLeft, "parser_trace")==0 ){ @@ -52648,11 +52648,11 @@ SQLITE_PRIVATE void sqlite3Pragma( } }else -#ifndef SQLITE_INTEGRITY_CHECK_ERROR_MAX -# define SQLITE_INTEGRITY_CHECK_ERROR_MAX 100 +#ifndef STQLITE_INTEGRITY_CHECK_ERROR_MAX +# define STQLITE_INTEGRITY_CHECK_ERROR_MAX 100 #endif -#ifndef SQLITE_OMIT_INTEGRITY_CHECK +#ifndef STQLITE_OMIT_INTEGRITY_CHECK if( sqlite3StrICmp(zLeft, "integrity_check")==0 ){ int i, j, addr, mxErr; @@ -52674,11 +52674,11 @@ SQLITE_PRIVATE void sqlite3Pragma( sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "integrity_check", P3_STATIC); /* Set the maximum error count */ - mxErr = SQLITE_INTEGRITY_CHECK_ERROR_MAX; + mxErr = STQLITE_INTEGRITY_CHECK_ERROR_MAX; if( zRight ){ mxErr = atoi(zRight); if( mxErr<=0 ){ - mxErr = SQLITE_INTEGRITY_CHECK_ERROR_MAX; + mxErr = STQLITE_INTEGRITY_CHECK_ERROR_MAX; } } sqlite3VdbeAddOp(v, OP_MemInt, mxErr, 0); @@ -52787,9 +52787,9 @@ SQLITE_PRIVATE void sqlite3Pragma( sqlite3VdbeChangeP1(v, addr+1, mxErr); sqlite3VdbeJumpHere(v, addr+2); }else -#endif /* SQLITE_OMIT_INTEGRITY_CHECK */ +#endif /* STQLITE_OMIT_INTEGRITY_CHECK */ -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 /* ** PRAGMA encoding ** PRAGMA encoding = "utf-8"|"utf-16"|"utf-16le"|"utf-16be" @@ -52817,14 +52817,14 @@ SQLITE_PRIVATE void sqlite3Pragma( char *zName; u8 enc; } encnames[] = { - { "UTF-8", SQLITE_UTF8 }, - { "UTF8", SQLITE_UTF8 }, - { "UTF-16le", SQLITE_UTF16LE }, - { "UTF16le", SQLITE_UTF16LE }, - { "UTF-16be", SQLITE_UTF16BE }, - { "UTF16be", SQLITE_UTF16BE }, - { "UTF-16", 0 }, /* SQLITE_UTF16NATIVE */ - { "UTF16", 0 }, /* SQLITE_UTF16NATIVE */ + { "UTF-8", STQLITE_UTF8 }, + { "UTF8", STQLITE_UTF8 }, + { "UTF-16le", STQLITE_UTF16LE }, + { "UTF16le", STQLITE_UTF16LE }, + { "UTF-16be", STQLITE_UTF16BE }, + { "UTF16be", STQLITE_UTF16BE }, + { "UTF-16", 0 }, /* STQLITE_UTF16NATIVE */ + { "UTF16", 0 }, /* STQLITE_UTF16NATIVE */ { 0, 0 } }; const struct EncName *pEnc; @@ -52852,7 +52852,7 @@ SQLITE_PRIVATE void sqlite3Pragma( ){ for(pEnc=&encnames[0]; pEnc->zName; pEnc++){ if( 0==sqlite3StrICmp(zRight, pEnc->zName) ){ - ENC(pParse->db) = pEnc->enc ? pEnc->enc : SQLITE_UTF16NATIVE; + ENC(pParse->db) = pEnc->enc ? pEnc->enc : STQLITE_UTF16NATIVE; break; } } @@ -52862,9 +52862,9 @@ SQLITE_PRIVATE void sqlite3Pragma( } } }else -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ -#ifndef SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS +#ifndef STQLITE_OMIT_SCHEMA_VERSION_PRAGMAS /* ** PRAGMA [database.]schema_version ** PRAGMA [database.]schema_version = <integer> @@ -52877,17 +52877,17 @@ SQLITE_PRIVATE void sqlite3Pragma( ** the schema-version and the user-version are 32-bit signed integers ** stored in the database header. ** - ** The schema-cookie is usually only manipulated internally by SQLite. It - ** is incremented by SQLite whenever the database schema is modified (by + ** The schema-cookie is usually only manipulated internally by STQLite. It + ** is incremented by STQLite whenever the database schema is modified (by ** creating or dropping a table or index). The schema version is used by - ** SQLite each time a query is executed to ensure that the internal cache + ** STQLite each time a query is executed to ensure that the internal cache ** of the schema used when compiling the SQL query matches the schema of ** the database against which the compiled query is actually executed. ** Subverting this mechanism by using "PRAGMA schema_version" to modify ** the schema-version is potentially dangerous and may lead to program ** crashes or database corruption. Use with caution! ** - ** The user-version is not used internally by SQLite. It may be used by + ** The user-version is not used internally by STQLite. It may be used by ** applications for any purpose. */ if( sqlite3StrICmp(zLeft, "schema_version")==0 @@ -52935,9 +52935,9 @@ SQLITE_PRIVATE void sqlite3Pragma( sqlite3VdbeSetColName(v, 0, COLNAME_NAME, zLeft, P3_TRANSIENT); } }else -#endif /* SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS */ +#endif /* STQLITE_OMIT_SCHEMA_VERSION_PRAGMAS */ -#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST) +#if defined(STQLITE_DEBUG) || defined(STQLITE_TEST) /* ** Report the current state of file logs for all databases */ @@ -52968,7 +52968,7 @@ SQLITE_PRIVATE void sqlite3Pragma( }else #endif -#ifdef SQLITE_SSE +#ifdef STQLITE_SSE /* ** Check to see if the sqlite_statements table exists. Create it ** if it does not. @@ -52979,20 +52979,20 @@ SQLITE_PRIVATE void sqlite3Pragma( }else #endif -#if SQLITE_HAS_CODEC +#if STQLITE_HAS_CODEC if( sqlite3StrICmp(zLeft, "key")==0 ){ sqlite3_key(db, zRight, strlen(zRight)); }else #endif -#if SQLITE_HAS_CODEC || defined(SQLITE_ENABLE_CEROD) +#if STQLITE_HAS_CODEC || defined(STQLITE_ENABLE_CEROD) if( sqlite3StrICmp(zLeft, "activate_extensions")==0 ){ -#if SQLITE_HAS_CODEC +#if STQLITE_HAS_CODEC if( sqlite3StrNICmp(zRight, "see-", 4)==0 ){ extern void sqlite3_activate_see(const char*); sqlite3_activate_see(&zRight[4]); } #endif -#ifdef SQLITE_ENABLE_CEROD +#ifdef STQLITE_ENABLE_CEROD if( sqlite3StrNICmp(zRight, "cerod-", 6)==0 ){ extern void sqlite3_activate_cerod(const char*); sqlite3_activate_cerod(&zRight[6]); @@ -53014,10 +53014,10 @@ SQLITE_PRIVATE void sqlite3Pragma( ** Reset the safety level, in case the fullfsync flag or synchronous ** setting changed. */ -#ifndef SQLITE_OMIT_PAGER_PRAGMAS +#ifndef STQLITE_OMIT_PAGER_PRAGMAS if( db->autoCommit ){ sqlite3BtreeSetSafetyLevel(pDb->pBt, pDb->safety_level, - (db->flags&SQLITE_FullFSync)!=0); + (db->flags&STQLITE_FullFSync)!=0); } #endif } @@ -53026,7 +53026,7 @@ pragma_out: sqliteFree(zRight); } -#endif /* SQLITE_OMIT_PRAGMA || SQLITE_OMIT_PARSER */ +#endif /* STQLITE_OMIT_PRAGMA || STQLITE_OMIT_PARSER */ /************** End of pragma.c **********************************************/ /************** Begin file prepare.c *****************************************/ @@ -53057,7 +53057,7 @@ static void corruptSchema(InitData *pData, const char *zExtra){ sqlite3SetString(pData->pzErrMsg, "malformed database schema", zExtra!=0 && zExtra[0]!=0 ? " - " : (char*)0, zExtra, (char*)0); } - pData->rc = SQLITE_CORRUPT; + pData->rc = STQLITE_CORRUPT; } /* @@ -53072,16 +53072,16 @@ static void corruptSchema(InitData *pData, const char *zExtra){ ** argv[2] = SQL text for the CREATE statement. ** */ -SQLITE_PRIVATE int sqlite3InitCallback(void *pInit, int argc, char **argv, char **azColName){ +STQLITE_PRIVATE int sqlite3InitCallback(void *pInit, int argc, char **argv, char **azColName){ InitData *pData = (InitData*)pInit; sqlite3 *db = pData->db; int iDb = pData->iDb; - pData->rc = SQLITE_OK; + pData->rc = STQLITE_OK; DbClearProperty(db, iDb, DB_Empty); if( sqlite3MallocFailed() ){ corruptSchema(pData, 0); - return SQLITE_NOMEM; + return STQLITE_NOMEM; } assert( argc==3 ); @@ -53104,12 +53104,12 @@ SQLITE_PRIVATE int sqlite3InitCallback(void *pInit, int argc, char **argv, char db->init.newTnum = atoi(argv[1]); rc = sqlite3_exec(db, argv[2], 0, 0, &zErr); db->init.iDb = 0; - assert( rc!=SQLITE_OK || zErr==0 ); - if( SQLITE_OK!=rc ){ + assert( rc!=STQLITE_OK || zErr==0 ); + if( STQLITE_OK!=rc ){ pData->rc = rc; - if( rc==SQLITE_NOMEM ){ + if( rc==STQLITE_NOMEM ){ sqlite3FailedMalloc(); - }else if( rc!=SQLITE_INTERRUPT ){ + }else if( rc!=STQLITE_INTERRUPT ){ corruptSchema(pData, zErr); } sqlite3_free(zErr); @@ -53117,7 +53117,7 @@ SQLITE_PRIVATE int sqlite3InitCallback(void *pInit, int argc, char **argv, char } }else{ /* If the SQL column is blank it means this is an index that - ** was created to be the PRIMARY KEY or to fulfill a UNIQUE + ** was created to be the PRIMARY KEY or to fulfill a UNITQUE ** constraint for a CREATE TABLE. The index should have already ** been created when we processed the CREATE TABLE. All we have ** to do here is record the root page number for that index. @@ -53143,7 +53143,7 @@ SQLITE_PRIVATE int sqlite3InitCallback(void *pInit, int argc, char **argv, char ** data structures for a single database file. The index of the ** database file is given by iDb. iDb==0 is used for the main ** database. iDb==1 should never be used. iDb>=2 is used for -** auxiliary databases. Return one of the SQLITE_ error codes to +** auxiliary databases. Return one of the STQLITE_ error codes to ** indicate success or failure. */ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ @@ -53170,7 +53170,7 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ " sql text\n" ")" ; -#ifndef SQLITE_OMIT_TEMPDB +#ifndef STQLITE_OMIT_TEMPDB static const char temp_master_schema[] = "CREATE TEMP TABLE sqlite_temp_master(\n" " type text,\n" @@ -53225,10 +53225,10 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ if( !OMIT_TEMPDB && iDb==1 ){ DbSetProperty(db, 1, DB_SchemaLoaded); } - return SQLITE_OK; + return STQLITE_OK; } rc = sqlite3BtreeCursor(pDb->pBt, MASTER_ROOT, 0, 0, 0, &curMain); - if( rc!=SQLITE_OK && rc!=SQLITE_EMPTY ){ + if( rc!=STQLITE_OK && rc!=STQLITE_EMPTY ){ sqlite3SetString(pzErrMsg, sqlite3ErrStr(rc), (char*)0); return rc; } @@ -53247,12 +53247,12 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ ** meta[8] ** meta[9] ** - ** Note: The #defined SQLITE_UTF* symbols in sqliteInt.h correspond to + ** Note: The #defined STQLITE_UTF* symbols in sqliteInt.h correspond to ** the possible values of meta[4]. */ - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ int i; - for(i=0; rc==SQLITE_OK && i<sizeof(meta)/sizeof(meta[0]); i++){ + for(i=0; rc==STQLITE_OK && i<sizeof(meta)/sizeof(meta[0]); i++){ rc = sqlite3BtreeGetMeta(pDb->pBt, i+1, (u32 *)&meta[i]); } if( rc ){ @@ -53274,14 +53274,14 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ if( iDb==0 ){ /* If opening the main database, set ENC(db). */ ENC(db) = (u8)meta[4]; - db->pDfltColl = sqlite3FindCollSeq(db, SQLITE_UTF8, "BINARY", 6, 0); + db->pDfltColl = sqlite3FindCollSeq(db, STQLITE_UTF8, "BINARY", 6, 0); }else{ /* If opening an attached database, the encoding much match ENC(db) */ if( meta[4]!=ENC(db) ){ sqlite3BtreeCloseCursor(curMain); sqlite3SetString(pzErrMsg, "attached databases must use the same" " text encoding as main database", (char*)0); - return SQLITE_ERROR; + return STQLITE_ERROR; } } }else{ @@ -53290,7 +53290,7 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ pDb->pSchema->enc = ENC(db); size = meta[2]; - if( size==0 ){ size = SQLITE_DEFAULT_CACHE_SIZE; } + if( size==0 ){ size = STQLITE_DEFAULT_CACHE_SIZE; } pDb->pSchema->cache_size = size; sqlite3BtreeSetCacheSize(pDb->pBt, pDb->pSchema->cache_size); @@ -53304,19 +53304,19 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ if( pDb->pSchema->file_format==0 ){ pDb->pSchema->file_format = 1; } - if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){ + if( pDb->pSchema->file_format>STQLITE_MAX_FILE_FORMAT ){ sqlite3BtreeCloseCursor(curMain); sqlite3SetString(pzErrMsg, "unsupported file format", (char*)0); - return SQLITE_ERROR; + return STQLITE_ERROR; } /* Read the schema information out of the schema tables */ assert( db->init.busy ); - if( rc==SQLITE_EMPTY ){ + if( rc==STQLITE_EMPTY ){ /* For an empty database, there is nothing to read */ - rc = SQLITE_OK; + rc = STQLITE_OK; }else{ char *zSql; zSql = sqlite3MPrintf( @@ -53324,11 +53324,11 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ db->aDb[iDb].zName, zMasterName); sqlite3SafetyOff(db); rc = sqlite3_exec(db, zSql, sqlite3InitCallback, &initData, 0); - if( rc==SQLITE_ABORT ) rc = initData.rc; + if( rc==STQLITE_ABORT ) rc = initData.rc; sqlite3SafetyOn(db); sqliteFree(zSql); -#ifndef SQLITE_OMIT_ANALYZE - if( rc==SQLITE_OK ){ +#ifndef STQLITE_OMIT_ANALYZE + if( rc==STQLITE_OK ){ sqlite3AnalysisLoad(db, iDb); } #endif @@ -53336,11 +53336,11 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ } if( sqlite3MallocFailed() ){ /* sqlite3SetString(pzErrMsg, "out of memory", (char*)0); */ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; sqlite3ResetInternalSchema(db, 0); } - if( rc==SQLITE_OK || (db->flags&SQLITE_RecoveryMode)){ - /* Black magic: If the SQLITE_RecoveryMode flag is set, then consider + if( rc==STQLITE_OK || (db->flags&STQLITE_RecoveryMode)){ + /* Black magic: If the STQLITE_RecoveryMode flag is set, then consider ** the schema loaded, even if errors occured. In this situation the ** current sqlite3_prepare() operation will fail, but the following one ** will attempt to compile the supplied statement against whatever subset @@ -53349,7 +53349,7 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ ** even when it's contents have been corrupted. */ DbSetProperty(db, iDb, DB_SchemaLoaded); - rc = SQLITE_OK; + rc = STQLITE_OK; } return rc; } @@ -53364,14 +53364,14 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){ ** bit is set in the flags field of the Db structure. If the database ** file was of zero-length, then the DB_Empty flag is also set. */ -SQLITE_PRIVATE int sqlite3Init(sqlite3 *db, char **pzErrMsg){ +STQLITE_PRIVATE int sqlite3Init(sqlite3 *db, char **pzErrMsg){ int i, rc; int called_initone = 0; - if( db->init.busy ) return SQLITE_OK; - rc = SQLITE_OK; + if( db->init.busy ) return STQLITE_OK; + rc = STQLITE_OK; db->init.busy = 1; - for(i=0; rc==SQLITE_OK && i<db->nDb; i++){ + for(i=0; rc==STQLITE_OK && i<db->nDb; i++){ if( DbHasProperty(db, i, DB_SchemaLoaded) || i==1 ) continue; rc = sqlite3InitOne(db, i, pzErrMsg); if( rc ){ @@ -53384,8 +53384,8 @@ SQLITE_PRIVATE int sqlite3Init(sqlite3 *db, char **pzErrMsg){ ** for the TEMP database. This is loaded last, as the TEMP database ** schema may contain references to objects in other databases. */ -#ifndef SQLITE_OMIT_TEMPDB - if( rc==SQLITE_OK && db->nDb>1 && !DbHasProperty(db, 1, DB_SchemaLoaded) ){ +#ifndef STQLITE_OMIT_TEMPDB + if( rc==STQLITE_OK && db->nDb>1 && !DbHasProperty(db, 1, DB_SchemaLoaded) ){ rc = sqlite3InitOne(db, 1, pzErrMsg); if( rc ){ sqlite3ResetInternalSchema(db, 1); @@ -53395,7 +53395,7 @@ SQLITE_PRIVATE int sqlite3Init(sqlite3 *db, char **pzErrMsg){ #endif db->init.busy = 0; - if( rc==SQLITE_OK && called_initone ){ + if( rc==STQLITE_OK && called_initone ){ sqlite3CommitInternalChanges(db); } @@ -53406,13 +53406,13 @@ SQLITE_PRIVATE int sqlite3Init(sqlite3 *db, char **pzErrMsg){ ** This routine is a no-op if the database schema is already initialised. ** Otherwise, the schema is loaded. An error code is returned. */ -SQLITE_PRIVATE int sqlite3ReadSchema(Parse *pParse){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3ReadSchema(Parse *pParse){ + int rc = STQLITE_OK; sqlite3 *db = pParse->db; if( !db->init.busy ){ rc = sqlite3Init(db, &pParse->zErrMsg); } - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ pParse->rc = rc; pParse->nErr++; } @@ -53436,9 +53436,9 @@ static int schemaIsValid(sqlite3 *db){ pBt = db->aDb[iDb].pBt; if( pBt==0 ) continue; rc = sqlite3BtreeCursor(pBt, MASTER_ROOT, 0, 0, 0, &curTemp); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = sqlite3BtreeGetMeta(pBt, 1, (u32 *)&cookie); - if( rc==SQLITE_OK && cookie!=db->aDb[iDb].pSchema->schema_cookie ){ + if( rc==STQLITE_OK && cookie!=db->aDb[iDb].pSchema->schema_cookie ){ allOk = 0; } sqlite3BtreeCloseCursor(curTemp); @@ -53454,7 +53454,7 @@ static int schemaIsValid(sqlite3 *db){ ** If the same database is attached more than once, the first ** attached database is returned. */ -SQLITE_PRIVATE int sqlite3SchemaToIndex(sqlite3 *db, Schema *pSchema){ +STQLITE_PRIVATE int sqlite3SchemaToIndex(sqlite3 *db, Schema *pSchema){ int i = -1000000; /* If pSchema is NULL, then return -1000000. This happens when code in @@ -53481,7 +53481,7 @@ SQLITE_PRIVATE int sqlite3SchemaToIndex(sqlite3 *db, Schema *pSchema){ /* ** Compile the UTF-8 encoded SQL statement zSql into a statement handle. */ -SQLITE_PRIVATE int sqlite3Prepare( +STQLITE_PRIVATE int sqlite3Prepare( sqlite3 *db, /* Database handle. */ const char *zSql, /* UTF-8 encoded SQL statement. */ int nBytes, /* Length of zSql in bytes. */ @@ -53491,7 +53491,7 @@ SQLITE_PRIVATE int sqlite3Prepare( ){ Parse sParse; char *zErrMsg = 0; - int rc = SQLITE_OK; + int rc = STQLITE_OK; int i; /* Assert that malloc() has not failed */ @@ -53500,19 +53500,19 @@ SQLITE_PRIVATE int sqlite3Prepare( assert( ppStmt ); *ppStmt = 0; if( sqlite3SafetyOn(db) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } /* If any attached database schemas are locked, do not proceed with - ** compilation. Instead return SQLITE_LOCKED immediately. + ** compilation. Instead return STQLITE_LOCKED immediately. */ for(i=0; i<db->nDb; i++) { Btree *pBt = db->aDb[i].pBt; if( pBt && sqlite3BtreeSchemaLocked(pBt) ){ const char *zDb = db->aDb[i].zName; - sqlite3Error(db, SQLITE_LOCKED, "database schema is locked: %s", zDb); + sqlite3Error(db, STQLITE_LOCKED, "database schema is locked: %s", zDb); sqlite3SafetyOff(db); - return SQLITE_LOCKED; + return STQLITE_LOCKED; } } @@ -53520,8 +53520,8 @@ SQLITE_PRIVATE int sqlite3Prepare( sParse.db = db; if( nBytes>=0 && zSql[nBytes]!=0 ){ char *zSqlCopy; - if( nBytes>SQLITE_MAX_SQL_LENGTH ){ - return SQLITE_TOOBIG; + if( nBytes>STQLITE_MAX_STQL_LENGTH ){ + return STQLITE_TOOBIG; } zSqlCopy = sqlite3StrNDup(zSql, nBytes); if( zSqlCopy ){ @@ -53534,25 +53534,25 @@ SQLITE_PRIVATE int sqlite3Prepare( } if( sqlite3MallocFailed() ){ - sParse.rc = SQLITE_NOMEM; + sParse.rc = STQLITE_NOMEM; } - if( sParse.rc==SQLITE_DONE ) sParse.rc = SQLITE_OK; + if( sParse.rc==STQLITE_DONE ) sParse.rc = STQLITE_OK; if( sParse.checkSchema && !schemaIsValid(db) ){ - sParse.rc = SQLITE_SCHEMA; + sParse.rc = STQLITE_SCHEMA; } - if( sParse.rc==SQLITE_SCHEMA ){ + if( sParse.rc==STQLITE_SCHEMA ){ sqlite3ResetInternalSchema(db, 0); } if( sqlite3MallocFailed() ){ - sParse.rc = SQLITE_NOMEM; + sParse.rc = STQLITE_NOMEM; } if( pzTail ){ *pzTail = sParse.zTail; } rc = sParse.rc; -#ifndef SQLITE_OMIT_EXPLAIN - if( rc==SQLITE_OK && sParse.pVdbe && sParse.explain ){ +#ifndef STQLITE_OMIT_EXPLAIN + if( rc==STQLITE_OK && sParse.pVdbe && sParse.explain ){ if( sParse.explain==2 ){ sqlite3VdbeSetNumCols(sParse.pVdbe, 3); sqlite3VdbeSetColName(sParse.pVdbe, 0, COLNAME_NAME, "order", P3_STATIC); @@ -53570,13 +53570,13 @@ SQLITE_PRIVATE int sqlite3Prepare( #endif if( sqlite3SafetyOff(db) ){ - rc = SQLITE_MISUSE; + rc = STQLITE_MISUSE; } if( saveSqlFlag ){ sqlite3VdbeSetSql(sParse.pVdbe, zSql, sParse.zTail - zSql); } - if( rc!=SQLITE_OK || sqlite3MallocFailed() ){ + if( rc!=STQLITE_OK || sqlite3MallocFailed() ){ sqlite3_finalize((sqlite3_stmt*)sParse.pVdbe); assert(!(*ppStmt)); }else{ @@ -53601,7 +53601,7 @@ SQLITE_PRIVATE int sqlite3Prepare( ** Return true if the statement was recompiled successfully. ** Return false if there is an error of some kind. */ -SQLITE_PRIVATE int sqlite3Reprepare(Vdbe *p){ +STQLITE_PRIVATE int sqlite3Reprepare(Vdbe *p){ int rc; sqlite3_stmt *pNew; const char *zSql; @@ -53630,12 +53630,12 @@ SQLITE_PRIVATE int sqlite3Reprepare(Vdbe *p){ /* ** Two versions of the official API. Legacy and new use. In the legacy ** version, the original SQL text is not saved in the prepared statement -** and so if a schema change occurs, SQLITE_SCHEMA is returned by +** and so if a schema change occurs, STQLITE_SCHEMA is returned by ** sqlite3_step(). In the new version, the original SQL text is retained ** and the statement is automatically recompiled if an schema change ** occurs. */ -SQLITE_API int sqlite3_prepare( +STQLITE_API int sqlite3_prepare( sqlite3 *db, /* Database handle. */ const char *zSql, /* UTF-8 encoded SQL statement. */ int nBytes, /* Length of zSql in bytes. */ @@ -53655,7 +53655,7 @@ int sqlite3_prepare_v2( } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 /* ** Compile the UTF-16 encoded SQL statement zSql into a statement handle. */ @@ -53673,10 +53673,10 @@ static int sqlite3Prepare16( */ char *zSql8; const char *zTail8 = 0; - int rc = SQLITE_OK; + int rc = STQLITE_OK; if( sqlite3SafetyCheck(db) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } zSql8 = sqlite3Utf16to8(zSql, nBytes); if( zSql8 ){ @@ -53685,7 +53685,7 @@ static int sqlite3Prepare16( if( zTail8 && pzTail ){ /* If sqlite3_prepare returns a tail pointer, we calculate the - ** equivalent pointer into the UTF-16 string by counting the unicode + ** equivalent pointer into the UTF-16 string by counting the tqunicode ** characters between zSql8 and zTail8, and then returning a pointer ** the same number of characters into the UTF-16 string. */ @@ -53699,12 +53699,12 @@ static int sqlite3Prepare16( /* ** Two versions of the official API. Legacy and new use. In the legacy ** version, the original SQL text is not saved in the prepared statement -** and so if a schema change occurs, SQLITE_SCHEMA is returned by +** and so if a schema change occurs, STQLITE_SCHEMA is returned by ** sqlite3_step(). In the new version, the original SQL text is retained ** and the statement is automatically recompiled if an schema change ** occurs. */ -SQLITE_API int sqlite3_prepare16( +STQLITE_API int sqlite3_prepare16( sqlite3 *db, /* Database handle. */ const void *zSql, /* UTF-8 encoded SQL statement. */ int nBytes, /* Length of zSql in bytes. */ @@ -53723,7 +53723,7 @@ int sqlite3_prepare16_v2( return sqlite3Prepare16(db,zSql,nBytes,1,ppStmt,pzTail); } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ /************** End of prepare.c *********************************************/ /************** Begin file select.c ******************************************/ @@ -53739,7 +53739,7 @@ int sqlite3_prepare16_v2( ** ************************************************************************* ** This file contains C code routines that are called by the parser -** to handle SELECT statements in SQLite. +** to handle SELECT statements in STQLite. ** ** $Id: select.c,v 1.354 2007/07/18 18:17:12 drh Exp $ */ @@ -53766,7 +53766,7 @@ static void clearSelect(Select *p){ ** Allocate a new Select structure and return a pointer to that ** structure. */ -SQLITE_PRIVATE Select *sqlite3SelectNew( +STQLITE_PRIVATE Select *sqlite3SelectNew( ExprList *pEList, /* which columns to include in the result */ SrcList *pSrc, /* the FROM clause -- which tables to scan */ Expr *pWhere, /* the WHERE clause */ @@ -53814,7 +53814,7 @@ SQLITE_PRIVATE Select *sqlite3SelectNew( /* ** Delete the given Select structure and all of its substructures. */ -SQLITE_PRIVATE void sqlite3SelectDelete(Select *p){ +STQLITE_PRIVATE void sqlite3SelectDelete(Select *p){ if( p ){ clearSelect(p); sqliteFree(p); @@ -53838,7 +53838,7 @@ SQLITE_PRIVATE void sqlite3SelectDelete(Select *p){ ** If an illegal or unsupported join type is seen, then still return ** a join type, but put an error in the pParse structure. */ -SQLITE_PRIVATE int sqlite3JoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){ +STQLITE_PRIVATE int sqlite3JoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){ int jointype = 0; Token *apAll[3]; Token *p; @@ -53930,7 +53930,7 @@ static void setQuotedToken(Token *p, const char *z){ /* ** Create an expression node for an identifier with the name of zName */ -SQLITE_PRIVATE Expr *sqlite3CreateIdExpr(const char *zName){ +STQLITE_PRIVATE Expr *sqlite3CreateIdExpr(const char *zName){ Token dummy; setToken(&dummy, zName); return sqlite3Expr(TK_ID, 0, 0, &dummy); @@ -54262,7 +54262,7 @@ static int selectInnerLoop( /* In this mode, write each query result to the key of the temporary ** table iParm. */ -#ifndef SQLITE_OMIT_COMPOUND_SELECT +#ifndef STQLITE_OMIT_COMPOUND_SELECT case SRT_Union: { sqlite3VdbeAddOp(v, OP_MakeRecord, nColumn, 0); if( aff ){ @@ -54301,7 +54301,7 @@ static int selectInnerLoop( break; } -#ifndef SQLITE_OMIT_SUBQUERY +#ifndef STQLITE_OMIT_SUBTQUERY /* If we are creating a set for an "expr IN (SELECT ...)" construct, ** then there should be a single item on the stack. Write this ** item into the set table with bogus data. @@ -54352,7 +54352,7 @@ static int selectInnerLoop( } break; } -#endif /* #ifndef SQLITE_OMIT_SUBQUERY */ +#endif /* #ifndef STQLITE_OMIT_SUBTQUERY */ /* Send the data to the callback function or to a subroutine. In the ** case of a subroutine, the subroutine itself is responsible for @@ -54371,7 +54371,7 @@ static int selectInnerLoop( break; } -#if !defined(SQLITE_OMIT_TRIGGER) +#if !defined(STQLITE_OMIT_TRIGGER) /* Discard the results. This is used for SELECT statements inside ** the body of a TRIGGER. The purpose of such selects is to call ** user-defined functions that have side effects. We do not care @@ -54477,7 +54477,7 @@ static void generateSortTail( sqlite3VdbeAddOp(v, OP_Insert, iParm, OPFLAG_APPEND); break; } -#ifndef SQLITE_OMIT_SUBQUERY +#ifndef STQLITE_OMIT_SUBTQUERY case SRT_Set: { assert( nColumn==1 ); sqlite3VdbeAddOp(v, OP_NotNull, -1, sqlite3VdbeCurrentAddr(v)+3); @@ -54638,7 +54638,7 @@ static const char *columnType( } break; } -#ifndef SQLITE_OMIT_SUBQUERY +#ifndef STQLITE_OMIT_SUBTQUERY case TK_SELECT: { /* The expression is a sub-select. Return the declaration type and ** origin info for the single column in the result set of the SELECT @@ -54712,7 +54712,7 @@ static void generateColumnNames( sqlite3 *db = pParse->db; int fullNames, shortNames; -#ifndef SQLITE_OMIT_EXPLAIN +#ifndef STQLITE_OMIT_EXPLAIN /* If this is an EXPLAIN, skip this step */ if( pParse->explain ){ return; @@ -54722,8 +54722,8 @@ static void generateColumnNames( assert( v!=0 ); if( pParse->colNamesSet || v==0 || sqlite3MallocFailed() ) return; pParse->colNamesSet = 1; - fullNames = (db->flags & SQLITE_FullColNames)!=0; - shortNames = (db->flags & SQLITE_ShortColNames)!=0; + fullNames = (db->flags & STQLITE_FullColNames)!=0; + shortNames = (db->flags & STQLITE_ShortColNames)!=0; sqlite3VdbeSetNumCols(v, pEList->nExpr); for(i=0; i<pEList->nExpr; i++){ Expr *p; @@ -54774,7 +54774,7 @@ static void generateColumnNames( generateColumnTypes(pParse, pTabList, pEList); } -#ifndef SQLITE_OMIT_COMPOUND_SELECT +#ifndef STQLITE_OMIT_COMPOUND_SELECT /* ** Name of the connection operator, used for error messages. */ @@ -54788,7 +54788,7 @@ static const char *selectOpName(int id){ } return z; } -#endif /* SQLITE_OMIT_COMPOUND_SELECT */ +#endif /* STQLITE_OMIT_COMPOUND_SELECT */ /* ** Forward declaration @@ -54799,7 +54799,7 @@ static int prepSelectStmt(Parse*, Select*); ** Given a SELECT statement, generate a Table structure that describes ** the result set of that SELECT. */ -SQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse *pParse, char *zTabName, Select *pSelect){ +STQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse *pParse, char *zTabName, Select *pSelect){ Table *pTab; int i, j; ExprList *pEList; @@ -54943,7 +54943,7 @@ static int prepSelectStmt(Parse *pParse, Select *p){ return 0; } if( pFrom->zName==0 ){ -#ifndef SQLITE_OMIT_SUBQUERY +#ifndef STQLITE_OMIT_SUBTQUERY /* A sub-query in the FROM clause of a SELECT */ assert( pFrom->pSelect!=0 ); if( pFrom->zAlias==0 ){ @@ -54971,7 +54971,7 @@ static int prepSelectStmt(Parse *pParse, Select *p){ return 1; } pTab->nRef++; -#if !defined(SQLITE_OMIT_VIEW) || !defined (SQLITE_OMIT_VIRTUALTABLE) +#if !defined(STQLITE_OMIT_VIEW) || !defined (STQLITE_OMIT_VIRTUALTABLE) if( pTab->pSelect || IsVirtual(pTab) ){ /* We reach here if the named table is a really a view */ if( sqlite3ViewGetColumnNames(pParse, pTab) ){ @@ -55020,8 +55020,8 @@ static int prepSelectStmt(Parse *pParse, Select *p){ struct ExprList_item *a = pEList->a; ExprList *pNew = 0; int flags = pParse->db->flags; - int longNames = (flags & SQLITE_FullColNames)!=0 && - (flags & SQLITE_ShortColNames)==0; + int longNames = (flags & STQLITE_FullColNames)!=0 && + (flags & STQLITE_ShortColNames)==0; for(k=0; k<pEList->nExpr; k++){ Expr *pE = a[k].pExpr; @@ -55124,17 +55124,17 @@ static int prepSelectStmt(Parse *pParse, Select *p){ sqlite3ExprListDelete(pEList); p->pEList = pNew; } - if( p->pEList && p->pEList->nExpr>SQLITE_MAX_COLUMN ){ + if( p->pEList && p->pEList->nExpr>STQLITE_MAX_COLUMN ){ sqlite3ErrorMsg(pParse, "too many columns in result set"); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } if( sqlite3MallocFailed() ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; } return rc; } -#ifndef SQLITE_OMIT_COMPOUND_SELECT +#ifndef STQLITE_OMIT_COMPOUND_SELECT /* ** This routine associates entries in an ORDER BY expression list with ** columns in a result. For each ORDER BY expression, the opcode of @@ -55223,13 +55223,13 @@ static int matchOrderbyToColumn( } return nErr; } -#endif /* #ifndef SQLITE_OMIT_COMPOUND_SELECT */ +#endif /* #ifndef STQLITE_OMIT_COMPOUND_SELECT */ /* ** Get a VDBE for the given parser context. Create a new one if necessary. ** If an error occurs, return NULL and leave a message in pParse. */ -SQLITE_PRIVATE Vdbe *sqlite3GetVdbe(Parse *pParse){ +STQLITE_PRIVATE Vdbe *sqlite3GetVdbe(Parse *pParse){ Vdbe *v = pParse->pVdbe; if( v==0 ){ v = pParse->pVdbe = sqlite3VdbeCreate(pParse->db); @@ -55323,7 +55323,7 @@ static void createSortingIndex(Parse *pParse, Select *p, ExprList *pOrderBy){ } } -#ifndef SQLITE_OMIT_COMPOUND_SELECT +#ifndef STQLITE_OMIT_COMPOUND_SELECT /* ** Return the appropriate collating sequence for the iCol-th column of ** the result set for the compound-select statement "p". Return NULL if @@ -55344,9 +55344,9 @@ static CollSeq *multiSelectCollSeq(Parse *pParse, Select *p, int iCol){ } return pRet; } -#endif /* SQLITE_OMIT_COMPOUND_SELECT */ +#endif /* STQLITE_OMIT_COMPOUND_SELECT */ -#ifndef SQLITE_OMIT_COMPOUND_SELECT +#ifndef STQLITE_OMIT_COMPOUND_SELECT /* ** This routine is called to process a query that is really the union ** or intersection of two or more separate queries. @@ -55374,7 +55374,7 @@ static CollSeq *multiSelectCollSeq(Parse *pParse, Select *p, int iCol){ ** So if this routine is called with p equal to the t3 query, then ** pPrior will be the t2 query. p->op will be TK_UNION in this case. ** -** Notice that because of the way SQLite parses compound SELECTs, the +** Notice that because of the way STQLite parses compound SELECTs, the ** individual selects always group from left to right. */ static int multiSelect( @@ -55384,7 +55384,7 @@ static int multiSelect( int iParm, /* / by these two parameters. */ char *aff /* If eDest is SRT_Union, the affinity string */ ){ - int rc = SQLITE_OK; /* Success code from a subroutine */ + int rc = STQLITE_OK; /* Success code from a subroutine */ Select *pPrior; /* Another SELECT immediately to our left */ Vdbe *v; /* Generate code to this VDBE */ int nCol; /* Number of columns in the result set */ @@ -55692,7 +55692,7 @@ static int multiSelect( nKeyCol = nCol + (pOrderBy ? pOrderBy->nExpr : 0); pKeyInfo = sqliteMalloc(sizeof(*pKeyInfo)+nKeyCol*(sizeof(CollSeq*) + 1)); if( !pKeyInfo ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; goto multi_select_end; } @@ -55771,9 +55771,9 @@ static int multiSelect( multi_select_end: return rc; } -#endif /* SQLITE_OMIT_COMPOUND_SELECT */ +#endif /* STQLITE_OMIT_COMPOUND_SELECT */ -#ifndef SQLITE_OMIT_VIEW +#ifndef STQLITE_OMIT_VIEW /* ** Scan through the expression pExpr. Replace every reference to ** a column in table number iTable with a copy of the iColumn-th @@ -55839,9 +55839,9 @@ static void substSelect(Select *p, int iTable, ExprList *pEList){ substExpr(p->pWhere, iTable, pEList); substSelect(p->pPrior, iTable, pEList); } -#endif /* !defined(SQLITE_OMIT_VIEW) */ +#endif /* !defined(STQLITE_OMIT_VIEW) */ -#ifndef SQLITE_OMIT_VIEW +#ifndef STQLITE_OMIT_VIEW /* ** This routine attempts to flatten subqueries in order to speed ** execution. It returns 1 if it makes changes and 0 if no flattening @@ -55920,7 +55920,7 @@ static void substSelect(Select *p, int iTable, ExprList *pEList){ ** the subquery before this routine runs. */ static int flattenSubquery( - Select *p, /* The parent or outer SELECT statement */ + Select *p, /* The tqparent or outer SELECT statement */ int iFrom, /* Index in p->pSrc->a[] of the inner subquery */ int isAgg, /* True if outer SELECT uses aggregate functions */ int subqueryIsAgg /* True if the subquery uses aggregate functions */ @@ -56007,7 +56007,7 @@ static int flattenSubquery( ** the FROM clause of the outer query. Before doing this, remember ** the cursor number for the original outer query FROM element in ** iParent. The iParent cursor will never be used. Subsequent code - ** will scan expressions looking for iParent references and replace + ** will scan expressions looking for iParent references and tqreplace ** those references with expressions that resolve to the subquery FROM ** elements we are now copying in. */ @@ -56108,7 +56108,7 @@ static int flattenSubquery( sqlite3SelectDelete(pSub); return 1; } -#endif /* SQLITE_OMIT_VIEW */ +#endif /* STQLITE_OMIT_VIEW */ /* ** Analyze the SELECT statement passed in as an argument to see if it @@ -56242,7 +56242,7 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){ sqlite3VdbeAddOp(v, OP_MakeRecord, 1, 0); seekOp = OP_MoveGt; } - if( pIdx->aSortOrder[0]==SQLITE_SO_DESC ){ + if( pIdx->aSortOrder[0]==STQLITE_SO_DESC ){ /* Ticket #2514: invert the seek operator if we are using ** a descending index. */ if( seekOp==OP_Last ){ @@ -56287,7 +56287,7 @@ static int processOrderGroupBy( assert( pEList ); if( pOrderBy==0 ) return 0; - if( pOrderBy->nExpr>SQLITE_MAX_COLUMN ){ + if( pOrderBy->nExpr>STQLITE_MAX_COLUMN ){ sqlite3ErrorMsg(pParse, "too many terms in %s BY clause", zType); return 1; } @@ -56322,9 +56322,9 @@ static int processOrderGroupBy( ** This routine resolves any names used in the result set of the ** supplied SELECT statement. If the SELECT statement being resolved ** is a sub-select, then pOuterNC is a pointer to the NameContext -** of the parent SELECT. +** of the tqparent SELECT. */ -SQLITE_PRIVATE int sqlite3SelectResolve( +STQLITE_PRIVATE int sqlite3SelectResolve( Parse *pParse, /* The parser context */ Select *p, /* The SELECT statement being coded. */ NameContext *pOuterNC /* The outer name context. May be NULL. */ @@ -56337,20 +56337,20 @@ SQLITE_PRIVATE int sqlite3SelectResolve( /* If this routine has run before, return immediately. */ if( p->isResolved ){ assert( !pOuterNC ); - return SQLITE_OK; + return STQLITE_OK; } p->isResolved = 1; /* If there have already been errors, do nothing. */ if( pParse->nErr>0 ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } /* Prepare the select statement. This call will allocate all cursors ** required to handle the tables and subqueries in the FROM clause. */ if( prepSelectStmt(pParse, p) ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } /* Resolve the expressions in the LIMIT and OFFSET clauses. These @@ -56360,7 +56360,7 @@ SQLITE_PRIVATE int sqlite3SelectResolve( sNC.pParse = pParse; if( sqlite3ExprResolveNames(&sNC, p->pLimit) || sqlite3ExprResolveNames(&sNC, p->pOffset) ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } /* Set up the local name-context to pass to ExprResolveNames() to @@ -56372,11 +56372,11 @@ SQLITE_PRIVATE int sqlite3SelectResolve( /* Resolve names in the result set. */ pEList = p->pEList; - if( !pEList ) return SQLITE_ERROR; + if( !pEList ) return STQLITE_ERROR; for(i=0; i<pEList->nExpr; i++){ Expr *pX = pEList->a[i].pExpr; if( sqlite3ExprResolveNames(&sNC, pX) ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } } @@ -56395,7 +56395,7 @@ SQLITE_PRIVATE int sqlite3SelectResolve( */ if( p->pHaving && !pGroupBy ){ sqlite3ErrorMsg(pParse, "a GROUP BY clause is required before HAVING"); - return SQLITE_ERROR; + return STQLITE_ERROR; } /* Add the expression list to the name-context before parsing the @@ -56409,17 +56409,17 @@ SQLITE_PRIVATE int sqlite3SelectResolve( sNC.pEList = p->pEList; if( sqlite3ExprResolveNames(&sNC, p->pWhere) || sqlite3ExprResolveNames(&sNC, p->pHaving) ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } if( p->pPrior==0 ){ if( processOrderGroupBy(&sNC, p->pOrderBy, "ORDER") || processOrderGroupBy(&sNC, pGroupBy, "GROUP") ){ - return SQLITE_ERROR; + return STQLITE_ERROR; } } if( sqlite3MallocFailed() ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } /* Make sure the GROUP BY clause does not contain aggregate functions. @@ -56431,7 +56431,7 @@ SQLITE_PRIVATE int sqlite3SelectResolve( if( ExprHasProperty(pItem->pExpr, EP_Agg) ){ sqlite3ErrorMsg(pParse, "aggregate functions are not allowed in " "the GROUP BY clause"); - return SQLITE_ERROR; + return STQLITE_ERROR; } } } @@ -56442,7 +56442,7 @@ SQLITE_PRIVATE int sqlite3SelectResolve( if( p->pPrior ){ return sqlite3SelectResolve(pParse, p->pPrior, pOuterNC); }else{ - return SQLITE_OK; + return STQLITE_OK; } } @@ -56578,10 +56578,10 @@ 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, parentTab, and *pParentAgg fields are filled in if this +** The pParent, tqparentTab, and *pParentAgg fields are filled in if this ** SELECT is a subquery. This routine may try to combine this SELECT -** with its parent to form a single flat query. In so doing, it might -** change the parent query from a non-aggregate to an aggregate query. +** 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. ** For that reason, the pParentAgg flag is passed as a pointer, so it ** can be changed. ** @@ -56596,16 +56596,16 @@ 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 parentTab parameter will +** the second element in a three-way join, the tqparentTab parameter will ** be 1 (the 2nd value of a 0-indexed array.) */ -SQLITE_PRIVATE int sqlite3Select( +STQLITE_PRIVATE int sqlite3Select( Parse *pParse, /* The parser context */ Select *p, /* The SELECT statement being coded. */ 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 parentTab, /* Index in pParent->pSrc of this query */ + int tqparentTab, /* 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 */ ){ @@ -56629,10 +56629,10 @@ SQLITE_PRIVATE int sqlite3Select( if( p==0 || sqlite3MallocFailed() || pParse->nErr ){ return 1; } - if( sqlite3AuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1; + if( sqlite3AuthCheck(pParse, STQLITE_SELECT, 0, 0, 0) ) return 1; memset(&sAggInfo, 0, sizeof(sAggInfo)); -#ifndef SQLITE_OMIT_COMPOUND_SELECT +#ifndef STQLITE_OMIT_COMPOUND_SELECT /* If there is are a sequence of queries, do the earlier ones first. */ if( p->pPrior ){ @@ -56642,7 +56642,7 @@ SQLITE_PRIVATE int sqlite3Select( for(pLoop=p; pLoop; pLoop=pLoop->pPrior, cnt++){ pLoop->pRightmost = p; } - if( SQLITE_MAX_COMPOUND_SELECT>0 && cnt>SQLITE_MAX_COMPOUND_SELECT ){ + if( STQLITE_MAX_COMPOUND_SELECT>0 && cnt>STQLITE_MAX_COMPOUND_SELECT ){ sqlite3ErrorMsg(pParse, "too many terms in compound SELECT"); return 1; } @@ -56680,7 +56680,7 @@ SQLITE_PRIVATE int sqlite3Select( /* If writing to memory or generating a set ** only a single column may be output. */ -#ifndef SQLITE_OMIT_SUBQUERY +#ifndef STQLITE_OMIT_SUBTQUERY if( checkForMultiColumnSelectError(pParse, eDest, pEList->nExpr) ){ goto select_end; } @@ -56699,7 +56699,7 @@ SQLITE_PRIVATE int sqlite3Select( /* Generate code for all sub-queries in the FROM clause */ -#if !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW) +#if !defined(STQLITE_OMIT_SUBTQUERY) || !defined(STQLITE_OMIT_VIEW) for(i=0; i<pTabList->nSrc; i++){ const char *zSavedAuthContext = 0; int needRestoreContext; @@ -56713,11 +56713,11 @@ SQLITE_PRIVATE int sqlite3Select( }else{ needRestoreContext = 0; } -#if SQLITE_MAX_EXPR_DEPTH>0 +#if STQLITE_MAX_EXPR_DEPTH>0 /* Increment Parse.nHeight by the height of the largest expression - ** tree refered to by this, the parent select. The child select + ** tree refered to by this, the tqparent select. The child select ** may contain expression trees of at most - ** (SQLITE_MAX_EXPR_DEPTH-Parse.nHeight) height. This is a bit + ** (STQLITE_MAX_EXPR_DEPTH-Parse.nHeight) height. This is a bit ** more conservative than necessary, but much easier than enforcing ** an exact limit. */ @@ -56725,7 +56725,7 @@ SQLITE_PRIVATE int sqlite3Select( #endif sqlite3Select(pParse, pItem->pSelect, SRT_EphemTab, pItem->iCursor, p, i, &isAgg, 0); -#if SQLITE_MAX_EXPR_DEPTH>0 +#if STQLITE_MAX_EXPR_DEPTH>0 pParse->nHeight -= sqlite3SelectExprHeight(p); #endif if( needRestoreContext ){ @@ -56750,12 +56750,12 @@ SQLITE_PRIVATE int sqlite3Select( goto select_end; } - /* Check to see if this is a subquery that can be "flattened" into its parent. + /* Check to see if this is a subquery that can be "flattened" into its tqparent. ** If flattening is a possiblity, do so and return immediately. */ -#ifndef SQLITE_OMIT_VIEW +#ifndef STQLITE_OMIT_VIEW if( pParent && pParentAgg && - flattenSubquery(pParent, parentTab, *pParentAgg, isAgg) ){ + flattenSubquery(pParent, tqparentTab, *pParentAgg, isAgg) ){ if( isAgg ) *pParentAgg = 1; goto select_end; } @@ -57097,16 +57097,16 @@ SQLITE_PRIVATE int sqlite3Select( generateSortTail(pParse, p, v, pEList->nExpr, eDest, iParm); } -#ifndef SQLITE_OMIT_SUBQUERY +#ifndef STQLITE_OMIT_SUBTQUERY /* If this was a subquery, we have now converted the subquery into a ** temporary table. So set the SrcList_item.isPopulated flag to prevent ** this subquery from being evaluated again and to force the use of ** the temporary table. */ if( pParent ){ - assert( pParent->pSrc->nSrc>parentTab ); - assert( pParent->pSrc->a[parentTab].pSelect==p ); - pParent->pSrc->a[parentTab].isPopulated = 1; + assert( pParent->pSrc->nSrc>tqparentTab ); + assert( pParent->pSrc->a[tqparentTab].pSelect==p ); + pParent->pSrc->a[tqparentTab].isPopulated = 1; } #endif @@ -57127,7 +57127,7 @@ select_end: /* Identify column names if we will be using them in a callback. This ** step is skipped if the output is going to some other destination. */ - if( rc==SQLITE_OK && eDest==SRT_Callback ){ + if( rc==STQLITE_OK && eDest==SRT_Callback ){ generateColumnNames(pParse, pTabList, pEList); } @@ -57136,7 +57136,7 @@ select_end: return rc; } -#if defined(SQLITE_DEBUG) +#if defined(STQLITE_DEBUG) /* ******************************************************************************* ** The following code is used for testing and debugging only. The code @@ -57151,7 +57151,7 @@ select_end: ** code base. Then are intended to be called from within the debugger ** or from temporary "printf" statements inserted for debugging. */ -SQLITE_PRIVATE void sqlite3PrintExpr(Expr *p){ +STQLITE_PRIVATE void sqlite3PrintExpr(Expr *p){ if( p->token.z && p->token.n>0 ){ sqlite3DebugPrintf("(%.*s", p->token.n, p->token.z); }else{ @@ -57167,7 +57167,7 @@ SQLITE_PRIVATE void sqlite3PrintExpr(Expr *p){ } sqlite3DebugPrintf(")"); } -SQLITE_PRIVATE void sqlite3PrintExprList(ExprList *pList){ +STQLITE_PRIVATE void sqlite3PrintExprList(ExprList *pList){ int i; for(i=0; i<pList->nExpr; i++){ sqlite3PrintExpr(pList->a[i].pExpr); @@ -57176,7 +57176,7 @@ SQLITE_PRIVATE void sqlite3PrintExprList(ExprList *pList){ } } } -SQLITE_PRIVATE void sqlite3PrintSelect(Select *p, int indent){ +STQLITE_PRIVATE void sqlite3PrintSelect(Select *p, int indent){ sqlite3DebugPrintf("%*sSELECT(%p) ", indent, "", p); sqlite3PrintExprList(p->pEList); sqlite3DebugPrintf("\n"); @@ -57230,7 +57230,7 @@ SQLITE_PRIVATE void sqlite3PrintSelect(Select *p, int indent){ } /* End of the structure debug printing code *****************************************************************************/ -#endif /* defined(SQLITE_TEST) || defined(SQLITE_DEBUG) */ +#endif /* defined(STQLITE_TEST) || defined(STQLITE_DEBUG) */ /************** End of select.c **********************************************/ /************** Begin file table.c *******************************************/ @@ -57253,7 +57253,7 @@ SQLITE_PRIVATE void sqlite3PrintSelect(Select *p, int indent){ ** if they are not used. */ -#ifndef SQLITE_OMIT_GET_TABLE +#ifndef STQLITE_OMIT_GET_TABLE /* ** This structure is used to pass data from sqlite3_get_table() through @@ -57314,7 +57314,7 @@ static int sqlite3_get_table_cb(void *pArg, int nCol, char **argv, char **colv){ sqlite3SetString(&p->zErrMsg, "sqlite3_get_table() called with two or more incompatible queries", (char*)0); - p->rc = SQLITE_ERROR; + p->rc = STQLITE_ERROR; return 1; } @@ -57337,7 +57337,7 @@ static int sqlite3_get_table_cb(void *pArg, int nCol, char **argv, char **colv){ return 0; malloc_failed: - p->rc = SQLITE_NOMEM; + p->rc = STQLITE_NOMEM; return 1; } @@ -57361,7 +57361,7 @@ int sqlite3_get_table( ){ int rc; TabResult res; - if( pazResult==0 ){ return SQLITE_ERROR; } + if( pazResult==0 ){ return STQLITE_ERROR; } *pazResult = 0; if( pnColumn ) *pnColumn = 0; if( pnRow ) *pnRow = 0; @@ -57371,16 +57371,16 @@ int sqlite3_get_table( res.nColumn = 0; res.nData = 1; res.nAlloc = 20; - res.rc = SQLITE_OK; + res.rc = STQLITE_OK; res.azResult = sqlite3_malloc( sizeof(char*)*res.nAlloc ); - if( res.azResult==0 ) return SQLITE_NOMEM; + if( res.azResult==0 ) return STQLITE_NOMEM; res.azResult[0] = 0; rc = sqlite3_exec(db, zSql, sqlite3_get_table_cb, &res, pzErrMsg); if( res.azResult ){ assert( sizeof(res.azResult[0])>= sizeof(res.nData) ); res.azResult[0] = (char*)res.nData; } - if( (rc&0xff)==SQLITE_ABORT ){ + if( (rc&0xff)==STQLITE_ABORT ){ sqlite3_free_table(&res.azResult[1]); if( res.zErrMsg ){ if( pzErrMsg ){ @@ -57393,7 +57393,7 @@ int sqlite3_get_table( return res.rc & db->errMask; } sqliteFree(res.zErrMsg); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqlite3_free_table(&res.azResult[1]); return rc & db->errMask; } @@ -57402,7 +57402,7 @@ int sqlite3_get_table( azNew = sqlite3_realloc( res.azResult, sizeof(char*)*(res.nData+1) ); if( azNew==0 ){ sqlite3_free_table(&res.azResult[1]); - return SQLITE_NOMEM; + return STQLITE_NOMEM; } res.nAlloc = res.nData+1; res.azResult = azNew; @@ -57429,7 +57429,7 @@ void sqlite3_free_table( } } -#endif /* SQLITE_OMIT_GET_TABLE */ +#endif /* STQLITE_OMIT_GET_TABLE */ /************** End of table.c ***********************************************/ /************** Begin file trigger.c *****************************************/ @@ -57446,11 +57446,11 @@ void sqlite3_free_table( * */ -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER /* ** Delete a linked list of TriggerStep structures. */ -SQLITE_PRIVATE void sqlite3DeleteTriggerStep(TriggerStep *pTriggerStep){ +STQLITE_PRIVATE void sqlite3DeleteTriggerStep(TriggerStep *pTriggerStep){ while( pTriggerStep ){ TriggerStep * pTmp = pTriggerStep; pTriggerStep = pTriggerStep->pNext; @@ -57473,7 +57473,7 @@ SQLITE_PRIVATE void sqlite3DeleteTriggerStep(TriggerStep *pTriggerStep){ ** sqlite3FinishTrigger() function is called to complete the trigger ** construction process. */ -SQLITE_PRIVATE void sqlite3BeginTrigger( +STQLITE_PRIVATE void sqlite3BeginTrigger( Parse *pParse, /* The parse context of the CREATE TRIGGER statement */ Token *pName1, /* The name of the trigger */ Token *pName2, /* The name of the trigger */ @@ -57545,7 +57545,7 @@ SQLITE_PRIVATE void sqlite3BeginTrigger( /* Check that the trigger name is not reserved and that no trigger of the ** specified name exists */ zName = sqlite3NameFromToken(pName); - if( !zName || SQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){ + if( !zName || STQLITE_OK!=sqlite3CheckObjectName(pParse, zName) ){ goto trigger_cleanup; } if( sqlite3HashFind(&(db->aDb[iDb].pSchema->trigHash), zName,strlen(zName)) ){ @@ -57577,16 +57577,16 @@ SQLITE_PRIVATE void sqlite3BeginTrigger( } iTabDb = sqlite3SchemaToIndex(db, pTab->pSchema); -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION { - int code = SQLITE_CREATE_TRIGGER; + int code = STQLITE_CREATE_TRIGGER; const char *zDb = db->aDb[iTabDb].zName; const char *zDbTrig = isTemp ? db->aDb[1].zName : zDb; - if( iTabDb==1 || isTemp ) code = SQLITE_CREATE_TEMP_TRIGGER; + if( iTabDb==1 || isTemp ) code = STQLITE_CREATE_TEMP_TRIGGER; if( sqlite3AuthCheck(pParse, code, zName, pTab->zName, zDbTrig) ){ goto trigger_cleanup; } - if( sqlite3AuthCheck(pParse, SQLITE_INSERT, SCHEMA_TABLE(iTabDb),0,zDb)){ + if( sqlite3AuthCheck(pParse, STQLITE_INSERT, SCHEMA_TABLE(iTabDb),0,zDb)){ goto trigger_cleanup; } } @@ -57633,7 +57633,7 @@ trigger_cleanup: ** This routine is called after all of the trigger actions have been parsed ** in order to complete the process of building the trigger. */ -SQLITE_PRIVATE void sqlite3FinishTrigger( +STQLITE_PRIVATE void sqlite3FinishTrigger( Parse *pParse, /* Parser context */ TriggerStep *pStepList, /* The triggered program */ Token *pAll /* Token that describes the complete CREATE TRIGGER */ @@ -57759,7 +57759,7 @@ static void sqlitePersistTriggerStep(TriggerStep *p){ ** The parser calls this routine when it finds a SELECT statement in ** body of a TRIGGER. */ -SQLITE_PRIVATE TriggerStep *sqlite3TriggerSelectStep(Select *pSelect){ +STQLITE_PRIVATE TriggerStep *sqlite3TriggerSelectStep(Select *pSelect){ TriggerStep *pTriggerStep = sqliteMalloc(sizeof(TriggerStep)); if( pTriggerStep==0 ) { sqlite3SelectDelete(pSelect); @@ -57781,7 +57781,7 @@ SQLITE_PRIVATE TriggerStep *sqlite3TriggerSelectStep(Select *pSelect){ ** The parser calls this routine when it sees an INSERT inside the ** body of a trigger. */ -SQLITE_PRIVATE TriggerStep *sqlite3TriggerInsertStep( +STQLITE_PRIVATE TriggerStep *sqlite3TriggerInsertStep( Token *pTableName, /* Name of the table into which we insert */ IdList *pColumn, /* List of columns in pTableName to insert into */ ExprList *pEList, /* The VALUE clause: a list of values to be inserted */ @@ -57815,7 +57815,7 @@ SQLITE_PRIVATE TriggerStep *sqlite3TriggerInsertStep( ** a pointer to that trigger step. The parser calls this routine when it ** sees an UPDATE statement inside the body of a CREATE TRIGGER. */ -SQLITE_PRIVATE TriggerStep *sqlite3TriggerUpdateStep( +STQLITE_PRIVATE TriggerStep *sqlite3TriggerUpdateStep( Token *pTableName, /* Name of the table to be updated */ ExprList *pEList, /* The SET clause: list of column and new values */ Expr *pWhere, /* The WHERE clause */ @@ -57843,7 +57843,7 @@ SQLITE_PRIVATE TriggerStep *sqlite3TriggerUpdateStep( ** a pointer to that trigger step. The parser calls this routine when it ** sees a DELETE statement inside the body of a CREATE TRIGGER. */ -SQLITE_PRIVATE TriggerStep *sqlite3TriggerDeleteStep(Token *pTableName, Expr *pWhere){ +STQLITE_PRIVATE TriggerStep *sqlite3TriggerDeleteStep(Token *pTableName, Expr *pWhere){ TriggerStep *pTriggerStep = sqliteMalloc(sizeof(TriggerStep)); if( pTriggerStep==0 ){ sqlite3ExprDelete(pWhere); @@ -57862,7 +57862,7 @@ SQLITE_PRIVATE TriggerStep *sqlite3TriggerDeleteStep(Token *pTableName, Expr *pW /* ** Recursively delete a Trigger structure */ -SQLITE_PRIVATE void sqlite3DeleteTrigger(Trigger *pTrigger){ +STQLITE_PRIVATE void sqlite3DeleteTrigger(Trigger *pTrigger){ if( pTrigger==0 ) return; sqlite3DeleteTriggerStep(pTrigger->step_list); sqliteFree(pTrigger->name); @@ -57881,7 +57881,7 @@ SQLITE_PRIVATE void sqlite3DeleteTrigger(Trigger *pTrigger){ ** same job as this routine except it takes a pointer to the trigger ** instead of the trigger name. **/ -SQLITE_PRIVATE void sqlite3DropTrigger(Parse *pParse, SrcList *pName, int noErr){ +STQLITE_PRIVATE void sqlite3DropTrigger(Parse *pParse, SrcList *pName, int noErr){ Trigger *pTrigger = 0; int i; const char *zDb; @@ -57890,7 +57890,7 @@ SQLITE_PRIVATE void sqlite3DropTrigger(Parse *pParse, SrcList *pName, int noErr) sqlite3 *db = pParse->db; if( sqlite3MallocFailed() ) goto drop_trigger_cleanup; - if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){ + if( STQLITE_OK!=sqlite3ReadSchema(pParse) ){ goto drop_trigger_cleanup; } @@ -57929,7 +57929,7 @@ static Table *tableOfTrigger(Trigger *pTrigger){ /* ** Drop a trigger given a pointer to that trigger. */ -SQLITE_PRIVATE void sqlite3DropTriggerPtr(Parse *pParse, Trigger *pTrigger){ +STQLITE_PRIVATE void sqlite3DropTriggerPtr(Parse *pParse, Trigger *pTrigger){ Table *pTable; Vdbe *v; sqlite3 *db = pParse->db; @@ -57940,14 +57940,14 @@ SQLITE_PRIVATE void sqlite3DropTriggerPtr(Parse *pParse, Trigger *pTrigger){ pTable = tableOfTrigger(pTrigger); assert( pTable ); assert( pTable->pSchema==pTrigger->pSchema || iDb==1 ); -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION { - int code = SQLITE_DROP_TRIGGER; + int code = STQLITE_DROP_TRIGGER; const char *zDb = db->aDb[iDb].zName; const char *zTab = SCHEMA_TABLE(iDb); - if( iDb==1 ) code = SQLITE_DROP_TEMP_TRIGGER; + if( iDb==1 ) code = STQLITE_DROP_TEMP_TRIGGER; if( sqlite3AuthCheck(pParse, code, pTrigger->name, pTable->zName, zDb) || - sqlite3AuthCheck(pParse, SQLITE_DELETE, zTab, 0, zDb) ){ + sqlite3AuthCheck(pParse, STQLITE_DELETE, zTab, 0, zDb) ){ return; } } @@ -57983,7 +57983,7 @@ SQLITE_PRIVATE void sqlite3DropTriggerPtr(Parse *pParse, Trigger *pTrigger){ /* ** Remove a trigger from the hash tables of the sqlite* pointer. */ -SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTrigger(sqlite3 *db, int iDb, const char *zName){ +STQLITE_PRIVATE void sqlite3UnlinkAndDeleteTrigger(sqlite3 *db, int iDb, const char *zName){ Trigger *pTrigger; int nName = strlen(zName); pTrigger = sqlite3HashInsert(&(db->aDb[iDb].pSchema->trigHash), @@ -58005,7 +58005,7 @@ SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTrigger(sqlite3 *db, int iDb, const ch assert(cc); } sqlite3DeleteTrigger(pTrigger); - db->flags |= SQLITE_InternChanges; + db->flags |= STQLITE_InternChanges; } } @@ -58036,23 +58036,23 @@ static int checkColumnOverLap(IdList *pIdList, ExprList *pEList){ ** The returned bit vector is some combination of TRIGGER_BEFORE and ** TRIGGER_AFTER. */ -SQLITE_PRIVATE int sqlite3TriggersExist( +STQLITE_PRIVATE int sqlite3TriggersExist( Parse *pParse, /* Used to check for recursive triggers */ Table *pTab, /* The table the contains the triggers */ int op, /* one of TK_DELETE, TK_INSERT, TK_UPDATE */ ExprList *pChanges /* Columns that change in an UPDATE statement */ ){ Trigger *pTrigger; - int mask = 0; + int tqmask = 0; pTrigger = IsVirtual(pTab) ? 0 : pTab->pTrigger; while( pTrigger ){ if( pTrigger->op==op && checkColumnOverLap(pTrigger->pColumns, pChanges) ){ - mask |= pTrigger->tr_tm; + tqmask |= pTrigger->tr_tm; } pTrigger = pTrigger->pNext; } - return mask; + return tqmask; } /* @@ -58175,7 +58175,7 @@ static int codeTriggerProgram( ** trigger program(s). ** */ -SQLITE_PRIVATE int sqlite3CodeRowTrigger( +STQLITE_PRIVATE int sqlite3CodeRowTrigger( Parse *pParse, /* Parse context */ int op, /* One of TK_UPDATE, TK_INSERT, TK_DELETE */ ExprList *pChanges, /* Changes list for any UPDATE OF triggers */ @@ -58213,7 +58213,7 @@ SQLITE_PRIVATE int sqlite3CodeRowTrigger( else{ sqlite3ErrorMsg(pParse, "recursive triggers not supported (%s)", p->name); - return SQLITE_ERROR; + return STQLITE_ERROR; } #endif } @@ -58259,7 +58259,7 @@ SQLITE_PRIVATE int sqlite3CodeRowTrigger( } return 0; } -#endif /* !defined(SQLITE_OMIT_TRIGGER) */ +#endif /* !defined(STQLITE_OMIT_TRIGGER) */ /************** End of trigger.c *********************************************/ /************** Begin file update.c ******************************************/ @@ -58280,7 +58280,7 @@ SQLITE_PRIVATE int sqlite3CodeRowTrigger( ** $Id: update.c,v 1.138 2007/06/25 16:29:34 danielk1977 Exp $ */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Forward declaration */ static void updateVirtualTable( Parse *pParse, /* The parsing context */ @@ -58291,7 +58291,7 @@ static void updateVirtualTable( int *aXRef, /* Mapping from columns of pTab to entries in pChanges */ Expr *pWhere /* WHERE clause of the UPDATE statement */ ); -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ /* ** The most recently coded instruction was an OP_Column to retrieve the @@ -58318,7 +58318,7 @@ static void updateVirtualTable( ** function is capable of transforming these types of expressions into ** sqlite3_value objects. */ -SQLITE_PRIVATE void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i){ +STQLITE_PRIVATE void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i){ if( pTab && !pTab->pSelect ){ sqlite3_value *pValue; u8 enc = ENC(sqlite3VdbeDb(v)); @@ -58340,7 +58340,7 @@ SQLITE_PRIVATE void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i){ ** \_______/ \________/ \______/ \________________/ * onError pTabList pChanges pWhere */ -SQLITE_PRIVATE void sqlite3Update( +STQLITE_PRIVATE void sqlite3Update( Parse *pParse, /* The parser context */ SrcList *pTabList, /* The table in which we should change things */ ExprList *pChanges, /* Things to be changed */ @@ -58370,7 +58370,7 @@ SQLITE_PRIVATE void sqlite3Update( int iDb; /* Database containing the table being updated */ int memCnt = 0; /* Memory cell used for counting rows changed */ -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER int isView; /* Trying to update a view */ int triggers_exist = 0; /* True if any row triggers exist */ #endif @@ -58394,14 +58394,14 @@ SQLITE_PRIVATE void sqlite3Update( /* Figure out if we have any triggers and if the table being ** updated is a view */ -#ifndef SQLITE_OMIT_TRIGGER +#ifndef STQLITE_OMIT_TRIGGER triggers_exist = sqlite3TriggersExist(pParse, pTab, TK_UPDATE, pChanges); isView = pTab->pSelect!=0; #else # define triggers_exist 0 # define isView 0 #endif -#ifdef SQLITE_OMIT_VIEW +#ifdef STQLITE_OMIT_VIEW # undef isView # define isView 0 #endif @@ -58469,14 +58469,14 @@ SQLITE_PRIVATE void sqlite3Update( goto update_cleanup; } } -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION { int rc; - rc = sqlite3AuthCheck(pParse, SQLITE_UPDATE, pTab->zName, + rc = sqlite3AuthCheck(pParse, STQLITE_UPDATE, pTab->zName, pTab->aCol[j].zName, db->aDb[iDb].zName); - if( rc==SQLITE_DENY ){ + if( rc==STQLITE_DENY ){ goto update_cleanup; - }else if( rc==SQLITE_IGNORE ){ + }else if( rc==STQLITE_IGNORE ){ aXRef[j] = -1; } } @@ -58526,7 +58526,7 @@ SQLITE_PRIVATE void sqlite3Update( if( pParse->nested==0 ) sqlite3VdbeCountChanges(v); sqlite3BeginWriteOperation(pParse, 1, iDb); -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Virtual tables must be handled separately */ if( IsVirtual(pTab) ){ updateVirtualTable(pParse, pTabList, pTab, pChanges, pRowidExpr, aXRef, @@ -58576,7 +58576,7 @@ SQLITE_PRIVATE void sqlite3Update( /* Initialize the count of updated rows */ - if( db->flags & SQLITE_CountRows && !pParse->trigStack ){ + if( db->flags & STQLITE_CountRows && !pParse->trigStack ){ memCnt = pParse->nMem++; sqlite3VdbeAddOp(v, OP_MemInt, 0, memCnt); } @@ -58735,7 +58735,7 @@ SQLITE_PRIVATE void sqlite3Update( /* Increment the row counter */ - if( db->flags & SQLITE_CountRows && !pParse->trigStack){ + if( db->flags & STQLITE_CountRows && !pParse->trigStack){ sqlite3VdbeAddOp(v, OP_MemIncr, 1, memCnt); } @@ -58780,7 +58780,7 @@ SQLITE_PRIVATE void sqlite3Update( ** generating code because of a call to sqlite3NestedParse(), do not ** invoke the callback function. */ - if( db->flags & SQLITE_CountRows && !pParse->trigStack && pParse->nested==0 ){ + if( db->flags & STQLITE_CountRows && !pParse->trigStack && pParse->nested==0 ){ sqlite3VdbeAddOp(v, OP_MemLoad, memCnt, 0); sqlite3VdbeAddOp(v, OP_Callback, 1, 0); sqlite3VdbeSetNumCols(v, 1); @@ -58797,11 +58797,11 @@ update_cleanup: return; } -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* ** Generate code for an UPDATE of a virtual table. ** -** The strategy is that we create an ephemerial table that contains +** The strategy is that we create an ephemerial table that tqcontains ** for each row to be changed: ** ** (A) The original rowid of that row. @@ -58888,7 +58888,7 @@ static void updateVirtualTable( /* Cleanup */ sqlite3SelectDelete(pSelect); } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ /************** End of update.c **********************************************/ /************** Begin file vacuum.c ******************************************/ @@ -58906,21 +58906,21 @@ static void updateVirtualTable( ** This file contains code used to implement the VACUUM command. ** ** Most of the code in this file may be omitted by defining the -** SQLITE_OMIT_VACUUM macro. +** STQLITE_OMIT_VACUUM macro. ** ** $Id: vacuum.c,v 1.69 2007/03/27 16:19:52 danielk1977 Exp $ */ -#if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH) +#if !defined(STQLITE_OMIT_VACUUM) && !defined(STQLITE_OMIT_ATTACH) /* ** Execute zSql on database db. Return an error code. */ static int execSql(sqlite3 *db, const char *zSql){ sqlite3_stmt *pStmt; - if( SQLITE_OK!=sqlite3_prepare(db, zSql, -1, &pStmt, 0) ){ + if( STQLITE_OK!=sqlite3_prepare(db, zSql, -1, &pStmt, 0) ){ return sqlite3_errcode(db); } - while( SQLITE_ROW==sqlite3_step(pStmt) ){} + while( STQLITE_ROW==sqlite3_step(pStmt) ){} return sqlite3_finalize(pStmt); } @@ -58933,11 +58933,11 @@ static int execExecSql(sqlite3 *db, const char *zSql){ int rc; rc = sqlite3_prepare(db, zSql, -1, &pStmt, 0); - if( rc!=SQLITE_OK ) return rc; + if( rc!=STQLITE_OK ) return rc; - while( SQLITE_ROW==sqlite3_step(pStmt) ){ + while( STQLITE_ROW==sqlite3_step(pStmt) ){ rc = execSql(db, (char*)sqlite3_column_text(pStmt, 0)); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqlite3_finalize(pStmt); return rc; } @@ -58951,12 +58951,12 @@ static int execExecSql(sqlite3 *db, const char *zSql){ ** collapse free space, etc. It is modelled after the VACUUM command ** in PostgreSQL. ** -** In version 1.0.x of SQLite, the VACUUM command would call +** In version 1.0.x of STQLite, the VACUUM command would call ** gdbm_reorganize() on all the database tables. But beginning -** with 2.0.0, SQLite no longer uses GDBM so this command has +** with 2.0.0, STQLite no longer uses GDBM so this command has ** become a no-op. */ -SQLITE_PRIVATE void sqlite3Vacuum(Parse *pParse){ +STQLITE_PRIVATE void sqlite3Vacuum(Parse *pParse){ Vdbe *v = sqlite3GetVdbe(pParse); if( v ){ sqlite3VdbeAddOp(v, OP_Vacuum, 0, 0); @@ -58967,8 +58967,8 @@ SQLITE_PRIVATE void sqlite3Vacuum(Parse *pParse){ /* ** This routine implements the OP_Vacuum opcode of the VDBE. */ -SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ - int rc = SQLITE_OK; /* Return code from service routines */ +STQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ + int rc = STQLITE_OK; /* Return code from service routines */ Btree *pMain; /* The database being vacuumed */ Btree *pTemp; /* The temporary database we vacuum into */ char *zSql = 0; /* SQL statements */ @@ -58977,12 +58977,12 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ /* Save the current value of the write-schema flag before setting it. */ saved_flags = db->flags; - db->flags |= SQLITE_WriteSchema | SQLITE_IgnoreChecks; + db->flags |= STQLITE_WriteSchema | STQLITE_IgnoreChecks; if( !db->autoCommit ){ sqlite3SetString(pzErrMsg, "cannot VACUUM from within a transaction", (char*)0); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; goto end_of_vacuum; } pMain = db->aDb[0].pBt; @@ -58997,29 +58997,29 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ */ zSql = "ATTACH '' AS vacuum_db;"; rc = execSql(db, zSql); - if( rc!=SQLITE_OK ) goto end_of_vacuum; + if( rc!=STQLITE_OK ) goto end_of_vacuum; pDb = &db->aDb[db->nDb-1]; assert( strcmp(db->aDb[db->nDb-1].zName,"vacuum_db")==0 ); pTemp = db->aDb[db->nDb-1].pBt; sqlite3BtreeSetPageSize(pTemp, sqlite3BtreeGetPageSize(pMain), sqlite3BtreeGetReserve(pMain)); if( sqlite3MallocFailed() ){ - rc = SQLITE_NOMEM; + rc = STQLITE_NOMEM; goto end_of_vacuum; } assert( sqlite3BtreeGetPageSize(pTemp)==sqlite3BtreeGetPageSize(pMain) ); rc = execSql(db, "PRAGMA vacuum_db.synchronous=OFF"); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ goto end_of_vacuum; } -#ifndef SQLITE_OMIT_AUTOVACUUM +#ifndef STQLITE_OMIT_AUTOVACUUM sqlite3BtreeSetAutoVacuum(pTemp, sqlite3BtreeGetAutoVacuum(pMain)); #endif /* Begin a transaction */ rc = execSql(db, "BEGIN EXCLUSIVE;"); - if( rc!=SQLITE_OK ) goto end_of_vacuum; + if( rc!=STQLITE_OK ) goto end_of_vacuum; /* Query the schema of the main database. Create a mirror schema ** in the temporary database. @@ -59029,15 +59029,15 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ " FROM sqlite_master WHERE type='table' AND name!='sqlite_sequence'" " AND rootpage>0" ); - if( rc!=SQLITE_OK ) goto end_of_vacuum; + if( rc!=STQLITE_OK ) goto end_of_vacuum; rc = execExecSql(db, "SELECT 'CREATE INDEX vacuum_db.' || substr(sql,14,100000000)" " FROM sqlite_master WHERE sql LIKE 'CREATE INDEX %' "); - if( rc!=SQLITE_OK ) goto end_of_vacuum; + if( rc!=STQLITE_OK ) goto end_of_vacuum; rc = execExecSql(db, - "SELECT 'CREATE UNIQUE INDEX vacuum_db.' || substr(sql,21,100000000) " - " FROM sqlite_master WHERE sql LIKE 'CREATE UNIQUE INDEX %'"); - if( rc!=SQLITE_OK ) goto end_of_vacuum; + "SELECT 'CREATE UNITQUE INDEX vacuum_db.' || substr(sql,21,100000000) " + " FROM sqlite_master WHERE sql LIKE 'CREATE UNITQUE INDEX %'"); + if( rc!=STQLITE_OK ) goto end_of_vacuum; /* Loop through the tables in the main database. For each, do ** an "INSERT INTO vacuum_db.xxx SELECT * FROM xxx;" to copy @@ -59051,7 +59051,7 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ " AND rootpage>0" ); - if( rc!=SQLITE_OK ) goto end_of_vacuum; + if( rc!=STQLITE_OK ) goto end_of_vacuum; /* Copy over the sequence table */ @@ -59059,19 +59059,19 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ "SELECT 'DELETE FROM vacuum_db.' || quote(name) || ';' " "FROM vacuum_db.sqlite_master WHERE name='sqlite_sequence' " ); - if( rc!=SQLITE_OK ) goto end_of_vacuum; + if( rc!=STQLITE_OK ) goto end_of_vacuum; rc = execExecSql(db, "SELECT 'INSERT INTO vacuum_db.' || quote(name) " "|| ' SELECT * FROM ' || quote(name) || ';' " "FROM vacuum_db.sqlite_master WHERE name=='sqlite_sequence';" ); - if( rc!=SQLITE_OK ) goto end_of_vacuum; + if( rc!=STQLITE_OK ) goto end_of_vacuum; /* Copy the triggers, views, and virtual tables from the main database ** over to the temporary database. None of these objects has any ** associated storage, so all we have to do is copy their entries - ** from the SQLITE_MASTER table. + ** from the STQLITE_MASTER table. */ rc = execSql(db, "INSERT INTO vacuum_db.sqlite_master " @@ -59090,7 +59090,7 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ ** opened for writing. This way, the SQL transaction used to create the ** temporary database never needs to be committed. */ - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ u32 meta; int i; @@ -59113,15 +59113,15 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ /* Copy Btree meta values */ for(i=0; i<sizeof(aCopy)/sizeof(aCopy[0]); i+=2){ rc = sqlite3BtreeGetMeta(pMain, aCopy[i], &meta); - if( rc!=SQLITE_OK ) goto end_of_vacuum; + if( rc!=STQLITE_OK ) goto end_of_vacuum; rc = sqlite3BtreeUpdateMeta(pTemp, aCopy[i], meta+aCopy[i+1]); - if( rc!=SQLITE_OK ) goto end_of_vacuum; + if( rc!=STQLITE_OK ) goto end_of_vacuum; } rc = sqlite3BtreeCopyFile(pMain, pTemp); - if( rc!=SQLITE_OK ) goto end_of_vacuum; + if( rc!=STQLITE_OK ) goto end_of_vacuum; rc = sqlite3BtreeCommit(pTemp); - if( rc!=SQLITE_OK ) goto end_of_vacuum; + if( rc!=STQLITE_OK ) goto end_of_vacuum; rc = sqlite3BtreeCommit(pMain); } @@ -59150,7 +59150,7 @@ end_of_vacuum: return rc; } -#endif /* SQLITE_OMIT_VACUUM && SQLITE_OMIT_ATTACH */ +#endif /* STQLITE_OMIT_VACUUM && STQLITE_OMIT_ATTACH */ /************** End of vacuum.c **********************************************/ /************** Begin file vtab.c ********************************************/ @@ -59169,7 +59169,7 @@ end_of_vacuum: ** ** $Id: vtab.c,v 1.48 2007/06/26 10:38:55 danielk1977 Exp $ */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE static int createModule( sqlite3 *db, /* Database in which module is registered */ @@ -59194,7 +59194,7 @@ static int createModule( sqliteFree(pMod); sqlite3ResetInternalSchema(db, 0); } - return sqlite3ApiExit(db, SQLITE_OK); + return sqlite3ApiExit(db, STQLITE_OK); } @@ -59231,7 +59231,7 @@ int sqlite3_create_module_v2( ** If a disconnect is attempted while a virtual table is locked, ** the disconnect is deferred until all locks have been removed. */ -SQLITE_PRIVATE void sqlite3VtabLock(sqlite3_vtab *pVtab){ +STQLITE_PRIVATE void sqlite3VtabLock(sqlite3_vtab *pVtab){ pVtab->nRef++; } @@ -59239,12 +59239,12 @@ SQLITE_PRIVATE void sqlite3VtabLock(sqlite3_vtab *pVtab){ ** Unlock a virtual table. When the last lock is removed, ** disconnect the virtual table. */ -SQLITE_PRIVATE void sqlite3VtabUnlock(sqlite3 *db, sqlite3_vtab *pVtab){ +STQLITE_PRIVATE void sqlite3VtabUnlock(sqlite3 *db, sqlite3_vtab *pVtab){ pVtab->nRef--; assert(db); assert(!sqlite3SafetyCheck(db)); if( pVtab->nRef==0 ){ - if( db->magic==SQLITE_MAGIC_BUSY ){ + if( db->magic==STQLITE_MAGIC_BUSY ){ sqlite3SafetyOff(db); pVtab->pModule->xDisconnect(pVtab); sqlite3SafetyOn(db); @@ -59259,7 +59259,7 @@ SQLITE_PRIVATE void sqlite3VtabUnlock(sqlite3 *db, sqlite3_vtab *pVtab){ ** This routine is called, for example, just before deleting the Table ** record. */ -SQLITE_PRIVATE void sqlite3VtabClear(Table *p){ +STQLITE_PRIVATE void sqlite3VtabClear(Table *p){ sqlite3_vtab *pVtab = p->pVtab; if( pVtab ){ assert( p->pMod && p->pMod->pModule ); @@ -59306,7 +59306,7 @@ static void addModuleArgument(Table *pTable, char *zArg){ ** statement. The module name has been parsed, but the optional list ** of parameters that follow the module name are still pending. */ -SQLITE_PRIVATE void sqlite3VtabBeginParse( +STQLITE_PRIVATE void sqlite3VtabBeginParse( Parse *pParse, /* Parsing context */ Token *pName1, /* Name of new table, or database name */ Token *pName2, /* Name of new table or NULL */ @@ -59315,7 +59315,7 @@ SQLITE_PRIVATE void sqlite3VtabBeginParse( int iDb; /* The database the table is being created in */ Table *pTable; /* The new virtual table */ -#ifndef SQLITE_OMIT_SHARED_CACHE +#ifndef STQLITE_OMIT_SHARED_CACHE if( sqlite3ThreadDataReadOnly()->useSharedData ){ sqlite3ErrorMsg(pParse, "Cannot use virtual tables in shared-cache mode"); return; @@ -59337,14 +59337,14 @@ SQLITE_PRIVATE void sqlite3VtabBeginParse( addModuleArgument(pTable, sqlite3StrDup(pTable->zName)); pParse->sNameToken.n = pModuleName->z + pModuleName->n - pName1->z; -#ifndef SQLITE_OMIT_AUTHORIZATION +#ifndef STQLITE_OMIT_AUTHORIZATION /* Creating a virtual table invokes the authorization callback twice. ** The first invocation, to obtain permission to INSERT a row into the ** sqlite_master table, has already been made by sqlite3StartTable(). ** The second call, to obtain permission to create the table, is made now. */ if( pTable->azModuleArg ){ - sqlite3AuthCheck(pParse, SQLITE_CREATE_VTABLE, pTable->zName, + sqlite3AuthCheck(pParse, STQLITE_CREATE_VTABLE, pTable->zName, pTable->azModuleArg[0], pParse->db->aDb[iDb].zName); } #endif @@ -59367,7 +59367,7 @@ static void addArgumentToVtab(Parse *pParse){ ** The parser calls this routine after the CREATE VIRTUAL TABLE statement ** has been completely parsed. */ -SQLITE_PRIVATE void sqlite3VtabFinishParse(Parse *pParse, Token *pEnd){ +STQLITE_PRIVATE void sqlite3VtabFinishParse(Parse *pParse, Token *pEnd){ Table *pTab; /* The table being constructed */ sqlite3 *db; /* The database connection */ char *zModule; /* The module name of the table: USING modulename */ @@ -59404,7 +59404,7 @@ SQLITE_PRIVATE void sqlite3VtabFinishParse(Parse *pParse, Token *pEnd){ zStmt = sqlite3MPrintf("CREATE VIRTUAL TABLE %T", &pParse->sNameToken); /* A slot for the record has already been allocated in the - ** SQLITE_MASTER table. We just need to update that slot with all + ** STQLITE_MASTER table. We just need to update that slot with all ** the information we've collected. ** ** The top of the stack is the rootpage allocated by sqlite3StartTable(). @@ -59455,7 +59455,7 @@ SQLITE_PRIVATE void sqlite3VtabFinishParse(Parse *pParse, Token *pEnd){ ** The parser calls this routine when it sees the first token ** of an argument to the module name in a CREATE VIRTUAL TABLE statement. */ -SQLITE_PRIVATE void sqlite3VtabArgInit(Parse *pParse){ +STQLITE_PRIVATE void sqlite3VtabArgInit(Parse *pParse){ addArgumentToVtab(pParse); pParse->sArg.z = 0; pParse->sArg.n = 0; @@ -59465,7 +59465,7 @@ SQLITE_PRIVATE void sqlite3VtabArgInit(Parse *pParse){ ** The parser calls this routine for each token after the first token ** in an argument to the module name in a CREATE VIRTUAL TABLE statement. */ -SQLITE_PRIVATE void sqlite3VtabArgExtend(Parse *pParse, Token *p){ +STQLITE_PRIVATE void sqlite3VtabArgExtend(Parse *pParse, Token *p){ Token *pArg = &pParse->sArg; if( pArg->z==0 ){ pArg->z = p->z; @@ -59497,7 +59497,7 @@ static int vtabCallConstructor( char *zModuleName = sqlite3MPrintf("%s", pTab->zName); if( !zModuleName ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } assert( !db->pVTab ); @@ -59505,16 +59505,16 @@ static int vtabCallConstructor( db->pVTab = pTab; rc = sqlite3SafetyOff(db); - assert( rc==SQLITE_OK ); + assert( rc==STQLITE_OK ); rc = xConstruct(db, pMod->pAux, nArg, azArg, &pTab->pVtab, &zErr); rc2 = sqlite3SafetyOn(db); pVtab = pTab->pVtab; - if( rc==SQLITE_OK && pVtab ){ + if( rc==STQLITE_OK && pVtab ){ pVtab->pModule = pMod->pModule; pVtab->nRef = 1; } - if( SQLITE_OK!=rc ){ + if( STQLITE_OK!=rc ){ if( zErr==0 ){ *pzErr = sqlite3MPrintf("vtable constructor failed: %s", zModuleName); }else { @@ -59524,9 +59524,9 @@ static int vtabCallConstructor( }else if( db->pVTab ){ const char *zFormat = "vtable constructor did not declare schema: %s"; *pzErr = sqlite3MPrintf(zFormat, pTab->zName); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = rc2; } db->pVTab = 0; @@ -59537,7 +59537,7 @@ static int vtabCallConstructor( ** If so, set the Column.isHidden flag and remove the token from ** the type string. */ - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ int iCol; for(iCol=0; iCol<pTab->nCol; iCol++){ char *zType = pTab->aCol[iCol].zType; @@ -59579,24 +59579,24 @@ static int vtabCallConstructor( ** ** This call is a no-op if table pTab is not a virtual table. */ -SQLITE_PRIVATE int sqlite3VtabCallConnect(Parse *pParse, Table *pTab){ +STQLITE_PRIVATE int sqlite3VtabCallConnect(Parse *pParse, Table *pTab){ Module *pMod; - int rc = SQLITE_OK; + int rc = STQLITE_OK; if( !pTab || !pTab->isVirtual || pTab->pVtab ){ - return SQLITE_OK; + return STQLITE_OK; } pMod = pTab->pMod; if( !pMod ){ const char *zModule = pTab->azModuleArg[0]; sqlite3ErrorMsg(pParse, "no such module: %s", zModule); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } else { char *zErr = 0; sqlite3 *db = pParse->db; rc = vtabCallConstructor(db, pTab, pMod, pMod->pModule->xConnect, &zErr); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqlite3ErrorMsg(pParse, "%s", zErr); } sqliteFree(zErr); @@ -59617,7 +59617,7 @@ static int addToVTrans(sqlite3 *db, sqlite3_vtab *pVtab){ int nBytes = sizeof(sqlite3_vtab *) * (db->nVTrans + ARRAY_INCR); aVTrans = sqliteRealloc((void *)db->aVTrans, nBytes); if( !aVTrans ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } memset(&aVTrans[db->nVTrans], 0, sizeof(sqlite3_vtab *)*ARRAY_INCR); db->aVTrans = aVTrans; @@ -59626,7 +59626,7 @@ static int addToVTrans(sqlite3 *db, sqlite3_vtab *pVtab){ /* Add pVtab to the end of sqlite3.aVTrans */ db->aVTrans[db->nVTrans++] = pVtab; sqlite3VtabLock(pVtab); - return SQLITE_OK; + return STQLITE_OK; } /* @@ -59634,11 +59634,11 @@ static int addToVTrans(sqlite3 *db, sqlite3_vtab *pVtab){ ** of the virtual table named zTab in database iDb. ** ** If an error occurs, *pzErr is set to point an an English language -** description of the error and an SQLITE_XXX error code is returned. +** description of the error and an STQLITE_XXX error code is returned. ** In this case the caller must call sqliteFree() on *pzErr. */ -SQLITE_PRIVATE int sqlite3VtabCallCreate(sqlite3 *db, int iDb, const char *zTab, char **pzErr){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3VtabCallCreate(sqlite3 *db, int iDb, const char *zTab, char **pzErr){ + int rc = STQLITE_OK; Table *pTab; Module *pMod; const char *zModule; @@ -59654,12 +59654,12 @@ SQLITE_PRIVATE int sqlite3VtabCallCreate(sqlite3 *db, int iDb, const char *zTab, */ if( !pMod ){ *pzErr = sqlite3MPrintf("no such module: %s", zModule); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; }else{ rc = vtabCallConstructor(db, pTab, pMod, pMod->pModule->xCreate, pzErr); } - if( rc==SQLITE_OK && pTab->pVtab ){ + if( rc==STQLITE_OK && pTab->pVtab ){ rc = addToVTrans(db, pTab->pVtab); } @@ -59674,13 +59674,13 @@ SQLITE_PRIVATE int sqlite3VtabCallCreate(sqlite3 *db, int iDb, const char *zTab, int sqlite3_declare_vtab(sqlite3 *db, const char *zCreateTable){ Parse sParse; - int rc = SQLITE_OK; + int rc = STQLITE_OK; Table *pTab = db->pVTab; char *zErr = 0; if( !pTab ){ - sqlite3Error(db, SQLITE_MISUSE, 0); - return SQLITE_MISUSE; + sqlite3Error(db, STQLITE_MISUSE, 0); + return STQLITE_MISUSE; } assert(pTab->isVirtual && pTab->nCol==0 && pTab->aCol==0); @@ -59689,7 +59689,7 @@ int sqlite3_declare_vtab(sqlite3 *db, const char *zCreateTable){ sParse.db = db; if( - SQLITE_OK == sqlite3RunParser(&sParse, zCreateTable, &zErr) && + STQLITE_OK == sqlite3RunParser(&sParse, zCreateTable, &zErr) && sParse.pNewTable && !sParse.pNewTable->pSelect && !sParse.pNewTable->isVirtual @@ -59700,9 +59700,9 @@ int sqlite3_declare_vtab(sqlite3 *db, const char *zCreateTable){ sParse.pNewTable->aCol = 0; db->pVTab = 0; } else { - sqlite3Error(db, SQLITE_ERROR, zErr); + sqlite3Error(db, STQLITE_ERROR, zErr); sqliteFree(zErr); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } sParse.declareVtab = 0; @@ -59721,9 +59721,9 @@ int sqlite3_declare_vtab(sqlite3 *db, const char *zCreateTable){ ** ** This call is a no-op if zTab is not a virtual table. */ -SQLITE_PRIVATE int sqlite3VtabCallDestroy(sqlite3 *db, int iDb, const char *zTab) +STQLITE_PRIVATE int sqlite3VtabCallDestroy(sqlite3 *db, int iDb, const char *zTab) { - int rc = SQLITE_OK; + int rc = STQLITE_OK; Table *pTab; pTab = sqlite3FindTable(db, zTab, db->aDb[iDb].zName); @@ -59731,12 +59731,12 @@ SQLITE_PRIVATE int sqlite3VtabCallDestroy(sqlite3 *db, int iDb, const char *zTab if( pTab->pVtab ){ int (*xDestroy)(sqlite3_vtab *pVTab) = pTab->pMod->pModule->xDestroy; rc = sqlite3SafetyOff(db); - assert( rc==SQLITE_OK ); + assert( rc==STQLITE_OK ); if( xDestroy ){ rc = xDestroy(pTab->pVtab); } sqlite3SafetyOn(db); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ pTab->pVtab = 0; } } @@ -59769,21 +59769,21 @@ static void callFinaliser(sqlite3 *db, int offset){ } /* -** If argument rc2 is not SQLITE_OK, then return it and do nothing. +** If argument rc2 is not STQLITE_OK, then return it and do nothing. ** Otherwise, invoke the xSync method of all virtual tables in the ** sqlite3.aVTrans array. Return the error code for the first error -** that occurs, or SQLITE_OK if all xSync operations are successful. +** that occurs, or STQLITE_OK if all xSync operations are successful. */ -SQLITE_PRIVATE int sqlite3VtabSync(sqlite3 *db, int rc2){ +STQLITE_PRIVATE int sqlite3VtabSync(sqlite3 *db, int rc2){ int i; - int rc = SQLITE_OK; + int rc = STQLITE_OK; int rcsafety; sqlite3_vtab **aVTrans = db->aVTrans; - if( rc2!=SQLITE_OK ) return rc2; + if( rc2!=STQLITE_OK ) return rc2; rc = sqlite3SafetyOff(db); db->aVTrans = 0; - for(i=0; rc==SQLITE_OK && i<db->nVTrans && aVTrans[i]; i++){ + for(i=0; rc==STQLITE_OK && i<db->nVTrans && aVTrans[i]; i++){ sqlite3_vtab *pVtab = aVTrans[i]; int (*x)(sqlite3_vtab *); x = pVtab->pModule->xSync; @@ -59794,7 +59794,7 @@ SQLITE_PRIVATE int sqlite3VtabSync(sqlite3 *db, int rc2){ db->aVTrans = aVTrans; rcsafety = sqlite3SafetyOn(db); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ rc = rcsafety; } return rc; @@ -59804,18 +59804,18 @@ SQLITE_PRIVATE int sqlite3VtabSync(sqlite3 *db, int rc2){ ** Invoke the xRollback method of all virtual tables in the ** sqlite3.aVTrans array. Then clear the array itself. */ -SQLITE_PRIVATE int sqlite3VtabRollback(sqlite3 *db){ +STQLITE_PRIVATE int sqlite3VtabRollback(sqlite3 *db){ callFinaliser(db, (int)(&((sqlite3_module *)0)->xRollback)); - return SQLITE_OK; + return STQLITE_OK; } /* ** Invoke the xCommit method of all virtual tables in the ** sqlite3.aVTrans array. Then clear the array itself. */ -SQLITE_PRIVATE int sqlite3VtabCommit(sqlite3 *db){ +STQLITE_PRIVATE int sqlite3VtabCommit(sqlite3 *db){ callFinaliser(db, (int)(&((sqlite3_module *)0)->xCommit)); - return SQLITE_OK; + return STQLITE_OK; } /* @@ -59826,20 +59826,20 @@ SQLITE_PRIVATE int sqlite3VtabCommit(sqlite3 *db){ ** If the xBegin call is successful, place the sqlite3_vtab pointer ** in the sqlite3.aVTrans array. */ -SQLITE_PRIVATE int sqlite3VtabBegin(sqlite3 *db, sqlite3_vtab *pVtab){ - int rc = SQLITE_OK; +STQLITE_PRIVATE int sqlite3VtabBegin(sqlite3 *db, sqlite3_vtab *pVtab){ + int rc = STQLITE_OK; const sqlite3_module *pModule; /* Special case: If db->aVTrans is NULL and db->nVTrans is greater ** than zero, then this function is being called from within a ** virtual module xSync() callback. It is illegal to write to - ** virtual module tables in this case, so return SQLITE_LOCKED. + ** virtual module tables in this case, so return STQLITE_LOCKED. */ if( 0==db->aVTrans && db->nVTrans>0 ){ - return SQLITE_LOCKED; + return STQLITE_LOCKED; } if( !pVtab ){ - return SQLITE_OK; + return STQLITE_OK; } pModule = pVtab->pModule; @@ -59850,13 +59850,13 @@ SQLITE_PRIVATE int sqlite3VtabBegin(sqlite3 *db, sqlite3_vtab *pVtab){ /* If pVtab is already in the aVTrans array, return early */ for(i=0; (i<db->nVTrans) && 0!=db->aVTrans[i]; i++){ if( db->aVTrans[i]==pVtab ){ - return SQLITE_OK; + return STQLITE_OK; } } /* Invoke the xBegin method */ rc = pModule->xBegin(pVtab); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ return rc; } @@ -59876,9 +59876,9 @@ SQLITE_PRIVATE int sqlite3VtabBegin(sqlite3 *db, sqlite3_vtab *pVtab){ ** ** Return either the pDef argument (indicating no change) or a ** new FuncDef structure that is marked as ephemeral using the -** SQLITE_FUNC_EPHEM flag. +** STQLITE_FUNC_EPHEM flag. */ -SQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction( +STQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction( FuncDef *pDef, /* Function to possibly overload */ int nArg, /* Number of arguments to the function */ Expr *pExpr /* First argument to the function */ @@ -59929,11 +59929,11 @@ SQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction( memcpy(pNew->zName, pDef->zName, strlen(pDef->zName)+1); pNew->xFunc = xFunc; pNew->pUserData = pArg; - pNew->flags |= SQLITE_FUNC_EPHEM; + pNew->flags |= STQLITE_FUNC_EPHEM; return pNew; } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ /************** End of vtab.c ************************************************/ /************** Begin file where.c *******************************************/ @@ -59959,14 +59959,14 @@ SQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction( */ /* -** The number of bits in a Bitmask. "BMS" means "BitMask Size". +** The number of bits in a Bittqmask. "BMS" means "BitMask Size". */ -#define BMS (sizeof(Bitmask)*8) +#define BMS (sizeof(Bittqmask)*8) /* ** Trace output macros */ -#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) +#if defined(STQLITE_TEST) || defined(STQLITE_DEBUG) int sqlite3_where_trace = 0; # define WHERETRACE(X) if(sqlite3_where_trace) sqlite3DebugPrintf X #else @@ -59995,20 +59995,20 @@ typedef struct ExprMaskSet ExprMaskSet; ** where X is a column name and <op> is one of certain operators, ** then WhereTerm.leftCursor and WhereTerm.leftColumn record the ** cursor number and column number for X. WhereTerm.operator records -** the <op> using a bitmask encoding defined by WO_xxx below. The -** use of a bitmask encoding for the operator allows us to search +** the <op> using a bittqmask encoding defined by WO_xxx below. The +** use of a bittqmask encoding for the operator allows us to search ** quickly for terms that match any of several different operators. ** ** prereqRight and prereqAll record sets of cursor numbers, ** but they do so indirectly. A single ExprMaskSet structure translates ** cursor number into bits and the translated bit is stored in the prereq ** fields. The translation is used in order to maximize the number of -** bits that will fit in a Bitmask. The VDBE cursor numbers might be +** bits that will fit in a Bittqmask. The VDBE cursor numbers might be ** spread out over the non-negative integers. For example, the cursor ** numbers might be 3, 8, 9, 10, 20, 23, 41, and 45. The ExprMaskSet ** translates these sparse cursor numbers into consecutive integers ** beginning with 0 in order to make the best possible use of the available -** bits in the Bitmask. So, in the example above, the cursor numbers +** bits in the Bittqmask. So, in the example above, the cursor numbers ** would be mapped into integers 0 through 7. */ typedef struct WhereTerm WhereTerm; @@ -60019,10 +60019,10 @@ struct WhereTerm { i16 leftColumn; /* Column number of X in "X <op> <expr>" */ u16 eOperator; /* A WO_xx value describing <op> */ u8 flags; /* Bit flags. See below */ - u8 nChild; /* Number of children that must disable us */ + u8 nChild; /* Number of tqchildren that must disable us */ WhereClause *pWC; /* The clause this term is part of */ - Bitmask prereqRight; /* Bitmask of tables used by pRight */ - Bitmask prereqAll; /* Bitmask of tables referenced by p */ + Bittqmask prereqRight; /* Bittqmask of tables used by pRight */ + Bittqmask prereqAll; /* Bittqmask of tables referenced by p */ }; /* @@ -60040,7 +60040,7 @@ struct WhereTerm { */ struct WhereClause { Parse *pParse; /* The parser context */ - ExprMaskSet *pMaskSet; /* Mapping of table indices to bitmasks */ + ExprMaskSet *pMaskSet; /* Mapping of table indices to bittqmasks */ int nTerm; /* Number of terms */ int nSlot; /* Number of entries in a[] */ WhereTerm *a; /* Each a[] describes a term of the WHERE cluase */ @@ -60049,18 +60049,18 @@ struct WhereClause { /* ** An instance of the following structure keeps track of a mapping -** between VDBE cursor numbers and bits of the bitmasks in WhereTerm. +** between VDBE cursor numbers and bits of the bittqmasks 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 bitmasks. This structure provides a mapping +** use of the bits in our bittqmasks. This structure provides a mapping ** from the sparse cursor numbers into consecutive integers beginning ** with 0. ** -** If ExprMaskSet.ix[A]==B it means that The A-th bit of a Bitmask -** corresponds VDBE cursor number B. The A-th bit of a bitmask is 1<<A. +** If ExprMaskSet.ix[A]==B it means that The A-th bit of a Bittqmask +** corresponds VDBE cursor number B. The A-th bit of a bittqmask is 1<<A. ** ** For example, if the WHERE clause expression used these VDBE ** cursors: 4, 5, 8, 29, 57, 73. Then the ExprMaskSet structure @@ -60075,12 +60075,12 @@ struct WhereClause { */ struct ExprMaskSet { int n; /* Number of assigned cursor values */ - int ix[sizeof(Bitmask)*8]; /* Cursor assigned to each bit */ + int ix[sizeof(Bittqmask)*8]; /* Cursor assigned to each bit */ }; /* -** Bitmasks for the operators that indices are able to exploit. An +** Bittqmasks 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. */ @@ -60096,7 +60096,7 @@ struct ExprMaskSet { /* ** Value for flags returned by bestIndex(). ** -** The least significant byte is reserved as a mask for WO_ values above. +** The least significant byte is reserved as a tqmask for WO_ values above. ** The WhereLevel.flags field is usually set to WO_IN|WO_EQ|WO_ISNULL. ** But if the table is the right table of a left join, WhereLevel.flags ** is set to WO_IN|WO_EQ. The WhereLevel.flags field can then be used as @@ -60114,7 +60114,7 @@ struct ExprMaskSet { #define WHERE_IDX_ONLY 0x080000 /* Use index only - omit table */ #define WHERE_ORDERBY 0x100000 /* Output will appear in correct order */ #define WHERE_REVERSE 0x200000 /* Scan in reverse order */ -#define WHERE_UNIQUE 0x400000 /* Selects no more than one row */ +#define WHERE_UNITQUE 0x400000 /* Selects no more than one row */ #define WHERE_VIRTUALTABLE 0x800000 /* Use virtual-table processing */ /* @@ -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 bitmasks */ + ExprMaskSet *pMaskSet /* Mapping from table indices to bittqmasks */ ){ pWC->pParse = pParse; pWC->pMaskSet = pMaskSet; @@ -60216,26 +60216,26 @@ static void whereSplit(WhereClause *pWC, Expr *pExpr, int op){ } /* -** Initialize an expression mask set +** Initialize an expression tqmask set */ #define initMaskSet(P) memset(P, 0, sizeof(*P)) /* -** Return the bitmask for the given cursor number. Return 0 if +** Return the bittqmask for the given cursor number. Return 0 if ** iCursor is not in the set. */ -static Bitmask getMask(ExprMaskSet *pMaskSet, int iCursor){ +static Bittqmask getMask(ExprMaskSet *pMaskSet, int iCursor){ int i; for(i=0; i<pMaskSet->n; i++){ if( pMaskSet->ix[i]==iCursor ){ - return ((Bitmask)1)<<i; + return ((Bittqmask)1)<<i; } } return 0; } /* -** Create a new mask for cursor iCursor. +** Create a new tqmask for cursor iCursor. ** ** There is one cursor per table in the FROM clause. The number of ** tables in the FROM clause is limited by a test early in the @@ -60249,7 +60249,7 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){ /* ** This routine walks (recursively) an expression tree and generates -** a bitmask indicating which tables are used in that expression +** a bittqmask indicating which tables are used in that expression ** tree. ** ** In order for this routine to work, the calling function must have @@ -60258,46 +60258,46 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){ ** The sqlite3ExprResolveNames() routines looks for column names and ** 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 bitmask values and OR all -** the bitmasks together. +** translate the cursor numbers into bittqmask values and OR all +** the bittqmasks together. */ -static Bitmask exprListTableUsage(ExprMaskSet*, ExprList*); -static Bitmask exprSelectTableUsage(ExprMaskSet*, Select*); -static Bitmask exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){ - Bitmask mask = 0; +static Bittqmask exprListTableUsage(ExprMaskSet*, ExprList*); +static Bittqmask exprSelectTableUsage(ExprMaskSet*, Select*); +static Bittqmask exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){ + Bittqmask tqmask = 0; if( p==0 ) return 0; if( p->op==TK_COLUMN ){ - mask = getMask(pMaskSet, p->iTable); - return mask; + tqmask = getMask(pMaskSet, p->iTable); + return tqmask; } - mask = exprTableUsage(pMaskSet, p->pRight); - mask |= exprTableUsage(pMaskSet, p->pLeft); - mask |= exprListTableUsage(pMaskSet, p->pList); - mask |= exprSelectTableUsage(pMaskSet, p->pSelect); - return mask; + tqmask = exprTableUsage(pMaskSet, p->pRight); + tqmask |= exprTableUsage(pMaskSet, p->pLeft); + tqmask |= exprListTableUsage(pMaskSet, p->pList); + tqmask |= exprSelectTableUsage(pMaskSet, p->pSelect); + return tqmask; } -static Bitmask exprListTableUsage(ExprMaskSet *pMaskSet, ExprList *pList){ +static Bittqmask exprListTableUsage(ExprMaskSet *pMaskSet, ExprList *pList){ int i; - Bitmask mask = 0; + Bittqmask tqmask = 0; if( pList ){ for(i=0; i<pList->nExpr; i++){ - mask |= exprTableUsage(pMaskSet, pList->a[i].pExpr); + tqmask |= exprTableUsage(pMaskSet, pList->a[i].pExpr); } } - return mask; + return tqmask; } -static Bitmask exprSelectTableUsage(ExprMaskSet *pMaskSet, Select *pS){ - Bitmask mask; +static Bittqmask exprSelectTableUsage(ExprMaskSet *pMaskSet, Select *pS){ + Bittqmask tqmask; if( pS==0 ){ - mask = 0; + tqmask = 0; }else{ - mask = exprListTableUsage(pMaskSet, pS->pEList); - mask |= exprListTableUsage(pMaskSet, pS->pGroupBy); - mask |= exprListTableUsage(pMaskSet, pS->pOrderBy); - mask |= exprTableUsage(pMaskSet, pS->pWhere); - mask |= exprTableUsage(pMaskSet, pS->pHaving); + tqmask = exprListTableUsage(pMaskSet, pS->pEList); + tqmask |= exprListTableUsage(pMaskSet, pS->pGroupBy); + tqmask |= exprListTableUsage(pMaskSet, pS->pOrderBy); + tqmask |= exprTableUsage(pMaskSet, pS->pWhere); + tqmask |= exprTableUsage(pMaskSet, pS->pHaving); } - return mask; + return tqmask; } /* @@ -60337,7 +60337,7 @@ static void exprCommute(Expr *pExpr){ } /* -** Translate from TK_xx operator to WO_xx bitmask. +** Translate from TK_xx operator to WO_xx bittqmask. */ static int operatorMask(int op){ int c; @@ -60369,7 +60369,7 @@ static WhereTerm *findTerm( WhereClause *pWC, /* The WHERE clause to be searched */ int iCur, /* Cursor number of LHS */ int iColumn, /* Column number of LHS */ - Bitmask notReady, /* RHS must not overlap with this mask */ + Bittqmask notReady, /* RHS must not overlap with this tqmask */ u16 op, /* Mask of WO_xx values describing operator */ Index *pIdx /* Must be compatible with this index, if not NULL */ ){ @@ -60429,7 +60429,7 @@ static void exprAnalyzeAll( } } -#ifndef SQLITE_OMIT_LIKE_OPTIMIZATION +#ifndef STQLITE_OMIT_LIKE_OPTIMIZATION /* ** Check to see if the given expression is a LIKE or GLOB operator that ** can be optimized using inequality constraints. Return TRUE if it is @@ -60472,8 +60472,8 @@ static int isLikeOrGlob( */ pColl = db->pDfltColl; } - if( (pColl->type!=SQLITE_COLL_BINARY || noCase) && - (pColl->type!=SQLITE_COLL_NOCASE || !noCase) ){ + if( (pColl->type!=STQLITE_COLL_BINARY || noCase) && + (pColl->type!=STQLITE_COLL_NOCASE || !noCase) ){ return 0; } sqlite3DequoteExpr(pRight); @@ -60486,10 +60486,10 @@ static int isLikeOrGlob( *pnPattern = cnt; return 1; } -#endif /* SQLITE_OMIT_LIKE_OPTIMIZATION */ +#endif /* STQLITE_OMIT_LIKE_OPTIMIZATION */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* ** Check to see if the given expression is of the form ** @@ -60518,7 +60518,7 @@ static int isMatchOfColumn( } return 1; } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ /* ** If the pBase expression originated in the ON or USING clause of @@ -60529,7 +60529,7 @@ static void transferJoinMarkings(Expr *pDerived, Expr *pBase){ pDerived->iRightJoinTable = pBase->iRightJoinTable; } -#if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBQUERY) +#if !defined(STQLITE_OMIT_OR_OPTIMIZATION) && !defined(STQLITE_OMIT_SUBTQUERY) /* ** Return TRUE if the given term of an OR clause can be converted ** into an IN clause. The iCursor and iColumn define the left-hand @@ -60614,7 +60614,7 @@ static int orTermHasOkDuplicate(WhereClause *pOr, WhereTerm *pOrTerm){ ** which the original did not qualify. Either way we are done for. */ return 0; } -#endif /* !SQLITE_OMIT_OR_OPTIMIZATION && !SQLITE_OMIT_SUBQUERY */ +#endif /* !STQLITE_OMIT_OR_OPTIMIZATION && !STQLITE_OMIT_SUBTQUERY */ /* ** The input to this routine is an WhereTerm structure with only the @@ -60636,8 +60636,8 @@ static void exprAnalyze( WhereTerm *pTerm = &pWC->a[idxTerm]; ExprMaskSet *pMaskSet = pWC->pMaskSet; Expr *pExpr = pTerm->pExpr; - Bitmask prereqLeft; - Bitmask prereqAll; + Bittqmask prereqLeft; + Bittqmask prereqAll; int nPattern; int isComplete; int op; @@ -60701,7 +60701,7 @@ static void exprAnalyze( } } -#ifndef SQLITE_OMIT_BETWEEN_OPTIMIZATION +#ifndef STQLITE_OMIT_BETWEEN_OPTIMIZATION /* If a term is the BETWEEN operator, create two new virtual terms ** that define the range that the BETWEEN implements. */ @@ -60723,9 +60723,9 @@ static void exprAnalyze( } pTerm->nChild = 2; } -#endif /* SQLITE_OMIT_BETWEEN_OPTIMIZATION */ +#endif /* STQLITE_OMIT_BETWEEN_OPTIMIZATION */ -#if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBQUERY) +#if !defined(STQLITE_OMIT_OR_OPTIMIZATION) && !defined(STQLITE_OMIT_SUBTQUERY) /* Attempt to convert OR-connected terms into an IN operator so that ** they can make use of indices. Example: ** @@ -60735,7 +60735,7 @@ static void exprAnalyze( ** ** x IN (expr1,expr2,expr3) ** - ** This optimization must be omitted if OMIT_SUBQUERY is defined because + ** This optimization must be omitted if OMIT_SUBTQUERY is defined because ** the compiler for the the IN operator is part of sub-queries. */ else if( pExpr->op==TK_OR ){ @@ -60798,9 +60798,9 @@ static void exprAnalyze( or_not_possible: whereClauseClear(&sOr); } -#endif /* SQLITE_OMIT_OR_OPTIMIZATION */ +#endif /* STQLITE_OMIT_OR_OPTIMIZATION */ -#ifndef SQLITE_OMIT_LIKE_OPTIMIZATION +#ifndef STQLITE_OMIT_LIKE_OPTIMIZATION /* Add constraints to reduce the search space on a LIKE or GLOB ** operator. */ @@ -60836,9 +60836,9 @@ or_not_possible: pTerm->nChild = 2; } } -#endif /* SQLITE_OMIT_LIKE_OPTIMIZATION */ +#endif /* STQLITE_OMIT_LIKE_OPTIMIZATION */ -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* Add a WO_MATCH auxiliary term to the constraint set if the ** current expression is of the form: column MATCH expr. ** This information is used by the xBestIndex methods of @@ -60849,7 +60849,7 @@ or_not_possible: int idxNew; Expr *pRight, *pLeft; WhereTerm *pNewTerm; - Bitmask prereqColumn, prereqExpr; + Bittqmask prereqColumn, prereqExpr; pRight = pExpr->pList->a[0].pExpr; pLeft = pExpr->pList->a[1].pExpr; @@ -60871,7 +60871,7 @@ or_not_possible: pNewTerm->prereqAll = pTerm->prereqAll; } } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ } /* @@ -60884,7 +60884,7 @@ static int referencesOtherTables( int iFirst, /* Be searching with the iFirst-th expression */ int iBase /* Ignore references to this table */ ){ - Bitmask allowed = ~getMask(pMaskSet, iBase); + Bittqmask allowed = ~getMask(pMaskSet, iBase); while( iFirst<pList->nExpr ){ if( (exprTableUsage(pMaskSet, pList->a[iFirst++].pExpr)&allowed)!=0 ){ return 1; @@ -60908,7 +60908,7 @@ static int referencesOtherTables( ** clause and the match can still be a success. ** ** All terms of the ORDER BY that match against the index must be either -** ASC or DESC. (Terms of the ORDER BY clause past the end of a UNIQUE +** ASC or DESC. (Terms of the ORDER BY clause past the end of a UNITQUE ** index do not need to satisfy this constraint.) The *pbRev value is ** set to 1 if the ORDER BY clause is all DESC and it is set to 0 if ** the ORDER BY clause is all ASC. @@ -61019,7 +61019,7 @@ static int isSortingIndex( if( pIdx->onError!=OE_None && i==pIdx->nColumn && !referencesOtherTables(pOrderBy, pMaskSet, j, base) ){ /* All terms of this index match some prefix of the ORDER BY clause - ** and the index is UNIQUE and no terms on the tail of the ORDER BY + ** and the index is UNITQUE and no terms on the tail of the ORDER BY ** clause reference other tables in a join. If this is all true then ** the order by clause is superfluous. */ return 1; @@ -61071,10 +61071,10 @@ static double estLog(double N){ /* ** Two routines for printing the content of an sqlite3_index_info ** structure. Used for testing and debugging only. If neither -** SQLITE_TEST or SQLITE_DEBUG are defined, then these routines +** STQLITE_TEST or STQLITE_DEBUG are defined, then these routines ** are no-ops. */ -#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_DEBUG) +#if !defined(STQLITE_OMIT_VIRTUALTABLE) && defined(STQLITE_DEBUG) static void TRACE_IDX_INPUTS(sqlite3_index_info *p){ int i; if( !sqlite3_where_trace ) return; @@ -61112,7 +61112,7 @@ static void TRACE_IDX_OUTPUTS(sqlite3_index_info *p){ #define TRACE_IDX_OUTPUTS(A) #endif -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE /* ** Compute the best index for a virtual table. ** @@ -61133,7 +61133,7 @@ static double bestVirtualIndex( Parse *pParse, /* The parsing context */ WhereClause *pWC, /* The WHERE clause */ struct SrcList_item *pSrc, /* The FROM clause term to search */ - Bitmask notReady, /* Mask of cursors that are not available */ + Bittqmask notReady, /* Mask of cursors that are not available */ ExprList *pOrderBy, /* The order by clause */ int orderByUsable, /* True if we can potential sort */ sqlite3_index_info **ppIdxInfo /* Index information passed to xBestIndex */ @@ -61192,7 +61192,7 @@ static double bestVirtualIndex( } *ppIdxInfo = pIdxInfo; - /* Initialize the structure. The sqlite3_index_info structure contains + /* Initialize the structure. The sqlite3_index_info structure tqcontains ** many fields that are declared "const" to prevent xBestIndex from ** changing them. We have to do some funky casting in order to ** initialize those fields. @@ -61214,14 +61214,14 @@ static double bestVirtualIndex( pIdxCons[j].iTermOffset = i; pIdxCons[j].op = pTerm->eOperator; /* The direct assignment in the previous line is possible only because - ** the WO_ and SQLITE_INDEX_CONSTRAINT_ codes are identical. The + ** the WO_ and STQLITE_INDEX_CONSTRAINT_ codes are identical. The ** following asserts verify this fact. */ - assert( WO_EQ==SQLITE_INDEX_CONSTRAINT_EQ ); - assert( WO_LT==SQLITE_INDEX_CONSTRAINT_LT ); - assert( WO_LE==SQLITE_INDEX_CONSTRAINT_LE ); - assert( WO_GT==SQLITE_INDEX_CONSTRAINT_GT ); - assert( WO_GE==SQLITE_INDEX_CONSTRAINT_GE ); - assert( WO_MATCH==SQLITE_INDEX_CONSTRAINT_MATCH ); + assert( WO_EQ==STQLITE_INDEX_CONSTRAINT_EQ ); + assert( WO_LT==STQLITE_INDEX_CONSTRAINT_LT ); + assert( WO_LE==STQLITE_INDEX_CONSTRAINT_LE ); + assert( WO_GT==STQLITE_INDEX_CONSTRAINT_GT ); + assert( WO_GE==STQLITE_INDEX_CONSTRAINT_GE ); + assert( WO_MATCH==STQLITE_INDEX_CONSTRAINT_MATCH ); assert( pTerm->eOperator & (WO_EQ|WO_LT|WO_LE|WO_GT|WO_GE|WO_MATCH) ); j++; } @@ -61288,7 +61288,7 @@ static double bestVirtualIndex( pIdxInfo->idxNum = 0; pIdxInfo->needToFreeIdxStr = 0; pIdxInfo->orderByConsumed = 0; - pIdxInfo->estimatedCost = SQLITE_BIG_DBL / 2.0; + pIdxInfo->estimatedCost = STQLITE_BIG_DBL / 2.0; nOrderBy = pIdxInfo->nOrderBy; if( pIdxInfo->nOrderBy && !orderByUsable ){ *(int*)&pIdxInfo->nOrderBy = 0; @@ -61299,8 +61299,8 @@ static double bestVirtualIndex( TRACE_IDX_INPUTS(pIdxInfo); rc = pTab->pVtab->pModule->xBestIndex(pTab->pVtab, pIdxInfo); TRACE_IDX_OUTPUTS(pIdxInfo); - if( rc!=SQLITE_OK ){ - if( rc==SQLITE_NOMEM ){ + if( rc!=STQLITE_OK ){ + if( rc==STQLITE_NOMEM ){ sqlite3FailedMalloc(); }else { sqlite3ErrorMsg(pParse, "%s", sqlite3ErrStr(rc)); @@ -61313,7 +61313,7 @@ static double bestVirtualIndex( return pIdxInfo->estimatedCost; } -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ /* ** Find the best index for accessing a particular table. Return a pointer @@ -61337,7 +61337,7 @@ static double bestIndex( Parse *pParse, /* The parsing context */ WhereClause *pWC, /* The WHERE clause */ struct SrcList_item *pSrc, /* The FROM clause term to search */ - Bitmask notReady, /* Mask of cursors that are not available */ + Bittqmask notReady, /* Mask of cursors that are not available */ ExprList *pOrderBy, /* The order by clause */ Index **ppIndex, /* Make *ppIndex point to the best index */ int *pFlags, /* Put flags describing this choice in *pFlags */ @@ -61357,7 +61357,7 @@ static double bestIndex( double cost; /* Cost of using pProbe */ WHERETRACE(("bestIndex: tbl=%s notReady=%x\n", pSrc->pTab->zName, notReady)); - lowestCost = SQLITE_BIG_DBL; + lowestCost = STQLITE_BIG_DBL; pProbe = pSrc->pTab->pIndex; /* If the table has no indices and there are no terms in the where @@ -61385,7 +61385,7 @@ static double bestIndex( if( pTerm->eOperator & WO_EQ ){ /* Rowid== is always the best pick. Look no further. Because only ** a single row is generated, output is always in sorted order */ - *pFlags = WHERE_ROWID_EQ | WHERE_UNIQUE; + *pFlags = WHERE_ROWID_EQ | WHERE_UNITQUE; *pnEq = 1; WHERETRACE(("... best is rowid\n")); return 0.0; @@ -61487,7 +61487,7 @@ static double bestIndex( nEq = i; if( pProbe->onError!=OE_None && (flags & WHERE_COLUMN_IN)==0 && nEq==pProbe->nColumn ){ - flags |= WHERE_UNIQUE; + flags |= WHERE_UNITQUE; } WHERETRACE(("...... nEq=%d inMult=%.9g cost=%.9g\n", nEq, inMultiplier, cost)); @@ -61532,13 +61532,13 @@ static double bestIndex( ** ever reading the table. If that is the case, then halve the ** cost of this index. */ - if( flags && pSrc->colUsed < (((Bitmask)1)<<(BMS-1)) ){ - Bitmask m = pSrc->colUsed; + if( flags && pSrc->colUsed < (((Bittqmask)1)<<(BMS-1)) ){ + Bittqmask m = pSrc->colUsed; int j; for(j=0; j<pProbe->nColumn; j++){ int x = pProbe->aiColumn[j]; if( x<BMS-1 ){ - m &= ~(((Bitmask)1)<<x); + m &= ~(((Bittqmask)1)<<x); } } if( m==0 ){ @@ -61648,7 +61648,7 @@ static void codeEqualityTerm( sqlite3ExprCode(pParse, pX->pRight); }else if( pX->op==TK_ISNULL ){ sqlite3VdbeAddOp(v, OP_Null, 0, 0); -#ifndef SQLITE_OMIT_SUBQUERY +#ifndef STQLITE_OMIT_SUBTQUERY }else{ int iTab; struct InLoop *pIn; @@ -61705,7 +61705,7 @@ static void codeAllEqualityTerms( Parse *pParse, /* Parsing context */ WhereLevel *pLevel, /* Which nested loop of the FROM we are coding */ WhereClause *pWC, /* The WHERE clause */ - Bitmask notReady /* Which parts of FROM have not yet been coded */ + Bittqmask notReady /* Which parts of FROM have not yet been coded */ ){ int nEq = pLevel->nEq; /* The number of == or IN constraints to code */ int termsInMem = 0; /* If true, store value in mem[] cells */ @@ -61752,7 +61752,7 @@ static void codeAllEqualityTerms( } } -#if defined(SQLITE_TEST) +#if defined(STQLITE_TEST) /* ** The following variable holds a text description of query plan generated ** by the most recent call to sqlite3WhereBegin(). Each call to WhereBegin @@ -61760,9 +61760,9 @@ static void codeAllEqualityTerms( ** analysis only. */ char sqlite3_query_plan[BMS*2*40]; /* Text of the join */ -static int nQPlan = 0; /* Next free slow in _query_plan[] */ +static int nTQPlan = 0; /* Next free slow in _query_plan[] */ -#endif /* SQLITE_TEST */ +#endif /* STQLITE_TEST */ /* @@ -61791,7 +61791,7 @@ static void whereInfoFree(WhereInfo *pWInfo){ /* ** Generate the beginning of the loop used for WHERE clause processing. -** The return value is a pointer to an opaque structure that contains +** The return value is a pointer to an opaque structure that tqcontains ** information needed to terminate the loop. Later, the calling routine ** should invoke sqlite3WhereEnd() with the return value of this function ** in order to complete the WHERE clause processing. @@ -61877,7 +61877,7 @@ static void whereInfoFree(WhereInfo *pWInfo){ ** If the where clause loops cannot be arranged to provide the correct ** output order, then the *ppOrderBy is unchanged. */ -SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( +STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( Parse *pParse, /* The parser context */ SrcList *pTabList, /* A list of all tables to be scanned */ Expr *pWhere, /* The WHERE clause */ @@ -61887,9 +61887,9 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( WhereInfo *pWInfo; /* Will become the return value of this function */ Vdbe *v = pParse->pVdbe; /* The virtual database engine */ int brk, cont = 0; /* Addresses used during code generation */ - Bitmask notReady; /* Cursors that are not yet positioned */ + Bittqmask notReady; /* Cursors that are not yet positioned */ WhereTerm *pTerm; /* A single term in the WHERE clause */ - ExprMaskSet maskSet; /* The expression mask set */ + ExprMaskSet tqmaskSet; /* 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 */ @@ -61897,7 +61897,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( int andFlags; /* AND-ed combination of all wc.a[].flags */ /* The number of tables in the FROM clause is limited by the number of - ** bits in a Bitmask + ** bits in a Bittqmask */ if( pTabList->nSrc>BMS ){ sqlite3ErrorMsg(pParse, "at most %d tables in a join", BMS); @@ -61907,8 +61907,8 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( /* Split the WHERE clause into separate subexpressions where each ** subexpression is separated by an AND operator. */ - initMaskSet(&maskSet); - whereClauseInit(&wc, pParse, &maskSet); + initMaskSet(&tqmaskSet); + whereClauseInit(&wc, pParse, &tqmaskSet); whereSplit(&wc, pWhere, TK_AND); /* Allocate and initialize the WhereInfo structure that will become the @@ -61937,7 +61937,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( ** and work forward so that the added virtual terms are never processed. */ for(i=0; i<pTabList->nSrc; i++){ - createMask(&maskSet, pTabList->a[i].iCursor); + createMask(&tqmaskSet, pTabList->a[i].iCursor); } exprAnalyzeAll(pTabList, &wc); if( sqlite3MallocFailed() ){ @@ -61958,7 +61958,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( ** This loop also figures out the nesting order of tables in the FROM ** clause. */ - notReady = ~(Bitmask)0; + notReady = ~(Bittqmask)0; pTabItem = pTabList->a; pLevel = pWInfo->a; andFlags = ~0; @@ -61974,23 +61974,23 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( int bestNEq = 0; /* nEq associated with pBest */ double lowestCost; /* Cost of the pBest */ int bestJ = 0; /* The value of j */ - Bitmask m; /* Bitmask value for j or bestJ */ + Bittqmask m; /* Bittqmask value for j or bestJ */ int once = 0; /* True when first table is seen */ sqlite3_index_info *pIndex; /* Current virtual index */ - lowestCost = SQLITE_BIG_DBL; + lowestCost = STQLITE_BIG_DBL; for(j=iFrom, pTabItem=&pTabList->a[j]; j<pTabList->nSrc; j++, pTabItem++){ int doNotReorder; /* True if this table should not be reordered */ doNotReorder = (pTabItem->jointype & (JT_LEFT|JT_CROSS))!=0; if( once && doNotReorder ) break; - m = getMask(&maskSet, pTabItem->iCursor); + m = getMask(&tqmaskSet, pTabItem->iCursor); if( (m & notReady)==0 ){ if( j==iFrom ) iFrom++; continue; } assert( pTabItem->pTab ); -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( IsVirtual(pTabItem->pTab) ){ sqlite3_index_info **ppIdxInfo = &pWInfo->a[j].pIdxInfo; cost = bestVirtualIndex(pParse, &wc, pTabItem, notReady, @@ -62003,13 +62003,13 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( } pIdx = 0; nEq = 0; - if( (SQLITE_BIG_DBL/2.0)<cost ){ - /* The cost is not allowed to be larger than SQLITE_BIG_DBL (the + if( (STQLITE_BIG_DBL/2.0)<cost ){ + /* The cost is not allowed to be larger than STQLITE_BIG_DBL (the ** inital value of lowestCost in this loop. If it is, then ** the (cost<lowestCost) test below will never be true and ** pLevel->pBestIdx never set. */ - cost = (SQLITE_BIG_DBL/2.0); + cost = (STQLITE_BIG_DBL/2.0); } }else #endif @@ -62046,7 +62046,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( }else{ pLevel->iIdxCur = -1; } - notReady &= ~getMask(&maskSet, pTabList->a[bestJ].iCursor); + notReady &= ~getMask(&tqmaskSet, pTabList->a[bestJ].iCursor); pLevel->iFrom = bestJ; } WHERETRACE(("*** Optimizer Finished ***\n")); @@ -62054,7 +62054,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( /* If the total query only selects a single row, then the ORDER BY ** clause is irrelevant. */ - if( (andFlags & WHERE_UNIQUE)!=0 && ppOrderBy ){ + if( (andFlags & WHERE_UNITQUE)!=0 && ppOrderBy ){ *ppOrderBy = 0; } @@ -62068,7 +62068,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( int iDb; /* Index of database containing table/index */ int iIdxCur = pLevel->iIdxCur; -#ifndef SQLITE_OMIT_EXPLAIN +#ifndef STQLITE_OMIT_EXPLAIN if( pParse->explain==2 ){ char *zMsg; struct SrcList_item *pItem = &pTabList->a[pLevel->iFrom]; @@ -62081,7 +62081,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( }else if( pLevel->flags & (WHERE_ROWID_EQ|WHERE_ROWID_RANGE) ){ zMsg = sqlite3MPrintf("%z USING PRIMARY KEY", zMsg); } -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE else if( pLevel->pBestIdx ){ sqlite3_index_info *pBestIdx = pLevel->pBestIdx; zMsg = sqlite3MPrintf("%z VIRTUAL TABLE INDEX %d:%s", zMsg, @@ -62093,12 +62093,12 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( } sqlite3VdbeOp3(v, OP_Explain, i, pLevel->iFrom, zMsg, P3_DYNAMIC); } -#endif /* SQLITE_OMIT_EXPLAIN */ +#endif /* STQLITE_OMIT_EXPLAIN */ pTabItem = &pTabList->a[pLevel->iFrom]; pTab = pTabItem->pTab; iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema); if( pTab->isEphem || pTab->pSelect ) continue; -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( pLevel->pBestIdx ){ int iCur = pTabItem->iCursor; sqlite3VdbeOp3(v, OP_VOpen, iCur, 0, (const char*)pTab->pVtab, P3_VTAB); @@ -62106,8 +62106,8 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( #endif if( (pLevel->flags & WHERE_IDX_ONLY)==0 ){ sqlite3OpenTable(pParse, pTabItem->iCursor, iDb, pTab, OP_OpenRead); - if( pTab->nCol<(sizeof(Bitmask)*8) ){ - Bitmask b = pTabItem->colUsed; + if( pTab->nCol<(sizeof(Bittqmask)*8) ){ + Bittqmask b = pTabItem->colUsed; int n = 0; for(; b; b=b>>1, n++){} sqlite3VdbeChangeP2(v, sqlite3VdbeCurrentAddr(v)-1, n); @@ -62138,7 +62138,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( ** loop below generates code for a single nested loop of the VM ** program. */ - notReady = ~(Bitmask)0; + notReady = ~(Bittqmask)0; for(i=0, pLevel=pWInfo->a; i<pTabList->nSrc; i++, pLevel++){ int j; int iCur = pTabItem->iCursor; /* The VDBE cursor for the table */ @@ -62179,7 +62179,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( VdbeComment((v, "# init LEFT JOIN no-match flag")); } -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE if( pLevel->pBestIdx ){ /* Case 0: The table is a virtual-table. Use the VFilter and VNext ** to access the data. @@ -62218,7 +62218,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( pLevel->p1 = iCur; pLevel->p2 = sqlite3VdbeCurrentAddr(v); }else -#endif /* SQLITE_OMIT_VIRTUALTABLE */ +#endif /* STQLITE_OMIT_VIRTUALTABLE */ if( pLevel->flags & WHERE_ROWID_EQ ){ /* Case 1: We can directly reference a single row using an @@ -62287,7 +62287,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( if( testOp!=OP_Noop ){ sqlite3VdbeAddOp(v, OP_Rowid, iCur, 0); sqlite3VdbeAddOp(v, OP_MemLoad, pLevel->iMem, 0); - sqlite3VdbeAddOp(v, testOp, SQLITE_AFF_NUMERIC|0x100, brk); + sqlite3VdbeAddOp(v, testOp, STQLITE_AFF_NUMERIC|0x100, brk); } }else if( pLevel->flags & WHERE_COLUMN_RANGE ){ /* Case 3: The WHERE clause term that refers to the right-most @@ -62328,7 +62328,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( ** operator and the top bound is a < or <= operator. For a descending ** index the operators are reversed. */ - if( pIdx->aSortOrder[nEq]==SQLITE_SO_ASC ){ + if( pIdx->aSortOrder[nEq]==STQLITE_SO_ASC ){ topOp = WO_LT|WO_LE; btmOp = WO_GT|WO_GE; }else{ @@ -62494,7 +62494,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( pLevel->p1 = iCur; pLevel->p2 = 1 + sqlite3VdbeAddOp(v, OP_Rewind, iCur, brk); } - notReady &= ~getMask(&maskSet, iCur); + notReady &= ~getMask(&tqmaskSet, iCur); /* Insert code to test every subexpression that can be completely ** computed using the current set of tables. @@ -62529,7 +62529,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( } } -#ifdef SQLITE_TEST /* For testing and debugging use only */ +#ifdef STQLITE_TEST /* For testing and debugging use only */ /* Record in the query plan information about the current table ** and the index used to access it (if any). If the table itself ** is not used, its name is just '{}'. If no index is used @@ -62544,37 +62544,37 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( z = pTabItem->zAlias; if( z==0 ) z = pTabItem->pTab->zName; n = strlen(z); - if( n+nQPlan < sizeof(sqlite3_query_plan)-10 ){ + if( n+nTQPlan < sizeof(sqlite3_query_plan)-10 ){ if( pLevel->flags & WHERE_IDX_ONLY ){ - memcpy(&sqlite3_query_plan[nQPlan], "{}", 2); - nQPlan += 2; + memcpy(&sqlite3_query_plan[nTQPlan], "{}", 2); + nTQPlan += 2; }else{ - memcpy(&sqlite3_query_plan[nQPlan], z, n); - nQPlan += n; + memcpy(&sqlite3_query_plan[nTQPlan], z, n); + nTQPlan += n; } - sqlite3_query_plan[nQPlan++] = ' '; + sqlite3_query_plan[nTQPlan++] = ' '; } if( pLevel->flags & (WHERE_ROWID_EQ|WHERE_ROWID_RANGE) ){ - memcpy(&sqlite3_query_plan[nQPlan], "* ", 2); - nQPlan += 2; + memcpy(&sqlite3_query_plan[nTQPlan], "* ", 2); + nTQPlan += 2; }else if( pLevel->pIdx==0 ){ - memcpy(&sqlite3_query_plan[nQPlan], "{} ", 3); - nQPlan += 3; + memcpy(&sqlite3_query_plan[nTQPlan], "{} ", 3); + nTQPlan += 3; }else{ n = strlen(pLevel->pIdx->zName); - if( n+nQPlan < sizeof(sqlite3_query_plan)-2 ){ - memcpy(&sqlite3_query_plan[nQPlan], pLevel->pIdx->zName, n); - nQPlan += n; - sqlite3_query_plan[nQPlan++] = ' '; + if( n+nTQPlan < sizeof(sqlite3_query_plan)-2 ){ + memcpy(&sqlite3_query_plan[nTQPlan], pLevel->pIdx->zName, n); + nTQPlan += n; + sqlite3_query_plan[nTQPlan++] = ' '; } } } - while( nQPlan>0 && sqlite3_query_plan[nQPlan-1]==' ' ){ - sqlite3_query_plan[--nQPlan] = 0; + while( nTQPlan>0 && sqlite3_query_plan[nTQPlan-1]==' ' ){ + sqlite3_query_plan[--nTQPlan] = 0; } - sqlite3_query_plan[nQPlan] = 0; - nQPlan = 0; -#endif /* SQLITE_TEST // Testing and debugging use only */ + sqlite3_query_plan[nTQPlan] = 0; + nTQPlan = 0; +#endif /* STQLITE_TEST // Testing and debugging use only */ /* Record the continuation address in the WhereInfo structure. Then ** clean up and return. @@ -62594,7 +62594,7 @@ whereBeginNoMem: ** Generate the end of the WHERE loop. See comments on ** sqlite3WhereBegin() for additional information. */ -SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){ +STQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){ Vdbe *v = pWInfo->pParse->pVdbe; int i; WhereLevel *pLevel; @@ -62803,7 +62803,7 @@ typedef union { struct TrigEvent yy370; SrcList* yy373; Expr * yy386; - struct {int value; int mask;} yy405; + struct {int value; int tqmask;} yy405; Token yy410; IdList* yy432; int yy495; @@ -63299,7 +63299,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* $ => nothing */ 0, /* SEMI => nothing */ 23, /* EXPLAIN => ID */ - 23, /* QUERY => ID */ + 23, /* TQUERY => ID */ 23, /* PLAN => ID */ 23, /* BEGIN => ID */ 0, /* TRANSACTION => nothing */ @@ -63390,7 +63390,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* DEFAULT => nothing */ 0, /* NULL => nothing */ 0, /* PRIMARY => nothing */ - 0, /* UNIQUE => nothing */ + 0, /* UNITQUE => nothing */ 0, /* CHECK => nothing */ 0, /* REFERENCES => nothing */ 0, /* AUTOINCR => nothing */ @@ -63496,7 +63496,7 @@ static char *yyTracePrompt = 0; ** Outputs: ** None. */ -SQLITE_PRIVATE void sqlite3ParserTrace(FILE *TraceFILE, char *zTracePrompt){ +STQLITE_PRIVATE void sqlite3ParserTrace(FILE *TraceFILE, char *zTracePrompt){ yyTraceFILE = TraceFILE; yyTracePrompt = zTracePrompt; if( yyTraceFILE==0 ) yyTracePrompt = 0; @@ -63508,7 +63508,7 @@ SQLITE_PRIVATE void sqlite3ParserTrace(FILE *TraceFILE, char *zTracePrompt){ /* For tracing shifts, the names of all terminals and nonterminals ** are required. The following table supplies these names */ static const char *const yyTokenName[] = { - "$", "SEMI", "EXPLAIN", "QUERY", + "$", "SEMI", "EXPLAIN", "TQUERY", "PLAN", "BEGIN", "TRANSACTION", "DEFERRED", "IMMEDIATE", "EXCLUSIVE", "COMMIT", "END", "ROLLBACK", "CREATE", "TABLE", "IF", @@ -63531,7 +63531,7 @@ static const char *const yyTokenName[] = { "STAR", "SLASH", "REM", "CONCAT", "COLLATE", "UMINUS", "UPLUS", "BITNOT", "STRING", "JOIN_KW", "CONSTRAINT", "DEFAULT", - "NULL", "PRIMARY", "UNIQUE", "CHECK", + "NULL", "PRIMARY", "UNITQUE", "CHECK", "REFERENCES", "AUTOINCR", "ON", "DELETE", "UPDATE", "INSERT", "SET", "DEFERRABLE", "FOREIGN", "DROP", "UNION", "ALL", @@ -63585,7 +63585,7 @@ static const char *const yyRuleName[] = { /* 5 */ "ecmd ::= explain cmdx SEMI", /* 6 */ "explain ::=", /* 7 */ "explain ::= EXPLAIN", - /* 8 */ "explain ::= EXPLAIN QUERY PLAN", + /* 8 */ "explain ::= EXPLAIN TQUERY PLAN", /* 9 */ "cmd ::= BEGIN transtype trans_opt", /* 10 */ "trans_opt ::=", /* 11 */ "trans_opt ::= TRANSACTION", @@ -63635,7 +63635,7 @@ static const char *const yyRuleName[] = { /* 55 */ "ccons ::= NULL onconf", /* 56 */ "ccons ::= NOT NULL onconf", /* 57 */ "ccons ::= PRIMARY KEY sortorder onconf autoinc", - /* 58 */ "ccons ::= UNIQUE onconf", + /* 58 */ "ccons ::= UNITQUE onconf", /* 59 */ "ccons ::= CHECK LP expr RP", /* 60 */ "ccons ::= REFERENCES nm idxlist_opt refargs", /* 61 */ "ccons ::= defer_subclause", @@ -63664,7 +63664,7 @@ static const char *const yyRuleName[] = { /* 84 */ "conslist ::= tcons", /* 85 */ "tcons ::= CONSTRAINT nm", /* 86 */ "tcons ::= PRIMARY KEY LP idxlist autoinc RP onconf", - /* 87 */ "tcons ::= UNIQUE LP idxlist RP onconf", + /* 87 */ "tcons ::= UNITQUE LP idxlist RP onconf", /* 88 */ "tcons ::= CHECK LP expr RP onconf", /* 89 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt", /* 90 */ "defer_subclause_opt ::=", @@ -63811,7 +63811,7 @@ static const char *const yyRuleName[] = { /* 231 */ "nexprlist ::= nexprlist COMMA expr", /* 232 */ "nexprlist ::= expr", /* 233 */ "cmd ::= CREATE uniqueflag INDEX ifnotexists nm dbnm ON nm LP idxlist RP", - /* 234 */ "uniqueflag ::= UNIQUE", + /* 234 */ "uniqueflag ::= UNITQUE", /* 235 */ "uniqueflag ::=", /* 236 */ "idxlist_opt ::=", /* 237 */ "idxlist_opt ::= LP idxlist RP", @@ -63927,7 +63927,7 @@ static void yyGrowStack(yyParser *p){ ** A pointer to a parser. This pointer is used in subsequent calls ** to sqlite3Parser and sqlite3ParserFree. */ -SQLITE_PRIVATE void *sqlite3ParserAlloc(void *(*mallocProc)(size_t)){ +STQLITE_PRIVATE void *sqlite3ParserAlloc(void *(*mallocProc)(size_t)){ yyParser *pParser; pParser = (yyParser*)(*mallocProc)( (size_t)sizeof(yyParser) ); if( pParser ){ @@ -64050,7 +64050,7 @@ static int yy_pop_parser_stack(yyParser *pParser){ ** from malloc. ** </ul> */ -SQLITE_PRIVATE void sqlite3ParserFree( +STQLITE_PRIVATE void sqlite3ParserFree( void *p, /* The parser to be deleted */ void (*freeProc)(void*) /* Function used to reclaim memory */ ){ @@ -64569,7 +64569,7 @@ static void yy_reduce( ** without this code, their parser segfaults. I'm not sure what there ** parser is doing to make this happen. This is the second bug report ** from wireshark this week. Clearly they are stressing Lemon in ways - ** that it has not been previously stressed... (SQLite ticket #2172) + ** that it has not been previously stressed... (STQLite ticket #2172) */ memset(&yygotominor, 0, sizeof(yygotominor)); @@ -64787,19 +64787,19 @@ static void yy_reduce( { yygotominor.yy46 = OE_Restrict * 0x010101; } break; case 66: -{ yygotominor.yy46 = (yymsp[-1].minor.yy46 & yymsp[0].minor.yy405.mask) | yymsp[0].minor.yy405.value; } +{ yygotominor.yy46 = (yymsp[-1].minor.yy46 & yymsp[0].minor.yy405.tqmask) | yymsp[0].minor.yy405.value; } break; case 67: -{ yygotominor.yy405.value = 0; yygotominor.yy405.mask = 0x000000; } +{ yygotominor.yy405.value = 0; yygotominor.yy405.tqmask = 0x000000; } break; case 68: -{ yygotominor.yy405.value = yymsp[0].minor.yy46; yygotominor.yy405.mask = 0x0000ff; } +{ yygotominor.yy405.value = yymsp[0].minor.yy46; yygotominor.yy405.tqmask = 0x0000ff; } break; case 69: -{ yygotominor.yy405.value = yymsp[0].minor.yy46<<8; yygotominor.yy405.mask = 0x00ff00; } +{ yygotominor.yy405.value = yymsp[0].minor.yy46<<8; yygotominor.yy405.tqmask = 0x00ff00; } break; case 70: -{ yygotominor.yy405.value = yymsp[0].minor.yy46<<16; yygotominor.yy405.mask = 0xff0000; } +{ yygotominor.yy405.value = yymsp[0].minor.yy46<<16; yygotominor.yy405.tqmask = 0xff0000; } break; case 71: { yygotominor.yy46 = OE_SetNull; } @@ -65026,10 +65026,10 @@ static void yy_reduce( break; case 146: case 148: -{yygotominor.yy46 = SQLITE_SO_ASC;} +{yygotominor.yy46 = STQLITE_SO_ASC;} break; case 147: -{yygotominor.yy46 = SQLITE_SO_DESC;} +{yygotominor.yy46 = STQLITE_SO_DESC;} break; case 153: {yygotominor.yy234.pLimit = 0; yygotominor.yy234.pOffset = 0;} @@ -65048,7 +65048,7 @@ static void yy_reduce( break; case 160: { - sqlite3ExprListCheckLength(pParse,yymsp[-1].minor.yy174,SQLITE_MAX_COLUMN,"set list"); + sqlite3ExprListCheckLength(pParse,yymsp[-1].minor.yy174,STQLITE_MAX_COLUMN,"set list"); sqlite3Update(pParse,yymsp[-3].minor.yy373,yymsp[-1].minor.yy174,yymsp[0].minor.yy172,yymsp[-4].minor.yy46); } break; @@ -65132,7 +65132,7 @@ static void yy_reduce( break; case 187: { - if( yymsp[-1].minor.yy174 && yymsp[-1].minor.yy174->nExpr>SQLITE_MAX_FUNCTION_ARG ){ + if( yymsp[-1].minor.yy174 && yymsp[-1].minor.yy174->nExpr>STQLITE_MAX_FUNCTION_ARG ){ sqlite3ErrorMsg(pParse, "too many arguments on function %T", &yymsp[-4].minor.yy0); } yygotominor.yy172 = sqlite3ExprFunction(yymsp[-1].minor.yy174, &yymsp[-4].minor.yy0); @@ -65338,7 +65338,7 @@ static void yy_reduce( case 233: { sqlite3CreateIndex(pParse, &yymsp[-6].minor.yy410, &yymsp[-5].minor.yy410, sqlite3SrcListAppend(0,&yymsp[-3].minor.yy410,0), yymsp[-1].minor.yy174, yymsp[-9].minor.yy46, - &yymsp[-10].minor.yy0, &yymsp[0].minor.yy0, SQLITE_SO_ASC, yymsp[-7].minor.yy46); + &yymsp[-10].minor.yy0, &yymsp[0].minor.yy0, STQLITE_SO_ASC, yymsp[-7].minor.yy46); } break; case 234: @@ -65356,7 +65356,7 @@ static void yy_reduce( if( p ) p->pColl = sqlite3LocateCollSeq(pParse, (char*)yymsp[-1].minor.yy410.z, yymsp[-1].minor.yy410.n); } yygotominor.yy174 = sqlite3ExprListAppend(yymsp[-4].minor.yy174, p, &yymsp[-2].minor.yy410); - sqlite3ExprListCheckLength(pParse, yygotominor.yy174, SQLITE_MAX_COLUMN, "index"); + sqlite3ExprListCheckLength(pParse, yygotominor.yy174, STQLITE_MAX_COLUMN, "index"); if( yygotominor.yy174 ) yygotominor.yy174->a[yygotominor.yy174->nExpr-1].sortOrder = yymsp[0].minor.yy46; } break; @@ -65368,7 +65368,7 @@ static void yy_reduce( if( p ) p->pColl = sqlite3LocateCollSeq(pParse, (char*)yymsp[-1].minor.yy410.z, yymsp[-1].minor.yy410.n); } yygotominor.yy174 = sqlite3ExprListAppend(0, p, &yymsp[-2].minor.yy410); - sqlite3ExprListCheckLength(pParse, yygotominor.yy174, SQLITE_MAX_COLUMN, "index"); + sqlite3ExprListCheckLength(pParse, yygotominor.yy174, STQLITE_MAX_COLUMN, "index"); if( yygotominor.yy174 ) yygotominor.yy174->a[yygotominor.yy174->nExpr-1].sortOrder = yymsp[0].minor.yy46; } break; @@ -65661,7 +65661,7 @@ static void yy_accept( ** Outputs: ** None. */ -SQLITE_PRIVATE void sqlite3Parser( +STQLITE_PRIVATE void sqlite3Parser( void *yyp, /* The parser */ int yymajor, /* The major token code number */ sqlite3ParserTOKENTYPE yyminor /* The value for the token */ @@ -65829,10 +65829,10 @@ SQLITE_PRIVATE void sqlite3Parser( ** to adjust the encoding. Only alphabetic characters and underscores ** need to be translated. */ -#ifdef SQLITE_ASCII +#ifdef STQLITE_ASCII # define charMap(X) sqlite3UpperToLower[(unsigned char)X] #endif -#ifdef SQLITE_EBCDIC +#ifdef STQLITE_EBCDIC # define charMap(X) ebcdicToAscii[(unsigned char)X] const unsigned char ebcdicToAscii[] = { /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ @@ -65887,7 +65887,7 @@ static int keywordCode(const char *z, int n){ static const char zText[526] = "BEFOREIGNOREGEXPLAINSTEADDESCAPEACHECKEYCONSTRAINTERSECTABLEFT" "HENDATABASELECTRANSACTIONATURALTERAISELSEXCEPTRIGGEREFERENCES" - "UNIQUERYATTACHAVINGROUPDATEMPORARYBEGINNEREINDEXCLUSIVEXISTSBETWEEN" + "UNITQUERYATTACHAVINGROUPDATEMPORARYBEGINNEREINDEXCLUSIVEXISTSBETWEEN" "OTNULLIKECASCADEFERRABLECASECOLLATECREATECURRENT_DATEDELETEDETACH" "IMMEDIATEJOINSERTMATCHPLANALYZEPRAGMABORTVALUESVIRTUALIMITWHEN" "WHERENAMEAFTEREPLACEANDEFAULTAUTOINCREMENTCASTCOLUMNCOMMITCONFLICT" @@ -65946,7 +65946,7 @@ static int keywordCode(const char *z, int n){ TK_TABLE, TK_JOIN_KW, TK_THEN, TK_END, TK_DATABASE, TK_AS, TK_SELECT, TK_TRANSACTION,TK_ON, TK_JOIN_KW, TK_ALTER, TK_RAISE, TK_ELSE, TK_EXCEPT, TK_TRIGGER, - TK_REFERENCES, TK_UNIQUE, TK_QUERY, TK_ATTACH, TK_HAVING, + TK_REFERENCES, TK_UNITQUE, TK_TQUERY, TK_ATTACH, TK_HAVING, TK_GROUP, TK_UPDATE, TK_TEMP, TK_TEMP, TK_OR, TK_BEGIN, TK_JOIN_KW, TK_REINDEX, TK_INDEX, TK_EXCLUSIVE, TK_EXISTS, TK_BETWEEN, TK_NOTNULL, TK_NOT, TK_NULL, @@ -65977,7 +65977,7 @@ static int keywordCode(const char *z, int n){ } return TK_ID; } -SQLITE_PRIVATE int sqlite3KeywordCode(const unsigned char *z, int n){ +STQLITE_PRIVATE int sqlite3KeywordCode(const unsigned char *z, int n){ return keywordCode((char*)z, n); } @@ -65998,10 +65998,10 @@ SQLITE_PRIVATE int sqlite3KeywordCode(const unsigned char *z, int n){ ** ** Ticket #1066. the SQL standard does not allow '$' in the ** middle of identfiers. But many SQL implementations do. -** SQLite will allow '$' in identifiers for compatibility. +** STQLite will allow '$' in identifiers for compatibility. ** But the feature is undocumented. */ -#ifdef SQLITE_ASCII +#ifdef STQLITE_ASCII const char sqlite3IsIdChar[] = { /* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */ 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 2x */ @@ -66013,7 +66013,7 @@ const char sqlite3IsIdChar[] = { }; #define IdChar(C) (((c=C)&0x80)!=0 || (c>0x1f && sqlite3IsIdChar[c-0x20])) #endif -#ifdef SQLITE_EBCDIC +#ifdef STQLITE_EBCDIC const char sqlite3IsIdChar[] = { /* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */ 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, /* 4x */ @@ -66171,7 +66171,7 @@ static int getToken(const unsigned char *z, int *tokenType){ } } case '.': { -#ifndef SQLITE_OMIT_FLOATING_POINT +#ifndef STQLITE_OMIT_FLOATING_POINT if( !isdigit(z[1]) ) #endif { @@ -66185,7 +66185,7 @@ static int getToken(const unsigned char *z, int *tokenType){ case '5': case '6': case '7': case '8': case '9': { *tokenType = TK_INTEGER; for(i=0; isdigit(z[i]); i++){} -#ifndef SQLITE_OMIT_FLOATING_POINT +#ifndef STQLITE_OMIT_FLOATING_POINT if( z[i]=='.' ){ i++; while( isdigit(z[i]) ){ i++; } @@ -66228,7 +66228,7 @@ static int getToken(const unsigned char *z, int *tokenType){ /* Fall through into the next case if the '#' is not followed by ** a digit. Try to match #AAAA where AAAA is a parameter name. */ } -#ifndef SQLITE_OMIT_TCL_VARIABLE +#ifndef STQLITE_OMIT_TCL_VARIABLE case '$': #endif case '@': /* For compatibility with MS SQL Server */ @@ -66238,7 +66238,7 @@ static int getToken(const unsigned char *z, int *tokenType){ for(i=1; (c=z[i])!=0; i++){ if( IdChar(c) ){ n++; -#ifndef SQLITE_OMIT_TCL_VARIABLE +#ifndef STQLITE_OMIT_TCL_VARIABLE }else if( c=='(' && n>0 ){ do{ i++; @@ -66259,7 +66259,7 @@ static int getToken(const unsigned char *z, int *tokenType){ if( n==0 ) *tokenType = TK_ILLEGAL; return i; } -#ifndef SQLITE_OMIT_BLOB_LITERAL +#ifndef STQLITE_OMIT_BLOB_LITERAL case 'x': case 'X': { if( (c=z[1])=='\'' || c=='"' ){ int delim = c; @@ -66292,25 +66292,25 @@ static int getToken(const unsigned char *z, int *tokenType){ *tokenType = TK_ILLEGAL; return 1; } -SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){ +STQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){ return getToken(z, tokenType); } /* ** The interface to the LEMON-generated parser */ -SQLITE_PRIVATE void *sqlite3ParserAlloc(void*(*)(size_t)); -SQLITE_PRIVATE void sqlite3ParserFree(void*, void(*)(void*)); -SQLITE_PRIVATE void sqlite3Parser(void*, int, Token, Parse*); +STQLITE_PRIVATE void *sqlite3ParserAlloc(void*(*)(size_t)); +STQLITE_PRIVATE void sqlite3ParserFree(void*, void(*)(void*)); +STQLITE_PRIVATE void sqlite3Parser(void*, int, Token, Parse*); /* ** Run the parser on the given SQL string. The parser structure is -** passed in. An SQLITE_ status code is returned. If an error occurs +** passed in. An STQLITE_ status code is returned. If an error occurs ** and pzErrMsg!=NULL then an error message might be written into ** memory obtained from malloc() and *pzErrMsg made to point to that ** error message. Or maybe not. */ -SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ +STQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ int nErr = 0; int i; void *pEngine; @@ -66321,11 +66321,11 @@ SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzEr if( db->activeVdbeCnt==0 ){ db->u1.isInterrupted = 0; } - pParse->rc = SQLITE_OK; + pParse->rc = STQLITE_OK; i = 0; pEngine = sqlite3ParserAlloc((void*(*)(size_t))sqlite3MallocX); if( pEngine==0 ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } assert( pParse->sLastToken.dyn==0 ); assert( pParse->pNewTable==0 ); @@ -66341,15 +66341,15 @@ SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzEr assert( pParse->sLastToken.dyn==0 ); pParse->sLastToken.n = getToken((unsigned char*)&zSql[i],&tokenType); i += pParse->sLastToken.n; - if( i>SQLITE_MAX_SQL_LENGTH ){ - pParse->rc = SQLITE_TOOBIG; + if( i>STQLITE_MAX_STQL_LENGTH ){ + pParse->rc = STQLITE_TOOBIG; break; } switch( tokenType ){ case TK_SPACE: case TK_COMMENT: { if( db->u1.isInterrupted ){ - pParse->rc = SQLITE_INTERRUPT; + pParse->rc = STQLITE_INTERRUPT; sqlite3SetString(pzErrMsg, "interrupt", (char*)0); goto abort_parse; } @@ -66371,7 +66371,7 @@ SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzEr default: { sqlite3Parser(pEngine, tokenType, pParse->sLastToken, pParse); lastTokenParsed = tokenType; - if( pParse->rc!=SQLITE_OK ){ + if( pParse->rc!=STQLITE_OK ){ goto abort_parse; } break; @@ -66379,7 +66379,7 @@ SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzEr } } abort_parse: - if( zSql[i]==0 && nErr==0 && pParse->rc==SQLITE_OK ){ + if( zSql[i]==0 && nErr==0 && pParse->rc==STQLITE_OK ){ if( lastTokenParsed!=TK_SEMI ){ sqlite3Parser(pEngine, TK_SEMI, pParse->sLastToken, pParse); pParse->zTail = &zSql[i]; @@ -66388,9 +66388,9 @@ abort_parse: } sqlite3ParserFree(pEngine, sqlite3FreeX); if( sqlite3MallocFailed() ){ - pParse->rc = SQLITE_NOMEM; + pParse->rc = STQLITE_NOMEM; } - if( pParse->rc!=SQLITE_OK && pParse->rc!=SQLITE_DONE && pParse->zErrMsg==0 ){ + if( pParse->rc!=STQLITE_OK && pParse->rc!=STQLITE_DONE && pParse->zErrMsg==0 ){ sqlite3SetString(&pParse->zErrMsg, sqlite3ErrStr(pParse->rc), (char*)0); } if( pParse->zErrMsg ){ @@ -66406,7 +66406,7 @@ abort_parse: sqlite3VdbeDelete(pParse->pVdbe); pParse->pVdbe = 0; } -#ifndef SQLITE_OMIT_SHARED_CACHE +#ifndef STQLITE_OMIT_SHARED_CACHE if( pParse->nested==0 ){ sqliteFree(pParse->aTableLock); pParse->aTableLock = 0; @@ -66424,8 +66424,8 @@ abort_parse: sqlite3DeleteTrigger(pParse->pNewTrigger); sqliteFree(pParse->apVarExpr); - if( nErr>0 && (pParse->rc==SQLITE_OK || pParse->rc==SQLITE_DONE) ){ - pParse->rc = SQLITE_ERROR; + if( nErr>0 && (pParse->rc==STQLITE_OK || pParse->rc==STQLITE_DONE) ){ + pParse->rc = STQLITE_ERROR; } return nErr; } @@ -66443,9 +66443,9 @@ abort_parse: ** May you share freely, never taking more than you give. ** ************************************************************************* -** Main file for the SQLite library. The routines in this file +** Main file for the STQLite library. The routines in this file ** implement the programmer interface to the library. Routines in -** other files are for internal use by SQLite and should not be +** other files are for internal use by STQLite and should not be ** accessed by users of the library. ** ** $Id: main.c,v 1.377 2007/06/22 15:21:16 danielk1977 Exp $ @@ -66454,13 +66454,13 @@ abort_parse: /* ** The version of the library */ -const char sqlite3_version[] = SQLITE_VERSION; -SQLITE_API const char *sqlite3_libversion(void){ return sqlite3_version; } -int sqlite3_libversion_number(void){ return SQLITE_VERSION_NUMBER; } +const char sqlite3_version[] = STQLITE_VERSION; +STQLITE_API const char *sqlite3_libversion(void){ return sqlite3_version; } +int sqlite3_libversion_number(void){ return STQLITE_VERSION_NUMBER; } /* ** If the following function pointer is not NULL and if -** SQLITE_ENABLE_IOTRACE is enabled, then messages describing +** STQLITE_ENABLE_IOTRACE is enabled, then messages describing ** I/O active are written using this function. These messages ** are intended for debugging activity only. */ @@ -66498,7 +66498,7 @@ static int binCollFunc( ** Another built-in collating sequence: NOCASE. ** ** This collating sequence is intended to be used for "case independant -** comparison". SQLite's knowledge of upper and lower case equivalents +** comparison". STQLite's knowledge of upper and lower case equivalents ** extends only to the 26 characters used in the English language. ** ** At the moment there is only a UTF-8 implementation. @@ -66526,7 +66526,7 @@ sqlite_int64 sqlite3_last_insert_rowid(sqlite3 *db){ /* ** Return the number of changes in the most recent call to sqlite3_exec(). */ -SQLITE_API int sqlite3_changes(sqlite3 *db){ +STQLITE_API int sqlite3_changes(sqlite3 *db){ return db->nChange; } @@ -66538,20 +66538,20 @@ int sqlite3_total_changes(sqlite3 *db){ } /* -** Close an existing SQLite database +** Close an existing STQLite database */ -SQLITE_API int sqlite3_close(sqlite3 *db){ +STQLITE_API int sqlite3_close(sqlite3 *db){ HashElem *i; int j; if( !db ){ - return SQLITE_OK; + return STQLITE_OK; } if( sqlite3SafetyCheck(db) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } -#ifdef SQLITE_SSE +#ifdef STQLITE_SSE { extern void sqlite3SseCleanup(sqlite3*); sqlite3SseCleanup(db); @@ -66569,15 +66569,15 @@ SQLITE_API int sqlite3_close(sqlite3 *db){ */ sqlite3VtabRollback(db); - /* If there are any outstanding VMs, return SQLITE_BUSY. */ + /* If there are any outstanding VMs, return STQLITE_BUSY. */ if( db->pVdbe ){ - sqlite3Error(db, SQLITE_BUSY, + sqlite3Error(db, STQLITE_BUSY, "Unable to close due to unfinalised statements"); - return SQLITE_BUSY; + return STQLITE_BUSY; } assert( !sqlite3SafetyCheck(db) ); - /* FIX ME: db->magic may be set to SQLITE_MAGIC_CLOSED if the database + /* FIX ME: db->magic may be set to STQLITE_MAGIC_CLOSED if the database ** cannot be opened for some reason. So this routine needs to run in ** that case. But maybe there should be an extra magic value for the ** "failed to open" state. @@ -66585,9 +66585,9 @@ SQLITE_API int sqlite3_close(sqlite3 *db){ ** TODO: Coverage tests do not test the case where this condition is ** true. It's hard to see how to cause it without messing with threads. */ - if( db->magic!=SQLITE_MAGIC_CLOSED && sqlite3SafetyOn(db) ){ + if( db->magic!=STQLITE_MAGIC_CLOSED && sqlite3SafetyOn(db) ){ /* printf("DID NOT CLOSE\n"); fflush(stdout); */ - return SQLITE_ERROR; + return STQLITE_ERROR; } for(j=0; j<db->nDb; j++){ @@ -66622,7 +66622,7 @@ SQLITE_API int sqlite3_close(sqlite3 *db){ sqliteFree(pColl); } sqlite3HashClear(&db->aCollSeq); -#ifndef SQLITE_OMIT_VIRTUALTABLE +#ifndef STQLITE_OMIT_VIRTUALTABLE for(i=sqliteHashFirst(&db->aModule); i; i=sqliteHashNext(i)){ Module *pMod = (Module *)sqliteHashData(i); if( pMod->xDestroy ){ @@ -66634,13 +66634,13 @@ SQLITE_API int sqlite3_close(sqlite3 *db){ #endif sqlite3HashClear(&db->aFunc); - sqlite3Error(db, SQLITE_OK, 0); /* Deallocates any cached error strings. */ + sqlite3Error(db, STQLITE_OK, 0); /* Deallocates any cached error strings. */ if( db->pErr ){ sqlite3ValueFree(db->pErr); } sqlite3CloseExtensions(db); - db->magic = SQLITE_MAGIC_ERROR; + db->magic = STQLITE_MAGIC_ERROR; /* The temp-database schema is allocated differently from the other schema ** objects (using sqliteMalloc() directly, instead of sqlite3BtreeSchema()). @@ -66651,13 +66651,13 @@ SQLITE_API int sqlite3_close(sqlite3 *db){ sqliteFree(db->aDb[1].pSchema); sqliteFree(db); sqlite3ReleaseThreadData(); - return SQLITE_OK; + return STQLITE_OK; } /* ** Rollback all database files. */ -SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db){ +STQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db){ int i; int inTrans = 0; for(i=0; i<db->nDb; i++){ @@ -66670,7 +66670,7 @@ SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db){ } } sqlite3VtabRollback(db); - if( db->flags&SQLITE_InternChanges ){ + if( db->flags&STQLITE_InternChanges ){ sqlite3ResetInternalSchema(db, 0); } @@ -66684,35 +66684,35 @@ SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db){ ** Return a static string that describes the kind of error specified in the ** argument. */ -SQLITE_PRIVATE const char *sqlite3ErrStr(int rc){ +STQLITE_PRIVATE const char *sqlite3ErrStr(int rc){ const char *z; switch( rc & 0xff ){ - case SQLITE_ROW: - case SQLITE_DONE: - case SQLITE_OK: z = "not an error"; break; - case SQLITE_ERROR: z = "SQL logic error or missing database"; break; - case SQLITE_PERM: z = "access permission denied"; break; - case SQLITE_ABORT: z = "callback requested query abort"; break; - case SQLITE_BUSY: z = "database is locked"; break; - case SQLITE_LOCKED: z = "database table is locked"; break; - case SQLITE_NOMEM: z = "out of memory"; break; - case SQLITE_READONLY: z = "attempt to write a readonly database"; break; - case SQLITE_INTERRUPT: z = "interrupted"; break; - case SQLITE_IOERR: z = "disk I/O error"; break; - case SQLITE_CORRUPT: z = "database disk image is malformed"; break; - case SQLITE_FULL: z = "database or disk is full"; break; - case SQLITE_CANTOPEN: z = "unable to open database file"; break; - case SQLITE_EMPTY: z = "table contains no data"; break; - case SQLITE_SCHEMA: z = "database schema has changed"; break; - case SQLITE_TOOBIG: z = "String or BLOB exceeded size limit"; break; - case SQLITE_CONSTRAINT: z = "constraint failed"; break; - case SQLITE_MISMATCH: z = "datatype mismatch"; break; - case SQLITE_MISUSE: z = "library routine called out of sequence";break; - case SQLITE_NOLFS: z = "kernel lacks large file support"; break; - case SQLITE_AUTH: z = "authorization denied"; break; - case SQLITE_FORMAT: z = "auxiliary database format error"; break; - case SQLITE_RANGE: z = "bind or column index out of range"; break; - case SQLITE_NOTADB: z = "file is encrypted or is not a database";break; + case STQLITE_ROW: + case STQLITE_DONE: + case STQLITE_OK: z = "not an error"; break; + case STQLITE_ERROR: z = "SQL logic error or missing database"; break; + case STQLITE_PERM: z = "access permission denied"; break; + case STQLITE_ABORT: z = "callback requested query abort"; break; + case STQLITE_BUSY: z = "database is locked"; break; + case STQLITE_LOCKED: z = "database table is locked"; break; + case STQLITE_NOMEM: z = "out of memory"; break; + case STQLITE_READONLY: z = "attempt to write a readonly database"; break; + case STQLITE_INTERRUPT: z = "interrupted"; break; + case STQLITE_IOERR: z = "disk I/O error"; break; + case STQLITE_CORRUPT: z = "database disk image is malformed"; break; + case STQLITE_FULL: z = "database or disk is full"; break; + case STQLITE_CANTOPEN: z = "unable to open database file"; break; + case STQLITE_EMPTY: z = "table contains no data"; break; + case STQLITE_SCHEMA: z = "database schema has changed"; break; + case STQLITE_TOOBIG: z = "String or BLOB exceeded size limit"; break; + case STQLITE_CONSTRAINT: z = "constraint failed"; break; + case STQLITE_MISMATCH: z = "datatype mismatch"; break; + case STQLITE_MISUSE: z = "library routine called out of sequence";break; + case STQLITE_NOLFS: z = "kernel lacks large file support"; break; + case STQLITE_AUTH: z = "authorization denied"; break; + case STQLITE_FORMAT: z = "auxiliary database format error"; break; + case STQLITE_RANGE: z = "bind or column index out of range"; break; + case STQLITE_NOTADB: z = "file is encrypted or is not a database";break; default: z = "unknown error"; break; } return z; @@ -66766,9 +66766,9 @@ static int sqliteDefaultBusyCallback( ** ** This routine is called when an operation failed with a lock. ** If this routine returns non-zero, the lock is retried. If it -** returns 0, the operation aborts with an SQLITE_BUSY error. +** returns 0, the operation aborts with an STQLITE_BUSY error. */ -SQLITE_PRIVATE int sqlite3InvokeBusyHandler(BusyHandler *p){ +STQLITE_PRIVATE int sqlite3InvokeBusyHandler(BusyHandler *p){ int rc; if( p==0 || p->xFunc==0 || p->nBusy<0 ) return 0; rc = p->xFunc(p->pArg, p->nBusy); @@ -66790,15 +66790,15 @@ int sqlite3_busy_handler( void *pArg ){ if( sqlite3SafetyCheck(db) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } db->busyHandler.xFunc = xBusy; db->busyHandler.pArg = pArg; db->busyHandler.nBusy = 0; - return SQLITE_OK; + return STQLITE_OK; } -#ifndef SQLITE_OMIT_PROGRESS_CALLBACK +#ifndef STQLITE_OMIT_PROGRESS_CALLBACK /* ** This routine sets the progress callback for an Sqlite database to the ** given callback function with the given argument. The progress callback will @@ -66831,7 +66831,7 @@ void sqlite3_progress_handler( */ int sqlite3_busy_timeout(sqlite3 *db, int ms){ if( sqlite3SafetyCheck(db) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } if( ms>0 ){ db->busyTimeout = ms; @@ -66839,21 +66839,21 @@ int sqlite3_busy_timeout(sqlite3 *db, int ms){ }else{ sqlite3_busy_handler(db, 0, 0); } - return SQLITE_OK; + return STQLITE_OK; } /* ** Cause any pending operation to stop at its earliest opportunity. */ -SQLITE_API void sqlite3_interrupt(sqlite3 *db){ - if( db && (db->magic==SQLITE_MAGIC_OPEN || db->magic==SQLITE_MAGIC_BUSY) ){ +STQLITE_API void sqlite3_interrupt(sqlite3 *db){ + if( db && (db->magic==STQLITE_MAGIC_OPEN || db->magic==STQLITE_MAGIC_BUSY) ){ db->u1.isInterrupted = 1; } } /* -** Memory allocation routines that use SQLites internal memory -** memory allocator. Depending on how SQLite is compiled, the +** Memory allocation routines that use STQLites internal memory +** memory allocator. Depending on how STQLite is compiled, the ** internal memory allocator might be just an alias for the ** system default malloc/realloc/free. Or the built-in allocator ** might do extra stuff like put sentinals around buffers to @@ -66861,9 +66861,9 @@ SQLITE_API void sqlite3_interrupt(sqlite3 *db){ ** ** Use sqlite3_free() to free memory returned by sqlite3_mprintf(). */ -SQLITE_API void sqlite3_free(void *p){ if( p ) sqlite3OsFree(p); } -SQLITE_API void *sqlite3_malloc(int nByte){ return nByte>0 ? sqlite3OsMalloc(nByte) : 0; } -SQLITE_API void *sqlite3_realloc(void *pOld, int nByte){ +STQLITE_API void sqlite3_free(void *p){ if( p ) sqlite3OsFree(p); } +STQLITE_API void *sqlite3_malloc(int nByte){ return nByte>0 ? sqlite3OsMalloc(nByte) : 0; } +STQLITE_API void *sqlite3_realloc(void *pOld, int nByte){ if( pOld ){ if( nByte>0 ){ return sqlite3OsRealloc(pOld, nByte); @@ -66882,7 +66882,7 @@ SQLITE_API void *sqlite3_realloc(void *pOld, int nByte){ ** that if a malloc() fails in sqlite3_create_function(), an error code ** is returned and the mallocFailed flag cleared. */ -SQLITE_PRIVATE int sqlite3CreateFunc( +STQLITE_PRIVATE int sqlite3CreateFunc( sqlite3 *db, const char *zFunctionName, int nArg, @@ -66896,7 +66896,7 @@ SQLITE_PRIVATE int sqlite3CreateFunc( int nName; if( sqlite3SafetyCheck(db) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } if( zFunctionName==0 || (xFunc && (xFinal || xStep)) || @@ -66904,46 +66904,46 @@ SQLITE_PRIVATE int sqlite3CreateFunc( (!xFunc && (!xFinal && xStep)) || (nArg<-1 || nArg>127) || (255<(nName = strlen(zFunctionName))) ){ - sqlite3Error(db, SQLITE_ERROR, "bad parameters"); - return SQLITE_ERROR; + sqlite3Error(db, STQLITE_ERROR, "bad parameters"); + return STQLITE_ERROR; } -#ifndef SQLITE_OMIT_UTF16 - /* If SQLITE_UTF16 is specified as the encoding type, transform this - ** to one of SQLITE_UTF16LE or SQLITE_UTF16BE using the - ** SQLITE_UTF16NATIVE macro. SQLITE_UTF16 is not used internally. +#ifndef STQLITE_OMIT_UTF16 + /* If STQLITE_UTF16 is specified as the encoding type, transform this + ** to one of STQLITE_UTF16LE or STQLITE_UTF16BE using the + ** STQLITE_UTF16NATIVE macro. STQLITE_UTF16 is not used internally. ** - ** If SQLITE_ANY is specified, add three versions of the function + ** If STQLITE_ANY is specified, add three versions of the function ** to the hash table. */ - if( enc==SQLITE_UTF16 ){ - enc = SQLITE_UTF16NATIVE; - }else if( enc==SQLITE_ANY ){ + if( enc==STQLITE_UTF16 ){ + enc = STQLITE_UTF16NATIVE; + }else if( enc==STQLITE_ANY ){ int rc; - rc = sqlite3CreateFunc(db, zFunctionName, nArg, SQLITE_UTF8, + rc = sqlite3CreateFunc(db, zFunctionName, nArg, STQLITE_UTF8, pUserData, xFunc, xStep, xFinal); - if( rc!=SQLITE_OK ) return rc; - rc = sqlite3CreateFunc(db, zFunctionName, nArg, SQLITE_UTF16LE, + if( rc!=STQLITE_OK ) return rc; + rc = sqlite3CreateFunc(db, zFunctionName, nArg, STQLITE_UTF16LE, pUserData, xFunc, xStep, xFinal); - if( rc!=SQLITE_OK ) return rc; - enc = SQLITE_UTF16BE; + if( rc!=STQLITE_OK ) return rc; + enc = STQLITE_UTF16BE; } #else - enc = SQLITE_UTF8; + enc = STQLITE_UTF8; #endif /* Check if an existing function is being overridden or deleted. If so, - ** and there are active VMs, then return SQLITE_BUSY. If a function + ** and there are active VMs, then return STQLITE_BUSY. If a function ** is being overridden/deleted but there are no active VMs, allow the - ** operation to continue but invalidate all precompiled statements. + ** operation to continue but tqinvalidate all precompiled statements. */ p = sqlite3FindFunction(db, zFunctionName, nName, nArg, enc, 0); if( p && p->iPrefEnc==enc && p->nArg==nArg ){ if( db->activeVdbeCnt ){ - sqlite3Error(db, SQLITE_BUSY, + sqlite3Error(db, STQLITE_BUSY, "Unable to delete/modify user-function due to active statements"); assert( !sqlite3MallocFailed() ); - return SQLITE_BUSY; + return STQLITE_BUSY; }else{ sqlite3ExpirePreparedStatements(db); } @@ -66958,7 +66958,7 @@ SQLITE_PRIVATE int sqlite3CreateFunc( p->pUserData = pUserData; p->nArg = nArg; } - return SQLITE_OK; + return STQLITE_OK; } /* @@ -66981,7 +66981,7 @@ int sqlite3_create_function( return sqlite3ApiExit(db, rc); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 int sqlite3_create_function16( sqlite3 *db, const void *zFunctionName, @@ -67023,14 +67023,14 @@ int sqlite3_overload_function( int nArg ){ int nName = strlen(zName); - if( sqlite3FindFunction(db, zName, nName, nArg, SQLITE_UTF8, 0)==0 ){ - sqlite3CreateFunc(db, zName, nArg, SQLITE_UTF8, + if( sqlite3FindFunction(db, zName, nName, nArg, STQLITE_UTF8, 0)==0 ){ + sqlite3CreateFunc(db, zName, nArg, STQLITE_UTF8, 0, sqlite3InvalidFunction, 0, 0); } - return sqlite3ApiExit(db, SQLITE_OK); + return sqlite3ApiExit(db, STQLITE_OK); } -#ifndef SQLITE_OMIT_TRACE +#ifndef STQLITE_OMIT_TRACE /* ** Register a trace function. The pArg from the previously registered trace ** is returned. @@ -67039,7 +67039,7 @@ int sqlite3_overload_function( ** trace is a pointer to a function that is invoked at the start of each ** SQL statement. */ -SQLITE_API void *sqlite3_trace(sqlite3 *db, void (*xTrace)(void*,const char*), void *pArg){ +STQLITE_API void *sqlite3_trace(sqlite3 *db, void (*xTrace)(void*,const char*), void *pArg){ void *pOld = db->pTraceArg; db->xTrace = xTrace; db->pTraceArg = pArg; @@ -67053,7 +67053,7 @@ SQLITE_API void *sqlite3_trace(sqlite3 *db, void (*xTrace)(void*,const char*), v ** profile is a pointer to a function that is invoked at the conclusion of ** each SQL statement that is run. */ -SQLITE_API void *sqlite3_profile( +STQLITE_API void *sqlite3_profile( sqlite3 *db, void (*xProfile)(void*,const char*,sqlite_uint64), void *pArg @@ -67063,7 +67063,7 @@ SQLITE_API void *sqlite3_profile( db->pProfileArg = pArg; return pOld; } -#endif /* SQLITE_OMIT_TRACE */ +#endif /* STQLITE_OMIT_TRACE */ /*** EXPERIMENTAL *** ** @@ -67137,7 +67137,7 @@ void *sqlite3_rollback_hook( ** 2 0 memory ** 3 any memory */ -SQLITE_PRIVATE int sqlite3BtreeFactory( +STQLITE_PRIVATE int sqlite3BtreeFactory( const sqlite3 *db, /* Main database when opening aux otherwise 0 */ const char *zFilename, /* Name of the file containing the BTree database */ int omitJournal, /* if TRUE then do not journal this file */ @@ -67151,14 +67151,14 @@ SQLITE_PRIVATE int sqlite3BtreeFactory( if( omitJournal ){ btree_flags |= BTREE_OMIT_JOURNAL; } - if( db->flags & SQLITE_NoReadlock ){ + if( db->flags & STQLITE_NoReadlock ){ btree_flags |= BTREE_NO_READLOCK; } if( zFilename==0 ){ #if TEMP_STORE==0 /* Do nothing */ #endif -#ifndef SQLITE_OMIT_MEMORYDB +#ifndef STQLITE_OMIT_MEMORYDB #if TEMP_STORE==1 if( db->temp_store==2 ) zFilename = ":memory:"; #endif @@ -67168,11 +67168,11 @@ SQLITE_PRIVATE int sqlite3BtreeFactory( #if TEMP_STORE==3 zFilename = ":memory:"; #endif -#endif /* SQLITE_OMIT_MEMORYDB */ +#endif /* STQLITE_OMIT_MEMORYDB */ } rc = sqlite3BtreeOpen(zFilename, (sqlite3 *)db, ppBtree, btree_flags); - if( rc==SQLITE_OK ){ + if( rc==STQLITE_OK ){ sqlite3BtreeSetBusyHandler(*ppBtree, (void*)&db->busyHandler); sqlite3BtreeSetCacheSize(*ppBtree, nCache); } @@ -67183,14 +67183,14 @@ SQLITE_PRIVATE int sqlite3BtreeFactory( ** Return UTF-8 encoded English language explanation of the most recent ** error. */ -SQLITE_API const char *sqlite3_errmsg(sqlite3 *db){ +STQLITE_API const char *sqlite3_errmsg(sqlite3 *db){ const char *z; assert( !sqlite3MallocFailed() ); if( !db ){ - return sqlite3ErrStr(SQLITE_NOMEM); + return sqlite3ErrStr(STQLITE_NOMEM); } - if( sqlite3SafetyCheck(db) || db->errCode==SQLITE_MISUSE ){ - return sqlite3ErrStr(SQLITE_MISUSE); + if( sqlite3SafetyCheck(db) || db->errCode==STQLITE_MISUSE ){ + return sqlite3ErrStr(STQLITE_MISUSE); } z = (char*)sqlite3_value_text(db->pErr); if( z==0 ){ @@ -67199,13 +67199,13 @@ SQLITE_API const char *sqlite3_errmsg(sqlite3 *db){ return z; } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 /* ** Return UTF-16 encoded English language explanation of the most recent ** error. */ -SQLITE_API const void *sqlite3_errmsg16(sqlite3 *db){ - /* Because all the characters in the string are in the unicode +STQLITE_API const void *sqlite3_errmsg16(sqlite3 *db){ + /* Because all the characters in the string are in the tqunicode ** range 0x00-0xFF, if we pad the big-endian string with a ** zero byte, we can obtain the little-endian string with ** &big_endian[1]. @@ -67227,32 +67227,32 @@ SQLITE_API const void *sqlite3_errmsg16(sqlite3 *db){ const void *z; assert( !sqlite3MallocFailed() ); if( !db ){ - return (void *)(&outOfMemBe[SQLITE_UTF16NATIVE==SQLITE_UTF16LE?1:0]); + return (void *)(&outOfMemBe[STQLITE_UTF16NATIVE==STQLITE_UTF16LE?1:0]); } - if( sqlite3SafetyCheck(db) || db->errCode==SQLITE_MISUSE ){ - return (void *)(&misuseBe[SQLITE_UTF16NATIVE==SQLITE_UTF16LE?1:0]); + if( sqlite3SafetyCheck(db) || db->errCode==STQLITE_MISUSE ){ + return (void *)(&misuseBe[STQLITE_UTF16NATIVE==STQLITE_UTF16LE?1:0]); } z = sqlite3_value_text16(db->pErr); if( z==0 ){ sqlite3ValueSetStr(db->pErr, -1, sqlite3ErrStr(db->errCode), - SQLITE_UTF8, SQLITE_STATIC); + STQLITE_UTF8, STQLITE_STATIC); z = sqlite3_value_text16(db->pErr); } sqlite3ApiExit(0, 0); return z; } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ /* -** Return the most recent error code generated by an SQLite routine. If NULL is +** Return the most recent error code generated by an STQLite routine. If NULL is ** passed to this function, we assume a malloc() failed during sqlite3_open(). */ -SQLITE_API int sqlite3_errcode(sqlite3 *db){ +STQLITE_API int sqlite3_errcode(sqlite3 *db){ if( !db || sqlite3MallocFailed() ){ - return SQLITE_NOMEM; + return STQLITE_NOMEM; } if( sqlite3SafetyCheck(db) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } return db->errCode & db->errMask; } @@ -67273,43 +67273,43 @@ static int createCollation( int enc2; if( sqlite3SafetyCheck(db) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } - /* If SQLITE_UTF16 is specified as the encoding type, transform this - ** to one of SQLITE_UTF16LE or SQLITE_UTF16BE using the - ** SQLITE_UTF16NATIVE macro. SQLITE_UTF16 is not used internally. + /* If STQLITE_UTF16 is specified as the encoding type, transform this + ** to one of STQLITE_UTF16LE or STQLITE_UTF16BE using the + ** STQLITE_UTF16NATIVE macro. STQLITE_UTF16 is not used internally. */ - enc2 = enc & ~SQLITE_UTF16_ALIGNED; - if( enc2==SQLITE_UTF16 ){ - enc2 = SQLITE_UTF16NATIVE; + enc2 = enc & ~STQLITE_UTF16_ALIGNED; + if( enc2==STQLITE_UTF16 ){ + enc2 = STQLITE_UTF16NATIVE; } if( (enc2&~3)!=0 ){ - sqlite3Error(db, SQLITE_ERROR, "unknown encoding"); - return SQLITE_ERROR; + sqlite3Error(db, STQLITE_ERROR, "unknown encoding"); + return STQLITE_ERROR; } /* Check if this call is removing or replacing an existing collation ** sequence. If so, and there are active VMs, return busy. If there - ** are no active VMs, invalidate any pre-compiled statements. + ** are no active VMs, tqinvalidate any pre-compiled statements. */ pColl = sqlite3FindCollSeq(db, (u8)enc2, zName, strlen(zName), 0); if( pColl && pColl->xCmp ){ if( db->activeVdbeCnt ){ - sqlite3Error(db, SQLITE_BUSY, + sqlite3Error(db, STQLITE_BUSY, "Unable to delete/modify collation sequence due to active statements"); - return SQLITE_BUSY; + return STQLITE_BUSY; } sqlite3ExpirePreparedStatements(db); /* 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 invalidated. + ** then any copies made by synthCollSeq() need to be tqinvalidated. ** Also, collation destructor - CollSeq.xDel() - function may need ** to be called. */ - if( (pColl->enc & ~SQLITE_UTF16_ALIGNED)==enc2 ){ + if( (pColl->enc & ~STQLITE_UTF16_ALIGNED)==enc2 ){ CollSeq *aColl = sqlite3HashFind(&db->aCollSeq, zName, strlen(zName)); int j; for(j=0; j<3; j++){ @@ -67329,10 +67329,10 @@ static int createCollation( pColl->xCmp = xCompare; pColl->pUser = pCtx; pColl->xDel = xDel; - pColl->enc = enc2 | (enc & SQLITE_UTF16_ALIGNED); + pColl->enc = enc2 | (enc & STQLITE_UTF16_ALIGNED); } - sqlite3Error(db, SQLITE_OK, 0); - return SQLITE_OK; + sqlite3Error(db, STQLITE_OK, 0); + return STQLITE_OK; } @@ -67356,54 +67356,54 @@ static int openDatabase( if( db==0 ) goto opendb_out; db->errMask = 0xff; db->priorNewRowid = 0; - db->magic = SQLITE_MAGIC_BUSY; + db->magic = STQLITE_MAGIC_BUSY; db->nDb = 2; db->aDb = db->aDbStatic; db->autoCommit = 1; - db->flags |= SQLITE_ShortColNames -#if SQLITE_DEFAULT_FILE_FORMAT<4 - | SQLITE_LegacyFileFmt + db->flags |= STQLITE_ShortColNames +#if STQLITE_DEFAULT_FILE_FORMAT<4 + | STQLITE_LegacyFileFmt #endif -#ifdef SQLITE_ENABLE_LOAD_EXTENSION - | SQLITE_LoadExtension +#ifdef STQLITE_ENABLE_LOAD_EXTENSION + | STQLITE_LoadExtension #endif ; - sqlite3HashInit(&db->aFunc, SQLITE_HASH_STRING, 0); - sqlite3HashInit(&db->aCollSeq, SQLITE_HASH_STRING, 0); -#ifndef SQLITE_OMIT_VIRTUALTABLE - sqlite3HashInit(&db->aModule, SQLITE_HASH_STRING, 0); + sqlite3HashInit(&db->aFunc, STQLITE_HASH_STRING, 0); + sqlite3HashInit(&db->aCollSeq, STQLITE_HASH_STRING, 0); +#ifndef STQLITE_OMIT_VIRTUALTABLE + sqlite3HashInit(&db->aModule, STQLITE_HASH_STRING, 0); #endif /* Add the default collation sequence BINARY. BINARY works for both UTF-8 ** and UTF-16, so add a version for each to avoid any unnecessary ** conversions. The only error that can occur here is a malloc() failure. */ - if( createCollation(db, "BINARY", SQLITE_UTF8, 0, binCollFunc, 0) || - createCollation(db, "BINARY", SQLITE_UTF16BE, 0, binCollFunc, 0) || - createCollation(db, "BINARY", SQLITE_UTF16LE, 0, binCollFunc, 0) || - (db->pDfltColl = sqlite3FindCollSeq(db, SQLITE_UTF8, "BINARY", 6, 0))==0 + if( createCollation(db, "BINARY", STQLITE_UTF8, 0, binCollFunc, 0) || + createCollation(db, "BINARY", STQLITE_UTF16BE, 0, binCollFunc, 0) || + createCollation(db, "BINARY", STQLITE_UTF16LE, 0, binCollFunc, 0) || + (db->pDfltColl = sqlite3FindCollSeq(db, STQLITE_UTF8, "BINARY", 6, 0))==0 ){ assert( sqlite3MallocFailed() ); - db->magic = SQLITE_MAGIC_CLOSED; + db->magic = STQLITE_MAGIC_CLOSED; goto opendb_out; } /* Also add a UTF-8 case-insensitive collation sequence. */ - createCollation(db, "NOCASE", SQLITE_UTF8, 0, nocaseCollatingFunc, 0); + createCollation(db, "NOCASE", STQLITE_UTF8, 0, nocaseCollatingFunc, 0); /* Set flags on the built-in collating sequences */ - db->pDfltColl->type = SQLITE_COLL_BINARY; - pColl = sqlite3FindCollSeq(db, SQLITE_UTF8, "NOCASE", 6, 0); + db->pDfltColl->type = STQLITE_COLL_BINARY; + pColl = sqlite3FindCollSeq(db, STQLITE_UTF8, "NOCASE", 6, 0); if( pColl ){ - pColl->type = SQLITE_COLL_NOCASE; + pColl->type = STQLITE_COLL_NOCASE; } /* Open the backend database driver */ - rc = sqlite3BtreeFactory(db, zFilename, 0, SQLITE_DEFAULT_CACHE_SIZE, + rc = sqlite3BtreeFactory(db, zFilename, 0, STQLITE_DEFAULT_CACHE_SIZE, &db->aDb[0].pBt); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqlite3Error(db, rc, 0); - db->magic = SQLITE_MAGIC_CLOSED; + db->magic = STQLITE_MAGIC_CLOSED; goto opendb_out; } db->aDb[0].pSchema = sqlite3SchemaGet(db->aDb[0].pBt); @@ -67415,12 +67415,12 @@ static int openDatabase( */ db->aDb[0].zName = "main"; db->aDb[0].safety_level = 3; -#ifndef SQLITE_OMIT_TEMPDB +#ifndef STQLITE_OMIT_TEMPDB db->aDb[1].zName = "temp"; db->aDb[1].safety_level = 1; #endif - db->magic = SQLITE_MAGIC_OPEN; + db->magic = STQLITE_MAGIC_OPEN; if( sqlite3MallocFailed() ){ goto opendb_out; } @@ -67429,51 +67429,51 @@ static int openDatabase( ** database schema yet. This is delayed until the first time the database ** is accessed. */ - sqlite3Error(db, SQLITE_OK, 0); + sqlite3Error(db, STQLITE_OK, 0); sqlite3RegisterBuiltinFunctions(db); /* Load automatic extensions - extensions that have been registered ** using the sqlite3_automatic_extension() API. */ (void)sqlite3AutoLoadExtensions(db); - if( sqlite3_errcode(db)!=SQLITE_OK ){ + if( sqlite3_errcode(db)!=STQLITE_OK ){ goto opendb_out; } -#ifdef SQLITE_ENABLE_FTS1 +#ifdef STQLITE_ENABLE_FTS1 if( !sqlite3MallocFailed() ){ extern int sqlite3Fts1Init(sqlite3*); rc = sqlite3Fts1Init(db); } #endif -#ifdef SQLITE_ENABLE_FTS2 - if( !sqlite3MallocFailed() && rc==SQLITE_OK ){ +#ifdef STQLITE_ENABLE_FTS2 + if( !sqlite3MallocFailed() && rc==STQLITE_OK ){ extern int sqlite3Fts2Init(sqlite3*); rc = sqlite3Fts2Init(db); } #endif -#ifdef SQLITE_ENABLE_ICU - if( !sqlite3MallocFailed() && rc==SQLITE_OK ){ +#ifdef STQLITE_ENABLE_ICU + if( !sqlite3MallocFailed() && rc==STQLITE_OK ){ extern int sqlite3IcuInit(sqlite3*); rc = sqlite3IcuInit(db); } #endif sqlite3Error(db, rc, 0); - /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking - ** mode. -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking + /* -DSTQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking + ** mode. -DSTQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking ** mode. Doing nothing at all also makes NORMAL the default. */ -#ifdef SQLITE_DEFAULT_LOCKING_MODE - db->dfltLockMode = SQLITE_DEFAULT_LOCKING_MODE; +#ifdef STQLITE_DEFAULT_LOCKING_MODE + db->dfltLockMode = STQLITE_DEFAULT_LOCKING_MODE; sqlite3PagerLockingMode(sqlite3BtreePager(db->aDb[0].pBt), - SQLITE_DEFAULT_LOCKING_MODE); + STQLITE_DEFAULT_LOCKING_MODE); #endif opendb_out: - if( SQLITE_NOMEM==(rc = sqlite3_errcode(db)) ){ + if( STQLITE_NOMEM==(rc = sqlite3_errcode(db)) ){ sqlite3_close(db); db = 0; } @@ -67484,36 +67484,36 @@ opendb_out: /* ** Open a new database handle. */ -SQLITE_API int sqlite3_open( +STQLITE_API int sqlite3_open( const char *zFilename, sqlite3 **ppDb ){ return openDatabase(zFilename, ppDb); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 /* ** Open a new database handle. */ -SQLITE_API int sqlite3_open16( +STQLITE_API int sqlite3_open16( const void *zFilename, sqlite3 **ppDb ){ char const *zFilename8; /* zFilename encoded in UTF-8 instead of UTF-16 */ - int rc = SQLITE_OK; + int rc = STQLITE_OK; sqlite3_value *pVal; assert( zFilename ); assert( ppDb ); *ppDb = 0; pVal = sqlite3ValueNew(); - sqlite3ValueSetStr(pVal, -1, zFilename, SQLITE_UTF16NATIVE, SQLITE_STATIC); - zFilename8 = sqlite3ValueText(pVal, SQLITE_UTF8); + sqlite3ValueSetStr(pVal, -1, zFilename, STQLITE_UTF16NATIVE, STQLITE_STATIC); + zFilename8 = sqlite3ValueText(pVal, STQLITE_UTF8); if( zFilename8 ){ rc = openDatabase(zFilename8, ppDb); - if( rc==SQLITE_OK && *ppDb ){ + if( rc==STQLITE_OK && *ppDb ){ rc = sqlite3_exec(*ppDb, "PRAGMA encoding = 'UTF-16'", 0, 0, 0); - if( rc!=SQLITE_OK ){ + if( rc!=STQLITE_OK ){ sqlite3_close(*ppDb); *ppDb = 0; } @@ -67523,21 +67523,21 @@ SQLITE_API int sqlite3_open16( return sqlite3ApiExit(0, rc); } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ /* ** The following routine destroys a virtual machine that is created by -** the sqlite3_compile() routine. The integer returned is an SQLITE_ +** the sqlite3_compile() routine. The integer returned is an STQLITE_ ** success/failure code that describes the result of executing the virtual ** machine. ** ** This routine sets the error code and string returned by ** sqlite3_errcode(), sqlite3_errmsg() and sqlite3_errmsg16(). */ -SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt){ +STQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt){ int rc; if( pStmt==0 ){ - rc = SQLITE_OK; + rc = STQLITE_OK; }else{ rc = sqlite3VdbeFinalize((Vdbe*)pStmt); } @@ -67552,10 +67552,10 @@ SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt){ ** This routine sets the error code and string returned by ** sqlite3_errcode(), sqlite3_errmsg() and sqlite3_errmsg16(). */ -SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt){ +STQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt){ int rc; if( pStmt==0 ){ - rc = SQLITE_OK; + rc = STQLITE_OK; }else{ rc = sqlite3VdbeReset((Vdbe*)pStmt); sqlite3VdbeMakeReady((Vdbe*)pStmt, -1, 0, 0, 0); @@ -67597,7 +67597,7 @@ int sqlite3_create_collation_v2( return sqlite3ApiExit(db, rc); } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 /* ** Register a new collation sequence with the database handle db. */ @@ -67608,7 +67608,7 @@ int sqlite3_create_collation16( void* pCtx, int(*xCompare)(void*,int,const void*,int,const void*) ){ - int rc = SQLITE_OK; + int rc = STQLITE_OK; char *zName8; assert( !sqlite3MallocFailed() ); zName8 = sqlite3Utf16to8(zName, -1); @@ -67618,7 +67618,7 @@ int sqlite3_create_collation16( } return sqlite3ApiExit(db, rc); } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ /* ** Register a collation sequence factory callback with the database handle @@ -67630,15 +67630,15 @@ int sqlite3_collation_needed( void(*xCollNeeded)(void*,sqlite3*,int eTextRep,const char*) ){ if( sqlite3SafetyCheck(db) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } db->xCollNeeded = xCollNeeded; db->xCollNeeded16 = 0; db->pCollNeededArg = pCollNeededArg; - return SQLITE_OK; + return STQLITE_OK; } -#ifndef SQLITE_OMIT_UTF16 +#ifndef STQLITE_OMIT_UTF16 /* ** Register a collation sequence factory callback with the database handle ** db. Replace any previously installed collation sequence factory. @@ -67649,22 +67649,22 @@ int sqlite3_collation_needed16( void(*xCollNeeded16)(void*,sqlite3*,int eTextRep,const void*) ){ if( sqlite3SafetyCheck(db) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } db->xCollNeeded = 0; db->xCollNeeded16 = xCollNeeded16; db->pCollNeededArg = pCollNeededArg; - return SQLITE_OK; + return STQLITE_OK; } -#endif /* SQLITE_OMIT_UTF16 */ +#endif /* STQLITE_OMIT_UTF16 */ -#ifndef SQLITE_OMIT_GLOBALRECOVER +#ifndef STQLITE_OMIT_GLOBALRECOVER /* ** This function is now an anachronism. It used to be used to recover from a -** malloc() failure, but SQLite now does this automatically. +** malloc() failure, but STQLite now does this automatically. */ int sqlite3_global_recover(){ - return SQLITE_OK; + return STQLITE_OK; } #endif @@ -67680,19 +67680,19 @@ int sqlite3_get_autocommit(sqlite3 *db){ return db->autoCommit; } -#ifdef SQLITE_DEBUG +#ifdef STQLITE_DEBUG /* -** The following routine is subtituted for constant SQLITE_CORRUPT in +** The following routine is subtituted for constant STQLITE_CORRUPT in ** debugging builds. This provides a way to set a breakpoint for when ** corruption is first detected. */ -SQLITE_PRIVATE int sqlite3Corrupt(void){ - return SQLITE_CORRUPT; +STQLITE_PRIVATE int sqlite3Corrupt(void){ + return STQLITE_CORRUPT; } #endif -#ifndef SQLITE_OMIT_SHARED_CACHE +#ifndef STQLITE_OMIT_SHARED_CACHE /* ** Enable or disable the shared pager and schema features for the ** current thread. @@ -67710,13 +67710,13 @@ int sqlite3_enable_shared_cache(int enable){ */ if( pTd->pBtree && !enable ){ assert( pTd->useSharedData ); - return SQLITE_MISUSE; + return STQLITE_MISUSE; } pTd->useSharedData = enable; sqlite3ReleaseThreadData(); } - return sqlite3ApiExit(0, SQLITE_OK); + return sqlite3ApiExit(0, STQLITE_OK); } #endif @@ -67736,7 +67736,7 @@ void sqlite3_thread_cleanup(void){ ** Return meta information about a specific column of a database table. ** See comment in sqlite3.h (sqlite.h.in) for details. */ -#ifdef SQLITE_ENABLE_COLUMN_METADATA +#ifdef STQLITE_ENABLE_COLUMN_METADATA int sqlite3_table_column_metadata( sqlite3 *db, /* Connection handle */ const char *zDbName, /* Database name or NULL */ @@ -67762,10 +67762,10 @@ int sqlite3_table_column_metadata( /* Ensure the database schema has been loaded */ if( sqlite3SafetyOn(db) ){ - return SQLITE_MISUSE; + return STQLITE_MISUSE; } rc = sqlite3Init(db, &zErrMsg); - if( SQLITE_OK!=rc ){ + if( STQLITE_OK!=rc ){ goto error_out; } @@ -67821,7 +67821,7 @@ int sqlite3_table_column_metadata( error_out: if( sqlite3SafetyOff(db) ){ - rc = SQLITE_MISUSE; + rc = STQLITE_MISUSE; } /* Whether the function call succeeded or failed, set the output parameters @@ -67834,10 +67834,10 @@ error_out: if( pPrimaryKey ) *pPrimaryKey = primarykey; if( pAutoinc ) *pAutoinc = autoinc; - if( SQLITE_OK==rc && !pTab ){ + if( STQLITE_OK==rc && !pTab ){ sqlite3SetString(&zErrMsg, "no such table column: ", zTableName, ".", zColumnName, 0); - rc = SQLITE_ERROR; + rc = STQLITE_ERROR; } sqlite3Error(db, rc, (zErrMsg?"%s":0), zErrMsg); sqliteFree(zErrMsg); @@ -67850,8 +67850,8 @@ error_out: */ int sqlite3_clear_bindings(sqlite3_stmt *pStmt){ int i; - int rc = SQLITE_OK; - for(i=1; rc==SQLITE_OK && i<=sqlite3_bind_parameter_count(pStmt); i++){ + int rc = STQLITE_OK; + for(i=1; rc==STQLITE_OK && i<=sqlite3_bind_parameter_count(pStmt); i++){ rc = sqlite3_bind_null(pStmt, i); } return rc; @@ -67860,7 +67860,7 @@ int sqlite3_clear_bindings(sqlite3_stmt *pStmt){ /* ** Sleep for a little while. Return the amount of time slept. */ -SQLITE_API int sqlite3_sleep(int ms){ +STQLITE_API int sqlite3_sleep(int ms){ return sqlite3OsSleep(ms); } @@ -67869,7 +67869,7 @@ SQLITE_API int sqlite3_sleep(int ms){ */ int sqlite3_extended_result_codes(sqlite3 *db, int onoff){ db->errMask = onoff ? 0xffffffff : 0xff; - return SQLITE_OK; + return STQLITE_OK; } /************** End of main.c ************************************************/ diff --git a/amarok/src/sqlite/sqlite3.h b/amarok/src/sqlite/sqlite3.h index cb1fdb6c..ae518c8e 100644 --- a/amarok/src/sqlite/sqlite3.h +++ b/amarok/src/sqlite/sqlite3.h @@ -9,21 +9,21 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** This header file defines the interface that the SQLite library +** This header file defines the interface that the STQLite library ** presents to client programs. If a C-function, structure, datatype, ** or constant definition does not appear in this file, then it is -** not a published API of SQLite, is subject to change without -** notice, and should not be referenced by programs that use SQLite. +** not a published API of STQLite, is subject to change without +** notice, and should not be referenced by programs that use STQLite. ** ** Some of the definitions that are in this file are marked as ** "experimental". Experimental interfaces are normally new -** features recently added to SQLite. We do not anticipate changes +** features recently added to STQLite. We do not anticipate changes ** to experimental interfaces but reserve to make minor changes if ** experience from use "in the wild" suggest such changes are prudent. ** -** The official C-language API documentation for SQLite is derived +** The official C-language API documentation for STQLite is derived ** from comments in this file. This file is the authoritative source -** on how SQLite interfaces are suppose to operate. +** on how STQLite interfaces are suppose to operate. ** ** The name of this file under configuration management is "sqlite.h.in". ** The makefile makes some minor changes to this file (such as inserting @@ -32,8 +32,8 @@ ** ** @(#) $Id: sqlite.h.in,v 1.218 2007/07/19 12:41:40 drh Exp $ */ -#ifndef _SQLITE3_H_ -#define _SQLITE3_H_ +#ifndef _STQLITE3_H_ +#define _STQLITE3_H_ #include <stdarg.h> /* Needed for the definition of va_list */ /* @@ -47,18 +47,18 @@ extern "C" { ** Make sure these symbols where not defined by some previous header ** file. */ -#ifdef SQLITE_VERSION -# undef SQLITE_VERSION +#ifdef STQLITE_VERSION +# undef STQLITE_VERSION #endif -#ifdef SQLITE_VERSION_NUMBER -# undef SQLITE_VERSION_NUMBER +#ifdef STQLITE_VERSION_NUMBER +# undef STQLITE_VERSION_NUMBER #endif /* ** CAPI3REF: Compile-Time Library Version Numbers ** -** The version of the SQLite library is contained in the sqlite3.h -** header file in a #define named SQLITE_VERSION. The SQLITE_VERSION +** The version of the STQLite library is contained in the sqlite3.h +** header file in a #define named STQLITE_VERSION. The STQLITE_VERSION ** macro resolves to a string constant. ** ** The format of the version string is "X.Y.Z", where @@ -66,36 +66,36 @@ extern "C" { ** is the release number. The X.Y.Z might be followed by "alpha" or "beta". ** For example "3.1.1beta". ** -** The X value is always 3 in SQLite. The X value only changes when +** The X value is always 3 in STQLite. The X value only changes when ** backwards compatibility is broken and we intend to never break ** backwards compatibility. The Y value only changes when ** there are major feature enhancements that are forwards compatible ** but not backwards compatible. The Z value is incremented with ** each release but resets back to 0 when Y is incremented. ** -** The SQLITE_VERSION_NUMBER is an integer with the value +** The STQLITE_VERSION_NUMBER is an integer with the value ** (X*1000000 + Y*1000 + Z). For example, for version "3.1.1beta", -** SQLITE_VERSION_NUMBER is set to 3001001. To detect if they are using +** STQLITE_VERSION_NUMBER is set to 3001001. To detect if they are using ** version 3.1.1 or greater at compile time, programs may use the test -** (SQLITE_VERSION_NUMBER>=3001001). +** (STQLITE_VERSION_NUMBER>=3001001). ** ** See also: [sqlite3_libversion()] and [sqlite3_libversion_number()]. */ -#define SQLITE_VERSION "3.4.1" -#define SQLITE_VERSION_NUMBER 3004001 +#define STQLITE_VERSION "3.4.1" +#define STQLITE_VERSION_NUMBER 3004001 /* ** CAPI3REF: Run-Time Library Version Numbers ** ** These routines return values equivalent to the header constants -** [SQLITE_VERSION] and [SQLITE_VERSION_NUMBER]. The values returned +** [STQLITE_VERSION] and [STQLITE_VERSION_NUMBER]. The values returned ** by this routines should only be different from the header values ** if you compile your program using an sqlite3.h header from a -** different version of SQLite that the version of the library you +** different version of STQLite that the version of the library you ** link against. ** ** The sqlite3_version[] string constant contains the text of the -** [SQLITE_VERSION] string. The sqlite3_libversion() function returns +** [STQLITE_VERSION] string. The sqlite3_libversion() function returns ** a poiner to the sqlite3_version[] string constant. The function ** is provided for DLL users who can only access functions and not ** constants within the DLL. @@ -107,7 +107,7 @@ int sqlite3_libversion_number(void); /* ** CAPI3REF: Database Connection Handle ** -** Each open SQLite database is represented by pointer to an instance of the +** Each open STQLite database is represented by pointer to an instance of the ** opaque structure named "sqlite3". It is useful to think of an sqlite3 ** pointer as an object. The [sqlite3_open] interface is its constructor ** and [sqlite3_close] is its destructor. There are many other interfaces @@ -124,12 +124,12 @@ typedef struct sqlite3 sqlite3; ** Some compilers do not support the "long long" datatype. So we have ** to do compiler-specific typedefs for 64-bit signed and unsigned integers. ** -** Many SQLite interface functions require a 64-bit integer arguments. +** Many STQLite interface functions require a 64-bit integer arguments. ** Those interfaces are declared using this typedef. */ -#ifdef SQLITE_INT64_TYPE - typedef SQLITE_INT64_TYPE sqlite_int64; - typedef unsigned SQLITE_INT64_TYPE sqlite_uint64; +#ifdef STQLITE_INT64_TYPE + typedef STQLITE_INT64_TYPE sqlite_int64; + typedef unsigned STQLITE_INT64_TYPE sqlite_uint64; #elif defined(_MSC_VER) || defined(__BORLANDC__) typedef __int64 sqlite_int64; typedef unsigned __int64 sqlite_uint64; @@ -142,7 +142,7 @@ typedef struct sqlite3 sqlite3; ** If compiling for a processor that lacks floating point support, ** substitute integer for floating-point */ -#ifdef SQLITE_OMIT_FLOATING_POINT +#ifdef STQLITE_OMIT_FLOATING_POINT # define double sqlite_int64 #endif @@ -155,7 +155,7 @@ typedef struct sqlite3 sqlite3; ** ** All SQL statements prepared using [sqlite3_prepare_v2()] or ** [sqlite3_prepare16_v2()] must be destroyed using [sqlite3_finalize()] -** before this routine is called. Otherwise, SQLITE_BUSY is returned and the +** before this routine is called. Otherwise, STQLITE_BUSY is returned and the ** database connection remains open. */ int sqlite3_close(sqlite3 *); @@ -181,7 +181,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**); ** invoked once for each row of the query result. This callback ** should normally return 0. If the callback returns a non-zero ** value then the query is aborted, all subsequent SQL statements -** are skipped and the sqlite3_exec() function returns the SQLITE_ABORT. +** are skipped and the sqlite3_exec() function returns the STQLITE_ABORT. ** ** The 4th parameter to this interface is an arbitrary pointer that is ** passed through to the callback function as its first parameter. @@ -206,8 +206,8 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**); ** message. Use [sqlite3_free()] for this. If errmsg==NULL, ** then no error message is ever written. ** -** The return value is is SQLITE_OK if there are no errors and -** some other [SQLITE_OK | return code] if there is an error. +** The return value is is STQLITE_OK if there are no errors and +** some other [STQLITE_OK | return code] if there is an error. ** The particular return value depends on the type of error. ** */ @@ -221,59 +221,59 @@ int sqlite3_exec( /* ** CAPI3REF: Result Codes -** KEYWORDS: SQLITE_OK +** KEYWORDS: STQLITE_OK ** -** Many SQLite functions return an integer result code from the set shown +** Many STQLite functions return an integer result code from the set shown ** above in order to indicates success or failure. ** -** The result codes above are the only ones returned by SQLite in its +** The result codes above are the only ones returned by STQLite in its ** default configuration. However, the [sqlite3_extended_result_codes()] ** API can be used to set a database connectoin to return more detailed ** result codes. ** -** See also: [SQLITE_IOERR_READ | extended result codes] +** See also: [STQLITE_IOERR_READ | extended result codes] ** */ -#define SQLITE_OK 0 /* Successful result */ +#define STQLITE_OK 0 /* Successful result */ /* beginning-of-error-codes */ -#define SQLITE_ERROR 1 /* SQL error or missing database */ -#define SQLITE_INTERNAL 2 /* NOT USED. Internal logic error in SQLite */ -#define SQLITE_PERM 3 /* Access permission denied */ -#define SQLITE_ABORT 4 /* Callback routine requested an abort */ -#define SQLITE_BUSY 5 /* The database file is locked */ -#define SQLITE_LOCKED 6 /* A table in the database is locked */ -#define SQLITE_NOMEM 7 /* A malloc() failed */ -#define SQLITE_READONLY 8 /* Attempt to write a readonly database */ -#define SQLITE_INTERRUPT 9 /* Operation terminated by sqlite3_interrupt()*/ -#define SQLITE_IOERR 10 /* Some kind of disk I/O error occurred */ -#define SQLITE_CORRUPT 11 /* The database disk image is malformed */ -#define SQLITE_NOTFOUND 12 /* NOT USED. Table or record not found */ -#define SQLITE_FULL 13 /* Insertion failed because database is full */ -#define SQLITE_CANTOPEN 14 /* Unable to open the database file */ -#define SQLITE_PROTOCOL 15 /* NOT USED. Database lock protocol error */ -#define SQLITE_EMPTY 16 /* Database is empty */ -#define SQLITE_SCHEMA 17 /* The database schema changed */ -#define SQLITE_TOOBIG 18 /* String or BLOB exceeds size limit */ -#define SQLITE_CONSTRAINT 19 /* Abort due to contraint violation */ -#define SQLITE_MISMATCH 20 /* Data type mismatch */ -#define SQLITE_MISUSE 21 /* Library used incorrectly */ -#define SQLITE_NOLFS 22 /* Uses OS features not supported on host */ -#define SQLITE_AUTH 23 /* Authorization denied */ -#define SQLITE_FORMAT 24 /* Auxiliary database format error */ -#define SQLITE_RANGE 25 /* 2nd parameter to sqlite3_bind out of range */ -#define SQLITE_NOTADB 26 /* File opened that is not a database file */ -#define SQLITE_ROW 100 /* sqlite3_step() has another row ready */ -#define SQLITE_DONE 101 /* sqlite3_step() has finished executing */ +#define STQLITE_ERROR 1 /* SQL error or missing database */ +#define STQLITE_INTERNAL 2 /* NOT USED. Internal logic error in STQLite */ +#define STQLITE_PERM 3 /* Access permission denied */ +#define STQLITE_ABORT 4 /* Callback routine requested an abort */ +#define STQLITE_BUSY 5 /* The database file is locked */ +#define STQLITE_LOCKED 6 /* A table in the database is locked */ +#define STQLITE_NOMEM 7 /* A malloc() failed */ +#define STQLITE_READONLY 8 /* Attempt to write a readonly database */ +#define STQLITE_INTERRUPT 9 /* Operation terminated by sqlite3_interrupt()*/ +#define STQLITE_IOERR 10 /* Some kind of disk I/O error occurred */ +#define STQLITE_CORRUPT 11 /* The database disk image is malformed */ +#define STQLITE_NOTFOUND 12 /* NOT USED. Table or record not found */ +#define STQLITE_FULL 13 /* Insertion failed because database is full */ +#define STQLITE_CANTOPEN 14 /* Unable to open the database file */ +#define STQLITE_PROTOCOL 15 /* NOT USED. Database lock protocol error */ +#define STQLITE_EMPTY 16 /* Database is empty */ +#define STQLITE_SCHEMA 17 /* The database schema changed */ +#define STQLITE_TOOBIG 18 /* String or BLOB exceeds size limit */ +#define STQLITE_CONSTRAINT 19 /* Abort due to contraint violation */ +#define STQLITE_MISMATCH 20 /* Data type mismatch */ +#define STQLITE_MISUSE 21 /* Library used incorrectly */ +#define STQLITE_NOLFS 22 /* Uses OS features not supported on host */ +#define STQLITE_AUTH 23 /* Authorization denied */ +#define STQLITE_FORMAT 24 /* Auxiliary database format error */ +#define STQLITE_RANGE 25 /* 2nd parameter to sqlite3_bind out of range */ +#define STQLITE_NOTADB 26 /* File opened that is not a database file */ +#define STQLITE_ROW 100 /* sqlite3_step() has another row ready */ +#define STQLITE_DONE 101 /* sqlite3_step() has finished executing */ /* end-of-error-codes */ /* ** CAPI3REF: Extended Result Codes ** -** In its default configuration, SQLite API routines return one of 26 integer +** In its default configuration, STQLite API routines return one of 26 integer ** result codes described at result-codes. However, experience has shown that ** many of these result codes are too course-grained. They do not provide as ** much information about problems as users might like. In an effort to -** address this, newer versions of SQLite (version 3.3.8 and later) include +** address this, newer versions of STQLite (version 3.3.8 and later) include ** support for additional result codes that provide more detailed information ** about errors. The extended result codes are enabled (or disabled) for ** each database @@ -282,50 +282,50 @@ int sqlite3_exec( ** Some of the available extended result codes are listed above. ** We expect the number of extended result codes will be expand ** over time. Software that uses extended result codes should expect -** to see new result codes in future releases of SQLite. +** to see new result codes in future releases of STQLite. ** ** The symbolic name for an extended result code always contains a related ** 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 masking off the lower 8 bytes. +** corresponding primary result code by tqmasking off the lower 8 bytes. ** -** The SQLITE_OK result code will never be extended. It will always +** The STQLITE_OK result code will never be extended. It will always ** be exactly zero. */ -#define SQLITE_IOERR_READ (SQLITE_IOERR | (1<<8)) -#define SQLITE_IOERR_SHORT_READ (SQLITE_IOERR | (2<<8)) -#define SQLITE_IOERR_WRITE (SQLITE_IOERR | (3<<8)) -#define SQLITE_IOERR_FSYNC (SQLITE_IOERR | (4<<8)) -#define SQLITE_IOERR_DIR_FSYNC (SQLITE_IOERR | (5<<8)) -#define SQLITE_IOERR_TRUNCATE (SQLITE_IOERR | (6<<8)) -#define SQLITE_IOERR_FSTAT (SQLITE_IOERR | (7<<8)) -#define SQLITE_IOERR_UNLOCK (SQLITE_IOERR | (8<<8)) -#define SQLITE_IOERR_RDLOCK (SQLITE_IOERR | (9<<8)) -#define SQLITE_IOERR_DELETE (SQLITE_IOERR | (10<<8)) -#define SQLITE_IOERR_BLOCKED (SQLITE_IOERR | (11<<8)) +#define STQLITE_IOERR_READ (STQLITE_IOERR | (1<<8)) +#define STQLITE_IOERR_SHORT_READ (STQLITE_IOERR | (2<<8)) +#define STQLITE_IOERR_WRITE (STQLITE_IOERR | (3<<8)) +#define STQLITE_IOERR_FSYNC (STQLITE_IOERR | (4<<8)) +#define STQLITE_IOERR_DIR_FSYNC (STQLITE_IOERR | (5<<8)) +#define STQLITE_IOERR_TRUNCATE (STQLITE_IOERR | (6<<8)) +#define STQLITE_IOERR_FSTAT (STQLITE_IOERR | (7<<8)) +#define STQLITE_IOERR_UNLOCK (STQLITE_IOERR | (8<<8)) +#define STQLITE_IOERR_RDLOCK (STQLITE_IOERR | (9<<8)) +#define STQLITE_IOERR_DELETE (STQLITE_IOERR | (10<<8)) +#define STQLITE_IOERR_BLOCKED (STQLITE_IOERR | (11<<8)) /* ** CAPI3REF: Enable Or Disable Extended Result Codes ** ** This routine enables or disables the -** [SQLITE_IOERR_READ | extended result codes] feature. -** By default, SQLite API routines return one of only 26 integer -** [SQLITE_OK | result codes]. When extended result codes +** [STQLITE_IOERR_READ | extended result codes] feature. +** By default, STQLite API routines return one of only 26 integer +** [STQLITE_OK | result codes]. When extended result codes ** are enabled by this routine, the repetoire of result codes can be ** much larger and can (hopefully) provide more detailed information ** about the cause of an error. ** ** The second argument is a boolean value that turns extended result ** codes on and off. Extended result codes are off by default for -** backwards compatibility with older versions of SQLite. +** backwards compatibility with older versions of STQLite. */ int sqlite3_extended_result_codes(sqlite3*, int onoff); /* ** CAPI3REF: Last Insert Rowid ** -** Each entry in an SQLite table has a unique 64-bit signed integer key +** Each entry in an STQLite table has a unique 64-bit signed integer key ** called the "rowid". The rowid is always available as an undeclared ** column named ROWID, OID, or _ROWID_. If the table has a column of ** type INTEGER PRIMARY KEY then that column is another an alias for the @@ -367,7 +367,7 @@ sqlite_int64 sqlite3_last_insert_rowid(sqlite3*); ** then the changes in the inner, recursive call are counted together ** with the changes in the outer call. ** -** SQLite implements the command "DELETE FROM table" without a WHERE clause +** STQLite implements the command "DELETE FROM table" without a WHERE clause ** by dropping and recreating the table. (This is much faster than going ** through and deleting individual elements from the table.) Because of ** this optimization, the change count for "DELETE FROM table" will be @@ -389,7 +389,7 @@ int sqlite3_changes(sqlite3*); ** ** See also the [sqlite3_change()] interface. ** -** SQLite implements the command "DELETE FROM table" without a WHERE clause +** STQLite implements the command "DELETE FROM table" without a WHERE clause ** by dropping and recreating the table. (This is much faster than going ** through and deleting individual elements form the table.) Because of ** this optimization, the change count for "DELETE FROM table" will be @@ -411,7 +411,7 @@ int sqlite3_total_changes(sqlite3*); ** It is safe to call this routine from a thread different from the ** thread that is currently running the database operation. ** -** The SQL operation that is interrupted will return [SQLITE_INTERRUPT]. +** The SQL operation that is interrupted will return [STQLITE_INTERRUPT]. ** If an interrupted operation was an update that is inside an ** explicit transaction, then the entire transaction will be rolled ** back automatically. @@ -430,7 +430,7 @@ void sqlite3_interrupt(sqlite3*); ** These routines are useful for command-line input to determine if the ** currently entered text forms one or more complete SQL statements or ** if additional input is needed before sending the statements into -** SQLite for parsing. The algorithm is simple. If the +** STQLite for parsing. The algorithm is simple. If the ** last token other than spaces and comments is a semicolon, then return ** true. Actually, the algorithm is a little more complicated than that ** in order to deal with triggers, but the basic idea is the same: the @@ -440,13 +440,13 @@ int sqlite3_complete(const char *sql); int sqlite3_complete16(const void *sql); /* -** CAPI3REF: Register A Callback To Handle SQLITE_BUSY Errors +** CAPI3REF: Register A Callback To Handle STQLITE_BUSY Errors ** ** This routine identifies a callback function that might be invoked ** whenever an attempt is made to open a database table ** that another thread or process has locked. -** If the busy callback is NULL, then [SQLITE_BUSY] -** (or sometimes [SQLITE_IOERR_BLOCKED]) +** If the busy callback is NULL, then [STQLITE_BUSY] +** (or sometimes [STQLITE_IOERR_BLOCKED]) ** is returned immediately upon encountering the lock. ** If the busy callback is not NULL, then the ** callback will be invoked with two arguments. The @@ -455,14 +455,14 @@ int sqlite3_complete16(const void *sql); ** the handler is the number of times that the busy handler has ** been invoked for this locking event. If the ** busy callback returns 0, then no additional attempts are made to -** access the database and [SQLITE_BUSY] or [SQLITE_IOERR_BLOCKED] is returned. +** access the database and [STQLITE_BUSY] or [STQLITE_IOERR_BLOCKED] is returned. ** If the callback returns non-zero, then another attempt is made to open the ** database for reading and the cycle repeats. ** ** The presence of a busy handler does not guarantee that ** it will be invoked when there is lock contention. -** If SQLite determines that invoking the busy handler could result in -** a deadlock, it will return [SQLITE_BUSY] instead. +** If STQLite determines that invoking the busy handler could result in +** a deadlock, it will return [STQLITE_BUSY] instead. ** Consider a scenario where one process is holding a read lock that ** it is trying to promote to a reserved lock and ** a second process is holding a reserved lock that it is trying @@ -470,22 +470,22 @@ int sqlite3_complete16(const void *sql); ** because it is blocked by the second and the second process cannot ** proceed because it is blocked by the first. If both processes ** invoke the busy handlers, neither will make any progress. Therefore, -** SQLite returns [SQLITE_BUSY] for the first process, hoping that this +** STQLite returns [STQLITE_BUSY] for the first process, hoping that this ** will induce the first process to release its read lock and allow ** the second process to proceed. ** ** The default busy callback is NULL. ** -** The [SQLITE_BUSY] error is converted to [SQLITE_IOERR_BLOCKED] when -** SQLite is in the middle of a large transaction where all the -** changes will not fit into the in-memory cache. SQLite will +** The [STQLITE_BUSY] error is converted to [STQLITE_IOERR_BLOCKED] when +** STQLite is in the middle of a large transaction where all the +** changes will not fit into the in-memory cache. STQLite will ** already hold a RESERVED lock on the database file, but it needs ** to promote this lock to EXCLUSIVE so that it can spill cache ** pages into the database file without harm to concurrent ** readers. If it is unable to promote the lock, then the in-memory ** cache will be left in an inconsistent state and so the error -** code is promoted from the relatively benign [SQLITE_BUSY] to -** the more severe [SQLITE_IOERR_BLOCKED]. This error code promotion +** code is promoted from the relatively benign [STQLITE_BUSY] to +** the more severe [STQLITE_IOERR_BLOCKED]. This error code promotion ** forces an automatic rollback of the changes. See the ** <a href="http://www.sqlite.org/cvstrac/wiki?p=CorruptionFollowingBusyError"> ** CorruptionFollowingBusyError</a> wiki page for a discussion of why @@ -512,7 +512,7 @@ int sqlite3_busy_handler(sqlite3*, int(*)(void*,int), void*); ** table is locked. The handler will sleep multiple times until ** at least "ms" milliseconds of sleeping have been done. After ** "ms" milliseconds of sleeping, the handler returns 0 which -** causes [sqlite3_step()] to return [SQLITE_BUSY] or [SQLITE_IOERR_BLOCKED]. +** causes [sqlite3_step()] to return [STQLITE_BUSY] or [STQLITE_IOERR_BLOCKED]. ** ** Calling this routine with an argument less than or equal to zero ** turns off all busy handlers. @@ -677,7 +677,7 @@ char *sqlite3_snprintf(int,char*,const char*, ...); /* ** CAPI3REF: Memory Allocation Functions ** -** SQLite uses its own memory allocator. On some installations, this +** STQLite uses its own memory allocator. On some installations, this ** memory allocator is identical to the standard malloc()/realloc()/free() ** and can be used interchangable. On others, the implementations are ** different. For maximum portability, it is best not to mix calls @@ -690,33 +690,33 @@ void sqlite3_free(void*); /* ** CAPI3REF: Compile-Time Authorization Callbacks *** -** This routine registers a authorizer callback with the SQLite library. +** This routine registers a authorizer callback with the STQLite library. ** The authorizer callback is invoked as SQL statements are being compiled ** by [sqlite3_prepare()] or its variants [sqlite3_prepare_v2()], ** [sqlite3_prepare16()] and [sqlite3_prepare16_v2()]. At various ** points during the compilation process, as logic is being created ** to perform various actions, the authorizer callback is invoked to ** see if those actions are allowed. The authorizer callback should -** return SQLITE_OK to allow the action, [SQLITE_IGNORE] to disallow the +** return STQLITE_OK to allow the action, [STQLITE_IGNORE] to disallow the ** specific action but allow the SQL statement to continue to be -** compiled, or [SQLITE_DENY] to cause the entire SQL statement to be +** compiled, or [STQLITE_DENY] to cause the entire SQL statement to be ** rejected with an error. ** -** Depending on the action, the [SQLITE_IGNORE] and [SQLITE_DENY] return +** Depending on the action, the [STQLITE_IGNORE] and [STQLITE_DENY] return ** codes might mean something different or they might mean the same ** thing. If the action is, for example, to perform a delete opertion, -** then [SQLITE_IGNORE] and [SQLITE_DENY] both cause the statement compilation +** then [STQLITE_IGNORE] and [STQLITE_DENY] both cause the statement compilation ** to fail with an error. But if the action is to read a specific column -** from a specific table, then [SQLITE_DENY] will cause the entire -** statement to fail but [SQLITE_IGNORE] will cause a NULL value to be +** from a specific table, then [STQLITE_DENY] will cause the entire +** statement to fail but [STQLITE_IGNORE] will cause a NULL value to be ** read instead of the actual column value. ** ** The first parameter to the authorizer callback is a copy of ** the third parameter to the sqlite3_set_authorizer() interface. ** The second parameter to the callback is an integer -** [SQLITE_COPY | action code] that specifies the particular action +** [STQLITE_COPY | action code] that specifies the particular action ** to be authorized. The available action codes are -** [SQLITE_COPY | documented separately]. The third through sixth +** [STQLITE_COPY | documented separately]. The third through sixth ** parameters to the callback are strings that contain additional ** details about the action to be authorized. ** @@ -750,13 +750,13 @@ int sqlite3_set_authorizer( ** CAPI3REF: Authorizer Return Codes ** ** The [sqlite3_set_authorizer | authorizer callback function] must -** return either [SQLITE_OK] or one of these two constants in order -** to signal SQLite whether or not the action is permitted. See the +** return either [STQLITE_OK] or one of these two constants in order +** to signal STQLite whether or not the action is permitted. See the ** [sqlite3_set_authorizer | authorizer documentation] for additional ** information. */ -#define SQLITE_DENY 1 /* Abort the SQL statement with an error */ -#define SQLITE_IGNORE 2 /* Don't allow access, but don't generate an error */ +#define STQLITE_DENY 1 /* Abort the SQL statement with an error */ +#define STQLITE_IGNORE 2 /* Don't allow access, but don't generate an error */ /* ** CAPI3REF: Authorizer Action Codes @@ -778,38 +778,38 @@ int sqlite3_set_authorizer( ** top-level SQL code. */ /******************************************* 3rd ************ 4th ***********/ -#define SQLITE_CREATE_INDEX 1 /* Index Name Table Name */ -#define SQLITE_CREATE_TABLE 2 /* Table Name NULL */ -#define SQLITE_CREATE_TEMP_INDEX 3 /* Index Name Table Name */ -#define SQLITE_CREATE_TEMP_TABLE 4 /* Table Name NULL */ -#define SQLITE_CREATE_TEMP_TRIGGER 5 /* Trigger Name Table Name */ -#define SQLITE_CREATE_TEMP_VIEW 6 /* View Name NULL */ -#define SQLITE_CREATE_TRIGGER 7 /* Trigger Name Table Name */ -#define SQLITE_CREATE_VIEW 8 /* View Name NULL */ -#define SQLITE_DELETE 9 /* Table Name NULL */ -#define SQLITE_DROP_INDEX 10 /* Index Name Table Name */ -#define SQLITE_DROP_TABLE 11 /* Table Name NULL */ -#define SQLITE_DROP_TEMP_INDEX 12 /* Index Name Table Name */ -#define SQLITE_DROP_TEMP_TABLE 13 /* Table Name NULL */ -#define SQLITE_DROP_TEMP_TRIGGER 14 /* Trigger Name Table Name */ -#define SQLITE_DROP_TEMP_VIEW 15 /* View Name NULL */ -#define SQLITE_DROP_TRIGGER 16 /* Trigger Name Table Name */ -#define SQLITE_DROP_VIEW 17 /* View Name NULL */ -#define SQLITE_INSERT 18 /* Table Name NULL */ -#define SQLITE_PRAGMA 19 /* Pragma Name 1st arg or NULL */ -#define SQLITE_READ 20 /* Table Name Column Name */ -#define SQLITE_SELECT 21 /* NULL NULL */ -#define SQLITE_TRANSACTION 22 /* NULL NULL */ -#define SQLITE_UPDATE 23 /* Table Name Column Name */ -#define SQLITE_ATTACH 24 /* Filename NULL */ -#define SQLITE_DETACH 25 /* Database Name NULL */ -#define SQLITE_ALTER_TABLE 26 /* Database Name Table Name */ -#define SQLITE_REINDEX 27 /* Index Name NULL */ -#define SQLITE_ANALYZE 28 /* Table Name NULL */ -#define SQLITE_CREATE_VTABLE 29 /* Table Name Module Name */ -#define SQLITE_DROP_VTABLE 30 /* Table Name Module Name */ -#define SQLITE_FUNCTION 31 /* Function Name NULL */ -#define SQLITE_COPY 0 /* No longer used */ +#define STQLITE_CREATE_INDEX 1 /* Index Name Table Name */ +#define STQLITE_CREATE_TABLE 2 /* Table Name NULL */ +#define STQLITE_CREATE_TEMP_INDEX 3 /* Index Name Table Name */ +#define STQLITE_CREATE_TEMP_TABLE 4 /* Table Name NULL */ +#define STQLITE_CREATE_TEMP_TRIGGER 5 /* Trigger Name Table Name */ +#define STQLITE_CREATE_TEMP_VIEW 6 /* View Name NULL */ +#define STQLITE_CREATE_TRIGGER 7 /* Trigger Name Table Name */ +#define STQLITE_CREATE_VIEW 8 /* View Name NULL */ +#define STQLITE_DELETE 9 /* Table Name NULL */ +#define STQLITE_DROP_INDEX 10 /* Index Name Table Name */ +#define STQLITE_DROP_TABLE 11 /* Table Name NULL */ +#define STQLITE_DROP_TEMP_INDEX 12 /* Index Name Table Name */ +#define STQLITE_DROP_TEMP_TABLE 13 /* Table Name NULL */ +#define STQLITE_DROP_TEMP_TRIGGER 14 /* Trigger Name Table Name */ +#define STQLITE_DROP_TEMP_VIEW 15 /* View Name NULL */ +#define STQLITE_DROP_TRIGGER 16 /* Trigger Name Table Name */ +#define STQLITE_DROP_VIEW 17 /* View Name NULL */ +#define STQLITE_INSERT 18 /* Table Name NULL */ +#define STQLITE_PRAGMA 19 /* Pragma Name 1st arg or NULL */ +#define STQLITE_READ 20 /* Table Name Column Name */ +#define STQLITE_SELECT 21 /* NULL NULL */ +#define STQLITE_TRANSACTION 22 /* NULL NULL */ +#define STQLITE_UPDATE 23 /* Table Name Column Name */ +#define STQLITE_ATTACH 24 /* Filename NULL */ +#define STQLITE_DETACH 25 /* Database Name NULL */ +#define STQLITE_ALTER_TABLE 26 /* Database Name Table Name */ +#define STQLITE_REINDEX 27 /* Index Name NULL */ +#define STQLITE_ANALYZE 28 /* Table Name NULL */ +#define STQLITE_CREATE_VTABLE 29 /* Table Name Module Name */ +#define STQLITE_DROP_VTABLE 30 /* Table Name Module Name */ +#define STQLITE_FUNCTION 31 /* Function Name NULL */ +#define STQLITE_COPY 0 /* No longer used */ /* ** CAPI3REF: Tracing And Profiling Functions @@ -856,7 +856,7 @@ void *sqlite3_profile(sqlite3*, ** If the progress callback returns a result other than 0, then the current ** query is immediately terminated and any database changes rolled back. ** The containing [sqlite3_exec()], [sqlite3_step()], or -** [sqlite3_get_table()] call returns SQLITE_INTERRUPT. This feature +** [sqlite3_get_table()] call returns STQLITE_INTERRUPT. This feature ** can be used, for example, to implement the "Cancel" button on a ** progress dialog box in a GUI. */ @@ -869,7 +869,7 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); ** encoded for sqlite3_open() and UTF-16 encoded in the native byte order ** for sqlite3_open16(). An [sqlite3*] handle is returned in *ppDb, even ** if an error occurs. If the database is opened (or created) successfully, -** then SQLITE_OK is returned. Otherwise an error code is returned. The +** then STQLITE_OK is returned. Otherwise an error code is returned. The ** sqlite3_errmsg() or sqlite3_errmsg16() routines can be used to obtain ** an English language description of the error. ** @@ -888,18 +888,18 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); */ int sqlite3_open( const char *filename, /* Database filename (UTF-8) */ - sqlite3 **ppDb /* OUT: SQLite db handle */ + sqlite3 **ppDb /* OUT: STQLite db handle */ ); int sqlite3_open16( const void *filename, /* Database filename (UTF-16) */ - sqlite3 **ppDb /* OUT: SQLite db handle */ + sqlite3 **ppDb /* OUT: STQLite db handle */ ); /* ** CAPI3REF: Error Codes And Messages ** ** The sqlite3_errcode() interface returns the numeric -** [SQLITE_OK | result code] or [SQLITE_IOERR_READ | extended result code] +** [STQLITE_OK | result code] or [STQLITE_IOERR_READ | extended result code] ** for the most recent failed sqlite3_* API call associated ** with [sqlite3] handle 'db'. If a prior API call failed but the ** most recent API call succeeded, the return value from sqlite3_errcode() @@ -908,7 +908,7 @@ int sqlite3_open16( ** The sqlite3_errmsg() and sqlite3_errmsg16() return English-langauge ** text that describes the error, as either UTF8 or UTF16 respectively. ** Memory to hold the error message string is managed internally. The -** string may be overwritten or deallocated by subsequent calls to SQLite +** string may be overwritten or deallocated by subsequent calls to STQLite ** interface functions. ** ** Calls to many sqlite3_* functions set the error code and string returned @@ -958,7 +958,7 @@ typedef struct sqlite3_stmt sqlite3_stmt; ** To execute an SQL query, it must first be compiled into a byte-code ** program using one of these routines. ** -** The first argument "db" is an [sqlite3 | SQLite database handle] +** The first argument "db" is an [sqlite3 | STQLite database handle] ** obtained from a prior call to [sqlite3_open()] or [sqlite3_open16()]. ** The second argument "zSql" is the statement to be compiled, encoded ** as either UTF-8 or UTF-16. The sqlite3_prepare() and sqlite3_prepare_v2() @@ -984,8 +984,8 @@ typedef struct sqlite3_stmt sqlite3_stmt; ** procedure is responsible for deleting the compiled SQL statement ** using [sqlite3_finalize()] after it has finished with it. ** -** On success, [SQLITE_OK] is returned. Otherwise an -** [SQLITE_ERROR | error code] is returned. +** On success, [STQLITE_OK] is returned. Otherwise an +** [STQLITE_ERROR | error code] is returned. ** ** The sqlite3_prepare_v2() and sqlite3_prepare16_v2() interfaces are ** recommended for all new programs. The two older interfaces are retained @@ -997,23 +997,23 @@ typedef struct sqlite3_stmt sqlite3_stmt; ** ** <ol> ** <li> -** If the database schema changes, instead of returning [SQLITE_SCHEMA] as it +** If the database schema changes, instead of returning [STQLITE_SCHEMA] as it ** always used to do, [sqlite3_step()] will automatically recompile the SQL ** statement and try to run it again. If the schema has changed in a way ** that makes the statement no longer valid, [sqlite3_step()] will still -** return [SQLITE_SCHEMA]. But unlike the legacy behavior, [SQLITE_SCHEMA] is +** return [STQLITE_SCHEMA]. But unlike the legacy behavior, [STQLITE_SCHEMA] is ** now a fatal error. Calling [sqlite3_prepare_v2()] again will not make the ** error go away. Note: use [sqlite3_errmsg()] to find the text of the parsing -** error that results in an [SQLITE_SCHEMA] return. +** error that results in an [STQLITE_SCHEMA] return. ** </li> ** ** <li> ** When an error occurs, ** [sqlite3_step()] will return one of the detailed -** [SQLITE_ERROR | result codes] or -** [SQLITE_IOERR_READ | extended result codes] such as directly. +** [STQLITE_ERROR | result codes] or +** [STQLITE_IOERR_READ | extended result codes] such as directly. ** The legacy behavior was that [sqlite3_step()] would only return a generic -** [SQLITE_ERROR] result code and you would have to make a second call to +** [STQLITE_ERROR] result code and you would have to make a second call to ** [sqlite3_reset()] in order to find the underlying cause of the problem. ** With the "v2" prepare interfaces, the underlying reason for the error is ** returned immediately. @@ -1052,7 +1052,7 @@ int sqlite3_prepare16_v2( /* ** CAPI3REF: Dynamically Typed Value Object ** -** SQLite uses dynamic typing for the values it stores. Values can +** STQLite uses dynamic typing for the values it stores. Values can ** be integers, floating point values, strings, BLOBs, or NULL. When ** passing around values internally, each value is represented as ** an instance of the sqlite3_value object. @@ -1100,7 +1100,7 @@ typedef struct sqlite3_context sqlite3_context; ** [sqlite3_bind_parameter_name()] API if desired. The index for "?NNN" ** parametes is the value of NNN. ** The NNN value must be between 1 and the compile-time -** parameter SQLITE_MAX_VARIABLE_NUMBER (default value: 999). +** parameter STQLITE_MAX_VARIABLE_NUMBER (default value: 999). ** See <a href="limits.html">limits.html</a> for additional information. ** ** The third argument is the value to bind to the parameter. @@ -1115,10 +1115,10 @@ typedef struct sqlite3_context sqlite3_context; ** ** The fifth argument to sqlite3_bind_blob(), sqlite3_bind_text(), and ** sqlite3_bind_text16() is a destructor used to dispose of the BLOB or -** text after SQLite has finished with it. If the fifth argument is the -** special value [SQLITE_STATIC], then the library assumes that the information +** text after STQLite has finished with it. If the fifth argument is the +** special value [STQLITE_STATIC], then the library assumes that the information ** is in static, unmanaged space and does not need to be freed. If the -** fifth argument has the value [SQLITE_TRANSIENT], then SQLite makes its +** fifth argument has the value [STQLITE_TRANSIENT], then STQLite makes its ** own private copy of the data immediately, before the sqlite3_bind_*() ** routine returns. ** @@ -1135,10 +1135,10 @@ typedef struct sqlite3_context sqlite3_context; ** Bindings are not cleared by the [sqlite3_reset()] routine. ** Unbound parameters are interpreted as NULL. ** -** These routines return [SQLITE_OK] on success or an error code if -** anything goes wrong. [SQLITE_RANGE] is returned if the parameter -** index is out of range. [SQLITE_NOMEM] is returned if malloc fails. -** [SQLITE_MISUSE] is returned if these routines are called on a virtual +** These routines return [STQLITE_OK] on success or an error code if +** anything goes wrong. [STQLITE_RANGE] is returned if the parameter +** index is out of range. [STQLITE_NOMEM] is returned if malloc fails. +** [STQLITE_MISUSE] is returned if these routines are called on a virtual ** machine that is the wrong state or which has already been finalized. */ int sqlite3_bind_blob(sqlite3_stmt*, int, const void*, int n, void(*)(void*)); @@ -1263,11 +1263,11 @@ const void *sqlite3_column_name16(sqlite3_stmt*, int N); ** name of the attached database, table and column that query result ** column was extracted from. ** -** As with all other SQLite APIs, those postfixed with "16" return UTF-16 +** As with all other STQLite APIs, those postfixed with "16" return UTF-16 ** encoded strings, the other functions return UTF-8. ** ** These APIs are only available if the library was compiled with the -** SQLITE_ENABLE_COLUMN_METADATA preprocessor symbol defined. +** STQLITE_ENABLE_COLUMN_METADATA preprocessor symbol defined. */ const char *sqlite3_column_database_name(sqlite3_stmt*,int); const void *sqlite3_column_database_name16(sqlite3_stmt*,int); @@ -1298,9 +1298,9 @@ const void *sqlite3_column_origin_name16(sqlite3_stmt*,int); ** result column (i==1), and a NULL pointer for the first result column ** (i==0). ** -** SQLite uses dynamic run-time typing. So just because a column +** STQLite uses dynamic run-time typing. So just because a column ** is declared to contain a particular type does not mean that the -** data stored in that column is of the declared type. SQLite is +** data stored in that column is of the declared type. STQLite is ** strongly typed, but the typing is dynamic not static. Type ** is associated with individual values, not with the containers ** used to hold those values. @@ -1324,58 +1324,58 @@ const void *sqlite3_column_decltype16(sqlite3_stmt*,int); ** new "v2" interface is recommended for new applications but the legacy ** interface will continue to be supported. ** -** In the lagacy interface, the return value will be either [SQLITE_BUSY], -** [SQLITE_DONE], [SQLITE_ROW], [SQLITE_ERROR], or [SQLITE_MISUSE]. -** With the "v2" interface, any of the other [SQLITE_OK | result code] -** or [SQLITE_IOERR_READ | extended result code] might be returned as +** In the lagacy interface, the return value will be either [STQLITE_BUSY], +** [STQLITE_DONE], [STQLITE_ROW], [STQLITE_ERROR], or [STQLITE_MISUSE]. +** With the "v2" interface, any of the other [STQLITE_OK | result code] +** or [STQLITE_IOERR_READ | extended result code] might be returned as ** well. ** -** [SQLITE_BUSY] means that the database engine was unable to acquire the +** [STQLITE_BUSY] means that the database engine was unable to acquire the ** database locks it needs to do its job. If the statement is a COMMIT ** or occurs outside of an explicit transaction, then you can retry the ** statement. If the statement is not a COMMIT and occurs within a ** explicit transaction then you should rollback the transaction before ** continuing. ** -** [SQLITE_DONE] means that the statement has finished executing +** [STQLITE_DONE] means that the statement has finished executing ** successfully. sqlite3_step() should not be called again on this virtual ** machine without first calling [sqlite3_reset()] to reset the virtual ** machine back to its initial state. ** ** If the SQL statement being executed returns any data, then -** [SQLITE_ROW] is returned each time a new row of data is ready +** [STQLITE_ROW] is returned each time a new row of data is ready ** for processing by the caller. The values may be accessed using ** the [sqlite3_column_int | column access functions]. ** sqlite3_step() is called again to retrieve the next row of data. ** -** [SQLITE_ERROR] means that a run-time error (such as a constraint +** [STQLITE_ERROR] means that a run-time error (such as a constraint ** violation) has occurred. sqlite3_step() should not be called again on ** the VM. More information may be found by calling [sqlite3_errmsg()]. ** With the legacy interface, a more specific error code (example: -** [SQLITE_INTERRUPT], [SQLITE_SCHEMA], [SQLITE_CORRUPT], and so forth) +** [STQLITE_INTERRUPT], [STQLITE_SCHEMA], [STQLITE_CORRUPT], and so forth) ** can be obtained by calling [sqlite3_reset()] on the ** [sqlite_stmt | prepared statement]. In the "v2" interface, ** the more specific error code is returned directly by sqlite3_step(). ** -** [SQLITE_MISUSE] means that the this routine was called inappropriately. +** [STQLITE_MISUSE] means that the this routine was called inappropriately. ** Perhaps it was called on a [sqlite_stmt | prepared statement] that has ** already been [sqlite3_finalize | finalized] or on one that had -** previously returned [SQLITE_ERROR] or [SQLITE_DONE]. Or it could +** previously returned [STQLITE_ERROR] or [STQLITE_DONE]. Or it could ** be the case that the same database connection is being used by two or ** more threads at the same moment in time. ** ** <b>Goofy Interface Alert:</b> ** In the legacy interface, ** the sqlite3_step() API always returns a generic error code, -** [SQLITE_ERROR], following any error other than [SQLITE_BUSY] -** and [SQLITE_MISUSE]. You must call [sqlite3_reset()] or +** [STQLITE_ERROR], following any error other than [STQLITE_BUSY] +** and [STQLITE_MISUSE]. You must call [sqlite3_reset()] or ** [sqlite3_finalize()] in order to find one of the specific -** [SQLITE_ERROR | result codes] that better describes the error. +** [STQLITE_ERROR | result codes] that better describes the error. ** We admit that this is a goofy design. The problem has been fixed ** with the "v2" interface. If you prepare all of your SQL statements ** using either [sqlite3_prepare_v2()] or [sqlite3_prepare16_v2()] instead ** of the legacy [sqlite3_prepare()] and [sqlite3_prepare16()], then the -** more specific [SQLITE_ERROR | result codes] are returned directly +** more specific [STQLITE_ERROR | result codes] are returned directly ** by sqlite3_step(). The use of the "v2" interface is recommended. */ int sqlite3_step(sqlite3_stmt*); @@ -1385,10 +1385,10 @@ int sqlite3_step(sqlite3_stmt*); ** ** Return the number of values in the current row of the result set. ** -** After a call to [sqlite3_step()] that returns [SQLITE_ROW], this routine +** After a call to [sqlite3_step()] that returns [STQLITE_ROW], this routine ** will return the same value as the [sqlite3_column_count()] function. -** After [sqlite3_step()] has returned an [SQLITE_DONE], [SQLITE_BUSY], or -** a [SQLITE_ERROR | error code], or before [sqlite3_step()] has been +** After [sqlite3_step()] has returned an [STQLITE_DONE], [STQLITE_BUSY], or +** a [STQLITE_ERROR | error code], or before [sqlite3_step()] has been ** called on the [sqlite_stmt | prepared statement] for the first time, ** this routine returns zero. */ @@ -1397,7 +1397,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); /* ** CAPI3REF: Fundamental Datatypes ** -** Every value in SQLite has one of five fundamental datatypes: +** Every value in STQLite has one of five fundamental datatypes: ** ** <ul> ** <li> 64-bit signed integer @@ -1409,21 +1409,21 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** ** These constants are codes for each of those types. ** -** Note that the SQLITE_TEXT constant was also used in SQLite version 2 +** Note that the STQLITE_TEXT constant was also used in STQLite version 2 ** for a completely different meaning. Software that links against both -** SQLite version 2 and SQLite version 3 should use SQLITE3_TEXT not -** SQLITE_TEXT. -*/ -#define SQLITE_INTEGER 1 -#define SQLITE_FLOAT 2 -#define SQLITE_BLOB 4 -#define SQLITE_NULL 5 -#ifdef SQLITE_TEXT -# undef SQLITE_TEXT +** STQLite version 2 and STQLite version 3 should use STQLITE3_TEXT not +** STQLITE_TEXT. +*/ +#define STQLITE_INTEGER 1 +#define STQLITE_FLOAT 2 +#define STQLITE_BLOB 4 +#define STQLITE_NULL 5 +#ifdef STQLITE_TEXT +# undef STQLITE_TEXT #else -# define SQLITE_TEXT 3 +# define STQLITE_TEXT 3 #endif -#define SQLITE3_TEXT 3 +#define STQLITE3_TEXT 3 /* ** CAPI3REF: Results Values From A Query @@ -1441,13 +1441,13 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** the column index is out of range, the result is undefined. ** ** The sqlite3_column_type() routine returns -** [SQLITE_INTEGER | datatype code] for the initial data type -** of the result column. The returned value is one of [SQLITE_INTEGER], -** [SQLITE_FLOAT], [SQLITE_TEXT], [SQLITE_BLOB], or [SQLITE_NULL]. The value +** [STQLITE_INTEGER | datatype code] for the initial data type +** of the result column. The returned value is one of [STQLITE_INTEGER], +** [STQLITE_FLOAT], [STQLITE_TEXT], [STQLITE_BLOB], or [STQLITE_NULL]. The value ** returned by sqlite3_column_type() is only meaningful if no type ** conversions have occurred as described below. After a type conversion, ** the value returned by sqlite3_column_type() is undefined. Future -** versions of SQLite may change the behavior of sqlite3_column_type() +** versions of STQLite may change the behavior of sqlite3_column_type() ** following a type conversion. ** ** If the result is a BLOB or UTF-8 string then the sqlite3_column_bytes() @@ -1496,14 +1496,14 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** </blockquote> ** ** The table above makes reference to standard C library functions atoi() -** and atof(). SQLite does not really use these functions. It has its +** and atof(). STQLite does not really use these functions. It has its ** on equavalent internal routines. The atoi() and atof() names are ** used in the table for brevity and because they are familiar to most ** C programmers. ** ** 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 invalidated. +** sqlite3_column_text16() may be tqinvalidated. ** Type conversions and pointer invalidations might occur ** in the following cases: ** @@ -1522,10 +1522,10 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** </ul> ** ** Conversions between UTF-16be and UTF-16le are always done in place and do -** not invalidate a prior pointer, though of course the content of the buffer +** 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 invalidated. +** not possible and in those cases prior pointers are tqinvalidated. ** ** The safest and easiest to remember policy is to invoke these routines ** in one of the following ways: @@ -1559,9 +1559,9 @@ sqlite3_value *sqlite3_column_value(sqlite3_stmt*, int iCol); ** ** The sqlite3_finalize() function is called to delete a ** [sqlite3_stmt | compiled SQL statement]. If the statement was -** executed successfully, or not executed at all, then SQLITE_OK is returned. +** executed successfully, or not executed at all, then STQLITE_OK is returned. ** If execution of the statement failed then an -** [SQLITE_ERROR | error code] or [SQLITE_IOERR_READ | extended error code] +** [STQLITE_ERROR | error code] or [STQLITE_IOERR_READ | extended error code] ** is returned. ** ** This routine can be called at any point during the execution of the @@ -1570,7 +1570,7 @@ sqlite3_value *sqlite3_column_value(sqlite3_stmt*, int iCol); ** encountering an error or an interrupt. (See [sqlite3_interrupt()].) ** Incomplete updates may be rolled back and transactions cancelled, ** depending on the circumstances, and the -** [SQLITE_ERROR | result code] returned will be [SQLITE_ABORT]. +** [STQLITE_ERROR | result code] returned will be [STQLITE_ABORT]. */ int sqlite3_finalize(sqlite3_stmt *pStmt); @@ -1606,24 +1606,24 @@ int sqlite3_reset(sqlite3_stmt *pStmt); ** The length of the name is limited to 255 bytes, exclusive of the ** zero-terminator. Note that the name length limit is in bytes, not ** characters. Any attempt to create a function with a longer name -** will result in an SQLITE_ERROR error. +** will result in an STQLITE_ERROR error. ** ** The third parameter is the number of arguments that the SQL function or ** aggregate takes. If this parameter is negative, then the SQL function or ** aggregate may take any number of arguments. ** ** The fourth parameter, eTextRep, specifies what -** [SQLITE_UTF8 | text encoding] this SQL function prefers for +** [STQLITE_UTF8 | text encoding] this SQL function prefers for ** its parameters. Any SQL function implementation should be able to work ** work with UTF-8, UTF-16le, or UTF-16be. But some implementations may be ** more efficient with one encoding than another. It is allowed to ** invoke sqlite_create_function() or sqlite3_create_function16() multiple ** times with the same function but with different values of eTextRep. -** When multiple implementations of the same function are available, SQLite +** When multiple implementations of the same function are available, STQLite ** will pick the one that involves the least amount of data conversion. ** If there is only a single implementation which does not care what ** text encoding is used, then the fourth argument should be -** [SQLITE_ANY]. +** [STQLITE_ANY]. ** ** The fifth parameter is an arbitrary pointer. The implementation ** of the function can gain access to this pointer using @@ -1640,7 +1640,7 @@ int sqlite3_reset(sqlite3_stmt *pStmt); ** ** It is permitted to register multiple implementations of the same ** functions with the same name but with either differing numbers of -** arguments or differing perferred text encodings. SQLite will use +** arguments or differing perferred text encodings. STQLite will use ** the implementation most closely matches the way in which the ** SQL function is used. */ @@ -1669,14 +1669,14 @@ int sqlite3_create_function16( ** CAPI3REF: Text Encodings ** ** These constant define integer codes that represent the various -** text encodings supported by SQLite. +** text encodings supported by STQLite. */ -#define SQLITE_UTF8 1 -#define SQLITE_UTF16LE 2 -#define SQLITE_UTF16BE 3 -#define SQLITE_UTF16 4 /* Use native byte order */ -#define SQLITE_ANY 5 /* sqlite3_create_function only */ -#define SQLITE_UTF16_ALIGNED 8 /* sqlite3_create_collation only */ +#define STQLITE_UTF8 1 +#define STQLITE_UTF16LE 2 +#define STQLITE_UTF16BE 3 +#define STQLITE_UTF16 4 /* Use native byte order */ +#define STQLITE_ANY 5 /* sqlite3_create_function only */ +#define STQLITE_UTF16_ALIGNED 8 /* sqlite3_create_collation only */ /* ** CAPI3REF: Obsolete Functions @@ -1724,11 +1724,11 @@ int sqlite3_global_recover(void); ** such a conversion is possible without loss of information (in order ** words if the value is original a string that looks like a number) ** then it is done. Otherwise no conversion occurs. The -** [SQLITE_INTEGER | datatype] after conversion is returned. +** [STQLITE_INTEGER | datatype] after conversion is returned. ** ** 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 invalidated by a subsequent call to +** [sqlite3_value_text16()] can be tqinvalidated by a subsequent call to ** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite_value_text()], ** or [sqlite3_value_text16()]. */ @@ -1755,7 +1755,7 @@ int sqlite3_value_numeric_type(sqlite3_value*); ** same aggregate instance) the same buffer is returned. The implementation ** of the aggregate can use the returned buffer to accumulate data. ** -** The buffer allocated is freed automatically by SQLite whan the aggregate +** The buffer allocated is freed automatically by STQLite whan the aggregate ** query concludes. ** ** The first parameter should be a copy of the @@ -1814,18 +1814,18 @@ void sqlite3_set_auxdata(sqlite3_context*, int, void*, void (*)(void*)); ** ** These are special value for the destructor that is passed in as the ** final argument to routines like [sqlite3_result_blob()]. If the destructor -** argument is SQLITE_STATIC, it means that the content pointer is constant +** argument is STQLITE_STATIC, it means that the content pointer is constant ** and will never change. It does not need to be destroyed. The -** SQLITE_TRANSIENT value means that the content will likely change in -** the near future and that SQLite should make its own private copy of +** STQLITE_TRANSIENT value means that the content will likely change in +** the near future and that STQLite should make its own private copy of ** the content before returning. ** ** The typedef is necessary to work around problems in certain ** C++ compilers. See ticket #2191. */ typedef void (*sqlite3_destructor_type)(void*); -#define SQLITE_STATIC ((sqlite3_destructor_type)0) -#define SQLITE_TRANSIENT ((sqlite3_destructor_type)-1) +#define STQLITE_STATIC ((sqlite3_destructor_type)0) +#define STQLITE_TRANSIENT ((sqlite3_destructor_type)-1) /* ** CAPI3REF: Setting The Result Of An SQL Function @@ -1877,14 +1877,14 @@ void sqlite3_result_zeroblob(sqlite3_context*, int n); ** and a UTF-16 string for sqlite3_create_collation16(). In all cases ** the name is passed as the second function argument. ** -** The third argument must be one of the constants [SQLITE_UTF8], -** [SQLITE_UTF16LE] or [SQLITE_UTF16BE], indicating that the user-supplied +** The third argument must be one of the constants [STQLITE_UTF8], +** [STQLITE_UTF16LE] or [STQLITE_UTF16BE], indicating that the user-supplied ** routine expects to be passed pointers to strings encoded using UTF-8, ** UTF-16 little-endian or UTF-16 big-endian respectively. ** ** A pointer to the user supplied routine must be passed as the fifth ** argument. If it is NULL, this is the same as deleting the collation -** sequence (so that SQLite cannot call it anymore). Each time the user +** sequence (so that STQLite cannot call it anymore). Each time the user ** supplied function is invoked, it is passed a copy of the void* passed as ** the fourth argument to sqlite3_create_collation() or ** sqlite3_create_collation16() as its first parameter. @@ -1948,8 +1948,8 @@ int sqlite3_create_collation16( ** When the callback is invoked, the first argument passed is a copy ** of the second argument to sqlite3_collation_needed() or ** sqlite3_collation_needed16(). The second argument is the database -** handle. The third argument is one of [SQLITE_UTF8], [SQLITE_UTF16BE], or -** [SQLITE_UTF16LE], indicating the most desirable form of the collation +** handle. The third argument is one of [STQLITE_UTF8], [STQLITE_UTF16BE], or +** [STQLITE_UTF16LE], indicating the most desirable form of the collation ** sequence function required. The fourth parameter is the name of the ** required collation sequence. ** @@ -1973,7 +1973,7 @@ int sqlite3_collation_needed16( ** called right after sqlite3_open(). ** ** The code to implement this API is not available in the public release -** of SQLite. +** of STQLite. */ int sqlite3_key( sqlite3 *db, /* Database to be rekeyed */ @@ -1986,7 +1986,7 @@ int sqlite3_key( ** database is decrypted. ** ** The code to implement this API is not available in the public release -** of SQLite. +** of STQLite. */ int sqlite3_rekey( sqlite3 *db, /* Database to be rekeyed */ @@ -2011,12 +2011,12 @@ int sqlite3_sleep(int); ** ** If this global variable is made to point to a string which is ** the name of a folder (a.ka. directory), then all temporary files -** created by SQLite will be placed in that directory. If this variable -** is NULL pointer, then SQLite does a search for an appropriate temporary +** created by STQLite will be placed in that directory. If this variable +** is NULL pointer, then STQLite does a search for an appropriate temporary ** file directory. ** ** Once [sqlite3_open()] has been called, changing this variable will -** invalidate the current temporary database, if any. Generally speaking, +** tqinvalidate the current temporary database, if any. Generally speaking, ** it is not safe to invoke this routine after [sqlite3_open()] has ** been called. */ @@ -2080,7 +2080,7 @@ void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*); ** The second argument is a pointer to the function to invoke when a ** row is updated, inserted or deleted. The first argument to the callback is ** a copy of the third argument to sqlite3_update_hook(). The second callback -** argument is one of SQLITE_INSERT, SQLITE_DELETE or SQLITE_UPDATE, depending +** argument is one of STQLITE_INSERT, STQLITE_DELETE or STQLITE_UPDATE, depending ** on the operation that caused the callback to be invoked. The third and ** fourth arguments to the callback contain pointers to the database and ** table name containing the affected row. The final callback parameter is @@ -2134,8 +2134,8 @@ void *sqlite3_update_hook( ** cache is enabled, the sqlite3_create_module() API used to register ** virtual tables will always return an error. ** -** This routine returns [SQLITE_OK] if shared cache was -** enabled or disabled successfully. An [SQLITE_ERROR | error code] +** This routine returns [STQLITE_OK] if shared cache was +** enabled or disabled successfully. An [STQLITE_ERROR | error code] ** is returned otherwise. ** ** Shared cache is disabled by default for backward compatibility. @@ -2150,7 +2150,7 @@ int sqlite3_enable_shared_cache(int); ** used to cache database pages to improve performance). ** ** This function is not a part of standard builds. It is only created -** if SQLite is compiled with the SQLITE_ENABLE_MEMORY_MANAGEMENT macro. +** if STQLite is compiled with the STQLITE_ENABLE_MEMORY_MANAGEMENT macro. */ int sqlite3_release_memory(int); @@ -2158,7 +2158,7 @@ int sqlite3_release_memory(int); ** CAPI3REF: Impose A Limit On Heap Size ** ** Place a "soft" limit on the amount of heap memory that may be allocated by -** SQLite within the current thread. If an internal allocation is requested +** STQLite within the current thread. If an internal allocation is requested ** that would exceed the specified limit, [sqlite3_release_memory()] is invoked ** one or more times to free up some space before the allocation is made. ** @@ -2174,13 +2174,13 @@ int sqlite3_release_memory(int); ** [sqlite3_release_memory()] will only be called when memory is exhaused. ** The default value for the soft heap limit is zero. ** -** SQLite makes a best effort to honor the soft heap limit. But if it +** STQLite makes a best effort to honor the soft heap limit. But if it ** is unable to reduce memory usage below the soft limit, execution will ** continue without error or notification. This is why the limit is ** called a "soft" limit. It is advisory only. ** ** This function is only available if the library was compiled with the -** SQLITE_ENABLE_MEMORY_MANAGEMENT option set. +** STQLITE_ENABLE_MEMORY_MANAGEMENT option set. ** memory-management has been enabled. */ void sqlite3_soft_heap_limit(int); @@ -2258,11 +2258,11 @@ void sqlite3_thread_cleanup(void); ** ** This function may load one or more schemas from database files. If an ** error occurs during this process, or if the requested table or column -** cannot be found, an SQLITE error code is returned and an error message +** cannot be found, an STQLITE error code is returned and an error message ** left in the database handle (to be retrieved using sqlite3_errmsg()). ** ** This API is only available if the library was compiled with the -** SQLITE_ENABLE_COLUMN_METADATA preprocessor symbol defined. +** STQLITE_ENABLE_COLUMN_METADATA preprocessor symbol defined. */ int sqlite3_table_column_metadata( sqlite3 *db, /* Connection handle */ @@ -2279,11 +2279,11 @@ int sqlite3_table_column_metadata( /* ** CAPI3REF: Load An Extension ** -** Attempt to load an SQLite extension library contained in the file +** Attempt to load an STQLite extension library contained in the file ** zFile. The entry point is zProc. zProc may be 0 in which case the ** name of the entry point defaults to "sqlite3_extension_init". ** -** Return [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong. +** Return [STQLITE_OK] on success and [STQLITE_ERROR] if something goes wrong. ** ** If an error occurs and pzErrMsg is not 0, then fill *pzErrMsg with ** error message text. The calling function should free this memory @@ -2336,7 +2336,7 @@ int sqlite3_enable_load_extension(sqlite3 *db, int onoff); ** Automatic extensions apply across all threads. ** ** This interface is experimental and is subject to change or -** removal in future releases of SQLite. +** removal in future releases of STQLite. */ int sqlite3_auto_extension(void *xEntryPoint); @@ -2351,7 +2351,7 @@ int sqlite3_auto_extension(void *xEntryPoint); ** This call disabled automatic extensions in all threads. ** ** This interface is experimental and is subject to change or -** removal in future releases of SQLite. +** removal in future releases of STQLite. */ void sqlite3_reset_auto_extension(void); @@ -2443,7 +2443,7 @@ struct sqlite3_module { ** the right-hand side of the corresponding aConstraint[] is evaluated ** and becomes the argvIndex-th entry in argv. If aConstraintUsage[].omit ** is true, then the constraint is assumed to be fully handled by the -** virtual table and is not checked again by SQLite. +** virtual table and is not checked again by STQLite. ** ** The idxNum and idxPtr values are recorded and passed into xFilter. ** sqlite3_free() is used to free idxPtr if needToFreeIdxPtr is true. @@ -2483,21 +2483,21 @@ struct sqlite3_index_info { int orderByConsumed; /* True if output is already ordered */ double estimatedCost; /* Estimated cost of using this index */ }; -#define SQLITE_INDEX_CONSTRAINT_EQ 2 -#define SQLITE_INDEX_CONSTRAINT_GT 4 -#define SQLITE_INDEX_CONSTRAINT_LE 8 -#define SQLITE_INDEX_CONSTRAINT_LT 16 -#define SQLITE_INDEX_CONSTRAINT_GE 32 -#define SQLITE_INDEX_CONSTRAINT_MATCH 64 +#define STQLITE_INDEX_CONSTRAINT_EQ 2 +#define STQLITE_INDEX_CONSTRAINT_GT 4 +#define STQLITE_INDEX_CONSTRAINT_LE 8 +#define STQLITE_INDEX_CONSTRAINT_LT 16 +#define STQLITE_INDEX_CONSTRAINT_GE 32 +#define STQLITE_INDEX_CONSTRAINT_MATCH 64 /* -** This routine is used to register a new module name with an SQLite +** This routine is used to register a new module name with an STQLite ** connection. Module names must be registered before creating new ** virtual tables on the module, or before using preexisting virtual ** tables of the module. */ int sqlite3_create_module( - sqlite3 *db, /* SQLite connection to register module with */ + sqlite3 *db, /* STQLite connection to register module with */ const char *zName, /* Name of the module */ const sqlite3_module *, /* Methods for the module */ void * /* Client data for xCreate/xConnect */ @@ -2509,7 +2509,7 @@ int sqlite3_create_module( ** even more experimental than the rest of the virtual tables API. */ int sqlite3_create_module_v2( - sqlite3 *db, /* SQLite connection to register module with */ + sqlite3 *db, /* STQLite connection to register module with */ const char *zName, /* Name of the module */ const sqlite3_module *, /* Methods for the module */ void *, /* Client data for xCreate/xConnect */ @@ -2619,7 +2619,7 @@ typedef struct sqlite3_blob sqlite3_blob; ** read and write access. If it is zero, the blob is opened for read ** access. ** -** On success, [SQLITE_OK] is returned and the new +** On success, [STQLITE_OK] is returned and the new ** [sqlite3_blob | blob handle] is written to *ppBlob. ** Otherwise an error code is returned and ** any value written to *ppBlob should not be used by the caller. @@ -2659,9 +2659,9 @@ int sqlite3_blob_bytes(sqlite3_blob *); ** n bytes of data are copied into buffer ** z from the open blob, starting at offset iOffset. ** -** On success, SQLITE_OK is returned. Otherwise, an -** [SQLITE_ERROR | SQLite error code] or an -** [SQLITE_IOERR_READ | extended error code] is returned. +** On success, STQLITE_OK is returned. Otherwise, an +** [STQLITE_ERROR | STQLite error code] or an +** [STQLITE_IOERR_READ | extended error code] is returned. */ int sqlite3_blob_read(sqlite3_blob *, void *z, int n, int iOffset); @@ -2675,16 +2675,16 @@ int sqlite3_blob_read(sqlite3_blob *, void *z, int n, int iOffset); ** ** If the [sqlite3_blob | blob-handle] passed as the first argument ** was not opened for writing (the flags parameter to [sqlite3_blob_open()] -*** was zero), this function returns [SQLITE_READONLY]. +*** was zero), this function returns [STQLITE_READONLY]. ** ** This function may only modify the contents of the blob, it is ** not possible to increase the size of a blob using this API. If ** offset iOffset is less than n bytes from the end of the blob, -** [SQLITE_ERROR] is returned and no data is written. +** [STQLITE_ERROR] is returned and no data is written. ** -** On success, SQLITE_OK is returned. Otherwise, an -** [SQLITE_ERROR | SQLite error code] or an -** [SQLITE_IOERR_READ | extended error code] is returned. +** On success, STQLITE_OK is returned. Otherwise, an +** [STQLITE_ERROR | STQLite error code] or an +** [STQLITE_IOERR_READ | extended error code] is returned. */ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); @@ -2692,7 +2692,7 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset); ** Undo the hack that converts floating point types to integer for ** builds on processors without floating point support. */ -#ifdef SQLITE_OMIT_FLOATING_POINT +#ifdef STQLITE_OMIT_FLOATING_POINT # undef double #endif diff --git a/amarok/src/starmanager.cpp b/amarok/src/starmanager.cpp index 66c5ab6c..27aa737e 100644 --- a/amarok/src/starmanager.cpp +++ b/amarok/src/starmanager.cpp @@ -60,7 +60,7 @@ StarManager::reinitStars( int height, int margin ) m_margin = margin; int hval = m_height + m_margin * 2 - 4 + ( ( m_height % 2 ) ? 1 : 0 ); - TQImage star = TQImage( locate( "data", "amarok/images/star.png" ) ).smoothScale( hval, hval, TQImage::ScaleMin ); + TQImage star = TQImage( locate( "data", "amarok/images/star.png" ) ).smoothScale( hval, hval, TQ_ScaleMin ); TQImage fullStar = TQImage( locate( "data", "amarok/images/star.png" ) ); m_star = star.copy(); m_fullStar = fullStar.copy(); @@ -69,7 +69,7 @@ StarManager::reinitStars( int height, int margin ) m_greyedStar = star.copy(); KIconEffect::toGray( m_greyedStar, 1.0 ); m_greyedStarPix.convertFromImage( m_greyedStar ); - TQImage half = TQImage( locate( "data", "amarok/images/smallstar.png" ) ).smoothScale( hval, hval, TQImage::ScaleMin ); + TQImage half = TQImage( locate( "data", "amarok/images/smallstar.png" ) ).smoothScale( hval, hval, TQ_ScaleMin ); TQImage fullHalf = TQImage( locate( "data", "amarok/images/smallstar.png" ) ); m_halfStar = half.copy(); m_fullHalfStar = fullHalf.copy(); diff --git a/amarok/src/starmanager.h b/amarok/src/starmanager.h index e73dc00b..8bf6ac2f 100644 --- a/amarok/src/starmanager.h +++ b/amarok/src/starmanager.h @@ -17,10 +17,11 @@ #include <tqimage.h> #include <tqpixmap.h> -class StarManager : public QObject +class StarManager : public TQObject { Q_OBJECT + TQ_OBJECT public: StarManager(); diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp index 33d1b23b..1efed47f 100644 --- a/amarok/src/statistics.cpp +++ b/amarok/src/statistics.cpp @@ -48,8 +48,8 @@ Statistics *Statistics::s_instance = 0; -Statistics::Statistics( TQWidget *parent, const char *name ) - : KDialogBase( KDialogBase::Swallow, 0, parent, name, false, 0, Close ) +Statistics::Statistics( TQWidget *tqparent, const char *name ) + : KDialogBase( KDialogBase::Swallow, 0, tqparent, name, false, 0, Close ) , m_timer( new TQTimer( this ) ) { s_instance = this; @@ -119,8 +119,8 @@ Statistics::slotSetFilter() //SLOT /// CLASS StatisticsList ////////////////////////////////////////////////////////////////////////////////////////// -StatisticsList::StatisticsList( TQWidget *parent, const char *name ) - : KListView( parent, name ) +StatisticsList::StatisticsList( TQWidget *tqparent, const char *name ) + : KListView( tqparent, name ) , m_currentItem( 0 ) , m_expanded( false ) { @@ -272,12 +272,12 @@ StatisticsList::renderView() qb.addReturnFunctionValue( QueryBuilder::funcMin, QueryBuilder::tabStats, QueryBuilder::valCreateDate ); qb.setOptions( QueryBuilder::optRemoveDuplicates ); a = qb.run(); - TQDateTime firstPlay = TQDateTime::currentDateTime(); + TQDateTime firstPlay = TQDateTime::tqcurrentDateTime(); if ( a[0].toUInt() ) firstPlay.setTime_t( a[0].toUInt() ); m_newestItem = new StatisticsItem( i18n("Newest Items"), this, m_genreItem ); - m_newestItem->setSubtext( i18n("First played %1").arg( Amarok::verboseTimeSince( firstPlay ) ) ); + m_newestItem->setSubtext( i18n("First played %1").tqarg( Amarok::verboseTimeSince( firstPlay ) ) ); m_trackItem ->setIcon( Amarok::icon("track") ); m_mostplayedItem->setIcon( Amarok::icon("mostplayed") ); @@ -344,7 +344,7 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2 - %3").arg( TQString::number(c), + TQString name = i18n("%1. %2 - %3").tqarg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i], fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1]); TQString score = locale->formatNumber( fave[i+3].toDouble(), 0 ); @@ -378,11 +378,11 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2 - %3").arg( TQString::number(c), + TQString name = i18n("%1. %2 - %3").tqarg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i], fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1]); double plays = fave[i+3].toDouble(); - TQString subtext = i18n("%1: %2").arg( i18n( "Playcount" ) ).arg( plays ); + TQString subtext = i18n("%1: %2").tqarg( i18n( "Playcount" ) ).tqarg( plays ); m_last = new StatisticsDetailedItem( name, subtext, item, m_last ); m_last->setItemType( StatisticsDetailedItem::TRACK ); m_last->setUrl( fave[i+2] ); @@ -413,13 +413,13 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2").arg( TQString::number(c), + TQString name = i18n("%1. %2").tqarg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i] ); TQString score = locale->formatNumber( fave[i+1].toDouble(), 2 ); TQString rating = locale->formatNumber( fave[i+2].toDouble() / 2.0, 2 ); m_last = new StatisticsDetailedItem( name, subText( score, rating ), item, m_last ); m_last->setItemType( StatisticsDetailedItem::ARTIST ); - TQString url = TQString("%1").arg( fave[i] ); + TQString url = TQString("%1").tqarg( fave[i] ); m_last->setUrl( url ); c++; } @@ -461,7 +461,7 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { const bool isSampler = (fave[i+6] == trueValue); - TQString name = i18n("%1. %2 - %3").arg( TQString::number(c), + TQString name = i18n("%1. %2 - %3").tqarg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i], isSampler ? i18n( "Various Artists" ) : ( fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1] ) ); @@ -470,7 +470,7 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) m_last = new StatisticsDetailedItem( name, subText( score, rating ), item, m_last ); m_last->setItemType( StatisticsDetailedItem::ALBUM ); - TQString url = TQString("%1 @@@ %2").arg( isSampler ? "0" : fave[i+2], fave[i+3] ); + TQString url = TQString("%1 @@@ %2").tqarg( isSampler ? "0" : fave[i+2], fave[i+3] ); m_last->setUrl( url ); c++; } @@ -500,14 +500,14 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2").arg( TQString::number(c), + TQString name = i18n("%1. %2").tqarg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i] ); TQString score = locale->formatNumber( fave[i+1].toDouble(), 2 ); TQString rating = locale->formatNumber( fave[i+2].toDouble() / 2.0, 2 ); m_last = new StatisticsDetailedItem( name, subText( score, rating ), item, m_last ); m_last->setItemType( StatisticsDetailedItem::GENRE ); - TQString url = TQString("%1").arg( fave[i] ); + TQString url = TQString("%1").tqarg( fave[i] ); m_last->setUrl( url ); c++; } @@ -541,33 +541,33 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < newest.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2 - %3").arg( TQString::number(c), + TQString name = i18n("%1. %2 - %3").tqarg( TQString::number(c), newest[i].isEmpty() ? i18n( "Unknown" ) : newest[i], newest[i+1].isEmpty() ? i18n( "Unknown" ) : newest[i+1] ); TQDateTime added = TQDateTime(); added.setTime_t( newest[i+4].toUInt() ); - TQString subtext = i18n("Added: %1").arg( Amarok::verboseTimeSince( added ) ); + TQString subtext = i18n("Added: %1").tqarg( Amarok::verboseTimeSince( added ) ); m_last = new StatisticsDetailedItem( name, subtext, item, m_last ); m_last->setItemType( StatisticsDetailedItem::HISTORY ); - TQString url = TQString("%1 @@@ %2").arg( newest[i+2] ).arg( newest[i+3] ); + TQString url = TQString("%1 @@@ %2").tqarg( newest[i+2] ).tqarg( newest[i+3] ); m_last->setUrl( url ); c++; } } item->setExpanded( true ); - repaintItem( item ); // Better than ::repaint(), flickers less + tqrepaintItem( item ); // Better than ::tqrepaint(), flickers less delete locale; } TQString StatisticsList::subText( const TQString &score, const TQString &rating ) //static { if( AmarokConfig::useScores() && AmarokConfig::useRatings() ) - return i18n( "Score: %1 Rating: %2" ).arg( score ).arg( rating ); + return i18n( "Score: %1 Rating: %2" ).tqarg( score ).tqarg( rating ); else if( AmarokConfig::useScores() ) - return i18n( "Score: %1" ).arg( score ); + return i18n( "Score: %1" ).tqarg( score ); else if( AmarokConfig::useRatings() ) - return i18n( "Rating: %1" ).arg( rating ); + return i18n( "Rating: %1" ).tqarg( rating ); else return TQString(); } @@ -623,9 +623,9 @@ StatisticsList::viewportPaintEvent( TQPaintEvent *e ) const uint x = (viewport()->width() - w - 30) / 2 ; const uint y = (viewport()->height() - h - 30) / 2 ; - p.setBrush( colorGroup().background() ); + p.setBrush( tqcolorGroup().background() ); p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h ); - t.draw( &p, x+15, y+15, TQRect(), colorGroup() ); + t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() ); } } @@ -639,10 +639,10 @@ StatisticsList::showContextMenu( TQListViewItem *item, const TQPoint &p, int ) bool hasSQL = !( item->itemType() == StatisticsDetailedItem::TRACK ); //track is url KPopupMenu menu( this ); - enum Actions { APPEND, QUEUE, INFO }; + enum Actions { APPEND, TQUEUE, INFO }; menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Track" ), QUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Track" ), TQUEUE ); menu.insertSeparator(); @@ -656,7 +656,7 @@ StatisticsList::showContextMenu( TQListViewItem *item, const TQPoint &p, int ) Playlist::instance()->insertMedia( KURL::fromPathOrURL( item->url() ) ); break; - case QUEUE: + case TQUEUE: hasSQL ? Playlist::instance()->insertMediaSql( item->getSQL(), Playlist::Queue ): Playlist::instance()->insertMedia( KURL::fromPathOrURL( item->url() ), Playlist::Queue ); @@ -681,8 +681,8 @@ StatisticsList::showContextMenu( TQListViewItem *item, const TQPoint &p, int ) /// CLASS StatisticsItem ////////////////////////////////////////////////////////////////////////////////////////// -StatisticsItem::StatisticsItem( TQString text, StatisticsList *parent, KListViewItem *after, const char *name ) - : KListViewItem( static_cast<KListView*>(parent), after, name ) +StatisticsItem::StatisticsItem( TQString text, StatisticsList *tqparent, KListViewItem *after, const char *name ) + : KListViewItem( static_cast<KListView*>(tqparent), after, name ) , m_animTimer( new TQTimer( this ) ) , m_animCount( 0 ) , m_isActive( false ) @@ -701,7 +701,7 @@ void StatisticsItem::setIcon( const TQString &icon ) { TQString path = kapp->iconLoader()->iconPath( icon, -KIcon::SizeHuge ); - path.replace( "32x32", "48x48" ); //HACK fucking KIconLoader only returns 32x32 max. Why? + path.tqreplace( "32x32", "48x48" ); //HACK fucking KIconLoader only returns 32x32 max. Why? // debug() << "ICONPATH: " << path << endl; @@ -735,7 +735,7 @@ StatisticsItem::slotAnimTimer() if( m_animEnter ) { m_animCount += 1; - listView()->repaintItem( this ); // Better than ::repaint(), flickers less + listView()->tqrepaintItem( this ); // Better than ::tqrepaint(), flickers less if( m_animCount >= ANIM_MAX ) m_animTimer->stop(); @@ -743,7 +743,7 @@ StatisticsItem::slotAnimTimer() else { m_animCount -= 1; - listView()->repaintItem( this ); + listView()->tqrepaintItem( this ); if( m_animCount <= 0 ) { m_animTimer->stop(); @@ -837,7 +837,7 @@ StatisticsItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int p->drawPixmap( 0, 0, buffer ); } -QColor +TQColor StatisticsItem::blendColors( const TQColor& color1, const TQColor& color2, int percent ) { const float factor1 = ( 100 - ( float ) percent ) / 100; @@ -857,9 +857,9 @@ StatisticsItem::blendColors( const TQColor& color1, const TQColor& color2, int p /// CLASS StatisticsDetailedItem ////////////////////////////////////////////////////////////////////////////////////////// -StatisticsDetailedItem::StatisticsDetailedItem( const TQString &text, const TQString &subtext, StatisticsItem *parent, +StatisticsDetailedItem::StatisticsDetailedItem( const TQString &text, const TQString &subtext, StatisticsItem *tqparent, StatisticsDetailedItem *after, const char *name ) - : KListViewItem( parent, after, name ) + : KListViewItem( tqparent, after, name ) , m_type( NONE ) , m_subText( subtext ) { @@ -930,10 +930,10 @@ StatisticsDetailedItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col if( showDetails ) { - const TQColorGroup _cg = listView()->palette().disabled(); + const TQColorGroup _cg = listView()->tqpalette().disabled(); text_x = lv->treeStepSize() + 3; font.setItalic( true ); - pBuf.setPen( isSelected() ? _cg.highlightedText() : _cg.text().dark() ); + pBuf.setPen( isSelected() ? _cg.highlightedText() : TQColor(_cg.text().dark()) ); pBuf.drawText( text_x, textHeight, width, fm.lineSpacing(), AlignVCenter, m_subText ); } @@ -955,17 +955,17 @@ StatisticsDetailedItem::setup() setHeight( h + margin ); } -QString +TQString StatisticsDetailedItem::getSQL() { QueryBuilder qb; - TQString query = TQString::null; + TQString query = TQString(); TQString artist, album, track; // track is unused here Amarok::albumArtistTrackFromUrl( url(), artist, album, track ); if( itemType() == StatisticsDetailedItem::ALBUM || itemType() == StatisticsDetailedItem::HISTORY ) { - qb.initSQLDrag(); + qb.initSTQLDrag(); if ( artist != "0" ) qb.addMatch( QueryBuilder::tabSong, QueryBuilder::valArtistID, artist ); qb.addMatch( QueryBuilder::tabSong, QueryBuilder::valAlbumID, album ); @@ -977,7 +977,7 @@ StatisticsDetailedItem::getSQL() { const uint artist_id = CollectionDB::instance()->artistID( url() ); - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.addMatch( QueryBuilder::tabSong, QueryBuilder::valArtistID, TQString::number( artist_id ) ); qb.sortBy( QueryBuilder::tabYear, QueryBuilder::valName ); qb.sortBy( QueryBuilder::tabAlbum, QueryBuilder::valName ); @@ -989,7 +989,7 @@ StatisticsDetailedItem::getSQL() { const uint genre_id = CollectionDB::instance()->genreID( url() ); - qb.initSQLDrag(); + qb.initSTQLDrag(); qb.addMatch( QueryBuilder::tabSong, QueryBuilder::valGenreID, TQString::number( genre_id ) ); qb.sortBy( QueryBuilder::tabArtist, QueryBuilder::valName ); qb.sortBy( QueryBuilder::tabYear, QueryBuilder::valName ); @@ -1009,7 +1009,7 @@ StatisticsDetailedItem::getURLs() return KURL::List( KURL::fromPathOrURL(url()) ); QueryBuilder qb; - TQString query = TQString::null; + TQString query = TQString(); TQString artist, album, track; // track is unused here Amarok::albumArtistTrackFromUrl( m_url, artist, album, track ); diff --git a/amarok/src/statistics.h b/amarok/src/statistics.h index 1d3a370f..446556e2 100644 --- a/amarok/src/statistics.h +++ b/amarok/src/statistics.h @@ -32,9 +32,10 @@ class StatisticsDetailedItem; class Statistics : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - Statistics( TQWidget *parent = 0, const char *name = 0 ); + Statistics( TQWidget *tqparent = 0, const char *name = 0 ); ~Statistics(); static Statistics *instance() { return s_instance; } @@ -54,9 +55,10 @@ class Statistics : public KDialogBase class StatisticsList : public KListView { Q_OBJECT + TQ_OBJECT public: - StatisticsList( TQWidget *parent, const char *name=0 ); + StatisticsList( TQWidget *tqparent, const char *name=0 ); ~StatisticsList() {}; TQString filter() { return m_filter; } @@ -92,9 +94,10 @@ class StatisticsList : public KListView class StatisticsItem : public TQObject, public KListViewItem { Q_OBJECT + TQ_OBJECT public: - StatisticsItem( TQString text, StatisticsList *parent, KListViewItem *after=0, const char *name=0 ); + StatisticsItem( TQString text, StatisticsList *tqparent, KListViewItem *after=0, const char *name=0 ); ~StatisticsItem() {}; void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); @@ -132,11 +135,11 @@ class StatisticsItem : public TQObject, public KListViewItem TQString m_subText; }; -/// Listview items for the children of expanded items (the actual results) +/// Listview items for the tqchildren of expanded items (the actual results) class StatisticsDetailedItem : public KListViewItem { public: - StatisticsDetailedItem( const TQString &text, const TQString &subtext, StatisticsItem *parent, + StatisticsDetailedItem( const TQString &text, const TQString &subtext, StatisticsItem *tqparent, StatisticsDetailedItem *after=0, const char *name=0 ); ~StatisticsDetailedItem() {}; diff --git a/amarok/src/statusbar/overlayWidget.cpp b/amarok/src/statusbar/overlayWidget.cpp index 7f120a53..f3cac1ef 100644 --- a/amarok/src/statusbar/overlayWidget.cpp +++ b/amarok/src/statusbar/overlayWidget.cpp @@ -26,12 +26,12 @@ namespace KDE { -OverlayWidget::OverlayWidget( TQWidget *parent, TQWidget *anchor, const char* name ) - : TQFrame( parent->parentWidget(), name ) +OverlayWidget::OverlayWidget( TQWidget *tqparent, TQWidget *anchor, const char* name ) + : TQFrame( tqparent->tqparentWidget(), name ) , m_anchor( anchor ) - , m_parent( parent ) + , m_tqparent( tqparent ) { - parent->installEventFilter( this ); + tqparent->installEventFilter( this ); hide(); } @@ -39,7 +39,7 @@ OverlayWidget::OverlayWidget( TQWidget *parent, TQWidget *anchor, const char* na void OverlayWidget::reposition() { - setMaximumSize( parentWidget()->size() ); + setMaximumSize( tqparentWidget()->size() ); adjustSize(); // p is in the alignWidget's coordinates @@ -49,10 +49,10 @@ OverlayWidget::reposition() p.setY( -height() ); // Position in the toplevelwidget's coordinates - TQPoint pTopLevel = m_anchor->mapTo( topLevelWidget(), p ); + TQPoint pTopLevel = m_anchor->mapTo( tqtopLevelWidget(), p ); - // Position in the widget's parentWidget coordinates - TQPoint pParent = parentWidget() ->mapFrom( topLevelWidget(), pTopLevel ); + // Position in the widget's tqparentWidget coordinates + TQPoint pParent = tqparentWidget() ->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 f9572794..34cd6bb5 100644 --- a/amarok/src/statusbar/overlayWidget.h +++ b/amarok/src/statusbar/overlayWidget.h @@ -24,14 +24,14 @@ namespace KDE { - class OverlayWidget : public QFrame + class OverlayWidget : public TQFrame { public: /** - * The widget is parented to the toplevelwidget of alignWidget, + * The widget is tqparented to the toplevelwidget of alignWidget, * this could be an issue if that widget has an autoAdd Layout */ - OverlayWidget( TQWidget *parent, TQWidget *anchor, const char *name = 0 ); + OverlayWidget( TQWidget *tqparent, TQWidget *anchor, const char *name = 0 ); virtual void reposition(); protected: @@ -41,7 +41,7 @@ namespace KDE private: TQWidget *m_anchor; - TQWidget *m_parent; + TQWidget *m_tqparent; }; } diff --git a/amarok/src/statusbar/popupMessage.cpp b/amarok/src/statusbar/popupMessage.cpp index 31a0ae24..71b2f089 100644 --- a/amarok/src/statusbar/popupMessage.cpp +++ b/amarok/src/statusbar/popupMessage.cpp @@ -38,11 +38,11 @@ namespace KDE { -PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, const char *name ) - : OverlayWidget( parent, anchor, name ) +PopupMessage::PopupMessage( TQWidget *tqparent, TQWidget *anchor, int timeout, const char *name ) + : OverlayWidget( tqparent, anchor, name ) , m_anchor( anchor ) - , m_parent( parent ) - , m_maskEffect( Slide ) + , m_tqparent( tqparent ) + , m_tqmaskEffect( Slide ) , m_dissolveSize( 0 ) , m_dissolveDelta( -1 ) , m_offset( 0 ) @@ -53,7 +53,7 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con { setFrameStyle( TQFrame::Panel | TQFrame::Raised ); setFrameShape( TQFrame::StyledPanel ); - setWFlags( Qt::WX11BypassWM ); + setWFlags( TQt::WX11BypassWM ); TQPalette p = TQToolTip::palette(); setPalette( p ); @@ -62,9 +62,9 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con TQLabel *label; KActiveLabel *alabel; - m_layout = new TQVBoxLayout( this, 9 /*margin*/, 6 /*spacing*/ ); + m_tqlayout = new TQVBoxLayout( this, 9 /*margin*/, 6 /*spacing*/ ); - hbox = new TQHBoxLayout( m_layout, 12 ); + hbox = new TQHBoxLayout( m_tqlayout, 12 ); hbox->addWidget( m_countdownFrame = new TQFrame( this, "counterVisual" ) ); m_countdownFrame->setFixedWidth( fontMetrics().width( "X" ) ); @@ -75,13 +75,13 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con hbox->add( label ); alabel = new KActiveLabel( this, "label" ); - alabel->setTextFormat( Qt::RichText ); - alabel->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); + alabel->setTextFormat( TQt::RichText ); + alabel->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); alabel->setPalette( p ); hbox->add( alabel ); - hbox = new TQHBoxLayout( m_layout ); + hbox = new TQHBoxLayout( m_tqlayout ); hbox->addItem( new TQSpacerItem( 4, 4, TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); hbox->add( new KPushButton( KStdGuiItem::close(), this, "closeButton" ) ); @@ -91,38 +91,38 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con void PopupMessage::addWidget( TQWidget *widget ) { - m_layout->add( widget ); + m_tqlayout->add( widget ); adjustSize(); } void PopupMessage::setShowCloseButton( const bool show ) { - static_cast<KPushButton*>(child( "closeButton" ))->setShown( show ); + static_cast<KPushButton*>(TQT_TQWIDGET(child( "closeButton" )))->setShown( show ); adjustSize(); } void PopupMessage::setShowCounter( const bool show ) { m_showCounter = show; - static_cast<TQFrame*>(child( "counterVisual" ))->setShown( show ); + static_cast<TQFrame*>(TQT_TQWIDGET(child( "counterVisual" )))->setShown( show ); adjustSize(); } void PopupMessage::setText( const TQString &text ) { - static_cast<KActiveLabel*>(child( "label" ))->setText( text ); + static_cast<KActiveLabel*>(TQT_TQWIDGET(child( "label" )))->setText( text ); adjustSize(); } void PopupMessage::setImage( const TQString &location ) { - static_cast<TQLabel*>(child( "image" ))->setPixmap( TQPixmap( location ) ); + static_cast<TQLabel*>(TQT_TQWIDGET(child( "image" )))->setPixmap( TQPixmap( location ) ); adjustSize(); } void PopupMessage::setImage( const TQPixmap &pix ) { - static_cast<TQLabel*>(child( "image" ))->setPixmap( pix ); + static_cast<TQLabel*>(TQT_TQWIDGET(child( "image" )))->setPixmap( pix ); adjustSize(); } @@ -143,11 +143,11 @@ void PopupMessage::display() //SLOT m_dissolveSize = 24; m_dissolveDelta = -1; - if( m_maskEffect == Dissolve ) + if( m_tqmaskEffect == Dissolve ) { - // necessary to create the mask - m_mask.resize( width(), height() ); - // make the mask empty and hence will not show widget with show() called below + // necessary to create the tqmask + m_tqmask.resize( width(), height() ); + // make the tqmask empty and hence will not show widget with show() called below dissolveMask(); m_timerId = startTimer( 1000 / 30 ); } @@ -164,7 +164,7 @@ void PopupMessage::display() //SLOT void PopupMessage::timerEvent( TQTimerEvent* ) { - switch( m_maskEffect ) + switch( m_tqmaskEffect ) { case Plain: plainMask(); @@ -191,7 +191,7 @@ void PopupMessage::countDown() TQFrame *&h = m_countdownFrame; if( m_counter < h->height() - 3 ) - TQPainter( h ).fillRect( 2, 2, h->width() - 4, m_counter, palette().active().highlight() ); + TQPainter( h ).fillRect( 2, 2, h->width() - 4, m_counter, tqpalette().active().highlight() ); if( !hasMouse() ) m_counter++; @@ -213,20 +213,20 @@ void PopupMessage::dissolveMask() { if( m_stage == 1 ) { - repaint( false ); - TQPainter maskPainter(&m_mask); + tqrepaint( false ); + TQPainter tqmaskPainter(&m_tqmask); - m_mask.fill(Qt::black); + m_tqmask.fill(TQt::black); - maskPainter.setBrush(Qt::white); - maskPainter.setPen(Qt::white); - maskPainter.drawRect( m_mask.rect() ); + tqmaskPainter.setBrush(TQt::white); + tqmaskPainter.setPen(TQt::white); + tqmaskPainter.drawRect( m_tqmask.rect() ); m_dissolveSize += m_dissolveDelta; if( m_dissolveSize > 0 ) { - maskPainter.setRasterOp( Qt::EraseROP ); + tqmaskPainter.setRasterOp( TQt::EraseROP ); int x, y, s; const int size = 16; @@ -241,7 +241,7 @@ void PopupMessage::dissolveMask() if (s < 0) break; - maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); + tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); } } } @@ -257,7 +257,7 @@ void PopupMessage::dissolveMask() } } - setMask(m_mask); + setMask(m_tqmask); } else if ( m_stage == 2 ) { @@ -299,7 +299,7 @@ void PopupMessage::slideMask() switch( m_stage ) { case 1: //raise - move( 0, m_parent->y() - m_offset ); + move( 0, m_tqparent->y() - m_offset ); m_offset++; if( m_offset > height() ) @@ -321,7 +321,7 @@ void PopupMessage::slideMask() case 3: //lower m_offset--; - move( 0, m_parent->y() - m_offset ); + move( 0, m_tqparent->y() - m_offset ); if( m_offset < 0 ) deleteLater(); diff --git a/amarok/src/statusbar/popupMessage.h b/amarok/src/statusbar/popupMessage.h index 41245738..1665155b 100644 --- a/amarok/src/statusbar/popupMessage.h +++ b/amarok/src/statusbar/popupMessage.h @@ -40,6 +40,7 @@ namespace KDE class PopupMessage : public OverlayWidget { Q_OBJECT + TQ_OBJECT public: /** @@ -47,7 +48,7 @@ namespace KDE * @param timeout : how long to wait before auto closing. A value of 0 means close * only on pressing the closeButton or close() is called. */ - PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout = 5000 /*milliseconds*/, const char* name = 0 ); + PopupMessage( TQWidget *tqparent, TQWidget *anchor, int timeout = 5000 /*milliseconds*/, const char* name = 0 ); enum MaskEffect { Plain, Slide, Dissolve }; @@ -56,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_maskEffect = type; } + void setMaskEffect( const MaskEffect type ) { m_tqmaskEffect = type; } void setText( const TQString &text ); void setTimeout( const int time ) { m_timeout = time; } @@ -84,12 +85,12 @@ namespace KDE void slideMask(); private: - TQVBoxLayout *m_layout; + TQVBoxLayout *m_tqlayout; TQFrame *m_countdownFrame; TQWidget *m_anchor; - TQWidget *m_parent; - TQBitmap m_mask; - MaskEffect m_maskEffect; + TQWidget *m_tqparent; + TQBitmap m_tqmask; + MaskEffect m_tqmaskEffect; int m_dissolveSize; int m_dissolveDelta; diff --git a/amarok/src/statusbar/progressBar.cpp b/amarok/src/statusbar/progressBar.cpp index 9b6d1415..57382e29 100644 --- a/amarok/src/statusbar/progressBar.cpp +++ b/amarok/src/statusbar/progressBar.cpp @@ -31,15 +31,15 @@ namespace KDE { -ProgressBar::ProgressBar( TQWidget *parent, TQLabel *label ) - : TQProgressBar( parent ) +ProgressBar::ProgressBar( TQWidget *tqparent, TQLabel *label ) + : TQProgressBar( tqparent ) , m_label( label ) , m_done( false ) { DEBUG_FUNC_INFO - m_label->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); - m_abort = new KPushButton( KStdGuiItem::cancel(), parent ); + m_label->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + m_abort = new KPushButton( KStdGuiItem::cancel(), tqparent ); m_abort->hide(); m_abort->setText( i18n("Abort") ); m_label->show(); @@ -61,7 +61,7 @@ ProgressBar::setDescription( const TQString &text ) } ProgressBar& -ProgressBar::setStatus( const TQString &text ) +ProgressBar::settqStatus( const TQString &text ) { TQString s = m_description; s += " ["; @@ -69,7 +69,7 @@ ProgressBar::setStatus( const TQString &text ) s += ']'; m_label->setText( s ); - parentWidget()->adjustSize(); + tqparentWidget()->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(); - parentWidget()->adjustSize(); + tqparentWidget()->adjustSize(); return *this; } @@ -100,11 +100,11 @@ ProgressBar::setDone() if( !m_done ) { m_done = true; m_abort->setEnabled( false ); - setStatus( i18n("Done") ); + settqStatus( i18n("Done") ); } else // then we we're aborted - setStatus( i18n("Aborted") ); + settqStatus( i18n("Aborted") ); } void @@ -114,7 +114,7 @@ ProgressBar::hide() m_done = true; m_abort->setEnabled( false ); - setStatus( i18n("Aborting...") ); + settqStatus( i18n("Aborting...") ); } } diff --git a/amarok/src/statusbar/progressBar.h b/amarok/src/statusbar/progressBar.h index a3328194..6e7972fe 100644 --- a/amarok/src/statusbar/progressBar.h +++ b/amarok/src/statusbar/progressBar.h @@ -35,7 +35,7 @@ namespace KDE * @class KDE::ProgressBar * @short ProgressBar class with some useful additions */ - class ProgressBar : public QProgressBar + class ProgressBar : public TQProgressBar { friend class StatusBar; @@ -44,7 +44,7 @@ namespace KDE ProgressBar &setDescription( const TQString &text ); /** @param text eg. Scanning, Reading. The state of the operation */ - ProgressBar &setStatus( const TQString &text ); + ProgressBar &settqStatus( const TQString &text ); /** set the recipient slot for the abort button */ ProgressBar &setAbortSlot( TQObject *receiver, const char *slot ); @@ -56,7 +56,7 @@ namespace KDE TQString description() const { return m_description; } protected: - ProgressBar( TQWidget *parent, TQLabel *label ); + ProgressBar( TQWidget *tqparent, TQLabel *label ); ~ProgressBar(); virtual void hide(); diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp index 6c3ae103..f549ddaf 100644 --- a/amarok/src/statusbar/queueLabel.cpp +++ b/amarok/src/statusbar/queueLabel.cpp @@ -39,8 +39,8 @@ static const uint MAX_TO_SHOW = 20; -QueueLabel::QueueLabel( TQWidget *parent, const char *name ) - : TQLabel( parent, name ) +QueueLabel::QueueLabel( TQWidget *tqparent, const char *name ) + : TQLabel( tqparent, name ) , m_timer( this ) , m_tooltip( 0 ) , m_tooltipShowing( false ) @@ -99,28 +99,28 @@ void QueueLabel::setNum( int num ) TQPixmap pix( w, h ); TQPainter p( &pix ); - p.setBrush( colorGroup().background() ); - p.setPen( colorGroup().background() ); + p.setBrush( tqcolorGroup().background() ); + p.setPen( tqcolorGroup().background() ); p.drawRect( pix.rect() ); - p.setBrush( colorGroup().highlight() ); - p.setPen( colorGroup().highlight().dark() ); + p.setBrush( tqcolorGroup().highlight() ); + p.setPen( tqcolorGroup().highlight().dark() ); if( w > h ) { p.drawPie( 0, 0, h, h, 90*16, 180*16 ); p.drawPie( w-1 -h, 0, h, h, -90*16, 180*16 ); p.drawLine( h/2-1, 0, w-1 - h/2, 0 ); p.drawLine( h/2-1, h-1, w-1 - h/2, h-1 ); - p.setPen( colorGroup().highlight() ); + p.setPen( tqcolorGroup().highlight() ); p.drawRect( h/2-1, 1, w - h + 1, h-2 ); } else p.drawEllipse( pix.rect() ); p.setFont( f ); - p.setPen( colorGroup().highlightedText() ); - p.setBrush( colorGroup().highlight().dark() ); - p.drawText( pix.rect(), Qt::AlignCenter | Qt::SingleLine, text ); + p.setPen( tqcolorGroup().highlightedText() ); + p.setBrush( tqcolorGroup().highlight().dark() ); + p.drawText( pix.rect(), TQt::AlignCenter | TQt::SingleLine, text ); p.end(); setPixmap( pix ); @@ -175,7 +175,7 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent ) const uint count = queue.count(); if( length ) menu->insertTitle( i18n( "1 Queued Track (%1)", "%n Queued Tracks (%1)", count ) - .arg( MetaBundle::prettyLength( length, true ) ) ); + .tqarg( MetaBundle::prettyLength( length, true ) ) ); else menu->insertTitle( i18n( "1 Queued Track", "%n Queued Tracks", count ) ); Amarok::actionCollection()->action( "queue_manager" )->plug( menu ); @@ -191,7 +191,7 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent ) { for( uint n = kMin( i + MAX_TO_SHOW - 1, count ); i <= n; ++i, ++it ) menu->insertItem( - KStringHandler::rsqueeze( i18n( "%1. %2" ).arg( i ).arg( veryNiceTitle( *it ) ), 50 ), i ); + KStringHandler::rsqueeze( i18n( "%1. %2" ).tqarg( i ).tqarg( veryNiceTitle( *it ) ), 50 ), i ); if( i < count ) { @@ -205,8 +205,8 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent ) menu = menus.getFirst(); int mx, my; - const int mw = menu->sizeHint().width(), - mh = menu->sizeHint().height(), + const int mw = menu->tqsizeHint().width(), + mh = menu->tqsizeHint().height(), sy = mapFrom( Amarok::StatusBar::instance(), TQPoint( 0, 0 ) ).y(), sheight = Amarok::StatusBar::instance()->height(); const TQRect dr = TQApplication::desktop()->availableGeometry( this ); @@ -264,13 +264,13 @@ void QueueLabel::showToolTip() } if( length ) text += TQString("<center>%1</center>") - .arg( i18n( "1 track (%1)", "%n tracks (%1)", count ) - .arg( MetaBundle::prettyLength( length, true ) ) ); + .tqarg( i18n( "1 track (%1)", "%n tracks (%1)", count ) + .tqarg( MetaBundle::prettyLength( length, true ) ) ); } - text += i18n( "Next: %1" ).arg( veryNiceTitle( item, true /*bold*/ ) ); + text += i18n( "Next: %1" ).tqarg( veryNiceTitle( item, true /*bold*/ ) ); - m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), this, 0 ); + m_tooltip = new KDE::PopupMessage( tqparentWidget()->tqparentWidget(), this, 0 ); m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCounter( false ); m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); @@ -296,9 +296,9 @@ TQString QueueLabel::veryNiceTitle( PlaylistItem* item, bool bold ) const const TQString artist = item->artist()->stripWhiteSpace(), title = item->title().stripWhiteSpace(); if( !artist.isEmpty() && !title.isEmpty() ) - return ( bold ? i18n( "<b>%1</b> by <b>%2</b>" ) : i18n( "%1 by %2" ) ).arg( title ).arg( artist ); + return ( bold ? i18n( "<b>%1</b> by <b>%2</b>" ) : i18n( "%1 by %2" ) ).tqarg( title ).tqarg( artist ); else - return TQString( "<b>%1</b>" ).arg( MetaBundle::prettyTitle( item->filename() ) ); + return TQString( "<b>%1</b>" ).tqarg( MetaBundle::prettyTitle( item->filename() ) ); } diff --git a/amarok/src/statusbar/queueLabel.h b/amarok/src/statusbar/queueLabel.h index 71432fab..cc7b0873 100644 --- a/amarok/src/statusbar/queueLabel.h +++ b/amarok/src/statusbar/queueLabel.h @@ -17,8 +17,8 @@ * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef AMAROK_QUEUELABEL_H -#define AMAROK_QUEUELABEL_H +#ifndef AMAROK_TQUEUELABEL_H +#define AMAROK_TQUEUELABEL_H #include "playlistitem.h" #include "popupMessage.h" @@ -29,9 +29,10 @@ class QueueLabel: public TQLabel //homonym, heh heh { Q_OBJECT + TQ_OBJECT public: - QueueLabel( TQWidget *parent, const char *name = 0 ); + QueueLabel( TQWidget *tqparent, const char *name = 0 ); signals: void queueChanged( const PLItemList &, const PLItemList & ); diff --git a/amarok/src/statusbar/selectLabel.h b/amarok/src/statusbar/selectLabel.h index 1da2b668..1d3552ea 100644 --- a/amarok/src/statusbar/selectLabel.h +++ b/amarok/src/statusbar/selectLabel.h @@ -35,9 +35,10 @@ #include <tqtimer.h> #include <tqtooltip.h> -class SelectLabel : public QLabel +class SelectLabel : public TQLabel { Q_OBJECT + TQ_OBJECT Amarok::SelectAction const*const m_action; @@ -45,8 +46,8 @@ class SelectLabel : public QLabel void activated( int ); public: - SelectLabel( Amarok::SelectAction const*const action, TQWidget *parent ) - : TQLabel( parent ) + SelectLabel( Amarok::SelectAction const*const action, TQWidget *tqparent ) + : TQLabel( tqparent ) , m_action( action ) , m_tooltip( 0 ) , m_tooltipShowing( false ) @@ -125,8 +126,8 @@ class SelectLabel : public QLabel m_tooltipShowing = true; TQString tip = i18n("%1: %2") - .arg( m_action->text().remove( '&' ) ) - .arg( m_action->currentText().remove( '&' ) ); + .tqarg( m_action->text().remove( '&' ) ) + .tqarg( m_action->currentText().remove( '&' ) ); if( !isEnabled() ) tip += i18n(" <br> <i>Disabled</i>"); @@ -135,12 +136,12 @@ class SelectLabel : public QLabel { KSelectAction *a = static_cast<KSelectAction*>( Amarok::actionCollection()->action( "favor_tracks" ) ); tip += TQString("<br><br>") + i18n("%1: %2") - .arg( a->text().remove( '&' ), a->currentText().remove( '&' ) ); + .tqarg( a->text().remove( '&' ), a->currentText().remove( '&' ) ); } tip += " "; - m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), parentWidget(), 0 /*timeout*/ ); + m_tooltip = new KDE::PopupMessage( tqparentWidget()->tqparentWidget(), tqparentWidget(), 0 /*timeout*/ ); m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCounter( false ); m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); diff --git a/amarok/src/statusbar/squeezedtextlabel.cpp b/amarok/src/statusbar/squeezedtextlabel.cpp index fda6cbf5..8f000def 100644 --- a/amarok/src/statusbar/squeezedtextlabel.cpp +++ b/amarok/src/statusbar/squeezedtextlabel.cpp @@ -20,38 +20,38 @@ #include "squeezedtextlabel.h" #include <tqsimplerichtext.h> -#include <tqwindowdefs.h> //QCOORD_MAX +#include <tqwindowdefs.h> //TQCOORD_MAX #include <tqtooltip.h> #include <kdebug.h> namespace KDE { -SqueezedTextLabel::SqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name ) - : TQLabel ( parent, name ) { - setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); +SqueezedTextLabel::SqueezedTextLabel( const TQString &text , TQWidget *tqparent, const char *name ) + : TQLabel ( tqparent, name ) { + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); fullText = text; squeezeTextToLabel(); } -SqueezedTextLabel::SqueezedTextLabel( TQWidget *parent, const char *name ) - : TQLabel ( parent, name ) { - setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); +SqueezedTextLabel::SqueezedTextLabel( TQWidget *tqparent, const char *name ) + : TQLabel ( tqparent, name ) { + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); } void SqueezedTextLabel::resizeEvent( TQResizeEvent * ) { squeezeTextToLabel(); } -TQSize SqueezedTextLabel::minimumSizeHint() const +TQSize SqueezedTextLabel::tqminimumSizeHint() const { - TQSize sh = TQLabel::minimumSizeHint(); + TQSize sh = TQLabel::tqminimumSizeHint(); sh.setWidth(-1); return sh; } -TQSize SqueezedTextLabel::sizeHint() const +TQSize SqueezedTextLabel::tqsizeHint() const { - return TQSize(contentsRect().width(), TQLabel::sizeHint().height()); + return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); } void SqueezedTextLabel::setText( const TQString &text ) { @@ -62,13 +62,13 @@ void SqueezedTextLabel::setText( const TQString &text ) { //TQSimpleRichText suck //in more detail, we only want the widthUsed(), which doesn't normally work, see below -class MySimpleRichText: public QSimpleRichText +class MySimpleRichText: public TQSimpleRichText { public: MySimpleRichText( const TQString &text, const TQFont &font ) : TQSimpleRichText( text, font ) { - setWidth( QCOORD_MAX ); //by default it's like 150-something, always. wtf? + setWidth( TQCOORD_MAX ); //by default it's like 150-something, always. wtf? } }; @@ -127,11 +127,11 @@ void SqueezedTextLabel::squeezeTextToLabel() } } -void SqueezedTextLabel::setAlignment( int alignment ) +void SqueezedTextLabel::tqsetAlignment( int tqalignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::setAlignment(alignment); + TQLabel::tqsetAlignment(tqalignment); fullText = tmpFull; } diff --git a/amarok/src/statusbar/squeezedtextlabel.h b/amarok/src/statusbar/squeezedtextlabel.h index f1826638..11e9bf08 100644 --- a/amarok/src/statusbar/squeezedtextlabel.h +++ b/amarok/src/statusbar/squeezedtextlabel.h @@ -18,8 +18,8 @@ * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef SQUEEZEDTEXTLABEL_H -#define SQUEEZEDTEXTLABEL_H +#ifndef STQUEEZEDTEXTLABEL_H +#define STQUEEZEDTEXTLABEL_H #include <tqlabel.h> @@ -29,14 +29,15 @@ namespace KDE { //that way in our case. class SqueezedTextLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: - SqueezedTextLabel( TQWidget *parent, const char *name = 0 ); - SqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); + SqueezedTextLabel( TQWidget *tqparent, const char *name = 0 ); + SqueezedTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 ); - virtual TQSize minimumSizeHint() const; - virtual TQSize sizeHint() const; - virtual void setAlignment( int ); + virtual TQSize tqminimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual void tqsetAlignment( int ); public slots: void setText( const TQString & ); diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp index 9e10d6db..616a90fb 100644 --- a/amarok/src/statusbar/statusBarBase.cpp +++ b/amarok/src/statusbar/statusBarBase.cpp @@ -70,9 +70,9 @@ namespace SingleShotPool timer->start( timeout, true ); } - static inline bool isActive( TQObject *parent, const char *slot ) + static inline bool isActive( TQObject *tqparent, const char *slot ) { - TQTimer *timer = static_cast<TQTimer*>( parent->child( slot ) ); + TQTimer *timer = static_cast<TQTimer*>( tqparent->child( slot ) ); return timer && timer->isA( TQTIMER_OBJECT_NAME_STRING ) && timer->isActive(); } @@ -82,14 +82,14 @@ namespace SingleShotPool //TODO allow for uncertain progress periods -StatusBar::StatusBar( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +StatusBar::StatusBar( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) , m_logCounter( -1 ) { - TQBoxLayout *mainlayout = new TQHBoxLayout( this, 2, /*spacing*/5 ); + TQBoxLayout *maintqlayout = new TQHBoxLayout( this, 2, /*spacing*/5 ); //we need extra spacing due to the way we paint the surrounding boxes - TQBoxLayout *layout = new TQHBoxLayout( mainlayout, /*spacing*/5 ); + TQBoxLayout *tqlayout = new TQHBoxLayout( maintqlayout, /*spacing*/5 ); TQHBox *statusBarTextBox = new TQHBox( this, "statusBarTextBox" ); m_mainTextLabel = new KDE::SqueezedTextLabel( statusBarTextBox, "mainTextLabel" ); @@ -103,15 +103,15 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) mainProgressBarBox->setSpacing( 2 ); mainProgressBarBox->hide(); - layout->add( statusBarTextBox ); - layout->add( mainProgressBarBox ); - layout->setStretchFactor( statusBarTextBox, 3 ); - layout->setStretchFactor( mainProgressBarBox, 1 ); + tqlayout->add( statusBarTextBox ); + tqlayout->add( mainProgressBarBox ); + tqlayout->setStretchFactor( statusBarTextBox, 3 ); + tqlayout->setStretchFactor( mainProgressBarBox, 1 ); - m_otherWidgetLayout = new TQHBoxLayout( mainlayout, /*spacing*/5 ); + m_otherWidgetLayout = new TQHBoxLayout( maintqlayout, /*spacing*/5 ); - mainlayout->setStretchFactor( layout, 6 ); - mainlayout->setStretchFactor( m_otherWidgetLayout, 4 ); + maintqlayout->setStretchFactor( tqlayout, 6 ); + maintqlayout->setStretchFactor( m_otherWidgetLayout, 4 ); shortLongButton->setIconSet( SmallIconSet( "edit_add" ) ); TQToolTip::add( shortLongButton, i18n( "Show details" ) ); @@ -129,7 +129,7 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) m_popupProgress->setMargin( 1 ); m_popupProgress->setFrameStyle( TQFrame::Panel | TQFrame::Raised ); m_popupProgress->setFrameShape( TQFrame::StyledPanel ); - m_popupProgress->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + m_popupProgress->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); (new TQGridLayout( m_popupProgress, 1 /*rows*/, 3 /*cols*/, 6, 3 ))->setAutoAdd( true ); } @@ -151,20 +151,20 @@ StatusBar::polish() TQObjectList *list = queryList( TQWIDGET_OBJECT_NAME_STRING, 0, false, false ); for( TQObject * o = list->first(); o; o = list->next() ) { - int _h = static_cast<TQWidget*>( o ) ->minimumSizeHint().height(); + int _h = TQT_TQWIDGET( o ) ->tqminimumSizeHint().height(); if ( _h > h ) h = _h; -// debug() << o->className() << ", " << o->name() << ": " << _h << ": " << static_cast<TQWidget*>(o)->minimumHeight() << endl; +// debug() << o->className() << ", " << o->name() << ": " << _h << ": " << TQT_TQWIDGET(o)->minimumHeight() << endl; if ( o->inherits( TQLABEL_OBJECT_NAME_STRING ) ) - static_cast<TQLabel*>(o)->setIndent( 4 ); + static_cast<TQLabel*>(TQT_TQWIDGET(o))->setIndent( 4 ); } h -= 4; // it's too big usually for ( TQObject * o = list->first(); o; o = list->next() ) - static_cast<TQWidget*>(o)->setFixedHeight( h ); + TQT_TQWIDGET(o)->setFixedHeight( h ); delete list; } @@ -176,16 +176,16 @@ StatusBar::paintEvent( TQPaintEvent* ) TQPainter p( this ); for( TQObject * o = list->first(); o; o = list->next() ) { - TQWidget *w = static_cast<TQWidget*>( o ); + TQWidget *w = TQT_TQWIDGET( o ); if ( !w->isVisible() ) continue; - style().drawPrimitive( + tqstyle().tqdrawPrimitive( TQStyle::PE_StatusBarSection, &p, TQRect( w->x() - 1, w->y() - 1, w->width() + 2, w->height() + 2 ), - colorGroup(), + tqcolorGroup(), TQStyle::Style_Default, TQStyleOption( w ) ); } @@ -224,7 +224,7 @@ StatusBar::shortMessage( const TQString &text, bool longShort ) m_mainTextLabel->setText( text ); m_mainTextLabel->setPalette( TQToolTip::palette() ); - SingleShotPool::startTimer( longShort ? 8000 : 5000, this, TQT_SLOT(resetMainText()) ); + SingleShotPool::startTimer( longShort ? 8000 : 5000, TQT_TQOBJECT(this), TQT_SLOT(resetMainText()) ); writeLogFile( text ); } @@ -236,7 +236,7 @@ StatusBar::resetMainText() // debug() << sender()->name() << endl; // don't reset if we are showing a shortMessage - if( SingleShotPool::isActive( this, TQT_SLOT(resetMainText()) ) ) + if( SingleShotPool::isActive( TQT_TQOBJECT(this), TQT_SLOT(resetMainText()) ) ) return; m_mainTextLabel->unsetPalette(); @@ -330,7 +330,7 @@ StatusBar::longMessage( const TQString &text, int type ) void StatusBar::popupDeleted( TQObject *obj ) { - m_messageQueue.remove( static_cast<TQWidget*>( obj ) ); + m_messageQueue.remove( TQT_TQWIDGET( obj ) ); } void @@ -371,7 +371,7 @@ StatusBar::newProgressOperation( TQObject *owner ) { SHOULD_BE_GUI - if ( m_progressMap.contains( owner ) ) + if ( m_progressMap.tqcontains( owner ) ) return *m_progressMap[owner]; if( allDone() ) @@ -389,7 +389,7 @@ StatusBar::newProgressOperation( TQObject *owner ) // so we can show the correct progress information // after the ProgressBar is setup - SingleShotPool::startTimer( 0, this, TQT_SLOT(updateProgressAppearance()) ); + SingleShotPool::startTimer( 0, TQT_TQOBJECT(this), TQT_SLOT(updateProgressAppearance()) ); progressBox()->show(); cancelButton()->setEnabled( true ); @@ -417,14 +417,14 @@ StatusBar::newProgressOperation( KIO::Job *job ) void StatusBar::endProgressOperation() { - TQObject *owner = const_cast<TQObject*>( sender() ); //HACK deconsting it + TQObject *owner = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); //HACK deconsting it KIO::Job *job = dynamic_cast<KIO::Job*>( owner ); //FIXME doesn't seem to work for KIO::DeleteJob, it has it's own error handler and returns no error too // if you try to delete http urls for instance <- KDE SUCKS! if( job && job->error() ) - shortLongMessage( TQString::null, job->errorString(), Error ); + shortLongMessage( TQString(), job->errorString(), Error ); endProgressOperation( owner ); } @@ -437,9 +437,9 @@ StatusBar::endProgressOperation( TQObject *owner ) //NOTE we don't delete it yet, as this upsets some //things, we just call setDone(). - if ( !m_progressMap.contains( owner ) ) + if ( !m_progressMap.tqcontains( owner ) ) { - SingleShotPool::startTimer( 2000, this, TQT_SLOT(hideMainProgressBar()) ); + SingleShotPool::startTimer( 2000, TQT_TQOBJECT(this), TQT_SLOT(hideMainProgressBar()) ); return ; } @@ -447,7 +447,7 @@ StatusBar::endProgressOperation( TQObject *owner ) if( allDone() && !m_popupProgress->isShown() ) { cancelButton()->setEnabled( false ); - SingleShotPool::startTimer( 2000, this, TQT_SLOT(hideMainProgressBar()) ); + SingleShotPool::startTimer( 2000, TQT_TQOBJECT(this), TQT_SLOT(hideMainProgressBar()) ); } updateTotalProgress(); @@ -471,7 +471,7 @@ StatusBar::toggleProgressWindow( bool show ) //slot m_popupProgress->setShown( show ); if( !show ) - SingleShotPool::startTimer( 2000, this, TQT_SLOT(hideMainProgressBar()) ); + SingleShotPool::startTimer( 2000, TQT_TQOBJECT(this), TQT_SLOT(hideMainProgressBar()) ); } void @@ -481,7 +481,7 @@ StatusBar::showShortLongDetails() longMessage( m_shortLongText, m_shortLongType ); m_shortLongType = Information; - m_shortLongText = TQString::null; + m_shortLongText = TQString(); shortLongButton()->hide(); } @@ -509,7 +509,7 @@ StatusBar::hideMainProgressBar() void StatusBar::setProgress( int steps ) { - setProgress( sender(), steps ); + setProgress( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())), steps ); } void @@ -521,7 +521,7 @@ StatusBar::setProgress( KIO::Job *job, unsigned long percent ) void StatusBar::setProgress( const TQObject *owner, int steps ) { - if ( !m_progressMap.contains( owner ) ) + if ( !m_progressMap.tqcontains( owner ) ) return ; m_progressMap[ owner ] ->setProgress( steps ); @@ -532,7 +532,7 @@ StatusBar::setProgress( const TQObject *owner, int steps ) void StatusBar::incrementProgressTotalSteps( const TQObject *owner, int inc ) { - if ( !m_progressMap.contains( owner ) ) + if ( !m_progressMap.tqcontains( owner ) ) return ; m_progressMap[ owner ] ->setTotalSteps( m_progressMap[ owner ] ->totalSteps() + inc ); @@ -541,23 +541,23 @@ StatusBar::incrementProgressTotalSteps( const TQObject *owner, int inc ) } void -StatusBar::setProgressStatus( const TQObject *owner, const TQString &text ) +StatusBar::setProgresstqStatus( const TQObject *owner, const TQString &text ) { - if ( !m_progressMap.contains( owner ) ) + if ( !m_progressMap.tqcontains( owner ) ) return ; - m_progressMap[owner]->setStatus( text ); + m_progressMap[owner]->settqStatus( text ); } void StatusBar::incrementProgress() { - incrementProgress( sender() ); + incrementProgress( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()) )); } void StatusBar::incrementProgress( const TQObject *owner ) { - if ( !m_progressMap.contains( owner ) ) + if ( !m_progressMap.tqcontains( owner ) ) return; m_progressMap[owner]->setProgress( m_progressMap[ owner ] ->progress() + 1 ); @@ -669,7 +669,7 @@ StatusBar::writeLogFile( const TQString &text ) TQTextStream stream( &file ); stream.setEncoding( TQTextStream::UnicodeUTF8 ); - stream << "[" << KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) << "] " << text << endl; + stream << "[" << KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) << "] " << text << endl; } } //namespace KDE diff --git a/amarok/src/statusbar/statusBarBase.h b/amarok/src/statusbar/statusBarBase.h index cc03b7b2..56e7dc5c 100644 --- a/amarok/src/statusbar/statusBarBase.h +++ b/amarok/src/statusbar/statusBarBase.h @@ -32,7 +32,7 @@ class TQTimer; namespace KIO { class Job; } //TODO -// * concept of a temporary message that is removed when a qobject parent is deleted +// * concept of a temporary message that is removed when a qobject tqparent is deleted namespace KDE { @@ -52,7 +52,7 @@ namespace KDE * * statusbar->newProgressOperation( myObject ) * .setDescription( i18n("MyProgressOperation") ) - * .setStatus( i18n("Stage1") ) + * .settqStatus( i18n("Stage1") ) * .setAbortSlot( myObject, TQT_SLOT(abort()) ) * .setTotalSteps( 100 ); * @@ -62,7 +62,7 @@ namespace KDE * * After this point you can use setProgress( TQObject*, int steps ) to update * the progress for this progress operation. Only one progress operation per - * QObject! + * TQObject! * * You can also follow KIO::Jobs, with built in error handling, and * ThreadManager::Jobs have built in thread-safe progress handling. @@ -76,12 +76,13 @@ namespace KDE * @see KDE::ProgressBar */ - class StatusBar : public QWidget + class StatusBar : public TQWidget { Q_OBJECT + TQ_OBJECT public: - StatusBar( TQWidget *parent, const char *name = "mainStatusBar" ); + StatusBar( TQWidget *tqparent, const char *name = "mainStatusBar" ); enum MessageType { Information, Question, Sorry, Warning, Error, ShowAgainCheckBox, None }; @@ -92,7 +93,7 @@ namespace KDE * @return the progressBar so you can configure its parameters * @see setProgress( TQObject*, int ) * @see incrementProgress( TQObject* ) - * @see setProgressStatus( const TQObject*, const TQString& ) + * @see setProgresstqStatus( const TQObject*, const TQString& ) */ ProgressBar &newProgressOperation( TQObject *owner ); @@ -103,7 +104,7 @@ namespace KDE void incrementProgressTotalSteps( const TQObject *owner, int inc = 1 ); void incrementProgress( const TQObject *owner ); - void setProgressStatus( const TQObject *owner, const TQString &text ); + void setProgresstqStatus( const TQObject *owner, const TQString &text ); public slots: /** @@ -185,8 +186,8 @@ namespace KDE virtual bool event( TQEvent* ); /** - * You must parent the widget to the statusbar, we won't do that - * for you! The widget will be added to the right of the layout. + * You must tqparent the widget to the statusbar, we won't do that + * for you! The widget will be added to the right of the tqlayout. * Currently you must add widgets before the statusbar gets shown * for the first time, because we are not currently very flexible. */ @@ -213,10 +214,10 @@ namespace KDE int m_logCounter; - TQWidget *cancelButton() { return static_cast<TQWidget*>( child( "cancelButton" ) ); } - TQWidget *toggleProgressWindowButton() { return static_cast<TQWidget*>( child( "showAllProgressDetails" ) ); } - TQWidget *progressBox() { return static_cast<TQWidget*>( child( "progressBox" ) ); } - TQWidget *shortLongButton() { return static_cast<TQWidget*>( child( "shortLongButton" ) ); } + TQWidget *cancelButton() { return TQT_TQWIDGET( child( "cancelButton" ) ); } + TQWidget *toggleProgressWindowButton() { return TQT_TQWIDGET( child( "showAllProgressDetails" ) ); } + TQWidget *progressBox() { return TQT_TQWIDGET( child( "progressBox" ) ); } + TQWidget *shortLongButton() { return TQT_TQWIDGET( child( "shortLongButton" ) ); } OverlayWidget *m_popupProgress; TQProgressBar *m_mainProgressBar; diff --git a/amarok/src/statusbar/statusbar.cpp b/amarok/src/statusbar/statusbar.cpp index 6020f01f..72363027 100644 --- a/amarok/src/statusbar/statusbar.cpp +++ b/amarok/src/statusbar/statusbar.cpp @@ -55,8 +55,8 @@ KAction *action( const char *name ) { return Amarok::actionCollection()->action( StatusBar* StatusBar::s_instance = 0; -StatusBar::StatusBar( TQWidget *parent, const char *name ) - : KDE::StatusBar( parent, name ) +StatusBar::StatusBar( TQWidget *tqparent, const char *name ) + : KDE::StatusBar( tqparent, name ) , EngineObserver( EngineController::instance() ) , m_timeLength( 9 ) , m_pauseTimer( new TQTimer( this ) ) @@ -65,8 +65,8 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) // total songs count m_itemCountLabel = new TQLabel( this ); - m_itemCountLabel->setAlignment( Qt::AlignCenter ); - m_itemCountLabel->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed ); + m_itemCountLabel->tqsetAlignment( TQt::AlignCenter ); + m_itemCountLabel->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed ); //positionBox TQWidget *positionBox = new TQWidget( this, "positionBox" ); @@ -85,12 +85,12 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) // TODO Both labels need tooltips (string freeze?) TQWidget *hbox = new TQWidget( this ); - TQBoxLayout *layout = new TQHBoxLayout( hbox, 0, 2 ); - layout->addSpacing( 3 ); - layout->addWidget( m_queueLabel = new QueueLabel( hbox ) ); - layout->addWidget( new SelectLabel( static_cast<Amarok::SelectAction*>( Amarok::action( "repeat" ) ), hbox ) ); - layout->addWidget( new SelectLabel( static_cast<Amarok::SelectAction*>( Amarok::action( "random_mode" ) ), hbox ) ); - layout->addSpacing( 3 ); + TQBoxLayout *tqlayout = new TQHBoxLayout( hbox, 0, 2 ); + tqlayout->addSpacing( 3 ); + tqlayout->addWidget( m_queueLabel = new QueueLabel( hbox ) ); + tqlayout->addWidget( new SelectLabel( static_cast<Amarok::SelectAction*>( Amarok::action( "repeat" ) ), hbox ) ); + tqlayout->addWidget( new SelectLabel( static_cast<Amarok::SelectAction*>( Amarok::action( "random_mode" ) ), hbox ) ); + tqlayout->addSpacing( 3 ); //TODO reimplement insertChild() instead addWidget( m_itemCountLabel ); @@ -101,7 +101,7 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) box->addWidget( m_timeLabel ); box->addWidget( m_slider ); box->addWidget( m_timeLabel2 ); -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC // don't overlap the resize handle with the time display box->addSpacing( 12 ); #endif @@ -141,7 +141,7 @@ StatusBar::engineStateChanged( Engine::State state, Engine::State /*oldState*/ ) m_slider->newBundle( MetaBundle() ); // Set an empty bundle m_timeLabel->setEnabled( false ); //must be done after the setValue() above, due to a signal connection m_timeLabel2->setEnabled( false ); - setMainText( TQString::null ); + setMainText( TQString() ); break; case Engine::Paused: @@ -164,7 +164,7 @@ StatusBar::engineStateChanged( Engine::State state, Engine::State /*oldState*/ ) void StatusBar::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ ) { - #define escapeHTML(s) TQString(s).replace( "&", "&" ).replace( "<", "<" ).replace( ">", ">" ) + #define escapeHTML(s) TQString(s).tqreplace( "&", "&" ).tqreplace( "<", "<" ).tqreplace( ">", ">" ) TQString title = escapeHTML( bundle.title() ); TQString prettyTitle = escapeHTML( bundle.prettyTitle() ); TQString artist = escapeHTML( bundle.artist() ); @@ -183,16 +183,16 @@ StatusBar::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ ) // ugly because of translation requirements if( !title.isEmpty() && !artist.isEmpty() && !album.isEmpty() ) title = i18n( "track by artist on album", "<b>%1</b> by <b>%2</b> on <b>%3</b>" ) - .arg( title, artist, album ); + .tqarg( title, artist, album ); else if( !title.isEmpty() && !artist.isEmpty() ) title = i18n( "track by artist", "<b>%1</b> by <b>%2</b>" ) - .arg( title, artist ); + .tqarg( title, artist ); else if( !album.isEmpty() ) // we try for pretty title as it may come out better title = i18n( "track on album", "<b>%1</b> on <b>%2</b>" ) - .arg( prettyTitle, album ); + .tqarg( prettyTitle, album ); else title = "<b>" + prettyTitle + "</b>"; @@ -206,7 +206,7 @@ StatusBar::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ ) title += ')'; } - setMainText( i18n( "Playing: %1" ).arg( title ) ); + setMainText( i18n( "Playing: %1" ).tqarg( title ) ); m_slider->newBundle( bundle ); engineTrackLengthChanged( bundle.length() ); @@ -220,10 +220,10 @@ StatusBar::slotItemCountChanged( int newCount, int newLength, //total const bool hasSel = ( selCount > 1 ), hasVis = ( visCount != newCount ); TQString text = ( hasSel && hasVis ) ? i18n( "%1 selected of %2 visible tracks" ) - .arg( selCount ).arg( visCount ) + .tqarg( selCount ).tqarg( visCount ) : ( hasVis && newCount == 1 ) ? i18n( "0 visible of 1 track" ) - : ( hasVis ) ? i18n( "%1 visible of %2 tracks" ).arg( visCount).arg( newCount ) - : ( hasSel ) ? i18n( "%1 selected of %2 tracks" ).arg( selCount ).arg( newCount ) + : ( hasVis ) ? i18n( "%1 visible of %2 tracks" ).tqarg( visCount).tqarg( newCount ) + : ( hasSel ) ? i18n( "%1 selected of %2 tracks" ).tqarg( selCount ).tqarg( newCount ) : i18n( "1 track", "%n tracks", newCount ); int getValue = 0; @@ -238,11 +238,11 @@ StatusBar::slotItemCountChanged( int newCount, int newLength, //total getValue = newLength; if( getValue ) - m_itemCountLabel->setText( i18n( "X visible/selected tracks (time) ", "%1 (%2)" ).arg( text, MetaBundle::fuzzyTime( getValue ) ) ); + m_itemCountLabel->setText( i18n( "X visible/selected tracks (time) ", "%1 (%2)" ).tqarg( text, MetaBundle::fuzzyTime( getValue ) ) ); else m_itemCountLabel->setText( text ); - TQToolTip::add( m_itemCountLabel, i18n( "Play-time: %1" ).arg( MetaBundle::veryPrettyTime( getValue ) ) ); + TQToolTip::add( m_itemCountLabel, i18n( "Play-time: %1" ).tqarg( MetaBundle::veryPrettyTime( getValue ) ) ); } void diff --git a/amarok/src/statusbar/statusbar.h b/amarok/src/statusbar/statusbar.h index 06d4711e..d42cfca4 100644 --- a/amarok/src/statusbar/statusbar.h +++ b/amarok/src/statusbar/statusbar.h @@ -36,11 +36,12 @@ namespace Amarok class StatusBar : public KDE::StatusBar, public EngineObserver { Q_OBJECT + TQ_OBJECT LIBAMAROK_EXPORT static StatusBar* s_instance; public: - StatusBar( TQWidget *parent, const char *name = 0 ); + StatusBar( TQWidget *tqparent, const char *name = 0 ); static StatusBar* instance() { return s_instance; } diff --git a/amarok/src/statusbar/timeLabel.h b/amarok/src/statusbar/timeLabel.h index 511e1883..e3b7d975 100644 --- a/amarok/src/statusbar/timeLabel.h +++ b/amarok/src/statusbar/timeLabel.h @@ -22,13 +22,13 @@ #include <tqlabel.h> -class TimeLabel : public QLabel +class TimeLabel : public TQLabel { public: - TimeLabel( TQWidget *parent ) : TQLabel( " 0:00:00 ", parent ) + TimeLabel( TQWidget *tqparent ) : TQLabel( " 0:00:00 ", tqparent ) { setFont( KGlobalSettings::fixedFont() ); - setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed ); + tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed ); } virtual void mousePressEvent( TQMouseEvent * ) diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h index 08447308..6d241a2d 100644 --- a/amarok/src/statusbar/toggleLabel.h +++ b/amarok/src/statusbar/toggleLabel.h @@ -35,9 +35,10 @@ #include <tqtimer.h> #include <tqtooltip.h> -class ToggleLabel : public QLabel +class ToggleLabel : public TQLabel { Q_OBJECT + TQ_OBJECT KToggleAction const*const m_action; @@ -45,8 +46,8 @@ class ToggleLabel : public QLabel void toggled( bool ); public: - ToggleLabel( KToggleAction const*const action, TQWidget *parent ) - : TQLabel( parent ) + ToggleLabel( KToggleAction const*const action, TQWidget *tqparent ) + : TQLabel( tqparent ) , m_action( action ) , m_tooltip( 0 ) , m_tooltipShowing( false ) @@ -118,11 +119,11 @@ class ToggleLabel : public QLabel const TQString path = KGlobal::iconLoader()->iconPath( m_action->icon(), -KIcon::SizeHuge ); - m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), parentWidget(), 0 /*timeout*/ ); + m_tooltip = new KDE::PopupMessage( tqparentWidget()->tqparentWidget(), tqparentWidget(), 0 /*timeout*/ ); m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCounter( false ); m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); - m_tooltip->setText( tip.arg(m_action->text().remove('&') ) ); + m_tooltip->setText( tip.tqarg(m_action->text().remove('&') ) ); m_tooltip->setImage( path ); m_tooltip->reposition(); diff --git a/amarok/src/systray.cpp b/amarok/src/systray.cpp index 98c591f5..0f7331ba 100644 --- a/amarok/src/systray.cpp +++ b/amarok/src/systray.cpp @@ -23,10 +23,10 @@ namespace Amarok { - static QPixmap + static TQPixmap loadOverlay( const char *iconName, int iconWidth ) { - return TQImage( locate( "data", TQString( "amarok/images/b_%1.png" ).arg( iconName ) ), "PNG" ).smoothScale( ((iconWidth/2)-(iconWidth/20)), ((iconWidth/2)-(iconWidth/20)) ); + return TQImage( locate( "data", TQString( "amarok/images/b_%1.png" ).tqarg( iconName ) ), "PNG" ).smoothScale( ((iconWidth/2)-(iconWidth/20)), ((iconWidth/2)-(iconWidth/20)) ); } } @@ -75,7 +75,7 @@ Amarok::TrayIcon::event( TQEvent *e ) return Amarok::genericEventHandler( this, e ); case TQEvent::Timer: - if( static_cast<TQTimerEvent*>(e)->timerId() != blinkTimerID ) + if( TQT_TQTIMEREVENT(e)->timerId() != blinkTimerID ) return KSystemTray::event( e ); // if we're playing, blink icon @@ -88,7 +88,7 @@ Amarok::TrayIcon::event( TQEvent *e ) return true; case TQEvent::MouseButtonPress: - if( static_cast<TQMouseEvent*>(e)->button() == Qt::MidButton ) + if( TQT_TQMOUSEEVENT(e)->button() == Qt::MidButton ) { EngineController::instance()->playPause(); @@ -146,12 +146,12 @@ Amarok::TrayIcon::engineStateChanged( Engine::State state, Engine::State /*oldSt if( AmarokConfig::animateTrayIcon() ) blinkTimerID = startTimer( 1500 ); // start 'blink' timer - paintIcon( mergeLevel, true ); // repaint the icon + paintIcon( mergeLevel, true ); // tqrepaint the icon break; case Engine::Empty: overlayVisible = false; - paintIcon( -1, true ); // repaint the icon + paintIcon( -1, true ); // tqrepaint the icon // fall through to default: default: setLastFm( false ); @@ -175,7 +175,7 @@ Amarok::TrayIcon::engineTrackPositionChanged( long position, bool /*userSeek*/ ) void Amarok::TrayIcon::paletteChange( const TQPalette & op ) { - if ( palette().active().highlight() == op.active().highlight() || alternateIcon.isNull() ) + if ( tqpalette().active().highlight() == op.active().highlight() || alternateIcon.isNull() ) return; alternateIcon.resize( 0, 0 ); @@ -209,11 +209,11 @@ Amarok::TrayIcon::paintIcon( int mergePixels, bool force ) // eros: this looks cool with dark red blue or green but sucks with // other colors (such as kde default's pale pink..). maybe the effect // or the blended color has to be changed.. - TQColor saturatedColor = palette().active().highlight(); + TQColor saturatedColor = tqpalette().active().highlight(); int hue, sat, value; saturatedColor.getHsv( &hue, &sat, &value ); saturatedColor.setHsv( hue, sat > 200 ? 200 : sat, value < 100 ? 100 : value ); - KIconEffect::colorize( tmpTrayIcon, saturatedColor/* Qt::blue */, 0.9 ); + KIconEffect::colorize( tmpTrayIcon, saturatedColor/* TQt::blue */, 0.9 ); alternateIcon = tmpTrayIcon; } diff --git a/amarok/src/systray.h b/amarok/src/systray.h index fe9380d8..ead82bcd 100644 --- a/amarok/src/systray.h +++ b/amarok/src/systray.h @@ -36,9 +36,9 @@ private: bool event( TQEvent* ); void setLastFm( bool ); - // repaints trayIcon showing progress (and overlay if present) + // tqrepaints trayIcon showing progress (and overlay if present) void paintIcon( int mergePixels = -1, bool force = false ); - // blend an overlay icon over 'sourcePixmap' and repaint trayIcon + // blend an overlay icon over 'sourcePixmap' and tqrepaint trayIcon void blendOverlay( TQPixmap &sourcePixmap ); long trackLength, mergeLevel; diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp index b3bf5294..b2997688 100644 --- a/amarok/src/tagdialog.cpp +++ b/amarok/src/tagdialog.cpp @@ -61,8 +61,8 @@ private: TQStringList m_failedURLs; }; -TagDialog::TagDialog( const KURL& url, TQWidget* parent ) - : TagDialogBase( parent ) +TagDialog::TagDialog( const KURL& url, TQWidget* tqparent ) + : TagDialogBase( tqparent ) , m_bundle( url, true ) , m_playlistItem( 0 ) , m_currentCover( 0 ) @@ -71,8 +71,8 @@ TagDialog::TagDialog( const KURL& url, TQWidget* parent ) } -TagDialog::TagDialog( const KURL::List list, TQWidget* parent ) - : TagDialogBase( parent ) +TagDialog::TagDialog( const KURL::List list, TQWidget* tqparent ) + : TagDialogBase( tqparent ) , m_bundle() , m_playlistItem( 0 ) , m_urlList( list ) @@ -82,8 +82,8 @@ TagDialog::TagDialog( const KURL::List list, TQWidget* parent ) } -TagDialog::TagDialog( const MetaBundle& mb, PlaylistItem* item, TQWidget* parent ) - : TagDialogBase( parent ) +TagDialog::TagDialog( const MetaBundle& mb, PlaylistItem* item, TQWidget* tqparent ) + : TagDialogBase( tqparent ) , m_bundle( mb ) , m_playlistItem( item ) , m_currentCover( 0 ) @@ -309,7 +309,7 @@ TagDialog::queryDone( KTRMResultList results, TQString error ) //SLOT #if HAVE_TUNEPIMP if ( !error.isEmpty() ) { - KMessageBox::sorry( this, i18n( "Tunepimp (MusicBrainz tagging library) returned the following error: \"%1\"." ).arg(error) ); + KMessageBox::sorry( this, i18n( "Tunepimp (MusicBrainz tagging library) returned the following error: \"%1\"." ).tqarg(error) ); } else { if ( !results.isEmpty() ) @@ -355,7 +355,7 @@ TagDialog::fillSelected( KTRMResult selected ) //SLOT if ( selected.track() != 0 ) mb.setTrack( selected.track() ); if ( selected.year() != 0 ) mb.setYear( selected.year() ); - storedTags.replace( m_mbTrack.path(), mb ); + storedTags.tqreplace( m_mbTrack.path(), mb ); } #else Q_UNUSED(selected); @@ -376,7 +376,7 @@ void TagDialog::resetMusicbrainz() //SLOT void TagDialog::init() { // delete itself when closing - setWFlags( getWFlags() | Qt::WDestructiveClose ); + setWFlags( getWFlags() | TQt::WDestructiveClose ); KConfig *config = Amarok::config( "TagDialog" ); @@ -418,12 +418,12 @@ void TagDialog::init() //m_labelCloud = new KHTMLPart( labels_favouriteLabelsFrame ); m_labelCloud = new HTMLView( labels_favouriteLabelsFrame ); - m_labelCloud->view()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored, false ); + m_labelCloud->view()->tqsetSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored, false ); m_labelCloud->view()->setVScrollBarMode( TQScrollView::AlwaysOff ); m_labelCloud->view()->setHScrollBarMode( TQScrollView::AlwaysOff ); new TQVBoxLayout( labels_favouriteLabelsFrame ); - labels_favouriteLabelsFrame->layout()->add( m_labelCloud->view() ); + labels_favouriteLabelsFrame->tqlayout()->add( m_labelCloud->view() ); const TQStringList favoriteLabels = CollectionDB::instance()->favoriteLabels(); TQString html = generateHTML( favoriteLabels ); m_labelCloud->set( html ); @@ -448,7 +448,7 @@ void TagDialog::init() scoreLabel->hide(); } - //HACK due to deficiency in Qt that will be addressed in version 4 + //HACK due to deficiency in TQt that will be addressed in version 4 // TQSpinBox doesn't emit valueChanged if you edit the value with // the lineEdit until you change the keyboard focus connect( kIntSpinBox_year->child( "qt_spinbox_edit" ), TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(checkModified()) ); @@ -550,7 +550,7 @@ void TagDialog::init() // make it as small as possible - resize( sizeHint().width(), minimumSize().height() ); + resize( tqsizeHint().width(), tqminimumSize().height() ); } @@ -629,21 +629,21 @@ void TagDialog::readTags() { bool local = m_bundle.url().isLocalFile(); - setCaption( kapp->makeStdCaption( i18n("Track Information: %1 by %2").arg( m_bundle.title(), m_bundle.artist() ) ) ); + setCaption( kapp->makeStdCaption( i18n("Track Information: %1 by %2").tqarg( m_bundle.title(), m_bundle.artist() ) ) ); TQString niceTitle; if ( m_bundle.album().isEmpty() ) { if( !m_bundle.title().isEmpty() ) { if( !m_bundle.artist().isEmpty() ) - niceTitle = i18n( "<b>%1</b> by <b>%2</b>" ).arg( m_bundle.title(), m_bundle.artist() ); + niceTitle = i18n( "<b>%1</b> by <b>%2</b>" ).tqarg( m_bundle.title(), m_bundle.artist() ); else - niceTitle = TQString( "<b>%1</b>" ).arg( m_bundle.title() ); + niceTitle = TQString( "<b>%1</b>" ).tqarg( m_bundle.title() ); } else niceTitle = m_bundle.prettyTitle(); } else { niceTitle = i18n( "<b>%1</b> by <b>%2</b> on <b>%3</b>" ) - .arg( m_bundle.title(), m_bundle.artist(), m_bundle.album() ); + .tqarg( m_bundle.title(), m_bundle.artist(), m_bundle.album() ); } trackArtistAlbumLabel->setText( niceTitle ); trackArtistAlbumLabel2->setText( niceTitle ); @@ -671,22 +671,22 @@ void TagDialog::readTags() const TQString emptyLine = "<tr><td colspan=2></td></tr>"; summaryText = "<table width=100%><tr><td width=50%><table>"; - summaryText += body2cols.arg( i18n("Length"), unknownSafe( m_bundle.prettyLength() ) ); - summaryText += body2cols.arg( i18n("Bitrate"), unknownSafe( m_bundle.prettyBitrate() ) ); - summaryText += body2cols.arg( i18n("Samplerate"), unknownSafe( m_bundle.prettySampleRate() ) ); - summaryText += body2cols.arg( i18n("Size"), unknownSafe( m_bundle.prettyFilesize() ) ); - summaryText += body2cols.arg( i18n("Format"), unknownSafe( m_bundle.type() ) ); + summaryText += body2cols.tqarg( i18n("Length"), unknownSafe( m_bundle.prettyLength() ) ); + summaryText += body2cols.tqarg( i18n("Bitrate"), unknownSafe( m_bundle.prettyBitrate() ) ); + summaryText += body2cols.tqarg( i18n("Samplerate"), unknownSafe( m_bundle.prettySampleRate() ) ); + summaryText += body2cols.tqarg( i18n("Size"), unknownSafe( m_bundle.prettyFilesize() ) ); + summaryText += body2cols.tqarg( i18n("Format"), unknownSafe( m_bundle.type() ) ); summaryText += "</table></td><td width=50%><table>"; if( AmarokConfig::useScores() ) - summaryText += body2cols.arg( i18n("Score"), TQString::number( static_cast<int>( m_bundle.score() ) ) ); + summaryText += body2cols.tqarg( i18n("Score"), TQString::number( static_cast<int>( m_bundle.score() ) ) ); if( AmarokConfig::useRatings() ) - summaryText += body2cols.arg( i18n("Rating"), m_bundle.prettyRating() ); + summaryText += body2cols.tqarg( i18n("Rating"), m_bundle.prettyRating() ); - summaryText += body2cols.arg( i18n("Playcount"), TQString::number( m_bundle.playCount() ) ); - summaryText += body2cols.arg( i18n("First Played"), + summaryText += body2cols.tqarg( i18n("Playcount"), TQString::number( m_bundle.playCount() ) ); + summaryText += body2cols.tqarg( i18n("First Played"), m_bundle.playCount() ? KGlobal::locale()->formatDate( CollectionDB::instance()->getFirstPlay( m_bundle.url().path() ).date() , true ) : i18n("Never") ); - summaryText += body2cols.arg( i18n("a single item (singular)", "Last Played"), + summaryText += body2cols.tqarg( i18n("a single item (singular)", "Last Played"), m_bundle.playCount() ? KGlobal::locale()->formatDate( CollectionDB::instance()->getLastPlay( m_bundle.url().path() ).date() , true ) : i18n("Never") ); summaryText += "</table></td></tr></table>"; @@ -696,7 +696,7 @@ void TagDialog::readTags() TQStringList sData = statisticsData(); for ( uint i = 0; i<sData.count(); i+=2 ) { - statisticsText += body2cols.arg( sData[i], sData[i+1] ); + statisticsText += body2cols.tqarg( sData[i], sData[i+1] ); } statisticsText += "</table>"; @@ -916,15 +916,15 @@ TagDialog::readMultipleTracks() TQString statisticsText = "<table>"; if( AmarokConfig::useRatings() ) { - statisticsText += body.arg( i18n( "Rated Songs" ) , TQString::number( ratingCount ) ); + statisticsText += body.tqarg( i18n( "Rated Songs" ) , TQString::number( ratingCount ) ); if ( ratingCount ) - statisticsText += body.arg( i18n( "Average Rating" ) , TQString::number( (float)ratingSum / (float)ratingCount/2.0, 'f', 1 ) ); + statisticsText += body.tqarg( i18n( "Average Rating" ) , TQString::number( (float)ratingSum / (float)ratingCount/2.0, 'f', 1 ) ); } if( AmarokConfig::useRatings() ) { - statisticsText += body.arg( i18n( "Scored Songs" ) , TQString::number( scoreCount ) ); + statisticsText += body.tqarg( i18n( "Scored Songs" ) , TQString::number( scoreCount ) ); if ( scoreCount ) - statisticsText += body.arg( i18n( "Average Score" ) , TQString::number( scoreSum / scoreCount, 'f', 1 ) ); + statisticsText += body.tqarg( i18n( "Average Score" ) , TQString::number( scoreSum / scoreCount, 'f', 1 ) ); } @@ -947,7 +947,7 @@ TagDialog::readMultipleTracks() checkModified(); } -QStringList +TQStringList TagDialog::getCommonLabels() { DEBUG_BLOCK @@ -959,7 +959,7 @@ TagDialog::getCommonLabels() TQStringList labels = labelsForURL( *iter ); foreach( labels ) { - if ( counterMap.contains( *it ) ) + if ( counterMap.tqcontains( *it ) ) counterMap[ *it ] = counterMap[ *it ] +1; else counterMap[ *it ] = 1; @@ -1051,15 +1051,15 @@ TagDialog::storeTags( const KURL &kurl ) mb.setLength( m_bundle.length() ); mb.setBitrate( m_bundle.bitrate() ); mb.setSampleRate( m_bundle.sampleRate() ); - storedTags.replace( url, mb ); + storedTags.tqreplace( url, mb ); } if( result & TagDialog::SCORECHANGED ) - storedScores.replace( url, kIntSpinBox_score->value() ); + storedScores.tqreplace( url, kIntSpinBox_score->value() ); if( result & TagDialog::RATINGCHANGED ) - storedRatings.replace( url, kComboBox_rating->currentItem() ); + storedRatings.tqreplace( url, kComboBox_rating->currentItem() ); if( result & TagDialog::LYRICSCHANGED ) { if ( kTextEdit_lyrics->text().isEmpty() ) - storedLyrics.replace( url, TQString::null ); + storedLyrics.tqreplace( url, TQString() ); else { TQDomDocument doc; TQDomElement e = doc.createElement( "lyrics" ); @@ -1068,13 +1068,13 @@ TagDialog::storeTags( const KURL &kurl ) TQDomText t = doc.createTextNode( kTextEdit_lyrics->text() ); e.appendChild( t ); doc.appendChild( e ); - storedLyrics.replace( url, doc.toString() ); + storedLyrics.tqreplace( url, doc.toString() ); } } if( result & TagDialog::LABELSCHANGED ) { generateDeltaForLabelList( labelListFromText( kTextEdit_selectedLabels->text() ) ); TQStringList tmpLabels; - if ( newLabels.find( url ) != newLabels.end() ) + if ( newLabels.tqfind( url ) != newLabels.end() ) tmpLabels = newLabels[ url ]; else tmpLabels = originalLabels[ url ]; @@ -1085,10 +1085,10 @@ TagDialog::storeTags( const KURL &kurl ) } foreach( m_addedLabels ) { - if( tmpLabels.find( *it ) == tmpLabels.end() ) + if( tmpLabels.tqfind( *it ) == tmpLabels.end() ) tmpLabels.append( *it ); } - newLabels.replace( url, tmpLabels ); + newLabels.tqreplace( url, tmpLabels ); } } @@ -1096,17 +1096,17 @@ void TagDialog::storeTags( const KURL &url, int changes, const MetaBundle &mb ) { if ( changes & TagDialog::TAGSCHANGED ) - storedTags.replace( url.path(), mb ); + storedTags.tqreplace( url.path(), mb ); if ( changes & TagDialog::SCORECHANGED ) - storedScores.replace( url.path(), mb.score() ); + storedScores.tqreplace( url.path(), mb.score() ); if ( changes & TagDialog::RATINGCHANGED ) - storedRatings.replace( url.path(), mb.rating() ); + storedRatings.tqreplace( url.path(), mb.rating() ); } void TagDialog::storeLabels( const KURL &url, const TQStringList &labels ) { - newLabels.replace( url.path(), labels ); + newLabels.tqreplace( url.path(), labels ); } @@ -1127,7 +1127,7 @@ TagDialog::loadLyrics( const KURL &url ) if( doc.setContent( xml ) ) m_lyrics = doc.documentElement().text(); else - m_lyrics = TQString::null; + m_lyrics = TQString(); } void @@ -1150,7 +1150,7 @@ TagDialog::loadLabels( const KURL &url ) MetaBundle TagDialog::bundleForURL( const KURL &url ) { - if( storedTags.find( url.path() ) != storedTags.end() ) + if( storedTags.tqfind( url.path() ) != storedTags.end() ) return storedTags[ url.path() ]; return MetaBundle( url, url.isLocalFile() ); @@ -1159,7 +1159,7 @@ TagDialog::bundleForURL( const KURL &url ) float TagDialog::scoreForURL( const KURL &url ) { - if( storedScores.find( url.path() ) != storedScores.end() ) + if( storedScores.tqfind( url.path() ) != storedScores.end() ) return storedScores[ url.path() ]; return CollectionDB::instance()->getSongPercentage( url.path() ); @@ -1168,27 +1168,27 @@ TagDialog::scoreForURL( const KURL &url ) int TagDialog::ratingForURL( const KURL &url ) { - if( storedRatings.find( url.path() ) != storedRatings.end() ) + if( storedRatings.tqfind( url.path() ) != storedRatings.end() ) return storedRatings[ url.path() ]; return CollectionDB::instance()->getSongRating( url.path() ); } -QString +TQString TagDialog::lyricsForURL( const KURL &url ) { - if( storedLyrics.find( url.path() ) != storedLyrics.end() ) + if( storedLyrics.tqfind( url.path() ) != storedLyrics.end() ) return storedLyrics[ url.path() ]; return CollectionDB::instance()->getLyrics( url.path() ); } -QStringList +TQStringList TagDialog::labelsForURL( const KURL &url ) { - if( newLabels.find( url.path() ) != newLabels.end() ) + if( newLabels.tqfind( url.path() ) != newLabels.end() ) return newLabels[ url.path() ]; - if( originalLabels.find( url.path() ) != originalLabels.end() ) + if( originalLabels.tqfind( url.path() ) != originalLabels.end() ) return originalLabels[ url.path() ]; TQStringList tmp = CollectionDB::instance()->getLabels( url.path(), CollectionDB::typeUser ); originalLabels[ url.path() ] = tmp; @@ -1315,14 +1315,14 @@ TagDialog::applyToAllTracks() } for( TQStringList::Iterator iter = m_addedLabels.begin(); iter != m_addedLabels.end(); ++iter ) { - if( tmpLabels.find( *iter ) == tmpLabels.end() ) + if( tmpLabels.tqfind( *iter ) == tmpLabels.end() ) tmpLabels.append( *iter ); } storeLabels( *it, tmpLabels ); } } -QStringList +TQStringList TagDialog::labelListFromText( const TQString &text ) { TQStringList tmp = TQStringList::split( ',', text ); @@ -1332,7 +1332,7 @@ TagDialog::labelListFromText( const TQString &text ) { TQString tmpString = (*it).stripWhiteSpace(); if ( !tmpString.isEmpty() ) - map.replace( tmpString, 0 ); + map.tqreplace( tmpString, 0 ); } TQStringList result; TQMap<TQString, int>::ConstIterator endMap( map.end() ); @@ -1349,23 +1349,23 @@ TagDialog::generateDeltaForLabelList( const TQStringList &list ) m_removedLabels.clear(); foreach( list ) { - if ( !m_labels.contains( *it ) ) + if ( !m_labels.tqcontains( *it ) ) m_addedLabels.append( *it ); } foreach( m_labels ) { - if ( !list.contains( *it ) ) + if ( !list.tqcontains( *it ) ) m_removedLabels.append( *it ); } m_labels = list; } -QString +TQString TagDialog::generateHTML( const TQStringList &labels ) { //the first column of each row is the label name, the second the number of assigned songs //loop through it to find the highest number of songs, can be removed if somebody figures out a better sql query - TQMap<TQString, QPair<TQString, int> > mapping; + TQMap<TQString, TQPair<TQString, int> > mapping; TQStringList sortedLabels; int max = 1; foreach( labels ) @@ -1376,7 +1376,7 @@ TagDialog::generateHTML( const TQStringList &labels ) int value = ( *it ).toInt(); if ( value > max ) max = value; - mapping[label.lower()] = QPair<TQString, int>( label, value ); + mapping[label.lower()] = TQPair<TQString, int>( label, value ); } sortedLabels.sort(); TQString html = "<html><body>"; @@ -1388,7 +1388,7 @@ TagDialog::generateHTML( const TQStringList &labels ) if ( labelUse == 0 ) labelUse = 1; html.append( TQString( "<span class='label size%1'><a href=\"label:%2\">%3</a></span> " ) - .arg( TQString::number( labelUse ), mapping[key].first, mapping[key].first ) ); + .tqarg( TQString::number( labelUse ), mapping[key].first, mapping[key].first ) ); } html.append( "</html></body>" ); debug() << "Dumping HTML for label cloud: " << html << endl; @@ -1403,7 +1403,7 @@ TagDialog::openURLRequest(const KURL &url ) //SLOT { TQString text = kTextEdit_selectedLabels->text(); TQStringList currentLabels = labelListFromText( text ); - if ( currentLabels.contains( url.path() ) ) + if ( currentLabels.tqcontains( url.path() ) ) return; if ( !text.isEmpty() ) text.append( ", " ); @@ -1418,7 +1418,7 @@ TagDialog::writeTag( MetaBundle &mb, bool updateCB ) TQCString path = TQFile::encodeName( mb.url().path() ); if ( !TagLib::File::isWritable( path ) ) { Amarok::StatusBar::instance()->longMessage( i18n( - "The file %1 is not writable." ).arg( mb.url().fileName() ), KDE::StatusBar::Error ); + "The file %1 is not writable." ).tqarg( mb.url().fileName() ), KDE::StatusBar::Error ); return false; } @@ -1458,7 +1458,7 @@ TagDialogWriter::doJob() TQCString path = TQFile::encodeName( m_tags[i].url().path() ); if ( !TagLib::File::isWritable( path ) ) { Amarok::StatusBar::instance()->longMessageThreadSafe( i18n( - "The file %1 is not writable." ).arg( m_tags[i].url().fileName() ), KDE::StatusBar::Error ); + "The file %1 is not writable." ).tqarg( m_tags[i].url().fileName() ), KDE::StatusBar::Error ); m_failed += true; continue; } @@ -1491,7 +1491,7 @@ TagDialogWriter::completeJob() CollectionView::instance()->databaseChanged(); if ( m_failCount ) Amarok::StatusBar::instance()->longMessage( i18n( - "Sorry, the tag for the following files could not be changed:\n" ).arg( m_failedURLs.join( ";\n" ) ), KDE::StatusBar::Error ); + "Sorry, the tag for the following files could not be changed:\n" ).tqarg( m_failedURLs.join( ";\n" ) ), KDE::StatusBar::Error ); } diff --git a/amarok/src/tagdialog.h b/amarok/src/tagdialog.h index 3fc309d5..ecb7af1f 100644 --- a/amarok/src/tagdialog.h +++ b/amarok/src/tagdialog.h @@ -33,15 +33,16 @@ namespace TagLib { class TagDialog : public TagDialogBase { Q_OBJECT + TQ_OBJECT public: enum Changes { NOCHANGE=0, SCORECHANGED=1, TAGSCHANGED=2, LYRICSCHANGED=4, RATINGCHANGED=8, LABELSCHANGED=16 }; enum Tabs { SUMMARYTAB, TAGSTAB, LYRICSTAB, STATSTAB, LABELSTAB }; - TagDialog( const KURL& url, TQWidget* parent = 0 ); - TagDialog( const KURL::List list, TQWidget* parent = 0 ); - TagDialog( const MetaBundle& mb, PlaylistItem* item, TQWidget* parent = 0 ); + TagDialog( const KURL& url, TQWidget* tqparent = 0 ); + TagDialog( const KURL::List list, TQWidget* tqparent = 0 ); + TagDialog( const MetaBundle& mb, PlaylistItem* item, TQWidget* tqparent = 0 ); ~TagDialog(); void setTab( int id ); diff --git a/amarok/src/tagdialogbase.ui b/amarok/src/tagdialogbase.ui index 174a63fc..44a1dae3 100644 --- a/amarok/src/tagdialogbase.ui +++ b/amarok/src/tagdialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TagDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>TagDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout5_3</cstring> + <cstring>tqlayout5_3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton_previous</cstring> </property> @@ -35,7 +35,7 @@ <string>&Previous</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton_next</cstring> </property> @@ -43,7 +43,7 @@ <string>&Next</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkBox_perTrack</cstring> </property> @@ -61,14 +61,14 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>215</width> <height>30</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton_ok</cstring> </property> @@ -82,7 +82,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton_cancel</cstring> </property> @@ -104,15 +104,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>locationLabel</cstring> </property> @@ -134,7 +134,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton_open</cstring> </property> @@ -154,7 +154,7 @@ <property name="currentPage"> <number>4</number> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>summaryTab</cstring> </property> @@ -169,27 +169,27 @@ <property name="name"> <cstring>pixmap_cover</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>85</width> <height>85</height> </size> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>trackArtistAlbumLabel</cstring> </property> <property name="text"> <string>Track by Artist on Album</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -217,27 +217,27 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>summaryLabel</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tagsTab</cstring> </property> @@ -248,7 +248,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -259,7 +259,7 @@ <cstring>kComboBox_artist</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -270,7 +270,7 @@ <cstring>kLineEdit_title</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel1_6_6</cstring> </property> @@ -284,15 +284,15 @@ <cstring>kIntSpinBox_track</cstring> </property> </widget> - <widget class="QLayoutWidget" row="8" column="1"> + <widget class="TQLayoutWidget" row="8" column="1"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton_guessTags</cstring> </property> @@ -300,7 +300,7 @@ <string>Guess Tags From &Filename</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton_setFilenameSchemes</cstring> </property> @@ -313,7 +313,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel_comment</cstring> </property> @@ -327,7 +327,7 @@ <cstring>kTextEdit_comment</cstring> </property> </widget> - <widget class="QPushButton" row="7" column="1"> + <widget class="TQPushButton" row="7" column="1"> <property name="name"> <cstring>pushButton_musicbrainz</cstring> </property> @@ -335,7 +335,7 @@ <string>Fill-In Tags Using MusicBrain&z</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -370,9 +370,9 @@ <cstring>kLineEdit_title</cstring> </property> </widget> - <widget class="QLayoutWidget" row="5" column="1"> + <widget class="TQLayoutWidget" row="5" column="1"> <property name="name"> - <cstring>layout5_2</cstring> + <cstring>tqlayout5_2</cstring> </property> <hbox> <property name="name"> @@ -400,7 +400,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_5</cstring> </property> @@ -449,7 +449,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -460,7 +460,7 @@ <cstring>kComboBox_album</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -471,9 +471,9 @@ <cstring>kComboBox_composer</cstring> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -498,7 +498,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_2</cstring> </property> @@ -521,13 +521,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>50</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>100</width> <height>32767</height> @@ -582,7 +582,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>lyricsTab</cstring> </property> @@ -609,7 +609,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>statisticsTab</cstring> </property> @@ -620,14 +620,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>trackArtistAlbumLabel2</cstring> </property> <property name="text"> <string>Track by Artist on Album</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -641,21 +641,21 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>200</height> </size> </property> </spacer> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>statisticsLabel</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -669,14 +669,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>431</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>scoreLabel</cstring> </property> @@ -684,7 +684,7 @@ <string>Score:</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>ratingLabel</cstring> </property> @@ -724,7 +724,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>labelsTab</cstring> </property> @@ -735,7 +735,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labels_favouriteLabels</cstring> </property> @@ -743,18 +743,18 @@ <string>Your favorite labels:</string> </property> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>labels_favouriteLabelsFrame</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>120</height> </size> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labels_explanation</cstring> </property> @@ -820,7 +820,7 @@ <tabstop>pushButton_cancel</tabstop> </tabstops> <pixmapinproject/> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>ktabwidget.h</includehint> diff --git a/amarok/src/tagdialogbase.ui.h b/amarok/src/tagdialogbase.ui.h index 00f90a72..43fe5f4e 100644 --- a/amarok/src/tagdialogbase.ui.h +++ b/amarok/src/tagdialogbase.ui.h @@ -8,7 +8,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). diff --git a/amarok/src/tagguesser.cpp b/amarok/src/tagguesser.cpp index a0a9ff30..8d6a3d6d 100644 --- a/amarok/src/tagguesser.cpp +++ b/amarok/src/tagguesser.cpp @@ -30,17 +30,17 @@ FileNameScheme::FileNameScheme( const TQString &s ) , m_composerField( -1 ) , m_genreField( -1 ) { - int artist = s.find( "%artist" ); - int title = s.find( "%title" ); - int track = s.find( "%track" ); - int album = s.find( "%album" ); - int comment = s.find( "%comment" ); - int year = s.find( "%year" ); - int composer = s.find( "%composer" ); - int genre = s.find( "%genre" ); + int artist = s.tqfind( "%artist" ); + int title = s.tqfind( "%title" ); + int track = s.tqfind( "%track" ); + int album = s.tqfind( "%album" ); + int comment = s.tqfind( "%comment" ); + int year = s.tqfind( "%year" ); + int composer = s.tqfind( "%composer" ); + int genre = s.tqfind( "%genre" ); int fieldNumber = 1; - int i = s.find( '%' ); + int i = s.tqfind( '%' ); while ( i > -1 ) { if ( title == i ) m_titleField = fieldNumber++; @@ -59,7 +59,7 @@ FileNameScheme::FileNameScheme( const TQString &s ) if ( genre == i ) m_genreField = fieldNumber++; - i = s.find('%', i + 1); + i = s.tqfind('%', i + 1); } m_regExp.setPattern( composeRegExp( s ) ); } @@ -70,7 +70,7 @@ bool FileNameScheme::matches( const TQString &fileName ) const * does not work as a separator. */ TQString stripped = fileName; - stripped.truncate( stripped.findRev( '.' ) ); + stripped.truncate( stripped.tqfindRev( '.' ) ); return m_regExp.exactMatch( stripped ); } @@ -148,7 +148,7 @@ TQString FileNameScheme::composeRegExp( const TQString &s ) const TQString regExp = TQRegExp::escape( s.simplifyWhiteSpace() ); regExp = ".*" + regExp; - regExp.replace( ' ', "\\s+" ); + regExp.tqreplace( ' ', "\\s+" ); regExp = KMacroExpander::expandMacros( regExp, substitutions ); regExp += "[^/]*$"; return regExp; @@ -225,7 +225,7 @@ void TagGuesser::loadSchemes() void TagGuesser::guess( const TQString &absFileName ) { - m_title = m_artist = m_album = m_track = m_comment = m_year = m_composer = m_genre = TQString::null; + m_title = m_artist = m_album = m_track = m_comment = m_year = m_composer = m_genre = TQString(); FileNameScheme::List::ConstIterator it = m_schemes.begin(); FileNameScheme::List::ConstIterator end = m_schemes.end(); @@ -233,14 +233,14 @@ void TagGuesser::guess( const TQString &absFileName ) const FileNameScheme schema( *it ); if( schema.matches( absFileName ) ) { debug() <<"Schema used: " << " " << schema.pattern() <<endl; - m_title = capitalizeWords( schema.title().replace( '_', " " ) ).stripWhiteSpace(); - m_artist = capitalizeWords( schema.artist().replace( '_', " " ) ).stripWhiteSpace(); - m_album = capitalizeWords( schema.album().replace( '_', " " ) ).stripWhiteSpace(); + m_title = capitalizeWords( schema.title().tqreplace( '_', " " ) ).stripWhiteSpace(); + m_artist = capitalizeWords( schema.artist().tqreplace( '_', " " ) ).stripWhiteSpace(); + m_album = capitalizeWords( schema.album().tqreplace( '_', " " ) ).stripWhiteSpace(); m_track = schema.track().stripWhiteSpace(); - m_comment = schema.comment().replace( '_', " " ).stripWhiteSpace(); + m_comment = schema.comment().tqreplace( '_', " " ).stripWhiteSpace(); m_year = schema.year().stripWhiteSpace(); - m_composer = capitalizeWords( schema.composer().replace( '_', " " ) ).stripWhiteSpace(); - m_genre = capitalizeWords( schema.genre().replace( '_', " " ) ).stripWhiteSpace(); + m_composer = capitalizeWords( schema.composer().tqreplace( '_', " " ) ).stripWhiteSpace(); + m_genre = capitalizeWords( schema.genre().tqreplace( '_', " " ) ).stripWhiteSpace(); break; } } @@ -255,10 +255,10 @@ TQString TagGuesser::capitalizeWords( const TQString &s ) result[ 0 ] = result[ 0 ].upper(); const TQRegExp wordRegExp( "\\s\\w" ); - int i = result.find( wordRegExp ); + int i = result.tqfind( wordRegExp ); while ( i > -1 ) { result[ i + 1 ] = result[ i + 1 ].upper(); - i = result.find( wordRegExp, ++i ); + i = result.tqfind( wordRegExp, ++i ); } return result; diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui index 23ab94cf..de75856f 100644 --- a/amarok/src/tagguesserconfigdialog.ui +++ b/amarok/src/tagguesserconfigdialog.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>TagGuesserConfigDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -69,7 +69,7 @@ For example, the file name scheme "[%track] %artist - %title" would match "[01] Note that the order in which the schemes appear in the list is relevant, since the tag guesser will go through the list from the top to the bottom, and use the first matching scheme.</string> </property> </widget> - <widget class="QToolButton" row="0" column="1"> + <widget class="TQToolButton" row="0" column="1"> <property name="name"> <cstring>bMoveUp</cstring> </property> @@ -83,7 +83,7 @@ Note that the order in which the schemes appear in the list is relevant, since t <string>Press this button to move the currently selected scheme one step upwards.</string> </property> </widget> - <widget class="QToolButton" row="0" column="3"> + <widget class="TQToolButton" row="0" column="3"> <property name="name"> <cstring>bMoveDown</cstring> </property> @@ -149,7 +149,7 @@ Note that the order in which the schemes appear in the list is relevant, since t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> @@ -191,22 +191,22 @@ Note that the order in which the schemes appear in the list is relevant, since t <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> - <slot specifier="non virtual">slotCurrentChanged( QListViewItem * item )</slot> +<Q_SLOTS> + <slot specifier="non virtual">slotCurrentChanged( TQListViewItem * item )</slot> <slot>accept()</slot> <slot>reject()</slot> - <slot specifier="non virtual">slotRenameItem( QListViewItem * item, const QPoint &, int c )</slot> + <slot specifier="non virtual">slotRenameItem( TQListViewItem * item, const QPoint &, int c )</slot> <slot specifier="non virtual">slotMoveUpClicked()</slot> <slot specifier="non virtual">slotMoveDownClicked()</slot> <slot specifier="non virtual">slotAddClicked()</slot> <slot specifier="non virtual">slotModifyClicked()</slot> <slot specifier="non virtual">slotRemoveClicked()</slot> -</slots> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<layoutdefaults spacing="6" margin="0"/> -<layoutfunctions spacing="KDialog::spacingHint"/> +<tqlayoutdefaults spacing="6" margin="0"/> +<tqlayoutfunctions spacing="KDialog::spacingHint"/> <includehints> <includehint>kdialog.h</includehint> <includehint>klistview.h</includehint> diff --git a/amarok/src/tagguesserconfigdialog.ui.h b/amarok/src/tagguesserconfigdialog.ui.h index 875bab35..dac41fac 100644 --- a/amarok/src/tagguesserconfigdialog.ui.h +++ b/amarok/src/tagguesserconfigdialog.ui.h @@ -16,7 +16,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/amarok/src/threadmanager.cpp b/amarok/src/threadmanager.cpp index cf4a90e5..c6f4e19a 100644 --- a/amarok/src/threadmanager.cpp +++ b/amarok/src/threadmanager.cpp @@ -4,13 +4,13 @@ // // the asserts we use in this module prevent crashes, so best to abort the application if they fail -#define QT_FATAL_ASSERT +#define TQT_FATAL_ASSERT #define DEBUG_PREFIX "ThreadManager" #include <kcursor.h> #include <tqapplication.h> -#include <pthread.h>//we're emulating features of Qt 4, so this can be removed for Amarok 2.0 +#include <pthread.h>//we're emulating features of TQt 4, so this can be removed for Amarok 2.0 #include "debug.h" #include "statusbar.h" @@ -204,16 +204,16 @@ ThreadManager::event( TQEvent *e ) break; case OverrideCursorEvent: - // we have to do this for the PlaylistLoader case, as Qt uses the same + // we have to do this for the PlaylistLoader case, as TQt uses the same // function for drag and drop operations. - if (qApp->type() != TQApplication::Tty) + if (tqApp->type() != TQApplication::Tty) TQApplication::setOverrideCursor( KCursor::workingCursor() ); break; case RestoreOverrideCursorEvent: - // we have to do this for the PlaylistLoader case, as Qt uses the same + // we have to do this for the PlaylistLoader case, as TQt uses the same // function for drag and drop operations. - if (qApp->type() != TQApplication::Tty) + if (tqApp->type() != TQApplication::Tty) TQApplication::restoreOverrideCursor(); break; @@ -225,7 +225,7 @@ ThreadManager::event( TQEvent *e ) } -//Taken from Qt 4 src/corelib/thread/qthread_unix.cpp +//Taken from TQt 4 src/corelib/thread/qthread_unix.cpp static pthread_once_t current_thread_key_once = PTHREAD_ONCE_INIT; static pthread_key_t current_thread_key; static void create_current_thread_key() @@ -252,7 +252,7 @@ ThreadManager::Thread::getRunning() return reinterpret_cast<TQThread *>( pthread_getspecific( current_thread_key ) ); } -QString +TQString ThreadManager::Thread::threadId() { if (!getRunning()) @@ -268,7 +268,7 @@ void ThreadManager::Thread::runJob( Job *job ) { job->m_thread = this; - job->m_parentThreadId = m_threadId; + job->m_tqparentThreadId = m_threadId; if ( job->isAborted() ) TQApplication::postEvent( ThreadManager::instance(), job ); @@ -290,7 +290,7 @@ ThreadManager::Thread::run() DEBUG_BLOCK - //keep this first, before anything that uses the database, or SQLite may error out + //keep this first, before anything that uses the database, or STQLite may error out if ( AmarokConfig::databaseEngine().toInt() == DbConnection::sqlite ) CollectionDB::instance()->releasePreviousConnection( this ); @@ -369,7 +369,7 @@ ThreadManager::Job::setProgress( uint steps ) } void -ThreadManager::Job::setStatus( const TQString &status ) +ThreadManager::Job::settqStatus( const TQString &status ) { m_status = status; @@ -390,7 +390,7 @@ ThreadManager::Job::customEvent( TQCustomEvent *e ) switch( progress ) { case -2: - StatusBar::instance()->setProgressStatus( this, m_status ); + StatusBar::instance()->setProgresstqStatus( this, m_status ); break; case -1: @@ -424,4 +424,4 @@ ThreadManager::DependentJob::completeJob() } #include "threadmanager.moc" -#undef QT_FATAL_ASSERT //enable-final +#undef TQT_FATAL_ASSERT //enable-final diff --git a/amarok/src/threadmanager.h b/amarok/src/threadmanager.h index 8ac62455..6d6406ac 100644 --- a/amarok/src/threadmanager.h +++ b/amarok/src/threadmanager.h @@ -76,15 +76,20 @@ */ -/// This class is because moc "is really good" (no nested Q_OBJECT classes) +/// This class is because tqmoc "is really good" (no nested TQ_OBJECT classes) class JobBase : public TQObject { -Q_OBJECT -protected: JobBase() : TQObject(), m_aborted( false ) {} -public slots: void abort() { m_aborted = true; } -protected: bool m_aborted; + Q_OBJECT + TQ_OBJECT + +protected: + JobBase() : TQObject(), m_aborted( false ) {} +public slots: + void abort() { m_aborted = true; } +protected: + bool m_aborted; }; -class ThreadManager : public QObject +class ThreadManager : public TQObject { public: class Thread; @@ -179,7 +184,7 @@ public: /** * Class Thread */ - class Thread : public QThread + class Thread : public TQThread { public: Thread(); @@ -229,8 +234,12 @@ public: * doesn't have to be called. */ - class Job : public JobBase, public QCustomEvent +#ifndef Q_MOC_RUN + + class Job : public JobBase, public TQCustomEvent { +// Q_OBJECT +// TQ_OBJECT friend class ThreadManager; //access to m_thread friend class ThreadManager::Thread; //access to m_aborted @@ -278,7 +287,7 @@ public: /** * If you set progress information, you should set this too, changing it when appropriate */ - void setStatus( const TQString &status ); + void settqStatus( const TQString &status ); /** * This shows the progressBar too, the user will be able to abort @@ -304,7 +313,7 @@ public: */ //void setVisible( bool ); - uint parentThreadId() { return m_parentThreadId; } + uint tqparentThreadId() { return m_tqparentThreadId; } protected: /** @@ -332,7 +341,7 @@ public: uint m_percentDone; uint m_progressDone; uint m_totalSteps; - uint m_parentThreadId; + uint m_tqparentThreadId; TQString m_description; TQString m_status; @@ -344,7 +353,7 @@ public: /** * @class DependentJob - * @short A Job that depends on the existence of a QObject + * @short A Job that depends on the existence of a TQObject * * This Job type is dependent on a TQObject instance, if that instance is * deleted, this Job will be aborted and safely deleted. @@ -366,13 +375,15 @@ public: * * It is only safe to have one dependent, if you depend on multiple objects * that might get deleted while you are running you should instead try to - * make the multiple objects children of one TQObject and depend on the - * top-most parent or best of all would be to make copies of the data you + * make the multiple objects tqchildren of one TQObject and depend on the + * top-most tqparent or best of all would be to make copies of the data you * need instead of being dependent. */ class DependentJob : public Job { +// Q_OBJECT +// TQ_OBJECT public: DependentJob( TQObject *dependent, const char *name ); @@ -387,6 +398,8 @@ public: DISABLE_GENERATED_MEMBER_FUNCTIONS_4( DependentJob ) }; +#endif Q_MOC_RUN + protected: ThreadManager( const ThreadManager& ); ThreadManager &operator=( const ThreadManager& ); diff --git a/amarok/src/tooltip.cpp b/amarok/src/tooltip.cpp index 4b842c85..24ee97cd 100644 --- a/amarok/src/tooltip.cpp +++ b/amarok/src/tooltip.cpp @@ -27,10 +27,10 @@ #include "debug.h" #include "tooltip.h" -class Amarok::ToolTip::Manager: public QObject +class Amarok::ToolTip::Manager: public TQObject { public: - Manager( TQObject *parent ): TQObject( parent ) { qApp->installEventFilter( this ); } + Manager( TQObject *tqparent ): TQObject( tqparent ) { tqApp->installEventFilter( this ); } virtual ~Manager() { for( int n = Amarok::ToolTip::s_tooltips.count() - 1; n >= 0; --n ) @@ -53,7 +53,7 @@ public: case TQEvent::Enter: case TQEvent::Leave: case TQEvent::FocusOut: - if( !dynamic_cast<Amarok::ToolTip*>( qApp->widgetAt( TQCursor::pos(), true ) ) ) + if( !dynamic_cast<Amarok::ToolTip*>( tqApp->widgetAt( TQCursor::pos(), true ) ) ) Amarok::ToolTip::hideTips(); default: break; } @@ -69,17 +69,17 @@ TQString Amarok::ToolTip::s_text; TQValueList<Amarok::ToolTip*> Amarok::ToolTip::s_tooltips; int Amarok::ToolTip::s_hack = 0; -void Amarok::ToolTip::add( ToolTipClient *client, TQWidget *parent ) //static +void Amarok::ToolTip::add( ToolTipClient *client, TQWidget *tqparent ) //static { if( !s_manager ) - s_manager = new Amarok::ToolTip::Manager( qApp ); - new ToolTip( client, parent ); + s_manager = new Amarok::ToolTip::Manager( TQT_TQOBJECT(tqApp) ); + new ToolTip( client, tqparent ); } void Amarok::ToolTip::remove( TQWidget *widget ) //static { for( int i = s_tooltips.count() - 1; i >= 0; --i ) - if( s_tooltips[i]->TQToolTip::parentWidget() == widget ) + if( s_tooltips[i]->TQToolTip::tqparentWidget() == 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::parentWidget() == widget ) + if( s_tooltips[i]->TQToolTip::tqparentWidget() == widget ) return s_tooltips[i]->m_client->toolTipText( widget, pos ).first; return TQToolTip::textFor( widget, pos ); } @@ -103,8 +103,8 @@ 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::parentWidget(); - QPair<TQString, TQRect> p = s_tooltips[i]->m_client->toolTipText( w, w->mapFromGlobal( s_pos ) ); + TQWidget* const w = s_tooltips[i]->TQToolTip::tqparentWidget(); + TQPair<TQString, TQRect> p = s_tooltips[i]->m_client->toolTipText( w, w->mapFromGlobal( s_pos ) ); TQString prev = s_text; if( prev != p.first ) { @@ -116,9 +116,9 @@ void Amarok::ToolTip::updateTip() //static } } -Amarok::ToolTip::ToolTip( ToolTipClient *client, TQWidget *parent ) +Amarok::ToolTip::ToolTip( ToolTipClient *client, TQWidget *tqparent ) : TQFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM | WNoAutoErase ), - TQToolTip( parent ), + TQToolTip( tqparent ), m_client( client ) { s_tooltips.append( this ); @@ -133,12 +133,12 @@ Amarok::ToolTip::~ToolTip() void Amarok::ToolTip::maybeTip( const TQPoint &pos ) { - s_pos = TQToolTip::parentWidget()->mapToGlobal( pos ); + s_pos = TQToolTip::tqparentWidget()->mapToGlobal( pos ); TQString prev = s_text; - QPair<TQString, TQRect> p = m_client->toolTipText( TQToolTip::parentWidget(), pos ); + TQPair<TQString, TQRect> p = m_client->toolTipText( TQToolTip::tqparentWidget(), pos ); s_text = p.first; s_rect = p.second; - if( TQToolTip::parentWidget() && !s_text.isEmpty() ) + if( TQToolTip::tqparentWidget() && !s_text.isEmpty() ) { if( s_text != prev ) hideTips(); @@ -151,9 +151,9 @@ void Amarok::ToolTip::maybeTip( const TQPoint &pos ) void Amarok::ToolTip::showTip() { m_timer.start( 15000, true ); - if( !isVisible() || sizeHint() != size() ) + if( !isVisible() || tqsizeHint() != size() ) { - resize( sizeHint() ); + resize( tqsizeHint() ); position(); } if( !isVisible() ) @@ -167,7 +167,7 @@ void Amarok::ToolTip::hideTip() if( !isVisible() ) return; TQFrame::hide(); - TQToolTip::parentWidget()->update(); + TQToolTip::tqparentWidget()->update(); m_timer.stop(); s_hack = 0; } @@ -176,30 +176,30 @@ void Amarok::ToolTip::drawContents( TQPainter *painter ) { TQPixmap buf( width(), height() ); TQPainter p( &buf ); - buf.fill( colorGroup().background() ); + buf.fill( tqcolorGroup().background() ); - p.setPen( colorGroup().foreground() ); + p.setPen( tqcolorGroup().foreground() ); p.drawRect( buf.rect() ); - TQSimpleRichText text( s_text, TQToolTip::parentWidget()->font() ); + TQSimpleRichText text( s_text, TQToolTip::tqparentWidget()->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::parentWidget()->font() ); - text.draw( &p, pos.x(), pos.y(), rect(), colorGroup() ); + p.setFont( TQToolTip::tqparentWidget()->font() ); + text.draw( &p, pos.x(), pos.y(), rect(), tqcolorGroup() ); painter->drawPixmap( 0, 0, buf ); } -TQSize Amarok::ToolTip::sizeHint() const +TQSize Amarok::ToolTip::tqsizeHint() const { if( !s_rect.isNull() ) return s_rect.size(); else { - TQSimpleRichText text( s_text, TQToolTip::parentWidget()->font() ); + TQSimpleRichText text( s_text, TQToolTip::tqparentWidget()->font() ); text.setWidth( 500 ); //is this reasonable? return TQSize( text.widthUsed() - 2, text.height() ); } @@ -207,8 +207,8 @@ TQSize Amarok::ToolTip::sizeHint() const void Amarok::ToolTip::position() { - const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() ); - const TQSize size = sizeHint(); + const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::tqparentWidget() ); + const TQSize size = tqsizeHint(); const int width = size.width(), height = size.height(); TQPoint pos; if( !s_rect.isNull() ) @@ -221,7 +221,7 @@ void Amarok::ToolTip::position() } else { - const TQRect r = TQRect( TQToolTip::parentWidget()->mapToGlobal( TQToolTip::parentWidget()->pos() ), TQToolTip::parentWidget()->size() ); + const TQRect r = TQRect( TQToolTip::tqparentWidget()->mapToGlobal( TQToolTip::tqparentWidget()->pos() ), TQToolTip::tqparentWidget()->size() ); pos = r.bottomRight(); if( pos.y() + height > drect.bottom() ) pos.setY( kMax( drect.top(), r.top() - height ) ); diff --git a/amarok/src/tooltip.h b/amarok/src/tooltip.h index 5eb3020e..49968a64 100644 --- a/amarok/src/tooltip.h +++ b/amarok/src/tooltip.h @@ -31,16 +31,17 @@ namespace Amarok class ToolTipClient { public: - virtual QPair<TQString, TQRect> toolTipText( TQWidget *widget, const TQPoint &pos ) const = 0; + virtual TQPair<TQString, TQRect> toolTipText( TQWidget *widget, const TQPoint &pos ) const = 0; }; -class ToolTip: public TQFrame, public QToolTip +class ToolTip: public TQFrame, public TQToolTip { Q_OBJECT + TQ_OBJECT public: - static void add( ToolTipClient *client, TQWidget *parent ); - static void remove( TQWidget *parent ); + static void add( ToolTipClient *client, TQWidget *tqparent ); + static void remove( TQWidget *tqparent ); static void hideTips(); static TQString textFor( TQWidget *widget, const TQPoint &pos = TQPoint() ); static void updateTip(); @@ -50,7 +51,7 @@ private slots: void hideTip(); private: - ToolTip( ToolTipClient *client, TQWidget *parent ); + ToolTip( ToolTipClient *client, TQWidget *tqparent ); virtual ~ToolTip(); void position(); ToolTipClient *m_client; @@ -64,7 +65,7 @@ private: static Manager* s_manager; public: - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; protected: virtual void maybeTip( const TQPoint &pos ); diff --git a/amarok/src/trackpickerdialog.cpp b/amarok/src/trackpickerdialog.cpp index 5288a811..6de609e9 100644 --- a/amarok/src/trackpickerdialog.cpp +++ b/amarok/src/trackpickerdialog.cpp @@ -26,13 +26,13 @@ #include "trackpickerdialog.h" #include "trackpickerdialogbase.h" -#define NUMBER(x) (x == 0 ? TQString::null : TQString::number(x)) +#define NUMBER(x) (x == 0 ? TQString() : TQString::number(x)) class TrackPickerItem : public KListViewItem { public: - TrackPickerItem(KListView *parent, const KTRMResult &result) : - KListViewItem(parent, parent->lastChild(), + TrackPickerItem(KListView *tqparent, const KTRMResult &result) : + KListViewItem(tqparent, tqparent->lastChild(), result.title(), result.artist(), result.album(), NUMBER(result.track()), NUMBER(result.year())), m_result(result) { @@ -51,8 +51,8 @@ private: // public methods //////////////////////////////////////////////////////////////////////////////// -TrackPickerDialog::TrackPickerDialog(const TQString &name, const KTRMResultList &results, TQWidget *parent) - : KDialogBase(parent, name.latin1(), true, TQString::null, Ok | Cancel, Ok, true) +TrackPickerDialog::TrackPickerDialog(const TQString &name, const KTRMResultList &results, TQWidget *tqparent) + : KDialogBase(tqparent, name.latin1(), true, TQString(), Ok | Cancel, Ok, true) { kapp->setTopWidget( this ); setCaption( kapp->makeStdCaption( i18n("MusicBrainz Results") ) ); @@ -78,7 +78,7 @@ TrackPickerDialog::TrackPickerDialog(const TQString &name, const KTRMResultList m_base->trackList->setSelected(m_base->trackList->firstChild(), true); // m_base->trackList->triggerUpdate(); setMinimumWidth(kMax(300, width())); - connect(this, TQT_SIGNAL( sigSelectionMade( KTRMResult ) ), parent, TQT_SLOT( fillSelected( KTRMResult ) ) ); + connect(this, TQT_SIGNAL( sigSelectionMade( KTRMResult ) ), tqparent, TQT_SLOT( fillSelected( KTRMResult ) ) ); } diff --git a/amarok/src/trackpickerdialog.h b/amarok/src/trackpickerdialog.h index 5edea974..889ca86c 100644 --- a/amarok/src/trackpickerdialog.h +++ b/amarok/src/trackpickerdialog.h @@ -30,12 +30,13 @@ class TrackPickerDialogBase; class TrackPickerDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT signals: void sigSelectionMade( KTRMResult ); public: - TrackPickerDialog(const TQString &name, const KTRMResultList &results, TQWidget *parent = 0); + TrackPickerDialog(const TQString &name, const KTRMResultList &results, TQWidget *tqparent = 0); KTRMResult result() const; diff --git a/amarok/src/trackpickerdialogbase.ui b/amarok/src/trackpickerdialogbase.ui index 9f36c2c4..454175be 100644 --- a/amarok/src/trackpickerdialogbase.ui +++ b/amarok/src/trackpickerdialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TrackPickerDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>trackPickerDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>fileLayout</cstring> </property> @@ -27,21 +27,21 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>fileInfoGroup</cstring> </property> <property name="title"> <string>File Name</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>fileLabel</cstring> </property> @@ -53,7 +53,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="indent"> @@ -64,7 +64,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>trackLayout</cstring> </property> @@ -72,14 +72,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>trackInfoGroup</cstring> </property> <property name="title"> <string>Select Best Possible Match</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <vbox> @@ -175,7 +175,7 @@ <tabstops> <tabstop>trackList</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/amarok/src/tracktooltip.cpp b/amarok/src/tracktooltip.cpp index 8cdc4010..c6e7b1c5 100644 --- a/amarok/src/tracktooltip.cpp +++ b/amarok/src/tracktooltip.cpp @@ -60,7 +60,7 @@ TrackToolTip::TrackToolTip(): m_haspos( false ) void TrackToolTip::addToWidget( TQWidget *widget ) { - if( widget && !m_widgets.containsRef( widget ) ) + if( widget && !m_widgets.tqcontainsRef( widget ) ) { m_widgets.append( widget ); Amarok::ToolTip::add( this, widget ); @@ -69,7 +69,7 @@ void TrackToolTip::addToWidget( TQWidget *widget ) void TrackToolTip::removeFromWidget( TQWidget *widget ) { - if( widget && m_widgets.containsRef( widget ) ) + if( widget && m_widgets.tqcontainsRef( widget ) ) { Amarok::ToolTip::remove( widget ); m_widgets.removeRef( widget ); @@ -84,7 +84,7 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force ) if( force || m_tags != tags || m_tags.url() != tags.url() ) { m_haspos = false; - m_tooltip = TQString::null; + m_tooltip = TQString(); TQStringList left, right; const TQString tableRow = "<tr><td width=70 align=right>%1:</td><td align=left>%2</td></tr>"; @@ -114,14 +114,14 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force ) TQString s; for( int i = 0; i < rating / 2; ++i ) s += TQString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" ) - .arg( locate( "data", "amarok/images/star.png" ) ) - .arg( TQFontMetrics( TQToolTip::font() ).height() ) - .arg( TQFontMetrics( TQToolTip::font() ).height() ); + .tqarg( locate( "data", "amarok/images/star.png" ) ) + .tqarg( TQFontMetrics( TQToolTip::font() ).height() ) + .tqarg( TQFontMetrics( TQToolTip::font() ).height() ); if( rating % 2 ) s += TQString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" ) - .arg( locate( "data", "amarok/images/smallstar.png" ) ) - .arg( TQFontMetrics( TQToolTip::font() ).height() ) - .arg( TQFontMetrics( TQToolTip::font() ).height() ); + .tqarg( locate( "data", "amarok/images/smallstar.png" ) ) + .tqarg( TQFontMetrics( TQToolTip::font() ).height() ) + .tqarg( TQFontMetrics( TQToolTip::font() ).height() ); right << s; left << playlist->columnText( column ); } @@ -163,7 +163,7 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force ) } right << TQString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" ) - .arg( filename ).arg( height ).arg( MOODBAR_WIDTH ); + .tqarg( filename ).tqarg( height ).tqarg( MOODBAR_WIDTH ); } break; @@ -225,11 +225,11 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force ) m_tooltip += "%1"; //the cover gets substituted in, in tooltip() m_cover = CollectionDB::instance()->podcastImage( tags, true ); - if( m_cover.isEmpty() || m_cover.contains( "nocover" ) != -1 ) + if( m_cover.isEmpty() || m_cover.tqcontains( "nocover" ) != -1 ) { m_cover = CollectionDB::instance()->albumImage( tags, true, 150 ); if ( m_cover == CollectionDB::instance()->notAvailCover() ) - m_cover = TQString::null; + m_cover = TQString(); } m_tooltip += "<td><table cellpadding='0' cellspacing='0'>"; @@ -237,10 +237,10 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force ) if (tags.title().isEmpty() || tags.artist().isEmpty()) // no title or no artist, so we add prettyTitle m_tooltip += TQString ("<tr><td align=center colspan='2'>%1</td></tr>") - .arg(tags.veryNiceTitle()); + .tqarg(tags.veryNiceTitle()); for( uint x = 0; x < left.count(); ++x ) if ( !right[x].isEmpty() ) - m_tooltip += tableRow.arg( left[x] ).arg( right[x] ); + m_tooltip += tableRow.tqarg( left[x] ).tqarg( right[x] ); m_tooltip += "</table></td>"; m_tooltip += "</tr></table></center>"; @@ -262,7 +262,7 @@ void TrackToolTip::setPos( int pos ) void TrackToolTip::clear() { m_pos = 0; - m_cover = TQString::null; + m_cover = TQString(); m_tooltip = i18n( "Amarok - rediscover your music" ); m_tags = MetaBundle(); m_tags.setUrl( KURL() ); @@ -270,9 +270,9 @@ void TrackToolTip::clear() updateWidgets(); } -QPair<TQString, TQRect> TrackToolTip::toolTipText( TQWidget*, const TQPoint& ) const +TQPair<TQString, TQRect> TrackToolTip::toolTipText( TQWidget*, const TQPoint& ) const { - return QPair<TQString, TQRect>( tooltip(), TQRect() ); + return TQPair<TQString, TQRect>( tooltip(), TQRect() ); } void TrackToolTip::slotCoverChanged( const TQString &artist, const TQString &album ) @@ -281,7 +281,7 @@ void TrackToolTip::slotCoverChanged( const TQString &artist, const TQString &alb { m_cover = CollectionDB::instance()->albumImage( m_tags, true, 150 ); if( m_cover == CollectionDB::instance()->notAvailCover() ) - m_cover = TQString::null; + m_cover = TQString(); updateWidgets(); } @@ -293,13 +293,13 @@ void TrackToolTip::slotImageChanged( const TQString &remoteURL ) if( CollectionDB::instance()->getPodcastEpisodeBundle( m_tags.url().url(), &peb ) ) { PodcastChannelBundle pcb; - if( CollectionDB::instance()->getPodcastChannelBundle( peb.parent().url(), &pcb ) ) + if( CollectionDB::instance()->getPodcastChannelBundle( peb.tqparent().url(), &pcb ) ) { if( pcb.imageURL().url() == remoteURL ) { m_cover = CollectionDB::instance()->podcastImage( remoteURL ); if( m_cover == CollectionDB::instance()->notAvailCover() ) - m_cover = TQString::null; + m_cover = TQString(); updateWidgets(); } @@ -318,7 +318,7 @@ void TrackToolTip::slotMoodbarEvent( void ) { // Clear this so the moodbar gets redrawn - m_moodbarURL = TQString::null; + m_moodbarURL = TQString(); // Reset the moodbar in case AlterMood has changed m_tags.moodbar().reset(); @@ -332,13 +332,13 @@ TQString TrackToolTip::tooltip() const if( !m_tags.isEmpty() ) { if( !m_cover.isEmpty() ) - tip = tip.arg( TQString( "<td><table cellpadding='0' cellspacing='0'><tr><td>" + tip = tip.tqarg( TQString( "<td><table cellpadding='0' cellspacing='0'><tr><td>" "<img src='%1'>" - "</td></tr></table></td>" ).arg( m_cover ) ); + "</td></tr></table></td>" ).tqarg( m_cover ) ); else - tip = tip.arg(""); + tip = tip.tqarg(""); if( m_haspos ) - tip = tip.arg( MetaBundle::prettyLength( m_pos / 1000, true ) ); + tip = tip.tqarg( MetaBundle::prettyLength( m_pos / 1000, true ) ); } return tip; } diff --git a/amarok/src/tracktooltip.h b/amarok/src/tracktooltip.h index 196b8a41..9730155b 100644 --- a/amarok/src/tracktooltip.h +++ b/amarok/src/tracktooltip.h @@ -26,6 +26,7 @@ class TQWidget; class TrackToolTip: public TQObject, public Amarok::ToolTipClient { Q_OBJECT + TQ_OBJECT public: TrackToolTip(); @@ -39,12 +40,12 @@ class TrackToolTip: public TQObject, public Amarok::ToolTipClient void clear(); public: - virtual QPair<TQString, TQRect> toolTipText( TQWidget*, const TQPoint& ) const; + virtual TQPair<TQString, TQRect> toolTipText( TQWidget*, const TQPoint& ) const; private slots: void slotCoverChanged( const TQString &artist, const TQString &album ); void slotImageChanged( const TQString &remoteURL ); - void slotUpdate( const TQString &url = TQString::null ); + void slotUpdate( const TQString &url = TQString() ); void slotMoodbarEvent( void ); private: diff --git a/amarok/src/transferdialog.cpp b/amarok/src/transferdialog.cpp index 27d346d3..3a044315 100644 --- a/amarok/src/transferdialog.cpp +++ b/amarok/src/transferdialog.cpp @@ -28,7 +28,7 @@ #include <kpushbutton.h> TransferDialog::TransferDialog( MediaDevice *mdev ) - : KDialogBase( Amarok::mainWindow(), "transferdialog", true, TQString::null, Ok|Cancel, Ok ) + : KDialogBase( Amarok::mainWindow(), "transferdialog", true, TQString(), Ok|Cancel, Ok ) { m_dev = mdev; m_accepted = false; @@ -45,13 +45,13 @@ TransferDialog::TransferDialog( MediaDevice *mdev ) TQGroupBox *location = new TQGroupBox( 1, Qt::Vertical, i18n( "Music Location" ), vbox ); new TQLabel( i18n( "Your music will be transferred to:\n%1" ) - .arg( transferDir ), location ); + .tqarg( transferDir ), location ); TQVBox *vbox2 = new TQVBox( vbox ); TQSpacerItem *spacer = new TQSpacerItem( 0, 25 ); - TQLayout *vlayout = vbox2->layout(); - if( vlayout ) - vlayout->addItem( spacer ); + TQLayout *vtqlayout = vbox2->tqlayout(); + if( vtqlayout ) + vtqlayout->addItem( spacer ); new TQLabel( i18n( "You can have your music automatically grouped in\n" "a variety of ways. Each grouping will create\n" @@ -94,9 +94,9 @@ TransferDialog::TransferDialog( MediaDevice *mdev ) TQVBox *vbox3 = new TQVBox( vbox ); TQSpacerItem *spacer2 = new TQSpacerItem( 0, 25 ); - TQLayout *vlayout2 = vbox3->layout(); - if( vlayout2 ) - vlayout2->addItem( spacer2 ); + TQLayout *vtqlayout2 = vbox3->tqlayout(); + if( vtqlayout2 ) + vtqlayout2->addItem( spacer2 ); TQGroupBox *options = new TQGroupBox( 6, Qt::Vertical, i18n( "Options" ), vbox ); diff --git a/amarok/src/transferdialog.h b/amarok/src/transferdialog.h index d9a5c03f..44194b9e 100644 --- a/amarok/src/transferdialog.h +++ b/amarok/src/transferdialog.h @@ -29,6 +29,7 @@ class TransferDialog; class LIBAMAROK_EXPORT TransferDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: TransferDialog( MediaDevice* mdev ); diff --git a/amarok/src/vis/libvisual/CMakeLists.txt b/amarok/src/vis/libvisual/CMakeLists.txt index 9fa31334..35a2da60 100644 --- a/amarok/src/vis/libvisual/CMakeLists.txt +++ b/amarok/src/vis/libvisual/CMakeLists.txt @@ -29,6 +29,6 @@ link_directories( tde_add_executable( amarok_libvisual SOURCES libvisual.cpp - LINK ${SDL_LIBRARIES} ${LIBVISUAL_LIBRARIES} + LINK ${TQT_LIBRARIES} ${SDL_LIBRARIES} ${LIBVISUAL_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/amarok/src/xmlloader.cpp b/amarok/src/xmlloader.cpp index 5793e9de..9313cb3b 100644 --- a/amarok/src/xmlloader.cpp +++ b/amarok/src/xmlloader.cpp @@ -67,7 +67,7 @@ void MetaBundle::XmlLoader::newAttribute( const TQString &key, const TQString &v else if( key == "compilation" ) m_bundle.setCompilation( MetaBundle::CompilationYes ); else - m_attributes << QPair<TQString, TQString>( key, value ); + m_attributes << TQPair<TQString, TQString>( key, value ); } void MetaBundle::XmlLoader::newTag( const TQString &name, const TQString &value ) @@ -165,7 +165,7 @@ bool MetaBundle::XmlLoader::startElement( const TQString &, const TQString &loca for( int i = 0, n = atts.count(); i < n; ++i ) newAttribute( atts.localName( i ), atts.value( i ) ); - m_currentElement = TQString::null; + m_currentElement = TQString(); } else m_currentElement = localName; @@ -184,7 +184,7 @@ bool MetaBundle::XmlLoader::endElement( const TQString &, const TQString &localN return false; } - m_currentElement = TQString::null; + m_currentElement = TQString(); return true; } @@ -213,7 +213,7 @@ bool MetaBundle::XmlLoader::fatalError( const TQXmlParseException &e ) bundleLoaded(); m_lastError = TQString( "Error loading XML: \"%1\", at line %2, column %3." ) - .arg( e.message(), TQString::number( e.lineNumber() ), TQString::number( e.columnNumber() ) ); + .tqarg( e.message(), TQString::number( e.lineNumber() ), TQString::number( e.columnNumber() ) ); errorEncountered( e.message(), e.lineNumber(), e.columnNumber() ); return false; diff --git a/amarok/src/xmlloader.h b/amarok/src/xmlloader.h index f85db8bc..c832a468 100644 --- a/amarok/src/xmlloader.h +++ b/amarok/src/xmlloader.h @@ -44,15 +44,16 @@ */ /** The type used for extra XML attributes not recognized. */ -typedef TQValueList< QPair<TQString, TQString> > XmlAttributeList; +typedef TQValueList< TQPair<TQString, TQString> > XmlAttributeList; -class MetaBundle::XmlLoader: public TQObject, public QXmlDefaultHandler +class MetaBundle::XmlLoader: public TQObject, public TQXmlDefaultHandler { Q_OBJECT + TQ_OBJECT public: /** Posted when a MetaBundle has been loaded. */ - class BundleLoadedEvent: public QCustomEvent + class BundleLoadedEvent: public TQCustomEvent { public: /** The type() of BundleLoadedEvents. */ @@ -68,7 +69,7 @@ class MetaBundle::XmlLoader: public TQObject, public QXmlDefaultHandler MetaBundle bundle; /** Any extra attributes not recognized. */ - TQValueList< QPair<TQString, TQString> > extraAttributes; + TQValueList< TQPair<TQString, TQString> > extraAttributes; public: BundleLoadedEvent( const MetaBundle &b, const XmlAttributeList &a ) @@ -171,7 +172,7 @@ class MetaBundle::XmlLoader: public TQObject, public QXmlDefaultHandler virtual bool endDocument(); virtual bool fatalError( const TQXmlParseException &exception ); - public: //fucking moc, these should be private + public: //fucking tqmoc, these should be private class ThreadedLoader; class SimpleLoader; }; diff --git a/amarok/src/xmlloader_p.h b/amarok/src/xmlloader_p.h index 925676bc..54b91849 100644 --- a/amarok/src/xmlloader_p.h +++ b/amarok/src/xmlloader_p.h @@ -23,9 +23,10 @@ #include <tqapplication.h> #include <tqthread.h> -class MetaBundle::XmlLoader::ThreadedLoader: public TQObject, public QThread +class MetaBundle::XmlLoader::ThreadedLoader: public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT TQObject *m_target; TQXmlInputSource *m_source; @@ -54,9 +55,10 @@ class MetaBundle::XmlLoader::ThreadedLoader: public TQObject, public QThread } }; -class MetaBundle::XmlLoader::SimpleLoader: public QObject +class MetaBundle::XmlLoader::SimpleLoader: public TQObject { Q_OBJECT + TQ_OBJECT public: BundleList bundles; diff --git a/amarok/src/xspfplaylist.cpp b/amarok/src/xspfplaylist.cpp index beb1f388..16592edf 100644 --- a/amarok/src/xspfplaylist.cpp +++ b/amarok/src/xspfplaylist.cpp @@ -39,19 +39,19 @@ XSPFPlaylist::loadXSPF( TQTextStream &stream ) return true; } -QString +TQString XSPFPlaylist::title() { return documentElement().namedItem( "title" ).firstChild().nodeValue(); } -QString +TQString XSPFPlaylist::creator() { return documentElement().namedItem( "creator" ).firstChild().nodeValue(); } -QString +TQString XSPFPlaylist::annotation() { return documentElement().namedItem( "annotation" ).firstChild().nodeValue(); @@ -69,7 +69,7 @@ XSPFPlaylist::location() return KURL::fromPathOrURL( documentElement().namedItem( "location" ).firstChild().nodeValue() ); } -QString +TQString XSPFPlaylist::identifier() { return documentElement().namedItem( "identifier" ).firstChild().nodeValue(); @@ -81,7 +81,7 @@ XSPFPlaylist::image() return KURL::fromPathOrURL( documentElement().namedItem( "image" ).firstChild().nodeValue() ); } -QDateTime +TQDateTime XSPFPlaylist::date() { return TQDateTime::fromString( documentElement().namedItem( "date" ).firstChild().nodeValue(), Qt::ISODate ); @@ -129,7 +129,7 @@ XSPFPlaylist::setTitle( TQString title ) documentElement().insertBefore( node, documentElement().namedItem( "trackList" ) ); } else - documentElement().namedItem( "title" ).replaceChild( createTextNode( title ), documentElement().namedItem( "title" ).firstChild() ); + documentElement().namedItem( "title" ).tqreplaceChild( createTextNode( title ), documentElement().namedItem( "title" ).firstChild() ); } void @@ -143,7 +143,7 @@ XSPFPlaylist::setCreator( TQString creator ) documentElement().insertBefore( node, documentElement().namedItem( "trackList" ) ); } else - documentElement().namedItem( "creator" ).replaceChild( createTextNode( creator ), documentElement().namedItem( "creator" ).firstChild() ); + documentElement().namedItem( "creator" ).tqreplaceChild( createTextNode( creator ), documentElement().namedItem( "creator" ).firstChild() ); } void @@ -157,7 +157,7 @@ XSPFPlaylist::setAnnotation( TQString annotation ) documentElement().insertBefore( node, documentElement().namedItem( "trackList" ) ); } else - documentElement().namedItem( "annotation" ).replaceChild( createTextNode( annotation ), documentElement().namedItem( "annotation" ).firstChild() ); + documentElement().namedItem( "annotation" ).tqreplaceChild( createTextNode( annotation ), documentElement().namedItem( "annotation" ).firstChild() ); } void @@ -171,7 +171,7 @@ XSPFPlaylist::setInfo( KURL info ) documentElement().insertBefore( node, documentElement().namedItem( "trackList" ) ); } else - documentElement().namedItem( "info" ).replaceChild( createTextNode( info.url() ), documentElement().namedItem( "info" ).firstChild() ); + documentElement().namedItem( "info" ).tqreplaceChild( createTextNode( info.url() ), documentElement().namedItem( "info" ).firstChild() ); } void @@ -185,7 +185,7 @@ XSPFPlaylist::setLocation( KURL location ) documentElement().insertBefore( node, documentElement().namedItem( "trackList" ) ); } else - documentElement().namedItem( "location" ).replaceChild( createTextNode( location.url() ), documentElement().namedItem( "location" ).firstChild() ); + documentElement().namedItem( "location" ).tqreplaceChild( createTextNode( location.url() ), documentElement().namedItem( "location" ).firstChild() ); } void @@ -199,7 +199,7 @@ XSPFPlaylist::setIdentifier( TQString identifier ) documentElement().insertBefore( node, documentElement().namedItem( "trackList" ) ); } else - documentElement().namedItem( "identifier" ).replaceChild( createTextNode( identifier ), documentElement().namedItem( "identifier" ).firstChild() ); + documentElement().namedItem( "identifier" ).tqreplaceChild( createTextNode( identifier ), documentElement().namedItem( "identifier" ).firstChild() ); } void @@ -213,7 +213,7 @@ XSPFPlaylist::setImage( KURL image ) documentElement().insertBefore( node, documentElement().namedItem( "trackList" ) ); } else - documentElement().namedItem( "image" ).replaceChild( createTextNode( image.url() ), documentElement().namedItem( "image" ).firstChild() ); + documentElement().namedItem( "image" ).tqreplaceChild( createTextNode( image.url() ), documentElement().namedItem( "image" ).firstChild() ); } void @@ -230,7 +230,7 @@ XSPFPlaylist::setDate( TQDateTime date ) documentElement().insertBefore( node, documentElement().namedItem( "trackList" ) ); } else - documentElement().namedItem( "date" ).replaceChild( createTextNode( date.toString( "yyyy-MM-ddThh:mm:ss" ) ), documentElement().namedItem( "date" ).firstChild() ); + documentElement().namedItem( "date" ).tqreplaceChild( createTextNode( date.toString( "yyyy-MM-ddThh:mm:ss" ) ), documentElement().namedItem( "date" ).firstChild() ); } void @@ -244,7 +244,7 @@ XSPFPlaylist::setLicense( KURL license ) documentElement().insertBefore( node, documentElement().namedItem( "trackList" ) ); } else - documentElement().namedItem( "license" ).replaceChild( createTextNode( license.url() ), documentElement().namedItem( "license" ).firstChild() ); + documentElement().namedItem( "license" ).tqreplaceChild( createTextNode( license.url() ), documentElement().namedItem( "license" ).firstChild() ); } void @@ -267,7 +267,7 @@ XSPFPlaylist::setAttribution( KURL attribution, bool append ) TQDomNode subSubNode = createTextNode( attribution.url() ); subNode.appendChild( subSubNode ); node.appendChild( subNode ); - documentElement().replaceChild( node, documentElement().namedItem( "attribution" ) ); + documentElement().tqreplaceChild( node, documentElement().namedItem( "attribution" ) ); } } @@ -282,7 +282,7 @@ XSPFPlaylist::setLink( KURL link ) documentElement().insertBefore( node, documentElement().namedItem( "trackList" ) ); } else - documentElement().namedItem( "link" ).replaceChild( createTextNode( link.url() ), documentElement().namedItem( "link" ).firstChild() ); + documentElement().namedItem( "link" ).tqreplaceChild( createTextNode( link.url() ), documentElement().namedItem( "link" ).firstChild() ); } @@ -425,7 +425,7 @@ XSPFPlaylist::setTrackList( XSPFtrackList trackList, bool append ) } } else - documentElement().replaceChild( node, documentElement().namedItem( "trackList" ) ); + documentElement().tqreplaceChild( node, documentElement().namedItem( "trackList" ) ); } diff --git a/amarok/src/xspfplaylist.h b/amarok/src/xspfplaylist.h index 48cb815d..522eff21 100644 --- a/amarok/src/xspfplaylist.h +++ b/amarok/src/xspfplaylist.h @@ -39,7 +39,7 @@ typedef struct { typedef TQValueList < XSPFtrack > XSPFtrackList; -class XSPFPlaylist : public QDomDocument +class XSPFPlaylist : public TQDomDocument { public: XSPFPlaylist(); |