summaryrefslogtreecommitdiffstats
path: root/kview
diff options
context:
space:
mode:
Diffstat (limited to 'kview')
-rw-r--r--kview/config/kviewconfmodules.cpp8
-rw-r--r--kview/kview.cpp34
-rw-r--r--kview/kviewcanvas/config/confmodules.cpp6
-rw-r--r--kview/kviewcanvas/config/generalconfigwidget.ui12
-rw-r--r--kview/kviewcanvas/kimagecanvas.cpp4
-rw-r--r--kview/kviewcanvas/kimageholder.cpp4
-rw-r--r--kview/kviewcanvas/kimageholder.h2
-rw-r--r--kview/kviewviewer/imagesettings.cpp10
-rw-r--r--kview/kviewviewer/kviewkonqextension.cpp2
-rw-r--r--kview/kviewviewer/kviewviewer.cpp28
-rw-r--r--kview/kviewviewer/printimagesettings.ui10
-rw-r--r--kview/modules/presenter/config/kviewpresenterconfig.cpp6
-rw-r--r--kview/modules/presenter/imagelistdialog.ui6
-rw-r--r--kview/modules/presenter/kviewpresenter.cpp6
-rw-r--r--kview/modules/presenter/kviewpresenterconfmodule.cpp6
-rw-r--r--kview/modules/scale/kview_scale.cpp26
-rw-r--r--kview/modules/scale/scaledlg.cpp26
17 files changed, 98 insertions, 98 deletions
diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp
index 0a448b1a..1c93b8fc 100644
--- a/kview/config/kviewconfmodules.cpp
+++ b/kview/config/kviewconfmodules.cpp
@@ -18,7 +18,7 @@
#include "kviewconfmodules.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbuttongroup.h>
#include <tqradiobutton.h>
@@ -35,12 +35,12 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kviewgeneralconfig, KViewGeneralConfigFactory( "
KViewGeneralConfig::KViewGeneralConfig( TQWidget * parent, const char * /*name*/, const TQStringList & args )
: KCModule( KViewGeneralConfigFactory::instance(), parent, args )
{
- TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+ TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
m_pResizeGroup = new TQVButtonGroup( i18n( "Resizing" ), this );
- m_pResizeGroup->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+ m_pResizeGroup->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
connect( m_pResizeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( resizeChanged( int ) ) );
- tqlayout->addWidget( m_pResizeGroup );
+ layout->addWidget( m_pResizeGroup );
( void )new TQRadioButton( i18n( "Only resize window" ), m_pResizeGroup );
( void )new TQRadioButton( i18n( "Resize image to fit window" ), m_pResizeGroup );
diff --git a/kview/kview.cpp b/kview/kview.cpp
index a67ad03a..d17e1cbf 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -46,7 +46,7 @@
#include <tqsize.h>
#include <tqscrollbar.h>
#include <tqstyle.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqdragobject.h>
#include <tqvaluelist.h>
#include <tqtimer.h>
@@ -89,7 +89,7 @@ KView::KView()
connect( part->widget(), TQT_SIGNAL( contextPress( const TQPoint & ) ),
TQT_SLOT( contextPress( const TQPoint & ) ) );
- connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
+ connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
TQT_SLOT( clipboardDataChanged() ) );
connect( m_pViewer, TQT_SIGNAL( started( KIO::Job * ) ),
@@ -120,7 +120,7 @@ KView::KView()
// create status bar (hidden by default)
statusBar()->insertItem( "", STATUSBAR_SPEED_ID, 0, true );
statusBar()->setItemFixed( STATUSBAR_SPEED_ID,
- 8 + fontMetrics().width( i18n( "%1/s" ).tqarg( KIO::convertSize( 999000 ) ) ) );
+ 8 + fontMetrics().width( i18n( "%1/s" ).arg( KIO::convertSize( 999000 ) ) ) );
statusBar()->insertItem( "", STATUSBAR_CURSOR_ID, 0, true );
statusBar()->setItemFixed( STATUSBAR_CURSOR_ID, 8 + fontMetrics().width( "8888, 8888" ) );
statusBar()->insertItem( "", STATUSBAR_SIZE_ID, 0, true );
@@ -163,13 +163,13 @@ void KView::load( const KURL & url )
if( url.isLocalFile() )
{
// XXX: this code is what
- //KRecentDirs::add( TQString::tqfromLatin1( ":load_image" ), url.directory() );
+ //KRecentDirs::add( TQString::fromLatin1( ":load_image" ), url.directory() );
// would do:
TQString directory = url.directory();
- TQString key = TQString::tqfromLatin1( "load_image" );
+ TQString key = TQString::fromLatin1( "load_image" );
KConfig * config = KGlobal::config();
- config->setGroup( TQString::tqfromLatin1( "Recent Dirs" ) );
+ config->setGroup( TQString::fromLatin1( "Recent Dirs" ) );
TQStringList result = config->readPathListEntry( key );
// make sure the dir is first in history
result.remove( directory );
@@ -208,7 +208,7 @@ TQSize KView::sizeForCentralWidgetSize( TQSize size )
if( ! mb->isHidden() )
{
size.rheight() += mb->heightForWidth( width() );
- if( tqstyle().tqstyleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) )
+ if( tqstyle().styleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) )
size.rheight() += dockWindowsMovable() ? 1 : 2;
}
kdDebug( 4600 ) << "added Menubar: " << size << endl;
@@ -262,7 +262,7 @@ bool KView::eventFilter( TQObject * obj, TQEvent * ev )
void KView::imageSizeChanged( const TQSize & /*size*/ )
{
TQSize size = m_pCanvas->imageSize();
- statusBar()->changeItem( TQString( "%1 x %2" ).tqarg( size.width() ).tqarg( size.height() ), STATUSBAR_SIZE_ID );
+ statusBar()->changeItem( TQString( "%1 x %2" ).arg( size.width() ).arg( size.height() ), STATUSBAR_SIZE_ID );
handleResize();
}
@@ -272,7 +272,7 @@ void KView::selectionChanged( const TQRect & rect )
if( rect.isNull() )
statusBar()->changeItem( TQString(), STATUSBAR_SELECTION_ID );
else
- statusBar()->changeItem( TQString( "%1, %2 - %3 x %4" ).tqarg( rect.x() ).tqarg( rect.y() ).tqarg( rect.width() ).tqarg( rect.height() ), STATUSBAR_SELECTION_ID );
+ statusBar()->changeItem( TQString( "%1, %2 - %3 x %4" ).arg( rect.x() ).arg( rect.y() ).arg( rect.width() ).arg( rect.height() ), STATUSBAR_SELECTION_ID );
action( "crop" )->setEnabled( ! rect.isNull() );
}
@@ -301,7 +301,7 @@ void KView::slotClose()
void KView::slotCopy()
{
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
cb->setSelectionMode( false );
TQRect selectarea = m_pCanvas->selection();
@@ -320,7 +320,7 @@ void KView::slotCopy()
void KView::slotPaste()
{
// Get TQImage from clipboard and create a new image.
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
TQImage img = cb->image();
if( ! img.isNull() )
m_pViewer->newImage( img );
@@ -412,7 +412,7 @@ void KView::enableAction( const char * name, bool b )
void KView::clipboardDataChanged()
{
- TQClipboard * cb = TQApplication::tqclipboard();
+ TQClipboard * cb = TQApplication::clipboard();
cb->setSelectionMode( false );
bool hasImage = TQImageDrag::canDecode( cb->data( TQClipboard::Clipboard ) );
m_paPaste->setEnabled( hasImage );
@@ -466,7 +466,7 @@ void KView::speedProgress( KIO::Job *, unsigned long bytesPerSecond )
TQString sizeStr;
if( bytesPerSecond > 0 )
- sizeStr = i18n( "%1/s" ).tqarg( KIO::convertSize( bytesPerSecond ) );
+ sizeStr = i18n( "%1/s" ).arg( KIO::convertSize( bytesPerSecond ) );
else
sizeStr = i18n( "Stalled" );
@@ -483,7 +483,7 @@ void KView::slotSetStatusBarText( const TQString & msg )
void KView::cursorPos( const TQPoint & pos )
{
- statusBar()->changeItem( TQString( "%1, %2" ).tqarg( pos.x() ).tqarg( pos.y() ), STATUSBAR_CURSOR_ID );
+ statusBar()->changeItem( TQString( "%1, %2" ).arg( pos.x() ).arg( pos.y() ), STATUSBAR_CURSOR_ID );
}
void KView::setupActions( TQObject * partobject )
@@ -498,7 +498,7 @@ void KView::setupActions( TQObject * partobject )
TQObject * extension = partobject->child( 0, "KParts::BrowserExtension", false );
if( extension )
{
- TQStrList slotNames = extension->tqmetaObject()->slotNames();
+ TQStrList slotNames = extension->metaObject()->slotNames();
if( slotNames.contains( "print()" ) )
KStdAction::print( extension, TQT_SLOT( print() ), actionCollection(), "print" );
if( slotNames.contains( "del()" ) )
@@ -614,7 +614,7 @@ void KView::fitWindowToImage()
winsize.setWidth( workarea.width() );
}
- TQRect winrect( tqgeometry() );
+ TQRect winrect( geometry() );
winrect.setSize( winsize );
int xdiff = winrect.x() + winrect.width() - workarea.x() - workarea.width();
@@ -653,7 +653,7 @@ TQSize KView::barSize( int mainwinwidth, BarSizeFrom from )
width += toolBar()->width();
break;
case KToolBar::Flat:
- height += kapp->tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent );
+ height += kapp->tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent );
break;
case KToolBar::Floating:
break;
diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp
index f9cf90cc..0aeb3b1b 100644
--- a/kview/kviewcanvas/config/confmodules.cpp
+++ b/kview/kviewcanvas/config/confmodules.cpp
@@ -20,7 +20,7 @@
#include "generalconfigwidget.h"
#include "defaults.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqframe.h>
@@ -38,8 +38,8 @@ KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQS
: KCModule( KViewCanvasConfigFactory::instance(), parent, args )
, m_config( new KConfig( "kviewcanvasrc" ) )
{
- TQBoxLayout * tqlayout = new TQVBoxLayout( this );
- tqlayout->setAutoAdd( true );
+ TQBoxLayout * layout = new TQVBoxLayout( this );
+ layout->setAutoAdd( true );
m_pWidget = new GeneralConfigWidget( this );
m_pWidget->m_pMinWidth ->setRange( 1, 200 );
diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui
index 746fa02c..108ed82e 100644
--- a/kview/kviewcanvas/config/generalconfigwidget.ui
+++ b/kview/kviewcanvas/config/generalconfigwidget.ui
@@ -110,7 +110,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>0</height>
@@ -127,7 +127,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>0</height>
@@ -138,7 +138,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -181,7 +181,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -239,7 +239,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -259,7 +259,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp
index a2e6c5b7..3efd8228 100644
--- a/kview/kviewcanvas/kimagecanvas.cpp
+++ b/kview/kviewcanvas/kimagecanvas.cpp
@@ -543,7 +543,7 @@ void KImageCanvas::slotUpdateImage()
if( m_bSizeChanged || m_bNewImage )
{
- TQSize sh = m_client->tqsizeHint();
+ TQSize sh = m_client->sizeHint();
if( ! sh.isValid() )
sh = TQSize( 0, 0 );
m_client->resize( sh );
@@ -587,7 +587,7 @@ void KImageCanvas::slotUpdateImage()
void KImageCanvas::mouseMoveEvent( TQMouseEvent * )
{
- if( m_cursor.tqshape() == TQt::BlankCursor )
+ if( m_cursor.shape() == TQt::BlankCursor )
{
m_cursor.setShape( Qt::CrossCursor );
viewport()->setCursor( m_cursor );
diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp
index f2e54462..b34cfab2 100644
--- a/kview/kviewcanvas/kimageholder.cpp
+++ b/kview/kviewcanvas/kimageholder.cpp
@@ -207,7 +207,7 @@ void KImageHolder::eraseSelect()
inner.rBottom() -= 1;
r -= inner;
- TQMemArray<TQRect> rects = r.tqrects();
+ TQMemArray<TQRect> rects = r.rects();
if( m_pDoubleBuffer )
for( unsigned int i = 0; i < rects.size(); ++i )
@@ -269,7 +269,7 @@ TQRect KImageHolder::selection() const
return TQRect();
}
-TQSize KImageHolder::tqsizeHint() const
+TQSize KImageHolder::sizeHint() const
{
if( m_pPixmap )
return m_pPixmap->size();
diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h
index 165ec0bc..a5555e2b 100644
--- a/kview/kviewcanvas/kimageholder.h
+++ b/kview/kviewcanvas/kimageholder.h
@@ -57,7 +57,7 @@ class KImageHolder : public TQWidget
*/
TQRect selection() const;
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
void setDrawRect( const TQRect & rect ) { m_drawRect = rect; }
const TQRect & drawRect() const { return m_drawRect; }
diff --git a/kview/kviewviewer/imagesettings.cpp b/kview/kviewviewer/imagesettings.cpp
index a4259b05..0a2e0dc3 100644
--- a/kview/kviewviewer/imagesettings.cpp
+++ b/kview/kviewviewer/imagesettings.cpp
@@ -19,7 +19,7 @@
#include "imagesettings.h"
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
#include <kdialog.h>
@@ -30,14 +30,14 @@ ImageSettings::ImageSettings( TQWidget * parent, const char * name )
{
setTitle( i18n( "Image Settings" ) );
- TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+ TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
m_pFitImage = new TQCheckBox( i18n( "Fit image to page size" ), this );
m_pFitImage->setChecked( true );
- tqlayout->addWidget( m_pFitImage );
+ layout->addWidget( m_pFitImage );
m_pCenter = new TQCheckBox( i18n( "Center image on page" ), this );
m_pCenter->setChecked( true );
- tqlayout->addWidget( m_pCenter );
- tqlayout->insertStretch( -1, 0 );
+ layout->addWidget( m_pCenter );
+ layout->insertStretch( -1, 0 );
}
ImageSettings::~ImageSettings()
diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp
index ed93d6ea..2d4f8bb9 100644
--- a/kview/kviewviewer/kviewkonqextension.cpp
+++ b/kview/kviewviewer/kviewkonqextension.cpp
@@ -68,7 +68,7 @@ void KViewKonqExtension::print()
printer.addDialogPage( new ImageSettings );
printer.setDocName( "KView: " + m_pViewer->url().fileName( false ) );
- if ( !printer.setup( ((KViewViewer *)parent())->widget(), i18n("Print %1").tqarg(m_pViewer->url().fileName( false )) ) )
+ if ( !printer.setup( ((KViewViewer *)parent())->widget(), i18n("Print %1").arg(m_pViewer->url().fileName( false )) ) )
return;
TQPainter painter;
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 73d1bd92..a2b3b4a9 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -29,7 +29,7 @@
#include <assert.h>
#include <tqbuffer.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <tqlabel.h>
#include <tqregexp.h>
@@ -397,7 +397,7 @@ bool KViewViewer::openFile()
}
else
{
- emit setStatusBarText( i18n( "Unknown image format: %1" ).tqarg( m_url.prettyURL() ) );
+ emit setStatusBarText( i18n( "Unknown image format: %1" ).arg( m_url.prettyURL() ) );
return false;
}
}
@@ -406,12 +406,12 @@ bool KViewViewer::openFile()
kdDebug( 4610 ) << k_funcinfo << " load from file: " << m_file << endl;
if( ! TQFile::exists( m_file ) )
{
- emit setStatusBarText( i18n( "No such file: %1" ).tqarg( m_file ) );
+ emit setStatusBarText( i18n( "No such file: %1" ).arg( m_file ) );
return false;
}
if( TQImage::imageFormat( m_file ) == 0 )
{
- emit setStatusBarText( i18n( "Unknown image format: %1" ).tqarg( m_file ) );
+ emit setStatusBarText( i18n( "Unknown image format: %1" ).arg( m_file ) );
return false;
}
// determine Mime Type
@@ -567,7 +567,7 @@ void KViewViewer::writeSettings()
void KViewViewer::zoomChanged( double zoom )
{
kdDebug( 4610 ) << k_funcinfo << endl;
- emit setWindowCaption( m_sCaption + TQString( " (%1%)" ).tqarg( zoom * 100, 0, 'f', 0 ) );
+ emit setWindowCaption( m_sCaption + TQString( " (%1%)" ).arg( zoom * 100, 0, 'f', 0 ) );
updateZoomMenu( zoom );
}
@@ -685,7 +685,7 @@ void KViewViewer::updateZoomMenu( double zoom )
}
// first look if it's a new value (not in the list yet)
- TQString z = TQString( "%1%" ).tqarg( zoom * 100, 0, 'f', 0 );
+ TQString z = TQString( "%1%" ).arg( zoom * 100, 0, 'f', 0 );
TQStringList items = m_paZoom->items();
int idx = items.findIndex( z );
if( -1 == idx )
@@ -803,21 +803,21 @@ void KViewViewer::slotFileDirty( const TQString & )
if( isModified() && isReadWrite() )
{
KPassivePopup * pop = new KPassivePopup( m_pParentWidget );
- TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).tqarg( kapp->aboutData()->programName() ),
+ TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).arg( kapp->aboutData()->programName() ),
TQString(), kapp->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"
- "changes that have already been saved." ).tqarg( url().fileName() ), vb );
+ "changes that have already been saved." ).arg( url().fileName() ), vb );
TQWidget * hb = new TQWidget( vb );
- TQHBoxLayout * tqlayout = new TQHBoxLayout( hb );
- tqlayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+ TQHBoxLayout * layout = new TQHBoxLayout( hb );
+ layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
KPushButton * yes = new KPushButton( i18n("Reload"), hb );
- tqlayout->addWidget( yes );
- tqlayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+ layout->addWidget( yes );
+ layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
KPushButton * no = new KPushButton( i18n("Do Not Reload"), hb );
- tqlayout->addWidget( no );
- tqlayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+ 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() ) );
diff --git a/kview/kviewviewer/printimagesettings.ui b/kview/kviewviewer/printimagesettings.ui
index 2eed3c78..8c35a9b2 100644
--- a/kview/kviewviewer/printimagesettings.ui
+++ b/kview/kviewviewer/printimagesettings.ui
@@ -25,7 +25,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -39,7 +39,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -93,7 +93,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>0</height>
@@ -168,7 +168,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>0</height>
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp
index 3f868694..f05cc936 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.cpp
+++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp
@@ -18,7 +18,7 @@
#include "kviewpresenterconfig.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqframe.h>
@@ -34,8 +34,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kviewpresenterconfig, KViewPresenterConfigFactor
KViewPresenterConfig::KViewPresenterConfig( TQWidget * parent, const char *, const TQStringList & args )
: KCModule( KViewPresenterConfigFactory::instance(), parent, args )
{
- TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
- tqlayout->setAutoAdd( true );
+ TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+ layout->setAutoAdd( true );
m_pCheckBox = new TQCheckBox( "This is only for testing...", this );
connect( m_pCheckBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( checkChanged() ) );
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index d56343dc..05d3b90f 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -60,7 +60,7 @@
<property name="name">
<cstring>m_pListView</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
@@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -188,7 +188,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>80</height>
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index e7275c0d..4a309902 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -24,7 +24,7 @@
#include <tqvbox.h>
#include <tqobjectlist.h>
-#include <tqsignalslotimp.h>
+#include <signalslotimp.h>
#include <tqtimer.h>
#include <tqevent.h>
#include <tqdragobject.h>
@@ -412,7 +412,7 @@ void KViewPresenter::loadList()
TQString tempfile;
if( ! KIO::NetAccess::download( url, tempfile, m_pViewer->widget() ) )
{
- KMessageBox::error( m_pImageList, i18n( "Could not load\n%1" ).tqarg( url.prettyURL() ) );
+ KMessageBox::error( m_pImageList, i18n( "Could not load\n%1" ).arg( url.prettyURL() ) );
return;
}
TQFile file( tempfile );
@@ -442,7 +442,7 @@ void KViewPresenter::loadList()
}
else
{
- KMessageBox::error( m_pImageList, i18n( "Wrong format\n%1" ).tqarg( url.prettyURL() ) );
+ KMessageBox::error( m_pImageList, i18n( "Wrong format\n%1" ).arg( url.prettyURL() ) );
}
file.close();
}
diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp
index b6818271..3c9ce04f 100644
--- a/kview/modules/presenter/kviewpresenterconfmodule.cpp
+++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp
@@ -20,7 +20,7 @@
#include "kviewpresenterconfmodule.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqframe.h>
@@ -49,8 +49,8 @@ void KViewPresenterConfModule::reset()
void KViewPresenterConfModule::createPage( TQFrame * page )
{
- TQBoxLayout * tqlayout = new TQVBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint() );
- tqlayout->setAutoAdd( true );
+ TQBoxLayout * layout = new TQVBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint() );
+ layout->setAutoAdd( true );
m_pCheckBox = new TQCheckBox( "This is only for testing...", page );
}
diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp
index 95802df4..f5138f55 100644
--- a/kview/modules/scale/kview_scale.cpp
+++ b/kview/modules/scale/kview_scale.cpp
@@ -64,9 +64,9 @@ void KViewScale::slotScaleDlg()
KDialogBase dlg( m_pViewer->widget(), "KView scale dialog", true, i18n( "Scale Image" ), KDialogBase::Ok|KDialogBase::Cancel );
ScaleDlg widget( m_pCanvas->imageSize(), dlg.makeVBoxMainWidget() );
#if 0
- TQVBox * tqlayout = dlg.makeVBoxMainWidget();
+ TQVBox * layout = dlg.makeVBoxMainWidget();
- TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), tqlayout );
+ TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), layout );
TQGridLayout * pixelgroupgrid = new TQGridLayout( pixelgroup, 1, 1, 0, KDialog::spacingHint() );
pixelgroupgrid->setSpacing( KDialog::spacingHint() );
pixelgroupgrid->setMargin( KDialog::marginHint() );
@@ -75,21 +75,21 @@ void KViewScale::slotScaleDlg()
// show original width
label = new TQLabel( i18n( "Original width:" ), pixelgroup );
- label->tqsetAlignment( TQLabel::AlignRight );
+ label->setAlignment( TQLabel::AlignRight );
pixelgroupgrid->addWidget( label, 0, 0 );
pixelgroupgrid->addWidget( new TQLabel( TQString::number( imagesize.width() ), pixelgroup ), 0, 1 );
label = new TQLabel( i18n( "Height:" ), pixelgroup );
- label->tqsetAlignment( TQLabel::AlignRight );
+ label->setAlignment( TQLabel::AlignRight );
pixelgroupgrid->addWidget( label, 1, 0 );
pixelgroupgrid->addWidget( new TQLabel( TQString::number( imagesize.height() ), pixelgroup ), 1, 1 );
pixelgroupgrid->addRowSpacing( 2, KDialog::spacingHint() );
label = new TQLabel( i18n( "New width:" ), pixelgroup );
- label->tqsetAlignment( TQLabel::AlignRight );
+ label->setAlignment( TQLabel::AlignRight );
pixelgroupgrid->addWidget( label, 3, 0 );
label = new TQLabel( i18n( "Height:" ), pixelgroup );
- label->tqsetAlignment( TQLabel::AlignRight );
+ label->setAlignment( TQLabel::AlignRight );
pixelgroupgrid->addWidget( label, 4, 0 );
TQSpinBox * newwidth = new TQSpinBox( 1, 100000, 1, pixelgroup );
pixelgroupgrid->addWidget( newwidth, 3, 1 );
@@ -103,10 +103,10 @@ void KViewScale::slotScaleDlg()
pixelgroupgrid->addRowSpacing( 5, KDialog::spacingHint() );
label = new TQLabel( i18n( "Ratio X:" ), pixelgroup );
- label->tqsetAlignment( TQLabel::AlignRight );
+ label->setAlignment( TQLabel::AlignRight );
pixelgroupgrid->addWidget( label, 6, 0 );
label = new TQLabel( i18n( "Y:" ), pixelgroup );
- label->tqsetAlignment( TQLabel::AlignRight );
+ label->setAlignment( TQLabel::AlignRight );
pixelgroupgrid->addWidget( label, 7, 0 );
TQSpinBox * ratiox = new TQSpinBox( pixelgroup );
ratiox->setValidator( new TQDoubleValidator( 0.0001, 10000, 4, ratiox ) );
@@ -116,16 +116,16 @@ void KViewScale::slotScaleDlg()
pixelgroupgrid->addWidget( ratioy, 7, 1 );
pixelgroupgrid->addMultiCellWidget( new TQCheckBox( i18n( "Link" ), pixelgroup ), 6, 7, 2, 2, TQt::AlignVCenter );
- TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), tqlayout );
+ TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), layout );
TQGridLayout * printgroupgrid = new TQGridLayout( printgroup, 1, 1, 0, KDialog::spacingHint() );
printgroupgrid->setSpacing( KDialog::spacingHint() );
printgroupgrid->setMargin( KDialog::marginHint() );
label = new TQLabel( i18n( "New width:" ), printgroup );
- label->tqsetAlignment( TQLabel::AlignRight );
+ label->setAlignment( TQLabel::AlignRight );
printgroupgrid->addWidget( label, 0, 0 );
label = new TQLabel( i18n( "Height:" ), printgroup );
- label->tqsetAlignment( TQLabel::AlignRight );
+ label->setAlignment( TQLabel::AlignRight );
printgroupgrid->addWidget( label, 1, 0 );
TQSpinBox * newwidth2 = new TQSpinBox( printgroup );
printgroupgrid->addWidget( newwidth2, 0, 1 );
@@ -139,10 +139,10 @@ void KViewScale::slotScaleDlg()
printgroupgrid->addRowSpacing( 2, KDialog::spacingHint() );
label = new TQLabel( i18n( "Resolution X:" ), printgroup );
- label->tqsetAlignment( TQLabel::AlignRight );
+ label->setAlignment( TQLabel::AlignRight );
printgroupgrid->addWidget( label, 3, 0 );
label = new TQLabel( i18n( "Y:" ), printgroup );
- label->tqsetAlignment( TQLabel::AlignRight );
+ label->setAlignment( TQLabel::AlignRight );
printgroupgrid->addWidget( label, 4, 0 );
TQSpinBox * resx = new TQSpinBox( printgroup );
printgroupgrid->addWidget( resx, 3, 1 );
diff --git a/kview/modules/scale/scaledlg.cpp b/kview/modules/scale/scaledlg.cpp
index 335ab1c9..3105bd85 100644
--- a/kview/modules/scale/scaledlg.cpp
+++ b/kview/modules/scale/scaledlg.cpp
@@ -21,7 +21,7 @@
#include "scaledlg.h"
#include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqspinbox.h>
#include <tqcheckbox.h>
@@ -61,53 +61,53 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name
pixelgroupgrid->addRowSpacing( 0, KDialog::spacingHint() );
label = new TQLabel( i18n( "Original width:" ), pixelgroup );
- label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( label, 1, 0 );
label = new TQLabel( i18n( "Height:" ), pixelgroup );
- label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( label, 2, 0 );
pixelgroupgrid->addRowSpacing( 3, KDialog::spacingHint() );
label = new TQLabel( i18n( "New width:" ), pixelgroup );
- label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( label, 4, 0 );
label = new TQLabel( i18n( "Height:" ), pixelgroup );
- label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( label, 5, 0 );
pixelgroupgrid->addRowSpacing( 6, KDialog::spacingHint() );
label = new TQLabel( i18n( "Ratio X:" ), pixelgroup );
- label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( label, 7, 0 );
label = new TQLabel( i18n( "Y:" ), pixelgroup );
- label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( label, 8, 0 );
printgroupgrid->addRowSpacing( 0, KDialog::spacingHint() );
label = new TQLabel( i18n( "New width:" ), printgroup );
- label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
printgroupgrid->addWidget( label, 1, 0 );
label = new TQLabel( i18n( "Height:" ), printgroup );
- label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
printgroupgrid->addWidget( label, 2, 0 );
printgroupgrid->addRowSpacing( 3, KDialog::spacingHint() );
label = new TQLabel( i18n( "Resolution X:" ), printgroup );
- label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
printgroupgrid->addWidget( label, 4, 0 );
label = new TQLabel( i18n( "Y:" ), printgroup );
- label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
printgroupgrid->addWidget( label, 5, 0 );
m_pOldWidth = new TQLabel( TQString::number( origsize.width() ), pixelgroup );
- m_pOldWidth->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_pOldWidth->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( m_pOldWidth, 1, 1 );
m_pOldHeight = new TQLabel( TQString::number( origsize.height() ), pixelgroup );
- m_pOldHeight->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_pOldHeight->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( m_pOldHeight, 2, 1 );
m_pNewWidth = new KFloatSpinBox( 1.0, 100000.0, 10.0, 0, pixelgroup );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 19:49:26 +0000