diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
| commit | 4a25ca5c80d9b88fdc1a0d44d1db47da47206899 (patch) | |
| tree | 8a1d1e893a80df8ad5233802c2b0e39220b86168 | |
| parent | 441266d591a9064dd619da0e1bd49b871d6a9c70 (diff) | |
| download | tdeadmin-4a25ca5c.tar.gz tdeadmin-4a25ca5c.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
66 files changed, 353 insertions, 353 deletions
diff --git a/kcron/ctunit.cpp b/kcron/ctunit.cpp index e843b2e..d034c8a 100644 --- a/kcron/ctunit.cpp +++ b/kcron/ctunit.cpp @@ -84,7 +84,7 @@ void CTUnit<min, max>::parse(string tokStr) { subelement = tokStr.substr(0,commapos); - // tqfind "/" to determine step + // find "/" to determine step slashpos = subelement.find("/"); if (slashpos == -1) { @@ -99,7 +99,7 @@ void CTUnit<min, max>::parse(string tokStr) step = 1; } - // tqfind "=" to determine range + // find "=" to determine range dashpos = subelement.find("-"); if (dashpos == -1) { diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp index 46ec77c..99e9608 100644 --- a/kcron/kttask.cpp +++ b/kcron/kttask.cpp @@ -421,10 +421,10 @@ void KTTask::slotCommandChanged() /* TQString qs(leCommand->text()); - int beginPos(qs.tqfindRev("/", qs.length()) + 1); + int beginPos(qs.findRev("/", qs.length()) + 1); if (beginPos < 0) beginPos = 0; - int endPos(qs.tqfindRev(" ", qs.length())); + int endPos(qs.findRev(" ", qs.length())); if (endPos < 0) endPos = qs.length(); TQString iconName(qs.mid(beginPos, endPos-beginPos) + ".xpm"); @@ -609,9 +609,9 @@ void KTTask::slotOK() // absolute path TQString qs(leCommand->text()); - if (qs.tqfind("/") == 0) + if (qs.find("/") == 0) { - int spacePos(qs.tqfind(" ")); + int spacePos(qs.find(" ")); if (spacePos < 0) spacePos = qs.length(); TQString programName(qs.left(spacePos)); TQFileInfo file(programName); diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp index 60ff101..474d22c 100644 --- a/kcron/ktvariable.cpp +++ b/kcron/ktvariable.cpp @@ -144,7 +144,7 @@ void KTVariable::slotOk() ctvar->variable = cmbVariable->currentText().local8Bit().data(); ctvar->value = leValue->text().local8Bit().data(); - ctvar->comment = teComment->text().tqreplace('\n',' ').tqreplace('\r',' ').local8Bit().data(); + ctvar->comment = teComment->text().replace('\n',' ').replace('\r',' ').local8Bit().data(); ctvar->enabled = chkEnabled->isChecked(); close(); } diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp index 5819104..50a562c 100644 --- a/kcron/ktview.cpp +++ b/kcron/ktview.cpp @@ -427,10 +427,10 @@ TQString KTView::absolute() const { TQString fullCommand = TQString::fromLocal8Bit(currentCTTask->command.c_str()); TQString command(fullCommand); - int pos(command.tqfind(" ")); + int pos(command.find(" ")); if (pos > 0) command = command.left(pos); - if (command.tqfind("/") == 0) + if (command.find("/") == 0) return fullCommand; TQString path = TQString::fromLocal8Bit(currentCTCron->path().c_str()); @@ -439,7 +439,7 @@ TQString KTView::absolute() const TQString prefix; TQString full; - while ((end = path.tqfind(":", begin)) > 0) + while ((end = path.find(":", begin)) > 0) { prefix = path.mid(begin, begin + end) + "/"; full = prefix + command; diff --git a/kdat/Archive.cpp b/kdat/Archive.cpp index 1a78d44..a6869ad 100644 --- a/kdat/Archive.cpp +++ b/kdat/Archive.cpp @@ -266,7 +266,7 @@ File* Archive::addFile( int size, int mtime, int startRecord, int endRecord, con TQString fn( filename ); int idx = 0; - while ( ( idx = fn.tqfind( '/' ) ) > -1 ) { + while ( ( idx = fn.find( '/' ) ) > -1 ) { path.append( fn.left( idx + 1 ) ); fn.remove( 0, idx + 1 ); } diff --git a/kdat/BackupProfileWidget.cpp b/kdat/BackupProfileWidget.cpp index 7530d5c..1cd3f4c 100644 --- a/kdat/BackupProfileWidget.cpp +++ b/kdat/BackupProfileWidget.cpp @@ -205,7 +205,7 @@ void BackupProfileWidget::setAbsoluteFiles( const TQStringList& files ) TQString prefix = Util::longestCommonPath( files ); _workingDir->clear(); - for ( int pos = prefix.length(); pos > 0; pos = prefix.tqfindRev( '/', pos - 1 ) ) { + for ( int pos = prefix.length(); pos > 0; pos = prefix.findRev( '/', pos - 1 ) ) { _workingDir->insertItem( prefix.left( pos ) ); } _workingDir->insertItem( "/" ); diff --git a/kdat/Node.cpp b/kdat/Node.cpp index 7999c9d..9ce9e03 100644 --- a/kdat/Node.cpp +++ b/kdat/Node.cpp @@ -311,7 +311,7 @@ TapeDirectoryNode::TapeDirectoryNode( File* file ) setDelayedExpanding( TRUE ); int len = _file->getName().length(); - int idx1 = _file->getName().tqfindRev( '/', len - 2 ); + int idx1 = _file->getName().findRev( '/', len - 2 ); if ( idx1 < 0 ) { setText( _file->getName().left( len - 1 ) ); } else { @@ -372,7 +372,7 @@ TapeFileNode::TapeFileNode( File* file ) _file( file ) { int len = _file->getName().length(); - int idx1 = _file->getName().tqfindRev( '/', len - 1 ); + int idx1 = _file->getName().findRev( '/', len - 1 ); if ( idx1 < 0 ) { setText( _file->getName().left( len ) ); } else { @@ -482,7 +482,7 @@ const TQPixmap* SelectableNode::getSelectPixmap() const bool SelectableNode::mousePressEvent( const TQPoint& point ) { - if ( _selectRect.tqcontains( point ) ) { + if ( _selectRect.contains( point ) ) { switch ( _state ) { case SelAll: setSelected( FALSE ); @@ -713,7 +713,7 @@ MountedTapeDirectoryNode::MountedTapeDirectoryNode( File* file, int state ) setDelayedExpanding( TRUE ); int len = _file->getName().length(); - int idx1 = _file->getName().tqfindRev( '/', len - 2 ); + int idx1 = _file->getName().findRev( '/', len - 2 ); if ( idx1 < 0 ) { setText( _file->getName().left( len - 1 ) ); } else { @@ -819,7 +819,7 @@ MountedTapeFileNode::MountedTapeFileNode( File* file, int state ) _file( file ) { int len = _file->getName().length(); - int idx1 = _file->getName().tqfindRev( '/', len - 1 ); + int idx1 = _file->getName().findRev( '/', len - 1 ); if ( idx1 < 0 ) { setText( _file->getName().left( len ) ); } else { diff --git a/kdat/Util.cpp b/kdat/Util.cpp index 7f1dcd7..11e7219 100644 --- a/kdat/Util.cpp +++ b/kdat/Util.cpp @@ -60,9 +60,9 @@ TQString Util::longestCommonPath( const TQStringList& files ) } i = filesTmp.begin(); TQString prefix = *i; - int idx = prefix.tqfindRev( '/', j ); + int idx = prefix.findRev( '/', j ); if ( idx > -1 ) { - prefix = prefix.left( prefix.tqfindRev( '/', j ) ); + prefix = prefix.left( prefix.findRev( '/', j ) ); } else { prefix = ""; } diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp index 93e8a93..520c050 100644 --- a/kdat/VerifyDlg.cpp +++ b/kdat/VerifyDlg.cpp @@ -248,7 +248,7 @@ void VerifyDlg::slotProcessExited( KProcess* ) void VerifyDlg::slotStdout( KProcess*, char* buf, int len ) { TQString data; - data.tqreplace( 0, len, buf ); + data.replace( 0, len, buf ); /* 2002-02-23 RG */ // data[len] = '\0'; data.truncate( len ); @@ -256,7 +256,7 @@ void VerifyDlg::slotStdout( KProcess*, char* buf, int len ) _leftover += data; int newlineIndex; - while ( ( newlineIndex = _leftover.tqfind( '\n' ) ) > -1 ) { + while ( ( newlineIndex = _leftover.find( '\n' ) ) > -1 ) { _log->append( _leftover.left( newlineIndex ) ); // Count differences. diff --git a/kdat/ktreeview.cpp b/kdat/ktreeview.cpp index c43cb35..2a31a19 100644 --- a/kdat/ktreeview.cpp +++ b/kdat/ktreeview.cpp @@ -155,7 +155,7 @@ int KTreeViewItem::childIndex(KTreeViewItem* searched) const // indicates whether mouse press is in expand button inline bool KTreeViewItem::expandButtonClicked(const TQPoint& coord) const { - return expandButton.tqcontains(coord); + return expandButton.contains(coord); } bool KTreeViewItem::mousePressEvent( const TQPoint& ) @@ -1681,7 +1681,7 @@ void KTreeView::mouseDoubleClickEvent(TQMouseEvent *e) // hit test item int indent = indentation(item); - if(item->boundingRect(indent).tqcontains(cellCoord)) + if(item->boundingRect(indent).contains(cellCoord)) emit selected(itemClicked); } @@ -1749,7 +1749,7 @@ void KTreeView::mousePressEvent(TQMouseEvent *e) emit selected(itemClicked); } // hit item (to show info on the file/dir label clicked) - else if (item->boundingRect(indentation(item)).tqcontains(cellCoord)) { + else if (item->boundingRect(indentation(item)).contains(cellCoord)) { setCurrentItem(itemClicked); // highlight item if ( e->button() == Qt::RightButton ) { emit popupMenu( itemClicked, mapToGlobal( TQPoint( e->pos().x(), e->pos().y() ) ) ); diff --git a/kfile-plugins/deb/kfile_deb.cpp b/kfile-plugins/deb/kfile_deb.cpp index fdd16f2..e11c38c 100644 --- a/kfile-plugins/deb/kfile_deb.cpp +++ b/kfile-plugins/deb/kfile_deb.cpp @@ -104,7 +104,7 @@ bool KDebPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) char linebuf[100]; controldev.readLine(linebuf, sizeof( linebuf )); TQString line(linebuf); - int fieldstart = line.tqfind(TQRegExp(":"), 0) + 2; + int fieldstart = line.find(TQRegExp(":"), 0) + 2; if (fieldstart == 1) break; TQString fieldname = line.mid(0, fieldstart - 2); TQString fielddata = line.mid(fieldstart, line.length() - fieldstart - 1); diff --git a/knetworkconf/backends/file.pl.in b/knetworkconf/backends/file.pl.in index 35d17cb..f147474 100644 --- a/knetworkconf/backends/file.pl.in +++ b/knetworkconf/backends/file.pl.in @@ -81,7 +81,7 @@ sub gst_file_get_data_path } -# Give a command, and it will put in C locale, some sane PATH values and tqfind +# Give a command, and it will put in C locale, some sane PATH values and find # the program to run in the path. Redirects stderr to null. sub get_cmd_path { diff --git a/knetworkconf/backends/network.pl.in b/knetworkconf/backends/network.pl.in index 42d1629..ed36e40 100644 --- a/knetworkconf/backends/network.pl.in +++ b/knetworkconf/backends/network.pl.in @@ -37,7 +37,7 @@ if ($SCRIPTSDIR =~ /^@scriptsdir[@]/) require "$SCRIPTSDIR/general.pl$DOTIN"; require "$SCRIPTSDIR/file.pl$DOTIN"; require "$SCRIPTSDIR/parse.pl$DOTIN"; -require "$SCRIPTSDIR/tqreplace.pl$DOTIN"; +require "$SCRIPTSDIR/replace.pl$DOTIN"; require "$SCRIPTSDIR/service.pl$DOTIN"; require "$SCRIPTSDIR/util.pl$DOTIN"; require "$SCRIPTSDIR/xml.pl$DOTIN"; diff --git a/knetworkconf/backends/parse.pl.in b/knetworkconf/backends/parse.pl.in index 7064536..0a02012 100644 --- a/knetworkconf/backends/parse.pl.in +++ b/knetworkconf/backends/parse.pl.in @@ -1437,7 +1437,7 @@ sub gst_parse_xml my ($model, $branch); ($model) = &gst_xml_model_scan ($file); - $branch = &gst_xml_model_tqfind ($model, $varpath); + $branch = &gst_xml_model_find ($model, $varpath); if ($branch) { @@ -1454,7 +1454,7 @@ sub gst_parse_xml_child_names my ($model, $branch, @tqchildren); ($model) = &gst_xml_model_scan ($file); - $branch = &gst_xml_model_tqfind ($model, $varpath); + $branch = &gst_xml_model_find ($model, $varpath); if (!$branch) { return @tqchildren; } @@ -1500,7 +1500,7 @@ sub gst_parse_alchemist_print_option my ($varpath, $model, $branch, $fd, $options, $option); ($model) = &gst_xml_model_scan ($file); - $branch = &gst_xml_model_tqfind ($model, "/adm_context/datatree/printconf/print_queues/" . $printer . + $branch = &gst_xml_model_find ($model, "/adm_context/datatree/printconf/print_queues/" . $printer . "/filter_data/foomatic_defaults"); return undef if (!$branch); @@ -1509,7 +1509,7 @@ sub gst_parse_alchemist_print_option foreach $o (@$options) { - my $opt_node = &gst_xml_model_tqfind ($o, "name"); + my $opt_node = &gst_xml_model_find ($o, "name"); next if (!$opt_node); if (&gst_xml_model_get_attribute ($opt_node, "VALUE") eq $name) @@ -1521,7 +1521,7 @@ sub gst_parse_alchemist_print_option return undef if (!$option); - my $node = &gst_xml_model_tqfind ($option, "default"); + my $node = &gst_xml_model_find ($option, "default"); return undef if (!$node); return &gst_xml_model_get_attribute ($node, "VALUE"); diff --git a/knetworkconf/backends/replace.pl.in b/knetworkconf/backends/replace.pl.in index bac1f9a..8114f19 100644 --- a/knetworkconf/backends/replace.pl.in +++ b/knetworkconf/backends/replace.pl.in @@ -1,7 +1,7 @@ #!/usr/bin/env perl #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -# tqreplace.pl: Common in-line replacing stuff for the ximian-setup-tools backends. +# replace.pl: Common in-line replacing stuff for the ximian-setup-tools backends. # # Copyright (C) 2000-2001 Ximian, Inc. # @@ -59,7 +59,7 @@ require "$SCRIPTSDIR/parse.pl$DOTIN"; # Additional abstraction: replace table entries can have # arrays inside. The replace proc will be ran with every # combination that the arrays provide. Ex: -# ["user", \&gst_replace_foo, [0, 1], [2, 3] ] will tqreplace +# ["user", \&gst_replace_foo, [0, 1], [2, 3] ] will replace # using all possibilities in the combinatory of [0, 1]x[2, 3]. # Check RedHat 7.2's network replace table for further # enlightenment. @@ -264,7 +264,7 @@ sub gst_replace_join_first_array return &gst_replace_split ($file, $key, $re1, join (&gst_replace_regexp_to_separator ($re2), @$value)); } -# Escape $value in /bin/sh way, tqfind/append key and set escaped value. +# Escape $value in /bin/sh way, find/append key and set escaped value. sub gst_replace_sh { my ($file, $key, $value) = @_; @@ -289,7 +289,7 @@ sub gst_replace_sh return $ret; } -# Escape $value in /bin/sh way, tqfind/append key and set escaped value, make sure line har +# Escape $value in /bin/sh way, find/append key and set escaped value, make sure line har sub gst_replace_sh_export { my ($file, $key, $value) = @_; @@ -443,7 +443,7 @@ sub gst_replace_line_first return 0; } -# For every key in %$value, tqreplace/append the corresponding key/value pair. +# For every key in %$value, replace/append the corresponding key/value pair. # The separator for $re1 sub gst_replace_join_hash { @@ -550,7 +550,7 @@ sub gst_replace_chat return $ret; } -# Find/append $section in ini $file and tqreplace/append +# Find/append $section in ini $file and replace/append # $var = $value pair. FIXME: should reimplement with # interfaces style. This is too large. sub gst_replace_ini @@ -1149,7 +1149,7 @@ sub gst_replace_interfaces_iface_stanza_delete return &gst_file_buffer_save ($buff, $file); } -# Find $iface stanza line and tqreplace $pos value (ie the method). +# Find $iface stanza line and replace $pos value (ie the method). sub gst_replace_interfaces_stanza_value { my ($file, $iface, $pos, $value) = @_; @@ -1323,7 +1323,7 @@ sub gst_replace_pump_add_device } # Find a "device" section for $iface and -# tqreplace/add/delete the $key option inside the section. +# replace/add/delete the $key option inside the section. sub gst_replace_pump_iface_option_str { my ($file, $iface, $key, $value) = @_; @@ -1448,11 +1448,11 @@ sub gst_replace_alchemist_ensure_list_types my ($model, $varpath, $setpath) = @_; my ($branch, @path); - $branch = &gst_xml_model_tqfind ($model, $varpath); + $branch = &gst_xml_model_find ($model, $varpath); @path = split /\//, $setpath; # NOTE: The following could be done with a depth-iterator callback from a func - # similar to gst_xml_model_tqfind (). + # similar to gst_xml_model_find (). for $elem (@path) { @@ -1511,7 +1511,7 @@ sub gst_replace_alchemist_print &gst_xml_model_set_attribute ($branch, "VALUE", $value); &gst_xml_model_set_attribute ($branch, "TYPE", $type); - $branch = &gst_xml_model_tqfind ($model, "/adm_context/datatree/printconf/print_queues/" . $printer); + $branch = &gst_xml_model_find ($model, "/adm_context/datatree/printconf/print_queues/" . $printer); &gst_xml_model_set_attribute ($branch, "ATOMIC", "TRUE"); return &gst_xml_model_save ($model, $file, $compressed); @@ -1536,7 +1536,7 @@ sub gst_replace_alchemist_print_option foreach $o (@$options) { - my $opt_node = &gst_xml_model_tqfind ($o, "name"); + my $opt_node = &gst_xml_model_find ($o, "name"); next if (!$opt_node); if (&gst_xml_model_get_attribute ($opt_node, "VALUE") eq $name) diff --git a/knetworkconf/backends/report.pl.in b/knetworkconf/backends/report.pl.in index ceaadd6..68326dd 100644 --- a/knetworkconf/backends/report.pl.in +++ b/knetworkconf/backends/report.pl.in @@ -260,7 +260,7 @@ sub gst_report "file_open_read_failed" => ["warn", "Could not open [%s] for reading."], "file_open_read_success" => ["info", "Reading options from [%s]."], "file_open_write_failed" => ["error", "Failed to write to [%s]."], - "file_open_write_create" => ["warn", "Could not tqfind [%s] for writing. Creating [%s]."], + "file_open_write_create" => ["warn", "Could not find [%s] for writing. Creating [%s]."], "file_open_write_success" => ["info", "Writing to [%s]."], "file_run_pipe_failed" => ["warn", "Failed to pipe command [%s] for reading."], "file_run_pipe_success" => ["info", "Piping command [%s] for reading."], @@ -269,7 +269,7 @@ sub gst_report "file_backup_rotate" => ["info", "Backup directory [%s] was rotated."], "file_backup_success" => ["info", "Saved backup for [%s]."], "file_open_filter_failed" => ["warn", "No file to patch: [%s]."], - "file_open_filter_create" => ["warn", "Could not tqfind [%s] for patching. Creating [%s]."], + "file_open_filter_create" => ["warn", "Could not find [%s] for patching. Creating [%s]."], "file_open_filter_success" => ["info", "Found [%s]. Patching [%s]."], "file_buffer_load" => ["info", "Loading file [%s] to buffer."], "file_buffer_save" => ["info", "Saving buffer to file [%s]."], diff --git a/knetworkconf/backends/type1inst b/knetworkconf/backends/type1inst index bb624be..86d6425 100755 --- a/knetworkconf/backends/type1inst +++ b/knetworkconf/backends/type1inst @@ -876,7 +876,7 @@ sub font_sample { die_bug("Bad argument(s) to font_sample()!\n"); } -# Here we create a full page sample for the current font. It tqcontains +# Here we create a full page sample for the current font. It contains # a large point-size version, a normal sized version, and a small version. $text = <<"TEXT"; diff --git a/knetworkconf/backends/xml.pl.in b/knetworkconf/backends/xml.pl.in index dfd41cd..eed6b88 100644 --- a/knetworkconf/backends/xml.pl.in +++ b/knetworkconf/backends/xml.pl.in @@ -814,7 +814,7 @@ sub gst_xml_get_state # XML model operations. # Locate a node from the branch leading up to it. -sub gst_xml_model_tqfind +sub gst_xml_model_find { my ($model, $varpath) = @_; my ($branch, @path); @@ -855,7 +855,7 @@ sub gst_xml_model_add my ($branch, @path); @path = split /\//, $addpath; - $branch = &gst_xml_model_tqfind ($model, $varpath); + $branch = &gst_xml_model_find ($model, $varpath); if ($branch == undef) { return -1; @@ -932,7 +932,7 @@ sub gst_xml_model_remove my ($branch, $i); @path = split /\//, $addpath; - $branch = &gst_xml_model_tqfind ($model, $varpath); + $branch = &gst_xml_model_find ($model, $varpath); if ($branch == undef) { return -1; diff --git a/knetworkconf/knetworkconf-mdk.spec b/knetworkconf/knetworkconf-mdk.spec index 4267f34..ce65b36 100644 --- a/knetworkconf/knetworkconf-mdk.spec +++ b/knetworkconf/knetworkconf-mdk.spec @@ -80,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT/* %files -f %name.lang -#Quick Hack: for some reason the %find_lang command doesn't tqfind +#Quick Hack: for some reason the %find_lang command doesn't find #the translations files, it outputs a knetworkconf.lang file full #of empty lines instead of the following ones: %lang(de) /usr/share/locale/de/LC_MESSAGES/knetworkconfmodule.mo diff --git a/knetworkconf/knetworkconf/kaddressvalidator.cpp b/knetworkconf/knetworkconf/kaddressvalidator.cpp index f3fabe7..c1f086a 100644 --- a/knetworkconf/knetworkconf/kaddressvalidator.cpp +++ b/knetworkconf/knetworkconf/kaddressvalidator.cpp @@ -33,7 +33,7 @@ bool KAddressValidator::isValidIPAddress(TQString addr){ int i; int number; bool ok; - if ((addr.tqcontains('.') > 3) || (addr.length() > 15)) + if ((addr.contains('.') > 3) || (addr.length() > 15)) return false; for (i = 0; i < 4; i++) { diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp index 11dbad0..c03b762 100644 --- a/knetworkconf/knetworkconf/knetworkconf.cpp +++ b/knetworkconf/knetworkconf/knetworkconf.cpp @@ -104,7 +104,7 @@ void KNetworkConf::loadNetworkDevicesInfo() { if ( device->getType() != "loopback" ) { - if (klvCardList->tqfindItem(device->getDeviceName(),0,CaseSensitive|ExactMatch) == 0) + if (klvCardList->findItem(device->getDeviceName(),0,CaseSensitive|ExactMatch) == 0) { TQListViewItem * item = new TQListViewItem( klvCardList, 0 ); @@ -740,7 +740,7 @@ void KNetworkConf::verifyDeviceStateChanged(){ } else if (commandOutput == "\n<!-- GST: end of request -->") { - TQListViewItem *item = klvCardList->tqfindItem(currentDevice,0,ExactMatch); + TQListViewItem *item = klvCardList->findItem(currentDevice,0,ExactMatch); if (item != NULL) { dev = getDeviceInfo(currentDevice); diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp index 093ab9f..1bba25c 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp +++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp @@ -820,7 +820,7 @@ void KNetworkConfigParser::readNetworkInfo() //If the platform where knetworkconf is running isn't supported, show the //user a dialog with all the supported platforms to choose. - if (xmlErr.tqcontains("platform_unsup::")) + if (xmlErr.contains("platform_unsup::")) { connect( this, TQT_SIGNAL(readyLoadingSupportedPlatforms()), this, TQT_SLOT(showSupportedPlatformsDialogSlot()) ); loadSupportedPlatforms(); @@ -1081,92 +1081,92 @@ void KNetworkConfigParser::showSupportedPlatformsDialogSlot(){ key = key.section(":",0,0); TQString name = (*it); name = name.section(":",1,1); - if (key.tqcontains("debian")) + if (key.contains("debian")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/debian.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("mandriva")) + else if (key.contains("mandriva")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/mandriva.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("conectiva")) + else if (key.contains("conectiva")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/conectiva.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("pld")) + else if (key.contains("pld")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/pld.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("redhat")) + else if (key.contains("redhat")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/redhat.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("suse")) + else if (key.contains("suse")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/suse.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("turbolinux")) + else if (key.contains("turbolinux")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/turbolinux.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("fedora")) + else if (key.contains("fedora")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/fedora.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("openna")) + else if (key.contains("openna")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/openna.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("slackware")) + else if (key.contains("slackware")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/slackware.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("freebsd")) + else if (key.contains("freebsd")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/freebsd.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("gentoo")) + else if (key.contains("gentoo")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/gentoo.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("blackpanther")) + else if (key.contains("blackpanther")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/blackpanther.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("rpath")) + else if (key.contains("rpath")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/rpath.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("vine")) + else if (key.contains("vine")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/vine.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("ubuntu")) + else if (key.contains("ubuntu")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/kubuntu.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("yoper")) + else if (key.contains("yoper")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/yoper.png")); dialog->klbDistroList->insertItem(distroImg, name); } - else if (key.tqcontains("ark")) + else if (key.contains("ark")) { TQPixmap distroImg(locate("data","knetworkconf/pixmaps/ark.png")); dialog->klbDistroList->insertItem(distroImg, name); diff --git a/knetworkconf/update_backends.sh b/knetworkconf/update_backends.sh index d6a5e0c..9b77d13 100755 --- a/knetworkconf/update_backends.sh +++ b/knetworkconf/update_backends.sh @@ -35,7 +35,7 @@ fi diractual=`pwd` cd $1; -cp -f AUTHORS debug.pl.in file.pl.in general.pl.in guess_system.sh mkinstalldirs network-conf.in network.pl.in NEWS parse.pl.in platform.pl.in README tqreplace.pl.in report.pl.in service-list.pl.in service.pl.in system-tools-backends.pc.in type1inst util.pl.in xml.pl.in process.pl.in $2 +cp -f AUTHORS debug.pl.in file.pl.in general.pl.in guess_system.sh mkinstalldirs network-conf.in network.pl.in NEWS parse.pl.in platform.pl.in README replace.pl.in report.pl.in service-list.pl.in service.pl.in system-tools-backends.pc.in type1inst util.pl.in xml.pl.in process.pl.in $2 echo echo 'Ready, dont forget to check configure.in.in or Makefile.am to see if they need further updating.' diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp index d453726..ce28d21 100644 --- a/kpackage/debAptInterface.cpp +++ b/kpackage/debAptInterface.cpp @@ -318,7 +318,7 @@ TQStringList DEBAPT::listInstalls(const TQStringList &packs, bool install, bool TQString packAll; for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { // kdDebug() << "M=" << *it << "\n"; - if ((*it).tqfind(match) >= 0 || extras) { + if ((*it).find(match) >= 0 || extras) { if (extras) { if ((*it)[0] == ' ') { packAll += *it; @@ -351,14 +351,14 @@ TQStringList DEBAPT::FindFile(const TQString &name, bool searchAll) TQStringList filelist = kpty->run(s); for ( TQStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it ) { - int p = (*it).tqfind(": "); + int p = (*it).find(": "); if( p !=-1 ) - (*it).tqreplace(p, 2, "\t"); + (*it).replace(p, 2, "\t"); } if (filelist.count() == 1) { TQStringList::Iterator it = filelist.begin(); - if ((*it).tqfind("not found") >= 0) { + if ((*it).find("not found") >= 0) { filelist.remove(it); } } @@ -514,10 +514,10 @@ void DEBAPT::writeApt(const TQStringList &list) { TQString cmd = "sh -c \"/bin/echo -e '"; for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { TQString s = *it; - s.tqreplace("\""," "); - s.tqreplace("'"," "); - s.tqreplace("!"," "); - s.tqreplace("`"," "); + s.replace("\""," "); + s.replace("'"," "); + s.replace("!"," "); + s.replace("`"," "); cmd += s; cmd += "\n"; } diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp index 8ad5226..d0bdd69 100644 --- a/kpackage/debInterface.cpp +++ b/kpackage/debInterface.cpp @@ -123,11 +123,11 @@ bool DEB::parseName(const TQString &name, TQString *n, TQString *v) { int d1, d2, s1; - s1 = name.tqfindRev('.'); + s1 = name.findRev('.'); if (s1 > 0) { - d2 = name.tqfindRev('-',s1-1); + d2 = name.findRev('-',s1-1); if (d2 > 0) { - d1 = name.tqfindRev('_',d2-1); + d1 = name.findRev('_',d2-1); if (d1 < 0) d1 = d2; *n = name.left(d1); @@ -248,7 +248,7 @@ packageInfo *DEB::getIRPackageInfo( const TQString &name) TQStringList list = kpty->run(s); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { // kdDebug() << "U=" << *it << "\n"; - if ((*it).tqfind("Package:") >= 0) { + if ((*it).find("Package:") >= 0) { kdDebug() << "found\n"; while (it != list.begin()) { list.remove(list.begin()); @@ -280,7 +280,7 @@ packageInfo *DEB::getUPackageInfo( const TQString &name) TQStringList list = kpty->run(s); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { // kdDebug() << "U=" << *it << "\n"; - if ((*it).tqfind("Package:") >= 0) { + if ((*it).find("Package:") >= 0) { // kdDebug() << "found\n"; while (it != list.begin()) { list.remove(list.begin()); @@ -316,7 +316,7 @@ packageInfo *DEB::collectInfo(TQStringList &ln, pkgInterface *pkgInt) for ( TQStringList::Iterator it = ln.begin(); it != ln.end(); ++it ) { loop: - int col = (*it).tqfind(':'); + int col = (*it).find(':'); key = ((*it).left(col)).lower(); if (key[0] == ' ') { key.remove(0,1); @@ -354,7 +354,7 @@ packageInfo *DEB::collectInfo(TQStringList &ln, pkgInterface *pkgInt) } else if (key == "section") { a.insert("group", val); } else if (key == "status") { - if ((val.tqfind("not-installed") >= 0) || (val.tqfind("config-files") >= 0)) { + if ((val.find("not-installed") >= 0) || (val.find("config-files") >= 0)) { return 0; } if (val != "install ok installed" && @@ -492,7 +492,7 @@ TQStringList DEB::getUFileList(const TQString &fn) it != filelist.end(); ++it ) { // kdDebug() << "F=" << *it << "\n"; if (pt < 0) { - pt = (*it).tqfindRev(' '); + pt = (*it).findRev(' '); } (*it) = (*it).mid(pt + 1); } @@ -509,14 +509,14 @@ TQStringList DEB::FindFile(const TQString &name, bool) TQStringList filelist = kpty->run(s); for ( TQStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it ) { - int p = (*it).tqfind(": "); + int p = (*it).find(": "); if( p !=-1 ) - (*it).tqreplace(p, 2, "\t"); + (*it).replace(p, 2, "\t"); } if (filelist.count() == 1) { TQStringList::Iterator it = filelist.begin(); - if ((*it).tqfind("not found") >= 0) { + if ((*it).find("not found") >= 0) { filelist.remove(it); } } diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp index cab1b8a..7ad7dbf 100644 --- a/kpackage/fbsdInterface.cpp +++ b/kpackage/fbsdInterface.cpp @@ -145,7 +145,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con cmd += name; TQStringList list = kpty->run(cmd); - int last_dir = name.tqfind('/'); + int last_dir = name.find('/'); if (last_dir != -1) { a["filename"] = name.mid(last_dir+1); a["base"] = name.left(last_dir + 1); @@ -335,7 +335,7 @@ TQStringList fbsdInterface::FindFile(const TQString &, bool) { bool fbsdInterface::parseName(const TQString &name, TQString *n, TQString *v) { int m1; - m1 = name.tqfindRev('-'); + m1 = name.findRev('-'); if (m1 <= 0) return false; *n = name.left(m1); *v = name.right(name.length() - m1 - 1); @@ -482,7 +482,7 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a) parseItem(it, name, value, INFO_SEPARATOR, list); // Information parseItem(it, name, value, INFO_SEPARATOR, list); // Path - int pos = value.tqfindRev('/'); + int pos = value.findRev('/'); value.truncate(pos); a["group"] = value; } else { diff --git a/kpackage/findf.cpp b/kpackage/findf.cpp index 651b50f..84b0d7c 100644 --- a/kpackage/findf.cpp +++ b/kpackage/findf.cpp @@ -47,7 +47,7 @@ FindF::FindF(TQWidget *tqparent) : KDialogBase(tqparent, "find_file", false, i18n("Find File"), User1 | Close, User1, true, - KGuiItem(i18n("&Find"),"filetqfind")) + KGuiItem(i18n("&Find"),"filefind")) { tick = UserIcon("ptick"); @@ -81,7 +81,7 @@ FindF::FindF(TQWidget *tqparent) tab->setAllColumnsShowFocus(TRUE); tab->setSorting(1); - if (kpackage->management->dirInstPackages->tqfind("apt-file/deb")) { + if (kpackage->management->dirInstPackages->find("apt-file/deb")) { searchAll = new TQCheckBox(i18n("Also search uninstalled packages"), frame1, "searchAll"); } else { searchAll = new TQCheckBox(i18n("Also search uninstalled packages (apt-file needs to be installed)"), frame1, "searchAll"); @@ -150,11 +150,11 @@ void FindF::doFind(const TQString &str) cnt++; for ( TQStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it ) { - if ((*it).tqfind("diversion by") >= 0) { + if ((*it).find("diversion by") >= 0) { new TQListViewItem(tab, "", *it); } - int t1 = (*it).tqfind('\t'); + int t1 = (*it).find('\t'); TQString s1 = (*it).left(t1); TQString s2 = (*it).right((*it).length()-t1); s2 = s2.stripWhiteSpace(); @@ -162,7 +162,7 @@ void FindF::doFind(const TQString &str) TQListViewItem *ql = new TQListViewItem(tab, "", kpinterface[i]->name, kpinterface[i]->head, s1, s2); TQString tx = s1 + kpinterface[i]->typeID; - if (kpackage->management->dirInstPackages->tqfind(tx)) { + if (kpackage->management->dirInstPackages->find(tx)) { ql->setPixmap(0,tick); } } @@ -193,7 +193,7 @@ void FindF::search(TQListViewItem *item) s = s.stripWhiteSpace(); kdDebug() << "searchF=" << s << "\n"; - p = s.tqfind(','); + p = s.find(','); if (p > 0) { s.truncate(p); } diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp index 31a9efc..4ed7c74 100644 --- a/kpackage/kissInterface.cpp +++ b/kpackage/kissInterface.cpp @@ -103,7 +103,7 @@ bool KISS::isType(char *buf, const TQString &) { if (hasProgram) { TQString tmp = buf; - if (tmp.tqfind("perl",0,false) >= 0) + if (tmp.find("perl",0,false) >= 0) return true; else return false; @@ -116,11 +116,11 @@ bool KISS::parseName(const TQString& name, TQString *n, TQString *v) { int d1, d2, s1; - s1 = name.tqfindRev('.'); + s1 = name.findRev('.'); if (s1 > 0) { - d2 = name.tqfindRev('-',s1-1); + d2 = name.findRev('-',s1-1); if (d2 > 0) { - d1 = name.tqfindRev('_',d2-1); + d1 = name.findRev('_',d2-1); if (d1 < 0) d1 = d2; *n = name.left(d1); @@ -149,7 +149,7 @@ void KISS::listInstalledPackages(TQPtrList<packageInfo> *pki) vb = "" ; int sc, sp = 0; - while ((sc = reader.buf.tqfind("\n\n",sp)) >= 0) { + while ((sc = reader.buf.find("\n\n",sp)) >= 0) { if (sc+1 == (signed int)reader.buf.length()) break; p = collectInfo(reader.buf.mid(sp,sc-sp).ascii()); diff --git a/kpackage/kpPty.cpp b/kpackage/kpPty.cpp index bd6062a..23eb15f 100644 --- a/kpackage/kpPty.cpp +++ b/kpackage/kpPty.cpp @@ -257,7 +257,7 @@ void kpPty::breakUpCmd(const TQString &cmd) if ((*it)[0] == '\'') { // Start of quoted string s = *it; if ((*it)[lastPt] == '\'') { // Also End of quoted string - s.tqreplace("'",""); + s.replace("'",""); (*pty) << s; quote = FALSE; } else { @@ -266,7 +266,7 @@ void kpPty::breakUpCmd(const TQString &cmd) } } else if ((*it)[lastPt] == '\'') { // End of quoted string s += *it; - s.tqreplace("'",""); + s.replace("'",""); (*pty) << s; quote = FALSE; } else if (quote) { @@ -345,7 +345,7 @@ void kpPty::finish(int ret) if (!retList.empty()) { int p; l = retList.fromLast(); - if ((p = (*l).tqfind("RESULT=")) >= 0) { + if ((p = (*l).find("RESULT=")) >= 0) { ret = (*l).mid(p+7).toInt(0,10); retList.remove(l); // Remove return code } else { @@ -356,7 +356,7 @@ void kpPty::finish(int ret) if (!retList.empty()) { l = retList.begin(); if ( l != retList.end()) { - if ((*l).tqfind("RESULT=") >= 0) { + if ((*l).find("RESULT=") >= 0) { retList.remove(l); // Remove command at start } } @@ -396,7 +396,7 @@ void kpPty::readLines() stext.truncate(stext.length()-1); } - i = stext.tqfindRev('\r'); + i = stext.findRev('\r'); if (i > -1) { stext = stext.mid(i+1); } diff --git a/kpackage/kpTerm.cpp b/kpackage/kpTerm.cpp index c91f1a2..b085296 100644 --- a/kpackage/kpTerm.cpp +++ b/kpackage/kpTerm.cpp @@ -111,13 +111,13 @@ void kpTerm::textIn(const TQString &stext, bool bNewLine) TQRegExp chrs("[\\010\\012\\015]"); TQString del = "\010"; // kdDebug() << "Tin=[" << stext << "]\n"; - if (stext.tqfind(chrs) < 0) { + if (stext.find(chrs) < 0) { insert( stext ); } else { int p; int op = 0; - while ((p = stext.tqfind(chrs,op)) >= 0) { + while ((p = stext.find(chrs,op)) >= 0) { if (p != op) { insert( stext.mid(op, p-op)); } diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp index 670b4b6..d8d7e64 100644 --- a/kpackage/kpackage.cpp +++ b/kpackage/kpackage.cpp @@ -100,11 +100,11 @@ void KPKG::setupMenu() actionCollection()); recent->loadEntries( config ); - pack_tqfind = new KAction( i18n("Find &Package..."), "tqfind", + pack_find = new KAction( i18n("Find &Package..."), "find", KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(kpackage), - TQT_SLOT(tqfind()), actionCollection(), "pack_tqfind"); + TQT_SLOT(find()), actionCollection(), "pack_find"); - pack_findf = new KAction( i18n("Find &File..."), "filetqfind", + pack_findf = new KAction( i18n("Find &File..."), "filefind", 0, TQT_TQOBJECT(kpackage), TQT_SLOT(findf()), actionCollection(), "pack_findf"); @@ -196,7 +196,7 @@ void KPKG::setupMenu() void KPKG::disableMenu() { pack_open->setEnabled(false); - pack_tqfind->setEnabled(false); + pack_find->setEnabled(false); pack_findf->setEnabled(false); kpack_reload->setEnabled(false); recent->setEnabled(false); @@ -205,7 +205,7 @@ void KPKG::disableMenu() void KPKG::enableMenu() { pack_open->setEnabled(true); - pack_tqfind->setEnabled(true); + pack_find->setEnabled(true); pack_findf->setEnabled(true); kpack_reload->setEnabled(true); recent->setEnabled(true); @@ -682,7 +682,7 @@ void KPACKAGE::fileOpenUrl(){ } } -void KPACKAGE::tqfind(){ +void KPACKAGE::find(){ if (srchdialog) srchdialog->show(); else diff --git a/kpackage/kpackage.h b/kpackage/kpackage.h index dcb55fa..b14b167 100644 --- a/kpackage/kpackage.h +++ b/kpackage/kpackage.h @@ -159,7 +159,7 @@ public slots: void fileOpenUrl(); // menu item FIle->OpenUrl - void tqfind(); + void find(); // search for package void findf(); @@ -230,7 +230,7 @@ class KPKG : public KMainWindow Tfileopen = 3, Tftout = 4, Tftin = 5, - Ttqfind = 6, + Tfind = 6, Tfindf = 7, Treload = 8 }; @@ -278,7 +278,7 @@ private: TQStrList recent_files; KAction *pack_open; - KAction *pack_tqfind; + KAction *pack_find; KAction *pack_findf; KAction *kpack_reload; KAction *pack_prev; diff --git a/kpackage/kplview.cpp b/kpackage/kplview.cpp index cf9014e..69d68d3 100644 --- a/kpackage/kplview.cpp +++ b/kpackage/kplview.cpp @@ -430,7 +430,7 @@ bool KpTreeList::searchChild(KpTreeListItem *it) TQString s = it->text(0); // kdDebug() << "s='" << s << "'='" << searchStr << "\n"; if ((it->childCount() == 0) && (it->info->display(treeType)) && - (searchSubstr ? s.tqcontains(searchStr,FALSE) : s == searchStr)) { + (searchSubstr ? s.contains(searchStr,FALSE) : s == searchStr)) { searchResult = it; return TRUE; } @@ -510,7 +510,7 @@ void KpTreeList::previous() void KpTreeList::stackRemove(KpTreeListItem *pack) { - int n = stack.tqfind(pack); + int n = stack.find(pack); if (n >= 0) { if (n == 0) { kpkg->disablePrevious(); @@ -650,11 +650,11 @@ int KpTreeListItem::compare( TQListViewItem *i, int col, bool ascending ) const TQString k, j; j = key( col, ascending ); - j = j.tqreplace(' ','0'); + j = j.replace(' ','0'); j = j.rightJustify(6,'0'); k = i->key( col, ascending ); - k = k.tqreplace(' ','0'); + k = k.replace(' ','0'); k = k.rightJustify(6,'0'); // kdDebug() << k <<"=" << j << "\n"; diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp index 2d30f5b..16e0ad7 100644 --- a/kpackage/managementWidget.cpp +++ b/kpackage/managementWidget.cpp @@ -623,7 +623,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install) if (install) { if (pnew) { if (pnew->packageState != packageInfo::BAD_INSTALL) { - ptree = dirInstPackages->tqfind(pkgId); // remove installed entry + ptree = dirInstPackages->find(pkgId); // remove installed entry dirInstPackages->remove(pkgId); if (ptree) { if (ptree->getItem()) { @@ -632,7 +632,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install) } } - ptree = dirUninstPackages->tqfind(pkgId); // remove uninstalled entry + ptree = dirUninstPackages->find(pkgId); // remove uninstalled entry if (ptree) { ptree->packageState = packageInfo::HIDDEN; if (ptree->getItem()) { @@ -665,7 +665,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install) } else { kdDebug() << "DEL=" << name << endl; } - packageInfo *pb = dirUninstPackages->tqfind(pkgId); + packageInfo *pb = dirUninstPackages->find(pkgId); if (pb) { // available package matching the one just uninstalled pb->packageState = packageInfo::NEW; q = pb->place(treeList,TRUE); diff --git a/kpackage/options.cpp b/kpackage/options.cpp index 16cf61f..895c75f 100644 --- a/kpackage/options.cpp +++ b/kpackage/options.cpp @@ -395,7 +395,7 @@ void Opts::readSettings(const TQString &initHost) // kdDebug() << "readSettings: " << initHost << "\n"; hostList = config->readListEntry("Host_list"); - if (!initHost.isEmpty() && !hostList.tqcontains(initHost)) { + if (!initHost.isEmpty() && !hostList.contains(initHost)) { hostList.prepend(initHost); config->writeEntry("Host_list", hostList); } diff --git a/kpackage/packageDisplay.cpp b/kpackage/packageDisplay.cpp index 0465d14..826a705 100644 --- a/kpackage/packageDisplay.cpp +++ b/kpackage/packageDisplay.cpp @@ -186,7 +186,7 @@ void packageDisplayWidget::changePackage(packageInfo *p) if (package && package != p) { - if (!package->getItem() && !kpackage->management->allPackages->tqfind(package)) { + if (!package->getItem() && !kpackage->management->allPackages->find(package)) { delete package; package = 0; } @@ -203,7 +203,7 @@ void packageDisplayWidget::changePackage(packageInfo *p) if (np) { TQMap<TQString, TQString>::Iterator it; // update info entries in p for ( it = np->info.begin(); it != np->info.end(); ++it ) { - package->info.tqreplace(it.key(),it.data()); + package->info.replace(it.key(),it.data()); } package->interface = np->interface; delete np; diff --git a/kpackage/packageInfo.cpp b/kpackage/packageInfo.cpp index e9d1e14..aab5be2 100644 --- a/kpackage/packageInfo.cpp +++ b/kpackage/packageInfo.cpp @@ -209,7 +209,7 @@ int packageInfo::getDigElement(const TQString &str, int *pos) int val = 0; if ((s[0] >= '0') && (s[0] <= '9')) { - nf = s.tqfind(ndig); + nf = s.find(ndig); if (nf >= 0) { val = s.left(nf).toInt(); } else { @@ -242,7 +242,7 @@ TQString packageInfo::getNdigElement(const TQString &string, int *pos) TQRegExp idig("[0-9]"); if ((s[0] < '0') || (s[0] > '9') ) { - nf = s.tqfind(idig); + nf = s.find(idig); if (nf < 0) nf = s.length(); str = s.left(nf); @@ -305,7 +305,7 @@ int packageInfo::pnewer(const TQString &s, const TQString &sp) static bool split(TQString orig, char seperator, TQString &first, TQString &second) { - int pos = orig.tqfind(seperator); + int pos = orig.find(seperator); if (pos > 0) { first = orig.mid(0,pos); second = orig.mid(pos+1); @@ -426,7 +426,7 @@ KpTreeListItem *packageInfo::place(KpTreeList *tree, bool insertI) cnt++; } - tmp = *info.tqfind("name"); + tmp = *info.find("name"); if(item) delete item; @@ -509,7 +509,7 @@ bool packageInfo::smerge( const TQString &exp) { TQDict<packageInfo> *dirInfoPackages = kpackage->management->dirInfoPackages; TQString pname = getProperty("name") + exp; - packageInfo *pi = dirInfoPackages->tqfind(pname); + packageInfo *pi = dirInfoPackages->find(pname); if (pi) { TQMap<TQString,TQString>::Iterator it; @@ -554,7 +554,7 @@ bool packageInfo::pkgInsert(TQPtrList<packageInfo> *pki, const TQString &exp, bool shouldUpdate = TRUE; bool hidden = FALSE; - packageInfo *pi = dirInstPackages->tqfind(pname); + packageInfo *pi = dirInstPackages->find(pname); if (pi) { // installed version exists if ((pi->packageState != BAD_INSTALL) && (pi->packageState != NOLIST)) { @@ -564,14 +564,14 @@ bool packageInfo::pkgInsert(TQPtrList<packageInfo> *pki, const TQString &exp, } } - packageInfo *pu = dirUninstPackages->tqfind(pname); + packageInfo *pu = dirUninstPackages->find(pname); if (pu) { // available version exists if ((pu->packageState != BAD_INSTALL) && (pu->packageState != NOLIST)) { if (newer(pu) >= 0) { shouldUpdate = FALSE; } else if (!installed) { // If older available package exists, remove it - dirUninstPackages->remove(*(pu->info.tqfind("name"))); + dirUninstPackages->remove(*(pu->info.find("name"))); pki->remove(pu); } } @@ -606,7 +606,7 @@ bool packageInfo::pkgInsert(TQPtrList<packageInfo> *pki, const TQString &exp, TQString group = getProperty("group"); if (group == "NEW") { if (pi->hasProperty("group")) { - info.tqreplace("group", + info.replace("group", pi->getProperty("group") ); } } diff --git a/kpackage/packageProperties.cpp b/kpackage/packageProperties.cpp index c613a23..2062a79 100644 --- a/kpackage/packageProperties.cpp +++ b/kpackage/packageProperties.cpp @@ -126,7 +126,7 @@ void packagePropertiesWidget::changePackage(packageInfo *p) // append other properties to end TQMap<TQString, TQString>::Iterator it; for ( it = p->info.begin(); it != p->info.end(); ++it ) { - if (!trl.tqfind(it.key())) { + if (!trl.find(it.key())) { if (!it.data().isEmpty()) cList.append(it.key()); } @@ -154,11 +154,11 @@ void packagePropertiesWidget::changePackage(packageInfo *p) stmp += "</td><td>"; TQString f = p->getProperty(*s); if (*s == "maintainer" || *s == "packager") { - f.tqreplace(TQRegExp("<"),"<"); - f.tqreplace(TQRegExp(">"),">"); + f.replace(TQRegExp("<"),"<"); + f.replace(TQRegExp(">"),">"); } if (*s == "filename") { - int p = f.tqfindRev("/"); + int p = f.findRev("/"); if (p >= 0) { f.insert(p+1,"\n"); }; @@ -211,7 +211,7 @@ void packagePropertiesWidget::dor(const TQString &f) { } void packagePropertiesWidget::delement(const TQString &f) { - int n = f.tqfind("("); + int n = f.find("("); if (n < 0) { n = f.length(); } @@ -222,9 +222,9 @@ void packagePropertiesWidget::delement(const TQString &f) { TQString us = uf + package->interface->typeID; bool inst = false, uninst = false; - if (kpackage->management->dirInstPackages->tqfind(us)) { + if (kpackage->management->dirInstPackages->find(us)) { inst = true; - } else if (kpackage->management->dirUninstPackages->tqfind(us)) { + } else if (kpackage->management->dirUninstPackages->find(us)) { uninst = true; } @@ -242,7 +242,7 @@ void packagePropertiesWidget::delement(const TQString &f) { if (uninst) stmp += "</i>"; if (n < (signed)f.length()) - stmp += f.mid(n).tqreplace(TQRegExp("<"),"<"); + stmp += f.mid(n).replace(TQRegExp("<"),"<"); } void packagePropertiesWidget::setSource(const TQString &name) { @@ -262,12 +262,12 @@ void packagePropertiesWidget::setSource(const TQString &name) { } TQString ind = s + package->interface->typeID; - packageInfo *p = kpackage->management->dirInstPackages->tqfind(ind); + packageInfo *p = kpackage->management->dirInstPackages->find(ind); if (p) { kpackage->management->treeList->changePack(p->getItem(), package->getItem() != 0); } else { kdDebug() << "nfound=" << ind << endl; - p = kpackage->management->dirUninstPackages->tqfind(ind); + p = kpackage->management->dirUninstPackages->find(ind); if (p) { kpackage->management->treeList->changePack(p->getItem(), package->getItem() != 0); } else { diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp index c1be713..1ed42e1 100644 --- a/kpackage/pkgOptions.cpp +++ b/kpackage/pkgOptions.cpp @@ -188,9 +188,9 @@ bool pkgOptions::setup(TQPtrList<packageInfo> *pl, const TQString &) plist.append(*it); TQString dirIndex = *it + pkgInt->typeID; if (installer) { - pk = kpackage->management->dirUninstPackages->tqfind(dirIndex); + pk = kpackage->management->dirUninstPackages->find(dirIndex); } else { - pk = kpackage->management->dirInstPackages->tqfind(dirIndex); + pk = kpackage->management->dirInstPackages->find(dirIndex); } if (pk) { // kdDebug() << "FF=" << dirIndex << "\n"; diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp index b9d6e5c..9b0401f 100644 --- a/kpackage/rpmInterface.cpp +++ b/kpackage/rpmInterface.cpp @@ -118,13 +118,13 @@ bool RPM::parseName(const TQString &name, TQString *n, TQString *v) { int d1, d2, s1, s2; - s2 = name.tqfindRev('.'); + s2 = name.findRev('.'); if (s2 > 0) { - s1 = name.tqfindRev('.',s2-1); + s1 = name.findRev('.',s2-1); if (s1 > 0) { - d2 = name.tqfindRev('-',s1-1); + d2 = name.findRev('-',s1-1); if (d2 > 0) { - d1 = name.tqfindRev('-',d2-1); + d1 = name.findRev('-',d2-1); if (d1 < 0) d1 = d2; *n = name.left(d1); @@ -231,8 +231,8 @@ packageInfo* RPM::collectInfo(TQStringList &ln) { } else if (name == "buildtime") { a.insert("build-time", value); } else if (name == "requires") { - value = value.tqreplace(TQRegExp("\\(\\)"),""); - value = value.tqreplace(TQRegExp("\\( \\)"),""); + value = value.replace(TQRegExp("\\(\\)"),""); + value = value.replace(TQRegExp("\\( \\)"),""); value = value.stripWhiteSpace(); if (value.endsWith(",")) { value.truncate(value.length()-1); @@ -242,18 +242,18 @@ packageInfo* RPM::collectInfo(TQStringList &ln) { int s = 0, n; TQString t; - if (!(*a.tqfind("name")).isEmpty()) { - while ((n = value.tqfind(",",s)) > 0) { + if (!(*a.find("name")).isEmpty()) { + while ((n = value.find(",",s)) > 0) { t = value.mid(s,n-s); t = t.stripWhiteSpace(); if (!t.isEmpty()) - provides.insert(t,new TQString(*a.tqfind("name"))); + provides.insert(t,new TQString(*a.find("name"))); s = n+1; } t = value.mid(s); t = t.stripWhiteSpace(); if (!t.isEmpty()) - provides.insert(t,new TQString(*a.tqfind("name"))); + provides.insert(t,new TQString(*a.find("name"))); value = value.stripWhiteSpace(); if (value.endsWith(",")) { @@ -464,7 +464,7 @@ void RPM::collectDepends(packageInfo *p, const TQString &name, int src) if (list.count() > 0) { TQStringList::Iterator it = list.begin(); - int pt = (*it).tqfind(":"); + int pt = (*it).find(":"); if (pt > 0) { TQString s = (*it).mid(pt+1); if (!s.isEmpty()) { @@ -602,10 +602,10 @@ TQStringList RPM::FindFile(const TQString &name, bool) { list.clear(); } else { for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - int p = (*it).tqfind(" "); - int nm = (*it).tqfind(name,p); + int p = (*it).find(" "); + int nm = (*it).find(name,p); if (nm >= 0) { - (*it).tqreplace(p, 1, "\t"); + (*it).replace(p, 1, "\t"); retlist.append(*it); } } @@ -617,7 +617,7 @@ TQStringList RPM::FindFile(const TQString &name, bool) { ////////////////////////////////////////////////////////////////////////////// TQString RPM::quotePath( const TQString &path) { TQString s = path; - s = s.tqreplace(" ","\\ "); + s = s.replace(" ","\\ "); return ( "'" + s + "'" ); } diff --git a/kpackage/search.cpp b/kpackage/search.cpp index 8477473..a3e60ee 100644 --- a/kpackage/search.cpp +++ b/kpackage/search.cpp @@ -39,7 +39,7 @@ Search::Search(TQWidget *tqparent, const char * name) : KDialogBase(tqparent, name, false, i18n("Find Package"), User1 | Close, User1, true, - KGuiItem( i18n("&Find"), "tqfind")) + KGuiItem( i18n("&Find"), "find")) { TQFrame *page = makeMainWidget(); diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp index 49e7c64..ae51d7b 100644 --- a/kpackage/slackInterface.cpp +++ b/kpackage/slackInterface.cpp @@ -148,7 +148,7 @@ bool SLACK::isType(char *buf, const TQString &) bool SLACK::parseName(const TQString &name, TQString *n, TQString *v) { int s1; - s1 = name.tqfindRev('.'); + s1 = name.findRev('.'); if (s1 > 0) { *n = name.left(s1); v = new TQString(""); @@ -432,15 +432,15 @@ packageInfo *SLACK::collectInfo(const char *_inp, int insState) } else if (!strcmp("package location",str)) { TQString sl = xstr; if (insState != INSTALLED) { - int sls = sl.tqfindRev("/"); + int sls = sl.findRev("/"); if (sls >= 0) { TQRegExp num("[0-9][0-9]*"); - int slf = sl.tqfind(num,sls); + int slf = sl.find(num,sls); if (slf >= 0) { sls++; TQString gt = sl.mid(sls,slf-sls); - if (trl->tqfind(gt)) { - gt = *trl->tqfind(gt); + if (trl->find(gt)) { + gt = *trl->find(gt); } a.insert("group",gt); } @@ -643,7 +643,7 @@ TQStringList SLACK::FindFile(const TQString &name, bool) } } while (fgets(linebuf,sizeof(linebuf),file)) { - if (TQString(TQString::fromLocal8Bit(linebuf)).tqfind(name) != -1) { + if (TQString(TQString::fromLocal8Bit(linebuf)).find(name) != -1) { st = "/"; st += linebuf; st.truncate(st.length() -1); diff --git a/ksysv/IOCore.cpp b/ksysv/IOCore.cpp index 3535317..8c7dc90 100644 --- a/ksysv/IOCore.cpp +++ b/ksysv/IOCore.cpp @@ -121,7 +121,7 @@ TQString ksv::IO::makeRelativePath (const TQString& from, const TQString& to) while (pos > -1) { const int old = pos + 1; - const int res = from.tqfind('/', old); + const int res = from.find('/', old); int length = 0; @@ -143,7 +143,7 @@ TQString ksv::IO::makeRelativePath (const TQString& from, const TQString& to) while (pos > -1) { const int old = pos + 1; - const int res = to.tqfind('/', old); + const int res = to.find('/', old); int length = 0; diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp index 53cde77..f039d63 100644 --- a/ksysv/TopWidget.cpp +++ b/ksysv/TopWidget.cpp @@ -725,7 +725,7 @@ void KSVTopLevel::print() // // if (line.isNull()) // // line = " "; -// // line.tqreplace( TQRegExp("\t"), " " ); +// // line.replace( TQRegExp("\t"), " " ); // // strncpy(buf,line.data(),160); diff --git a/ksysv/kdltooltip.cpp b/ksysv/kdltooltip.cpp index 1b98fa4..0260b5d 100644 --- a/ksysv/kdltooltip.cpp +++ b/ksysv/kdltooltip.cpp @@ -42,7 +42,7 @@ void KDLToolTip::maybeTip (const TQPoint& p) const TQRect vert = mParent->verticalScrollBar()->tqgeometry(); const TQRect horiz = mParent->horizontalScrollBar()->tqgeometry(); - if (vert.tqcontains(p)) + if (vert.contains(p)) { rect = vert; @@ -51,7 +51,7 @@ void KDLToolTip::maybeTip (const TQPoint& p) else text = mParent->tooltip(); } - else if (horiz.tqcontains(p)) + else if (horiz.contains(p)) { rect = horiz; if (!mParent->commonToolTips()) @@ -67,7 +67,7 @@ void KDLToolTip::maybeTip (const TQPoint& p) KSVItem* item = static_cast<KSVItem*> (i); rect = mParent->header()->tqgeometry(); - if (rect.tqcontains (p)) + if (rect.contains (p)) { text = mParent->tooltip(); } diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp index e279193..a4a713d 100644 --- a/ksysv/ksv_conf.cpp +++ b/ksysv/ksv_conf.cpp @@ -118,7 +118,7 @@ void KSVConfig::writeSettings() { bool KSVConfig::showRunlevel (int index) const { - if (mShowRunlevel.tqcontains (index)) + if (mShowRunlevel.contains (index)) return mShowRunlevel[index]; else return false; diff --git a/ksysv/ksv_core.cpp b/ksysv/ksv_core.cpp index 87d5528..b71ab78 100644 --- a/ksysv/ksv_core.cpp +++ b/ksysv/ksv_core.cpp @@ -59,7 +59,7 @@ TQString ksv::breakWords (const TQString& s, int amount) int pos = -1; for (int i = 1; i < amount; ++i) { - if ((pos = str.tqfind(' ', amount - i, false)) < 0 || (pos > maximum + i)) + if ((pos = str.find(' ', amount - i, false)) < 0 || (pos > maximum + i)) continue; else break; diff --git a/kuser/kgroup.cpp b/kuser/kgroup.cpp index 1ea6462..dbbff91 100644 --- a/kuser/kgroup.cpp +++ b/kuser/kgroup.cpp @@ -140,7 +140,7 @@ void KU::KGroup::setDesc(const TQString &data) bool KU::KGroup::lookup_user(const TQString &name) { - return (u.tqfind(name) != u.end()); + return (u.find(name) != u.end()); } bool KU::KGroup::addUser(const TQString &name) diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp index 1dacda2..4534ac5 100644 --- a/kuser/kgroupfiles.cpp +++ b/kuser/kgroupfiles.cpp @@ -271,12 +271,12 @@ bool KGroupFiles::save() if ( gr == 0 ) break; }; - if ( mDel.tqcontainsRef( gr ) ) { + if ( mDel.containsRef( gr ) ) { ++it; gr = (*it); continue; } - if ( mMod.tqcontains( gr ) ) gr = &( mMod[ gr ] ); + if ( mMod.contains( gr ) ) gr = &( mMod[ gr ] ); #ifdef HAVE_SHADOW if ( addok && !mCfg->gshadowsrc().isEmpty() ) @@ -284,8 +284,8 @@ bool KGroupFiles::save() #endif tmpGe = gr->getName(); - tmpGe.tqreplace( ',', "_" ); - tmpGe.tqreplace( ':', "_" ); + tmpGe.replace( ',', "_" ); + tmpGe.replace( ':', "_" ); gr->setName( tmpGe ); tmp_gid = gr->getGID(); @@ -298,8 +298,8 @@ bool KGroupFiles::save() tmpGe += ','; tmpSe += ','; } - gr->user( j ).tqreplace( ',', "_" ); - gr->user( j ).tqreplace( ':', "_" ); + gr->user( j ).replace( ',', "_" ); + gr->user( j ).replace( ':', "_" ); tmpGe += gr->user( j) ; tmpSe += gr->user( j ); } diff --git a/kuser/kgroupldap.cpp b/kuser/kgroupldap.cpp index d99475d..2f66b27 100644 --- a/kuser/kgroupldap.cpp +++ b/kuser/kgroupldap.cpp @@ -281,39 +281,39 @@ void KGroupLDAP::modData( KU::KGroup *group ) ldif += "dn: " + newrdn.utf8() + "," + mUrl.dn().utf8() + "\n" + "changetype: modify\n" + - "tqreplace: objectclass\n" + + "replace: objectclass\n" + "objectclass: posixgroup\n"; if ( ( getCaps() & Cap_Samba ) && ( group->getCaps() & KU::KGroup::Cap_Samba ) ) { ldif += "objectclass: sambagroupmapping\n"; } ldif += - "-\ntqreplace: cn\n" + + "-\nreplace: cn\n" + KABC::LDIF::assembleLine( "cn", group->getName() ) + - "\n-\ntqreplace: gidnumber\n" + + "\n-\nreplace: gidnumber\n" + KABC::LDIF::assembleLine( "gidnumber", TQString::number(group->getGID()) ) + - "\n-\ntqreplace: userpassword\n" + + "\n-\nreplace: userpassword\n" + KABC::LDIF::assembleLine( "userpassword", group->getPwd() ) + - "\n-\ntqreplace: memberuid\n"; + "\n-\nreplace: memberuid\n"; for ( uint i=0; i < group->count(); i++ ) { ldif += KABC::LDIF::assembleLine( "memberuid", group->user(i)) + "\n"; } if ( getCaps() & Cap_Samba ) { if ( group->getCaps() & KU::KGroup::Cap_Samba ) { ldif += - "-\ntqreplace: sambasid\n" + + "-\nreplace: sambasid\n" + KABC::LDIF::assembleLine( "sambasid", group->getSID().getSID() ) + - "\n-\ntqreplace: displayname\n" + + "\n-\nreplace: displayname\n" + KABC::LDIF::assembleLine( "displayname", group->getDisplayName() ) + - "\n-\ntqreplace: description\n" + + "\n-\nreplace: description\n" + KABC::LDIF::assembleLine( "description", group->getDesc() ) + - "\n-\ntqreplace: sambagrouptype\n" + + "\n-\nreplace: sambagrouptype\n" + KABC::LDIF::assembleLine( "sambagrouptype", TQString::number( group->getType() ) ) + "\n"; } else { - ldif += "-\ntqreplace: sambasid\n"; - ldif += "-\ntqreplace: displayname\n"; - ldif += "-\ntqreplace: description\n"; - ldif += "-\ntqreplace: sambagrouptype\n"; - ldif += "-\ntqreplace: sambasidlist\n"; + ldif += "-\nreplace: sambasid\n"; + ldif += "-\nreplace: displayname\n"; + ldif += "-\nreplace: description\n"; + ldif += "-\nreplace: sambagrouptype\n"; + ldif += "-\nreplace: sambasidlist\n"; } } diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp index f76c2ac..868f100 100644 --- a/kuser/kuserfiles.cpp +++ b/kuser/kuserfiles.cpp @@ -286,8 +286,8 @@ bool KUserFiles::loadsdw() // Save password file #define escstr(a,b) tmp2 = user->a(); \ - tmp2.tqreplace(':',"_"); \ - tmp2.tqreplace(',',"_"); \ + tmp2.replace(':',"_"); \ + tmp2.replace(',',"_"); \ user->b( tmp2 ); @@ -364,12 +364,12 @@ bool KUserFiles::savepwd() addok = true; if ( user == 0 ) break; }; - if ( mDel.tqcontainsRef( user ) ) { + if ( mDel.containsRef( user ) ) { ++it; user = (*it); continue; } - if ( mMod.tqcontains( user ) ) user = &( mMod[ user ] ); + if ( mMod.contains( user ) ) user = &( mMod[ user ] ); tmp_uid = user->getUID(); if ( caps & Cap_Shadow ) @@ -542,12 +542,12 @@ bool KUserFiles::savesdw() if ( up == 0 ) break; }; - if ( mDel.tqcontainsRef( up ) ) { + if ( mDel.containsRef( up ) ) { ++it; up = (*it); continue; } - if ( mMod.tqcontains( up ) ) up = &( mMod[ up ] ); + if ( mMod.contains( up ) ) up = &( mMod[ up ] ); strncpy( s.sp_namp, up->getName().local8Bit(), 200 ); if ( up->getDisabled() ) diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp index d1d99b0..5d4979a 100644 --- a/kuser/kuserldap.cpp +++ b/kuser/kuserldap.cpp @@ -176,7 +176,7 @@ void KUserLDAP::data( KIO::Job *, const TQByteArray& data ) else if ( name == "shadowflag" ) mUser->setFlag( val.toLong() ); else if ( name == "sambaacctflags" ) { - if ( !val.tqcontains( 'D' ) ) mUser->setDisabled( false ); + if ( !val.contains( 'D' ) ) mUser->setDisabled( false ); } else if ( name == "sambasid" ) mUser->setSID( val ); else if ( name == "sambaprimarygroupsid" ) @@ -399,7 +399,7 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod ) ldif += "dn: " + getRDN( user ).utf8() + "," + mUrl.dn().utf8() + "\n"; if ( mod ) { ldif += "changetype: modify\n"; - ldif += "tqreplace: objectClass\n"; + ldif += "replace: objectClass\n"; } if ( caps & Cap_InetOrg ) @@ -416,7 +416,7 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod ) if ( ( caps & Cap_Samba ) && ( user->getCaps() & KU::KUser::Cap_Samba ) ) { ldif += "objectClass: sambaSamAccount\n"; } - if ( mod && mObjectClasses.tqcontains( mUser ) ) { + if ( mod && mObjectClasses.contains( mUser ) ) { TQStringList ocs = mObjectClasses[ mUser ]; kdDebug() << user->getName() << " has additional objectclasses: " << ocs.join(",") << endl; TQValueListIterator<TQString> it; @@ -427,61 +427,61 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod ) } } - if ( mod ) ldif += "-\ntqreplace: cn\n"; + if ( mod ) ldif += "-\nreplace: cn\n"; ldif += KABC::LDIF::assembleLine( "cn", cn )+"\n"; if ( caps & Cap_InetOrg ) { - if ( mod ) ldif += "-\ntqreplace: uid\n"; + if ( mod ) ldif += "-\nreplace: uid\n"; ldif += KABC::LDIF::assembleLine( "uid", user->getName() ) + "\n"; } else { - if ( mod ) ldif += "-\ntqreplace: userid\n"; + if ( mod ) ldif += "-\nreplace: userid\n"; ldif += KABC::LDIF::assembleLine( "userid", user->getName() ) + "\n"; } if ( mod ) ldif += "-\n"; if ( ( user->getCaps() & KU::KUser::Cap_POSIX ) || ( caps & Cap_InetOrg ) ) { - if ( mod ) ldif += "tqreplace: userpassword\n"; + if ( mod ) ldif += "replace: userpassword\n"; ldif += KABC::LDIF::assembleLine( "userpassword", pwd )+"\n"; if ( mod ) ldif += "-\n"; } if ( user->getCaps() & KU::KUser::Cap_POSIX ) { - if ( mod ) ldif += "tqreplace: uidnumber\n"; + if ( mod ) ldif += "replace: uidnumber\n"; ldif += KABC::LDIF::assembleLine( "uidnumber", TQString::number( user->getUID() ) )+"\n"; - if ( mod ) ldif += "-\ntqreplace: gidnumber\n"; + if ( mod ) ldif += "-\nreplace: gidnumber\n"; ldif += KABC::LDIF::assembleLine( "gidnumber", TQString::number( user->getGID() ) )+"\n"; - if ( mod ) ldif += "-\ntqreplace: gecos\n"; + if ( mod ) ldif += "-\nreplace: gecos\n"; ldif += KABC::LDIF::assembleLine( "gecos", !mCfg->ldapgecos() ? TQCString() : TQCString( gecos.latin1() ) )+"\n"; - if ( mod ) ldif += "-\ntqreplace: homedirectory\n"; + if ( mod ) ldif += "-\nreplace: homedirectory\n"; ldif += KABC::LDIF::assembleLine( "homedirectory", user->getHomeDir() )+"\n"; - if ( mod ) ldif += "-\ntqreplace: loginshell\n"; + if ( mod ) ldif += "-\nreplace: loginshell\n"; ldif += KABC::LDIF::assembleLine( "loginshell", user->getShell() )+"\n"; if ( mod ) ldif += "-\n"; } else { if ( mod ) { - ldif += "tqreplace: uidnumber\n"; - ldif += "-\ntqreplace: gidnumber\n"; - ldif += "-\ntqreplace: homedirectory\n"; - ldif += "-\ntqreplace: loginshell\n"; - ldif += "-\ntqreplace: gecos\n"; + ldif += "replace: uidnumber\n"; + ldif += "-\nreplace: gidnumber\n"; + ldif += "-\nreplace: homedirectory\n"; + ldif += "-\nreplace: loginshell\n"; + ldif += "-\nreplace: gecos\n"; ldif += "-\n"; } } if ( caps & Cap_InetOrg ) { - if ( mod ) ldif += "tqreplace: sn\n"; + if ( mod ) ldif += "replace: sn\n"; ldif += KABC::LDIF::assembleLine( "sn", user->getSurname() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: mail\n"; + if ( mod ) ldif += "-\nreplace: mail\n"; ldif += KABC::LDIF::assembleLine( "mail", user->getEmail() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: displayName\n"; + if ( mod ) ldif += "-\nreplace: displayName\n"; ldif += KABC::LDIF::assembleLine( "displayname", user->getFullName() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: postaladdress\n"; + if ( mod ) ldif += "-\nreplace: postaladdress\n"; ldif += KABC::LDIF::assembleLine( "postaladdress", user->getAddress() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: telephoneNumber\n"; + if ( mod ) ldif += "-\nreplace: telephoneNumber\n"; ldif += KABC::LDIF::assembleLine( "telephoneNumber", user->getOffice1() ) + "\n"; ldif += KABC::LDIF::assembleLine( "telephoneNumber", user->getOffice2() ) + "\n"; if ( mod ) ldif += "-\n"; @@ -489,63 +489,63 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod ) if ( caps & Cap_Samba ) { if ( user->getCaps() & KU::KUser::Cap_Samba ) { - if ( mod ) ldif += "tqreplace: sambadomainname\n"; + if ( mod ) ldif += "replace: sambadomainname\n"; ldif += KABC::LDIF::assembleLine( "sambadomainname", user->getDomain() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: sambauserworkstations\n"; + if ( mod ) ldif += "-\nreplace: sambauserworkstations\n"; ldif += KABC::LDIF::assembleLine( "sambauserworkstations", user->getWorkstations() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: sambahomepath\n"; + if ( mod ) ldif += "-\nreplace: sambahomepath\n"; ldif += KABC::LDIF::assembleLine( "sambahomepath", user->getHomePath() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: sambahomedrive\n"; + if ( mod ) ldif += "-\nreplace: sambahomedrive\n"; ldif += KABC::LDIF::assembleLine( "sambahomedrive", user->getHomeDrive() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: sambalogonscript\n"; + if ( mod ) ldif += "-\nreplace: sambalogonscript\n"; ldif += KABC::LDIF::assembleLine( "sambalogonscript", user->getLoginScript() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: sambaprofilepath\n"; + if ( mod ) ldif += "-\nreplace: sambaprofilepath\n"; ldif += KABC::LDIF::assembleLine( "sambaprofilepath", user->getProfilePath() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: sambalmpassword\n"; + if ( mod ) ldif += "-\nreplace: sambalmpassword\n"; ldif += KABC::LDIF::assembleLine( "sambalmpassword", user->getLMPwd() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: sambantpassword\n"; + if ( mod ) ldif += "-\nreplace: sambantpassword\n"; ldif += KABC::LDIF::assembleLine( "sambantpassword", user->getNTPwd() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: sambasid\n"; + if ( mod ) ldif += "-\nreplace: sambasid\n"; ldif += KABC::LDIF::assembleLine( "sambasid", user->getSID().getSID() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: sambaacctflags\n"; + if ( mod ) ldif += "-\nreplace: sambaacctflags\n"; ldif += KABC::LDIF::assembleLine( "sambaacctflags", samflags ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: sambaprimarygroupsid\n"; + if ( mod ) ldif += "-\nreplace: sambaprimarygroupsid\n"; ldif += KABC::LDIF::assembleLine( "sambaprimarygroupsid", user->getPGSID().getSID() ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: sambapwdlastset\n"; + if ( mod ) ldif += "-\nreplace: sambapwdlastset\n"; ldif += KABC::LDIF::assembleLine( "sambapwdlastset", TQString::number( user->getLastChange() ) ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: sambakickofftime\n"; + if ( mod ) ldif += "-\nreplace: sambakickofftime\n"; if ( user->getExpire() != -1 ) ldif += KABC::LDIF::assembleLine( "sambakickofftime", TQString::number( user->getExpire() ) ) + "\n"; if ( mod ) ldif += "-\n"; } else { if ( mod ) { - ldif += "tqreplace: sambahomepath\n"; - ldif += "-\ntqreplace: sambahomedrive\n"; - ldif += "-\ntqreplace: sambalogonscript\n"; - ldif += "-\ntqreplace: sambaprofilepath\n"; - ldif += "-\ntqreplace: sambalmpassword\n"; - ldif += "-\ntqreplace: sambantpassword\n"; - ldif += "-\ntqreplace: sambasid\n"; - ldif += "-\ntqreplace: sambaacctflags\n"; - ldif += "-\ntqreplace: sambaprimarygroupsid\n"; - ldif += "-\ntqreplace: sambapwdlastset\n"; - ldif += "-\ntqreplace: sambakickofftime\n"; - ldif += "-\ntqreplace: sambalogontime\n"; - ldif += "-\ntqreplace: sambalogofftime\n"; - ldif += "-\ntqreplace: sambapwdcanchange\n"; - ldif += "-\ntqreplace: sambapwdmustchange\n"; - ldif += "-\ntqreplace: sambauserworkstations\n"; - ldif += "-\ntqreplace: sambadomainname\n"; - ldif += "-\ntqreplace: sambamungeddial\n"; - ldif += "-\ntqreplace: sambabadpasswordcount\n"; - ldif += "-\ntqreplace: sambabadpasswordtime\n"; - ldif += "-\ntqreplace: sambadomainname\n"; + ldif += "replace: sambahomepath\n"; + ldif += "-\nreplace: sambahomedrive\n"; + ldif += "-\nreplace: sambalogonscript\n"; + ldif += "-\nreplace: sambaprofilepath\n"; + ldif += "-\nreplace: sambalmpassword\n"; + ldif += "-\nreplace: sambantpassword\n"; + ldif += "-\nreplace: sambasid\n"; + ldif += "-\nreplace: sambaacctflags\n"; + ldif += "-\nreplace: sambaprimarygroupsid\n"; + ldif += "-\nreplace: sambapwdlastset\n"; + ldif += "-\nreplace: sambakickofftime\n"; + ldif += "-\nreplace: sambalogontime\n"; + ldif += "-\nreplace: sambalogofftime\n"; + ldif += "-\nreplace: sambapwdcanchange\n"; + ldif += "-\nreplace: sambapwdmustchange\n"; + ldif += "-\nreplace: sambauserworkstations\n"; + ldif += "-\nreplace: sambadomainname\n"; + ldif += "-\nreplace: sambamungeddial\n"; + ldif += "-\nreplace: sambabadpasswordcount\n"; + ldif += "-\nreplace: sambabadpasswordtime\n"; + ldif += "-\nreplace: sambadomainname\n"; if ( schemaversion > 0 ) { - ldif += "-\ntqreplace: sambapasswordhistory\n"; - ldif += "-\ntqreplace: sambalogonhours\n"; + ldif += "-\nreplace: sambapasswordhistory\n"; + ldif += "-\nreplace: sambalogonhours\n"; } ldif += "-\n"; } @@ -554,37 +554,37 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod ) if ( caps & Cap_Shadow ) { if ( user->getCaps() & KU::KUser::Cap_POSIX ) { - if ( mod ) ldif += "tqreplace: shadowlastchange\n"; //sambapwdlastset + if ( mod ) ldif += "replace: shadowlastchange\n"; //sambapwdlastset ldif += KABC::LDIF::assembleLine( "shadowlastchange", TQString::number( timeToDays( user->getLastChange() ) ) ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: shadowmin\n"; //sambaPwdCanChange + if ( mod ) ldif += "-\nreplace: shadowmin\n"; //sambaPwdCanChange ldif += KABC::LDIF::assembleLine( "shadowmin", TQString::number( user->getMin() ) ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: shadowmax\n"; //sambaPwdMustChange + if ( mod ) ldif += "-\nreplace: shadowmax\n"; //sambaPwdMustChange ldif += KABC::LDIF::assembleLine( "shadowmax", TQString::number( user->getMax() ) ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: shadowwarning\n"; + if ( mod ) ldif += "-\nreplace: shadowwarning\n"; ldif += KABC::LDIF::assembleLine( "shadowwarning", TQString::number( user->getWarn() ) ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: shadowinactive\n"; + if ( mod ) ldif += "-\nreplace: shadowinactive\n"; ldif += KABC::LDIF::assembleLine( "shadowinactive", TQString::number( user->getInactive() ) ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: shadowexpire\n"; //sambaKickoffTime + if ( mod ) ldif += "-\nreplace: shadowexpire\n"; //sambaKickoffTime ldif += KABC::LDIF::assembleLine( "shadowexpire", TQString::number( timeToDays( user->getExpire() ) ) ) + "\n"; - if ( mod ) ldif += "-\ntqreplace: shadowflag\n"; + if ( mod ) ldif += "-\nreplace: shadowflag\n"; ldif += KABC::LDIF::assembleLine( "shadowflag", TQString::number( user->getFlag() ) ) + "\n"; if ( mod ) ldif += "-\n"; } else { if ( mod ) { - ldif += "tqreplace: shadowlastchange\n"; - ldif += "-\ntqreplace: shadowmin\n"; - ldif += "-\ntqreplace: shadowmax\n"; - ldif += "-\ntqreplace: shadowwarning\n"; - ldif += "-\ntqreplace: shadowinactive\n"; - ldif += "-\ntqreplace: shadowexpire\n"; - ldif += "-\ntqreplace: shadowflag\n"; + ldif += "replace: shadowlastchange\n"; + ldif += "-\nreplace: shadowmin\n"; + ldif += "-\nreplace: shadowmax\n"; + ldif += "-\nreplace: shadowwarning\n"; + ldif += "-\nreplace: shadowinactive\n"; + ldif += "-\nreplace: shadowexpire\n"; + ldif += "-\nreplace: shadowflag\n"; ldif += "-\n"; } } @@ -630,7 +630,7 @@ void KUserLDAP::putData( KIO::Job *, TQByteArray& data ) if ( mDelUser ) { kdDebug() << "delete ok for: " << mDelUser->getName() << endl; mDelSucc.append( mDelUser ); - if ( mObjectClasses.tqcontains( mDelUser ) ) { + if ( mObjectClasses.contains( mDelUser ) ) { kdDebug() << "deleting additonal objectclasses!" << endl; mObjectClasses.remove( mDelUser ); } diff --git a/kuser/mainView.cpp b/kuser/mainView.cpp index 82b5cb3..344ee3a 100644 --- a/kuser/mainView.cpp +++ b/kuser/mainView.cpp @@ -217,15 +217,15 @@ void mainView::useradd() sid.setDOM( kug->getUsers().getDOMSID() ); sid.setRID( rid ); tk->setSID( sid ); - tk->setProfilePath( kug->kcfg()->samprofilepath().tqreplace( "%U",name ) ); - tk->setHomePath( kug->kcfg()->samhomepath().tqreplace( "%U", name ) ); + tk->setProfilePath( kug->kcfg()->samprofilepath().replace( "%U",name ) ); + tk->setHomePath( kug->kcfg()->samhomepath().replace( "%U", name ) ); tk->setHomeDrive( kug->kcfg()->samhomedrive() ); tk->setLoginScript( kug->kcfg()->samloginscript() ); tk->setDomain( kug->kcfg()->samdomain() ); } tk->setShell( kug->kcfg()->shell() ); - tk->setHomeDir( kug->kcfg()->homepath().tqreplace( "%U", name ) ); + tk->setHomeDir( kug->kcfg()->homepath().replace( "%U", name ) ); if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Shadow || samba ) { tk->setLastChange( now() ); } diff --git a/kuser/misc.cpp b/kuser/misc.cpp index 5f550be..2e1ebab 100644 --- a/kuser/misc.cpp +++ b/kuser/misc.cpp @@ -120,7 +120,7 @@ TQStringList readShells() void addShell(const TQString &shell) { TQStringList shells = readShells(); - if (shells.tqcontains(shell)) + if (shells.contains(shell)) return; FILE *f = fopen(SHELL_FILE,"a"); diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp index 775b837..b273d8d 100644 --- a/kuser/propdlg.cpp +++ b/kuser/propdlg.cpp @@ -408,7 +408,7 @@ void propdlg::setLE( KLineEdit *le, const TQString &val, bool first ) if ( val.isEmpty() && le->text().isEmpty() ) return; if ( le->text() != val ) { le->setText( "" ); - if ( !ro && mNoChanges.tqcontains( le ) ) { + if ( !ro && mNoChanges.contains( le ) ) { mNoChanges[ le ]->show(); mNoChanges[ le ]->setChecked( true ); } @@ -437,7 +437,7 @@ void propdlg::setSB( KIntSpinBox *sb, int val, bool first ) } if ( sb->value() != val ) { sb->setValue( 0 ); - if ( !ro && mNoChanges.tqcontains( sb ) ) { + if ( !ro && mNoChanges.contains( sb ) ) { mNoChanges[ sb ]->show(); mNoChanges[ sb ]->setChecked( true ); } @@ -485,7 +485,7 @@ void propdlg::selectuser() setLE( lefname, user->getFullName(), first ); TQString home; home = user->getHomeDir(); - if ( !one ) home.tqreplace( user->getName(), "%U" ); + if ( !one ) home.replace( user->getName(), "%U" ); setLE( lehome, home, first ); TQString shell = user->getShell(); @@ -523,11 +523,11 @@ void propdlg::selectuser() setLE( leliscript, user->getLoginScript(), first ); TQString profile; profile = user->getProfilePath(); - if ( !one ) profile.tqreplace( user->getName(), "%U" ); + if ( !one ) profile.replace( user->getName(), "%U" ); setLE( leprofile, profile, first ); setLE( lehomedrive, user->getHomeDrive(), first ); home = user->getHomePath(); - if ( !one ) home.tqreplace( user->getName(), "%U" ); + if ( !one ) home.replace( user->getName(), "%U" ); setLE( lehomepath, home, first ); setLE( leworkstations, user->getWorkstations(), first ); setLE( ledomain, user->getDomain(), first ); @@ -676,7 +676,7 @@ void propdlg::setpgroup() void propdlg::changed() { TQWidget *widget = (TQWidget*) sender(); - if ( mNoChanges.tqcontains( widget ) ) mNoChanges[ widget ]->setChecked( false ); + if ( mNoChanges.contains( widget ) ) mNoChanges[ widget ]->setChecked( false ); ischanged = true; kdDebug() << "changed" << endl; } @@ -689,14 +689,14 @@ void propdlg::gchanged() TQString propdlg::mergeLE( KLineEdit *le, const TQString &val, bool one ) { TQCheckBox *cb = 0; - if ( mNoChanges.tqcontains( le ) ) cb = mNoChanges[ le ]; + if ( mNoChanges.contains( le ) ) cb = mNoChanges[ le ]; return ( one || ( cb && !cb->isChecked() ) ) ? le->text() : val; } int propdlg::mergeSB( KIntSpinBox *sb, int val, bool one ) { TQCheckBox *cb = 0; - if ( mNoChanges.tqcontains( sb ) ) cb = mNoChanges[ sb ]; + if ( mNoChanges.contains( sb ) ) cb = mNoChanges[ sb ]; return ( one || ( cb && !cb->isChecked() ) ) ? sb->value() : val; } @@ -745,11 +745,11 @@ void propdlg::mergeUser( KU::KUser *user, KU::KUser *newuser ) newuser->setLoginScript( samba ? mergeLE( leliscript, user->getLoginScript(), one ) : TQString() ); newuser->setProfilePath( samba ? - mergeLE( leprofile, user->getProfilePath(), one ).tqreplace( "%U", newuser->getName() ) : TQString() ); + mergeLE( leprofile, user->getProfilePath(), one ).replace( "%U", newuser->getName() ) : TQString() ); newuser->setHomeDrive( samba ? mergeLE( lehomedrive, user->getHomeDrive(), one ) : TQString() ); newuser->setHomePath( samba ? - mergeLE( lehomepath, user->getHomePath(), one ).tqreplace( "%U", newuser->getName() ) : TQString() ); + mergeLE( lehomepath, user->getHomePath(), one ).replace( "%U", newuser->getName() ) : TQString() ); newuser->setWorkstations( samba ? mergeLE( leworkstations, user->getWorkstations(), one ) : TQString() ); newuser->setDomain( samba ? @@ -768,7 +768,7 @@ void propdlg::mergeUser( KU::KUser *user, KU::KUser *newuser ) } newuser->setHomeDir( posix ? - mergeLE( lehome, user->getHomeDir(), one ).tqreplace( "%U", newuser->getName() ) : + mergeLE( lehome, user->getHomeDir(), one ).replace( "%U", newuser->getName() ) : TQString() ); if ( posix ) { if ( leshell->currentItem() == 0 && ismoreshells ) { @@ -870,7 +870,7 @@ bool propdlg::checkShell(const TQString &shell) if (shell.isEmpty()) return true; TQStringList shells = readShells(); - return shells.tqcontains(shell); + return shells.contains(shell); } bool propdlg::check() diff --git a/kuser/selectconn.cpp b/kuser/selectconn.cpp index d661fb1..20c7ec3 100644 --- a/kuser/selectconn.cpp +++ b/kuser/selectconn.cpp @@ -80,7 +80,7 @@ void SelectConn::slotUser3() newconn = KInputDialog::getText( TQString(), i18n("Please type the name of the new connection:") ); if ( newconn.isEmpty() ) return; - if ( kapp->sharedConfig()->groupList().tqcontains( "connection-" + newconn ) ) { + if ( kapp->sharedConfig()->groupList().contains( "connection-" + newconn ) ) { KMessageBox::sorry( 0, i18n("A connection with this name already exists.") ); return; } diff --git a/kuser/sid.cpp b/kuser/sid.cpp index 5608129..8f3e254 100644 --- a/kuser/sid.cpp +++ b/kuser/sid.cpp @@ -83,7 +83,7 @@ void SID::setSID( const TQString &sid ) TQString rid; mSid = sid; - pos = sid.tqfindRev( '-' ); + pos = sid.findRev( '-' ); mDom = sid.left( pos ); rid = sid.right( sid.length() - pos - 1 ); mRid = rid.toUInt(); diff --git a/lilo-config/common/String.cc b/lilo-config/common/String.cc index 6fda1fa..f8a0e35 100644 --- a/lilo-config/common/String.cc +++ b/lilo-config/common/String.cc @@ -98,7 +98,7 @@ bool String::casecmp(char const * const s) const return false; return (strncasecmp(data(), s, size())==0); } -bool String::tqcontains(String const &s, bool cs) const +bool String::contains(String const &s, bool cs) const { if(cs) if(strstr(cstr(), s.cstr())) @@ -226,10 +226,10 @@ String &String::regex(String const &expr, bool cs) const } return *ret; } -String &String::tqreplace(String const &what, String const &with, bool all) const +String &String::replace(String const &what, String const &with, bool all) const { String *result; - if(!tqcontains(what)) { + if(!contains(what)) { result=new String(*this); return *result; } @@ -331,7 +331,7 @@ void StringList::operator +=(StringList const * const s) for(const_iterator it=s->begin(); it!=s->end(); it++) insert(end(), *it); } -bool StringList::tqcontains(String const &s) const +bool StringList::contains(String const &s) const { for(const_iterator it=begin(); it!=end(); it++) if(*it == s) diff --git a/lilo-config/common/String.h b/lilo-config/common/String.h index 5eaa77a..77caa61 100644 --- a/lilo-config/common/String.h +++ b/lilo-config/common/String.h @@ -54,7 +54,7 @@ public: char * cstr() const; bool cmp(char const * const s) const; bool casecmp(char const * const s) const; - bool tqcontains(String const &s, bool cs=true) const; + bool contains(String const &s, bool cs=true) const; int locate(String const &s, bool cs=true, unsigned int startat=0) const; void sprintf(const char *format, ...); bool readfile(String filename); @@ -63,7 +63,7 @@ public: String right(unsigned int num=1) const; String mid(unsigned int start, unsigned int num=0) const; String ®ex(String const &expr, bool cs=true) const; - String &tqreplace(String const &what, String const &with, bool all=true) const; + String &replace(String const &what, String const &with, bool all=true) const; static String escapeForRegExp(String const &s); char chr(unsigned int index) const { if(index>=size()) return 0; else return data()[index]; } int length() const { return size(); } // For compatibility with TQString @@ -82,7 +82,7 @@ public: void operator +=(StringList const &s); void operator +=(StringList const * const s); operator String() const; - bool tqcontains(String const &s) const; + bool contains(String const &s) const; void remove(String const &s); void add(String const &s) { insert(end(), s); } String const &grep(String const &s) const; diff --git a/lilo-config/common/lilo.cc b/lilo-config/common/lilo.cc index 6ce15dc..c61429a 100644 --- a/lilo-config/common/lilo.cc +++ b/lilo-config/common/lilo.cc @@ -42,13 +42,13 @@ using namespace std; bool liloimage::isLinux() const { const_iterator it=begin(); - if((*it).tqcontains("image")) + if((*it).contains("image")) return true; else return false; } -liloimage *liloimages::tqfind(String const &s) const +liloimage *liloimages::find(String const &s) const { String t = String::escapeForRegExp(s); @@ -61,7 +61,7 @@ liloimage *liloimages::tqfind(String const &s) const } void liloimages::remove(String const &s) { - liloimage *i=tqfind(s); + liloimage *i=find(s); for(iterator it=begin(); it!=end(); it++) if(*it==*i) { erase(it); @@ -186,18 +186,18 @@ bool liloconf::probe() images.clear(); /* Set some reasonable defaults... */ // Try to figure out the boot device first... - if(drives.tqcontains("/dev/hda")) { + if(drives.contains("/dev/hda")) { defaults += "boot=/dev/hda"; // 1st IDE/ATAPI harddisk defaults += "lba32"; // otherwise it is assumed } - else if(drives.tqcontains("/dev/sda")) { + else if(drives.contains("/dev/sda")) { defaults += "boot=/dev/sda"; // 1st SCSI harddisk defaults += "linear"; // some SCSI disks need this - } else if(drives.tqcontains("/dev/i2o/hda")) + } else if(drives.contains("/dev/i2o/hda")) defaults += "boot=/dev/i2o/hda"; // 1st I2O harddisk - else if(drives.tqcontains("/dev/eda")) + else if(drives.contains("/dev/eda")) defaults += "boot=/dev/eda"; // 1st MCA ESDI harddisk - else if(drives.tqcontains("/dev/pda")) + else if(drives.contains("/dev/pda")) defaults += "boot=/dev/pda"; // 1st Parallel port IDE disk else defaults += "boot=Insert_your_boot_device_here"; // shouldn't happen @@ -226,12 +226,12 @@ bool liloconf::probe() continue; if(s.st_size<131072) // if you managed to compile a kernel at less than 128k, you're cheating. ;) continue; - if((*it).tqcontains("System.map") || (*it).tqcontains("initrd")) // definitely not a kernel + if((*it).contains("System.map") || (*it).contains("initrd")) // definitely not a kernel continue; - if((*it).tqcontains("vmlinux")) { + if((*it).contains("vmlinux")) { // If the kernel exists both in compressed and in // uncompressed form, ignore the uncompressed one. - String compr=(*it).tqreplace("vmlinux", "vmlinuz"); + String compr=(*it).replace("vmlinux", "vmlinuz"); if(!access(compr, F_OK)) continue; } @@ -243,27 +243,27 @@ bool liloconf::probe() if (label.empty()) { label = (*it); - if (label.tqfind('/') != string::npos) + if (label.find('/') != string::npos) label = label.right(label.length()-1-label.rfind('/')); } // Check if we have an initial ramdisk (initrd) for this kernel... String initrd1; // first guess String initrd2; // second guess - if((*it).tqcontains("vmlinuz")) { - initrd1=(*it).tqreplace("vmlinux", "initrd")+".img"; - initrd2=(*it).tqreplace("vmlinuz", "initrd.img"); + if((*it).contains("vmlinuz")) { + initrd1=(*it).replace("vmlinux", "initrd")+".img"; + initrd2=(*it).replace("vmlinuz", "initrd.img"); } - else if((*it).tqcontains("vmlinux")) { - initrd1=(*it).tqreplace("vmlinux", "initrd")+".img"; - initrd2=(*it).tqreplace("vmlinuz", "initrd.img"); + else if((*it).contains("vmlinux")) { + initrd1=(*it).replace("vmlinux", "initrd")+".img"; + initrd2=(*it).replace("vmlinuz", "initrd.img"); } - else if((*it).tqcontains("kernel")) { - initrd1=(*it).tqreplace("kernel", "initrd")+".img"; - initrd2=(*it).tqreplace("vmlinuz", "initrd.img"); + else if((*it).contains("kernel")) { + initrd1=(*it).replace("kernel", "initrd")+".img"; + initrd2=(*it).replace("vmlinuz", "initrd.img"); } - else if((*it).tqcontains("linux")) { - initrd1=(*it).tqreplace("linux", "initrd")+".img"; - initrd2=(*it).tqreplace("vmlinuz", "initrd.img"); + else if((*it).contains("linux")) { + initrd1=(*it).replace("linux", "initrd")+".img"; + initrd2=(*it).replace("vmlinuz", "initrd.img"); } else { initrd1="/boot/initrd-"+version+".img"; @@ -277,8 +277,8 @@ bool liloconf::probe() initrd = initrd2; if(label.size()>15) // LILO can't handle this - if(label.tqcontains("enterprise")) - label=label.tqreplace("enterprise", "E"); + if(label.contains("enterprise")) + label=label.replace("enterprise", "E"); if(label.size()>15) label=label.left(15); diff --git a/lilo-config/common/lilo.h b/lilo-config/common/lilo.h index 22d6517..c992df0 100644 --- a/lilo-config/common/lilo.h +++ b/lilo-config/common/lilo.h @@ -39,8 +39,8 @@ public: class liloimages:public std::list<liloimage> { public: void remove(String const &s); - liloimage *tqfind(String const &s) const; - liloimage *operator[](String const &s) const { return tqfind(s); } + liloimage *find(String const &s) const; + liloimage *operator[](String const &s) const { return find(s); } }; class liloconf { diff --git a/lilo-config/common/tests/String.cc b/lilo-config/common/tests/String.cc index cfd9744..7b0b60e 100644 --- a/lilo-config/common/tests/String.cc +++ b/lilo-config/common/tests/String.cc @@ -54,20 +54,20 @@ int main(int argc, char **argv) cerr << "regex() seems to be broken." << endl; bugs++; } - if(!s.tqcontains("Red Hat")) { - cerr << "tqcontains() seems to be broken." << endl; + if(!s.contains("Red Hat")) { + cerr << "contains() seems to be broken." << endl; bugs++; } - if(t.tqreplace("Microsoft", "Windows", false) != "Windows sucks! Destroy Microsoft! Microsoft must die!") { - cerr << "tqreplace() [once] seems to be broken." << endl; + if(t.replace("Microsoft", "Windows", false) != "Windows sucks! Destroy Microsoft! Microsoft must die!") { + cerr << "replace() [once] seems to be broken." << endl; bugs++; } - if(t.tqreplace("Microsoft", "Windows") != "Windows sucks! Destroy Windows! Windows must die!") { - cerr << "tqreplace() [all] seems to be broken." << endl; + if(t.replace("Microsoft", "Windows") != "Windows sucks! Destroy Windows! Windows must die!") { + cerr << "replace() [all] seems to be broken." << endl; bugs++; } - if(u.tqreplace("Microsoft", "Windows") != "Windows sucks!") { - cerr << "tqreplace() [all, test case 2] seems to be broken." << endl; + if(u.replace("Microsoft", "Windows") != "Windows sucks!") { + cerr << "replace() [all, test case 2] seems to be broken." << endl; bugs++; } diff --git a/lilo-config/kde-qt-common/general.cpp b/lilo-config/kde-qt-common/general.cpp index 858ba9c..bdfd12f 100644 --- a/lilo-config/kde-qt-common/general.cpp +++ b/lilo-config/kde-qt-common/general.cpp @@ -168,7 +168,7 @@ void General::saveChanges() } else { TQString mode=vga->currentText(); if(mode!="ask") { - mode=mode.mid(mode.tqfind('(')+1); + mode=mode.mid(mode.find('(')+1); mode=mode.left(mode.length()-1); } lilo->defaults.set("vga", mode.latin1()); @@ -201,7 +201,7 @@ void General::update() vga->setCurrentItem(1); else for(int i=0; i<vga->count(); i++) { - if(vga->text(i).tqcontains("(" + mode + ")")) { + if(vga->text(i).contains("(" + mode + ")")) { vga->setCurrentItem(i); break; } diff --git a/lilo-config/kde-qt-common/images.cpp b/lilo-config/kde-qt-common/images.cpp index bdbdac4..a4872c0 100644 --- a/lilo-config/kde-qt-common/images.cpp +++ b/lilo-config/kde-qt-common/images.cpp @@ -131,7 +131,7 @@ void Images::probeClicked() // SLOT void Images::dfltClicked() // SLOT { if (images->currentItem() < 0) return; - lilo->setDefault(images->currentText().tqreplace(TQRegExp(" (default)", true, true), "").latin1()); + lilo->setDefault(images->currentText().replace(TQRegExp(" (default)", true, true), "").latin1()); update(); emit configChanged(); } @@ -246,7 +246,7 @@ void Images::removeClicked() // SLOT TQString value(TQString const &s) { - TQString r=s.mid(s.tqfind('=')+1).simplifyWhiteSpace(); + TQString r=s.mid(s.find('=')+1).simplifyWhiteSpace(); if(r.left(1)=="\"") r=r.mid(1); if(r.right(1)=="\"") diff --git a/lilo-config/kde/Details.cpp b/lilo-config/kde/Details.cpp index 385b715..ae82090 100644 --- a/lilo-config/kde/Details.cpp +++ b/lilo-config/kde/Details.cpp @@ -101,7 +101,7 @@ Details::Details(liloimage *lilo, TQWidget *tqparent, const char *name, WFlags / vga->setCurrentItem(1); else for(int i=0; i<vga->count(); i++) { - if(vga->text(i).tqcontains("(" + mode + ")")) { + if(vga->text(i).contains("(" + mode + ")")) { vga->setCurrentItem(i); break; } @@ -127,7 +127,7 @@ TQString Details::vgaMode() const if(s=="default") return ""; else if(s!="ask") { - s=s.mid(s.tqfind('(')+1); + s=s.mid(s.find('(')+1); s=s.left(s.length()-1); } return s; diff --git a/lilo-config/qt/Details.cpp b/lilo-config/qt/Details.cpp index 6b4e50a..f85216c 100644 --- a/lilo-config/qt/Details.cpp +++ b/lilo-config/qt/Details.cpp @@ -113,7 +113,7 @@ Details::Details(liloimage *lilo, TQWidget *tqparent, const char *name, WFlags f vga->setCurrentItem(1); else for(int i=0; i<vga->count(); i++) { - if(vga->text(i).tqcontains("(" + mode + ")")) { + if(vga->text(i).contains("(" + mode + ")")) { vga->setCurrentItem(i); break; } @@ -137,7 +137,7 @@ TQString Details::vgaMode() const if(s=="default") return ""; else if(s!="ask") { - s=s.mid(s.tqfind('(')+1); + s=s.mid(s.find('(')+1); s=s.left(s.length()-1); } return s; |