summaryrefslogtreecommitdiffstats
path: root/kcoloredit
diff options
context:
space:
mode:
Diffstat (limited to 'kcoloredit')
-rw-r--r--kcoloredit/editablestreamhistory.h4
-rw-r--r--kcoloredit/kcoloreditdoc.cpp4
-rw-r--r--kcoloredit/kcoloreditdoc.h2
-rw-r--r--kcoloredit/kcoloreditview.cpp4
-rw-r--r--kcoloredit/loadpalettedlg.cpp2
-rw-r--r--kcoloredit/palette.cpp8
6 files changed, 12 insertions, 12 deletions
diff --git a/kcoloredit/editablestreamhistory.h b/kcoloredit/editablestreamhistory.h
index 20233e33..9fe59d99 100644
--- a/kcoloredit/editablestreamhistory.h
+++ b/kcoloredit/editablestreamhistory.h
@@ -37,7 +37,7 @@ public:
/** Pastes a stream at index. Uses undo/redo history */
void paste(const int index, EDITABLE_STREAM& pasteStream);
/** Replaces a stream at index. Uses undo/redo history */
- void tqreplace(const int index, EDITABLE_STREAM& replaceStream);
+ void replace(const int index, EDITABLE_STREAM& replaceStream);
/** @return Whether undo possible */
bool undoPossible();
/** @return Whether redo possible */
@@ -76,7 +76,7 @@ template <class EDITABLE_STREAM> void
}
template <class EDITABLE_STREAM> void
- EditableStreamHistory<EDITABLE_STREAM>::tqreplace(const int index, EDITABLE_STREAM& replaceStream) {
+ EditableStreamHistory<EDITABLE_STREAM>::replace(const int index, EDITABLE_STREAM& replaceStream) {
m_editableStream->cut(index, replaceStream.length());
m_editableStream->paste(index, replaceStream);
}
diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp
index ed9094e5..449c78f3 100644
--- a/kcoloredit/kcoloreditdoc.cpp
+++ b/kcoloredit/kcoloreditdoc.cpp
@@ -281,11 +281,11 @@ void KColorEditDoc::insert(int index, const Color& color) {
slotRedrawAllViews(0);
}
-void KColorEditDoc::tqreplace(int index, const Color& color) {
+void KColorEditDoc::replace(int index, const Color& color) {
Palette paletteReplace;
Color* replaceColor = new Color(color);
paletteReplace.append(replaceColor);
- m_paletteHistory.tqreplace(index, paletteReplace);
+ m_paletteHistory.replace(index, paletteReplace);
setPaletteSelection(0, 0);
setModified(true);
slotRedrawAllViews(0);
diff --git a/kcoloredit/kcoloreditdoc.h b/kcoloredit/kcoloreditdoc.h
index 108e05fe..9f65c25e 100644
--- a/kcoloredit/kcoloreditdoc.h
+++ b/kcoloredit/kcoloreditdoc.h
@@ -112,7 +112,7 @@ class KColorEditDoc : public TQObject
/** Inserts a color at index */
void insert(int index, const Color& color);
/** Replaces a color at index */
- void tqreplace(int index, const Color& color);
+ void replace(int index, const Color& color);
protected:
/** Sets an error string if an IO operation was unsuccesfull */
diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp
index b82a92ca..e7251ec7 100644
--- a/kcoloredit/kcoloreditview.cpp
+++ b/kcoloredit/kcoloreditview.cpp
@@ -234,7 +234,7 @@ void KColorEditView::slotAddColor() {
case REPLACE_COLOR:
if(index < palette->length())
- document()->tqreplace(index, color);
+ document()->replace(index, color);
else
document()->insert(index, color);
break;
@@ -274,7 +274,7 @@ void KColorEditView::slotSetColorName(const TQString& name) {
palette->color(cursorPos)->component(Color::BLUE_INDEX),
name);
doNotUpdateColorLabels = true;
- document()->tqreplace(cursorPos, newColor);
+ document()->replace(cursorPos, newColor);
doNotUpdateColorLabels = false;
}
}
diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp
index a5e298ce..35fceb26 100644
--- a/kcoloredit/loadpalettedlg.cpp
+++ b/kcoloredit/loadpalettedlg.cpp
@@ -45,7 +45,7 @@ LoadPaletteDlg::LoadPaletteDlg(TQWidget *tqparent, const char *name)
TQStringList palettesList = Palette::kdePalettes();
for(TQStringList::Iterator palette = palettesList.begin();
palette != palettesList.end(); ++palette) {
- bool prepend = (*palette).tqcontains( "colors/Custom_Colors" );
+ bool prepend = (*palette).contains( "colors/Custom_Colors" );
TQString fileName = locate("config", (*palette));
if(prepend) {
palettesFileNames.prepend(fileName);
diff --git a/kcoloredit/palette.cpp b/kcoloredit/palette.cpp
index 6f830278..42758b41 100644
--- a/kcoloredit/palette.cpp
+++ b/kcoloredit/palette.cpp
@@ -108,14 +108,14 @@ bool Palette::load(TQTextStream& stream, bool loadName /* = true */) {
int lineNum = 0;
while (!stream.atEnd()) {
TQString string = stream.readLine().append(' ');
- if(string.tqfind( TQRegExp("[^\\s]") ) == -1 ||
+ if(string.find( TQRegExp("[^\\s]") ) == -1 ||
string.stripWhiteSpace().at( 0 ) == '#' ||
( loadName && lineNum == 0 )) {
if(loadName && lineNum == 0)
setName(string.stripWhiteSpace());
} else {
Color* newColor = new Color();
- int position = string.tqfind(TQRegExp( "[^\\s]" ));
+ int position = string.find(TQRegExp( "[^\\s]" ));
for(int componentIndex = 0; componentIndex < Color::COMPONENTS_NUM;
++componentIndex) {
if(position == -1) {
@@ -123,7 +123,7 @@ bool Palette::load(TQTextStream& stream, bool loadName /* = true */) {
result = false;
break;
}
- int endPosition = string.tqfind(TQRegExp( "\\s" ), position);
+ int endPosition = string.find(TQRegExp( "\\s" ), position);
if(endPosition == -1) {
m_errorString = i18n("Invalid format");
result = false;
@@ -139,7 +139,7 @@ bool Palette::load(TQTextStream& stream, bool loadName /* = true */) {
break;
}
newColor->setComponent(componentIndex, componentValue);
- position = string.tqfind(TQRegExp( "[^\\s]" ), endPosition);
+ position = string.find(TQRegExp( "[^\\s]" ), endPosition);
}
if(!result) {
delete newColor;