summaryrefslogtreecommitdiffstats
path: root/kig/modes
diff options
context:
space:
mode:
Diffstat (limited to 'kig/modes')
-rw-r--r--kig/modes/construct_mode.cc2
-rw-r--r--kig/modes/edittype.cc4
-rw-r--r--kig/modes/edittypebase.ui12
-rw-r--r--kig/modes/label.cc6
-rw-r--r--kig/modes/label.h4
-rw-r--r--kig/modes/linkslabel.cpp26
-rw-r--r--kig/modes/macrowizard.cc4
-rw-r--r--kig/modes/macrowizardbase.ui2
-rw-r--r--kig/modes/moving.cc10
-rw-r--r--kig/modes/popup.cc10
-rw-r--r--kig/modes/textlabelwizard.cc10
-rw-r--r--kig/modes/textlabelwizardbase.ui4
-rw-r--r--kig/modes/typesdialog.cpp8
-rw-r--r--kig/modes/typesdialogbase.ui12
14 files changed, 57 insertions, 57 deletions
diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc
index e9e2e5ad..f2d5f2ed 100644
--- a/kig/modes/construct_mode.cc
+++ b/kig/modes/construct_mode.cc
@@ -485,7 +485,7 @@ void TestConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p,
std::vector<ObjectCalcer*> parents;
parents.push_back( new ObjectConstCalcer( new IntImp( test_has_frame_dflt ) ) );
parents.push_back( new ObjectConstCalcer( new PointImp( loc ) ) );
- parents.push_back( new ObjectConstCalcer( new StringImp( TQString::tqfromLatin1( "%1" ) ) ) );
+ parents.push_back( new ObjectConstCalcer( new StringImp( TQString::fromLatin1( "%1" ) ) ) );
assert( mresult->imp()->inherits( TestResultImp::stype() ) );
parents.push_back(
new ObjectPropertyCalcer(
diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cc
index d2f25a47..f4ed323e 100644
--- a/kig/modes/edittype.cc
+++ b/kig/modes/edittype.cc
@@ -50,8 +50,8 @@ EditType::~EditType()
void EditType::helpSlot()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "working-with-types" ),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
+ TQString::fromLatin1( "kig" ) );
}
void EditType::okSlot()
diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui
index e69d9f13..e0af9850 100644
--- a/kig/modes/edittypebase.ui
+++ b/kig/modes/edittypebase.ui
@@ -43,7 +43,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -51,7 +51,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -125,7 +125,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<vbox>
<property name="name">
@@ -152,7 +152,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -179,7 +179,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout24</cstring>
+ <cstring>layout24</cstring>
</property>
<hbox>
<property name="name">
@@ -212,7 +212,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kig/modes/label.cc b/kig/modes/label.cc
index 48f729bf..a6399b3d 100644
--- a/kig/modes/label.cc
+++ b/kig/modes/label.cc
@@ -38,7 +38,7 @@
#include <kmessagebox.h>
#include <kaction.h>
#include <klocale.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <tqregexp.h>
@@ -376,7 +376,7 @@ void TextLabelModeBase::updateLinksLabel()
}
else
// otherwise, we show a stub...
- linktext = i18n( "argument %1" ).tqarg( count + 1 );
+ linktext = i18n( "argument %1" ).arg( count + 1 );
d->wiz->myCustomWidget1->addLink( linktext, buf );
// set pos and prevpos to the next char after the last match, so
@@ -406,7 +406,7 @@ void TextLabelModeBase::linkClicked( int i )
d->mwawd = ReallySelectingArgs;
d->mwaaws = i;
- mdoc.emitStatusBarText( i18n( "Selecting argument %1" ).tqarg( i + 1 ) );
+ mdoc.emitStatusBarText( i18n( "Selecting argument %1" ).arg( i + 1 ) );
}
void TextLabelModeBase::redrawScreen( KigWidget* w )
diff --git a/kig/modes/label.h b/kig/modes/label.h
index b016d691..828c2e29 100644
--- a/kig/modes/label.h
+++ b/kig/modes/label.h
@@ -35,7 +35,7 @@ class ObjectCalcer;
/**
* this is the base class for TextLabelConstructionMode and
* TextLabelRedefineMode.. most of the work is done in this class,
- * with some specific things delegated to the tqchildren.. Template
+ * with some specific things delegated to the children.. Template
* method pattern, right ? :)
*/
class TextLabelModeBase
@@ -65,7 +65,7 @@ protected:
void setLocationParent( ObjectCalcer* o );
/**
* objects you pass here, should be newly created property objects,
- * that have no tqchildren..
+ * that have no children..
*/
void setPropertyObjects( const argvect& props );
void setFrame( bool f );
diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp
index 693c165a..7472dec6 100644
--- a/kig/modes/linkslabel.cpp
+++ b/kig/modes/linkslabel.cpp
@@ -21,7 +21,7 @@
#include <tqlabel.h>
#include <kurllabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <vector>
#include <algorithm>
@@ -33,7 +33,7 @@ using namespace std;
class LinksLabel::Private
{
public:
- TQHBoxLayout* tqlayout;
+ TQHBoxLayout* layout;
std::vector<TQLabel*> labels;
std::vector<KURLLabel*> urllabels;
};
@@ -42,22 +42,22 @@ LinksLabel::LinksLabel( TQWidget* parent, const char* name )
: TQWidget( parent, name )
{
p = new Private;
- p->tqlayout = new TQHBoxLayout( this );
+ p->layout = new TQHBoxLayout( this );
TQLabel* l = new TQLabel( TQString::fromUtf8( "Dit is een " ), this );
p->labels.push_back( l );
- p->tqlayout->addWidget( l );
+ p->layout->addWidget( l );
KURLLabel* u = new KURLLabel( TQString::fromUtf8( "http://www.kde.org/" ),
TQString::fromUtf8( "url"), this );
p->urllabels.push_back( u );
- p->tqlayout->addWidget( u );
+ p->layout->addWidget( u );
l = new TQLabel( TQString::fromUtf8( " !" ), this );
p->labels.push_back( l );
- p->tqlayout->addWidget(l );
+ p->layout->addWidget(l );
- p->tqlayout->activate();
+ p->layout->activate();
}
LinksLabel::~LinksLabel()
@@ -99,8 +99,8 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf )
p->urllabels.clear();
p->labels.clear();
- delete p->tqlayout;
- p->tqlayout = new TQHBoxLayout( this );
+ delete p->layout;
+ p->layout = new TQHBoxLayout( this );
for ( LinksLabelEditBuf::vec::iterator i = buf.data.begin(); i != buf.data.end(); ++i )
{
@@ -111,7 +111,7 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf )
KURLLabel* l = new KURLLabel( TQString::fromUtf8( "http://edu.kde.org/kig" ),
i->second, this );
p->urllabels.push_back( l );
- p->tqlayout->addWidget( l );
+ p->layout->addWidget( l );
connect( l, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( urlClicked() ) );
}
else
@@ -119,15 +119,15 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf )
// we need a normal label...
TQLabel* l = new TQLabel( i->second, this );
p->labels.push_back( l );
- p->tqlayout->addWidget( l );
+ p->layout->addWidget( l );
};
};
TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
- p->tqlayout->addItem( spacer );
+ p->layout->addItem( spacer );
- p->tqlayout->activate();
+ 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 ) );
diff --git a/kig/modes/macrowizard.cc b/kig/modes/macrowizard.cc
index 1b25c803..662e3a0d 100644
--- a/kig/modes/macrowizard.cc
+++ b/kig/modes/macrowizard.cc
@@ -85,6 +85,6 @@ void MacroWizard::accept()
void MacroWizard::slotHelpClicked()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "defining-macros"),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "defining-macros"),
+ TQString::fromLatin1( "kig" ) );
}
diff --git a/kig/modes/macrowizardbase.ui b/kig/modes/macrowizardbase.ui
index fefd5c6f..ea20ead7 100644
--- a/kig/modes/macrowizardbase.ui
+++ b/kig/modes/macrowizardbase.ui
@@ -55,7 +55,7 @@
<property name="text">
<string>Select the "given" objects for your new macro and press "Next".</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
diff --git a/kig/modes/moving.cc b/kig/modes/moving.cc
index 7c3148da..593c7077 100644
--- a/kig/modes/moving.cc
+++ b/kig/modes/moving.cc
@@ -143,8 +143,8 @@ MovingMode::MovingMode( const std::vector<ObjectHolder*>& os, const Coordinate&
std::set<ObjectCalcer*> tmp = objs;
for ( std::set<ObjectCalcer*>::const_iterator i = tmp.begin(); i != tmp.end(); ++i )
{
- std::set<ObjectCalcer*> tqchildren = getAllChildren(*i);
- objs.insert( tqchildren.begin(), tqchildren.end() );
+ std::set<ObjectCalcer*> children = getAllChildren(*i);
+ objs.insert( children.begin(), children.end() );
}
initScreen( calcPath( std::vector<ObjectCalcer*>( objs.begin(), objs.end() ) ) );
@@ -154,7 +154,7 @@ void MovingMode::stopMove()
{
TQString text = d->emo.size() == 1 ?
d->emo[0]->imp()->type()->moveAStatement() :
- i18n( "Move %1 Objects" ).tqarg( d->emo.size() );
+ i18n( "Move %1 Objects" ).arg( d->emo.size() );
KigCommand* mc = new KigCommand( mdoc, text );
d->mon->finish( mc );
mdoc.history()->addCommand( mc );
@@ -182,8 +182,8 @@ PointRedefineMode::PointRedefineMode( ObjectHolder* p, KigPart& d, KigWidget& v
std::vector<ObjectCalcer*> parents = getAllParents( mp->calcer() );
mmon = new MonitorDataObjects( parents );
std::vector<ObjectCalcer*> moving = parents;
- std::set<ObjectCalcer*> tqchildren = getAllChildren( mp->calcer() );
- std::copy( tqchildren.begin(), tqchildren.end(), std::back_inserter( moving ) );
+ std::set<ObjectCalcer*> children = getAllChildren( mp->calcer() );
+ std::copy( children.begin(), children.end(), std::back_inserter( moving ) );
initScreen( moving );
}
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc
index 32280d62..ba778f43 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cc
@@ -198,12 +198,12 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
else if ( single )
{
if ( !objs[0]->name().isNull() )
- title = TQString::tqfromLatin1( "%1 %2" ).tqarg( objs[0]->imp()->type()->translatedName() ).tqarg( objs[0]->name() );
+ title = TQString::fromLatin1( "%1 %2" ).arg( objs[0]->imp()->type()->translatedName() ).arg( objs[0]->name() );
else
title = objs[0]->imp()->type()->translatedName();
}
else
- title = i18n( "%1 Objects" ).tqarg( objs.size() );
+ title = i18n( "%1 Objects" ).arg( objs.size() );
insertTitle( title, 1 );
if ( !empty )
@@ -518,7 +518,7 @@ static void addNameLabel( ObjectCalcer* object, ObjectCalcer* namecalcer, const
object->imp()->inherits( CurveImp::stype() ) )
attachto = object;
ObjectHolder* label = ObjectFactory::instance()->attachedLabel(
- TQString::tqfromLatin1( "%1" ), attachto, loc, namelabelneedsframe, args, doc.document() );
+ TQString::fromLatin1( "%1" ), attachto, loc, namelabelneedsframe, args, doc.document() );
doc.addObject( label );
}
@@ -924,7 +924,7 @@ bool PropertiesActionsProvider::executeAction(
// /////// Coordinate c = Coordinate::invalidCoord();
Coordinate c = w.fromScreen( popup.plc() );
ObjectHolder* label = ObjectFactory::instance()->attachedLabel(
- TQString::tqfromLatin1( "%1" ), parent->calcer(), c,
+ TQString::fromLatin1( "%1" ), parent->calcer(), c,
false, args, doc.document() );
doc.addObject( label );
}
@@ -1182,7 +1182,7 @@ ObjectChooserPopup::ObjectChooserPopup( const TQPoint& p, KigWidget& view,
for ( uint i = 0; i < mobjs.size(); i++ )
{
insertItem( !mobjs[i]->name().isEmpty()
- ? TQString::tqfromLatin1( "%1 %2" ).tqarg( mobjs[i]->imp()->type()->translatedName() ).tqarg( mobjs[i]->name() )
+ ? TQString::fromLatin1( "%1 %2" ).arg( mobjs[i]->imp()->type()->translatedName() ).arg( mobjs[i]->name() )
: mobjs[i]->imp()->type()->translatedName(),
i );
}
diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cc
index e35e707a..3853ab18 100644
--- a/kig/modes/textlabelwizard.cc
+++ b/kig/modes/textlabelwizard.cc
@@ -21,10 +21,10 @@
#include "label.h"
#include "linkslabel.h"
-#include <tqtextedit.h>
+#include <textedit.h>
#include <kapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
TextLabelWizard::TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode )
: TextLabelWizardBase( parent, "TextLabelWizard", false ), mmode( mode )
@@ -84,12 +84,12 @@ void TextLabelWizard::linkClicked( int which )
void TextLabelWizard::relayoutArgsPage()
{
select_arguments_pageLayout->activate();
- tqrepaint();
+ repaint();
}
void TextLabelWizard::slotHelpClicked()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "text-labels" ),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "text-labels" ),
+ TQString::fromLatin1( "kig" ) );
}
diff --git a/kig/modes/textlabelwizardbase.ui b/kig/modes/textlabelwizardbase.ui
index 8f12ca3c..06e3db8f 100644
--- a/kig/modes/textlabelwizardbase.ui
+++ b/kig/modes/textlabelwizardbase.ui
@@ -34,7 +34,7 @@
<string>Enter the text for your label here and press "Next".
If you want to show variable parts, then put %1, %2, ... at the appropriate places (e.g. "This segment is %1 units long.").</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -71,7 +71,7 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac
<property name="text">
<string>Now select the argument(s) you need. For every argument, click on it, select an object and a property in the Kig window, and click finish when you are done...</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index df061888..f023d288 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -40,7 +40,7 @@
#include <tqfile.h>
#include <tqpixmap.h>
#include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <algorithm>
#include <vector>
@@ -108,8 +108,8 @@ TypesDialog::~TypesDialog()
void TypesDialog::helpSlot()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "working-with-types" ),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
+ TQString::fromLatin1( "kig" ) );
}
void TypesDialog::okSlot()
@@ -173,7 +173,7 @@ void TypesDialog::exportType()
TQFile fi( file_name );
if ( fi.exists() )
if ( KMessageBox::warningContinueCancel( this, i18n( "The file \"%1\" already exists. "
- "Do you wish to overwrite it?" ).tqarg( fi.name() ),
+ "Do you wish to overwrite it?" ).arg( fi.name() ),
i18n( "Overwrite File?" ), i18n("Overwrite") ) == KMessageBox::Cancel )
return;
MacroList::instance()->save( types, file_name );
diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui
index 89f00986..90216532 100644
--- a/kig/modes/typesdialogbase.ui
+++ b/kig/modes/typesdialogbase.ui
@@ -30,7 +30,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -90,7 +90,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -98,7 +98,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -147,7 +147,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -228,7 +228,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-28 20:26:27 +0000