Browse Source

Fix instances of Orientation in quotes which were accidentally renamed to Qt::Orientation during TQt conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1244690 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 8 years ago
parent
commit
e7e4b0b68c
15 changed files with 22 additions and 22 deletions
  1. +2
    -2
      chalk/doc/chalk.xmi
  2. +2
    -2
      chalk/doc/controller.xmi
  3. +2
    -2
      filters/chalk/jpeg/kis_jpeg_converter.cc
  4. +1
    -1
      kchart/kchartLegendConfigPage.cc
  5. +2
    -2
      kchart/kdchart/KDChartParams_io.cpp
  6. +1
    -1
      kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
  7. +1
    -1
      kexi/formeditor/factories/stdwidgetfactory.cpp
  8. +2
    -2
      kexi/main/printing/kexisimpleprintingengine.cpp
  9. +1
    -1
      kpresenter/KPrMoveHelpLineDia.cpp
  10. +2
    -2
      kugar/kudesigner/kudesigner_doc.cpp
  11. +1
    -1
      kugar/kudesigner_lib/canvas.cpp
  12. +2
    -2
      kugar/kudesigner_lib/kugartemplate.cpp
  13. +1
    -1
      lib/kofficecore/KoMainWindow.cpp
  14. +1
    -1
      lib/kofficeui/KoGuideLineDia.cpp
  15. +1
    -1
      lib/kofficeui/KoPageLayoutSize.cpp

+ 2
- 2
chalk/doc/chalk.xmi View File

@@ -983,7 +983,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
</UML:Class>
<UML:Class stereotype="class" visibility="public" xmi.id="740" name="KisGuide" >
<UML:Operation visibility="public" xmi.id="745" type="" name="KisGuide" >
<UML:Parameter visibility="private" xmi.id="746" value="" type="Qt :: Qt::Orientation" name="o" />
<UML:Parameter visibility="private" xmi.id="746" value="" type="Qt :: Orientation" name="o" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="747" type="bool" name="isSelected" />
<UML:Operation visibility="public" xmi.id="748" type="double" name="position" />
@@ -1050,7 +1050,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Operation visibility="public" xmi.id="802" type="" name="KisGuideMgr" />
<UML:Operation visibility="public" xmi.id="803" type="KisGuideSP" name="add" >
<UML:Parameter visibility="private" xmi.id="804" value="" type="double" name="pos" />
<UML:Parameter visibility="private" xmi.id="805" value="" type="Qt :: Qt::Orientation" name="o" />
<UML:Parameter visibility="private" xmi.id="805" value="" type="Qt :: Orientation" name="o" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="806" type="void" name="erase" >
<UML:Parameter visibility="private" xmi.id="807" value="" type="QPaintDevice *" name="device" />


+ 2
- 2
chalk/doc/controller.xmi View File

@@ -2212,7 +2212,7 @@ and the clipboard." isSpecification="false" isLeaf="false" visibility="public" x
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="662" isRoot="false" isAbstract="false" name=TQBYTEARRAY_OBJECT_NAME_STRING />
<UML:Package isSpecification="false" isLeaf="false" visibility="public" xmi.id="677" isRoot="false" isAbstract="false" name="Qt" >
<UML:Namespace.ownedElement>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="678" isRoot="false" isAbstract="false" name="Qt::Orientation" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="678" isRoot="false" isAbstract="false" name="Orientation" />
</UML:Namespace.ownedElement>
</UML:Package>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="685" isRoot="false" isAbstract="false" name=TQPIXMAP_OBJECT_NAME_STRING />
@@ -21842,7 +21842,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</header>
<classfields/>
</classifiercodedocument>
<classifiercodedocument writeOutCode="true" package="Qt" id="678" parent_class="678" fileExt=".java" fileName="Qt::Orientation" >
<classifiercodedocument writeOutCode="true" package="Qt" id="678" parent_class="678" fileExt=".java" fileName="Orientation" >
<textblocks>
<codeblockwithcomments tag="packages" text="package Qt;&amp;#010;" >
<header>


+ 2
- 2
filters/chalk/jpeg/kis_jpeg_converter.cc View File

@@ -274,7 +274,7 @@ KisImageBuilder_Result KisJPEGConverter::decode(const KURL& uri)
exifIO.readExifFromMem( marker->data , marker->data_length );
// Interpret orientation tag
ExifValue v;
if( layer->paintDevice()->exifInfo()->getValue("Qt::Orientation", v) && v.type() == ExifValue::EXIF_TYPE_SHORT)
if( layer->paintDevice()->exifInfo()->getValue("Orientation", v) && v.type() == ExifValue::EXIF_TYPE_SHORT)
{
switch(v.asShort(0)) //
{
@@ -305,7 +305,7 @@ KisImageBuilder_Result KisJPEGConverter::decode(const KURL& uri)
break;
}
v.setValue(0, (TQ_UINT16)1);
layer->paintDevice()->exifInfo()->setValue("Qt::Orientation", v);
layer->paintDevice()->exifInfo()->setValue("Orientation", v);
}
break;
}


