diff options
Diffstat (limited to 'src/kile/tabulardialog.cpp')
-rw-r--r-- | src/kile/tabulardialog.cpp | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/kile/tabulardialog.cpp b/src/kile/tabulardialog.cpp index b75d0c3..bc3acda 100644 --- a/src/kile/tabulardialog.cpp +++ b/src/kile/tabulardialog.cpp @@ -205,13 +205,13 @@ void TabCellFrame::mousePressEvent(TQMouseEvent *event) //KILE_DEBUG() << "left mouse button: x=" << x << " y=" << endl; int state = 0; - if ( m_left.tqcontains(x,y) ) + if ( m_left.contains(x,y) ) state = TabularCell::cbLeft; - else if ( m_top.tqcontains(x,y) ) + else if ( m_top.contains(x,y) ) state = TabularCell::cbTop; - else if ( m_right.tqcontains(x,y) ) + else if ( m_right.contains(x,y) ) state = TabularCell::cbRight; - else if ( m_bottom.tqcontains(x,y) ) + else if ( m_bottom.contains(x,y) ) state = TabularCell::cbBottom; if ( state > 0 ) @@ -513,7 +513,7 @@ TQString TabCellDialog::header() if ( m_cbPre->isChecked() ) s += ">{} "; - s += m_coHeader->currentText().tqreplace("{w}","{}"); + s += m_coHeader->currentText().replace("{w}","{}"); if ( m_cbPost->isChecked() ) s += " <{}"; @@ -554,27 +554,27 @@ void TabCellDialog::initWidgets() { TQString s = m_headerlabel.remove(' '); - bool state = ( s.tqfind("@{}") >= 0 ); + bool state = ( s.find("@{}") >= 0 ); if ( state ) s = s.remove("@{}"); m_cbAt->setChecked(state); - state = ( s.tqfind("!{}") >= 0 ); + state = ( s.find("!{}") >= 0 ); if ( state ) s = s.remove("!{}"); m_cbSep->setChecked(state); - state = ( s.tqfind(">{}") >= 0 ); + state = ( s.find(">{}") >= 0 ); if ( state ) s = s.remove(">{}"); m_cbPre->setChecked(state); - state = ( s.tqfind("<{}") >= 0 ); + state = ( s.find("<{}") >= 0 ); if ( state ) s = s.remove("<{}"); m_cbPost->setChecked(state); - int pos = m_preamblelist.tqfindIndex(s); + int pos = m_preamblelist.findIndex(s); if ( pos < 0 ) pos = 0; m_coHeader->setCurrentItem(pos); @@ -912,9 +912,9 @@ bool TabularTable::updateCell(int row,int col) } // when editing is finished, we check, if the TQTableItem is still needed -void TabularTable::endEdit(int row,int col,bool accept,bool tqreplace) +void TabularTable::endEdit(int row,int col,bool accept,bool replace) { - TQTable::endEdit(row,col,accept,tqreplace); + TQTable::endEdit(row,col,accept,replace); //updateCell(row,col); } @@ -1126,11 +1126,11 @@ void TabularTable::insertPopupAlign(TQPopupMenu *popup,bool header) if ( header && m_x1==m_x2 ) { TQString label = horizontalHeader()->label(m_x1); - if ( label.tqfind('l') < 0 ) + if ( label.find('l') < 0 ) align += 1; - if ( label.tqfind('c') < 0 ) + if ( label.find('c') < 0 ) align += 2; - if ( label.tqfind('r') < 0 ) + if ( label.find('r') < 0 ) align += 4; } else { @@ -1475,9 +1475,9 @@ void TabularTable::updateHeaderAlignment(int col1,int col2,TQChar alignchar) TQString label = horizontalHeader()->label(col); for ( uint i=0; i<list.count(); ++i ) { - if ( label.tqfind(list[i]) >= 0 ) + if ( label.find(list[i]) >= 0 ) { - horizontalHeader()->setLabel( col,label.tqreplace(list[i],alignchar) ); + horizontalHeader()->setLabel( col,label.replace(list[i],alignchar) ); break; } } @@ -1745,11 +1745,11 @@ TabularCell::Count TabularTable::countCells(int x1,int y1,int x2,int y2) TQString whitename = TQt::white.name(); colors[whitename] = 0; - itw = colors.tqfind(whitename); + itw = colors.find(whitename); TQString blackname = TQt::black.name(); textcolors[blackname] = 0; - itb = textcolors.tqfind(blackname); + itb = textcolors.find(blackname); // initialize result TabularCell::Count count = { 0,0,0,0,0, whitename,blackname }; @@ -1776,7 +1776,7 @@ TabularCell::Count TabularTable::countCells(int x1,int y1,int x2,int y2) // check backgroundcolor TQString name = cellitem->m_data.bgcolor.name(); - it = colors.tqfind(name); + it = colors.find(name); if ( it != colors.end() ) (*it)++; else @@ -1784,7 +1784,7 @@ TabularCell::Count TabularTable::countCells(int x1,int y1,int x2,int y2) // check textcolor name = cellitem->m_data.textcolor.name(); - it = textcolors.tqfind(name); + it = textcolors.find(name); if ( it != textcolors.end() ) (*it)++; else @@ -1977,7 +1977,7 @@ void TabularDialog::slotEnvironmentChanged(const TQString &env) m_cbStarred->setEnabled( attr.starred ); // option - if ( attr.option.tqfind('[') == 0 ) + if ( attr.option.find('[') == 0 ) { TQStringList optionlist = TQStringList::split("",attr.option); if ( optionlist.count() > 2 ) @@ -2092,7 +2092,7 @@ char TabularDialog::defineColor(const TQString &name, TQMap<TQString,char> &colo // look for current color TQMapIterator<TQString,char> it; - it = colors.tqfind(name); + it = colors.find(name); if ( it != colors.end() ) return (*it); @@ -2216,11 +2216,11 @@ void TabularDialog::slotOk() { // get current header s = hor->label(col).remove(' '); - if ( s.tqfind('>') || s.tqfind('<') || s.tqfind('!') || s.tqfind('m') || s.tqfind('b')) + if ( s.find('>') || s.find('<') || s.find('!') || s.find('m') || s.find('b')) pkgArray = true; // look for @{} and !{} substrings - bool separator = ( s.tqfind('@')>=0 || s.tqfind('!')>=0 ); + bool separator = ( s.find('@')>=0 || s.find('!')>=0 ); if ( !separator ) { lines = m_table->countVLines(col,true); @@ -2247,21 +2247,21 @@ void TabularDialog::slotOk() } if ( ! colorcommand.isEmpty() ) { - if ( s.tqfind('>') >= 0 ) - s = s.tqreplace(">{}",TQString(">{%1}").tqarg(colorcommand)); + if ( s.find('>') >= 0 ) + s = s.replace(">{}",TQString(">{%1}").tqarg(colorcommand)); else preamble += TQString(">{%1}").tqarg(colorcommand); pkgArray = true; } // Alignment: default is left, we look only for center or right - if ( s.tqfind('c') >= 0 ) + if ( s.find('c') >= 0 ) colinfo[col].align = TQt::AlignHCenter; - else if ( s.tqfind('r') >= 0 ) + else if ( s.find('r') >= 0 ) colinfo[col].align = TQt::AlignRight; // pre >{} and post <{} commands can stay, but perhaps bullets are wanted - preamble += ( m_cbBullets->isChecked() ) ? s.tqreplace("{}", '{' + s_bullet + '}') : s; + preamble += ( m_cbBullets->isChecked() ) ? s.replace("{}", '{' + s_bullet + '}') : s; } // search for right vline in last column lines = m_table->countVLines( numcols-1,false ); @@ -2435,7 +2435,7 @@ void TabularDialog::slotOk() if ( envname=="tabularx" || envname=="longtable" || envname=="supertabular" ) packagelist += ',' + envname; if ( ! packagelist.isEmpty() ) { - packagelist = packagelist.tqreplace(0,1,"% use packages: ") + '\n'; + packagelist = packagelist.replace(0,1,"% use packages: ") + '\n'; } // get environment names @@ -2493,18 +2493,18 @@ void TabularDialog::slotOk() // set cursor to first bullet position if ( m_cbBullets->isChecked() ) { - int pos = m_td.tagBegin.tqfind(bullet); + int pos = m_td.tagBegin.find(bullet); if ( pos >= 0 ) { - m_td.tagBegin = m_td.tagBegin.tqreplace(pos,1,"%C"); + m_td.tagBegin = m_td.tagBegin.replace(pos,1,"%C"); setcursor = false; } else { - pos = m_td.tagEnd.tqfind(bullet); + pos = m_td.tagEnd.find(bullet); if ( pos >= 0 ) { - m_td.tagEnd = m_td.tagEnd.tqreplace(pos,1,"%C"); + m_td.tagEnd = m_td.tagEnd.replace(pos,1,"%C"); setcursor = false; } else |