summaryrefslogtreecommitdiffstats
path: root/src/viewcontainer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/viewcontainer.cpp')
-rw-r--r--src/viewcontainer.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/viewcontainer.cpp b/src/viewcontainer.cpp
index 9242562..a06c95a 100644
--- a/src/viewcontainer.cpp
+++ b/src/viewcontainer.cpp
@@ -124,7 +124,7 @@ View *ViewContainer::view( uint id ) const
ViewArea *ViewContainer::viewArea( uint id ) const
{
- if ( !m_viewAreaMap.tqcontains(id) )
+ if ( !m_viewAreaMap.contains(id) )
return 0l;
return m_viewAreaMap[id];
@@ -211,7 +211,7 @@ void ViewContainer::setViewAreaRemoved( uint id )
if (b_deleted)
return;
- ViewAreaMap::iterator it = m_viewAreaMap.tqfind(id);
+ ViewAreaMap::iterator it = m_viewAreaMap.find(id);
if ( it == m_viewAreaMap.end() )
return;
@@ -501,13 +501,13 @@ void ViewArea::saveState( KConfig *config )
{
config->writeEntry( orientationKey(m_id), (orientation() == Qt::Horizontal) ? "LeftRight" : "TopBottom" );
- TQValueList<int> tqcontains;
+ TQValueList<int> contains;
if (va1Ok)
- tqcontains << p_viewArea1->id();
+ contains << p_viewArea1->id();
if (va2Ok)
- tqcontains << p_viewArea2->id();
+ contains << p_viewArea2->id();
- config->writeEntry( containsKey(m_id), tqcontains );
+ config->writeEntry( containsKey(m_id), contains );
if (va1Ok)
p_viewArea1->saveState(config);
if (va2Ok)
@@ -549,25 +549,25 @@ void ViewArea::restoreState( KConfig *config, int id, const TQString &groupName
if ( config->hasKey( containsKey(m_id) ) )
{
typedef TQValueList<int> IntList;
- IntList tqcontains = config->readIntListEntry( containsKey(m_id) );
+ IntList contains = config->readIntListEntry( containsKey(m_id) );
- if ( tqcontains.isEmpty() || tqcontains.size() > 2 )
- kdError() << k_funcinfo << "Contained list has wrong size of " << tqcontains.size() << endl;
+ if ( contains.isEmpty() || contains.size() > 2 )
+ kdError() << k_funcinfo << "Contained list has wrong size of " << contains.size() << endl;
else
{
- if ( tqcontains.size() >= 1 )
+ if ( contains.size() >= 1 )
{
- int viewArea1Id = tqcontains[0];
+ int viewArea1Id = contains[0];
p_viewArea1 = new ViewArea( this, p_viewContainer, viewArea1Id, (const char*)("viewarea_"+TQString::number(viewArea1Id)) );
connect( p_viewArea1, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) );
p_viewArea1->restoreState( config, viewArea1Id, groupName );
p_viewArea1->show();
}
- if ( tqcontains.size() >= 2 )
+ if ( contains.size() >= 2 )
{
- int viewArea2Id = tqcontains[1];
+ int viewArea2Id = contains[1];
p_viewArea2 = new ViewArea( this, p_viewContainer, viewArea2Id, (const char*)("viewarea_"+TQString::number(viewArea2Id)) );
connect( p_viewArea2, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(viewAreaDestroyed(TQObject* )) );
p_viewArea2->restoreState( config, viewArea2Id, groupName );
@@ -591,7 +591,7 @@ TQString ViewArea::fileKey( int id )
}
TQString ViewArea::containsKey( int id )
{
- return TQString("ViewArea ") + TQString::number(id) + TQString(" tqcontains");
+ return TQString("ViewArea ") + TQString::number(id) + TQString(" contains");
}
TQString ViewArea::orientationKey( int id )
{