+ 1
- 1
kchart/kchartLegendConfigPage.cc View File

@@ -131,7 +131,7 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params,
this, TQT_SLOT(changeTextLegendFont()));

// 4. Block: Qt::Orientation
orientationGroup = new TQVButtonGroup( i18n("Qt::Orientation"), this );
orientationGroup = new TQVButtonGroup( i18n("Orientation"), this );
TQWhatsThis::add(orientationGroup, i18n("Select, if the legend's items should be drawn next to each other, or below each other."));
orientationGroup->setRadioButtonExclusive(true);
orientationGroup->tqlayout()->setSpacing(KDialog::spacingHint());


+ 2
- 2
kchart/kdchart/KDChartParams_io.cpp View File

@@ -786,7 +786,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const

// the Qt::Orientation element
KDXML::createOrientationNode( doc, legendSettingsElement,
"Qt::Orientation", _legendOrientation );
"Orientation", _legendOrientation );

// the ShowLines element
KDXML::createBoolNode( doc, legendSettingsElement,
@@ -1879,7 +1879,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
TQString string;
if( KDXML::readStringNode( element, string ) )
_legendPosition = KDChartParams::stringToLegendPosition( string );
} else if( tagName == "Qt::Orientation" ) {
} else if( tagName == "Orientation" ) {
Qt::Orientation value=Qt::Vertical;
if( KDXML::readOrientationNode( element, value ) )
_legendOrientation = value;


+ 1
- 1
kexi/3rdparty/kolibs/KoPageLayoutSize.cpp View File

@@ -107,7 +107,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *tqparent, const KoPageLayout& tqlay
connect( epgHeight, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( heightChanged(double) ) );

// --------------- orientation ---------------
m_orientGroup = new TQHButtonGroup( i18n( "Qt::Orientation" ), this );
m_orientGroup = new TQHButtonGroup( i18n( "Orientation" ), this );
m_orientGroup->setInsideSpacing( KDialog::spacingHint() );
grid1->addWidget( m_orientGroup, 2, 0 );



+ 1
- 1
kexi/formeditor/factories/stdwidgetfactory.cpp View File

@@ -325,7 +325,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *tqparent, const char *, const TQStr
i18n("Echo mode for Line Edit widget eg. Normal, NoEcho, Password","Echo Mode");
m_propDesc["indent"] = i18n("Indent");
//line
m_propDesc["orientation"] = i18n("Qt::Orientation");
m_propDesc["orientation"] = i18n("Orientation");
//checkbox
m_propDesc["checked"] = i18n("Checked checkbox", "Checked");
m_propDesc["tristate"] = i18n("Tristate checkbox", "Tristate");


+ 2
- 2
kexi/main/printing/kexisimpleprintingengine.cpp View File

@@ -71,7 +71,7 @@ KexiSimplePrintingSettings KexiSimplePrintingSettings::load()
if (config->hasKey("pageFormat"))
settings.pageLayout.format = KoPageFormat::formatFromString(
config->readEntry("pageFormat" ) );
if (config->readEntry("pageQt::Orientation", "portrait").lower()=="landscape")
if (config->readEntry("pageOrientation", "portrait").lower()=="landscape")
settings.pageLayout.orientation = PG_LANDSCAPE;
else
settings.pageLayout.orientation = PG_PORTRAIT;
@@ -99,7 +99,7 @@ void KexiSimplePrintingSettings::save()
config->setGroup("Simple Printing");
config->writeEntry( "pageTitleFont", pageTitleFont );
config->writeEntry( "pageFormat", KoPageFormat::formatString( pageLayout.format ) );
config->writeEntry("pageQt::Orientation",
config->writeEntry("pageOrientation",
pageLayout.orientation == PG_PORTRAIT ? "portrait" : "landscape");
config->writeEntry("pageWidth", pageLayout.ptWidth);
config->writeEntry("pageHeight", pageLayout.ptHeight);


+ 1
- 1
kpresenter/KPrMoveHelpLineDia.cpp View File

@@ -72,7 +72,7 @@ KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *tqparent, const KoRect & _
m_doc=_doc;
setCaption( i18n("Add New Help Line") );
TQVBox *page = makeVBoxMainWidget();
TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal,i18n("Qt::Orientation"), page );
TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal,i18n("Orientation"), page );
group->setRadioButtonExclusive( TRUE );
group->tqlayout();
m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group );


+ 2
- 2
kugar/kudesigner/kudesigner_doc.cpp View File

@@ -251,7 +251,7 @@ bool KudesignerDoc::loadXML( TQIODevice *, const TQDomDocument &rt )
int height = 297;
int width = 210;

