Removed obsolete CHECK_PTR and replaced CHECK_PTR/Q_CHECK_PTR with TQ_CHECK_PTR.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit a2ed8321f9)
r14.0.x
Michele Calgaro 6 years ago committed by Slávek Banko
parent d88c4d4569
commit c9ff18c2ff
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -59,7 +59,7 @@
<a name="l00042"></a>00042 setHelp( helpTopic ); <a name="l00042"></a>00042 setHelp( helpTopic );
<a name="l00043"></a>00043 <a name="l00043"></a>00043
<a name="l00044"></a>00044 <a class="code" href="classKFeedbackDialog.html#c95533de8e33e87407a06b910f5b6cfa">_form</a> = <span class="keyword">new</span> <a class="code" href="classKFeedbackForm.html">KFeedbackForm</a>( feedbackMailAddress, plainPage() ); <a name="l00044"></a>00044 <a class="code" href="classKFeedbackDialog.html#c95533de8e33e87407a06b910f5b6cfa">_form</a> = <span class="keyword">new</span> <a class="code" href="classKFeedbackForm.html">KFeedbackForm</a>( feedbackMailAddress, plainPage() );
<a name="l00045"></a>00045 CHECK_PTR( <a class="code" href="classKFeedbackDialog.html#c95533de8e33e87407a06b910f5b6cfa">_form</a> ); <a name="l00045"></a>00045 TQ_CHECK_PTR( <a class="code" href="classKFeedbackDialog.html#c95533de8e33e87407a06b910f5b6cfa">_form</a> );
<a name="l00046"></a>00046 <a name="l00046"></a>00046
<a name="l00047"></a>00047 layout-&gt;addWidget( <a class="code" href="classKFeedbackDialog.html#c95533de8e33e87407a06b910f5b6cfa">_form</a> ); <a name="l00047"></a>00047 layout-&gt;addWidget( <a class="code" href="classKFeedbackDialog.html#c95533de8e33e87407a06b910f5b6cfa">_form</a> );
<a name="l00048"></a>00048 <a class="code" href="classKFeedbackDialog.html#34f680000dbe1b4446bd647d51c3738d">checkSendButton</a>(); <a name="l00048"></a>00048 <a class="code" href="classKFeedbackDialog.html#34f680000dbe1b4446bd647d51c3738d">checkSendButton</a>();
@ -113,7 +113,7 @@
<a name="l00096"></a>00096 <span class="comment">//</span> <a name="l00096"></a>00096 <span class="comment">//</span>
<a name="l00097"></a>00097 <a name="l00097"></a>00097
<a name="l00098"></a>00098 <a class="code" href="classKFeedbackForm.html#e8c28be58b2684f090c396ad52f64ad3">_questionList</a> = <span class="keyword">new</span> <a class="code" href="classKFeedbackQuestionList.html">KFeedbackQuestionList</a>( <span class="keyword">this</span> ); <a name="l00098"></a>00098 <a class="code" href="classKFeedbackForm.html#e8c28be58b2684f090c396ad52f64ad3">_questionList</a> = <span class="keyword">new</span> <a class="code" href="classKFeedbackQuestionList.html">KFeedbackQuestionList</a>( <span class="keyword">this</span> );
<a name="l00099"></a>00099 CHECK_PTR( <a class="code" href="classKFeedbackForm.html#e8c28be58b2684f090c396ad52f64ad3">_questionList</a> ); <a name="l00099"></a>00099 TQ_CHECK_PTR( <a class="code" href="classKFeedbackForm.html#e8c28be58b2684f090c396ad52f64ad3">_questionList</a> );
<a name="l00100"></a>00100 <a name="l00100"></a>00100
<a name="l00101"></a>00101 connect( <a class="code" href="classKFeedbackForm.html#e8c28be58b2684f090c396ad52f64ad3">_questionList</a>, SIGNAL( <a class="code" href="classKFeedbackForm.html#c328809367354cf8ff97e7c78b521345">checkComplete</a>() ), <a name="l00101"></a>00101 connect( <a class="code" href="classKFeedbackForm.html#e8c28be58b2684f090c396ad52f64ad3">_questionList</a>, SIGNAL( <a class="code" href="classKFeedbackForm.html#c328809367354cf8ff97e7c78b521345">checkComplete</a>() ),
<a name="l00102"></a>00102 <span class="keyword">this</span>, SLOT ( <a class="code" href="classKFeedbackForm.html#5ec1c36c978229b6e14e9005b595d69e">slotCheckComplete</a>() ) ); <a name="l00102"></a>00102 <span class="keyword">this</span>, SLOT ( <a class="code" href="classKFeedbackForm.html#5ec1c36c978229b6e14e9005b595d69e">slotCheckComplete</a>() ) );
@ -124,21 +124,21 @@
<a name="l00107"></a>00107 <span class="comment">//</span> <a name="l00107"></a>00107 <span class="comment">//</span>
<a name="l00108"></a>00108 <a name="l00108"></a>00108
<a name="l00109"></a>00109 TQHBox * hbox = <span class="keyword">new</span> TQHBox( <span class="keyword">this</span> ); <a name="l00109"></a>00109 TQHBox * hbox = <span class="keyword">new</span> TQHBox( <span class="keyword">this</span> );
<a name="l00110"></a>00110 CHECK_PTR( hbox ); <a name="l00110"></a>00110 TQ_CHECK_PTR( hbox );
<a name="l00111"></a>00111 <a name="l00111"></a>00111
<a name="l00112"></a>00112 TQSizePolicy pol( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); <span class="comment">// hor / vert</span> <a name="l00112"></a>00112 TQSizePolicy pol( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); <span class="comment">// hor / vert</span>
<a name="l00113"></a>00113 <a name="l00113"></a>00113
<a name="l00114"></a>00114 label = <span class="keyword">new</span> TQLabel( i18n( <span class="stringliteral">"Questions marked with "</span> ), hbox ); <a name="l00114"></a>00114 label = <span class="keyword">new</span> TQLabel( i18n( <span class="stringliteral">"Questions marked with "</span> ), hbox );
<a name="l00115"></a>00115 CHECK_PTR( label ); <a name="l00115"></a>00115 TQ_CHECK_PTR( label );
<a name="l00116"></a>00116 label-&gt;setSizePolicy( pol ); <a name="l00116"></a>00116 label-&gt;setSizePolicy( pol );
<a name="l00117"></a>00117 <a name="l00117"></a>00117
<a name="l00118"></a>00118 label = <span class="keyword">new</span> TQLabel( hbox ); <a name="l00118"></a>00118 label = <span class="keyword">new</span> TQLabel( hbox );
<a name="l00119"></a>00119 CHECK_PTR( label ); <a name="l00119"></a>00119 TQ_CHECK_PTR( label );
<a name="l00120"></a>00120 label-&gt;setPixmap( TDEGlobal::iconLoader()-&gt;loadIcon( <span class="stringliteral">"edit"</span>, TDEIcon::Small ) ); <a name="l00120"></a>00120 label-&gt;setPixmap( TDEGlobal::iconLoader()-&gt;loadIcon( <span class="stringliteral">"edit"</span>, TDEIcon::Small ) );
<a name="l00121"></a>00121 label-&gt;setSizePolicy( pol ); <a name="l00121"></a>00121 label-&gt;setSizePolicy( pol );
<a name="l00122"></a>00122 <a name="l00122"></a>00122
<a name="l00123"></a>00123 label = <span class="keyword">new</span> TQLabel( i18n( <span class="stringliteral">" must be answered before a mail can be sent."</span>) , hbox ); <a name="l00123"></a>00123 label = <span class="keyword">new</span> TQLabel( i18n( <span class="stringliteral">" must be answered before a mail can be sent."</span>) , hbox );
<a name="l00124"></a>00124 CHECK_PTR( label ); <a name="l00124"></a>00124 TQ_CHECK_PTR( label );
<a name="l00125"></a>00125 label-&gt;setSizePolicy( pol ); <a name="l00125"></a>00125 label-&gt;setSizePolicy( pol );
<a name="l00126"></a>00126 <a name="l00126"></a>00126
<a name="l00127"></a>00127 <span class="keyword">new</span> TQWidget( hbox ); <span class="comment">// Fill any leftover space to the right.</span> <a name="l00127"></a>00127 <span class="keyword">new</span> TQWidget( hbox ); <span class="comment">// Fill any leftover space to the right.</span>
@ -148,8 +148,8 @@
<a name="l00131"></a>00131 <span class="comment">// Free-text comment field</span> <a name="l00131"></a>00131 <span class="comment">// Free-text comment field</span>
<a name="l00132"></a>00132 <span class="comment">//</span> <a name="l00132"></a>00132 <span class="comment">//</span>
<a name="l00133"></a>00133 <a name="l00133"></a>00133
<a name="l00134"></a>00134 label = <span class="keyword">new</span> TQLabel( <span class="stringliteral">"\n"</span> + i18n( <span class="stringliteral">"&amp;Additional comments:"</span> ), <span class="keyword">this</span> ); CHECK_PTR( label ); <a name="l00134"></a>00134 label = <span class="keyword">new</span> TQLabel( <span class="stringliteral">"\n"</span> + i18n( <span class="stringliteral">"&amp;Additional comments:"</span> ), <span class="keyword">this</span> ); TQ_CHECK_PTR( label );
<a name="l00135"></a>00135 <a class="code" href="classKFeedbackForm.html#862ae3fd81afe2f61f19d41d927c537b">_comment</a> = <span class="keyword">new</span> TQMultiLineEdit( <span class="keyword">this</span> ); CHECK_PTR( <a class="code" href="classKFeedbackForm.html#862ae3fd81afe2f61f19d41d927c537b">_comment</a> ); <a name="l00135"></a>00135 <a class="code" href="classKFeedbackForm.html#862ae3fd81afe2f61f19d41d927c537b">_comment</a> = <span class="keyword">new</span> TQMultiLineEdit( <span class="keyword">this</span> ); TQ_CHECK_PTR( <a class="code" href="classKFeedbackForm.html#862ae3fd81afe2f61f19d41d927c537b">_comment</a> );
<a name="l00136"></a>00136 <a name="l00136"></a>00136
<a name="l00137"></a>00137 label-&gt;setBuddy( <a class="code" href="classKFeedbackForm.html#862ae3fd81afe2f61f19d41d927c537b">_comment</a> ); <a name="l00137"></a>00137 label-&gt;setBuddy( <a class="code" href="classKFeedbackForm.html#862ae3fd81afe2f61f19d41d927c537b">_comment</a> );
<a name="l00138"></a>00138 <span class="preprocessor">#if (TQT_VERSION &lt; 300)</span> <a name="l00138"></a>00138 <span class="preprocessor">#if (TQT_VERSION &lt; 300)</span>
@ -310,7 +310,7 @@
<a name="l00293"></a>00293 <a class="code" href="classKFeedbackQuestion.html">KFeedbackQuestion</a> * question = <span class="keyword">new</span> <a class="code" href="classKFeedbackQuestion.html">KFeedbackQuestion</a>( <span class="keyword">this</span>, text, <span class="keywordtype">id</span>, <a name="l00293"></a>00293 <a class="code" href="classKFeedbackQuestion.html">KFeedbackQuestion</a> * question = <span class="keyword">new</span> <a class="code" href="classKFeedbackQuestion.html">KFeedbackQuestion</a>( <span class="keyword">this</span>, text, <span class="keywordtype">id</span>,
<a name="l00294"></a>00294 exclusiveAnswer, <a name="l00294"></a>00294 exclusiveAnswer,
<a name="l00295"></a>00295 required ); <a name="l00295"></a>00295 required );
<a name="l00296"></a>00296 CHECK_PTR( question ); <a name="l00296"></a>00296 TQ_CHECK_PTR( question );
<a name="l00297"></a>00297 <a name="l00297"></a>00297
<a name="l00298"></a>00298 <span class="keywordflow">return</span> question; <a name="l00298"></a>00298 <span class="keywordflow">return</span> question;
<a name="l00299"></a>00299 } <a name="l00299"></a>00299 }
@ -325,7 +325,7 @@
<a name="l00308"></a>00308 <a class="code" href="classKFeedbackQuestion.html">KFeedbackQuestion</a> * question = <span class="keyword">new</span> <a class="code" href="classKFeedbackQuestion.html">KFeedbackQuestion</a>( <span class="keyword">this</span>, text, <span class="keywordtype">id</span>, <a name="l00308"></a>00308 <a class="code" href="classKFeedbackQuestion.html">KFeedbackQuestion</a> * question = <span class="keyword">new</span> <a class="code" href="classKFeedbackQuestion.html">KFeedbackQuestion</a>( <span class="keyword">this</span>, text, <span class="keywordtype">id</span>,
<a name="l00309"></a>00309 <span class="keyword">true</span>, <span class="comment">// exclusive</span> <a name="l00309"></a>00309 <span class="keyword">true</span>, <span class="comment">// exclusive</span>
<a name="l00310"></a>00310 required ); <a name="l00310"></a>00310 required );
<a name="l00311"></a>00311 CHECK_PTR( question ); <a name="l00311"></a>00311 TQ_CHECK_PTR( question );
<a name="l00312"></a>00312 question-&gt;<a class="code" href="classKFeedbackQuestion.html#70dfbcfb7699accc62ca3f9c1b2da8b6">addAnswer</a>( i18n( <span class="stringliteral">"yes"</span> ), <span class="stringliteral">"yes"</span> ); <a name="l00312"></a>00312 question-&gt;<a class="code" href="classKFeedbackQuestion.html#70dfbcfb7699accc62ca3f9c1b2da8b6">addAnswer</a>( i18n( <span class="stringliteral">"yes"</span> ), <span class="stringliteral">"yes"</span> );
<a name="l00313"></a>00313 question-&gt;<a class="code" href="classKFeedbackQuestion.html#70dfbcfb7699accc62ca3f9c1b2da8b6">addAnswer</a>( i18n( <span class="stringliteral">"no"</span> ), <span class="stringliteral">"no"</span> ); <a name="l00313"></a>00313 question-&gt;<a class="code" href="classKFeedbackQuestion.html#70dfbcfb7699accc62ca3f9c1b2da8b6">addAnswer</a>( i18n( <span class="stringliteral">"no"</span> ), <span class="stringliteral">"no"</span> );
<a name="l00314"></a>00314 } <a name="l00314"></a>00314 }

