summaryrefslogtreecommitdiffstats
path: root/kig/filters
diff options
context:
space:
mode:
Diffstat (limited to 'kig/filters')
-rw-r--r--kig/filters/cabri-filter.cpp6
-rw-r--r--kig/filters/drgeo-filter-chooser.cpp6
-rw-r--r--kig/filters/drgeo-filter-chooser.h2
-rw-r--r--kig/filters/drgeo-filter.cpp4
-rw-r--r--kig/filters/exporter.cpp2
-rw-r--r--kig/filters/imageexporteroptions.cpp4
-rw-r--r--kig/filters/imageexporteroptions.h2
-rw-r--r--kig/filters/kgeo-filter.cpp10
-rw-r--r--kig/filters/kgeo-filter.h6
-rw-r--r--kig/filters/latexexporter.cpp8
-rw-r--r--kig/filters/native-filter.cpp4
-rw-r--r--kig/filters/svgexporter.cpp2
12 files changed, 28 insertions, 28 deletions
diff --git a/kig/filters/cabri-filter.cpp b/kig/filters/cabri-filter.cpp
index 0a94f140..f65a0138 100644
--- a/kig/filters/cabri-filter.cpp
+++ b/kig/filters/cabri-filter.cpp
@@ -343,12 +343,12 @@ KigDocument* KigFilterCabri::load( const TQString& file )
return 0;
// reading linestyle
- Qt::PenStyle ls = Qt::SolidLine;
+ TQt::PenStyle ls = TQt::SolidLine;
if ( ( obj.lineSegLength > 1 ) && ( obj.lineSegLength < 6 ) &&
( obj.lineSegSplit > 1 ) && ( obj.lineSegSplit <= 10 ) )
- ls = Qt::DotLine;
+ ls = TQt::DotLine;
else if ( ( obj.lineSegLength >= 6 ) && ( obj.lineSegSplit > 10 ) )
- ls = Qt::DashLine;
+ ls = TQt::DashLine;
int ps = 0;
args.clear();
diff --git a/kig/filters/drgeo-filter-chooser.cpp b/kig/filters/drgeo-filter-chooser.cpp
index 89250235..4ec6db88 100644
--- a/kig/filters/drgeo-filter-chooser.cpp
+++ b/kig/filters/drgeo-filter-chooser.cpp
@@ -33,9 +33,9 @@ KigFilterDrgeoChooser::KigFilterDrgeoChooser( const TQStringList& l )
FigureListBox->insertStringList( l );
- connect( OKButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOKPressed() ) );
- connect( CancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancelPressed() ) );
- connect( FigureListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ), TQT_SLOT( slotExecuted( TQListBoxItem* ) ) );
+ connect( OKButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOKPressed() ) );
+ connect( CancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancelPressed() ) );
+ connect( FigureListBox, TQ_SIGNAL( executed( TQListBoxItem* ) ), TQ_SLOT( slotExecuted( TQListBoxItem* ) ) );
}
void KigFilterDrgeoChooser::slotOKPressed()
diff --git a/kig/filters/drgeo-filter-chooser.h b/kig/filters/drgeo-filter-chooser.h
index 78e3b4c0..9b227bca 100644
--- a/kig/filters/drgeo-filter-chooser.h
+++ b/kig/filters/drgeo-filter-chooser.h
@@ -27,7 +27,7 @@ class TQStringList;
class KigFilterDrgeoChooser
: public KigFilterDrgeoChooserBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kig/filters/drgeo-filter.cpp b/kig/filters/drgeo-filter.cpp
index 9742fcf5..1c904c3e 100644
--- a/kig/filters/drgeo-filter.cpp
+++ b/kig/filters/drgeo-filter.cpp
@@ -729,7 +729,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
// Normal -> the medium
// Thick -> the biggest one
int w = -1;
- Qt::PenStyle s = Qt::SolidLine;
+ TQt::PenStyle s = TQt::SolidLine;
if ( domelem.tagName() == "point" )
{
if ( domelem.attribute( "thickness" ) == "Normal" )
@@ -740,7 +740,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
if ( domelem.attribute( "thickness" ) == "Dashed" )
- s = Qt::DotLine;
+ s = TQt::DotLine;
if ( domelem.attribute( "thickness" ) == "Thick" )
w = 2;
}
diff --git a/kig/filters/exporter.cpp b/kig/filters/exporter.cpp
index 32b25f01..a64bab01 100644
--- a/kig/filters/exporter.cpp
+++ b/kig/filters/exporter.cpp
@@ -162,7 +162,7 @@ void ImageExporter::run( const KigPart& doc, KigWidget& w )
TQPixmap img( TQSize( width, height ) );
img.fill( TQt::white );
- KigPainter p( ScreenInfo( w.screenInfo().shownRect(), img.rect() ), TQT_TQPAINTDEVICE(&img), doc.document() );
+ KigPainter p( ScreenInfo( w.screenInfo().shownRect(), img.rect() ), &img, doc.document() );
p.setWholeWinOverlay();
p.drawGrid( doc.document().coordinateSystem(), showgrid, showaxes );
// FIXME: show the selections ?
diff --git a/kig/filters/imageexporteroptions.cpp b/kig/filters/imageexporteroptions.cpp
index cd68a0af..a72b0ae7 100644
--- a/kig/filters/imageexporteroptions.cpp
+++ b/kig/filters/imageexporteroptions.cpp
@@ -28,8 +28,8 @@ ImageExporterOptions::ImageExporterOptions( TQWidget* parent, const TQSize& s )
minternallysettingstuff( false )
{
keepAspectRatio->setChecked( true );
- connect( WidthInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotWidthChanged( int ) ) );
- connect( HeightInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHeightChanged( int ) ) );
+ connect( WidthInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotWidthChanged( int ) ) );
+ connect( HeightInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHeightChanged( int ) ) );
}
ImageExporterOptions::~ImageExporterOptions()
diff --git a/kig/filters/imageexporteroptions.h b/kig/filters/imageexporteroptions.h
index ba5e645b..21b67c3e 100644
--- a/kig/filters/imageexporteroptions.h
+++ b/kig/filters/imageexporteroptions.h
@@ -25,7 +25,7 @@ class TQSize;
class ImageExporterOptions
: public ImageExporterOptionsBase
{
- Q_OBJECT
+ TQ_OBJECT
TQSize msize;
diff --git a/kig/filters/kgeo-filter.cpp b/kig/filters/kgeo-filter.cpp
index 8849256b..1b0900cf 100644
--- a/kig/filters/kgeo-filter.cpp
+++ b/kig/filters/kgeo-filter.cpp
@@ -42,7 +42,7 @@
#include "../objects/transform_types.h"
#include "../objects/vector_type.h"
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <algorithm>
#include <functional>
@@ -54,14 +54,14 @@ bool KigFilterKGeo::supportMime( const TQString& mime )
KigDocument* KigFilterKGeo::load( const TQString& sFrom )
{
- // kgeo uses a KSimpleConfig to save its contents...
- KSimpleConfig config ( sFrom );
+ // kgeo uses a TDESimpleConfig to save its contents...
+ TDESimpleConfig config ( sFrom );
loadMetrics ( &config );
return loadObjects ( sFrom, &config );
}
-void KigFilterKGeo::loadMetrics(KSimpleConfig* c )
+void KigFilterKGeo::loadMetrics(TDESimpleConfig* c )
{
c->setGroup("Main");
xMax = c->readNumEntry("XMax", 16);
@@ -100,7 +100,7 @@ static std::vector<KGeoHierarchyElement> sortElems( const std::vector<KGeoHierar
return ret;
}
-KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c )
+KigDocument* KigFilterKGeo::loadObjects( const TQString& file, TDESimpleConfig* c )
{
KigDocument* ret = new KigDocument();
diff --git a/kig/filters/kgeo-filter.h b/kig/filters/kgeo-filter.h
index 9bac9085..62fae04c 100644
--- a/kig/filters/kgeo-filter.h
+++ b/kig/filters/kgeo-filter.h
@@ -21,7 +21,7 @@
#include "filter.h"
-class KSimpleConfig;
+class TDESimpleConfig;
/**
* This is an import filter for files generated by the program KGeo,
@@ -43,8 +43,8 @@ protected:
KigFilterKGeo();
~KigFilterKGeo();
- void loadMetrics ( KSimpleConfig* );
- KigDocument* loadObjects ( const TQString& file, KSimpleConfig* );
+ void loadMetrics ( TDESimpleConfig* );
+ KigDocument* loadObjects ( const TQString& file, TDESimpleConfig* );
int xMax;
int yMax;
diff --git a/kig/filters/latexexporter.cpp b/kig/filters/latexexporter.cpp
index 622a1a49..bbf6144a 100644
--- a/kig/filters/latexexporter.cpp
+++ b/kig/filters/latexexporter.cpp
@@ -126,7 +126,7 @@ private:
* Draws a line (segment) or a vector if vector is true.
*/
void emitLine( const Coordinate& a, const Coordinate& b, const int width,
- const Qt::PenStyle s, bool vector = false );
+ const TQt::PenStyle s, bool vector = false );
/**
* Sends a new line character ( \n ) to stream.
*/
@@ -144,7 +144,7 @@ private:
/**
* Converts a pen style into latex style string.
*/
- TQString writeStyle( Qt::PenStyle style );
+ TQString writeStyle( TQt::PenStyle style );
/**
* Plots a generic curve though its points calc'ed with getPoint.
*/
@@ -157,7 +157,7 @@ void LatexExportImpVisitor::emitCoord( const Coordinate& c )
}
void LatexExportImpVisitor::emitLine( const Coordinate& a, const Coordinate& b,
- const int width, const Qt::PenStyle s,
+ const int width, const TQt::PenStyle s,
bool vector )
{
mstream << "\\psline[linecolor=" << mcurcolorid << ",linewidth=" << width / 100.0
@@ -210,7 +210,7 @@ double LatexExportImpVisitor::dimRealToCoord( int dim )
return fabs( r.width() );
}
-TQString LatexExportImpVisitor::writeStyle( Qt::PenStyle style )
+TQString LatexExportImpVisitor::writeStyle( TQt::PenStyle style )
{
TQString ret( "linestyle=" );
if ( style == TQt::DashLine )
diff --git a/kig/filters/native-filter.cpp b/kig/filters/native-filter.cpp
index cf6521b2..72c464a8 100644
--- a/kig/filters/native-filter.cpp
+++ b/kig/filters/native-filter.cpp
@@ -39,7 +39,7 @@
#include <karchive.h>
#include <kdebug.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktar.h>
#include <stdio.h>
@@ -536,7 +536,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
if ( ! ok ) width = -1;
tmp = e.attribute( "style" );
- Qt::PenStyle style = ObjectDrawer::styleFromString( tmp );
+ TQt::PenStyle style = ObjectDrawer::styleFromString( tmp );
tmp = e.attribute( "point-style" );
int pointstyle = ObjectDrawer::pointStyleFromString( tmp );
diff --git a/kig/filters/svgexporter.cpp b/kig/filters/svgexporter.cpp
index 2fd53756..54e9c5f1 100644
--- a/kig/filters/svgexporter.cpp
+++ b/kig/filters/svgexporter.cpp
@@ -91,7 +91,7 @@ void SVGExporter::run( const KigPart& part, KigWidget& w )
TQPicture pic;
pic.setBoundingRect( r );
KigPainter* p = new KigPainter( ScreenInfo( w.screenInfo().shownRect(), viewrect ),
- TQT_TQPAINTDEVICE(&pic), part.document() );
+ &pic, part.document() );
// p->setWholeWinOverlay();
// p->setBrushColor( TQt::white );
// p->setBrushStyle( TQt::SolidPattern );