summaryrefslogtreecommitdiffstats
path: root/kview/modules
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:00 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:00 -0600
commitec1fddcd0d6663ad273af85357f04abbc5689468 (patch)
tree6cb946ab8b4771868c6eee8d1aa5213d6ec246e2 /kview/modules
parentc2637a0da6d9a1c8626ca39f8451ab3b7cda487a (diff)
downloadtdegraphics-ec1fddcd0d6663ad273af85357f04abbc5689468.tar.gz
tdegraphics-ec1fddcd0d6663ad273af85357f04abbc5689468.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.
Diffstat (limited to 'kview/modules')
-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
6 files changed, 38 insertions, 38 deletions
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp
index f05cc936..3f868694 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.cpp
+++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp
@@ -18,7 +18,7 @@
#include "kviewpresenterconfig.h"
-#include <layout.h>
+#include <tqlayout.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 * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
- layout->setAutoAdd( true );
+ TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+ tqlayout->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 05d3b90f..d56343dc 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="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>400</width>
<height>0</height>
@@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -188,7 +188,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>80</height>
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index 4a309902..e7275c0d 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -24,7 +24,7 @@
#include <tqvbox.h>
#include <tqobjectlist.h>
-#include <signalslotimp.h>
+#include <tqsignalslotimp.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" ).arg( url.prettyURL() ) );
+ KMessageBox::error( m_pImageList, i18n( "Could not load\n%1" ).tqarg( url.prettyURL() ) );
return;
}
TQFile file( tempfile );
@@ -442,7 +442,7 @@ void KViewPresenter::loadList()
}
else
{
- KMessageBox::error( m_pImageList, i18n( "Wrong format\n%1" ).arg( url.prettyURL() ) );
+ KMessageBox::error( m_pImageList, i18n( "Wrong format\n%1" ).tqarg( url.prettyURL() ) );
}
file.close();
}
diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp
index 3c9ce04f..b6818271 100644
--- a/kview/modules/presenter/kviewpresenterconfmodule.cpp
+++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp
@@ -20,7 +20,7 @@
#include "kviewpresenterconfmodule.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqframe.h>
@@ -49,8 +49,8 @@ void KViewPresenterConfModule::reset()
void KViewPresenterConfModule::createPage( TQFrame * page )
{
- TQBoxLayout * layout = new TQVBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint() );
- layout->setAutoAdd( true );
+ TQBoxLayout * tqlayout = new TQVBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint() );
+ tqlayout->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 f5138f55..95802df4 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 * layout = dlg.makeVBoxMainWidget();
+ TQVBox * tqlayout = dlg.makeVBoxMainWidget();
- TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), layout );
+ TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), tqlayout );
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->setAlignment( TQLabel::AlignRight );
+ label->tqsetAlignment( 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->setAlignment( TQLabel::AlignRight );
+ label->tqsetAlignment( 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->setAlignment( TQLabel::AlignRight );
+ label->tqsetAlignment( TQLabel::AlignRight );
pixelgroupgrid->addWidget( label, 3, 0 );
label = new TQLabel( i18n( "Height:" ), pixelgroup );
- label->setAlignment( TQLabel::AlignRight );
+ label->tqsetAlignment( 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->setAlignment( TQLabel::AlignRight );
+ label->tqsetAlignment( TQLabel::AlignRight );
pixelgroupgrid->addWidget( label, 6, 0 );
label = new TQLabel( i18n( "Y:" ), pixelgroup );
- label->setAlignment( TQLabel::AlignRight );
+ label->tqsetAlignment( 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" ), layout );
+ TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), tqlayout );
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->setAlignment( TQLabel::AlignRight );
+ label->tqsetAlignment( TQLabel::AlignRight );
printgroupgrid->addWidget( label, 0, 0 );
label = new TQLabel( i18n( "Height:" ), printgroup );
- label->setAlignment( TQLabel::AlignRight );
+ label->tqsetAlignment( 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->setAlignment( TQLabel::AlignRight );
+ label->tqsetAlignment( TQLabel::AlignRight );
printgroupgrid->addWidget( label, 3, 0 );
label = new TQLabel( i18n( "Y:" ), printgroup );
- label->setAlignment( TQLabel::AlignRight );
+ label->tqsetAlignment( 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 3105bd85..335ab1c9 100644
--- a/kview/modules/scale/scaledlg.cpp
+++ b/kview/modules/scale/scaledlg.cpp
@@ -21,7 +21,7 @@
#include "scaledlg.h"
#include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.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->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( label, 1, 0 );
label = new TQLabel( i18n( "Height:" ), pixelgroup );
- label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( label, 2, 0 );
pixelgroupgrid->addRowSpacing( 3, KDialog::spacingHint() );
label = new TQLabel( i18n( "New width:" ), pixelgroup );
- label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( label, 4, 0 );
label = new TQLabel( i18n( "Height:" ), pixelgroup );
- label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( label, 5, 0 );
pixelgroupgrid->addRowSpacing( 6, KDialog::spacingHint() );
label = new TQLabel( i18n( "Ratio X:" ), pixelgroup );
- label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( label, 7, 0 );
label = new TQLabel( i18n( "Y:" ), pixelgroup );
- label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( label, 8, 0 );
printgroupgrid->addRowSpacing( 0, KDialog::spacingHint() );
label = new TQLabel( i18n( "New width:" ), printgroup );
- label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
printgroupgrid->addWidget( label, 1, 0 );
label = new TQLabel( i18n( "Height:" ), printgroup );
- label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
printgroupgrid->addWidget( label, 2, 0 );
printgroupgrid->addRowSpacing( 3, KDialog::spacingHint() );
label = new TQLabel( i18n( "Resolution X:" ), printgroup );
- label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
printgroupgrid->addWidget( label, 4, 0 );
label = new TQLabel( i18n( "Y:" ), printgroup );
- label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
printgroupgrid->addWidget( label, 5, 0 );
m_pOldWidth = new TQLabel( TQString::number( origsize.width() ), pixelgroup );
- m_pOldWidth->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_pOldWidth->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( m_pOldWidth, 1, 1 );
m_pOldHeight = new TQLabel( TQString::number( origsize.height() ), pixelgroup );
- m_pOldHeight->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_pOldHeight->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
pixelgroupgrid->addWidget( m_pOldHeight, 2, 1 );
m_pNewWidth = new KFloatSpinBox( 1.0, 100000.0, 10.0, 0, pixelgroup );