summaryrefslogtreecommitdiffstats
path: root/kview
diff options
context:
space:
mode:
Diffstat (limited to 'kview')
-rw-r--r--kview/config/kviewconfmodules.cpp4
-rw-r--r--kview/kview.cpp12
-rw-r--r--kview/kviewcanvas/config/confmodules.cpp4
-rw-r--r--kview/kviewcanvas/config/generalconfigwidget.ui4
-rw-r--r--kview/kviewviewer/imagesettings.cpp8
-rw-r--r--kview/kviewviewer/kviewviewer.cpp12
-rw-r--r--kview/kviewviewer/printimagesettings.ui6
-rw-r--r--kview/modules/presenter/config/kviewpresenterconfig.cpp4
-rw-r--r--kview/modules/presenter/kviewpresenterconfmodule.cpp4
-rw-r--r--kview/modules/scale/kview_scale.cpp6
10 files changed, 32 insertions, 32 deletions
diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp
index 6645fb1e..e994d8ed 100644
--- a/kview/config/kviewconfmodules.cpp
+++ b/kview/config/kviewconfmodules.cpp
@@ -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->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 c9c4c55d..6b830cac 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -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 * ) ),
@@ -208,7 +208,7 @@ TQSize KView::sizeForCentralWidgetSize( TQSize size )
if( ! mb->isHidden() )
{
size.rheight() += mb->heightForWidth( width() );
- if( tqstyle().styleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) )
+ if( style().styleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) )
size.rheight() += dockWindowsMovable() ? 1 : 2;
}
kdDebug( 4600 ) << "added Menubar: " << size << endl;
@@ -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 );
@@ -653,7 +653,7 @@ TQSize KView::barSize( int mainwinwidth, BarSizeFrom from )
width += toolBar()->width();
break;
case KToolBar::Flat:
- height += kapp->tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent );
+ height += kapp->style().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..4ecf07b9 100644
--- a/kview/kviewcanvas/config/confmodules.cpp
+++ b/kview/kviewcanvas/config/confmodules.cpp
@@ -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 15476bcd..108ed82e 100644
--- a/kview/kviewcanvas/config/generalconfigwidget.ui
+++ b/kview/kviewcanvas/config/generalconfigwidget.ui
@@ -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">
diff --git a/kview/kviewviewer/imagesettings.cpp b/kview/kviewviewer/imagesettings.cpp
index a4259b05..0ee58b78 100644
--- a/kview/kviewviewer/imagesettings.cpp
+++ b/kview/kviewviewer/imagesettings.cpp
@@ -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/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 9971dee8..65513b12 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -810,14 +810,14 @@ void KViewViewer::slotFileDirty( const TQString & )
"If you don't and subsequently save the image, you will lose the\n"
"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 b2cf260f..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">
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp
index 3f868694..e44889ed 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.cpp
+++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp
@@ -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/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp
index b6818271..1c79ee15 100644
--- a/kview/modules/presenter/kviewpresenterconfmodule.cpp
+++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp
@@ -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 4979e4dc..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() );
@@ -116,7 +116,7 @@ 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() );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 06:36:05 +0000