summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/app/bookmarkdialogbase.ui2
-rw-r--r--src/app/configfileoperationspage.ui2
-rw-r--r--src/app/configfullscreenpage.ui2
-rw-r--r--src/app/configimagelistpage.ui2
-rw-r--r--src/app/configimageviewpage.ui2
-rw-r--r--src/app/configmiscpage.ui2
-rw-r--r--src/app/configslideshowpage.ui2
-rw-r--r--src/gvcore/bcgdialogbase.ui2
-rw-r--r--src/gvcore/deletedialogbase.ui2
-rw-r--r--src/gvcore/externaltooldialogbase.ui2
-rw-r--r--src/gvcore/fileoperation.cpp4
-rw-r--r--src/gvcore/fileoperation.h2
-rw-r--r--src/gvcore/filterbar.ui2
-rw-r--r--src/gvcore/imageviewcontroller.cpp6
-rw-r--r--src/gvcore/printdialogpagebase.ui2
-rw-r--r--src/gvcore/qxcfi.cpp98
-rw-r--r--src/gvcore/qxcfi.h8
-rw-r--r--src/gvcore/thumbnaildetailsdialogbase.ui2
-rw-r--r--src/gvdirpart/gvdirpart.cpp4
-rw-r--r--src/gvimagepart/gvimagepart.cpp4
20 files changed, 76 insertions, 76 deletions
diff --git a/src/app/bookmarkdialogbase.ui b/src/app/bookmarkdialogbase.ui
index 8dc42c2..d4db944 100644
--- a/src/app/bookmarkdialogbase.ui
+++ b/src/app/bookmarkdialogbase.ui
@@ -99,7 +99,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kurlrequester.h</includehint>
diff --git a/src/app/configfileoperationspage.ui b/src/app/configfileoperationspage.ui
index 78797cc..78ac6d3 100644
--- a/src/app/configfileoperationspage.ui
+++ b/src/app/configfileoperationspage.ui
@@ -164,7 +164,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/src/app/configfullscreenpage.ui b/src/app/configfullscreenpage.ui
index 80e0ce9..e7da709 100644
--- a/src/app/configfullscreenpage.ui
+++ b/src/app/configfullscreenpage.ui
@@ -140,5 +140,5 @@ You can use the following keywords to format the On Screen Display:
</spacer>
</vbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/src/app/configimagelistpage.ui b/src/app/configimagelistpage.ui
index ffdc84b..6670dbd 100644
--- a/src/app/configimagelistpage.ui
+++ b/src/app/configimagelistpage.ui
@@ -290,5 +290,5 @@
</widget>
</vbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui
index b294315..a99b945 100644
--- a/src/app/configimageviewpage.ui
+++ b/src/app/configimageviewpage.ui
@@ -323,7 +323,7 @@ Use this option if your computer is not very fast.</string>
<slot>setDisabled(bool)</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
</includehints>
diff --git a/src/app/configmiscpage.ui b/src/app/configmiscpage.ui
index f1467a5..9b69c2d 100644
--- a/src/app/configmiscpage.ui
+++ b/src/app/configmiscpage.ui
@@ -200,5 +200,5 @@
</spacer>
</vbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/src/app/configslideshowpage.ui b/src/app/configslideshowpage.ui
index 85d404b..62ab807 100644
--- a/src/app/configslideshowpage.ui
+++ b/src/app/configslideshowpage.ui
@@ -127,7 +127,7 @@ When this option is enabled, the slideshow will stop on the last image of the fo
<slot>setDisabled(bool)</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
</includehints>
diff --git a/src/gvcore/bcgdialogbase.ui b/src/gvcore/bcgdialogbase.ui
index b3d77b5..9f6960c 100644
--- a/src/gvcore/bcgdialogbase.ui
+++ b/src/gvcore/bcgdialogbase.ui
@@ -175,5 +175,5 @@
<tabstop>mGSlider</tabstop>
<tabstop>mGSpinBox</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui
index c81d2eb..4725920 100644
--- a/src/gvcore/deletedialogbase.ui
+++ b/src/gvcore/deletedialogbase.ui
@@ -104,7 +104,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistbox.h</includehint>
</includehints>
diff --git a/src/gvcore/externaltooldialogbase.ui b/src/gvcore/externaltooldialogbase.ui
index bcd4939..00d2954 100644
--- a/src/gvcore/externaltooldialogbase.ui
+++ b/src/gvcore/externaltooldialogbase.ui
@@ -358,7 +358,7 @@ You can use keywords in the Command field:
<tabstop>radioButton1</tabstop>
<tabstop>mMimeTypeListView</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kurllabel.h</includehint>
diff --git a/src/gvcore/fileoperation.cpp b/src/gvcore/fileoperation.cpp
index 8213fcb..da5b8d8 100644
--- a/src/gvcore/fileoperation.cpp
+++ b/src/gvcore/fileoperation.cpp
@@ -56,8 +56,8 @@ void moveTo(const KURL::List& srcURL,TQWidget* tqparent,TQObject* receiver,const
(*op)();
}
-void makeDir(const KURL& tqparentURL, TQWidget* tqparent, TQObject* receiver, const char* slot) {
- FileOpObject* op=new FileOpMakeDirObject(tqparentURL, tqparent);
+void makeDir(const KURL& parentURL, TQWidget* tqparent, TQObject* receiver, const char* slot) {
+ FileOpObject* op=new FileOpMakeDirObject(parentURL, tqparent);
if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot);
(*op)();
}
diff --git a/src/gvcore/fileoperation.h b/src/gvcore/fileoperation.h
index 163682b..fb79d7b 100644
--- a/src/gvcore/fileoperation.h
+++ b/src/gvcore/fileoperation.h
@@ -42,7 +42,7 @@ namespace FileOperation {
LIBGWENVIEW_EXPORT void copyTo(const KURL::List&,TQWidget* tqparent=0L);
LIBGWENVIEW_EXPORT void moveTo(const KURL::List&,TQWidget* tqparent,TQObject* receiver=0L,const char* slot=0L);
LIBGWENVIEW_EXPORT void linkTo(const KURL::List& srcURL,TQWidget* tqparent);
-LIBGWENVIEW_EXPORT void makeDir(const KURL& tqparentURL, TQWidget* tqparent, TQObject* receiver=0L, const char* slot=0L);
+LIBGWENVIEW_EXPORT void makeDir(const KURL& parentURL, TQWidget* tqparent, TQObject* receiver=0L, const char* slot=0L);
LIBGWENVIEW_EXPORT void del(const KURL::List&,TQWidget* tqparent,TQObject* receiver=0L,const char* slot=0L);
LIBGWENVIEW_EXPORT void trash(const KURL::List&,TQWidget* tqparent,TQObject* receiver=0L,const char* slot=0L);
LIBGWENVIEW_EXPORT void realDelete(const KURL::List&,TQWidget* tqparent,TQObject* receiver=0L,const char* slot=0L);
diff --git a/src/gvcore/filterbar.ui b/src/gvcore/filterbar.ui
index 43dc2de..b407ce1 100644
--- a/src/gvcore/filterbar.ui
+++ b/src/gvcore/filterbar.ui
@@ -251,5 +251,5 @@ equal to this date</string>
<tabstop>mToDateEdit</tabstop>
<tabstop>mFilterButton</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp
index 1ec4218..992a961 100644
--- a/src/gvcore/imageviewcontroller.cpp
+++ b/src/gvcore/imageviewcontroller.cpp
@@ -424,9 +424,9 @@ bool ImageViewController::eventFilter(TQObject* object, TQEvent* event) {
// Check we must filter this object. This is an application filter, so we
// have to check we are not dealing with another object.
bool isAChildOfStack=false;
- TQObject* tqparentObject;
- for (tqparentObject=object->tqparent(); tqparentObject; tqparentObject=tqparentObject->tqparent()) {
- if (TQT_BASE_OBJECT(tqparentObject)==TQT_BASE_OBJECT(d->mStack)) {
+ TQObject* parentObject;
+ for (parentObject=object->tqparent(); parentObject; parentObject=parentObject->tqparent()) {
+ if (TQT_BASE_OBJECT(parentObject)==TQT_BASE_OBJECT(d->mStack)) {
isAChildOfStack=true;
break;
}
diff --git a/src/gvcore/printdialogpagebase.ui b/src/gvcore/printdialogpagebase.ui
index 976cf12..6d92eda 100644
--- a/src/gvcore/printdialogpagebase.ui
+++ b/src/gvcore/printdialogpagebase.ui
@@ -398,7 +398,7 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp
index f6da18f..8c690ba 100644
--- a/src/gvcore/qxcfi.cpp
+++ b/src/gvcore/qxcfi.cpp
@@ -653,8 +653,8 @@ void XCFImageFormat::composeTiles ( XCFImage& xcf_image )
if ( layer.type == GRAYA_GIMAGE || layer.type == INDEXEDA_GIMAGE )
layer.alpha_tiles.resize( layer.nrows );
- if ( layer.tqmask_offset != 0 )
- layer.tqmask_tiles.resize( layer.nrows );
+ if ( layer.mask_offset != 0 )
+ layer.mask_tiles.resize( layer.nrows );
for ( uint j = 0; j < layer.nrows; j++ ) {
layer.image_tiles[j].resize( layer.ncols );
@@ -662,8 +662,8 @@ void XCFImageFormat::composeTiles ( XCFImage& xcf_image )
if ( layer.type == GRAYA_GIMAGE || layer.type == INDEXEDA_GIMAGE )
layer.alpha_tiles[j].resize( layer.ncols );
- if ( layer.tqmask_offset != 0 )
- layer.tqmask_tiles[j].resize( layer.ncols );
+ if ( layer.mask_offset != 0 )
+ layer.mask_tiles[j].resize( layer.ncols );
}
for ( uint j = 0; j < layer.nrows; j++ ) {
@@ -717,9 +717,9 @@ void XCFImageFormat::composeTiles ( XCFImage& xcf_image )
setGrayPalette( layer.alpha_tiles[j][i] );
}
- if ( layer.tqmask_offset != 0 ) {
- layer.tqmask_tiles[j][i] = TQImage( tile_width, tile_height, 8, 256 );
- setGrayPalette( layer.tqmask_tiles[j][i] );
+ if ( layer.mask_offset != 0 ) {
+ layer.mask_tiles[j][i] = TQImage( tile_width, tile_height, 8, 256 );
+ setGrayPalette( layer.mask_tiles[j][i] );
}
}
}
@@ -874,7 +874,7 @@ bool XCFImageFormat::loadLayer ( SafeDataStream& xcf_io, XCFImage& xcf_image )
// If there are any more layers, merge them into the final TQImage.
- xcf_io >> layer.hierarchy_offset >> layer.tqmask_offset;
+ xcf_io >> layer.hierarchy_offset >> layer.mask_offset;
if ( xcf_io.failed() ) {
qDebug( "XCF: read failure on layer image offsets" );
@@ -896,8 +896,8 @@ bool XCFImageFormat::loadLayer ( SafeDataStream& xcf_io, XCFImage& xcf_image )
if ( !loadHierarchy( xcf_io, layer ) ) return false;
- if ( layer.tqmask_offset != 0 ) {
- xcf_io.device()->at( layer.tqmask_offset );
+ if ( layer.mask_offset != 0 ) {
+ xcf_io.device()->at( layer.mask_offset );
if ( !loadMask( xcf_io, layer ) ) return false;
}
@@ -1018,24 +1018,24 @@ bool XCFImageFormat::loadChannelProperties ( SafeDataStream& xcf_io, Layer& laye
return true;
case PROP_OPACITY:
- property >> layer.tqmask_channel.opacity;
+ property >> layer.mask_channel.opacity;
break;
case PROP_VISIBLE:
- property >> layer.tqmask_channel.visible;
+ property >> layer.mask_channel.visible;
break;
case PROP_SHOW_MASKED:
- property >> layer.tqmask_channel.show_tqmasked;
+ property >> layer.mask_channel.show_masked;
break;
case PROP_COLOR:
- property >> layer.tqmask_channel.red >> layer.tqmask_channel.green
- >> layer.tqmask_channel.blue;
+ property >> layer.mask_channel.red >> layer.mask_channel.green
+ >> layer.mask_channel.blue;
break;
case PROP_TATTOO:
- property >> layer.tqmask_channel.tattoo;
+ property >> layer.mask_channel.tattoo;
break;
default:
@@ -1377,7 +1377,7 @@ void XCFImageFormat::assignImageBytes ( Layer& layer, uint i, uint j )
for ( int l = 0; l < layer.image_tiles[j][i].height(); l++ ) {
for ( int k = 0; k < layer.image_tiles[j][i].width(); k++ ) {
- // The "if" here should not be necessary, but aptqparently there
+ // The "if" here should not be necessary, but apparently there
// are some cases where the image can contain larger indices
// than there are colors in the palette. (A bug in The GIMP?)
@@ -1404,7 +1404,7 @@ void XCFImageFormat::assignMaskBytes ( Layer& layer, uint i, uint j )
for ( int l = 0; l < layer.image_tiles[j][i].height(); l++ ) {
for ( int k = 0; k < layer.image_tiles[j][i].width(); k++ ) {
- layer.tqmask_tiles[j][i].setPixel( k, l, tile[0] );
+ layer.mask_tiles[j][i].setPixel( k, l, tile[0] );
tile += sizeof(TQRgb);
}
}
@@ -1555,7 +1555,7 @@ void XCFImageFormat::copyLayerToImage ( XCFImage& xcf_image )
// This seems the best place to apply the dissolve because it
// depends on the global position of each tile's
- // pixels. Aptqparently it's the only mode which can apply to a
+ // pixels. Apparently it's the only mode which can apply to a
// single layer.
if ( layer.mode == DISSOLVE_MODE ) {
@@ -1607,9 +1607,9 @@ void XCFImageFormat::copyRGBToRGB ( Layer& layer, uint i, uint j, int k, int l,
// Apply the tqmask (if any)
- if ( layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
- layer.tqmask_tiles[j].size() > i )
- src_a = INT_MULT( src_a, layer.tqmask_tiles[j][i].pixelIndex( k, l ) );
+ if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ layer.mask_tiles[j].size() > i )
+ src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
image.setPixel( m, n, tqRgba( src, src_a ) );
}
@@ -1680,9 +1680,9 @@ void XCFImageFormat::copyGrayAToRGB ( Layer& layer, uint i, uint j, int k, int l
// Apply the tqmask (if any)
- if ( layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
- layer.tqmask_tiles[j].size() > i )
- src_a = INT_MULT( src_a, layer.tqmask_tiles[j][i].pixelIndex( k, l ) );
+ if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ layer.mask_tiles[j].size() > i )
+ src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
image.setPixel( m, n, tqRgba( src, src_a ) );
}
@@ -1727,10 +1727,10 @@ void XCFImageFormat::copyIndexedAToIndexed ( Layer& layer,uint i,uint j,int k,in
src_a = INT_MULT( src_a, layer.opacity );
if ( layer.apply_tqmask == 1 &&
- layer.tqmask_tiles.size() > j &&
- layer.tqmask_tiles[j].size() > i )
+ layer.mask_tiles.size() > j &&
+ layer.mask_tiles[j].size() > i )
src_a = INT_MULT( src_a,
- layer.tqmask_tiles[j][i].pixelIndex( k, l ) );
+ layer.mask_tiles[j][i].pixelIndex( k, l ) );
if ( src_a > 127 )
src++;
@@ -1764,9 +1764,9 @@ void XCFImageFormat::copyIndexedAToRGB ( Layer& layer, uint i, uint j, int k, in
// Apply the tqmask (if any)
- if ( layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
- layer.tqmask_tiles[j].size() > i )
- src_a = INT_MULT( src_a, layer.tqmask_tiles[j][i].pixelIndex( k, l ) );
+ if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ layer.mask_tiles[j].size() > i )
+ src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
// This is what appears in the GIMP window
@@ -1822,7 +1822,7 @@ void XCFImageFormat::mergeLayerIntoImage ( XCFImage& xcf_image )
// This seems the best place to apply the dissolve because it
// depends on the global position of each tile's
- // pixels. Aptqparently it's the only mode which can apply to a
+ // pixels. Apparently it's the only mode which can apply to a
// single layer.
if ( layer.mode == DISSOLVE_MODE ) {
@@ -2021,9 +2021,9 @@ void XCFImageFormat::mergeRGBToRGB ( Layer& layer, uint i, uint j, int k, int l,
// Apply the tqmask (if any)
- if ( layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
- layer.tqmask_tiles[j].size() > i )
- src_a = INT_MULT( src_a, layer.tqmask_tiles[j][i].pixelIndex( k, l ) );
+ if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ layer.mask_tiles[j].size() > i )
+ src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
uchar new_r, new_g, new_b, new_a;
@@ -2123,9 +2123,9 @@ void XCFImageFormat::mergeGrayAToGray ( Layer& layer, uint i, uint j, int k, int
// Apply the tqmask (if any)
- if ( layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
- layer.tqmask_tiles[j].size() > i )
- src_a = INT_MULT( src_a, layer.tqmask_tiles[j][i].pixelIndex( k, l ) );
+ if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ layer.mask_tiles[j].size() > i )
+ src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
uchar new_a = OPAQUE_OPACITY;
@@ -2234,9 +2234,9 @@ void XCFImageFormat::mergeGrayAToRGB ( Layer& layer, uint i, uint j, int k, int
// Apply the tqmask (if any)
- if ( layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
- layer.tqmask_tiles[j].size() > i )
- src_a = INT_MULT( src_a, layer.tqmask_tiles[j][i].pixelIndex( k, l ) );
+ if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ layer.mask_tiles[j].size() > i )
+ src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
uchar new_a = dst_a + INT_MULT( OPAQUE_OPACITY - dst_a, src_a );
@@ -2291,10 +2291,10 @@ void XCFImageFormat::mergeIndexedAToIndexed ( Layer& layer,uint i,uint j,int k,i
src_a = INT_MULT( src_a, layer.opacity );
if ( layer.apply_tqmask == 1 &&
- layer.tqmask_tiles.size() > j &&
- layer.tqmask_tiles[j].size() > i )
+ layer.mask_tiles.size() > j &&
+ layer.mask_tiles[j].size() > i )
src_a = INT_MULT( src_a,
- layer.tqmask_tiles[j][i].pixelIndex( k, l ) );
+ layer.mask_tiles[j][i].pixelIndex( k, l ) );
if ( src_a > 127 ) {
src++;
@@ -2326,9 +2326,9 @@ void XCFImageFormat::mergeIndexedAToRGB ( Layer& layer, uint i, uint j, int k, i
// Apply the tqmask (if any)
- if ( layer.apply_tqmask == 1 && layer.tqmask_tiles.size() > j &&
- layer.tqmask_tiles[j].size() > i )
- src_a = INT_MULT( src_a, layer.tqmask_tiles[j][i].pixelIndex( k, l ) );
+ if ( layer.apply_tqmask == 1 && layer.mask_tiles.size() > j &&
+ layer.mask_tiles[j].size() > i )
+ src_a = INT_MULT( src_a, layer.mask_tiles[j][i].pixelIndex( k, l ) );
// This is what appears in the GIMP window
@@ -2349,7 +2349,7 @@ void XCFImageFormat::mergeIndexedAToRGB ( Layer& layer, uint i, uint j, int k, i
*/
void XCFImageFormat::dissolveRGBPixels ( TQImage& image, int x, int y )
{
- // The aptqparently spurious rand() calls are to wind the random
+ // The apparently spurious rand() calls are to wind the random
// numbers up to the same point for each tile.
for ( int l = 0; l < image.height(); l++ ) {
@@ -2380,7 +2380,7 @@ void XCFImageFormat::dissolveRGBPixels ( TQImage& image, int x, int y )
*/
void XCFImageFormat::dissolveAlphaPixels ( TQImage& image, int x, int y )
{
- // The aptqparently spurious rand() calls are to wind the random
+ // The apparently spurious rand() calls are to wind the random
// numbers up to the same point for each tile.
for ( int l = 0; l < image.height(); l++ ) {
diff --git a/src/gvcore/qxcfi.h b/src/gvcore/qxcfi.h
index e98f226..be0c3d6 100644
--- a/src/gvcore/qxcfi.h
+++ b/src/gvcore/qxcfi.h
@@ -130,7 +130,7 @@ class XCFImageFormat : public TQImageFormatPlugin {
TQ_INT32 type; //!< Type of the layer (GimpImageType)
char* name; //!< Name of the layer
TQ_UINT32 hierarchy_offset; //!< File position of Tile hierarchy
- TQ_UINT32 tqmask_offset; //!< File position of tqmask image
+ TQ_UINT32 mask_offset; //!< File position of tqmask image
uint nrows; //!< Number of rows of tiles (y direction)
uint ncols; //!< Number of columns of tiles (x direction)
@@ -139,16 +139,16 @@ class XCFImageFormat : public TQImageFormatPlugin {
//! For Grayscale and Indexed images, the alpha channel is stored
//! separately (in this data structure, anyway).
Tiles alpha_tiles;
- Tiles tqmask_tiles; //!< The layer tqmask (optional)
+ Tiles mask_tiles; //!< The layer tqmask (optional)
//! Additional information about a layer tqmask.
struct {
TQ_UINT32 opacity;
TQ_UINT32 visible;
- TQ_UINT32 show_tqmasked;
+ TQ_UINT32 show_masked;
uchar red, green, blue;
TQ_UINT32 tattoo;
- } tqmask_channel;
+ } mask_channel;
bool active; //!< Is this layer the active layer?
TQ_UINT32 opacity; //!< The opacity of the layer
diff --git a/src/gvcore/thumbnaildetailsdialogbase.ui b/src/gvcore/thumbnaildetailsdialogbase.ui
index 1ed73b7..1dd6646 100644
--- a/src/gvcore/thumbnaildetailsdialogbase.ui
+++ b/src/gvcore/thumbnaildetailsdialogbase.ui
@@ -113,5 +113,5 @@
</widget>
</vbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp
index d9aff69..5f2029e 100644
--- a/src/gvdirpart/gvdirpart.cpp
+++ b/src/gvdirpart/gvdirpart.cpp
@@ -59,7 +59,7 @@ const char CONFIG_CACHE_GROUP[]="cache";
typedef KParts::GenericFactory<GVDirPart> GVDirFactory;
K_EXPORT_COMPONENT_FACTORY( libgvdirpart /*library name*/, GVDirFactory )
-GVDirPart::GVDirPart(TQWidget* tqparentWidget, const char* /*widgetName*/, TQObject* tqparent, const char* name,
+GVDirPart::GVDirPart(TQWidget* parentWidget, const char* /*widgetName*/, TQObject* tqparent, const char* name,
const TQStringList &) : KParts::ReadOnlyPart( tqparent, name ) {
GVDirFactory::instance()->iconLoader()->addAppDir( "gwenview");
setInstance( GVDirFactory::instance() );
@@ -68,7 +68,7 @@ GVDirPart::GVDirPart(TQWidget* tqparentWidget, const char* /*widgetName*/, TQObj
mBrowserExtension = new GVDirPartBrowserExtension(this);
- mSplitter = new TQSplitter(Qt::Horizontal, tqparentWidget, "gwenview-kpart-splitter");
+ mSplitter = new TQSplitter(Qt::Horizontal, parentWidget, "gwenview-kpart-splitter");
mSplitter->setFocusPolicy(TQ_ClickFocus);
mSplitter->setOpaqueResize(true);
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
index 8f273d6..d53ce63 100644
--- a/src/gvimagepart/gvimagepart.cpp
+++ b/src/gvimagepart/gvimagepart.cpp
@@ -75,7 +75,7 @@ static bool storeData(TQWidget* tqparent, TQFile* file, const TQByteArray& data)
typedef KParts::GenericFactory<GVImagePart> GVImageFactory;
K_EXPORT_COMPONENT_FACTORY( libgvimagepart /*library name*/, GVImageFactory )
-GVImagePart::GVImagePart(TQWidget* tqparentWidget, const char* /*widgetName*/, TQObject* tqparent,
+GVImagePart::GVImagePart(TQWidget* parentWidget, const char* /*widgetName*/, TQObject* tqparent,
const char* name, const TQStringList &)
: KParts::ReadOnlyPart( tqparent, name )
, mPrefetch( NULL )
@@ -91,7 +91,7 @@ GVImagePart::GVImagePart(TQWidget* tqparentWidget, const char* /*widgetName*/, T
mDocument = new Document(this);
connect( mDocument, TQT_SIGNAL( loading()), TQT_SLOT( slotLoading()));
connect( mDocument, TQT_SIGNAL( loaded(const KURL&)), TQT_SLOT( slotLoaded(const KURL&)));
- mImageView = new ImageView(tqparentWidget, mDocument, actionCollection());
+ mImageView = new ImageView(parentWidget, mDocument, actionCollection());
connect( mImageView, TQT_SIGNAL(requestContextMenu(const TQPoint&)),
this, TQT_SLOT(openContextMenu(const TQPoint&)) );
setWidget(mImageView);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 05:51:19 +0000