summaryrefslogtreecommitdiffstats
path: root/kview/kviewviewer
diff options
context:
space:
mode:
Diffstat (limited to 'kview/kviewviewer')
-rw-r--r--kview/kviewviewer/config/kviewviewerpluginsconfig.cpp4
-rw-r--r--kview/kviewviewer/config/kviewviewerpluginsconfig.h2
-rw-r--r--kview/kviewviewer/imagesettings.h2
-rw-r--r--kview/kviewviewer/kviewkonqextension.cpp2
-rw-r--r--kview/kviewviewer/kviewkonqextension.h2
-rw-r--r--kview/kviewviewer/kviewviewer.cpp94
-rw-r--r--kview/kviewviewer/kviewviewer.desktop2
-rw-r--r--kview/kviewviewer/kviewviewer.h6
-rw-r--r--kview/kviewviewer/printimagesettings.ui4
-rw-r--r--kview/kviewviewer/test/test.cpp2
-rw-r--r--kview/kviewviewer/test/test.h2
11 files changed, 60 insertions, 62 deletions
diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp
index d6d9a2d6..b4693ba0 100644
--- a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp
+++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp
@@ -22,7 +22,7 @@
#include <kgenericfactory.h>
#include <tdelocale.h>
#include <tdeglobal.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <kplugininfo.h>
#include <tqstring.h>
@@ -33,7 +33,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kviewviewerpluginsconfig, KViewViewerPluginsConf
KViewViewerPluginsConfig::KViewViewerPluginsConfig( TQWidget * parent, const char *, const TQStringList & args )
: KSettings::PluginPage( KViewViewerPluginsConfigFactory::instance(), parent, args )
{
- m_config = new KSimpleConfig( "kviewviewerrc" );
+ m_config = new TDESimpleConfig( "kviewviewerrc" );
pluginSelector()->addPlugins( TQString::fromAscii( "kviewviewer" ), i18n( "Viewer" ), TQString(), m_config );
pluginSelector()->setShowEmptyConfigPage( false );
}
diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.h b/kview/kviewviewer/config/kviewviewerpluginsconfig.h
index 492e5607..6beff0df 100644
--- a/kview/kviewviewer/config/kviewviewerpluginsconfig.h
+++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.h
@@ -25,7 +25,7 @@ class TDEConfig;
class KViewViewerPluginsConfig : public KSettings::PluginPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
KViewViewerPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() );
diff --git a/kview/kviewviewer/imagesettings.h b/kview/kviewviewer/imagesettings.h
index 683de123..9e48ff61 100644
--- a/kview/kviewviewer/imagesettings.h
+++ b/kview/kviewviewer/imagesettings.h
@@ -25,7 +25,7 @@ class TQCheckBox;
class ImageSettings : public KPrintDialogPage
{
- Q_OBJECT
+ TQ_OBJECT
public:
ImageSettings( TQWidget * parent = 0, const char * name = 0 );
diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp
index ca1c6ca3..e87c214a 100644
--- a/kview/kviewviewer/kviewkonqextension.cpp
+++ b/kview/kviewviewer/kviewkonqextension.cpp
@@ -80,7 +80,7 @@ void KViewKonqExtension::print()
TQImage imagetoprint;
if( printer.option( "app-kviewviewer-fitimage" ) == "1" )
- imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQ_ScaleMin );
+ imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQImage::ScaleMin );
else
imagetoprint = *m_pCanvas->image();
diff --git a/kview/kviewviewer/kviewkonqextension.h b/kview/kviewviewer/kviewkonqextension.h
index ed4ba750..d73622aa 100644
--- a/kview/kviewviewer/kviewkonqextension.h
+++ b/kview/kviewviewer/kviewkonqextension.h
@@ -28,7 +28,7 @@ class KViewViewer;
class KViewKonqExtension: public KParts::BrowserExtension
{
friend class KViewViewer; // it can emit our signals
- Q_OBJECT
+ TQ_OBJECT
public:
KViewKonqExtension( KImageViewer::Canvas *, KViewViewer *parent, const char *name = 0 );
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index dcafd750..d3973946 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -69,7 +69,7 @@ KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/,
KImageIO::registerFormats();
TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<TQWidget>(
- "KImageViewer/Canvas", TQString(), TQT_TQOBJECT(m_pParentWidget) );
+ "KImageViewer/Canvas", TQString(), m_pParentWidget );
m_pCanvas = static_cast<KImageViewer::Canvas *>( widget->tqt_cast( "KImageViewer::Canvas" ) );
kdDebug( 4610 ) << "KImageViewer::Canvas at " << m_pCanvas << endl;
if( ! ( widget && m_pCanvas ) )
@@ -104,21 +104,21 @@ KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/,
else
setXMLFile( "kviewviewer_ro.rc" );
- connect( widget, TQT_SIGNAL( contextPress( const TQPoint & ) ),
- this, TQT_SLOT( slotPopupMenu( const TQPoint & ) ) );
- connect( widget, TQT_SIGNAL( zoomChanged( double ) ),
- this, TQT_SLOT( zoomChanged( double ) ) );
- connect( widget, TQT_SIGNAL( showingImageDone() ),
- this, TQT_SLOT( switchBlendEffect() ) );
- connect( widget, TQT_SIGNAL( hasImage( bool ) ),
- this, TQT_SLOT( hasImage( bool ) ) );
- connect( widget, TQT_SIGNAL( imageChanged() ),
- this, TQT_SLOT( setModified() ) );
+ connect( widget, TQ_SIGNAL( contextPress( const TQPoint & ) ),
+ this, TQ_SLOT( slotPopupMenu( const TQPoint & ) ) );
+ connect( widget, TQ_SIGNAL( zoomChanged( double ) ),
+ this, TQ_SLOT( zoomChanged( double ) ) );
+ connect( widget, TQ_SIGNAL( showingImageDone() ),
+ this, TQ_SLOT( switchBlendEffect() ) );
+ connect( widget, TQ_SIGNAL( hasImage( bool ) ),
+ this, TQ_SLOT( hasImage( bool ) ) );
+ connect( widget, TQ_SIGNAL( imageChanged() ),
+ this, TQ_SLOT( setModified() ) );
- connect( m_pFileWatch, TQT_SIGNAL( dirty( const TQString & ) ),
- this, TQT_SLOT( slotFileDirty( const TQString & ) ) );
+ connect( m_pFileWatch, TQ_SIGNAL( dirty( const TQString & ) ),
+ this, TQ_SLOT( slotFileDirty( const TQString & ) ) );
- KSettings::Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( readSettings() ) );
+ KSettings::Dispatcher::self()->registerInstance( instance(), this, TQ_SLOT( readSettings() ) );
// by default disable progress info (so it won't open the dialog in Konqueror)
setProgressInfoEnabled( false );
@@ -202,8 +202,8 @@ bool KViewViewer::saveAs( const KURL & kurl )
TDEIO::Job * job = TDEIO::copy( KURL( m_file ), kurl, isProgressInfoEnabled() );
emit started( job );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- this, TQT_SLOT( slotResultSaveAs( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQ_SLOT( slotResultSaveAs( TDEIO::Job * ) ) );
return true;
}
kdDebug( 4610 ) << "call KParts::ReadWritePart::saveAs( " << kurl.prettyURL() << " )" << endl;
@@ -268,8 +268,8 @@ bool KViewViewer::openURL( const KURL & url )
m_pJob = TDEIO::get( m_url, m_pExtension->urlArgs().reload, isProgressInfoEnabled() );
emit started( m_pJob );
- connect( m_pJob, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
- connect( m_pJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( m_pJob, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
+ connect( m_pJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
return true;
}
}
@@ -466,33 +466,33 @@ bool KViewViewer::saveFile()
void KViewViewer::setupActions()
{
m_paZoomIn = new TDEAction( i18n( "Zoom In" ), "zoom-in", TDEStdAccel::shortcut( TDEStdAccel::ZoomIn ), this,
- TQT_SLOT( slotZoomIn() ), actionCollection(), "zoomin" );
+ TQ_SLOT( slotZoomIn() ), actionCollection(), "zoomin" );
m_paZoomOut = new TDEAction( i18n( "Zoom Out" ), "zoom-out", TDEStdAccel::shortcut( TDEStdAccel::ZoomOut ), this,
- TQT_SLOT( slotZoomOut() ), actionCollection(), "zoomout" );
+ TQ_SLOT( slotZoomOut() ), actionCollection(), "zoomout" );
m_paZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" );
- connect( m_paZoom, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( setZoom( const TQString & ) ) );
+ connect( m_paZoom, TQ_SIGNAL( activated( const TQString & ) ), this, TQ_SLOT( setZoom( const TQString & ) ) );
m_paZoom->setEditable( true );
m_paZoom->clear();
m_paZoom->setItems( TQStringList::split( '|', "20%|25%|33%|50%|75%|100%|125%|150%|200%|250%|300%|350%|400%|450%|500%" ) );
m_paZoom->setCurrentItem( 5 );
m_paFlipMenu = new TDEActionMenu( i18n( "&Flip" ), actionCollection(), "flip" );
- m_paFlipV = new TDEAction( i18n( "&Vertical" ), Key_V, this, TQT_SLOT( slotFlipV() ), actionCollection(), "flip_vertical" );
- m_paFlipH = new TDEAction( i18n( "&Horizontal" ), Key_H, this, TQT_SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" );
+ m_paFlipV = new TDEAction( i18n( "&Vertical" ), Key_V, this, TQ_SLOT( slotFlipV() ), actionCollection(), "flip_vertical" );
+ m_paFlipH = new TDEAction( i18n( "&Horizontal" ), Key_H, this, TQ_SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" );
m_paFlipMenu->insert( m_paFlipV );
m_paFlipMenu->insert( m_paFlipH );
m_paRotateCCW = new TDEAction( i18n( "Ro&tate Counter-Clockwise" ), "object-rotate-left", 0, this,
- TQT_SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" );
+ TQ_SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" );
m_paRotateCW = new TDEAction( i18n( "Rotate Clockwise" ), "object-rotate-right", 0, this,
- TQT_SLOT( slotRotateCW() ), actionCollection(), "rotateCW" );
- m_paSave = KStdAction::save( this, TQT_SLOT( slotSave() ), actionCollection() );
+ TQ_SLOT( slotRotateCW() ), actionCollection(), "rotateCW" );
+ m_paSave = KStdAction::save( this, TQ_SLOT( slotSave() ), actionCollection() );
m_paSave->setEnabled( false );
- m_paSaveAs = KStdAction::saveAs( this, TQT_SLOT( slotSaveAs() ), actionCollection() );
+ m_paSaveAs = KStdAction::saveAs( this, TQ_SLOT( slotSaveAs() ), actionCollection() );
m_paFitToWin = new TDEAction( i18n( "Fit Image to Window" ), 0, 0, this,
- TQT_SLOT( slotFitToWin() ), actionCollection(), "fittowin" );
+ TQ_SLOT( slotFitToWin() ), actionCollection(), "fittowin" );
m_paZoomIn->setEnabled( false );
m_paZoomOut->setEnabled( false );
m_paZoom->setEnabled( false );
@@ -503,18 +503,18 @@ void KViewViewer::setupActions()
m_paFlipMenu->setEnabled( false );
m_paFlipV->setEnabled( false );
m_paFlipH->setEnabled( false );
- connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paZoomIn, TQT_SLOT( setEnabled( bool ) ) );
- connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paZoomOut, TQT_SLOT( setEnabled( bool ) ) );
- connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paZoom, TQT_SLOT( setEnabled( bool ) ) );
- connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paRotateCCW, TQT_SLOT( setEnabled( bool ) ) );
- connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paRotateCW, TQT_SLOT( setEnabled( bool ) ) );
- connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paSaveAs, TQT_SLOT( setEnabled( bool ) ) );
- connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFitToWin, TQT_SLOT( setEnabled( bool ) ) );
- connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipMenu, TQT_SLOT( setEnabled( bool ) ) );
- connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipV, TQT_SLOT( setEnabled( bool ) ) );
- connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipH, TQT_SLOT( setEnabled( bool ) ) );
-
- m_paShowScrollbars = new TDEToggleAction( i18n( "Show Scrollbars" ), 0, this, TQT_SLOT( slotToggleScrollbars() ),
+ connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paZoomIn, TQ_SLOT( setEnabled( bool ) ) );
+ connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paZoomOut, TQ_SLOT( setEnabled( bool ) ) );
+ connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paZoom, TQ_SLOT( setEnabled( bool ) ) );
+ connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paRotateCCW, TQ_SLOT( setEnabled( bool ) ) );
+ connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paRotateCW, TQ_SLOT( setEnabled( bool ) ) );
+ connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paSaveAs, TQ_SLOT( setEnabled( bool ) ) );
+ connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFitToWin, TQ_SLOT( setEnabled( bool ) ) );
+ connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFlipMenu, TQ_SLOT( setEnabled( bool ) ) );
+ connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFlipV, TQ_SLOT( setEnabled( bool ) ) );
+ connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFlipH, TQ_SLOT( setEnabled( bool ) ) );
+
+ m_paShowScrollbars = new TDEToggleAction( i18n( "Show Scrollbars" ), 0, this, TQ_SLOT( slotToggleScrollbars() ),
actionCollection(), "show_scrollbars" );
m_paShowScrollbars->setCheckedState(i18n("Hide Scrollbars"));
}
@@ -754,7 +754,7 @@ void KViewViewer::slotPopupMenu( const TQPoint &pos )
{
KXMLGUIClient *popupGUIClient = new PopupGUIClient( instance(), m_popupDoc );
- (void) new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveAs() ),
+ (void) new TDEAction( i18n( "Save Image As..." ), 0, this, TQ_SLOT( slotSaveAs() ),
popupGUIClient->actionCollection(), "saveimageas" );
// ### HACK treat the image as dir to get the back/fwd/reload buttons (Simon)
@@ -773,7 +773,7 @@ void KViewViewer::slotResultSaveAs( TDEIO::Job *job )
else
{
emit completed();
- TDEIO::CopyJob * cjob = ::tqqt_cast<TDEIO::CopyJob*>( job );
+ TDEIO::CopyJob * cjob = ::tqt_cast<TDEIO::CopyJob*>( job );
if( cjob )
{
m_url = cjob->destURL();
@@ -803,8 +803,8 @@ void KViewViewer::slotFileDirty( const TQString & )
if( isModified() && isReadWrite() )
{
KPassivePopup * pop = new KPassivePopup( m_pParentWidget );
- TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).arg( kapp->aboutData()->programName() ),
- TQString(), kapp->miniIcon() );
+ TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).arg( tdeApp->aboutData()->programName() ),
+ TQString(), tdeApp->miniIcon() );
( void )new TQLabel( i18n( "The image %1 which you have modified has changed on disk.\n"
"Do you want to reload the file and lose your changes?\n"
"If you don't and subsequently save the image, you will lose the\n"
@@ -818,9 +818,9 @@ void KViewViewer::slotFileDirty( const TQString & )
KPushButton * no = new KPushButton( i18n("Do Not Reload"), hb );
layout->addWidget( no );
layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
- connect( yes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotReloadUnmodified() ) );
- connect( yes, TQT_SIGNAL( clicked() ), pop, TQT_SLOT( hide() ) );
- connect( no, TQT_SIGNAL( clicked() ), pop, TQT_SLOT( hide() ) );
+ connect( yes, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotReloadUnmodified() ) );
+ connect( yes, TQ_SIGNAL( clicked() ), pop, TQ_SLOT( hide() ) );
+ connect( no, TQ_SIGNAL( clicked() ), pop, TQ_SLOT( hide() ) );
pop->setView( vb );
pop->setTimeout( 0 );
pop->setAutoDelete( true );
diff --git a/kview/kviewviewer/kviewviewer.desktop b/kview/kviewviewer/kviewviewer.desktop
index a5643d98..922b25b0 100644
--- a/kview/kviewviewer/kviewviewer.desktop
+++ b/kview/kviewviewer/kviewviewer.desktop
@@ -2,7 +2,7 @@
Type=Service
Icon=kview
# Comment=TDE Image Viewer Part
-MimeType=image/gif;image/x-xpm;image/x-xbm;image/jpeg;image/x-bmp;image/png;image/x-ico;image/x-portable-bitmap;image/x-portable-pixmap;image/x-portable-greymap;image/tiff;image/jp2
+MimeType=image/gif;image/x-xpm;image/x-xbm;image/jpeg;image/x-bmp;image/png;image/x-ico;image/x-portable-bitmap;image/x-portable-pixmap;image/x-portable-greymap;image/tiff;image/jp2;image/webp;
Name=KView Image Viewer
X-TDE-ServiceTypes=KImageViewer/Viewer,KParts/ReadWritePart,Browser/View
X-TDE-InitialPreference=3
diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h
index fa80a255..fdf646b9 100644
--- a/kview/kviewviewer/kviewviewer.h
+++ b/kview/kviewviewer/kviewviewer.h
@@ -25,7 +25,7 @@
#include <tqvaluevector.h>
#include "kviewvieweriface.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
namespace KImageViewer { class Canvas; }
namespace TDEIO { class Job; }
@@ -42,9 +42,9 @@ class KDirWatch;
template<class T>
class TQCache;
-class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIface
+class TDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIface
{
- Q_OBJECT
+ TQ_OBJECT
friend class KViewKonqExtension;
diff --git a/kview/kviewviewer/printimagesettings.ui b/kview/kviewviewer/printimagesettings.ui
index b33b7798..36f07649 100644
--- a/kview/kviewviewer/printimagesettings.ui
+++ b/kview/kviewviewer/printimagesettings.ui
@@ -180,10 +180,8 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">tqwidget.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>tqwidget.h</includehint>
-</includehints>
</UI>
diff --git a/kview/kviewviewer/test/test.cpp b/kview/kviewviewer/test/test.cpp
index 87b0d1c8..ed854567 100644
--- a/kview/kviewviewer/test/test.cpp
+++ b/kview/kviewviewer/test/test.cpp
@@ -27,7 +27,7 @@ Test::Test()
else
{
KMessageBox::error(this, "Could not find our Part!");
- kapp->quit();
+ tdeApp->quit();
}
}
diff --git a/kview/kviewviewer/test/test.h b/kview/kviewviewer/test/test.h
index 608ca4e9..189017bb 100644
--- a/kview/kviewviewer/test/test.h
+++ b/kview/kviewviewer/test/test.h
@@ -12,7 +12,7 @@ namespace KParts { class ReadWritePart; }
class Test : public KParts::MainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
Test();
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-14 03:28:19 +0000