From f59dfa08651a47f21d004e8e4cb5020b8035287e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345. --- noatun/modules/kaiman/SKIN-SPECS | 10 +++++----- noatun/modules/kaiman/pref.cpp | 2 +- noatun/modules/kaiman/skins/circle/README | 4 ++-- noatun/modules/kaiman/skins/circle/skindata | 6 +++--- noatun/modules/kaiman/skins/circle/skindata_alt | 6 +++--- noatun/modules/kaiman/style.cpp | 26 ++++++++++++------------- noatun/modules/kaiman/style.h | 2 +- noatun/modules/kaiman/userinterface.cpp | 18 ++++++++--------- 8 files changed, 37 insertions(+), 37 deletions(-) (limited to 'noatun/modules/kaiman') diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS index ae293014..7cfc61e2 100644 --- a/noatun/modules/kaiman/SKIN-SPECS +++ b/noatun/modules/kaiman/SKIN-SPECS @@ -56,7 +56,7 @@ options in the event that options are added to the skin spec in the future. PROPER TRANSPARENCY: The main background image uses a threshold of 1 (out of 256 levels) for the -window shape, the rest is used for partially overwiting the background when +window tqshape, the rest is used for partially overwiting the background when the Transparency option is true. Portions of items, buttons, sliders, numbers, and text that never change and @@ -80,7 +80,7 @@ Background: filename filename The background image file, the window will be the same size as this image. - Add transparency to this image for shaped skins, the cutoff threshold for + Add transparency to this image for tqshaped skins, the cutoff threshold for transparency is 1 on images with muli-level alpha (like in png). Transparency: flag @@ -95,7 +95,7 @@ Mask: filename (this is DEPRECATED!, for transparent skins just add transparency to the Background image, Mask remains merely for backwards compatibility) filename - The mask image file, only needed for skins which are shaped windows (not + The mask image file, only needed for skins which are tqshaped windows (not rectangular). Contains a transparency mask for the main window. ========================== @@ -185,7 +185,7 @@ Preset_1_/.../Preset_10_Button: filename prelight x y [clip_filename] Items (with fixed number sections) ========================== -Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/Status/ +Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/tqStatus/ Minus/Total_Item: filename x y filename @@ -401,7 +401,7 @@ Option line: | # images | Normal | Pressed | Prelit | Items (all item images contained vertically) -------------------------- -Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/Status/Minus/Total_Item: filename x y +Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/tqStatus/Minus/Total_Item: filename x y Item: | # images | Image 1 | Image 2 | Image 3 | Image 4 | Image 5 | | total | | | | | | diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index bc3222d5..1077613b 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include #include diff --git a/noatun/modules/kaiman/skins/circle/README b/noatun/modules/kaiman/skins/circle/README index d80082af..a39fff38 100644 --- a/noatun/modules/kaiman/skins/circle/README +++ b/noatun/modules/kaiman/skins/circle/README @@ -3,8 +3,8 @@ Author: Johne Ellis Released: November 25, 1998 Version: 1.0 URL: http://www.geocities.com/SiliconValley/Haven/5235 -Comments: Skin with a doughnut shape to test shaped windows. - (skins with a shape mask) +Comments: Skin with a doughnut tqshape to test tqshaped windows. + (skins with a tqshape mask) Note: For transparency to work, GQmpeg 0.4.2 is required. Previous versions will work, but will be _ugly_. diff --git a/noatun/modules/kaiman/skins/circle/skindata b/noatun/modules/kaiman/skins/circle/skindata index 25268d22..8dba21db 100644 --- a/noatun/modules/kaiman/skins/circle/skindata +++ b/noatun/modules/kaiman/skins/circle/skindata @@ -6,15 +6,15 @@ #Released: November 25, 1998 #Author: John Ellis #URL: http://www.geocities.com/SiliconValley/Haven/5235/ -#Comments: Skin with a doughnut shape to test shaped windows. -# (skins with a shape mask) +#Comments: Skin with a doughnut tqshape to test tqshaped windows. +# (skins with a tqshape mask) #run 'gqmpeg -skinhelp' for help with coordinates. #simply comment out items you do not want to display #only Background is required. Background: back.png -#Mask is an image with transparency used to define a shaped window +#Mask is an image with transparency used to define a tqshaped window Mask: back_mask.png #Title: filename length x y diff --git a/noatun/modules/kaiman/skins/circle/skindata_alt b/noatun/modules/kaiman/skins/circle/skindata_alt index fb3e97f5..42661e81 100644 --- a/noatun/modules/kaiman/skins/circle/skindata_alt +++ b/noatun/modules/kaiman/skins/circle/skindata_alt @@ -6,15 +6,15 @@ #Released: November 25, 1998 #Author: John Ellis #URL: http://www.geocities.com/SiliconValley/Haven/5235/ -#Comments: Skin with a doughnut shape to test shaped windows. -# (skins with a shape mask) +#Comments: Skin with a doughnut tqshape to test tqshaped windows. +# (skins with a tqshape mask) #run 'gqmpeg -skinhelp' for help with coordinates. #simply comment out items you do not want to display #only Background is required. Background: back_sm.png -#Mask is an image with transparency used to define a shaped window +#Mask is an image with transparency used to define a tqshaped window Mask: back_sm_mask.png #Title: filename length x y diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index dbfcea6c..bbf55cb3 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -160,7 +160,7 @@ void KaimanStyleElement::setPixmap( int num ) if ( num<0 ) num = 0; _currentPixmap = num; - repaint( FALSE ); + tqrepaint( FALSE ); } } @@ -321,7 +321,7 @@ void KaimanStyleButton::updateButtonState() { } setPixmap( *I_pmIndex[i_i_currentState] ); - repaint(); + tqrepaint(); } @@ -349,7 +349,7 @@ void KaimanStyleSlider::setValue( int value ) if (value>_max) value=_max; if (value<_min) value=_min; _value = value; - repaint(); + tqrepaint(); } @@ -359,7 +359,7 @@ void KaimanStyleSlider::setValue( int value, int min, int max ) _min = min; _max = max; setValue( value ); - repaint(); + tqrepaint(); } } @@ -413,7 +413,7 @@ void KaimanStyleSlider::mouseReleaseEvent(TQMouseEvent *qme) { _down = false; releaseMouse(); - repaint(); + tqrepaint(); setValue( pos2value(qme->x(), qme->y()) ); emit newValue( value() ); @@ -465,7 +465,7 @@ void KaimanStyleSlider::enterEvent ( TQEvent * e ) if ( !_lit && optionPrelight ) { _lit = true; - repaint(); + tqrepaint(); } KaimanStyleMasked::enterEvent( e ); @@ -476,7 +476,7 @@ void KaimanStyleSlider::leaveEvent ( TQEvent * e ) if ( _lit ) { _lit = false; - repaint(); + tqrepaint(); } KaimanStyleMasked::leaveEvent( e ); @@ -522,7 +522,7 @@ void KaimanStyleBackground::mouseMoveEvent(TQMouseEvent *qme) void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme) { - // On the background we move the shaped toplevel around + // On the background we move the tqshaped toplevel around if (!i_b_move) { i_point_dragStart = qme->pos(); i_point_lastPos = qme->globalPos(); @@ -599,7 +599,7 @@ void KaimanStyleNumber::setValue( int value ) if ( _value!=value ) { _value = value; - repaint(); + tqrepaint(); } } @@ -667,7 +667,7 @@ void KaimanStyleText::setValue( TQString value ) _pos = 0; _direction = 1; _value = value; - repaint(); + tqrepaint(); } } @@ -698,7 +698,7 @@ void KaimanStyleText::timeout() // check new position if ( _pos+_direction>=0 && (int)_value.length()-(_pos+_direction)>=digits ) { _pos += _direction; - repaint(); + tqrepaint(); } _timer->start( _delay, TRUE ); @@ -1456,7 +1456,7 @@ bool KaimanStyle::loadPixmaps() if ( (l_pixmap_Background != 0) && (l_pixmap_Mask != 0) ) { - // OK, background and mask are defined. So now I can calculate the shape + // OK, background and mask are defined. So now I can calculate the tqshape int l_i_width_Mask = l_pixmap_Mask->width(); int l_i_height_Mask = l_pixmap_Mask->height(); diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h index 19d44b98..5d3bfcdb 100644 --- a/noatun/modules/kaiman/style.h +++ b/noatun/modules/kaiman/style.h @@ -346,7 +346,7 @@ private: TQString i_s_styleBase; - // The mask of the complete style. Used for doing shaped windows + // The mask of the complete style. Used for doing tqshaped windows TQBitmap i_bitmap_Mask; /// All style elements are stored here. diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index 3d1791ec..a8b241f7 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -88,10 +88,10 @@ Kaiman::Kaiman() if ( !changeStyle(skinName, "skindata") ) { - KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").arg(skinName) ); + KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").tqarg(skinName) ); if ( !changeStyle( DEFAULT_SKIN, "skindata" ) ) { - KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) ); + KMessageBox::error( this, i18n("Cannot load default skin %1.").tqarg(DEFAULT_SKIN) ); TQTimer::singleShot( 0, this, TQT_SLOT(close()) ); return; } @@ -159,7 +159,7 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) if ( _style->Mask() != 0 ) { - // Set the shaped window form + // Set the tqshaped window form XShapeCombineMask( qt_xdisplay(), winId(), ShapeBounding, 0,0, _style->Mask()->handle(), ShapeSet ); } @@ -335,13 +335,13 @@ void Kaiman::toggleSkin() TQString oldDesc, newDesc; if ( _altSkin ) { - oldDesc = TQString::fromLatin1("skindata"); - newDesc = TQString::fromLatin1("alt_skindata"); + oldDesc = TQString::tqfromLatin1("skindata"); + newDesc = TQString::tqfromLatin1("alt_skindata"); } else { - newDesc = TQString::fromLatin1("skindata"); - oldDesc = TQString::fromLatin1("alt_skindata"); + newDesc = TQString::tqfromLatin1("skindata"); + oldDesc = TQString::tqfromLatin1("alt_skindata"); } if ( !changeStyle(skinName, newDesc) ) @@ -372,7 +372,7 @@ void Kaiman::volumeDown() void Kaiman::execMixer() { - kapp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString() ); + kapp->startServiceByDesktopName ( TQString::tqfromLatin1("kmix"), TQString() ); } @@ -520,7 +520,7 @@ void Kaiman::newSong() if ( title.isEmpty() ) title = napp->player()->current().file(); - title = i18n("TITLE (LENGTH)", "%1 (%2)").arg(title, + title = i18n("TITLE (LENGTH)", "%1 (%2)").tqarg(title, napp->player()->current().lengthString()); } titleItem->setValue( title ); -- cgit v1.2.1