diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
commit | 7c71ab86d1f7e387fc3df63b48df07231f111862 (patch) | |
tree | 30ba2d2f840ff5fd458b6113e9c3f2e8a71d510d /kword/KWView.cpp | |
parent | afbfdc507bfaafc8824a9808311d57a9ece87510 (diff) | |
download | koffice-7c71ab86d1f7e387fc3df63b48df07231f111862.tar.gz koffice-7c71ab86d1f7e387fc3df63b48df07231f111862.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/applications/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kword/KWView.cpp')
-rw-r--r-- | kword/KWView.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 2651e6ad..92181228 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -1420,7 +1420,7 @@ void KWView::updateGridButton() m_actionViewSnapToGrid->setChecked ( m_doc->snapToGrid() ); } -void KWView::loadexpressionActions( KActionMenu * tqparentMenu) +void KWView::loadexpressionActions( KActionMenu * parentMenu) { KActionPtrList lst = actionCollection()->actions("expression-action"); TQValueList<KAction *> actions = lst; @@ -1434,7 +1434,7 @@ void KWView::loadexpressionActions( KActionMenu * tqparentMenu) delete *it; } - tqparentMenu->popupMenu()->clear(); + parentMenu->popupMenu()->clear(); TQStringList path = m_doc->personalExpressionPath(); TQStringList files; for ( TQStringList::Iterator it = path.begin(); it != path.end(); ++it ) @@ -1452,10 +1452,10 @@ void KWView::loadexpressionActions( KActionMenu * tqparentMenu) int i = 0; int nbFile = 0; for( TQStringList::Iterator it = files.begin(); it != files.end(); ++it,nbFile++ ) - createExpressionActions( tqparentMenu,*it, i,(nbFile<(int)files.count()-1), personalShortCuts ); + createExpressionActions( parentMenu,*it, i,(nbFile<(int)files.count()-1), personalShortCuts ); } -void KWView::createExpressionActions( KActionMenu * tqparentMenu,const TQString& filename,int &i, bool insertSepar, const TQMap<TQString, KShortcut>& personalShortCut ) +void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& filename,int &i, bool insertSepar, const TQMap<TQString, KShortcut>& personalShortCut ) { TQFile file( filename ); if ( !file.exists() || !file.open( IO_ReadOnly ) ) @@ -1477,7 +1477,7 @@ void KWView::createExpressionActions( KActionMenu * tqparentMenu,const TQString& expressionExist =true; TQString group = i18n( e.namedItem( "TypeName" ).toElement().text().utf8() ); KActionMenu * subMenu = new KActionMenu( group, actionCollection() ); - tqparentMenu->insert( subMenu ); + parentMenu->insert( subMenu ); TQDomNode n2 = e.firstChild(); for( ; !n2.isNull(); n2 = n2.nextSibling() ) @@ -1504,7 +1504,7 @@ void KWView::createExpressionActions( KActionMenu * tqparentMenu,const TQString& } } if(expressionExist && insertSepar) - tqparentMenu->popupMenu()->insertSeparator(); + parentMenu->popupMenu()->insertSeparator(); } void KWView::insertExpression() @@ -1519,15 +1519,15 @@ void KWView::insertExpression() void KWView::addVariableActions( int type, const TQStringList & texts, - KActionMenu * tqparentMenu, const TQString & menuText ) + KActionMenu * parentMenu, const TQString & menuText ) { - // Single items go directly into tqparentMenu. + // Single items go directly into parentMenu. // For multiple items we create a submenu. if ( texts.count() > 1 && !menuText.isEmpty() ) { KActionMenu * subMenu = new KActionMenu( menuText, actionCollection() ); - tqparentMenu->insert( subMenu ); - tqparentMenu = subMenu; + parentMenu->insert( subMenu ); + parentMenu = subMenu; } TQStringList::ConstIterator it = texts.begin(); for ( int i = 0; it != texts.end() ; ++it, ++i ) @@ -1544,7 +1544,7 @@ void KWView::addVariableActions( int type, const TQStringList & texts, // Mainly for KEditToolbar act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).tqarg( *it ) ); m_variableDefMap.insert( act, v ); - tqparentMenu->insert( act ); + parentMenu->insert( act ); } } } @@ -6203,7 +6203,7 @@ void KWView::inlineFrame() if( !frame) return; KWFrameSet * fs = frame->frameSet(); - KWFrameSet * tqparentFs = fs->groupmanager() ? fs->groupmanager() : fs; + KWFrameSet * parentFs = fs->groupmanager() ? fs->groupmanager() : fs; if(m_actionInlineFrame->isChecked()) { @@ -6214,7 +6214,7 @@ void KWView::inlineFrame() KoPoint initialPos = frame->topLeft(); // turn non-floating frame into floating frame - KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( i18n("Make Frameset Inline"), tqparentFs, true ); + KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( i18n("Make Frameset Inline"), parentFs, true ); cmd->execute(); frameindexList.append( FrameIndex( frame ) ); @@ -6228,7 +6228,7 @@ void KWView::inlineFrame() } else { - KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( i18n("Make Frameset Non-Inline"), tqparentFs, false ); + KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( i18n("Make Frameset Non-Inline"), parentFs, false ); m_doc->addCommand(cmd); cmd->execute(); } |