if ( attributes.namedItem( "PageQt::Orientation" ).nodeValue().toInt() )
if ( attributes.namedItem( "PageOrientation" ).nodeValue().toInt() )
{
int temp = height;
height = width;
@@ -265,7 +265,7 @@ bool KudesignerDoc::loadXML( TQIODevice *, const TQDomDocument &rt )
printer = new TQPrinter();
printer->setFullPage( true );
printer->setPageSize( ( TQPrinter::PageSize ) attributes.namedItem( "PageSize" ).nodeValue().toInt() );
printer->setOrientation( ( TQPrinter::Orientation ) attributes.namedItem( "PageQt::Orientation" ).nodeValue().toInt() );
printer->setOrientation( ( TQPrinter::Orientation ) attributes.namedItem( "PageOrientation" ).nodeValue().toInt() );

// Get the page metrics and set appropriate wigth and height
TQPaintDeviceMetrics pdm( printer );


+ 1
- 1
kugar/kudesigner_lib/canvas.cpp View File

@@ -155,7 +155,7 @@ bool Canvas::loadXML( const TQDomNode &report )
KugarTemplate *templ = new KugarTemplate( 0, 0, width(), height(), this );
templ->show();
templ->props[ "PageSize" ].setValue( attributes.namedItem( "PageSize" ).nodeValue() );
templ->props[ "PageQt::Orientation" ].setValue( attributes.namedItem( "PageQt::Orientation" ).nodeValue() );
templ->props[ "PageOrientation" ].setValue( attributes.namedItem( "PageOrientation" ).nodeValue() );
templ->props[ "TopMargin" ].setValue( attributes.namedItem( "TopMargin" ).nodeValue().toInt() );
templ->props[ "BottomMargin" ].setValue( attributes.namedItem( "BottomMargin" ).nodeValue().toInt() );
templ->props[ "LeftMargin" ].setValue( attributes.namedItem( "LeftMargin" ).nodeValue().toInt() );


+ 2
- 2
kugar/kudesigner_lib/kugartemplate.cpp View File

@@ -97,7 +97,7 @@ KugarTemplate::KugarTemplate( int x, int y, int width, int height, Canvas *canva

m[ i18n( "Portrait" ) ] = "0";
m[ i18n( "Landscape" ) ] = "1";
props.addProperty( new Property( "PageQt::Orientation", m.values(), m.keys(), "0", i18n( "Page Qt::Orientation" ), i18n( "Page Qt::Orientation" ) ), "DocumentSettings" );
props.addProperty( new Property( "PageOrientation", m.values(), m.keys(), "0", i18n( "Page Orientation" ), i18n( "Page Orientation" ) ), "DocumentSettings" );
m.clear();

props.addProperty( new Property( "TopMargin", 0, i18n( "Top Margin" ), i18n( "Top Margin" ), KoProperty::Integer ), "DocumentSettings" );
@@ -177,7 +177,7 @@ void KugarTemplate::updatePaperProps()
printer = new TQPrinter();
printer->setFullPage( true );
printer->setPageSize( ( TQPrinter::PageSize ) props[ "PageSize" ].value().toInt() );
printer->setOrientation( ( TQPrinter::Orientation ) props[ "PageQt::Orientation" ].value().toInt() );
printer->setOrientation( ( TQPrinter::Orientation ) props[ "PageOrientation" ].value().toInt() );

// Get the page metrics and set appropriate wigth and height
TQPaintDeviceMetrics pdm( printer );


+ 1
- 1
lib/kofficecore/KoMainWindow.cpp View File

@@ -272,7 +272,7 @@ KoMainWindow::KoMainWindow( KInstance *instance, const char* name )
actionCollection(), "view_rm_splitter");
d->m_splitViewActionList.append(d->m_removeView);
d->m_removeView->setEnabled(false);
d->m_orientation=new KSelectAction(i18n("Splitter &Qt::Orientation"), "view_orientation", 0,
d->m_orientation=new KSelectAction(i18n("Splitter &Orientation"), "view_orientation", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSetOrientation()),
actionCollection(), "view_splitter_orientation");
TQStringList items;


+ 1
- 1
lib/kofficeui/KoGuideLineDia.cpp View File

@@ -58,7 +58,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *tqparent, KoPoint &pos, KoRect &rect,
setCaption( i18n("Add Guide Line") );
TQVBox * vbox = makeVBoxMainWidget();

TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Qt::Orientation" ), vbox );
TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Orientation" ), vbox );
group->setRadioButtonExclusive( true );
//group->tqlayout();
m_hButton = new TQRadioButton( i18n( "Horizontal" ), group );


+ 1
- 1
lib/kofficeui/KoPageLayoutSize.cpp View File

@@ -108,7 +108,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *tqparent, const KoPageLayout& tqlay
connect( epgHeight, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( heightChanged(double) ) );

// --------------- orientation ---------------
m_orientGroup = new TQHButtonGroup( i18n( "Qt::Orientation" ), this );
m_orientGroup = new TQHButtonGroup( i18n( "Orientation" ), this );
m_orientGroup->setInsideSpacing( KDialog::spacingHint() );
grid1->addWidget( m_orientGroup, 2, 0 );



Loading…
Cancel
Save