summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chalk/doc/chalk.xmi4
-rw-r--r--chalk/doc/controller.xmi4
-rw-r--r--filters/chalk/jpeg/kis_jpeg_converter.cc4
-rw-r--r--kchart/kchartLegendConfigPage.cc2
-rw-r--r--kchart/kdchart/KDChartParams_io.cpp4
-rw-r--r--kexi/3rdparty/kolibs/KoPageLayoutSize.cpp2
-rw-r--r--kexi/formeditor/factories/stdwidgetfactory.cpp2
-rw-r--r--kexi/main/printing/kexisimpleprintingengine.cpp4
-rw-r--r--kpresenter/KPrMoveHelpLineDia.cpp2
-rw-r--r--kugar/kudesigner/kudesigner_doc.cpp4
-rw-r--r--kugar/kudesigner_lib/canvas.cpp2
-rw-r--r--kugar/kudesigner_lib/kugartemplate.cpp4
-rw-r--r--lib/kofficecore/KoMainWindow.cpp2
-rw-r--r--lib/kofficeui/KoGuideLineDia.cpp2
-rw-r--r--lib/kofficeui/KoPageLayoutSize.cpp2
15 files changed, 22 insertions, 22 deletions
diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi
index c16828cf..ec204a76 100644
--- a/chalk/doc/chalk.xmi
+++ b/chalk/doc/chalk.xmi
@@ -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" />
diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi
index baf5589f..18ac49f0 100644
--- a/chalk/doc/controller.xmi
+++ b/chalk/doc/controller.xmi
@@ -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>
diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc
index 8daebc00..5fa8e78a 100644
--- a/filters/chalk/jpeg/kis_jpeg_converter.cc
+++ b/filters/chalk/jpeg/kis_jpeg_converter.cc
@@ -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;
}
diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc
index fdbf3f10..34edaf83 100644
--- a/kchart/kchartLegendConfigPage.cc
+++ b/kchart/kchartLegendConfigPage.cc
@@ -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());
diff --git a/kchart/kdchart/KDChartParams_io.cpp b/kchart/kdchart/KDChartParams_io.cpp
index 3a3d637d..e24ce590 100644
--- a/kchart/kdchart/KDChartParams_io.cpp
+++ b/kchart/kdchart/KDChartParams_io.cpp
@@ -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;
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
index a8eb447f..c83c381e 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
@@ -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 );
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index 7460b480..08621283 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -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");
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 34b8af21..59a86efd 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -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);
diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp
index 74fb88c4..2abc986f 100644
--- a/kpresenter/KPrMoveHelpLineDia.cpp
+++ b/kpresenter/KPrMoveHelpLineDia.cpp
@@ -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 );
diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp
index aa5cec46..28ed36d1 100644
--- a/kugar/kudesigner/kudesigner_doc.cpp
+++ b/kugar/kudesigner/kudesigner_doc.cpp
@@ -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 );
diff --git a/kugar/kudesigner_lib/canvas.cpp b/kugar/kudesigner_lib/canvas.cpp
index d56e425d..d486ae9d 100644
--- a/kugar/kudesigner_lib/canvas.cpp
+++ b/kugar/kudesigner_lib/canvas.cpp
@@ -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() );
diff --git a/kugar/kudesigner_lib/kugartemplate.cpp b/kugar/kudesigner_lib/kugartemplate.cpp
index deffdcc6..28dc10d7 100644
--- a/kugar/kudesigner_lib/kugartemplate.cpp
+++ b/kugar/kudesigner_lib/kugartemplate.cpp
@@ -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 );
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index b78677f4..be8a0fa2 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -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;
diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp
index d3fb50b1..f91627ec 100644
--- a/lib/kofficeui/KoGuideLineDia.cpp
+++ b/lib/kofficeui/KoGuideLineDia.cpp
@@ -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 );
diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp
index c5868574..c191f565 100644
--- a/lib/kofficeui/KoPageLayoutSize.cpp
+++ b/lib/kofficeui/KoPageLayoutSize.cpp
@@ -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 );