summaryrefslogtreecommitdiffstats
path: root/kig/kig
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commit96698e12d1d6ba8072e9365334277438c3cf0e4a (patch)
tree81e81a49226aab2570d5fe8464576a6c960f1782 /kig/kig
parentdcb06497ea70d050554422eec10b0756d926a5c0 (diff)
downloadtdeedu-96698e12d1d6ba8072e9365334277438c3cf0e4a.tar.gz
tdeedu-96698e12d1d6ba8072e9365334277438c3cf0e4a.zip
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kig/kig')
-rw-r--r--kig/kig/kig_commands.cpp30
-rw-r--r--kig/kig/kig_commands.h6
-rw-r--r--kig/kig/kig_part.cpp4
-rw-r--r--kig/kig/kig_part.h2
-rw-r--r--kig/kig/kig_view.h2
5 files changed, 22 insertions, 22 deletions
diff --git a/kig/kig/kig_commands.cpp b/kig/kig/kig_commands.cpp
index d6b79805..bcf26969 100644
--- a/kig/kig/kig_commands.cpp
+++ b/kig/kig/kig_commands.cpp
@@ -274,7 +274,7 @@ class ChangeParentsAndTypeTask::Private
{
public:
ObjectTypeCalcer* o;
- std::vector<ObjectCalcer::shared_ptr> newtqparents;
+ std::vector<ObjectCalcer::shared_ptr> newparents;
const ObjectType* newtype;
};
@@ -284,13 +284,13 @@ ChangeParentsAndTypeTask::~ChangeParentsAndTypeTask()
}
ChangeParentsAndTypeTask::ChangeParentsAndTypeTask(
- ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newtqparents,
+ ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newparents,
const ObjectType* newtype )
: KigCommandTask(), d( new Private )
{
d->o = o;
- std::copy( newtqparents.begin(), newtqparents.end(),
- std::back_inserter( d->newtqparents ) );
+ std::copy( newparents.begin(), newparents.end(),
+ std::back_inserter( d->newparents ) );
d->newtype = newtype;
}
@@ -300,17 +300,17 @@ void ChangeParentsAndTypeTask::execute( KigPart& doc )
d->o->setType( d->newtype );
d->newtype = oldtype;
- std::vector<ObjectCalcer*> oldtqparentso = d->o->tqparents();
- std::vector<ObjectCalcer::shared_ptr> oldtqparents(
- oldtqparentso.begin(), oldtqparentso.end() );
- std::vector<ObjectCalcer*> newtqparents;
- for ( std::vector<ObjectCalcer::shared_ptr>::iterator i = d->newtqparents.begin();
- i != d->newtqparents.end(); ++i )
- newtqparents.push_back( i->get() );
- d->o->setParents( newtqparents );
- d->newtqparents = oldtqparents;
-
- for ( std::vector<ObjectCalcer*>::iterator i = newtqparents.begin(); i != newtqparents.end(); ++i )
+ std::vector<ObjectCalcer*> oldparentso = d->o->parents();
+ std::vector<ObjectCalcer::shared_ptr> oldparents(
+ oldparentso.begin(), oldparentso.end() );
+ std::vector<ObjectCalcer*> newparents;
+ for ( std::vector<ObjectCalcer::shared_ptr>::iterator i = d->newparents.begin();
+ i != d->newparents.end(); ++i )
+ newparents.push_back( i->get() );
+ d->o->setParents( newparents );
+ d->newparents = oldparents;
+
+ for ( std::vector<ObjectCalcer*>::iterator i = newparents.begin(); i != newparents.end(); ++i )
( *i )->calc( doc.document() );
d->o->calc( doc.document() );
std::set<ObjectCalcer*> alltqchildren = getAllChildren( d->o );
diff --git a/kig/kig/kig_commands.h b/kig/kig/kig_commands.h
index e9df77c1..5bd3ae29 100644
--- a/kig/kig/kig_commands.h
+++ b/kig/kig/kig_commands.h
@@ -59,7 +59,7 @@ public:
static KigCommand* addCommand( KigPart& doc, ObjectHolder* os );
/**
* make sure that when you delete something, you are also deleting
- * its tqparents. This class assumes you've done that.
+ * its parents. This class assumes you've done that.
* \ref KigDocument::delObjects() takes care of this for you.
*/
static KigCommand* removeCommand( KigPart& doc, const std::vector<ObjectHolder*>& os );
@@ -124,7 +124,7 @@ protected:
* this class monitors a set of DataObjects for changes and returns an
* appropriate ChangeObjectImpsCommand if necessary..
* E.g. MovingMode wants to move certain objects, so it monitors all
- * the tqparents of the explicitly moving objects:
+ * the parents of the explicitly moving objects:
* \code
* MonitorDataObjects mon( getAllParents( emo ) );
* \endcode
@@ -181,7 +181,7 @@ class ChangeParentsAndTypeTask
class Private;
Private* d;
public:
- ChangeParentsAndTypeTask( ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newtqparents,
+ ChangeParentsAndTypeTask( ObjectTypeCalcer* o, const std::vector<ObjectCalcer*>& newparents,
const ObjectType* newtype );
~ChangeParentsAndTypeTask();
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 137d0096..f59559d1 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -165,7 +165,7 @@ bool KigPrintDialogPage::isValid( TQString& )
return true;
}
-KigPart::KigPart( TQWidget *tqparentWidget, const char *,
+KigPart::KigPart( TQWidget *parentWidget, const char *,
TQObject *tqparent, const char *name,
const TQStringList& )
: KParts::ReadWritePart( tqparent, name ),
@@ -177,7 +177,7 @@ KigPart::KigPart( TQWidget *tqparentWidget, const char *,
mMode = new NormalMode( *this );
// we need a widget, to actually show the document
- m_widget = new KigView(this, false, tqparentWidget, "kig_view");
+ m_widget = new KigView(this, false, parentWidget, "kig_view");
// notify the part that this is our internal widget
setWidget( m_widget );
diff --git a/kig/kig/kig_part.h b/kig/kig/kig_part.h
index 187f559e..677c9037 100644
--- a/kig/kig/kig_part.h
+++ b/kig/kig/kig_part.h
@@ -66,7 +66,7 @@ public:
/**
* Default constructor
*/
- KigPart( TQWidget* tqparentWidget, const char* widgetName,
+ KigPart( TQWidget* parentWidget, const char* widgetName,
TQObject* tqparent = 0, const char* name = 0,
const TQStringList& = TQStringList()
);
diff --git a/kig/kig/kig_view.h b/kig/kig/kig_view.h
index 4c167d7a..9d3ebab2 100644
--- a/kig/kig/kig_view.h
+++ b/kig/kig/kig_view.h
@@ -235,7 +235,7 @@ class KigView
TQScrollBar* mbottomscroll;
/**
- * aptqparently, TQScrollBar also emits its signals when you update it
+ * apparently, TQScrollBar also emits its signals when you update it
* manually, so we ignore them while we're in \ref updateScrollBars()...
*/
bool mupdatingscrollbars;