From 648ba4a456d3aad2825193ff8f3bd52a875783b5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:18:52 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1212481 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kig/modes/base_mode.cc | 24 ++++++++++++------------ kig/modes/base_mode.h | 2 +- kig/modes/construct_mode.cc | 10 +++++----- kig/modes/edittype.cc | 4 ++-- kig/modes/edittypebase.ui | 16 ++++++++-------- kig/modes/label.cc | 2 +- kig/modes/linkslabel.cpp | 24 ++++++++++++------------ kig/modes/macrowizard.cc | 4 ++-- kig/modes/macrowizardbase.ui | 6 +++--- kig/modes/popup.cc | 8 ++++---- kig/modes/textlabelwizard.cc | 8 ++++---- kig/modes/textlabelwizard.h | 2 +- kig/modes/textlabelwizardbase.ui | 8 ++++---- kig/modes/typesdialog.cpp | 4 ++-- kig/modes/typesdialogbase.ui | 16 ++++++++-------- 15 files changed, 69 insertions(+), 69 deletions(-) (limited to 'kig/modes') diff --git a/kig/modes/base_mode.cc b/kig/modes/base_mode.cc index 86de684d..d968566b 100644 --- a/kig/modes/base_mode.cc +++ b/kig/modes/base_mode.cc @@ -46,9 +46,9 @@ void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) v->updateWidget(); mplc = e->pos(); - tqmoco = mdoc.document().whatAmIOn( v->fromScreen( mplc ), *v ); + moco = mdoc.document().whatAmIOn( v->fromScreen( mplc ), *v ); - if( tqmoco.empty() ) + if( moco.empty() ) { // clicked on an empty spot --> we show the rectangle for // selecting stuff... @@ -66,8 +66,8 @@ void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) void BaseMode::leftMouseMoved( TQMouseEvent* e, KigWidget* w ) { - if( !tqmoco.empty() && ( mplc - e->pos() ).manhattanLength() > 3 ) - dragObject( tqmoco, mplc, *w, + if( !moco.empty() && ( mplc - e->pos() ).manhattanLength() > 3 ) + dragObject( moco, mplc, *w, ( e->state() & (ShiftButton | ControlButton ) ) != 0 ); } @@ -79,16 +79,16 @@ void BaseMode::leftReleased( TQMouseEvent* e, KigWidget* v ) ObjectHolder* o = 0; bool keyCtrl = ( e->state() & ControlButton ) != 0; bool keyShift = ( e->state() & ShiftButton ) != 0; - if ( ! tqmoco.empty() ) + if ( ! moco.empty() ) { if ( keyShift ) { - int id = ObjectChooserPopup::getObjectFromList( e->pos(), v, tqmoco ); + int id = ObjectChooserPopup::getObjectFromList( e->pos(), v, moco ); if ( id >= 0 ) - o = tqmoco[id]; + o = moco[id]; } else - o = tqmoco.front(); + o = moco.front(); } leftClickedObject( o, e->pos(), *v, keyCtrl ); } @@ -100,7 +100,7 @@ void BaseMode::midClicked( TQMouseEvent* e, KigWidget* v ) v->updateWidget(); mplc = e->pos(); - tqmoco = mdoc.document().whatAmIOn( v->fromScreen( e->pos() ), *v ); + moco = mdoc.document().whatAmIOn( v->fromScreen( e->pos() ), *v ); } void BaseMode::midReleased( TQMouseEvent* e, KigWidget* v ) @@ -119,9 +119,9 @@ void BaseMode::rightClicked( TQMouseEvent* e, KigWidget* w ) w->setCursor( KCursor::arrowCursor() ); mplc = e->pos(); - tqmoco = mdoc.document().whatAmIOn( w->fromScreen( mplc ), *w ); + moco = mdoc.document().whatAmIOn( w->fromScreen( mplc ), *w ); - rightClicked( tqmoco, mplc, *w ); + rightClicked( moco, mplc, *w ); } void BaseMode::mouseMoved( TQMouseEvent* e, KigWidget* w ) @@ -151,7 +151,7 @@ void BaseMode::enableActions() std::vector BaseMode::oco() { - return tqmoco; + return moco; } TQPoint BaseMode::pointLocation() diff --git a/kig/modes/base_mode.h b/kig/modes/base_mode.h index 044b8b65..cb029abf 100644 --- a/kig/modes/base_mode.h +++ b/kig/modes/base_mode.h @@ -31,7 +31,7 @@ class BaseMode : public KigMode { TQPoint mplc; - std::vector tqmoco; + std::vector moco; void leftClicked( TQMouseEvent* e, KigWidget* v ); void leftMouseMoved( TQMouseEvent*, KigWidget* ); diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc index 71488c12..b535ee5c 100644 --- a/kig/modes/construct_mode.cc +++ b/kig/modes/construct_mode.cc @@ -69,15 +69,15 @@ void BaseConstructMode::leftReleased( TQMouseEvent* e, KigWidget* v ) ObjectHolder* o = 0; bool keyCtrlOrShift = ( e->state() & ( ControlButton | ShiftButton) ) != 0; - std::vector tqmoco = oco(); - if ( ! tqmoco.empty() ) + std::vector moco = oco(); + if ( ! moco.empty() ) { std::vector goodargs; - if ( !tqmoco.empty() ) + if ( !moco.empty() ) { std::vector::const_iterator it; std::vector testargs = getCalcers( mparents ); - for ( std::vector::const_iterator i = tqmoco.begin(); i != tqmoco.end(); ++i ) + for ( std::vector::const_iterator i = moco.begin(); i != moco.end(); ++i ) { it = std::find( mparents.begin(), mparents.end(), *i ); bool newdup = @@ -485,7 +485,7 @@ void TestConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p, std::vector 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 5e85bfca..0dc8129d 100644 --- a/kig/modes/edittypebase.ui +++ b/kig/modes/edittypebase.ui @@ -4,7 +4,7 @@ EditTypeBase - + 0 0 @@ -43,7 +43,7 @@ - tqlayout8 + layout8 @@ -51,7 +51,7 @@ - tqlayout8 + layout8 @@ -125,7 +125,7 @@ - tqlayout23 + layout23 @@ -152,7 +152,7 @@ Expanding - + 20 20 @@ -179,7 +179,7 @@ - tqlayout24 + layout24 @@ -212,7 +212,7 @@ Expanding - + 20 20 @@ -275,7 +275,7 @@ okSlot() cancelSlot() - + klineedit.h klineedit.h diff --git a/kig/modes/label.cc b/kig/modes/label.cc index 1bbc4ca9..578e15dd 100644 --- a/kig/modes/label.cc +++ b/kig/modes/label.cc @@ -391,7 +391,7 @@ void TextLabelModeBase::updateLinksLabel() d->wiz->myCustomWidget1->addText( s.mid( prevpos ), buf ); d->wiz->myCustomWidget1->applyEdit( buf ); - d->wiz->retqlayoutArgsPage(); + d->wiz->relayoutArgsPage(); d->wiz->resize( d->wiz->size() ); } diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp index eba5409c..96a73a8f 100644 --- a/kig/modes/linkslabel.cpp +++ b/kig/modes/linkslabel.cpp @@ -33,7 +33,7 @@ using namespace std; class LinksLabel::Private { public: - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; std::vector labels; std::vector 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 40d1dacb..d3929ad8 100644 --- a/kig/modes/macrowizardbase.ui +++ b/kig/modes/macrowizardbase.ui @@ -4,7 +4,7 @@ MacroWizardBase - + 4 0 @@ -55,7 +55,7 @@ Select the "given" objects for your new macro and press "Next". - + WordBreak|AlignVCenter @@ -180,7 +180,7 @@ - + klineedit.h klineedit.h diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc index 92d933ba..489b4985 100644 --- a/kig/modes/popup.cc +++ b/kig/modes/popup.cc @@ -198,7 +198,7 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part, else if ( single ) { if ( !objs[0]->name().isNull() ) - title = TQString::tqfromLatin1( "%1 %2" ).arg( objs[0]->imp()->type()->translatedName() ).arg( 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(); } @@ -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" ).arg( mobjs[i]->imp()->type()->translatedName() ).arg( 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 2f7a10ab..d562bbf3 100644 --- a/kig/modes/textlabelwizard.cc +++ b/kig/modes/textlabelwizard.cc @@ -81,15 +81,15 @@ void TextLabelWizard::linkClicked( int which ) mmode->linkClicked( which ); } -void TextLabelWizard::retqlayoutArgsPage() +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/textlabelwizard.h b/kig/modes/textlabelwizard.h index 357e83e0..bd51c1e0 100644 --- a/kig/modes/textlabelwizard.h +++ b/kig/modes/textlabelwizard.h @@ -34,7 +34,7 @@ public: void reject(); void accept(); - void retqlayoutArgsPage(); + void relayoutArgsPage(); private slots: void textChanged(); void linkClicked( int which ); diff --git a/kig/modes/textlabelwizardbase.ui b/kig/modes/textlabelwizardbase.ui index 4676ecac..4e195b0d 100644 --- a/kig/modes/textlabelwizardbase.ui +++ b/kig/modes/textlabelwizardbase.ui @@ -4,7 +4,7 @@ TextLabelWizardBase - + 0 0 @@ -34,7 +34,7 @@ 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."). - + WordBreak|AlignVCenter @@ -71,7 +71,7 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac 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... - + WordBreak|AlignVCenter @@ -106,7 +106,7 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac 789c9d97c76e24490e86effd1442f3d65870d2451a0ce6206f5adeb4cc620f8c34f2553225b5a4c1befb46927fe6a1d4c0ccac4287fa8a0c26834193f5dbb785b3fd9d856fbf7d799ec9ecba5ea8afe469e15bf3727ffffeeffffcf1e797af49b2d0ffc7d142f2f55f5fbe1ecc16ea85dde9a4ed81290045faa77ca49cf4ab67ba1e3953969173651ab9d4fdf1c8a27c3872ad7c3c72d3b32c2a67c3f3444636fbef23eb7e590267e68fcc4656395d8dacf6d938ef97eaef289781cddebdb2846fccff44b989ba58e3411f3dc75158e6df1d3889539517ca49bf54fe43398d1dec4f46567f685fd9c539f43fc025f80c1c3ce8d93f28e77185f8bf0c6cfae4c0b5f9c3c6e5c0542a4b5876fe13708df39d2bd7716372aa8c93c4e4723bb2f977aadc26ceec4bdb7310e6b0bfab9c2445ecd49f1370694cebca65d260ffa6711a41aef14d24e94cee6be3348e0ae5e9c8765f07ca3e8db17f0f9c825794eb3489351fe9bb7217e4969f29388bd51ee9fda5715a19730696b852fea95c6471647ca95cf64bcf43e0cef4657b647bfe6acf213d6bb32f9a9f5992b5a64f9a8f990b6cf9ecc15d6cf9acf6b2da55a8a75cb973dee4b2d1b38b5c05de02434e87e01aacfb351df5bebddea74b5c67f9c795711ea15e357e2ecde358fb87efc0a867df8cac728a074e62e527706afb59f3cf6583be5c28bb3c35f693812d1fbdc6dbe57966fec932d899ffa4f7e38adca17e34beaeca4b9c271a18f1d5fc739257b0d70d9c68be7bed7fcee7827ab91cd8e4740cf6b19d4ffb87ab07b9bf516e72d4a3ac821b9cef6e60d84f47367ded2fae1d9f7704f6163f79000ffde27660f387ed3c5dbf54dfeebb0bf6acbe6b706bfa5ef32f8f8b18f5bf0f463f20edb77956a4e68fbc80b3c4facd163847be6bfde72ec86dbeac82715fbc0286be683cf3bc081d44f7df80d344fb0b6b7de64581fb916765297263d6fccd9b7ee97e566e8b06cfdb1f59cf2bda2f8bbc2c11df0c5c41aefdb328ca22b1feb0012eedbce24736f91b18fb796d64eb87cb60817dcdafb07d906bfd14d22f659d8785ef97b2f6d7b2df6ef1d6fb2babaac6f92e8c25b27ecc1f239b7f3a5fca5a8678ea7c2d9bc0e6ef1238b3fca2c7814d5f4cbf9334b5f833384bed3c7a5f5514f4adbe2ec07962e7590457f06f6f649b977afe2a16f42f5e070bfc591e18f7a5f1a812a9e0df39d827da4fbd8c6ccfd7785569bf945f953371a9d5a3de67950bfa2d75c63eb2fb15bdcfaaf011e6c7263846bf8f4636f91618f3c7d3c0f047fb69550efab2074e12bd6fd27957553ec33c5b043bcc7f9d0795f818fdb501a3df8ae673e507ff69021eea37063bc45ffb73550736ff36c0a84f3e0317a86f8b5f139e6ffe1f821de6d9127898ff3be00a7c3ab2cd03e3d697560ff40016e47b3bb2e96bbd559d8f32bbff4b7065f193042c98873acf240af6adbf3c83c5f2954bb0c7bcd77c107d81d2fdebc63e33ff640aaecc9e1c8151df5c803dfaadc64b52dfa03ed64636ffb4ff4b2867f453ede7227586fcd3f9264ded91fffafe236d5da37fe83c91ceb7b9e5b7f6731ff92ed7f747d6fbf7e185cf58347e3e6932e47b3430fa893edf87d795c2fc3f003b67f5f902cec17abfde0dfa3c053b3c5ffb832fc2eb8fddcf233887fc195c801f46b6f3cdc02558fba72f7d2d1a7f7e321ee58fe0cad86bbff24dd3e2fe74fef836b0c6eb60d62fa6bf5e07b3419f853dd7dc70fb8bd5f1255fd90ed30f9f3c5ff30ddff21ddff384a7fcc08ffcc4cf61cdf8855ff9e79c7e1db4dff89d3f7891977899577895d7789d377893b7f83b6fcfe937bc13b477798ff7f9800ff928ac633ee11f7cca6761d7f99c7e1b3cb908da11c7413be1943376e153cc39175c72f549ff9e17c31744429e6a6aa8a58e2ee98aaee9866e7f617fc24b7417a4f734a1293dd0233dd133cd8285177aa5f9f3b63ca5377aa78f607b919668995682e62aadd17ab0b1419b9ff41f682b48bed336edd02eed05ed7d5ea3033a0cdf1ed1f127fd273ae123fa41a774a6b685cee982228a837e42e927fd47caf8985c38651eb40b2ac38e4a5842658a97fab33fd248cb87d2c9a55cc9b5dcc82d1fc99ddccb44a6f230af2f8ff224cf417f262ff22a3fe54ddee543166549966545567f617f4dd66523dc6b2c9bb225df655b7682f692ecca9eeccfe97772c09b722847722c27c1f3eb70f66bf9116c9fca999ccbc59cfe25bf4a143a5ef8992561324a78bd92522acf9ebc78efe7cf7b153276db37bef59dbff457fedadff85b7f27abfede4ffcd4cf9ff76faeff4fffefeff8c7f5fedfdfbffc0fa355c495 - + linkslabel.h diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp index 92755113..e14ceee8 100644 --- a/kig/modes/typesdialog.cpp +++ b/kig/modes/typesdialog.cpp @@ -106,8 +106,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() diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui index cab548a4..7cc7effb 100644 --- a/kig/modes/typesdialogbase.ui +++ b/kig/modes/typesdialogbase.ui @@ -4,7 +4,7 @@ TypesDialogBase - + 0 0 @@ -30,7 +30,7 @@ - tqlayout1 + layout1 @@ -90,7 +90,7 @@ - tqlayout4 + layout4 @@ -98,7 +98,7 @@ - tqlayout3 + layout3 @@ -138,7 +138,7 @@ Expanding - + 20 20 @@ -147,7 +147,7 @@ - tqlayout4 + layout4 @@ -228,7 +228,7 @@ Expanding - + 20 20 @@ -323,7 +323,7 @@ contextMenuRequested( QListViewItem* i, const QPoint& p, int c ) cancelSlot() - + klistview.h kpushbutton.h -- cgit v1.2.1