@ -40,7 +40,7 @@
<a name="l00023"></a><a class="code" href="classKShowMailApp.html#cb6b97d7b759372c2ab7690fc70d1518">00023</a> <span class="keywordtype">void</span> <a class="code" href="classKShowMailApp.html#cb6b97d7b759372c2ab7690fc70d1518">KShowMailApp::slotSendFeedbackMail</a>() <a name="l00023"></a><a class="code" href="classKShowMailApp.html#cb6b97d7b759372c2ab7690fc70d1518">00023</a> <span class="keywordtype">void</span> <a class="code" href="classKShowMailApp.html#cb6b97d7b759372c2ab7690fc70d1518">KShowMailApp::slotSendFeedbackMail</a>()
<a name="l00024"></a>00024 { <a name="l00024"></a>00024 {
<a name="l00025"></a>00025 <a class="code" href="classKFeedbackDialog.html">KFeedbackDialog</a>* feedbackDialog = <span class="keyword">new</span> <a class="code" href="classKFeedbackDialog.html">KFeedbackDialog</a>( <span class="stringliteral">"eggert.ehmke@berlin.de"</span>, <span class="stringliteral">"feedback_mail"</span> ); <a name="l00025"></a>00025 <a class="code" href="classKFeedbackDialog.html">KFeedbackDialog</a>* feedbackDialog = <span class="keyword">new</span> <a class="code" href="classKFeedbackDialog.html">KFeedbackDialog</a>( <span class="stringliteral">"eggert.ehmke@berlin.de"</span>, <span class="stringliteral">"feedback_mail"</span> );
<a name="l00026"></a>00026 CHECK_PTR( feedbackDialog ); <a name="l00026"></a>00026 TQ_CHECK_PTR( feedbackDialog );
<a name="l00027"></a>00027 <a name="l00027"></a>00027
<a name="l00028"></a>00028 <a class="code" href="classKFeedbackQuestionList.html">KFeedbackQuestionList</a> * list = feedbackDialog-&gt;<a class="code" href="classKFeedbackDialog.html#1d9dfb5bac160ce16eb8e929f37c31b6">form</a>()-&gt;<a class="code" href="classKFeedbackForm.html#51b1d4e1e48d18c6155203b9f72ada5e">questionList</a>(); <a name="l00028"></a>00028 <a class="code" href="classKFeedbackQuestionList.html">KFeedbackQuestionList</a> * list = feedbackDialog-&gt;<a class="code" href="classKFeedbackDialog.html#1d9dfb5bac160ce16eb8e929f37c31b6">form</a>()-&gt;<a class="code" href="classKFeedbackForm.html#51b1d4e1e48d18c6155203b9f72ada5e">questionList</a>();
<a name="l00029"></a>00029 <a name="l00029"></a>00029

@ -42,7 +42,7 @@ KFeedbackDialog::KFeedbackDialog( const TQString & feedbackMailAddress, const TQ
setHelp( helpTopic ); setHelp( helpTopic );
_form = new KFeedbackForm( feedbackMailAddress, plainPage() ); _form = new KFeedbackForm( feedbackMailAddress, plainPage() );
CHECK_PTR( _form ); TQ_CHECK_PTR( _form );
layout->addWidget( _form ); layout->addWidget( _form );
checkSendButton(); checkSendButton();
@ -96,7 +96,7 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
// //
_questionList = new KFeedbackQuestionList( this ); _questionList = new KFeedbackQuestionList( this );
CHECK_PTR( _questionList ); TQ_CHECK_PTR( _questionList );
connect( _questionList, SIGNAL( checkComplete() ), connect( _questionList, SIGNAL( checkComplete() ),
this, SLOT ( slotCheckComplete() ) ); this, SLOT ( slotCheckComplete() ) );
@ -107,21 +107,21 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
// //
TQHBox * hbox = new TQHBox( this ); TQHBox * hbox = new TQHBox( this );
CHECK_PTR( hbox ); TQ_CHECK_PTR( hbox );
TQSizePolicy pol( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); // hor / vert TQSizePolicy pol( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); // hor / vert
label = new TQLabel( i18n( "Questions marked with " ), hbox ); label = new TQLabel( i18n( "Questions marked with " ), hbox );
CHECK_PTR( label ); TQ_CHECK_PTR( label );
label->setSizePolicy( pol ); label->setSizePolicy( pol );
label = new TQLabel( hbox ); label = new TQLabel( hbox );
CHECK_PTR( label ); TQ_CHECK_PTR( label );
label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "edit", TDEIcon::Small ) ); label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "edit", TDEIcon::Small ) );
label->setSizePolicy( pol ); label->setSizePolicy( pol );
label = new TQLabel( i18n( " must be answered before a mail can be sent.") , hbox ); label = new TQLabel( i18n( " must be answered before a mail can be sent.") , hbox );
CHECK_PTR( label ); TQ_CHECK_PTR( label );
label->setSizePolicy( pol ); label->setSizePolicy( pol );
new TQWidget( hbox ); // Fill any leftover space to the right. new TQWidget( hbox ); // Fill any leftover space to the right.
@ -131,8 +131,8 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
// Free-text comment field // Free-text comment field
// //
label = new TQLabel( "\n" + i18n( "&Additional comments:" ), this ); CHECK_PTR( label ); label = new TQLabel( "\n" + i18n( "&Additional comments:" ), this ); TQ_CHECK_PTR( label );
_comment = new TQMultiLineEdit( this ); CHECK_PTR( _comment ); _comment = new TQMultiLineEdit( this ); TQ_CHECK_PTR( _comment );
label->setBuddy( _comment ); label->setBuddy( _comment );
#if (TQT_VERSION < 300) #if (TQT_VERSION < 300)
@ -293,7 +293,7 @@ KFeedbackQuestion* KFeedbackQuestionList::addQuestion( const TQString & text,
KFeedbackQuestion * question = new KFeedbackQuestion( this, text, id, KFeedbackQuestion * question = new KFeedbackQuestion( this, text, id,
exclusiveAnswer, exclusiveAnswer,
required ); required );
CHECK_PTR( question ); TQ_CHECK_PTR( question );
return question; return question;
} }
@ -308,7 +308,7 @@ KFeedbackQuestionList::addYesNoQuestion( const TQString & text,
KFeedbackQuestion * question = new KFeedbackQuestion( this, text, id, KFeedbackQuestion * question = new KFeedbackQuestion( this, text, id,
true, // exclusive true, // exclusive
required ); required );
CHECK_PTR( question ); TQ_CHECK_PTR( question );
question->addAnswer( i18n( "yes" ), "yes" ); question->addAnswer( i18n( "yes" ), "yes" );
question->addAnswer( i18n( "no" ), "no" ); question->addAnswer( i18n( "no" ), "no" );
} }

@ -23,7 +23,7 @@
void KShowMailApp::slotSendFeedbackMail() void KShowMailApp::slotSendFeedbackMail()
{ {
KFeedbackDialog* feedbackDialog = new KFeedbackDialog( "eggert.ehmke@berlin.de, ulrich.weigelt@gmx.de", "feedback_mail" ); KFeedbackDialog* feedbackDialog = new KFeedbackDialog( "eggert.ehmke@berlin.de, ulrich.weigelt@gmx.de", "feedback_mail" );
CHECK_PTR( feedbackDialog ); TQ_CHECK_PTR( feedbackDialog );
KFeedbackQuestionList * list = feedbackDialog->form()->questionList(); KFeedbackQuestionList * list = feedbackDialog->form()->questionList();

Loading…
Cancel
Save