From 48989665dd045400121be9592c525a6731238573 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 5 May 2012 11:31:42 +0200 Subject: RHEL/Fedora: kaffeine fix (again) --- ...error_out_if_critical_osd_defines_not_set.patch | 25 + .../kaffeine-3.5.13-fix_slow_dvb_start.patch | 97 ++++ ...affeine-3.5.13-rename_obsolete_tq_methods.patch | 643 +++++++++++++++++++++ .../kaffeine-3.5.13-renames_a_few_stragglers.patch | 30 + ...error_out_if_critical_osd_defines_not_set.patch | 25 - .../kdebase-3.5.13-fix_slow_dvb_start.patch | 97 ---- ...kdebase-3.5.13-rename_obsolete_tq_methods.patch | 643 --------------------- .../kdebase-3.5.13-renames_a_few_stragglers.patch | 30 - redhat/applications/kaffeine/trinity-kaffeine.spec | 2 +- 9 files changed, 796 insertions(+), 796 deletions(-) create mode 100644 redhat/applications/kaffeine/kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch create mode 100644 redhat/applications/kaffeine/kaffeine-3.5.13-fix_slow_dvb_start.patch create mode 100644 redhat/applications/kaffeine/kaffeine-3.5.13-rename_obsolete_tq_methods.patch create mode 100644 redhat/applications/kaffeine/kaffeine-3.5.13-renames_a_few_stragglers.patch delete mode 100644 redhat/applications/kaffeine/kdebase-3.5.13-error_out_if_critical_osd_defines_not_set.patch delete mode 100644 redhat/applications/kaffeine/kdebase-3.5.13-fix_slow_dvb_start.patch delete mode 100644 redhat/applications/kaffeine/kdebase-3.5.13-rename_obsolete_tq_methods.patch delete mode 100644 redhat/applications/kaffeine/kdebase-3.5.13-renames_a_few_stragglers.patch (limited to 'redhat/applications') diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch new file mode 100644 index 000000000..9c01d1056 --- /dev/null +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch @@ -0,0 +1,25 @@ +commit 25b89439bbdcbc245b2a4125d2345afaa32fb952 +Author: Timothy Pearson +Date: 1326858742 -0600 + + Error out if critical OSD-related defines are not set + +diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +index acc9937..68d47ac 100644 +--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp ++++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +@@ -1513,6 +1513,14 @@ bool KXineWidget::playDvb() + return true; + } + ++#ifndef Q_BYTE_ORDER ++#error Q_BYTE_ORDER is not defined! ++#endif ++ ++#ifndef TQ_LITTLE_ENDIAN ++#error TQ_LITTLE_ENDIAN is not defined! ++#endif ++ + #if Q_BYTE_ORDER == TQ_LITTLE_ENDIAN + #define rgb2yuv(R,G,B) ((((((66*R+129*G+25*B+128)>>8)+16)<<8)|(((112*R-94*G-18*B+128)>>8)+128))<<8|(((-38*R-74*G+112*B+128)>>8)+128)) + #else diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_slow_dvb_start.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_slow_dvb_start.patch new file mode 100644 index 000000000..71b71cc6e --- /dev/null +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_slow_dvb_start.patch @@ -0,0 +1,97 @@ +commit fd68e4c4940afb4529b16e2c3e3d0f379ac7b161 +Author: Darrell Anderson +Date: 1331343133 -0600 + + Fix nominal "tqt" typos and fix slow DVB start. + This closes bug reports 729 and 899. + +diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp +index 96752aa..32c8817 100644 +--- a/kaffeine/src/player-parts/gstreamer-part/video.cpp ++++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp +@@ -232,7 +232,7 @@ void VideoWindow::correctByAspectRatio( TQSize& frame ) + case FOURBYTHREE: factor = 4.0 / 3.0; break; + case ANAMORPHIC: factor = 16.0 / 9.0; break; + case DVB: factor = 2.11; break; +- case STQUARE: factor = 1.0; break; ++ case SQUARE: factor = 1.0; break; + } + + float frameAspect = (float)frame.width() / (float)frame.height(); +@@ -291,7 +291,7 @@ void VideoWindow::slotAspectRatioDVB() + + void VideoWindow::slotAspectRatioSquare() + { +- m_aspectRatio = STQUARE; ++ m_aspectRatio = SQUARE; + TQSize frame = getFrameSize(); + correctByAspectRatio( frame ); + emit signalNewFrameSize( frame ); +diff --git a/kaffeine/src/player-parts/gstreamer-part/video.h b/kaffeine/src/player-parts/gstreamer-part/video.h +index c4d9f74..f7c5180 100644 +--- a/kaffeine/src/player-parts/gstreamer-part/video.h ++++ b/kaffeine/src/player-parts/gstreamer-part/video.h +@@ -47,7 +47,7 @@ public: + FOURBYTHREE, + ANAMORPHIC, + DVB, +- STQUARE ++ SQUARE + }; + + void newState(); +diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.h b/kaffeine/src/player-parts/xine-part/deinterlacequality.h +index edc2fa9..6987de3 100644 +--- a/kaffeine/src/player-parts/xine-part/deinterlacequality.h ++++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.h +@@ -18,8 +18,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#ifndef DEINTERLACETQUALITY_H +-#define DEINTERLACETQUALITY_H ++#ifndef DEINTERLACEQUALITY_H ++#define DEINTERLACEQUALITY_H + + #include + +@@ -77,4 +77,4 @@ private: + KPushButton* m_customConfigButton; + }; + +-#endif /* DEINTERLACETQUALITY_H */ ++#endif /* DEINTERLACEQUALITY_H */ +diff --git a/kaffeine/src/player-parts/xine-part/equalizer.h b/kaffeine/src/player-parts/xine-part/equalizer.h +index 7d43ec0..2e81096 100644 +--- a/kaffeine/src/player-parts/xine-part/equalizer.h ++++ b/kaffeine/src/player-parts/xine-part/equalizer.h +@@ -18,8 +18,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#ifndef ETQUALIZER_H +-#define ETQUALIZER_H ++#ifndef EQUALIZER_H ++#define EQUALIZER_H + + #include + #include +@@ -77,4 +77,4 @@ private: + TQSlider* eq16kSlider; + }; + +-#endif /* ETQUALIZER_H */ ++#endif /* EQUALIZER_H */ +diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +index 68d47ac..ab87338 100644 +--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp ++++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +@@ -3889,7 +3889,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide + break; + default: + warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").arg(ratio)); +- case XINE_VO_ASPECT_STQUARE: ++ case XINE_VO_ASPECT_SQUARE: + debugOut("Screenshot: got video aspect: 1:1"); + desired_ratio = image_ratio; + break; diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-rename_obsolete_tq_methods.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-rename_obsolete_tq_methods.patch new file mode 100644 index 000000000..a60af902e --- /dev/null +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-rename_obsolete_tq_methods.patch @@ -0,0 +1,643 @@ +commit 66805bafb9e1db535090dd74f6bdc56c2ac431c0 +Author: Timothy Pearson +Date: 1324497848 -0600 + + Rename obsolete tq methods to standard names + +diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp +index e67603e..c48cf28 100644 +--- a/kaffeine/src/input/audiobrowser/playlist.cpp ++++ b/kaffeine/src/input/audiobrowser/playlist.cpp +@@ -169,10 +169,10 @@ struct CoverPopup : public TQWidget + CoverPopup(const TQPixmap &image, const TQPoint &p) : + TQWidget(0, 0, WDestructiveClose | WX11BypassWM) + { +- TQHBoxLayout *tqlayout = new TQHBoxLayout(this); ++ TQHBoxLayout *layout = new TQHBoxLayout(this); + TQLabel *label = new TQLabel(this); + +- tqlayout->addWidget(label); ++ layout->addWidget(label); + label->setFrameStyle(TQFrame::Box | TQFrame::Raised); + label->setLineWidth(1); + label->setPixmap(image); +@@ -342,7 +342,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : + KIO::NetAccess::mkdir(m_playlistDirectory, mainWidget); + kdDebug() << "PLAYLIST" << endl; + +- TQGridLayout* tqlayout = new TQGridLayout( playlist, 4, 2, 3 ); ++ TQGridLayout* layout = new TQGridLayout( playlist, 4, 2, 3 ); + + m_list = new UrlListView(playlist); + mainWidget->setAcceptDrops(true); +@@ -379,12 +379,12 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : + m_list->setRenameable(TRACK_COLUMN); + m_list->setAllColumnsShowFocus(true); + m_list->setShowSortIndicator(true); +- tqlayout->addMultiCellWidget(m_list, 3, 3, 0, 1); ++ layout->addMultiCellWidget(m_list, 3, 3, 0, 1); + + coverFrame = new CoverFrame( playlist ); + coverFrame->setFixedWidth( 80 ); + coverFrame->setFixedHeight( 80 ); +- tqlayout->addMultiCellWidget(coverFrame, 0, 2, 0, 0); ++ layout->addMultiCellWidget(coverFrame, 0, 2, 0, 0); + + TQHBoxLayout *h1 = new TQHBoxLayout(); + searchBtn = new TQToolButton( playlist ); +@@ -397,7 +397,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : + m_playlistFilter = new KLineEdit(playlist); + m_playlistFilter->setFocusPolicy(TQ_ClickFocus); + h1->addWidget(m_playlistFilter); +- tqlayout->addLayout( h1, 2, 1 ); ++ layout->addLayout( h1, 2, 1 ); + + TQHBoxLayout *h2 = new TQHBoxLayout(); + TQLabel* playlistLabel = new TQLabel(i18n("Playlist:"), playlist); +@@ -410,10 +410,10 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : + m_playlistSelector->setFocusPolicy(TQ_ClickFocus); + TQToolTip::add(m_playlistSelector, i18n("Select the active playlist. To change playlist name edit it and confirm with 'Return'.")); + h2->addWidget(m_playlistSelector); +- tqlayout->addLayout( h2, 1, 1 ); ++ layout->addLayout( h2, 1, 1 ); + + roller = new RollTitle( playlist ); +- tqlayout->addWidget( roller, 0, 1 ); ++ layout->addWidget( roller, 0, 1 ); + + KAccel* accel = new KAccel(mainWidget); + accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected())); +@@ -2145,7 +2145,7 @@ void PlayList::slotPaste() + + TQStrList list; + +- if (TQUriDrag::decode(TQApplication::tqclipboard()->data(), list)) ++ if (TQUriDrag::decode(TQApplication::clipboard()->data(), list)) + { + TQStringList urls; + for (TQStrListIterator it(list); *it; ++it) +@@ -2155,7 +2155,7 @@ void PlayList::slotPaste() + } + /** try to decode as text **/ + TQString text; +- if (TQTextDrag::decode(TQApplication::tqclipboard()->data(), text)) ++ if (TQTextDrag::decode(TQApplication::clipboard()->data(), text)) + { + add(text, lastSelected); + } +@@ -2173,7 +2173,7 @@ void PlayList::slotCopy() + urlList.append(TQUriDrag::unicodeUriToUri(dynamic_cast(selected.at(i))->url())); + } + +- TQApplication::tqclipboard()->setData(new TQUriDrag(urlList)); ++ TQApplication::clipboard()->setData(new TQUriDrag(urlList)); + } + + void PlayList::slotSelectAll() +diff --git a/kaffeine/src/input/disc/paranoiasettings.ui b/kaffeine/src/input/disc/paranoiasettings.ui +index 1d163d3..30bbe54 100644 +--- a/kaffeine/src/input/disc/paranoiasettings.ui ++++ b/kaffeine/src/input/disc/paranoiasettings.ui +@@ -24,7 +24,7 @@ + + + +- tqlayout3 ++ layout3 + + + +@@ -174,7 +174,7 @@ + + + +- tqlayout8 ++ layout8 + + + +diff --git a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui +index d956e5b..03485cf 100644 +--- a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui ++++ b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui +@@ -24,7 +24,7 @@ + + + +- tqlayout5 ++ layout5 + + + +@@ -51,7 +51,7 @@ + + + +- tqlayout7 ++ layout7 + + + +@@ -117,7 +117,7 @@ + + + +- tqlayout4 ++ layout4 + + + +diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui +index b243300..f414545 100644 +--- a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui ++++ b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui +@@ -24,7 +24,7 @@ + + + +- tqlayout9 ++ layout9 + + + +@@ -107,7 +107,7 @@ + + + +- tqlayout7 ++ layout7 + + + +diff --git a/kaffeine/src/input/dvb/audioeditorui.ui b/kaffeine/src/input/dvb/audioeditorui.ui +index 1131eec..ab94806 100644 +--- a/kaffeine/src/input/dvb/audioeditorui.ui ++++ b/kaffeine/src/input/dvb/audioeditorui.ui +@@ -21,7 +21,7 @@ + + + +- tqlayout24 ++ layout24 + + + +@@ -29,7 +29,7 @@ + + + +- tqlayout23 ++ layout23 + + + +@@ -60,7 +60,7 @@ + + + +- tqlayout21 ++ layout21 + + + +@@ -68,7 +68,7 @@ + + + +- tqlayout16 ++ layout16 + + + +@@ -76,7 +76,7 @@ + + + +- tqlayout15 ++ layout15 + + + +@@ -146,7 +146,7 @@ + + + +- tqlayout14 ++ layout14 + + + +@@ -154,7 +154,7 @@ + + + +- tqlayout13 ++ layout13 + + + +@@ -258,7 +258,7 @@ + + + +- tqlayout19 ++ layout19 + + + +diff --git a/kaffeine/src/input/dvb/camdialog.ui b/kaffeine/src/input/dvb/camdialog.ui +index 9463cee..c255575 100644 +--- a/kaffeine/src/input/dvb/camdialog.ui ++++ b/kaffeine/src/input/dvb/camdialog.ui +@@ -21,7 +21,7 @@ + + + +- tqlayout5 ++ layout5 + + + +@@ -29,7 +29,7 @@ + + + +- tqlayout5 ++ layout5 + + + +diff --git a/kaffeine/src/input/dvb/cammenudialog.ui b/kaffeine/src/input/dvb/cammenudialog.ui +index f6b5a00..022993a 100644 +--- a/kaffeine/src/input/dvb/cammenudialog.ui ++++ b/kaffeine/src/input/dvb/cammenudialog.ui +@@ -21,7 +21,7 @@ + + + +- tqlayout7 ++ layout7 + + + +@@ -34,7 +34,7 @@ + + + +- tqlayout6 ++ layout6 + + + +diff --git a/kaffeine/src/input/dvb/channeleditorui.ui b/kaffeine/src/input/dvb/channeleditorui.ui +index ceb3d62..add07e2 100644 +--- a/kaffeine/src/input/dvb/channeleditorui.ui ++++ b/kaffeine/src/input/dvb/channeleditorui.ui +@@ -35,7 +35,7 @@ + + + +- tqlayout7 ++ layout7 + + + +@@ -43,7 +43,7 @@ + + + +- tqlayout8 ++ layout8 + + + +@@ -83,7 +83,7 @@ + + + +- tqlayout5 ++ layout5 + + + +@@ -138,7 +138,7 @@ + + + +- tqlayout6 ++ layout6 + + + +@@ -261,7 +261,7 @@ + + + +- tqlayout7 ++ layout7 + + + +@@ -642,7 +642,7 @@ + + + +- tqlayout14 ++ layout14 + + + +diff --git a/kaffeine/src/input/dvb/crontimerui.ui b/kaffeine/src/input/dvb/crontimerui.ui +index 87baff7..5441bee 100644 +--- a/kaffeine/src/input/dvb/crontimerui.ui ++++ b/kaffeine/src/input/dvb/crontimerui.ui +@@ -21,7 +21,7 @@ + + + +- tqlayout13 ++ layout13 + + + +@@ -29,7 +29,7 @@ + + + +- tqlayout12 ++ layout12 + + + +@@ -54,7 +54,7 @@ + + + +- tqlayout11 ++ layout11 + + + +@@ -271,7 +271,7 @@ + + + +- tqlayout9 ++ layout9 + + + +diff --git a/kaffeine/src/input/dvb/scandialogui.ui b/kaffeine/src/input/dvb/scandialogui.ui +index dbcff8b..654e762 100644 +--- a/kaffeine/src/input/dvb/scandialogui.ui ++++ b/kaffeine/src/input/dvb/scandialogui.ui +@@ -21,7 +21,7 @@ + + + +- tqlayout9 ++ layout9 + + + +@@ -29,7 +29,7 @@ + + + +- tqlayout8 ++ layout8 + + + +@@ -129,7 +129,7 @@ + + + +- tqlayout7 ++ layout7 + + + +@@ -487,7 +487,7 @@ + + + +- tqlayout9 ++ layout9 + + + +diff --git a/kaffeine/src/input/dvb/subeditorui.ui b/kaffeine/src/input/dvb/subeditorui.ui +index fb8d391..857cdc5 100644 +--- a/kaffeine/src/input/dvb/subeditorui.ui ++++ b/kaffeine/src/input/dvb/subeditorui.ui +@@ -35,7 +35,7 @@ + + + +- tqlayout19 ++ layout19 + + + +@@ -70,7 +70,7 @@ + + + +- tqlayout13 ++ layout13 + + + +@@ -101,7 +101,7 @@ + + + +- tqlayout12 ++ layout12 + + + +@@ -109,7 +109,7 @@ + + + +- tqlayout16 ++ layout16 + + + +@@ -117,7 +117,7 @@ + + + +- tqlayout15 ++ layout15 + + + +@@ -187,7 +187,7 @@ + + + +- tqlayout11 ++ layout11 + + + +@@ -195,7 +195,7 @@ + + + +- tqlayout13 ++ layout13 + + + +@@ -232,7 +232,7 @@ + + + +- tqlayout10 ++ layout10 + + + +@@ -274,7 +274,7 @@ + + + +- tqlayout9 ++ layout9 + + + +diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp +index 9efebc9..10bd4be 100644 +--- a/kaffeine/src/kaffeine.cpp ++++ b/kaffeine/src/kaffeine.cpp +@@ -1591,7 +1591,7 @@ void Kaffeine::slotFakeKeyEvent() + } + } + +-/** slots for meta to tqunicode encoding **/ ++/** slots for meta to unicode encoding **/ + + void Kaffeine::slotUseAlternateEncoding(bool useEncoding) + { +diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp +index ecfa2c5..4ff1154 100644 +--- a/kaffeine/src/kmultitabbar.cpp ++++ b/kaffeine/src/kmultitabbar.cpp +@@ -474,7 +474,7 @@ TQSize KMultiTabBarButton::sizeHint() const + } + #endif + if ( isMenuButton() ) +- w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); ++ w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); + + if ( pixmap() ) { + TQPixmap *pm = (TQPixmap *)pixmap(); +@@ -493,7 +493,7 @@ TQSize KMultiTabBarButton::sizeHint() const + h = TQMAX(h, sz.height()); + } + +- return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). ++ return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + expandedTo(TQApplication::globalStrut())); + } + +diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp +index dd843f5..ccb56f3 100644 +--- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp ++++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp +@@ -40,47 +40,47 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin + setInitialSize(TQSize(400,300), true); + + TQFrame* frame = NULL; +- TQGridLayout* tqlayout = NULL; ++ TQGridLayout* layout = NULL; + TQLabel* label = NULL; + + //Audio Page + frame = addPage(i18n("Audio"), i18n("Audio Options"), KGlobal::iconLoader()->loadIcon("sound", KIcon::Panel, + KIcon::SizeMedium)); +- tqlayout = new TQGridLayout(frame, 10, 2); +- tqlayout->setMargin(10); +- tqlayout->setSpacing(10); ++ layout = new TQGridLayout(frame, 10, 2); ++ layout->setMargin(10); ++ layout->setSpacing(10); + m_audioDriverBox = new KComboBox(frame); + m_audioDriverBox->insertStringList(audioDrivers); + label = new TQLabel(i18n("Prefered audio driver"), frame); +- tqlayout->addWidget(label, 1, 0); +- tqlayout->addWidget(m_audioDriverBox, 1, 1); +- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); ++ layout->addWidget(label, 1, 0); ++ layout->addWidget(m_audioDriverBox, 1, 1); ++ layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); + + //Video Page + frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel, + KIcon::SizeMedium)); +- tqlayout = new TQGridLayout(frame, 10, 2); +- tqlayout->setMargin(10); +- tqlayout->setSpacing(10); ++ layout = new TQGridLayout(frame, 10, 2); ++ layout->setMargin(10); ++ layout->setSpacing(10); + m_videoDriverBox = new KComboBox(frame); + m_videoDriverBox->insertStringList(videoDrivers); + label = new TQLabel(i18n("Prefered video driver")+ "*", frame); +- tqlayout->addWidget(label, 1, 0); +- tqlayout->addWidget(m_videoDriverBox, 1, 1); +- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); +- tqlayout->addWidget(new TQLabel(TQString("") + i18n("* Restart required!") + "", frame), 10, 1); ++ layout->addWidget(label, 1, 0); ++ layout->addWidget(m_videoDriverBox, 1, 1); ++ layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); ++ layout->addWidget(new TQLabel(TQString("") + i18n("* Restart required!") + "", frame), 10, 1); + + //Media page + frame = addPage(i18n("Media"), i18n("Media Options"), KGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Panel, + KIcon::SizeMedium)); +- tqlayout = new TQGridLayout(frame, 10, 2); +- tqlayout->setMargin(10); +- tqlayout->setSpacing(10); ++ layout = new TQGridLayout(frame, 10, 2); ++ layout->setMargin(10); ++ layout->setSpacing(10); + m_driveEdit = new KLineEdit(frame); + label = new TQLabel(i18n("CD, VCD, DVD drive"), frame); +- tqlayout->addWidget(label, 1, 0); +- tqlayout->addWidget(m_driveEdit, 1, 1); +- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); ++ layout->addWidget(label, 1, 0); ++ layout->addWidget(m_driveEdit, 1, 1); ++ layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); + } + + GStreamerConfig::~GStreamerConfig() +diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp +index 1b9c123..98ff969 100644 +--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp ++++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp +@@ -212,7 +212,7 @@ bool XinePart::openURL(const MRL& mrl) + if (firstLine.contains("smil", false)) + { + kdDebug() << "XinePart: Try loading smil playlist\n"; +- if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any tqlayout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes) ++ if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any layout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes) + { + if (!PlaylistImport::smil(localFile, m_mrl, m_playlist)) + { +@@ -1240,7 +1240,7 @@ void XinePart::slotInfo() + if (m_xine->hasSaveURL()) + ts << "" << i18n("Save Stream as") << ": " << m_xine->getSaveURL() << ""; + +- ts << ""; // added for better tqlayout ++ ts << ""; // added for better layout + ts << ""; + KMessageBox::information(0, info, i18n("Track info") ); + } diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-renames_a_few_stragglers.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-renames_a_few_stragglers.patch new file mode 100644 index 000000000..b3fcbc792 --- /dev/null +++ b/redhat/applications/kaffeine/kaffeine-3.5.13-renames_a_few_stragglers.patch @@ -0,0 +1,30 @@ +commit 89b5fd35299d63e54cb2b36ec366d0071381458b +Author: Timothy Pearson +Date: 1324748015 -0600 + + Rename a few stragglers + +diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp +index 4ff1154..8d85e01 100644 +--- a/kaffeine/src/kmultitabbar.cpp ++++ b/kaffeine/src/kmultitabbar.cpp +@@ -654,8 +654,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { + + if (down) st|=TQStyle::Style_On; + +- tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); +- tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); ++ 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); + + switch (m_position) { + case KMultiTabBar::Left: +@@ -671,7 +671,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { + paint->drawPixmap(0,0,pixmap); + break; + } +-// tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), ++// style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), + // colorGroup(),TQStyle::Style_Enabled); + + diff --git a/redhat/applications/kaffeine/kdebase-3.5.13-error_out_if_critical_osd_defines_not_set.patch b/redhat/applications/kaffeine/kdebase-3.5.13-error_out_if_critical_osd_defines_not_set.patch deleted file mode 100644 index 9c01d1056..000000000 --- a/redhat/applications/kaffeine/kdebase-3.5.13-error_out_if_critical_osd_defines_not_set.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 25b89439bbdcbc245b2a4125d2345afaa32fb952 -Author: Timothy Pearson -Date: 1326858742 -0600 - - Error out if critical OSD-related defines are not set - -diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp -index acc9937..68d47ac 100644 ---- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp -+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp -@@ -1513,6 +1513,14 @@ bool KXineWidget::playDvb() - return true; - } - -+#ifndef Q_BYTE_ORDER -+#error Q_BYTE_ORDER is not defined! -+#endif -+ -+#ifndef TQ_LITTLE_ENDIAN -+#error TQ_LITTLE_ENDIAN is not defined! -+#endif -+ - #if Q_BYTE_ORDER == TQ_LITTLE_ENDIAN - #define rgb2yuv(R,G,B) ((((((66*R+129*G+25*B+128)>>8)+16)<<8)|(((112*R-94*G-18*B+128)>>8)+128))<<8|(((-38*R-74*G+112*B+128)>>8)+128)) - #else diff --git a/redhat/applications/kaffeine/kdebase-3.5.13-fix_slow_dvb_start.patch b/redhat/applications/kaffeine/kdebase-3.5.13-fix_slow_dvb_start.patch deleted file mode 100644 index 71b71cc6e..000000000 --- a/redhat/applications/kaffeine/kdebase-3.5.13-fix_slow_dvb_start.patch +++ /dev/null @@ -1,97 +0,0 @@ -commit fd68e4c4940afb4529b16e2c3e3d0f379ac7b161 -Author: Darrell Anderson -Date: 1331343133 -0600 - - Fix nominal "tqt" typos and fix slow DVB start. - This closes bug reports 729 and 899. - -diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp -index 96752aa..32c8817 100644 ---- a/kaffeine/src/player-parts/gstreamer-part/video.cpp -+++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp -@@ -232,7 +232,7 @@ void VideoWindow::correctByAspectRatio( TQSize& frame ) - case FOURBYTHREE: factor = 4.0 / 3.0; break; - case ANAMORPHIC: factor = 16.0 / 9.0; break; - case DVB: factor = 2.11; break; -- case STQUARE: factor = 1.0; break; -+ case SQUARE: factor = 1.0; break; - } - - float frameAspect = (float)frame.width() / (float)frame.height(); -@@ -291,7 +291,7 @@ void VideoWindow::slotAspectRatioDVB() - - void VideoWindow::slotAspectRatioSquare() - { -- m_aspectRatio = STQUARE; -+ m_aspectRatio = SQUARE; - TQSize frame = getFrameSize(); - correctByAspectRatio( frame ); - emit signalNewFrameSize( frame ); -diff --git a/kaffeine/src/player-parts/gstreamer-part/video.h b/kaffeine/src/player-parts/gstreamer-part/video.h -index c4d9f74..f7c5180 100644 ---- a/kaffeine/src/player-parts/gstreamer-part/video.h -+++ b/kaffeine/src/player-parts/gstreamer-part/video.h -@@ -47,7 +47,7 @@ public: - FOURBYTHREE, - ANAMORPHIC, - DVB, -- STQUARE -+ SQUARE - }; - - void newState(); -diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.h b/kaffeine/src/player-parts/xine-part/deinterlacequality.h -index edc2fa9..6987de3 100644 ---- a/kaffeine/src/player-parts/xine-part/deinterlacequality.h -+++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.h -@@ -18,8 +18,8 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - --#ifndef DEINTERLACETQUALITY_H --#define DEINTERLACETQUALITY_H -+#ifndef DEINTERLACEQUALITY_H -+#define DEINTERLACEQUALITY_H - - #include - -@@ -77,4 +77,4 @@ private: - KPushButton* m_customConfigButton; - }; - --#endif /* DEINTERLACETQUALITY_H */ -+#endif /* DEINTERLACEQUALITY_H */ -diff --git a/kaffeine/src/player-parts/xine-part/equalizer.h b/kaffeine/src/player-parts/xine-part/equalizer.h -index 7d43ec0..2e81096 100644 ---- a/kaffeine/src/player-parts/xine-part/equalizer.h -+++ b/kaffeine/src/player-parts/xine-part/equalizer.h -@@ -18,8 +18,8 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - --#ifndef ETQUALIZER_H --#define ETQUALIZER_H -+#ifndef EQUALIZER_H -+#define EQUALIZER_H - - #include - #include -@@ -77,4 +77,4 @@ private: - TQSlider* eq16kSlider; - }; - --#endif /* ETQUALIZER_H */ -+#endif /* EQUALIZER_H */ -diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp -index 68d47ac..ab87338 100644 ---- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp -+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp -@@ -3889,7 +3889,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide - break; - default: - warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").arg(ratio)); -- case XINE_VO_ASPECT_STQUARE: -+ case XINE_VO_ASPECT_SQUARE: - debugOut("Screenshot: got video aspect: 1:1"); - desired_ratio = image_ratio; - break; diff --git a/redhat/applications/kaffeine/kdebase-3.5.13-rename_obsolete_tq_methods.patch b/redhat/applications/kaffeine/kdebase-3.5.13-rename_obsolete_tq_methods.patch deleted file mode 100644 index a60af902e..000000000 --- a/redhat/applications/kaffeine/kdebase-3.5.13-rename_obsolete_tq_methods.patch +++ /dev/null @@ -1,643 +0,0 @@ -commit 66805bafb9e1db535090dd74f6bdc56c2ac431c0 -Author: Timothy Pearson -Date: 1324497848 -0600 - - Rename obsolete tq methods to standard names - -diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp -index e67603e..c48cf28 100644 ---- a/kaffeine/src/input/audiobrowser/playlist.cpp -+++ b/kaffeine/src/input/audiobrowser/playlist.cpp -@@ -169,10 +169,10 @@ struct CoverPopup : public TQWidget - CoverPopup(const TQPixmap &image, const TQPoint &p) : - TQWidget(0, 0, WDestructiveClose | WX11BypassWM) - { -- TQHBoxLayout *tqlayout = new TQHBoxLayout(this); -+ TQHBoxLayout *layout = new TQHBoxLayout(this); - TQLabel *label = new TQLabel(this); - -- tqlayout->addWidget(label); -+ layout->addWidget(label); - label->setFrameStyle(TQFrame::Box | TQFrame::Raised); - label->setLineWidth(1); - label->setPixmap(image); -@@ -342,7 +342,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : - KIO::NetAccess::mkdir(m_playlistDirectory, mainWidget); - kdDebug() << "PLAYLIST" << endl; - -- TQGridLayout* tqlayout = new TQGridLayout( playlist, 4, 2, 3 ); -+ TQGridLayout* layout = new TQGridLayout( playlist, 4, 2, 3 ); - - m_list = new UrlListView(playlist); - mainWidget->setAcceptDrops(true); -@@ -379,12 +379,12 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : - m_list->setRenameable(TRACK_COLUMN); - m_list->setAllColumnsShowFocus(true); - m_list->setShowSortIndicator(true); -- tqlayout->addMultiCellWidget(m_list, 3, 3, 0, 1); -+ layout->addMultiCellWidget(m_list, 3, 3, 0, 1); - - coverFrame = new CoverFrame( playlist ); - coverFrame->setFixedWidth( 80 ); - coverFrame->setFixedHeight( 80 ); -- tqlayout->addMultiCellWidget(coverFrame, 0, 2, 0, 0); -+ layout->addMultiCellWidget(coverFrame, 0, 2, 0, 0); - - TQHBoxLayout *h1 = new TQHBoxLayout(); - searchBtn = new TQToolButton( playlist ); -@@ -397,7 +397,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : - m_playlistFilter = new KLineEdit(playlist); - m_playlistFilter->setFocusPolicy(TQ_ClickFocus); - h1->addWidget(m_playlistFilter); -- tqlayout->addLayout( h1, 2, 1 ); -+ layout->addLayout( h1, 2, 1 ); - - TQHBoxLayout *h2 = new TQHBoxLayout(); - TQLabel* playlistLabel = new TQLabel(i18n("Playlist:"), playlist); -@@ -410,10 +410,10 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : - m_playlistSelector->setFocusPolicy(TQ_ClickFocus); - TQToolTip::add(m_playlistSelector, i18n("Select the active playlist. To change playlist name edit it and confirm with 'Return'.")); - h2->addWidget(m_playlistSelector); -- tqlayout->addLayout( h2, 1, 1 ); -+ layout->addLayout( h2, 1, 1 ); - - roller = new RollTitle( playlist ); -- tqlayout->addWidget( roller, 0, 1 ); -+ layout->addWidget( roller, 0, 1 ); - - KAccel* accel = new KAccel(mainWidget); - accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected())); -@@ -2145,7 +2145,7 @@ void PlayList::slotPaste() - - TQStrList list; - -- if (TQUriDrag::decode(TQApplication::tqclipboard()->data(), list)) -+ if (TQUriDrag::decode(TQApplication::clipboard()->data(), list)) - { - TQStringList urls; - for (TQStrListIterator it(list); *it; ++it) -@@ -2155,7 +2155,7 @@ void PlayList::slotPaste() - } - /** try to decode as text **/ - TQString text; -- if (TQTextDrag::decode(TQApplication::tqclipboard()->data(), text)) -+ if (TQTextDrag::decode(TQApplication::clipboard()->data(), text)) - { - add(text, lastSelected); - } -@@ -2173,7 +2173,7 @@ void PlayList::slotCopy() - urlList.append(TQUriDrag::unicodeUriToUri(dynamic_cast(selected.at(i))->url())); - } - -- TQApplication::tqclipboard()->setData(new TQUriDrag(urlList)); -+ TQApplication::clipboard()->setData(new TQUriDrag(urlList)); - } - - void PlayList::slotSelectAll() -diff --git a/kaffeine/src/input/disc/paranoiasettings.ui b/kaffeine/src/input/disc/paranoiasettings.ui -index 1d163d3..30bbe54 100644 ---- a/kaffeine/src/input/disc/paranoiasettings.ui -+++ b/kaffeine/src/input/disc/paranoiasettings.ui -@@ -24,7 +24,7 @@ - - - -- tqlayout3 -+ layout3 - - - -@@ -174,7 +174,7 @@ - - - -- tqlayout8 -+ layout8 - - - -diff --git a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui -index d956e5b..03485cf 100644 ---- a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui -+++ b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui -@@ -24,7 +24,7 @@ - - - -- tqlayout5 -+ layout5 - - - -@@ -51,7 +51,7 @@ - - - -- tqlayout7 -+ layout7 - - - -@@ -117,7 +117,7 @@ - - - -- tqlayout4 -+ layout4 - - - -diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui -index b243300..f414545 100644 ---- a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui -+++ b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui -@@ -24,7 +24,7 @@ - - - -- tqlayout9 -+ layout9 - - - -@@ -107,7 +107,7 @@ - - - -- tqlayout7 -+ layout7 - - - -diff --git a/kaffeine/src/input/dvb/audioeditorui.ui b/kaffeine/src/input/dvb/audioeditorui.ui -index 1131eec..ab94806 100644 ---- a/kaffeine/src/input/dvb/audioeditorui.ui -+++ b/kaffeine/src/input/dvb/audioeditorui.ui -@@ -21,7 +21,7 @@ - - - -- tqlayout24 -+ layout24 - - - -@@ -29,7 +29,7 @@ - - - -- tqlayout23 -+ layout23 - - - -@@ -60,7 +60,7 @@ - - - -- tqlayout21 -+ layout21 - - - -@@ -68,7 +68,7 @@ - - - -- tqlayout16 -+ layout16 - - - -@@ -76,7 +76,7 @@ - - - -- tqlayout15 -+ layout15 - - - -@@ -146,7 +146,7 @@ - - - -- tqlayout14 -+ layout14 - - - -@@ -154,7 +154,7 @@ - - - -- tqlayout13 -+ layout13 - - - -@@ -258,7 +258,7 @@ - - - -- tqlayout19 -+ layout19 - - - -diff --git a/kaffeine/src/input/dvb/camdialog.ui b/kaffeine/src/input/dvb/camdialog.ui -index 9463cee..c255575 100644 ---- a/kaffeine/src/input/dvb/camdialog.ui -+++ b/kaffeine/src/input/dvb/camdialog.ui -@@ -21,7 +21,7 @@ - - - -- tqlayout5 -+ layout5 - - - -@@ -29,7 +29,7 @@ - - - -- tqlayout5 -+ layout5 - - - -diff --git a/kaffeine/src/input/dvb/cammenudialog.ui b/kaffeine/src/input/dvb/cammenudialog.ui -index f6b5a00..022993a 100644 ---- a/kaffeine/src/input/dvb/cammenudialog.ui -+++ b/kaffeine/src/input/dvb/cammenudialog.ui -@@ -21,7 +21,7 @@ - - - -- tqlayout7 -+ layout7 - - - -@@ -34,7 +34,7 @@ - - - -- tqlayout6 -+ layout6 - - - -diff --git a/kaffeine/src/input/dvb/channeleditorui.ui b/kaffeine/src/input/dvb/channeleditorui.ui -index ceb3d62..add07e2 100644 ---- a/kaffeine/src/input/dvb/channeleditorui.ui -+++ b/kaffeine/src/input/dvb/channeleditorui.ui -@@ -35,7 +35,7 @@ - - - -- tqlayout7 -+ layout7 - - - -@@ -43,7 +43,7 @@ - - - -- tqlayout8 -+ layout8 - - - -@@ -83,7 +83,7 @@ - - - -- tqlayout5 -+ layout5 - - - -@@ -138,7 +138,7 @@ - - - -- tqlayout6 -+ layout6 - - - -@@ -261,7 +261,7 @@ - - - -- tqlayout7 -+ layout7 - - - -@@ -642,7 +642,7 @@ - - - -- tqlayout14 -+ layout14 - - - -diff --git a/kaffeine/src/input/dvb/crontimerui.ui b/kaffeine/src/input/dvb/crontimerui.ui -index 87baff7..5441bee 100644 ---- a/kaffeine/src/input/dvb/crontimerui.ui -+++ b/kaffeine/src/input/dvb/crontimerui.ui -@@ -21,7 +21,7 @@ - - - -- tqlayout13 -+ layout13 - - - -@@ -29,7 +29,7 @@ - - - -- tqlayout12 -+ layout12 - - - -@@ -54,7 +54,7 @@ - - - -- tqlayout11 -+ layout11 - - - -@@ -271,7 +271,7 @@ - - - -- tqlayout9 -+ layout9 - - - -diff --git a/kaffeine/src/input/dvb/scandialogui.ui b/kaffeine/src/input/dvb/scandialogui.ui -index dbcff8b..654e762 100644 ---- a/kaffeine/src/input/dvb/scandialogui.ui -+++ b/kaffeine/src/input/dvb/scandialogui.ui -@@ -21,7 +21,7 @@ - - - -- tqlayout9 -+ layout9 - - - -@@ -29,7 +29,7 @@ - - - -- tqlayout8 -+ layout8 - - - -@@ -129,7 +129,7 @@ - - - -- tqlayout7 -+ layout7 - - - -@@ -487,7 +487,7 @@ - - - -- tqlayout9 -+ layout9 - - - -diff --git a/kaffeine/src/input/dvb/subeditorui.ui b/kaffeine/src/input/dvb/subeditorui.ui -index fb8d391..857cdc5 100644 ---- a/kaffeine/src/input/dvb/subeditorui.ui -+++ b/kaffeine/src/input/dvb/subeditorui.ui -@@ -35,7 +35,7 @@ - - - -- tqlayout19 -+ layout19 - - - -@@ -70,7 +70,7 @@ - - - -- tqlayout13 -+ layout13 - - - -@@ -101,7 +101,7 @@ - - - -- tqlayout12 -+ layout12 - - - -@@ -109,7 +109,7 @@ - - - -- tqlayout16 -+ layout16 - - - -@@ -117,7 +117,7 @@ - - - -- tqlayout15 -+ layout15 - - - -@@ -187,7 +187,7 @@ - - - -- tqlayout11 -+ layout11 - - - -@@ -195,7 +195,7 @@ - - - -- tqlayout13 -+ layout13 - - - -@@ -232,7 +232,7 @@ - - - -- tqlayout10 -+ layout10 - - - -@@ -274,7 +274,7 @@ - - - -- tqlayout9 -+ layout9 - - - -diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp -index 9efebc9..10bd4be 100644 ---- a/kaffeine/src/kaffeine.cpp -+++ b/kaffeine/src/kaffeine.cpp -@@ -1591,7 +1591,7 @@ void Kaffeine::slotFakeKeyEvent() - } - } - --/** slots for meta to tqunicode encoding **/ -+/** slots for meta to unicode encoding **/ - - void Kaffeine::slotUseAlternateEncoding(bool useEncoding) - { -diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp -index ecfa2c5..4ff1154 100644 ---- a/kaffeine/src/kmultitabbar.cpp -+++ b/kaffeine/src/kmultitabbar.cpp -@@ -474,7 +474,7 @@ TQSize KMultiTabBarButton::sizeHint() const - } - #endif - if ( isMenuButton() ) -- w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); -+ w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); - - if ( pixmap() ) { - TQPixmap *pm = (TQPixmap *)pixmap(); -@@ -493,7 +493,7 @@ TQSize KMultiTabBarButton::sizeHint() const - h = TQMAX(h, sz.height()); - } - -- return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). -+ return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). - expandedTo(TQApplication::globalStrut())); - } - -diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp -index dd843f5..ccb56f3 100644 ---- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp -+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp -@@ -40,47 +40,47 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin - setInitialSize(TQSize(400,300), true); - - TQFrame* frame = NULL; -- TQGridLayout* tqlayout = NULL; -+ TQGridLayout* layout = NULL; - TQLabel* label = NULL; - - //Audio Page - frame = addPage(i18n("Audio"), i18n("Audio Options"), KGlobal::iconLoader()->loadIcon("sound", KIcon::Panel, - KIcon::SizeMedium)); -- tqlayout = new TQGridLayout(frame, 10, 2); -- tqlayout->setMargin(10); -- tqlayout->setSpacing(10); -+ layout = new TQGridLayout(frame, 10, 2); -+ layout->setMargin(10); -+ layout->setSpacing(10); - m_audioDriverBox = new KComboBox(frame); - m_audioDriverBox->insertStringList(audioDrivers); - label = new TQLabel(i18n("Prefered audio driver"), frame); -- tqlayout->addWidget(label, 1, 0); -- tqlayout->addWidget(m_audioDriverBox, 1, 1); -- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); -+ layout->addWidget(label, 1, 0); -+ layout->addWidget(m_audioDriverBox, 1, 1); -+ layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); - - //Video Page - frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel, - KIcon::SizeMedium)); -- tqlayout = new TQGridLayout(frame, 10, 2); -- tqlayout->setMargin(10); -- tqlayout->setSpacing(10); -+ layout = new TQGridLayout(frame, 10, 2); -+ layout->setMargin(10); -+ layout->setSpacing(10); - m_videoDriverBox = new KComboBox(frame); - m_videoDriverBox->insertStringList(videoDrivers); - label = new TQLabel(i18n("Prefered video driver")+ "*", frame); -- tqlayout->addWidget(label, 1, 0); -- tqlayout->addWidget(m_videoDriverBox, 1, 1); -- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); -- tqlayout->addWidget(new TQLabel(TQString("") + i18n("* Restart required!") + "", frame), 10, 1); -+ layout->addWidget(label, 1, 0); -+ layout->addWidget(m_videoDriverBox, 1, 1); -+ layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); -+ layout->addWidget(new TQLabel(TQString("") + i18n("* Restart required!") + "", frame), 10, 1); - - //Media page - frame = addPage(i18n("Media"), i18n("Media Options"), KGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Panel, - KIcon::SizeMedium)); -- tqlayout = new TQGridLayout(frame, 10, 2); -- tqlayout->setMargin(10); -- tqlayout->setSpacing(10); -+ layout = new TQGridLayout(frame, 10, 2); -+ layout->setMargin(10); -+ layout->setSpacing(10); - m_driveEdit = new KLineEdit(frame); - label = new TQLabel(i18n("CD, VCD, DVD drive"), frame); -- tqlayout->addWidget(label, 1, 0); -- tqlayout->addWidget(m_driveEdit, 1, 1); -- tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); -+ layout->addWidget(label, 1, 0); -+ layout->addWidget(m_driveEdit, 1, 1); -+ layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1); - } - - GStreamerConfig::~GStreamerConfig() -diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp -index 1b9c123..98ff969 100644 ---- a/kaffeine/src/player-parts/xine-part/xine_part.cpp -+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp -@@ -212,7 +212,7 @@ bool XinePart::openURL(const MRL& mrl) - if (firstLine.contains("smil", false)) - { - kdDebug() << "XinePart: Try loading smil playlist\n"; -- if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any tqlayout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes) -+ if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any layout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes) - { - if (!PlaylistImport::smil(localFile, m_mrl, m_playlist)) - { -@@ -1240,7 +1240,7 @@ void XinePart::slotInfo() - if (m_xine->hasSaveURL()) - ts << "" << i18n("Save Stream as") << ": " << m_xine->getSaveURL() << ""; - -- ts << ""; // added for better tqlayout -+ ts << ""; // added for better layout - ts << ""; - KMessageBox::information(0, info, i18n("Track info") ); - } diff --git a/redhat/applications/kaffeine/kdebase-3.5.13-renames_a_few_stragglers.patch b/redhat/applications/kaffeine/kdebase-3.5.13-renames_a_few_stragglers.patch deleted file mode 100644 index b3fcbc792..000000000 --- a/redhat/applications/kaffeine/kdebase-3.5.13-renames_a_few_stragglers.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 89b5fd35299d63e54cb2b36ec366d0071381458b -Author: Timothy Pearson -Date: 1324748015 -0600 - - Rename a few stragglers - -diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp -index 4ff1154..8d85e01 100644 ---- a/kaffeine/src/kmultitabbar.cpp -+++ b/kaffeine/src/kmultitabbar.cpp -@@ -654,8 +654,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { - - if (down) st|=TQStyle::Style_On; - -- tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); -- tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); -+ 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); - - switch (m_position) { - case KMultiTabBar::Left: -@@ -671,7 +671,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { - paint->drawPixmap(0,0,pixmap); - break; - } --// tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), -+// style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), - // colorGroup(),TQStyle::Style_Enabled); - - diff --git a/redhat/applications/kaffeine/trinity-kaffeine.spec b/redhat/applications/kaffeine/trinity-kaffeine.spec index 2bef14408..41669667a 100644 --- a/redhat/applications/kaffeine/trinity-kaffeine.spec +++ b/redhat/applications/kaffeine/trinity-kaffeine.spec @@ -6,7 +6,7 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %define _mandir %{_datadir}/man %endif -- cgit v1.2.1