summaryrefslogtreecommitdiffstats
path: root/khexedit
diff options
context:
space:
mode:
Diffstat (limited to 'khexedit')
-rw-r--r--khexedit/hexbuffer.cc2
-rw-r--r--khexedit/hexeditorwidget.cc8
-rw-r--r--khexedit/hexeditorwidget.h2
-rw-r--r--khexedit/hexmanagerwidget.cc4
-rw-r--r--khexedit/hexviewwidget.cc6
-rw-r--r--khexedit/hexviewwidget.h2
-rw-r--r--khexedit/optiondialog.cc2
-rw-r--r--khexedit/optiondialog.h2
-rw-r--r--khexedit/parts/kpart/khepartfactory.h2
-rw-r--r--khexedit/toplevel.cc6
-rw-r--r--khexedit/toplevel.h2
11 files changed, 19 insertions, 19 deletions
diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc
index 2b9dc96..7d823dc 100644
--- a/khexedit/hexbuffer.cc
+++ b/khexedit/hexbuffer.cc
@@ -323,7 +323,7 @@ int SFilterControl::execute( uchar *dest, uchar *src, uint size )
// A short description so that I will understand what the
// h... is going on five minutes from now.
//
- // Destination byte is tqmasked (AND'ed) with the inverse bitmap
+ // Destination byte is masked (AND'ed) with the inverse bitmap
// (the noninversed bitmap contains position of the
// two swap bits, eg 7-2 gives 10000100). Then the destination
// is OR'ed with the swapped bitmap.
diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index d1eaddd..e84d5ce 100644
--- a/khexedit/hexeditorwidget.cc
+++ b/khexedit/hexeditorwidget.cc
@@ -66,8 +66,8 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *tqparent, const char *name )
connect( mHexView, TQT_SIGNAL(pleaseStepFile(bool)), TQT_SLOT( stepFile(bool)) );
connect( kapp, TQT_SIGNAL( kdisplayFontChanged() ), TQT_SLOT( fontChanged() ) );
connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ),TQT_SLOT( paletteChanged()) );
- connect( mHexView, TQT_SIGNAL( tqlayoutChanged( const SDisplayLayout & ) ),
- TQT_SLOT( tqlayoutChanged( const SDisplayLayout & ) ) );
+ connect( mHexView, TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ),
+ TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) );
connect( mHexView, TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ),
this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) );
@@ -398,7 +398,7 @@ void CHexEditorWidget::paletteChanged( void )
setColor( mDisplayState.color );
}
-void CHexEditorWidget::tqlayoutChanged( const SDisplayLayout &/*tqlayout*/ )
+void CHexEditorWidget::layoutChanged( const SDisplayLayout &/*tqlayout*/ )
{
//mDisplayState.tqlayout = tqlayout;
}
@@ -1932,7 +1932,7 @@ void CHexEditorWidget::options( void )
connect( mOptionDialog, TQT_SIGNAL(lineSizeChoice(const SDisplayLine &)),
TQT_SLOT(setLineSize(const SDisplayLine &)) );
- connect( mOptionDialog, TQT_SIGNAL(tqlayoutChoice(const SDisplayLayout &)),
+ connect( mOptionDialog, TQT_SIGNAL(layoutChoice(const SDisplayLayout &)),
TQT_SLOT(setLayout(const SDisplayLayout &)) );
connect( mOptionDialog, TQT_SIGNAL(fontChoice(const SDisplayFont &)),
TQT_SLOT(setFont(const SDisplayFont &)) );
diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h
index d14bfd1..7cd8cfa 100644
--- a/khexedit/hexeditorwidget.h
+++ b/khexedit/hexeditorwidget.h
@@ -170,7 +170,7 @@ class CHexEditorWidget : public TQWidget
protected slots:
void fontChanged( void );
void paletteChanged( void );
- void tqlayoutChanged( const SDisplayLayout &tqlayout );
+ void layoutChanged( const SDisplayLayout &tqlayout );
void inputModeChanged( const SDisplayInputMode &input );
void setLineSize(const SDisplayLine &line );
void setLayout( const SDisplayLayout &tqlayout );
diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cc
index 2001a6b..bc7a4bc 100644
--- a/khexedit/hexmanagerwidget.cc
+++ b/khexedit/hexmanagerwidget.cc
@@ -297,7 +297,7 @@ void CTabBar::removeName( const TQString &name )
{
mFileList.remove(it);
removeTab(t);
- tqlayoutTabs();
+ layoutTabs();
break;
}
}
@@ -323,7 +323,7 @@ void CTabBar::changeName( const TQString &curName, const TQString &newName )
mFileList.remove(it);
mFileList.append( CFileKey(newName,t->identifier()) );
- tqlayoutTabs();
+ layoutTabs();
update(); // Seems to be necessary
break;
}
diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index 8cdc1d4..2d99264 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -272,7 +272,7 @@ int CHexViewWidget::insertFile( TQFile &file, CProgress &p )
emit dataChanged();
emit cursorChanged( mHexBuffer->cursorState() );
- emit tqlayoutChanged( mLayout );
+ emit layoutChanged( mLayout );
return( Err_Success );
}
@@ -371,7 +371,7 @@ void CHexViewWidget::setBuffer( CHexBuffer *hexBuffer )
emit cursorChanged( mHexBuffer->cursorState() );
emit fileState( mHexBuffer->fileState() );
emit encodingChanged( mHexBuffer->encoding() );
- emit tqlayoutChanged( mLayout );
+ emit layoutChanged( mLayout );
emit inputModeChanged( mHexBuffer->inputMode() );
emit fileName( mHexBuffer->url(), mHexBuffer->hasFileName() );
emit bookmarkChanged( mHexBuffer->bookmarkList() );
@@ -722,7 +722,7 @@ void CHexViewWidget::setLayout( SDisplayLayout &tqlayout )
mHexBuffer->setLayout( mLayout );
updateWindow();
- emit tqlayoutChanged( mLayout );
+ emit layoutChanged( mLayout );
emit cursorChanged( mHexBuffer->cursorState() );
emit textWidth( defaultWidth() );
}
diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h
index c467e03..65f1164 100644
--- a/khexedit/hexviewwidget.h
+++ b/khexedit/hexviewwidget.h
@@ -218,7 +218,7 @@ class CHexViewWidget : public TQFrame
void cursorChanged( SCursorState &state );
void fileState( SFileState &state );
void dataChanged( void );
- void tqlayoutChanged( const SDisplayLayout &tqlayout );
+ void layoutChanged( const SDisplayLayout &tqlayout );
void inputModeChanged( const SDisplayInputMode &mode );
void bookmarkChanged( TQPtrList<SCursorOffset> &list );
void editMode( CHexBuffer::EEditMode editMode );
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index 783a8c0..4669d9d 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -789,7 +789,7 @@ void COptionDialog::slotApply( void )
l.horzGridWidth = l.vertGridWidth = 1;
}
- emit tqlayoutChoice( mDisplayState.tqlayout );
+ emit layoutChoice( mDisplayState.tqlayout );
}
break;
diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h
index 0089155..7a8f678 100644
--- a/khexedit/optiondialog.h
+++ b/khexedit/optiondialog.h
@@ -238,7 +238,7 @@ class COptionDialog : public KDialogBase
signals:
void lineSizeChoice( const SDisplayLine &lineSize );
- void tqlayoutChoice( const SDisplayLayout &tqlayout );
+ void layoutChoice( const SDisplayLayout &tqlayout );
void cursorChoice( const SDisplayCursor &cursor );
void colorChoice( const SDisplayColor &color );
void fontChoice( const SDisplayFont &font );
diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h
index cc918a7..38aafd9 100644
--- a/khexedit/parts/kpart/khepartfactory.h
+++ b/khexedit/parts/kpart/khepartfactory.h
@@ -34,7 +34,7 @@ class KHexEditPartFactory : public KParts::Factory
virtual ~KHexEditPartFactory();
public:
- virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+ virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args );
static KInstance* instance();
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index f23d9ad..4be3bda 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -83,8 +83,8 @@ KHexEdit::KHexEdit( void )
TQT_TQOBJECT(this), TQT_SLOT( textWidth( uint ) ) );
connect( hexView(), TQT_SIGNAL( fileState( SFileState & ) ),
TQT_TQOBJECT(this), TQT_SLOT( fileState( SFileState & ) ) );
- connect( hexView(), TQT_SIGNAL( tqlayoutChanged( const SDisplayLayout & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( tqlayoutChanged( const SDisplayLayout & ) ) );
+ connect( hexView(), TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ),
+ TQT_TQOBJECT(this), TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) );
connect( hexView(), TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ),
TQT_TQOBJECT(this), TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) );
connect( hexView(), TQT_SIGNAL( bookmarkChanged( TQPtrList<SCursorOffset> &)),
@@ -807,7 +807,7 @@ void KHexEdit::fileState( SFileState &state )
-void KHexEdit::tqlayoutChanged( const SDisplayLayout &tqlayout )
+void KHexEdit::layoutChanged( const SDisplayLayout &tqlayout )
{
KRadioAction *radioAction;
diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h
index b15517c..398abf4 100644
--- a/khexedit/toplevel.h
+++ b/khexedit/toplevel.h
@@ -157,7 +157,7 @@ class KHexEdit : public KMainWindow
void operationChanged( bool state );
void cursorChanged( SCursorState &state );
void fileState( SFileState &state );
- void tqlayoutChanged( const SDisplayLayout &tqlayout );
+ void layoutChanged( const SDisplayLayout &tqlayout );
void inputModeChanged( const SDisplayInputMode &mode );
void bookmarkChanged( TQPtrList<SCursorOffset> &list );
void removeRecentFile( const TQString &fileName );