summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/canvasitemparts.cpp10
-rw-r--r--src/canvasitemparts.h4
-rw-r--r--src/ciwidgetmgr.cpp2
-rw-r--r--src/ciwidgetmgr.h2
-rw-r--r--src/cnitem.h2
-rw-r--r--src/drawparts/dpline.cpp10
-rw-r--r--src/drawparts/drawpart.cpp114
-rw-r--r--src/drawparts/drawpart.h24
-rw-r--r--src/drawparts/solidshape.cpp6
-rw-r--r--src/electronics/components/ecpotentiometer.cpp2
-rw-r--r--src/eventinfo.cpp20
-rw-r--r--src/eventinfo.h2
-rw-r--r--src/gui/itemeditor.cpp2
-rw-r--r--src/gui/microselectwidget.cpp2
-rw-r--r--src/gui/microsettingsdlg.cpp2
-rw-r--r--src/gui/oscilloscopeview.cpp4
-rw-r--r--src/katemdi.cpp8
-rw-r--r--src/katemdi.h2
-rw-r--r--src/viewcontainer.cpp8
19 files changed, 113 insertions, 113 deletions
diff --git a/src/canvasitemparts.cpp b/src/canvasitemparts.cpp
index 67eb986..0518890 100644
--- a/src/canvasitemparts.cpp
+++ b/src/canvasitemparts.cpp
@@ -437,7 +437,7 @@ SliderWidget::SliderWidget( TQWidget *parent )
Slider::Slider( const TQString & id, CNItem * parent, const TQRect & r, TQCanvas * canvas )
: Widget( id, parent, r, canvas )
{
- m_orientation = Qt::Vertical;
+ m_orientation = TQt::Vertical;
m_slider = new SliderWidget(0l);
m_slider->setPaletteBackgroundColor(TQt::white);
m_slider->setPaletteForegroundColor(TQt::white);
@@ -531,7 +531,7 @@ void Slider::slotValueChanged( int value )
parent()->sliderValueChanged(id(),value);
}
-void Slider::setOrientation( Qt::Orientation o )
+void Slider::setOrientation( TQt::Orientation o )
{
m_orientation = o;
posChanged();
@@ -541,11 +541,11 @@ void Slider::posChanged()
{
Widget::posChanged();
- if ( m_orientation == Qt::Vertical )
- m_slider->setOrientation( (m_angleDegrees%180 == 0) ? Qt::Vertical : Qt::Horizontal );
+ if ( m_orientation == TQt::Vertical )
+ m_slider->setOrientation( (m_angleDegrees%180 == 0) ? TQt::Vertical : TQt::Horizontal );
else
- m_slider->setOrientation( (m_angleDegrees%180 == 0) ? Qt::Horizontal : Qt::Vertical );
+ m_slider->setOrientation( (m_angleDegrees%180 == 0) ? TQt::Horizontal : TQt::Vertical );
}
//END Class Slider
diff --git a/src/canvasitemparts.h b/src/canvasitemparts.h
index 1ac58da..d34f07c 100644
--- a/src/canvasitemparts.h
+++ b/src/canvasitemparts.h
@@ -278,7 +278,7 @@ class Slider : public Widget
virtual TQWidget *widget() const;
int value() const;
void setValue( int value );
- void setOrientation( Qt::Orientation o );
+ void setOrientation( TQt::Orientation o );
protected:
virtual void posChanged();
@@ -288,7 +288,7 @@ class Slider : public Widget
private:
SliderWidget *m_slider;
- Qt::Orientation m_orientation;
+ TQt::Orientation m_orientation;
};
#endif
diff --git a/src/ciwidgetmgr.cpp b/src/ciwidgetmgr.cpp
index b159de6..293c5d4 100644
--- a/src/ciwidgetmgr.cpp
+++ b/src/ciwidgetmgr.cpp
@@ -156,7 +156,7 @@ Button* CIWidgetMgr::addButton( const TQString &id, const TQRect & pos, TQPixmap
}
-Slider* CIWidgetMgr::addSlider( const TQString &id, int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, const TQRect & pos )
+Slider* CIWidgetMgr::addSlider( const TQString &id, int minValue, int maxValue, int pageStep, int value, TQt::Orientation orientation, const TQRect & pos )
{
Slider *slider = new Slider( id, p_cnItem, pos, p_canvas );
TQSlider *qslider = dynamic_cast<TQSlider*>(slider->widget());
diff --git a/src/ciwidgetmgr.h b/src/ciwidgetmgr.h
index f92a877..923567c 100644
--- a/src/ciwidgetmgr.h
+++ b/src/ciwidgetmgr.h
@@ -50,7 +50,7 @@ public:
/**
* Adds a slider with the given id and values to the position
*/
- Slider* addSlider( const TQString &id, int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, const TQRect & pos );
+ Slider* addSlider( const TQString &id, int minValue, int maxValue, int pageStep, int value, TQt::Orientation orientation, const TQRect & pos );
/**
* Essentially the same as addDisplayText, but displays a button with
* text on it. The virtual functions buttonPressed( const TQString &id ) and
diff --git a/src/cnitem.h b/src/cnitem.h
index c306d71..3320aae 100644
--- a/src/cnitem.h
+++ b/src/cnitem.h
@@ -39,7 +39,7 @@ public:
Node *node; //Pointer to the node
double x; // X position relative to item
double y; // Y position relative to item
- int orientation; // Qt::Orientation relative to item
+ int orientation; // TQt::Orientation relative to item
};
typedef TQMap<TQString, TQString> StringMap;
diff --git a/src/drawparts/dpline.cpp b/src/drawparts/dpline.cpp
index 5127a0e..0a9d019 100644
--- a/src/drawparts/dpline.cpp
+++ b/src/drawparts/dpline.cpp
@@ -56,12 +56,12 @@ DPLine::DPLine( ItemDocument *itemDocument, bool newItem, const char *id )
createProperty( "line-style", Variant::Type::PenStyle );
property("line-style")->setCaption( i18n("Line Style") );
property("line-style")->setAdvanced(true);
- setDataPenStyle( "line-style", Qt::SolidLine );
+ setDataPenStyle( "line-style", TQt::SolidLine );
createProperty( "cap-style", Variant::Type::PenCapStyle );
property("cap-style")->setCaption( i18n("Cap Style") );
property("cap-style")->setAdvanced(true);
- setDataPenCapStyle( "cap-style", Qt::FlatCap );
+ setDataPenCapStyle( "cap-style", TQt::FlatCap );
}
DPLine::~DPLine()
@@ -84,7 +84,7 @@ void DPLine::dataChanged()
unsigned( dataInt("line-width") ),
getDataPenStyle("line-style"),
getDataPenCapStyle("cap-style"),
- Qt::MiterJoin ) );
+ TQt::MiterJoin ) );
postResize(); // in case the pen width has changed
update();
@@ -171,7 +171,7 @@ DPArrow::DPArrow( ItemDocument *itemDocument, bool newItem, const char *id )
// We don't want to use the square cap style as it screws up drawing our arrow head
TQStringList allowed = property("cap-style")->allowed();
- allowed.remove( DrawPart::penCapStyleToName( Qt::SquareCap ) );
+ allowed.remove( DrawPart::penCapStyleToName( TQt::SquareCap ) );
property("cap-style")->setAllowed(allowed);
}
@@ -211,7 +211,7 @@ void DPArrow::drawShape( TQPainter & p )
// Draw arrowhead
TQPen pen = p.pen();
- pen.setCapStyle( Qt::RoundCap );
+ pen.setCapStyle( TQt::RoundCap );
p.setPen(pen);
p.setBrush(pen.color());
TQPointArray pa(3);
diff --git a/src/drawparts/drawpart.cpp b/src/drawparts/drawpart.cpp
index 1ac24cf..2a67a4f 100644
--- a/src/drawparts/drawpart.cpp
+++ b/src/drawparts/drawpart.cpp
@@ -39,9 +39,9 @@ Variant * DrawPart::createProperty( const TQString & id, Variant::Type::Value ty
if ( type == Variant::Type::PenStyle )
{
TQStringList penStyles;
- penStyles << DrawPart::penStyleToName(Qt::SolidLine) << DrawPart::penStyleToName(Qt::DashLine)
- << DrawPart::penStyleToName(Qt::DotLine) << DrawPart::penStyleToName(Qt::DashDotLine)
- << DrawPart::penStyleToName(Qt::DashDotDotLine);
+ penStyles << DrawPart::penStyleToName(TQt::SolidLine) << DrawPart::penStyleToName(TQt::DashLine)
+ << DrawPart::penStyleToName(TQt::DotLine) << DrawPart::penStyleToName(TQt::DashDotLine)
+ << DrawPart::penStyleToName(TQt::DashDotDotLine);
Variant * v = createProperty( id, Variant::Type::String );
v->setType( Variant::Type::PenStyle );
@@ -52,8 +52,8 @@ Variant * DrawPart::createProperty( const TQString & id, Variant::Type::Value ty
if ( type == Variant::Type::PenCapStyle )
{
TQStringList penCapStyles;
- penCapStyles << DrawPart::penCapStyleToName(Qt::FlatCap) << DrawPart::penCapStyleToName(Qt::SquareCap)
- << DrawPart::penCapStyleToName(Qt::RoundCap);
+ penCapStyles << DrawPart::penCapStyleToName(TQt::FlatCap) << DrawPart::penCapStyleToName(TQt::SquareCap)
+ << DrawPart::penCapStyleToName(TQt::RoundCap);
Variant * v = createProperty( id, Variant::Type::String );
v->setType( Variant::Type::PenCapStyle );
@@ -65,19 +65,19 @@ Variant * DrawPart::createProperty( const TQString & id, Variant::Type::Value ty
}
-Qt::PenStyle DrawPart::getDataPenStyle( const TQString & id )
+TQt::PenStyle DrawPart::getDataPenStyle( const TQString & id )
{
return nameToPenStyle( dataString(id) );
}
-Qt::PenCapStyle DrawPart::getDataPenCapStyle( const TQString & id )
+TQt::PenCapStyle DrawPart::getDataPenCapStyle( const TQString & id )
{
return nameToPenCapStyle( dataString(id) );
}
-void DrawPart::setDataPenStyle( const TQString & id, Qt::PenStyle value )
+void DrawPart::setDataPenStyle( const TQString & id, TQt::PenStyle value )
{
property(id)->setValue( penStyleToName(value) );
}
-void DrawPart::setDataPenCapStyle( const TQString & id, Qt::PenCapStyle value )
+void DrawPart::setDataPenCapStyle( const TQString & id, TQt::PenCapStyle value )
{
property(id)->setValue( penCapStyleToName(value) );
}
@@ -144,121 +144,121 @@ void DrawPart::restoreFromItemData( const ItemData &itemData )
-TQString DrawPart::penStyleToID( Qt::PenStyle style )
+TQString DrawPart::penStyleToID( TQt::PenStyle style )
{
switch (style)
{
- case Qt::SolidLine:
+ case TQt::SolidLine:
return "SolidLine";
- case Qt::NoPen:
+ case TQt::NoPen:
return "NoPen";
- case Qt::DashLine:
+ case TQt::DashLine:
return "DashLine";
- case Qt::DotLine:
+ case TQt::DotLine:
return "DotLine";
- case Qt::DashDotLine:
+ case TQt::DashDotLine:
return "DashDotLine";
- case Qt::DashDotDotLine:
+ case TQt::DashDotDotLine:
return "DashDotDotLine";
- case Qt::MPenStyle:
+ case TQt::MPenStyle:
default:
return ""; // ?!
}
}
-Qt::PenStyle DrawPart::idToPenStyle( const TQString & id )
+TQt::PenStyle DrawPart::idToPenStyle( const TQString & id )
{
if ( id == "NoPen" )
- return Qt::NoPen;
+ return TQt::NoPen;
if ( id == "DashLine" )
- return Qt::DashLine;
+ return TQt::DashLine;
if ( id == "DotLine" )
- return Qt::DotLine;
+ return TQt::DotLine;
if ( id == "DashDotLine" )
- return Qt::DashDotLine;
+ return TQt::DashDotLine;
if ( id == "DashDotDotLine" )
- return Qt::DashDotDotLine;
- return Qt::SolidLine;
+ return TQt::DashDotDotLine;
+ return TQt::SolidLine;
}
-TQString DrawPart::penCapStyleToID( Qt::PenCapStyle style )
+TQString DrawPart::penCapStyleToID( TQt::PenCapStyle style )
{
switch (style)
{
- case Qt::FlatCap:
+ case TQt::FlatCap:
return "FlatCap";
- case Qt::SquareCap:
+ case TQt::SquareCap:
return "SquareCap";
- case Qt::RoundCap:
+ case TQt::RoundCap:
return "RoundCap";
- case Qt::MPenCapStyle:
+ case TQt::MPenCapStyle:
default:
return ""; // ?!
}
}
-Qt::PenCapStyle DrawPart::idToPenCapStyle( const TQString & id )
+TQt::PenCapStyle DrawPart::idToPenCapStyle( const TQString & id )
{
if ( id == "SquareCap" )
- return Qt::SquareCap;
+ return TQt::SquareCap;
if ( id == "RoundCap" )
- return Qt::RoundCap;
- return Qt::FlatCap;
+ return TQt::RoundCap;
+ return TQt::FlatCap;
}
-TQString DrawPart::penStyleToName( Qt::PenStyle style )
+TQString DrawPart::penStyleToName( TQt::PenStyle style )
{
switch (style)
{
- case Qt::SolidLine:
+ case TQt::SolidLine:
return i18n("Solid");
- case Qt::NoPen:
+ case TQt::NoPen:
return i18n("None");
- case Qt::DashLine:
+ case TQt::DashLine:
return i18n("Dash");
- case Qt::DotLine:
+ case TQt::DotLine:
return i18n("Dot");
- case Qt::DashDotLine:
+ case TQt::DashDotLine:
return i18n("Dash Dot");
- case Qt::DashDotDotLine:
+ case TQt::DashDotDotLine:
return i18n("Dash Dot Dot");
- case Qt::MPenStyle:
+ case TQt::MPenStyle:
default:
return ""; // ?!
}
}
-Qt::PenStyle DrawPart::nameToPenStyle( const TQString & name )
+TQt::PenStyle DrawPart::nameToPenStyle( const TQString & name )
{
if ( name == i18n("None") )
- return Qt::NoPen;
+ return TQt::NoPen;
if ( name == i18n("Dash") )
- return Qt::DashLine;
+ return TQt::DashLine;
if ( name == i18n("Dot") )
- return Qt::DotLine;
+ return TQt::DotLine;
if ( name == i18n("Dash Dot") )
- return Qt::DashDotLine;
+ return TQt::DashDotLine;
if ( name == i18n("Dash Dot Dot") )
- return Qt::DashDotDotLine;
- return Qt::SolidLine;
+ return TQt::DashDotDotLine;
+ return TQt::SolidLine;
}
-TQString DrawPart::penCapStyleToName( Qt::PenCapStyle style )
+TQString DrawPart::penCapStyleToName( TQt::PenCapStyle style )
{
switch (style)
{
- case Qt::FlatCap:
+ case TQt::FlatCap:
return i18n("Flat");
- case Qt::SquareCap:
+ case TQt::SquareCap:
return i18n("Square");
- case Qt::RoundCap:
+ case TQt::RoundCap:
return i18n("Round");
- case Qt::MPenCapStyle:
+ case TQt::MPenCapStyle:
default:
return ""; // ?!
}
}
-Qt::PenCapStyle DrawPart::nameToPenCapStyle( const TQString & name )
+TQt::PenCapStyle DrawPart::nameToPenCapStyle( const TQString & name )
{
if ( name == i18n("Square") )
- return Qt::SquareCap;
+ return TQt::SquareCap;
if ( name == i18n("Round") )
- return Qt::RoundCap;
- return Qt::FlatCap;
+ return TQt::RoundCap;
+ return TQt::FlatCap;
}
diff --git a/src/drawparts/drawpart.h b/src/drawparts/drawpart.h
index e2b046e..71042bb 100644
--- a/src/drawparts/drawpart.h
+++ b/src/drawparts/drawpart.h
@@ -43,26 +43,26 @@ class DrawPart : public Item
virtual Variant * createProperty( const TQString & id, Variant::Type::Value type );
- Qt::PenStyle getDataPenStyle( const TQString & id );
- Qt::PenCapStyle getDataPenCapStyle( const TQString & id );
+ TQt::PenStyle getDataPenStyle( const TQString & id );
+ TQt::PenCapStyle getDataPenCapStyle( const TQString & id );
- void setDataPenStyle( const TQString & id, Qt::PenStyle value );
- void setDataPenCapStyle( const TQString & id, Qt::PenCapStyle value );
+ void setDataPenStyle( const TQString & id, TQt::PenStyle value );
+ void setDataPenCapStyle( const TQString & id, TQt::PenCapStyle value );
virtual ItemData itemData() const;
virtual void restoreFromItemData( const ItemData &itemData );
// Convention for following functions: name is i18n'd name of style, id is the english one
- static TQString penStyleToID( Qt::PenStyle style );
- static Qt::PenStyle idToPenStyle( const TQString & id );
- static TQString penCapStyleToID( Qt::PenCapStyle style );
- static Qt::PenCapStyle idToPenCapStyle( const TQString & id );
+ static TQString penStyleToID( TQt::PenStyle style );
+ static TQt::PenStyle idToPenStyle( const TQString & id );
+ static TQString penCapStyleToID( TQt::PenCapStyle style );
+ static TQt::PenCapStyle idToPenCapStyle( const TQString & id );
- static TQString penStyleToName( Qt::PenStyle style );
- static Qt::PenStyle nameToPenStyle( const TQString & name );
- static TQString penCapStyleToName( Qt::PenCapStyle style );
- static Qt::PenCapStyle nameToPenCapStyle( const TQString & name );
+ static TQString penStyleToName( TQt::PenStyle style );
+ static TQt::PenStyle nameToPenStyle( const TQString & name );
+ static TQString penCapStyleToName( TQt::PenCapStyle style );
+ static TQt::PenCapStyle nameToPenCapStyle( const TQString & name );
};
#endif
diff --git a/src/drawparts/solidshape.cpp b/src/drawparts/solidshape.cpp
index 419e0ad..51fafa8 100644
--- a/src/drawparts/solidshape.cpp
+++ b/src/drawparts/solidshape.cpp
@@ -65,7 +65,7 @@ DPRectangle::DPRectangle( ItemDocument *itemDocument, bool newItem, const char *
createProperty( "line-style", Variant::Type::PenStyle );
property("line-style")->setAdvanced(true);
- setDataPenStyle( "line-style", Qt::SolidLine );
+ setDataPenStyle( "line-style", TQt::SolidLine );
}
DPRectangle::~DPRectangle()
@@ -87,14 +87,14 @@ void DPRectangle::dataChanged()
bool displayBackground = dataBool("background");
TQColor line_color = dataColor("line-color");
unsigned width = unsigned( dataInt("line-width") );
- Qt::PenStyle style = getDataPenStyle("line-style");
+ TQt::PenStyle style = getDataPenStyle("line-style");
setPen( TQPen( line_color, width, style ) );
if (displayBackground)
setBrush( dataColor("background-color") );
else
- setBrush( Qt::NoBrush );
+ setBrush( TQt::NoBrush );
postResize();
update();
diff --git a/src/electronics/components/ecpotentiometer.cpp b/src/electronics/components/ecpotentiometer.cpp
index d775634..0371088 100644
--- a/src/electronics/components/ecpotentiometer.cpp
+++ b/src/electronics/components/ecpotentiometer.cpp
@@ -48,7 +48,7 @@ ECPotentiometer::ECPotentiometer( ICNDocument *icnDocument, bool newItem, const
m_r1 = createResistance( createPin( -8, -24, 90, "n1" ), m_p1, 1. );
m_r2 = createResistance( createPin( -8, 24, 270, "n2" ), m_p1, 1. );
- Slider * s = addSlider( "slider", 0, 100, 5, 50, Qt::Vertical, TQRect( 0, -16, 16, 32 ) );
+ Slider * s = addSlider( "slider", 0, 100, 5, 50, TQt::Vertical, TQRect( 0, -16, 16, 32 ) );
m_pSlider = static_cast<TQSlider*>(s->widget());
createProperty( "resistance", Variant::Type::Double );
diff --git a/src/eventinfo.cpp b/src/eventinfo.cpp
index 3a63c30..39bf877 100644
--- a/src/eventinfo.cpp
+++ b/src/eventinfo.cpp
@@ -30,7 +30,7 @@ EventInfo::EventInfo( ItemView *itemView, TQMouseEvent *e )
{
pos = e->pos()/itemView->zoomLevel();
globalPos = e->globalPos();
- isRightClick = e->button() == Qt::RightButton;
+ isRightClick = e->button() == TQt::RightButton;
ctrlPressed = e->state() & TQt::ControlButton;
shiftPressed = e->state() & TQt::ShiftButton;
altPressed = e->state() & TQt::AltButton;
@@ -38,7 +38,7 @@ EventInfo::EventInfo( ItemView *itemView, TQMouseEvent *e )
qcanvasItemClickedOn = id->itemAtTop(pos);
itemRtti = qcanvasItemClickedOn ? qcanvasItemClickedOn->rtti() : ItemDocument::RTTI::None;
scrollDelta = 0;
- scrollOrientation = Qt::Vertical;
+ scrollOrientation = TQt::Vertical;
}
@@ -69,7 +69,7 @@ void EventInfo::reset()
qcanvasItemClickedOn = 0l;
itemRtti = ItemDocument::RTTI::None;
scrollDelta = 0;
- scrollOrientation = Qt::Vertical;
+ scrollOrientation = TQt::Vertical;
}
@@ -77,8 +77,8 @@ TQMouseEvent *EventInfo::mousePressEvent( int dx, int dy ) const
{
return new TQMouseEvent( TQEvent::MouseButtonPress,
pos + TQPoint( dx, dy ),
- (isRightClick ? Qt::RightButton : Qt::LeftButton),
- (isRightClick ? Qt::RightButton : Qt::LeftButton) |
+ (isRightClick ? TQt::RightButton : TQt::LeftButton),
+ (isRightClick ? TQt::RightButton : TQt::LeftButton) |
(ctrlPressed ? TQt::ControlButton : 0 ) |
(shiftPressed ? TQt::ShiftButton : 0 ) |
(altPressed ? TQt::AltButton : 0 ) );
@@ -89,8 +89,8 @@ TQMouseEvent *EventInfo::mouseReleaseEvent( int dx, int dy ) const
{
return new TQMouseEvent( TQEvent::MouseButtonRelease,
pos + TQPoint( dx, dy ),
- (isRightClick ? Qt::RightButton : Qt::LeftButton),
- (isRightClick ? Qt::RightButton : Qt::LeftButton) |
+ (isRightClick ? TQt::RightButton : TQt::LeftButton),
+ (isRightClick ? TQt::RightButton : TQt::LeftButton) |
(ctrlPressed ? TQt::ControlButton : 0 ) |
(shiftPressed ? TQt::ShiftButton : 0 ) |
(altPressed ? TQt::AltButton : 0 ) );
@@ -101,8 +101,8 @@ TQMouseEvent *EventInfo::mouseDoubleClickEvent( int dx, int dy ) const
{
return new TQMouseEvent( TQEvent::MouseButtonDblClick,
pos + TQPoint( dx, dy ),
- (isRightClick ? Qt::RightButton : Qt::LeftButton),
- (isRightClick ? Qt::RightButton : Qt::LeftButton) |
+ (isRightClick ? TQt::RightButton : TQt::LeftButton),
+ (isRightClick ? TQt::RightButton : TQt::LeftButton) |
(ctrlPressed ? TQt::ControlButton : 0 ) |
(shiftPressed ? TQt::ShiftButton : 0 ) |
(altPressed ? TQt::AltButton : 0 ) );
@@ -113,7 +113,7 @@ TQMouseEvent *EventInfo::mouseMoveEvent( int dx, int dy ) const
{
return new TQMouseEvent( TQEvent::MouseMove,
pos + TQPoint( dx, dy ),
- Qt::NoButton,
+ TQt::NoButton,
(ctrlPressed ? TQt::ControlButton : 0 ) |
(shiftPressed ? TQt::ShiftButton : 0 ) |
(altPressed ? TQt::AltButton : 0 ) );
diff --git a/src/eventinfo.h b/src/eventinfo.h
index 35d31d9..c7d56f1 100644
--- a/src/eventinfo.h
+++ b/src/eventinfo.h
@@ -45,7 +45,7 @@ public:
TQCanvasItem *qcanvasItemClickedOn;
int itemRtti;
short scrollDelta;
- Qt::Orientation scrollOrientation;
+ TQt::Orientation scrollOrientation;
bool isRightClick:1;
bool ctrlPressed:1;
bool shiftPressed:1;
diff --git a/src/gui/itemeditor.cpp b/src/gui/itemeditor.cpp
index fa37dfb..9a05aee 100644
--- a/src/gui/itemeditor.cpp
+++ b/src/gui/itemeditor.cpp
@@ -66,7 +66,7 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent )
connect(m_mergeBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(mergeProperties()));
h1Layout->addWidget(m_mergeBtn);
- // Qt::Orientation widget stuff
+ // TQt::Orientation widget stuff
TQHBoxLayout *h2Layout = new TQHBoxLayout( vlayout, 6 );
TQSpacerItem *spacer2 = new TQSpacerItem( 1, 1 );
h2Layout->addItem(spacer2);
diff --git a/src/gui/microselectwidget.cpp b/src/gui/microselectwidget.cpp
index 0abb83d..432961d 100644
--- a/src/gui/microselectwidget.cpp
+++ b/src/gui/microselectwidget.cpp
@@ -23,7 +23,7 @@
#include <tqwhatsthis.h>
MicroSelectWidget::MicroSelectWidget( TQWidget* parent, const char* name, WFlags )
- : TQGroupBox( 4, Qt::Horizontal, i18n("Microprocessor"), parent, name )
+ : TQGroupBox( 4, TQt::Horizontal, i18n("Microprocessor"), parent, name )
{
m_allowedAsmSet = AsmInfo::AsmSetAll;
m_allowedGpsimSupport = m_allowedFlowCodeSupport = m_allowedMicrobeSupport = MicroInfo::AllSupport;
diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp
index 195aa3d..9195cfe 100644
--- a/src/gui/microsettingsdlg.cpp
+++ b/src/gui/microsettingsdlg.cpp
@@ -68,7 +68,7 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par
TQGroupBox * groupBox = new TQGroupBox( *it, m_pWidget->portsGroupBox );
- groupBox->setColumnLayout(0, Qt::Vertical );
+ groupBox->setColumnLayout(0, TQt::Vertical );
groupBox->layout()->setSpacing( 6 );
groupBox->layout()->setMargin( 11 );
TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() );
diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp
index 5abcd3f..8641c27 100644
--- a/src/gui/oscilloscopeview.cpp
+++ b/src/gui/oscilloscopeview.cpp
@@ -109,7 +109,7 @@ void OscilloscopeView::mousePressEvent( TQMouseEvent *event )
{
switch ( event->button() )
{
- case Qt::LeftButton:
+ case TQt::LeftButton:
{
event->accept();
m_clickOffsetPos = event->pos().x();
@@ -118,7 +118,7 @@ void OscilloscopeView::mousePressEvent( TQMouseEvent *event )
return;
}
- case Qt::RightButton:
+ case TQt::RightButton:
{
event->accept();
diff --git a/src/katemdi.cpp b/src/katemdi.cpp
index d380621..b258723 100644
--- a/src/katemdi.cpp
+++ b/src/katemdi.cpp
@@ -35,7 +35,7 @@ namespace KateMDI {
//BEGIN SPLITTER
-Splitter::Splitter(Qt::Orientation o, TQWidget* parent, const char* name)
+Splitter::Splitter(TQt::Orientation o, TQWidget* parent, const char* name)
: TQSplitter(o, parent, name)
{
}
@@ -222,7 +222,7 @@ void Sidebar::setSidebarStyle( KMultiTabBarStyle style )
void Sidebar::setSplitter (Splitter *sp)
{
m_splitter = sp;
- m_ownSplit = new Splitter ((sidebarPosition() == KMultiTabBar::Top || sidebarPosition() == KMultiTabBar::Bottom) ? Qt::Horizontal : Qt::Vertical, m_splitter);
+ m_ownSplit = new Splitter ((sidebarPosition() == KMultiTabBar::Top || sidebarPosition() == KMultiTabBar::Bottom) ? TQt::Horizontal : TQt::Vertical, m_splitter);
m_ownSplit->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_ownSplit->setChildrenCollapsible( false );
m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize );
@@ -599,7 +599,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
m_sidebars[KMultiTabBar::Left] = new Sidebar (KMultiTabBar::Left, this, hb);
- m_hSplitter = new Splitter (Qt::Horizontal, hb);
+ m_hSplitter = new Splitter (TQt::Horizontal, hb);
m_hSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_sidebars[KMultiTabBar::Left]->setSplitter (m_hSplitter);
@@ -609,7 +609,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
m_sidebars[KMultiTabBar::Top] = new Sidebar (KMultiTabBar::Top, this, vb);
- m_vSplitter = new Splitter (Qt::Vertical, vb);
+ m_vSplitter = new Splitter (TQt::Vertical, vb);
m_vSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_sidebars[KMultiTabBar::Top]->setSplitter (m_vSplitter);
diff --git a/src/katemdi.h b/src/katemdi.h
index 51d8149..c9cf0d6 100644
--- a/src/katemdi.h
+++ b/src/katemdi.h
@@ -39,7 +39,7 @@ class Splitter : public TQSplitter
public:
- Splitter(Qt::Orientation o, TQWidget* parent=0, const char* name=0);
+ Splitter(TQt::Orientation o, TQWidget* parent=0, const char* name=0);
~Splitter();
/** Since there is supposed to be only 2 childs of a katesplitter,
diff --git a/src/viewcontainer.cpp b/src/viewcontainer.cpp
index 594a473..7191d74 100644
--- a/src/viewcontainer.cpp
+++ b/src/viewcontainer.cpp
@@ -410,7 +410,7 @@ ViewArea *ViewArea::createViewArea( Position position, uint id )
return 0l;
}
- setOrientation( ( position == Right ) ? Qt::Horizontal : Qt::Vertical );
+ setOrientation( ( position == Right ) ? TQt::Horizontal : TQt::Vertical );
p_viewArea1 = new ViewArea(this, p_viewContainer, m_id, TQString("viewarea_%1").arg(TQString::number(m_id)).latin1());
p_viewArea2 = new ViewArea(this, p_viewContainer, id, TQString("viewarea_%1").arg(TQString::number(id)).latin1());
@@ -424,7 +424,7 @@ ViewArea *ViewArea::createViewArea( Position position, uint id )
m_id = p_viewContainer->uniqueParentId();
TQValueList<int> splitPos;
- int pos = ((orientation() == Qt::Horizontal) ? width()/2 : height()/2);
+ int pos = ((orientation() == TQt::Horizontal) ? width()/2 : height()/2);
splitPos << pos << pos;
setSizes(splitPos);
@@ -499,7 +499,7 @@ void ViewArea::saveState( TDEConfig *config )
if ( va1Ok || va2Ok )
{
- config->writeEntry( orientationKey(m_id), (orientation() == Qt::Horizontal) ? "LeftRight" : "TopBottom" );
+ config->writeEntry( orientationKey(m_id), (orientation() == TQt::Horizontal) ? "LeftRight" : "TopBottom" );
TQValueList<int> contains;
if (va1Ok)
@@ -542,7 +542,7 @@ void ViewArea::restoreState( TDEConfig *config, int id, const TQString &groupNam
if ( config->hasKey( orientationKey(id) ) )
{
TQString orientation = config->readEntry( orientationKey(m_id) );
- setOrientation( (orientation == "LeftRight") ? Qt::Horizontal : Qt::Vertical );
+ setOrientation( (orientation == "LeftRight") ? TQt::Horizontal : TQt::Vertical );
}
config->setGroup(groupName);