summaryrefslogtreecommitdiffstats
path: root/kig/modes
diff options
context:
space:
mode:
Diffstat (limited to 'kig/modes')
-rw-r--r--kig/modes/construct_mode.cpp10
-rw-r--r--kig/modes/dragrectmode.cpp2
-rw-r--r--kig/modes/edittype.cpp2
-rw-r--r--kig/modes/edittype.h2
-rw-r--r--kig/modes/edittypebase.ui4
-rw-r--r--kig/modes/label.cpp2
-rw-r--r--kig/modes/linkslabel.cpp10
-rw-r--r--kig/modes/linkslabel.h2
-rw-r--r--kig/modes/macro.cpp14
-rw-r--r--kig/modes/macrowizard.cpp10
-rw-r--r--kig/modes/macrowizard.h2
-rw-r--r--kig/modes/moving.cpp6
-rw-r--r--kig/modes/normal.cpp10
-rw-r--r--kig/modes/popup.cpp58
-rw-r--r--kig/modes/popup.h4
-rw-r--r--kig/modes/textlabelwizard.cpp14
-rw-r--r--kig/modes/textlabelwizard.h2
-rw-r--r--kig/modes/typesdialog.cpp8
-rw-r--r--kig/modes/typesdialog.h2
-rw-r--r--kig/modes/typesdialogbase.ui4
20 files changed, 84 insertions, 84 deletions
diff --git a/kig/modes/construct_mode.cpp b/kig/modes/construct_mode.cpp
index 02bb98fc..378fc999 100644
--- a/kig/modes/construct_mode.cpp
+++ b/kig/modes/construct_mode.cpp
@@ -182,7 +182,7 @@ void BaseConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const
mdoc.emitStatusBarText( selectStatement( getCalcers( mparents ), w ) );
w.updateCurPix();
- KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() );
+ KigPainter pter( w.screenInfo(), &w.curPix, mdoc.document() );
Coordinate ncoord = w.fromScreen( p );
if ( shiftpressed )
@@ -330,7 +330,7 @@ void PointConstructMode::mouseMoved(
bool shiftpressed )
{
w.updateCurPix();
- KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() );
+ KigPainter pter( w.screenInfo(), &w.curPix, mdoc.document() );
Coordinate ncoord = w.fromScreen( p );
if ( shiftpressed )
@@ -423,7 +423,7 @@ void TestConstructMode::handlePrelim( const std::vector<ObjectCalcer*>& os, cons
{
Args args;
std::transform( os.begin(), os.end(), std::back_inserter( args ),
- std::mem_fun( &ObjectCalcer::imp ) );
+ std::mem_fn( &ObjectCalcer::imp ) );
// usetext
TQString usetext = i18n( mtype->argsParser().usetext( args.back(), args ).c_str() );
@@ -529,7 +529,7 @@ void TestConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const
w.setCursor( KCursor::blankCursor() );
w.updateCurPix();
- KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() );
+ KigPainter pter( w.screenInfo(), &w.curPix, mdoc.document() );
TQPoint qloc = p + TQPoint( -40, 0 );
Coordinate loc = w.fromScreen( qloc );
@@ -554,7 +554,7 @@ TQString TestConstructMode::selectStatement( const std::vector<ObjectCalcer*>& s
{
using namespace std;
Args args;
- transform( sel.begin(), sel.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) );
+ transform( sel.begin(), sel.end(), back_inserter( args ), mem_fn( &ObjectCalcer::imp ) );
std::string ret = mtype->argsParser().selectStatement( args );
if ( ret.empty() ) return TQString();
diff --git a/kig/modes/dragrectmode.cpp b/kig/modes/dragrectmode.cpp
index 29b00886..1bb39cae 100644
--- a/kig/modes/dragrectmode.cpp
+++ b/kig/modes/dragrectmode.cpp
@@ -48,7 +48,7 @@ void DragRectMode::moved( const TQPoint& p, KigWidget& w )
std::vector<TQRect> overlay;
if ( mstartselected )
{
- KigPainter pt( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() );
+ KigPainter pt( w.screenInfo(), &w.curPix, mdoc.document() );
pt.drawFilledRect( TQRect( p, mstart ) );
overlay = pt.overlay();
};
diff --git a/kig/modes/edittype.cpp b/kig/modes/edittype.cpp
index 00686392..75ba9ca3 100644
--- a/kig/modes/edittype.cpp
+++ b/kig/modes/edittype.cpp
@@ -50,7 +50,7 @@ EditType::~EditType()
void EditType::helpSlot()
{
- kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
+ tdeApp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
TQString::fromLatin1( "kig" ) );
}
diff --git a/kig/modes/edittype.h b/kig/modes/edittype.h
index 28e2353d..41c19f88 100644
--- a/kig/modes/edittype.h
+++ b/kig/modes/edittype.h
@@ -27,7 +27,7 @@
*/
class EditType : public EditTypeBase
{
- Q_OBJECT
+ TQ_OBJECT
TQString mname;
diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui
index c0ed56cf..f8078404 100644
--- a/kig/modes/edittypebase.ui
+++ b/kig/modes/edittypebase.ui
@@ -270,11 +270,11 @@
<slot>cancelSlot()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>helpSlot()</slot>
<slot>okSlot()</slot>
<slot>cancelSlot()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/kig/modes/label.cpp b/kig/modes/label.cpp
index 12f0d57c..73d26808 100644
--- a/kig/modes/label.cpp
+++ b/kig/modes/label.cpp
@@ -231,7 +231,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w )
TQString s = d->locationparent->imp()->type()->attachToThisStatement();
mdoc.emitStatusBarText( s );
- KigPainter p( w->screenInfo(), TQT_TQPAINTDEVICE(&w->curPix), mdoc.document() );
+ KigPainter p( w->screenInfo(), &w->curPix, mdoc.document() );
// set the text next to the arrow cursor
TQPoint point = e->pos();
diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp
index 9d37d840..19cb744d 100644
--- a/kig/modes/linkslabel.cpp
+++ b/kig/modes/linkslabel.cpp
@@ -67,8 +67,8 @@ LinksLabel::~LinksLabel()
void LinksLabel::urlClicked()
{
- const TQObject* o = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
- std::vector<KURLLabel*>::iterator i = std::find( p->urllabels.begin(), p->urllabels.end(), static_cast<const KURLLabel*>(TQT_TQWIDGET_CONST( o )) );
+ const TQObject* o = sender();
+ std::vector<KURLLabel*>::iterator i = std::find( p->urllabels.begin(), p->urllabels.end(), static_cast<const KURLLabel*>( o ) );
assert( i != p->urllabels.end() );
emit linkClicked( i - p->urllabels.begin() );
}
@@ -112,7 +112,7 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf )
i->second, this );
p->urllabels.push_back( l );
p->layout->addWidget( l );
- connect( l, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( urlClicked() ) );
+ connect( l, TQ_SIGNAL( leftClickedURL() ), TQ_SLOT( urlClicked() ) );
}
else
{
@@ -129,6 +129,6 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf )
p->layout->activate();
- std::for_each( p->urllabels.begin(), p->urllabels.end(), mem_fun( &TQWidget::show ) );
- std::for_each( p->labels.begin(), p->labels.end(), mem_fun( &TQWidget::show ) );
+ std::for_each( p->urllabels.begin(), p->urllabels.end(), mem_fn( &TQWidget::show ) );
+ std::for_each( p->labels.begin(), p->labels.end(), mem_fn( &TQWidget::show ) );
}
diff --git a/kig/modes/linkslabel.h b/kig/modes/linkslabel.h
index a45777d5..cb556a70 100644
--- a/kig/modes/linkslabel.h
+++ b/kig/modes/linkslabel.h
@@ -29,7 +29,7 @@
*/
class LinksLabel : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kig/modes/macro.cpp b/kig/modes/macro.cpp
index 8fe16b4d..be69d80b 100644
--- a/kig/modes/macro.cpp
+++ b/kig/modes/macro.cpp
@@ -94,11 +94,11 @@ void DefineMacroMode::namePageEntered()
std::vector<ObjectCalcer*> given;
std::transform( mgiven.begin(), mgiven.end(),
std::back_inserter( given ),
- std::mem_fun( memfun ) );
+ std::mem_fn( memfun ) );
std::vector<ObjectCalcer*> final;
std::transform( mfinal.begin(), mfinal.end(),
std::back_inserter( final ),
- std::mem_fun( memfun ) );
+ std::mem_fn( memfun ) );
ObjectHierarchy hier( given, final );
if ( hier.resultDoesNotDependOnGiven() )
{
@@ -132,11 +132,11 @@ void DefineMacroMode::finishPressed()
std::vector<ObjectCalcer*> given;
std::transform( mgiven.begin(), mgiven.end(),
std::back_inserter( given ),
- std::mem_fun( memfun ) );
+ std::mem_fn( memfun ) );
std::vector<ObjectCalcer*> final;
std::transform( mfinal.begin(), mfinal.end(),
std::back_inserter( final ),
- std::mem_fun( memfun ) );
+ std::mem_fn( memfun ) );
ObjectHierarchy hier( given, final );
MacroConstructor* ctor =
new MacroConstructor( hier,
@@ -167,7 +167,7 @@ void DefineMacroMode::dragRect( const TQPoint& p, KigWidget& w )
std::vector<ObjectHolder*>* objs = mwizard->currentPage() == mwizard->mpgiven ? &mgiven : &mfinal;
DragRectMode dm( p, mdoc, w );
mdoc.runMode( &dm );
- KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() );
+ KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() );
if ( ! dm.cancelled() )
{
std::vector<ObjectHolder*> ret = dm.ret();
@@ -196,7 +196,7 @@ void DefineMacroMode::leftClickedObject( ObjectHolder* o, const TQPoint&,
if ( isselected ) objs->erase( iter );
else objs->push_back( o );
- KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() );
+ KigPainter p( w.screenInfo(), &w.stillPix, mdoc.document() );
p.drawObject( o, !isselected );
w.updateCurPix( p.overlay() );
w.updateWidget();
@@ -224,7 +224,7 @@ void DefineMacroMode::mouseMoved( const std::vector<ObjectHolder*>& os, const TQ
// statusbar text
mdoc.emitStatusBarText( selectstat );
- KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() );
+ KigPainter p( w.screenInfo(), &w.curPix, mdoc.document() );
// set the text next to the arrow cursor
TQPoint point = pt;
diff --git a/kig/modes/macrowizard.cpp b/kig/modes/macrowizard.cpp
index c6b8f36c..3d1e598d 100644
--- a/kig/modes/macrowizard.cpp
+++ b/kig/modes/macrowizard.cpp
@@ -27,10 +27,10 @@
MacroWizard::MacroWizard( TQWidget* parent, DefineMacroMode* m )
: MacroWizardBase( parent, "Define Macro Wizard", false ), mmode( m )
{
- connect( KLineEdit2, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( nameTextChanged( const TQString& ) ) );
- connect( this, TQT_SIGNAL( helpClicked() ), this,
- TQT_SLOT( slotHelpClicked() ) );
+ connect( KLineEdit2, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( nameTextChanged( const TQString& ) ) );
+ connect( this, TQ_SIGNAL( helpClicked() ), this,
+ TQ_SLOT( slotHelpClicked() ) );
}
MacroWizard::~MacroWizard()
@@ -85,6 +85,6 @@ void MacroWizard::accept()
void MacroWizard::slotHelpClicked()
{
- kapp->invokeHelp( TQString::fromLatin1( "defining-macros"),
+ tdeApp->invokeHelp( TQString::fromLatin1( "defining-macros"),
TQString::fromLatin1( "kig" ) );
}
diff --git a/kig/modes/macrowizard.h b/kig/modes/macrowizard.h
index ebd4c519..acb67b5f 100644
--- a/kig/modes/macrowizard.h
+++ b/kig/modes/macrowizard.h
@@ -24,7 +24,7 @@ class DefineMacroMode;
class MacroWizard : public MacroWizardBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
MacroWizard( TQWidget* parent, DefineMacroMode* m );
diff --git a/kig/modes/moving.cpp b/kig/modes/moving.cpp
index 593c7077..d7d07e89 100644
--- a/kig/modes/moving.cpp
+++ b/kig/modes/moving.cpp
@@ -55,13 +55,13 @@ void MovingModeBase::initScreen( const std::vector<ObjectCalcer*>& in )
std::inserter( notmovingobjs, notmovingobjs.begin() ) );
mview.clearStillPix();
- KigPainter p( mview.screenInfo(), TQT_TQPAINTDEVICE(&mview.stillPix), mdoc.document() );
+ KigPainter p( mview.screenInfo(), &mview.stillPix, mdoc.document() );
p.drawGrid( mdoc.document().coordinateSystem(), mdoc.document().grid(),
mdoc.document().axes() );
p.drawObjects( notmovingobjs.begin(), notmovingobjs.end(), false );
mview.updateCurPix();
- KigPainter p2( mview.screenInfo(), TQT_TQPAINTDEVICE(&mview.curPix), mdoc.document() );
+ KigPainter p2( mview.screenInfo(), &mview.curPix, mdoc.document() );
p2.drawObjects( drawableset.begin(), drawableset.end(), true );
}
@@ -91,7 +91,7 @@ void MovingModeBase::mouseMoved( TQMouseEvent* e, KigWidget* v )
for ( std::vector<ObjectCalcer*>::iterator i = mcalcable.begin();
i != mcalcable.end(); ++i )
( *i )->calc( mdoc.document() );
- KigPainter p( v->screenInfo(), TQT_TQPAINTDEVICE(&v->curPix), mdoc.document() );
+ KigPainter p( v->screenInfo(), &v->curPix, mdoc.document() );
// TODO: only draw the explicitly moving objects as selected, the
// other ones as deselected.. Needs some support from the
// subclasses..
diff --git a/kig/modes/normal.cpp b/kig/modes/normal.cpp
index 9a30c213..b91db417 100644
--- a/kig/modes/normal.cpp
+++ b/kig/modes/normal.cpp
@@ -71,8 +71,8 @@ void NormalMode::selectObjects( const std::vector<ObjectHolder*>& os )
{
// hehe, don't you love this c++ stuff ;)
std::for_each( os.begin(), os.end(),
- std::bind1st(
- std::mem_fun( &NormalMode::selectObject ), this ) );
+ std::bind(
+ std::mem_fn( &NormalMode::selectObject ), this, std::placeholders::_1 ) );
}
void NormalMode::unselectObject( ObjectHolder* o )
@@ -133,7 +133,7 @@ void NormalMode::dragRect( const TQPoint& p, KigWidget& w )
DragRectMode d( p, mdoc, w );
mdoc.runMode( &d );
- KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() );
+ KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() );
if ( ! d.cancelled() )
{
@@ -174,7 +174,7 @@ void NormalMode::dragObject( const std::vector<ObjectHolder*>& oco, const TQPoin
void NormalMode::leftClickedObject( ObjectHolder* o, const TQPoint&,
KigWidget& w, bool ctrlOrShiftDown )
{
- KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() );
+ KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() );
if ( ! o )
{
@@ -269,7 +269,7 @@ void NormalMode::mouseMoved( const std::vector<ObjectHolder*>& os,
// statusbar text
mdoc.emitStatusBarText( stat );
- KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() );
+ KigPainter p( w.screenInfo(), &w.curPix, mdoc.document() );
// set the text next to the arrow cursor
TQPoint point = plc;
diff --git a/kig/modes/popup.cpp b/kig/modes/popup.cpp
index 05dc5d24..0a7e0265 100644
--- a/kig/modes/popup.cpp
+++ b/kig/modes/popup.cpp
@@ -190,7 +190,7 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
{
bool empty = objs.empty();
bool single = objs.size() == 1;
- connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( toplevelMenuSlot( int ) ) );
+ connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( toplevelMenuSlot( int ) ) );
TQString title;
if ( empty )
@@ -246,24 +246,24 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
for ( uint i = 0; i < NumberOfMenus; ++i )
mmenus[i] = new TQPopupMenu( this );
- connect( mmenus[TransformMenu], TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( transformMenuSlot( int ) ) );
- connect( mmenus[TestMenu], TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( testMenuSlot( int ) ) );
- connect( mmenus[ConstructMenu], TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( constructMenuSlot( int ) ) );
- connect( mmenus[StartMenu], TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( startMenuSlot( int ) ) );
- connect( mmenus[ShowMenu], TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( showMenuSlot( int ) ) );
- connect( mmenus[SetColorMenu], TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( setColorMenuSlot( int ) ) );
- connect( mmenus[SetSizeMenu], TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( setSizeMenuSlot( int ) ) );
- connect( mmenus[SetStyleMenu], TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( setStyleMenuSlot( int ) ) );
- connect( mmenus[SetCoordinateSystemMenu], TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( setCoordinateSystemMenuSlot( int ) ) );
+ connect( mmenus[TransformMenu], TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( transformMenuSlot( int ) ) );
+ connect( mmenus[TestMenu], TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( testMenuSlot( int ) ) );
+ connect( mmenus[ConstructMenu], TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( constructMenuSlot( int ) ) );
+ connect( mmenus[StartMenu], TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( startMenuSlot( int ) ) );
+ connect( mmenus[ShowMenu], TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( showMenuSlot( int ) ) );
+ connect( mmenus[SetColorMenu], TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( setColorMenuSlot( int ) ) );
+ connect( mmenus[SetSizeMenu], TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( setSizeMenuSlot( int ) ) );
+ connect( mmenus[SetStyleMenu], TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( setStyleMenuSlot( int ) ) );
+ connect( mmenus[SetCoordinateSystemMenu], TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( setCoordinateSystemMenuSlot( int ) ) );
for ( int i = 0; i <= NumberOfMenus; ++i )
{
@@ -470,23 +470,23 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in
TQPixmap p( 20, 20 );
p.fill( popup.eraseColor() );
ScreenInfo si( Rect( -1, -1, 2, 2 ), p.rect() );
- KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false );
+ KigPainter ptr( si, &p, popup.part().document(), false );
PointImp pt( Coordinate( 0, 0 ) );
- ObjectDrawer d( color, -1, true, Qt::SolidLine, i );
+ ObjectDrawer d( color, -1, true, TQt::SolidLine, i );
d.draw( pt, ptr, false );
popup.addAction( menu, p, nextfree++ );
}
else
{
- Qt::PenStyle penstyles[] = {Qt::SolidLine, Qt::DashLine, Qt::DashDotLine, Qt::DashDotDotLine, Qt::DotLine};
- for ( int i = 0; i < (int) ( sizeof( penstyles ) / sizeof( Qt::PenStyle ) ); ++i )
+ TQt::PenStyle penstyles[] = {TQt::SolidLine, TQt::DashLine, TQt::DashDotLine, TQt::DashDotDotLine, TQt::DotLine};
+ for ( int i = 0; i < (int) ( sizeof( penstyles ) / sizeof( TQt::PenStyle ) ); ++i )
{
TQPixmap p( 50, 20 );
p.fill( popup.eraseColor() );
ScreenInfo si( Rect( -2.5, -1, 5, 2 ), p.rect() );
- KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false );
+ KigPainter ptr( si, &p, popup.part().document(), false );
LineImp line( Coordinate( -1, 0 ), Coordinate( 1, 0 ) );
- Qt::PenStyle ps = penstyles[i];
+ TQt::PenStyle ps = penstyles[i];
ObjectDrawer d( color, -1, true, ps, 1 );
d.draw( line, ptr, false );
popup.addAction( menu, p, nextfree++ );
@@ -712,9 +712,9 @@ bool BuiltinObjectActionsProvider::executeAction(
}
else
{
- Qt::PenStyle penstyles[] = {Qt::SolidLine, Qt::DashLine, Qt::DashDotLine, Qt::DashDotDotLine, Qt::DotLine};
- assert( id < (int)( sizeof( penstyles ) / sizeof( Qt::PenStyle ) ) );
- Qt::PenStyle p = penstyles[id];
+ TQt::PenStyle penstyles[] = {TQt::SolidLine, TQt::DashLine, TQt::DashDotLine, TQt::DashDotDotLine, TQt::DotLine};
+ assert( id < (int)( sizeof( penstyles ) / sizeof( TQt::PenStyle ) ) );
+ TQt::PenStyle p = penstyles[id];
KigCommand* kc = new KigCommand( doc, i18n( "Change Object Style" ) );
for ( std::vector<ObjectHolder*>::const_iterator i = os.begin(); i != os.end(); ++i )
if ( ! (*i)->imp()->inherits( PointImp::stype() ) )
@@ -1187,7 +1187,7 @@ ObjectChooserPopup::ObjectChooserPopup( const TQPoint& p, KigWidget& view,
i );
}
- connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( actionActivatedSlot( int ) ) );
+ connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( actionActivatedSlot( int ) ) );
}
ObjectChooserPopup::~ObjectChooserPopup()
diff --git a/kig/modes/popup.h b/kig/modes/popup.h
index 16078c15..5ba95428 100644
--- a/kig/modes/popup.h
+++ b/kig/modes/popup.h
@@ -46,7 +46,7 @@ class ObjectHolder;
class NormalModePopupObjects
: public TDEPopupMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -117,7 +117,7 @@ private:
class ObjectChooserPopup
: public TDEPopupMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kig/modes/textlabelwizard.cpp b/kig/modes/textlabelwizard.cpp
index c92068de..f52e9bb0 100644
--- a/kig/modes/textlabelwizard.cpp
+++ b/kig/modes/textlabelwizard.cpp
@@ -29,12 +29,12 @@
TextLabelWizard::TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode )
: TextLabelWizardBase( parent, "TextLabelWizard", false ), mmode( mode )
{
- connect( labelTextInput, TQT_SIGNAL( textChanged() ),
- TQT_SLOT( textChanged() ) );
- connect( myCustomWidget1, TQT_SIGNAL( linkClicked( int ) ),
- TQT_SLOT( linkClicked( int ) ) );
- connect( this, TQT_SIGNAL( helpClicked() ),
- this, TQT_SLOT( slotHelpClicked() ) );
+ connect( labelTextInput, TQ_SIGNAL( textChanged() ),
+ TQ_SLOT( textChanged() ) );
+ connect( myCustomWidget1, TQ_SIGNAL( linkClicked( int ) ),
+ TQ_SLOT( linkClicked( int ) ) );
+ connect( this, TQ_SIGNAL( helpClicked() ),
+ this, TQ_SLOT( slotHelpClicked() ) );
labelTextInput->setFocus();
}
@@ -89,7 +89,7 @@ void TextLabelWizard::relayoutArgsPage()
void TextLabelWizard::slotHelpClicked()
{
- kapp->invokeHelp( TQString::fromLatin1( "text-labels" ),
+ tdeApp->invokeHelp( TQString::fromLatin1( "text-labels" ),
TQString::fromLatin1( "kig" ) );
}
diff --git a/kig/modes/textlabelwizard.h b/kig/modes/textlabelwizard.h
index 5e22ada2..f586b62f 100644
--- a/kig/modes/textlabelwizard.h
+++ b/kig/modes/textlabelwizard.h
@@ -24,7 +24,7 @@ class TextLabelModeBase;
class TextLabelWizard : public TextLabelWizardBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode );
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index d8219308..0c3609c5 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -81,10 +81,10 @@ TypesDialog::TypesDialog( TQWidget* parent, KigPart& part )
loadAllMacros();
popup = new TQPopupMenu( this );
- popup->insertItem( SmallIcon( "edit" ), i18n( "&Edit..." ), this, TQT_SLOT( editType() ) );
- popup->insertItem( SmallIcon( "edit-delete" ), i18n( "&Delete" ), this, TQT_SLOT( deleteType() ) );
+ popup->insertItem( SmallIcon( "edit" ), i18n( "&Edit..." ), this, TQ_SLOT( editType() ) );
+ popup->insertItem( SmallIcon( "edit-delete" ), i18n( "&Delete" ), this, TQ_SLOT( deleteType() ) );
popup->insertSeparator();
- popup->insertItem( SmallIcon( "fileexport" ), i18n( "E&xport..." ), this, TQT_SLOT( exportType() ) );
+ popup->insertItem( SmallIcon( "fileexport" ), i18n( "E&xport..." ), this, TQ_SLOT( exportType() ) );
// saving types
part.saveTypes();
@@ -108,7 +108,7 @@ TypesDialog::~TypesDialog()
void TypesDialog::helpSlot()
{
- kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
+ tdeApp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
TQString::fromLatin1( "kig" ) );
}
diff --git a/kig/modes/typesdialog.h b/kig/modes/typesdialog.h
index 636999c5..6afb40f1 100644
--- a/kig/modes/typesdialog.h
+++ b/kig/modes/typesdialog.h
@@ -38,7 +38,7 @@ class KigDocument;
*/
class TypesDialog : public TypesDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
// necessary because some MacroList functions need it..
diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui
index bea69868..5aa9f34b 100644
--- a/kig/modes/typesdialogbase.ui
+++ b/kig/modes/typesdialogbase.ui
@@ -316,7 +316,7 @@
<forwards>
<forward>class TQListViewItem;</forward>
</forwards>
-<Q_SLOTS>
+<slots>
<slot access="protected">deleteType()</slot>
<slot access="protected">exportType()</slot>
<slot>helpSlot()</slot>
@@ -325,7 +325,7 @@
<slot access="protected">editType()</slot>
<slot access="protected">contextMenuRequested( TQListViewItem* i, const TQPoint&amp; p, int c )</slot>
<slot>cancelSlot()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">kpushbutton.h</include>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-17 09:46:12 +0000