diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:00 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:00 -0600 |
commit | ec1fddcd0d6663ad273af85357f04abbc5689468 (patch) | |
tree | 6cb946ab8b4771868c6eee8d1aa5213d6ec246e2 /kpovmodeler/pmviewlayoutmanager.cpp | |
parent | c2637a0da6d9a1c8626ca39f8451ab3b7cda487a (diff) | |
download | tdegraphics-ec1fddcd0d6663ad273af85357f04abbc5689468.tar.gz tdegraphics-ec1fddcd0d6663ad273af85357f04abbc5689468.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.
Diffstat (limited to 'kpovmodeler/pmviewlayoutmanager.cpp')
-rw-r--r-- | kpovmodeler/pmviewlayoutmanager.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp index 7d45224d..e6f9148c 100644 --- a/kpovmodeler/pmviewlayoutmanager.cpp +++ b/kpovmodeler/pmviewlayoutmanager.cpp @@ -32,7 +32,7 @@ #include <tqwidgetlist.h> #include <tqlistbox.h> #include <tqlineedit.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include "pmshell.h" @@ -443,7 +443,7 @@ void PMViewLayout::normalize( ) PMViewLayout PMViewLayout::extractViewLayout( PMShell* shell ) { - PMViewLayout layout; + PMViewLayout tqlayout; TQValueList< TQValueList< PMViewLayoutEntry > > cols; cols.append( TQValueList< PMViewLayoutEntry >( ) ); @@ -457,7 +457,7 @@ PMViewLayout PMViewLayout::extractViewLayout( PMShell* shell ) for( cit = cols.begin( ); cit != cols.end( ); ++cit ) for( eit = ( *cit ).begin( ); eit != ( *cit ).end( ); ++eit ) - layout.addEntry( *eit ); + tqlayout.addEntry( *eit ); // find floating widgets TQPtrList<PMDockWidget> list; @@ -495,11 +495,11 @@ PMViewLayout PMViewLayout::extractViewLayout( PMShell* shell ) invalid = true; if( !invalid ) - layout.addEntry( e ); + tqlayout.addEntry( e ); } } - return layout; + return tqlayout; } void PMViewLayout::recursiveExtractColumns( @@ -666,7 +666,7 @@ void PMViewLayoutManager::loadData( ) TQString fileName = locate( "data", "kpovmodeler/viewlayouts.xml" ); if( fileName.isEmpty( ) ) { - // Generate a default layout + // Generate a default tqlayout // I have a feeling this shouldn't be here but hey, it works for now // TODO Must find a way to move this cleanly to PMShell PMViewLayout a; @@ -763,7 +763,7 @@ void PMViewLayoutManager::saveData( ) { TQDomElement l; - l = doc.createElement( "viewlayout" ); + l = doc.createElement( "viewtqlayout" ); ( *it ).saveData( l, doc ); e.appendChild( l ); } @@ -810,7 +810,7 @@ void PMViewLayoutManager::displayLayout( const TQString& name, PMShell* shell ) flist.remove( ); } } - // Create the new layout + // Create the new tqlayout v_layout->displayLayout( shell ); m_layoutDisplayed = true; } @@ -879,7 +879,7 @@ PMSaveViewLayoutDialog::PMSaveViewLayoutDialog( PMShell* parent, TQWidget* w = new TQWidget( this ); TQVBoxLayout* vl = new TQVBoxLayout( w, 0, KDialog::spacingHint( ) ); - TQLabel* l = new TQLabel( i18n( "Enter view layout name:" ), w ); + TQLabel* l = new TQLabel( i18n( "Enter view tqlayout name:" ), w ); vl->addWidget( l ); m_pLayoutName = new TQLineEdit( w ); @@ -907,13 +907,13 @@ void PMSaveViewLayoutDialog::slotOk( ) TQString name = m_pLayoutName->text( ); PMViewLayoutManager* m = PMViewLayoutManager::theManager( ); - PMViewLayout* layout = m->findLayout( name ); + PMViewLayout* tqlayout = m->findLayout( name ); PMViewLayout newLayout = PMViewLayout::extractViewLayout( m_pShell ); newLayout.setName( name ); - if( layout ) - *layout = newLayout; + if( tqlayout ) + *tqlayout = newLayout; else m->addLayout( newLayout ); |