summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kuickshow/bp000-8712ab46.diff
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/kuickshow/bp000-8712ab46.diff')
-rw-r--r--redhat/applications/kuickshow/bp000-8712ab46.diff182
1 files changed, 182 insertions, 0 deletions
diff --git a/redhat/applications/kuickshow/bp000-8712ab46.diff b/redhat/applications/kuickshow/bp000-8712ab46.diff
new file mode 100644
index 000000000..2f7e0b2cf
--- /dev/null
+++ b/redhat/applications/kuickshow/bp000-8712ab46.diff
@@ -0,0 +1,182 @@
+commit 8712ab46f5d6dc08d2ff6a1e238773adfc5ab85e
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date: 1324253623 -0600
+
+ Rename old tq methods that no longer need a unique name
+
+diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp
+index d5d3a84..ce85788 100644
+--- a/kuickshow/src/aboutwidget.cpp
++++ b/kuickshow/src/aboutwidget.cpp
+@@ -41,7 +41,7 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name )
+
+ TQGroupBox *gBox = new TQGroupBox( 1,Qt::Horizontal, this);
+ gBox->setGeometry( 10, 10, width()-20, height()-20 );
+- gBox->tqsetAlignment( AlignHCenter );
++ gBox->setAlignment( AlignHCenter );
+ gBox->installEventFilter( this );
+
+ gBox->setPalette( TQPalette( TQColor( white ) ) );
+@@ -57,14 +57,14 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name )
+
+ TQLabel *authors = new TQLabel("Kuickshow " KUICKSHOWVERSION
+ " was brought to you by", gBox);
+- authors->tqsetAlignment( AlignCenter );
++ authors->setAlignment( AlignCenter );
+
+ m_homepage = new KURLWidget("Carsten Pfeiffer", gBox);
+ m_homepage->setURL( "http://devel-home.kde.org/~pfeiffer/kuickshow/" );
+- m_homepage->tqsetAlignment( AlignCenter );
++ m_homepage->setAlignment( AlignCenter );
+
+ TQLabel *copy = new TQLabel("(C) 1998-2006", gBox);
+- copy->tqsetAlignment( AlignCenter );
++ copy->setAlignment( AlignCenter );
+
+ ImlibWidget *im = new ImlibWidget( 0L, gBox, "KuickShow Logo" );
+ if ( im->loadImage( file ) )
+diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp
+index c0bef52..e444605 100644
+--- a/kuickshow/src/defaultswidget.cpp
++++ b/kuickshow/src/defaultswidget.cpp
+@@ -92,7 +92,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
+ // --
+
+ gbPreview = new TQGroupBox( i18n("Preview"), this );
+- gbPreview->tqsetAlignment( AlignCenter );
++ gbPreview->setAlignment( AlignCenter );
+
+ lbImOrig = new TQLabel( i18n("Original"), gbPreview );
+ imOrig = new ImlibWidget( 0L, gbPreview, "original image" );
+diff --git a/kuickshow/src/filecache.cpp b/kuickshow/src/filecache.cpp
+index d68bc89..2fb4f6d 100644
+--- a/kuickshow/src/filecache.cpp
++++ b/kuickshow/src/filecache.cpp
+@@ -68,7 +68,7 @@ TQString FileCache::tempDir()
+
+ KTempDir * FileCache::createTempDir()
+ {
+- TQString tmpName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() );
++ TQString tmpName = TQString::fromLatin1( KGlobal::instance()->instanceName() );
+ tmpName.append( TQString::number( getpid() ) );
+ TQString dirName = locateLocal( "tmp", tmpName );
+ KTempDir *dir = new KTempDir( dirName );
+diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
+index 403269b..5f8df74 100644
+--- a/kuickshow/src/filewidget.cpp
++++ b/kuickshow/src/filewidget.cpp
+@@ -448,7 +448,7 @@ void FileWidget::slotFinishedLoading()
+ emit finished();
+ }
+
+-TQSize FileWidget::tqsizeHint() const
++TQSize FileWidget::sizeHint() const
+ {
+ return TQSize( 300, 300 );
+ }
+diff --git a/kuickshow/src/filewidget.h b/kuickshow/src/filewidget.h
+index 64f1160..8299664 100644
+--- a/kuickshow/src/filewidget.h
++++ b/kuickshow/src/filewidget.h
+@@ -71,7 +71,7 @@ protected:
+ virtual bool eventFilter( TQObject *o, TQEvent * );
+ virtual void resizeEvent( TQResizeEvent * );
+ virtual void activatedMenu( const KFileItem *, const TQPoint& );
+- virtual TQSize tqsizeHint() const;
++ virtual TQSize sizeHint() const;
+
+ private slots:
+ void slotReturnPressed( const TQString& text );
+diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
+index f56c7b3..8b195a7 100644
+--- a/kuickshow/src/imagewindow.cpp
++++ b/kuickshow/src/imagewindow.cpp
+@@ -1128,7 +1128,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const
+ {
+ if ( myIsFullscreen || totalScreen )
+ {
+- return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).width();
++ return KGlobalSettings::desktopGeometry(topLevelWidget()).width();
+ } else
+ return Kuick::workArea().width();
+ }
+@@ -1137,7 +1137,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const
+ int ImageWindow::desktopHeight( bool totalScreen ) const
+ {
+ if ( myIsFullscreen || totalScreen ) {
+- return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).height();
++ return KGlobalSettings::desktopGeometry(topLevelWidget()).height();
+ } else {
+ return Kuick::workArea().height();
+ }
+@@ -1146,7 +1146,7 @@ int ImageWindow::desktopHeight( bool totalScreen ) const
+ TQSize ImageWindow::maxImageSize() const
+ {
+ if ( myIsFullscreen ) {
+- return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size();
++ return KGlobalSettings::desktopGeometry(topLevelWidget()).size();
+ }
+ else {
+ return Kuick::workArea().size() - Kuick::frameSize( winId() );
+@@ -1193,7 +1193,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight )
+ if ( !ImlibWidget::canZoomTo( newWidth, newHeight ) )
+ return false;
+
+- TQSize desktopSize = KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size();
++ TQSize desktopSize = KGlobalSettings::desktopGeometry(topLevelWidget()).size();
+
+ int desktopArea = desktopSize.width() * desktopSize.height();
+ int imageArea = newWidth * newHeight;
+diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
+index 4e0aa57..b20606a 100644
+--- a/kuickshow/src/kuickfile.cpp
++++ b/kuickshow/src/kuickfile.cpp
+@@ -94,7 +94,7 @@ bool KuickFile::download()
+ return m_job != 0L;
+ }
+
+-KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *parent )
++KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent )
+ {
+ if ( isAvailable() )
+ return OK;
+@@ -152,7 +152,7 @@ void KuickFile::slotResult( KIO::Job *job )
+
+ TQString canceledFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
+ TQFile::remove( canceledFile );
+- m_progress->tqtopLevelWidget()->hide();
++ m_progress->topLevelWidget()->hide();
+ }
+ else {
+ m_localFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
+@@ -162,7 +162,7 @@ void KuickFile::slotResult( KIO::Job *job )
+ m_progress->setProgress( 100 );
+ #define BUGGY_VERSION KDE_MAKE_VERSION(3,5,2)
+ if ( KDE::version() <= BUGGY_VERSION ) {
+- m_progress->tqtopLevelWidget()->hide(); // ### workaround broken KProgressDialog
++ m_progress->topLevelWidget()->hide(); // ### workaround broken KProgressDialog
+ }
+ }
+ }
+diff --git a/kuickshow/src/kuickfile.h b/kuickshow/src/kuickfile.h
+index af92355..49ee389 100644
+--- a/kuickshow/src/kuickfile.h
++++ b/kuickshow/src/kuickfile.h
+@@ -27,7 +27,7 @@ class KuickFile : public TQObject
+ TQ_OBJECT
+
+ public:
+- enum DownloadtqStatus
++ enum DownloadStatus
+ {
+ OK = 1,
+ CANCELED,
+@@ -72,7 +72,7 @@ public:
+ * immediately.
+ * @return true when the download has finished or false when the user aborted the dialog
+ */
+- KuickFile::DownloadtqStatus waitForDownload( TQWidget *parent );
++ KuickFile::DownloadStatus waitForDownload( TQWidget *parent );
+
+ // bool needsDownload();
+
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 05:09:46 +0000