summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2018-10-27 23:55:06 +0900
committerSlávek Banko <[email protected]>2018-11-04 14:21:18 +0100
commit8f65ac9b20bf6d7f5180e934060db7c98a71373e (patch)
tree79b7d65ed2c80f4c22279206f6395ed1cd0f834c
parentc1821ba5d7c9a7c16eac8029f823ac07109251d2 (diff)
downloadkdirstat-8f65ac9b20bf6d7f5180e934060db7c98a71373e.tar.gz
kdirstat-8f65ac9b20bf6d7f5180e934060db7c98a71373e.zip
Removed obsolete CHECK_PTR and replaced CHECK_PTR/Q_CHECK_PTR with TQ_CHECK_PTR.
Signed-off-by: Michele Calgaro <[email protected]> (cherry picked from commit 0cd4d565764dd403047d804844da868c592298e4)
-rw-r--r--kdirstat/kcleanupcollection.cpp4
-rw-r--r--kdirstat/kdirstatapp.cpp6
-rw-r--r--kdirstat/kdirstatfeedback.cpp2
-rw-r--r--kdirstat/kdirstatsettings.cpp2
-rw-r--r--kdirstat/kdirtree.cpp8
-rw-r--r--kdirstat/kdirtreeiterators.cpp2
-rw-r--r--kdirstat/kdirtreeview.cpp2
-rw-r--r--kdirstat/kfeedback.cpp20
-rw-r--r--kdirstat/kstdcleanup.cpp14
-rw-r--r--kdirstat/ktreemaptile.cpp4
-rw-r--r--kdirstat/ktreemapview.cpp2
11 files changed, 33 insertions, 33 deletions
diff --git a/kdirstat/kcleanupcollection.cpp b/kdirstat/kcleanupcollection.cpp
index 8c929aa..ec465a5 100644
--- a/kdirstat/kcleanupcollection.cpp
+++ b/kdirstat/kcleanupcollection.cpp
@@ -161,7 +161,7 @@ KCleanupCollection::deepCopy( const KCleanupCollection &src )
void
KCleanupCollection::add( KCleanup *newCleanup )
{
- CHECK_PTR( newCleanup );
+ TQ_CHECK_PTR( newCleanup );
if ( _cleanupDict[ newCleanup->id() ] ) // Already there?
{
@@ -236,7 +236,7 @@ KCleanupCollection::addUserCleanups( int number )
_nextUserCleanupNo++;
KCleanup *cleanup = new KCleanup( id, "", title, _actionCollection );
- CHECK_PTR( cleanup );
+ TQ_CHECK_PTR( cleanup );
cleanup->setEnabled( false );
if ( i <= 9 )
diff --git a/kdirstat/kdirstatapp.cpp b/kdirstat/kdirstatapp.cpp
index 7d9bdea..af86b36 100644
--- a/kdirstat/kdirstatapp.cpp
+++ b/kdirstat/kdirstatapp.cpp
@@ -237,7 +237,7 @@ void
KDirStatApp::initCleanups()
{
_cleanupCollection = new KCleanupCollection( actionCollection() );
- CHECK_PTR( _cleanupCollection );
+ TQ_CHECK_PTR( _cleanupCollection );
_cleanupCollection->addStdCleanups();
_cleanupCollection->addUserCleanups( USER_CLEANUPS );
_cleanupCollection->slotReadConfig();
@@ -688,7 +688,7 @@ KDirStatApp::preferences()
if ( ! _settingsDialog )
{
_settingsDialog = new KDirStat::KSettingsDialog( this );
- CHECK_PTR( _settingsDialog );
+ TQ_CHECK_PTR( _settingsDialog );
}
if ( ! _settingsDialog->isVisible() )
@@ -807,7 +807,7 @@ KDirStatApp::createTreemapView()
_treemapView = new KTreemapView( _treeView->tree(), _splitter,
TQSize( _splitter->width(), _treemapViewHeight ) );
- CHECK_PTR( _treemapView );
+ TQ_CHECK_PTR( _treemapView );
connect( _treemapView, TQT_SIGNAL( contextMenu( KTreemapTile *, const TQPoint & ) ),
this, TQT_SLOT ( contextMenu( KTreemapTile *, const TQPoint & ) ) );
diff --git a/kdirstat/kdirstatfeedback.cpp b/kdirstat/kdirstatfeedback.cpp
index fc77184..1900614 100644
--- a/kdirstat/kdirstatfeedback.cpp
+++ b/kdirstat/kdirstatfeedback.cpp
@@ -22,7 +22,7 @@ KDirStatApp::sendFeedbackMail()
if ( ! _feedbackDialog )
{
_feedbackDialog = new KFeedbackDialog( "[email protected]", "feedback_mail" );
- CHECK_PTR( _feedbackDialog );
+ TQ_CHECK_PTR( _feedbackDialog );
connect( _feedbackDialog->form(), TQT_SIGNAL( mailSent() ),
this, TQT_SLOT( feedbackMailSent() ) );
diff --git a/kdirstat/kdirstatsettings.cpp b/kdirstat/kdirstatsettings.cpp
index c370060..bfdce3e 100644
--- a/kdirstat/kdirstatsettings.cpp
+++ b/kdirstat/kdirstatsettings.cpp
@@ -502,7 +502,7 @@ KCleanupListBoxItem::KCleanupListBoxItem( KCleanupListBox * listBox,
: TQListBoxText( listBox )
, _cleanup( cleanup )
{
- CHECK_PTR( cleanup );
+ TQ_CHECK_PTR( cleanup );
setText( cleanup->cleanTitle() );
}
diff --git a/kdirstat/kdirtree.cpp b/kdirstat/kdirtree.cpp
index f7d465e..a4aafd2 100644
--- a/kdirstat/kdirtree.cpp
+++ b/kdirstat/kdirtree.cpp
@@ -55,7 +55,7 @@ KFileInfo::KFileInfo( const TQString & filenameWithoutPath,
, _next( 0 )
, _tree( tree )
{
- CHECK_PTR( statInfo );
+ TQ_CHECK_PTR( statInfo );
_isLocalFile = true;
_name = filenameWithoutPath;
@@ -107,7 +107,7 @@ KFileInfo::KFileInfo( const KFileItem * fileItem,
, _next( 0 )
, _tree( tree )
{
- CHECK_PTR( fileItem );
+ TQ_CHECK_PTR( fileItem );
_isLocalFile = fileItem->isLocalFile();
_name = parent ? fileItem->name() : fileItem->url().url();
@@ -576,7 +576,7 @@ KDirInfo::isBusy()
void
KDirInfo::insertChild( KFileInfo *newChild )
{
- CHECK_PTR( newChild );
+ TQ_CHECK_PTR( newChild );
if ( newChild->isDir() || _dotEntry == 0 || _isDotEntry )
{
@@ -1499,7 +1499,7 @@ KDirTree::deleteSubtree( KFileInfo *subtree )
void
KDirTree::addJob( KDirReadJob * job )
{
- CHECK_PTR( job );
+ TQ_CHECK_PTR( job );
_jobQueue.enqueue( job );
}
diff --git a/kdirstat/kdirtreeiterators.cpp b/kdirstat/kdirtreeiterators.cpp
index 7c55c2a..0ede37d 100644
--- a/kdirstat/kdirtreeiterators.cpp
+++ b/kdirstat/kdirtreeiterators.cpp
@@ -192,7 +192,7 @@ void
KFileInfoSortedIterator::delayedInit()
{
_childrenList = new KFileInfoList( _sortOrder, _ascending );
- CHECK_PTR( _childrenList );
+ TQ_CHECK_PTR( _childrenList );
if ( _sortOrder == KSortByName )
{
diff --git a/kdirstat/kdirtreeview.cpp b/kdirstat/kdirtreeview.cpp
index c335722..6eb9657 100644
--- a/kdirstat/kdirtreeview.cpp
+++ b/kdirstat/kdirtreeview.cpp
@@ -983,7 +983,7 @@ KDirTreeViewItem::KDirTreeViewItem( KDirTreeView * view,
KFileInfo * orig )
: TQListViewItem( parent )
{
- CHECK_PTR( parent );
+ TQ_CHECK_PTR( parent );
init( view, parent, orig );
}
diff --git a/kdirstat/kfeedback.cpp b/kdirstat/kfeedback.cpp
index 428f850..7adb7fd 100644
--- a/kdirstat/kfeedback.cpp
+++ b/kdirstat/kfeedback.cpp
@@ -41,7 +41,7 @@ KFeedbackDialog::KFeedbackDialog( const TQString & feedbackMailAddress,
setHelp( helpTopic );
_form = new KFeedbackForm( feedbackMailAddress, plainPage() );
- CHECK_PTR( _form );
+ TQ_CHECK_PTR( _form );
layout->addWidget( _form );
checkSendButton();
@@ -95,7 +95,7 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
//
_questionList = new KFeedbackQuestionList( this );
- CHECK_PTR( _questionList );
+ TQ_CHECK_PTR( _questionList );
connect( _questionList, TQT_SIGNAL( checkComplete() ),
this, TQT_SLOT ( slotCheckComplete() ) );
@@ -106,21 +106,21 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
//
TQHBox * hbox = new TQHBox( this );
- CHECK_PTR( hbox );
+ TQ_CHECK_PTR( hbox );
TQSizePolicy pol( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); // hor / vert
label = new TQLabel( i18n( "Questions marked with " ), hbox );
- CHECK_PTR( label );
+ TQ_CHECK_PTR( label );
label->setSizePolicy( pol );
label = new TQLabel( hbox );
- CHECK_PTR( label );
+ TQ_CHECK_PTR( label );
label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "edit", TDEIcon::Small ) );
label->setSizePolicy( pol );
label = new TQLabel( i18n( " must be answered before a mail can be sent.") , hbox );
- CHECK_PTR( label );
+ TQ_CHECK_PTR( label );
label->setSizePolicy( pol );
new TQWidget( hbox ); // Fill any leftover space to the right.
@@ -130,8 +130,8 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
// Free-text comment field
//
- label = new TQLabel( "\n" + i18n( "&Additional Comments:" ), this ); CHECK_PTR( label );
- _comment = new TQMultiLineEdit( this ); CHECK_PTR( _comment );
+ label = new TQLabel( "\n" + i18n( "&Additional Comments:" ), this ); TQ_CHECK_PTR( label );
+ _comment = new TQMultiLineEdit( this ); TQ_CHECK_PTR( _comment );
label->setBuddy( _comment );
_comment->setWordWrap( TQMultiLineEdit::FixedColumnWidth );
@@ -289,7 +289,7 @@ KFeedbackQuestionList::addQuestion( const TQString & text,
KFeedbackQuestion * question = new KFeedbackQuestion( this, text, id,
exclusiveAnswer,
required );
- CHECK_PTR( question );
+ TQ_CHECK_PTR( question );
return question;
}
@@ -304,7 +304,7 @@ KFeedbackQuestionList::addYesNoQuestion( const TQString & text,
KFeedbackQuestion * question = new KFeedbackQuestion( this, text, id,
true, // exclusive
required );
- CHECK_PTR( question );
+ TQ_CHECK_PTR( question );
question->addAnswer( i18n( "yes" ), "yes" );
question->addAnswer( i18n( "no" ), "no" );
}
diff --git a/kdirstat/kstdcleanup.cpp b/kdirstat/kstdcleanup.cpp
index 9898410..1c9dea5 100644
--- a/kdirstat/kstdcleanup.cpp
+++ b/kdirstat/kstdcleanup.cpp
@@ -22,7 +22,7 @@ KStdCleanup::openInKonqueror( TDEActionCollection *parent )
"kfmclient openURL %p",
i18n( "Open in &Konqueror" ),
parent );
- CHECK_PTR( cleanup );
+ TQ_CHECK_PTR( cleanup );
cleanup->setWorksForDir ( true );
cleanup->setWorksForFile ( true );
cleanup->setWorksForDotEntry( true );
@@ -42,7 +42,7 @@ KStdCleanup::openInTerminal( TDEActionCollection *parent )
"konsole",
i18n( "Open in &Terminal" ),
parent );
- CHECK_PTR( cleanup );
+ TQ_CHECK_PTR( cleanup );
cleanup->setWorksForDir ( true );
cleanup->setWorksForFile ( true );
cleanup->setWorksForDotEntry( true );
@@ -61,7 +61,7 @@ KStdCleanup::compressSubtree( TDEActionCollection *parent )
"cd ..; tar cjvf %n.tar.bz2 %n && rm -rf %n",
i18n( "&Compress" ),
parent );
- CHECK_PTR( cleanup );
+ TQ_CHECK_PTR( cleanup );
cleanup->setWorksForDir ( true );
cleanup->setWorksForFile ( false );
cleanup->setWorksForDotEntry( false );
@@ -79,7 +79,7 @@ KStdCleanup::makeClean( TDEActionCollection *parent )
"make clean",
i18n( "&make clean" ),
parent );
- CHECK_PTR( cleanup );
+ TQ_CHECK_PTR( cleanup );
cleanup->setWorksForDir ( true );
cleanup->setWorksForFile ( false );
cleanup->setWorksForDotEntry( true );
@@ -96,7 +96,7 @@ KStdCleanup::deleteTrash( TDEActionCollection *parent )
"rm -f *.o *~ *.bak *.auto core",
i18n( "Delete T&rash Files" ),
parent );
- CHECK_PTR( cleanup );
+ TQ_CHECK_PTR( cleanup );
cleanup->setWorksForDir ( true );
cleanup->setWorksForFile ( false );
cleanup->setWorksForDotEntry( true );
@@ -114,7 +114,7 @@ KStdCleanup::moveToTrashBin( TDEActionCollection *parent )
"kfmclient move %p %t",
i18n( "Delete (to Trash &Bin)" ),
parent );
- CHECK_PTR( cleanup );
+ TQ_CHECK_PTR( cleanup );
cleanup->setWorksForDir ( true );
cleanup->setWorksForFile ( true );
cleanup->setWorksForDotEntry( false );
@@ -133,7 +133,7 @@ KStdCleanup::hardDelete( TDEActionCollection *parent )
"rm -rf %p",
i18n( "&Delete (no way to undelete!)" ),
parent );
- CHECK_PTR( cleanup );
+ TQ_CHECK_PTR( cleanup );
cleanup->setWorksForDir ( true );
cleanup->setWorksForFile ( true );
cleanup->setWorksForDotEntry( false );
diff --git a/kdirstat/ktreemaptile.cpp b/kdirstat/ktreemaptile.cpp
index 21d363c..bbe0117 100644
--- a/kdirstat/ktreemaptile.cpp
+++ b/kdirstat/ktreemaptile.cpp
@@ -148,7 +148,7 @@ KTreemapTile::createChildrenSimple( const TQRect & rect,
childRect = TQRect( rect.x(), rect.y() + offset, rect.width(), childSize );
KTreemapTile * tile = new KTreemapTile( _parentView, this, *it, childRect, childDir );
- CHECK_PTR( tile );
+ TQ_CHECK_PTR( tile );
tile->cushionSurface().addRidge( dir,
_cushionSurface.height() * _parentView->heightScaleFactor(),
@@ -320,7 +320,7 @@ KTreemapTile::layoutRow( const TQRect & rect,
childRect = TQRect( rect.x(), rect.y() + offset, secondary, childSize );
KTreemapTile * tile = new KTreemapTile( _parentView, this, *it, childRect, rowCushionSurface );
- CHECK_PTR( tile );
+ TQ_CHECK_PTR( tile );
tile->cushionSurface().addRidge( dir,
rowCushionSurface.height() * _parentView->heightScaleFactor(),
diff --git a/kdirstat/ktreemapview.cpp b/kdirstat/ktreemapview.cpp
index 51f8e75..60db30d 100644
--- a/kdirstat/ktreemapview.cpp
+++ b/kdirstat/ktreemapview.cpp
@@ -410,7 +410,7 @@ KTreemapView::rebuildTreemap( KFileInfo * newRoot,
if ( ! canvas() )
{
TQCanvas * canv = new TQCanvas( TQT_TQOBJECT(this) );
- CHECK_PTR( canv );
+ TQ_CHECK_PTR( canv );
setCanvas( canv );
}