author | erik <erik> | 2007-01-29 22:00:04 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-29 22:00:04 (UTC) |
commit | 9a3875c32922a322d991e67b13e89242f71a862c (patch) (unidiff) | |
tree | 4f5c7c79f7e1ee70f19b5cc3d75131b8151ad9cd /noncore/apps/tinykate/mainwindow | |
parent | 02ef45be75a3024df11365956e1cce6392d9103c (diff) | |
download | opie-9a3875c32922a322d991e67b13e89242f71a862c.zip opie-9a3875c32922a322d991e67b13e89242f71a862c.tar.gz opie-9a3875c32922a322d991e67b13e89242f71a862c.tar.bz2 |
Each file in this commit exhibits a problem where a variable is made in
some way but never used. This is a tricky problem with Qt since almost all
UI forms are made but not used (like QLabel). But I am pretty confident that
these changes are correct and do not have any aspect of a change to the UI.
In most cases, there are just variables that are made and then copied over
(like in iteration over lists or assignment of pointers based on
conditionals).
Diffstat (limited to 'noncore/apps/tinykate/mainwindow') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/tinykate/mainwindow/tinykate.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/noncore/apps/tinykate/mainwindow/tinykate.cpp b/noncore/apps/tinykate/mainwindow/tinykate.cpp index e87464e..e920d5b 100644 --- a/noncore/apps/tinykate/mainwindow/tinykate.cpp +++ b/noncore/apps/tinykate/mainwindow/tinykate.cpp | |||
@@ -194,48 +194,47 @@ void TinyKate::slotOpen( ) | |||
194 | { | 194 | { |
195 | QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, | 195 | QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, |
196 | QString::null); | 196 | QString::null); |
197 | if (!filename.isEmpty()) | 197 | if (!filename.isEmpty()) |
198 | { | 198 | { |
199 | open(filename); | 199 | open(filename); |
200 | } | 200 | } |
201 | } | 201 | } |
202 | 202 | ||
203 | void TinyKate::open(const QString & filename) | 203 | void TinyKate::open(const QString & filename) |
204 | { | 204 | { |
205 | KateDocument *kd= new KateDocument(false, false, this,0,this); | 205 | KateDocument *kd= new KateDocument(false, false, this,0,this); |
206 | KTextEditor::View *kv; | ||
207 | QString realFileName; | 206 | QString realFileName; |
208 | //check if filename is a .desktop file | 207 | //check if filename is a .desktop file |
209 | if ( filename.find( ".desktop", 0, true ) != -1 ) { | 208 | if ( filename.find( ".desktop", 0, true ) != -1 ) { |
210 | switch ( QMessageBox::warning( this, tr( "TinyKATE" ), | 209 | switch ( QMessageBox::warning( this, tr( "TinyKATE" ), |
211 | tr("TinyKATE has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?" ), | 210 | tr("TinyKATE has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?" ), |
212 | tr(".desktop File"), | 211 | tr(".desktop File"), |
213 | tr("Linked Document"), 0, 1, 1 ) ) | 212 | tr("Linked Document"), 0, 1, 1 ) ) |
214 | { | 213 | { |
215 | case 0: //desktop | 214 | case 0: //desktop |
216 | realFileName = filename; | 215 | realFileName = filename; |
217 | break; | 216 | break; |
218 | case 1: //linked | 217 | case 1: //linked |
219 | DocLnk docLnk( filename ); | 218 | DocLnk docLnk( filename ); |
220 | realFileName = docLnk.file(); | 219 | realFileName = docLnk.file(); |
221 | break; | 220 | break; |
222 | }; | 221 | }; |
223 | } else { | 222 | } else { |
224 | realFileName = filename; | 223 | realFileName = filename; |
225 | } | 224 | } |
226 | 225 | ||
227 | QFileInfo fileInfo( realFileName ); | 226 | QFileInfo fileInfo( realFileName ); |
228 | QString filenamed = fileInfo.fileName(); | 227 | QString filenamed = fileInfo.fileName(); |
229 | tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed ); | 228 | tabwidget->addTab(kd->createView(tabwidget,"Unnamed kateview"),"tinykate/tinykate", filenamed ); |
230 | odebug << realFileName << oendl; | 229 | odebug << realFileName << oendl; |
231 | 230 | ||
232 | kd->setDocName( filenamed); | 231 | kd->setDocName( filenamed); |
233 | kd->open( realFileName ); | 232 | kd->open( realFileName ); |
234 | viewCount++; | 233 | viewCount++; |
235 | } | 234 | } |
236 | 235 | ||
237 | void TinyKate::setDocument(const QString& fileref) | 236 | void TinyKate::setDocument(const QString& fileref) |
238 | { | 237 | { |
239 | open( fileref ); | 238 | open( fileref ); |
240 | } | 239 | } |
241 | 240 | ||
@@ -269,29 +268,28 @@ void TinyKate::slotCurrentChanged( QWidget * view) | |||
269 | connect(editReplace,SIGNAL(activated()),currentView,SLOT(replace())); | 268 | connect(editReplace,SIGNAL(activated()),currentView,SLOT(replace())); |
270 | connect(editGotoLine,SIGNAL(activated()),currentView,SLOT(gotoLine())); | 269 | connect(editGotoLine,SIGNAL(activated()),currentView,SLOT(gotoLine())); |
271 | connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); | 270 | connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); |
272 | connect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes())); | 271 | connect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes())); |
273 | connect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int))); | 272 | connect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int))); |
274 | connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); | 273 | connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); |
275 | 274 | ||
276 | } | 275 | } |
277 | 276 | ||
278 | void TinyKate::slotNew( ) | 277 | void TinyKate::slotNew( ) |
279 | { | 278 | { |
280 | KateDocument *kd= new KateDocument(false, false, this,0,this); | 279 | KateDocument *kd= new KateDocument(false, false, this,0,this); |
281 | KTextEditor::View *kv; | ||
282 | 280 | ||
283 | kd->setDocName(tr("Unnamed %1").arg(nextUnnamed++)); | 281 | kd->setDocName(tr("Unnamed %1").arg(nextUnnamed++)); |
284 | kd->setNewDoc(true); | 282 | kd->setNewDoc(true); |
285 | tabwidget->addTab(kv=kd->createView(tabwidget,"BLAH"), | 283 | tabwidget->addTab(kd->createView(tabwidget,"Unnamed"), |
286 | "tinykate/tinykate", | 284 | "tinykate/tinykate", |
287 | kd->docName()); | 285 | kd->docName()); |
288 | viewCount++; | 286 | viewCount++; |
289 | } | 287 | } |
290 | 288 | ||
291 | bool TinyKate::checkSave() { | 289 | bool TinyKate::checkSave() { |
292 | if (currentView==0) return true; | 290 | if (currentView==0) return true; |
293 | 291 | ||
294 | KateView *kv = (KateView*) currentView; | 292 | KateView *kv = (KateView*) currentView; |
295 | if(kv->isModified()) { | 293 | if(kv->isModified()) { |
296 | KateDocument *kd = (KateDocument*) kv->document(); | 294 | KateDocument *kd = (KateDocument*) kv->document(); |
297 | switch( QMessageBox::information( 0, (tr("TinyKATE")), | 295 | switch( QMessageBox::information( 0, (tr("TinyKATE")), |