Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 10 years ago
parent 273ccce287
commit fccf6d244a
  1. 4
      blinken/src/blinken.cpp
  2. 2
      blinken/src/button.cpp
  3. 2
      doc/kvoctrain/index.docbook
  4. 2
      kalzium/src/detailinfodlg.cpp
  5. 2
      kalzium/src/elementdataviewer.cpp
  6. 2
      kalzium/src/kalzium.cpp
  7. 2
      kalzium/src/kalzium.h
  8. 4
      kalzium/src/molcalcwidget.cpp
  9. 4
      kanagram/src/kanagram.cpp
  10. 4
      kbruch/src/mainqtwidget.cpp
  11. 2
      kbruch/src/mainqtwidget.h
  12. 2
      kbruch/src/taskvieweroptionsbase.ui
  13. 6
      keduca/keduca/Makefile.am
  14. 2
      keduca/keduca/kcheckeduca.cpp
  15. 2
      keduca/keduca/keduca.h
  16. 4
      keduca/keduca/kgroupeduca.cpp
  17. 2
      keduca/keduca/kgroupeduca.h
  18. 8
      keduca/keduca/tderadioeduca.cpp
  19. 2
      keduca/keduca/tderadioeduca.h
  20. 2
      keduca/keducabuilder/kcontroladdedit.cpp
  21. 2
      keduca/keducabuilder/kcontroladdeditbase.ui
  22. 6
      keduca/keducabuilder/keducabuilder.h
  23. 2
      keduca/keducabuilder/keducaeditorstartdialog.cpp
  24. 2
      kgeography/src/boxasker.cpp
  25. 2
      kgeography/src/kgeography.cpp
  26. 2
      kgeography/src/kgeography.h
  27. 6
      khangman/khangman/khangman.cpp
  28. 2
      khangman/khangman/khangman.h
  29. 2
      khangman/khangman/khnewstuff.cpp
  30. 4
      kig/TODO
  31. 2
      kig/filters/drgeo-filter-chooser.cc
  32. 2
      kig/filters/drgeo-filter-chooserbase.ui
  33. 2
      kig/filters/exporter.cc
  34. 2
      kig/kig/kig.cpp
  35. 6
      kig/kig/kig_part.cpp
  36. 2
      kig/kig/kig_view.cpp
  37. 2
      kig/misc/guiaction.h
  38. 2
      kig/modes/construct_mode.cc
  39. 2
      kig/modes/dragrectmode.cc
  40. 2
      kig/modes/label.cc
  41. 2
      kig/modes/mode.cc
  42. 2
      kig/modes/normal.cc
  43. 2
      kig/modes/popup.cc
  44. 2
      kig/modes/popup.h
  45. 2
      kig/modes/typesdialog.h
  46. 2
      kig/modes/typesdialogbase.ui
  47. 30
      kig/objects/polygon_imp.cc
  48. 8
      kig/scripting/newscriptwizard.cc
  49. 4
      kig/scripting/python_scripter.cc
  50. 2
      kiten/configdictionaries.cpp
  51. 4
      kiten/configdictionariesbase.ui
  52. 2
      kiten/configfont.ui
  53. 4
      kiten/kiten.cpp
  54. 4
      kiten/learn.cpp
  55. 2
      kiten/main.cpp
  56. 2
      kiten/optiondialog.cpp
  57. 2
      kiten/rad.cpp
  58. 4
      kiten/widgets.cpp
  59. 4
      kiten/widgets.h
  60. 4
      klatin/klatin/klatin.h
  61. 2
      klettres/klettres/fontsdlg.ui
  62. 6
      klettres/klettres/klettres.cpp
  63. 2
      klettres/klettres/klettres.h
  64. 2
      klettres/klettres/klnewstuff.cpp
  65. 2
      kmplot/kmplot/FktDlg.cpp
  66. 2
      kmplot/kmplot/FktDlgData.ui
  67. 2
      kmplot/kmplot/MainDlg.cpp
  68. 4
      kmplot/kmplot/MainDlg.h
  69. 4
      kmplot/kmplot/View.cpp
  70. 4
      kmplot/kmplot/View.h
  71. 2
      kmplot/kmplot/kconstanteditor.cpp
  72. 2
      kmplot/kmplot/kmplot.cpp
  73. 2
      kmplot/kmplot/kparametereditor.cpp
  74. 2
      kmplot/kmplot/ksliderwindow.cpp
  75. 2
      kmplot/kmplot/ksliderwindow.h
  76. 2
      kmplot/kmplot/qconstanteditor.ui
  77. 4
      kmplot/kmplot/settingspagefonts.ui
  78. 2
      kstars/kstars/addcatdialogui.ui
  79. 2
      kstars/kstars/detaildialog.cpp
  80. 2
      kstars/kstars/details_database.ui
  81. 4
      kstars/kstars/details_links.ui
  82. 4
      kstars/kstars/devmanager.ui
  83. 2
      kstars/kstars/draglistbox.h
  84. 6
      kstars/kstars/fitsimage.cpp
  85. 2
      kstars/kstars/fitsimage.h
  86. 2
      kstars/kstars/fitsprocess.cpp
  87. 8
      kstars/kstars/fitsviewer.cpp
  88. 2
      kstars/kstars/fitsviewer.h
  89. 2
      kstars/kstars/fovdialogui.ui
  90. 4
      kstars/kstars/imageviewer.cpp
  91. 2
      kstars/kstars/imageviewer.h
  92. 4
      kstars/kstars/indidevice.cpp
  93. 6
      kstars/kstars/indidriver.cpp
  94. 4
      kstars/kstars/indimenu.cpp
  95. 2
      kstars/kstars/indiproperty.cpp
  96. 2
      kstars/kstars/indistd.cpp
  97. 2
      kstars/kstars/ksnewstuff.cpp
  98. 2
      kstars/kstars/kspopupmenu.h
  99. 2
      kstars/kstars/kstars.cpp
  100. 2
      kstars/kstars/kstars.h
  101. 8
      kstars/kstars/kstarsactions.cpp
  102. 2
      kstars/kstars/kstarsdata.h
  103. 4
      kstars/kstars/kstarsdcop.cpp
  104. 4
      kstars/kstars/kstarsinit.cpp
  105. 2
      kstars/kstars/kswizard.cpp
  106. 2
      kstars/kstars/skymap.cpp
  107. 2
      kstars/kstars/skymapevents.cpp
  108. 2
      kstars/kstars/skyobjectname.h
  109. 2
      kstars/kstars/telescopeprop.cpp
  110. 2
      kstars/kstars/telescopepropui.ui
  111. 2
      kstars/kstars/telescopewizardprocess.cpp
  112. 2
      kstars/kstars/thumbnailpicker.cpp
  113. 2
      kstars/kstars/thumbnailpickerui.ui
  114. 2
      kstars/kstars/toggleaction.h
  115. 2
      kstars/kstars/tools/altvstime.cpp
  116. 2
      kstars/kstars/tools/lcgenerator.cpp
  117. 2
      kstars/kstars/tools/observinglist.cpp
  118. 4
      kstars/kstars/tools/observinglistui.ui
  119. 4
      kstars/kstars/tools/obslistwizard.cpp
  120. 6
      kstars/kstars/tools/obslistwizardui.ui
  121. 2
      kstars/kstars/tools/optionstreeview.ui
  122. 4
      kstars/kstars/tools/scriptbuilder.cpp
  123. 4
      kstars/kstars/tools/scriptbuilderui.ui
  124. 2
      kstars/kstars/tools/wutdialog.cpp
  125. 4
      kstars/kstars/tools/wutdialogui.ui
  126. 8
      ktouch/src/ktouch.cpp
  127. 2
      ktouch/src/ktouch.h
  128. 2
      ktouch/src/ktouchkeyboardeditor.cpp
  129. 4
      ktouch/src/ktouchlectureeditor.cpp
  130. 2
      ktouch/src/ktouchlectureeditor_dlg.ui
  131. 2
      ktouch/src/ktouchprefgenerallayout.ui
  132. 2
      ktouch/src/ktouchprefkeyboardlayout.ui
  133. 2
      ktouch/training/polish.ktouch.xml
  134. 4
      kverbos/kverbos/kverbos.h
  135. 2
      kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
  136. 4
      kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
  137. 2
      kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
  138. 2
      kvoctrain/kvoctrain/kva_init.cpp
  139. 2
      kvoctrain/kvoctrain/kva_io.cpp
  140. 4
      kvoctrain/kvoctrain/kvoctrain.h
  141. 2
      kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
  142. 4
      kwordquiz/src/kwordquiz.cpp
  143. 4
      kwordquiz/src/kwordquiz.h
  144. 2
      kwordquiz/src/kwordquizprefs.cpp
  145. 2
      kwordquiz/src/prefcardappearance.cpp
  146. 2
      kwordquiz/src/prefcardappearancebase.ui
  147. 2
      kwordquiz/src/qaview.h
  148. 2
      libtdeedu/extdate/extdatepicker.cpp
  149. 2
      libtdeedu/extdate/extdatetbl.cpp
  150. 2
      libtdeedu/extdate/testwidget.h
  151. 6
      libtdeedu/tdeeduui/tdeeduglossary.cpp

@ -12,14 +12,14 @@
#include <tqpixmap.h>
#include <tqtimer.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <khelpmenu.h>
#include <kinputdialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include "blinken.h"

@ -7,7 +7,7 @@
* (at your option) any later version. *
***************************************************************************/
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>

@ -1153,7 +1153,7 @@ You may download a free font from
<ulink url="http://bibliofile.mc.duke.edu/gww/fonts/Unicode.html">http://bibliofile.mc.duke.edu/gww/fonts/Unicode.html
</ulink> or
<ulink url="http://www.hclrss.demon.co.uk/unicode/fonts.html">http://www.hclrss.demon.co.uk/unicode/fonts.html
</ulink>. Install these fonts for example with kfontinst.</para>
</ulink>. Install these fonts for example with tdefontinst.</para>
<para>If you have <application>StarOffice</application> installed you probably
have the font <quote>Lucida Sans Unicode</quote> which also contains most of the

@ -24,7 +24,7 @@
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <kstandarddirs.h>
#include <kactioncollection.h>
#include <tdeactioncollection.h>
#include <kcombobox.h>
#include <kapplication.h>

@ -22,7 +22,7 @@
#include <knuminput.h>
#include <kcombobox.h>
#include <kdebug.h>
#include <kactioncollection.h>
#include <tdeactioncollection.h>
#include <kapplication.h>
//QT-Includes

@ -43,7 +43,7 @@
#include <kiconloader.h>
#include <klocale.h>
#include <kdebug.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kstatusbar.h>
#include <kstandarddirs.h>

@ -17,7 +17,7 @@
#include <config.h>
#endif
#include <kmainwindow.h>
#include <tdemainwindow.h>
class TDESelectAction;
class TDEToggleAction;

@ -29,12 +29,12 @@
#include "parser.h"
#include "moleculeparser.h"
#include <kaction.h>
#include <tdeaction.h>
#include <kdebug.h>
#include <klocale.h>
#include <kpushbutton.h>
#include <klineedit.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <tqlabel.h>
#include <tqlayout.h>

@ -32,14 +32,14 @@ using namespace std;
#include <tqfontmetrics.h>
#include <tqdir.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <khelpmenu.h>
#include <kinputdialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <tdeconfigdialog.h>
#include <tdeconfigskeleton.h>

@ -18,9 +18,9 @@
#include <config.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <kapplication.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kjanuswidget.h>

@ -17,7 +17,7 @@
#ifndef MAINTQTWIDGET_H
#define MAINTQTWIDGET_H
#include <kmainwindow.h>
#include <tdemainwindow.h>
class KJanusWidget;

@ -216,7 +216,7 @@
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kfontdialog.h</includehint>
<includehint>tdefontdialog.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>

@ -10,7 +10,7 @@ keduca_SOURCES = main.cpp keduca.cpp
# Convenience library
#noinst_LTLIBRARIES = libkeduca_common.la
#libkeduca_common_la_SOURCES = kradioeduca.cpp kquestion.cpp kgroupeduca.cpp keducaview.cpp \
#libkeduca_common_la_SOURCES = tderadioeduca.cpp kquestion.cpp kgroupeduca.cpp keducaview.cpp \
# keducaprefs.cpp kcheckeduca.cpp
#libkeduca_common_la_LDFLAGS = $(all_libraries) -no-undefined
#libkeduca_common_la_LIBADD = ../libkeduca/libkeduca.la
@ -19,13 +19,13 @@ keduca_SOURCES = main.cpp keduca.cpp
kde_module_LTLIBRARIES = libkeducapart.la
libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
libkeducapart_la_LIBADD = ../libkeduca/libkeduca.la $(LIB_KPARTS)
libkeducapart_la_SOURCES = keduca_part.cpp kradioeduca.cpp kquestion.cpp \
libkeducapart_la_SOURCES = keduca_part.cpp tderadioeduca.cpp kquestion.cpp \
kgroupeduca.cpp keducaview.cpp keducaprefs.cpp \
kcheckeduca.cpp settings.kcfgc configdialogbase.ui
EXTRA_DIST = main.cpp keduca.cpp keduca.h kcheckeduca.cpp kcheckeduca.h keducaprefs.cpp \
keducaprefs.h keducaui.rc keducaview.cpp keducaview.h kgroupeduca.cpp kgroupeduca.h kquestion.cpp \
kquestion.h kradioeduca.cpp kradioeduca.h
kquestion.h tderadioeduca.cpp tderadioeduca.h
METASOURCES = AUTO

@ -19,7 +19,7 @@
#include "kcheckeduca.moc"
#include <tqstyle.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>
KCheckEduca::KCheckEduca(TQWidget *parent, const char *name ) : TQCheckBox(parent,name)
{

@ -27,7 +27,7 @@
#include <kapplication.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/part.h>
#include <kaction.h>
#include <tdeaction.h>
/** The KEduca TestMaster.
This will execute the Test/Examen as defined by the KEduca Document. */

@ -18,7 +18,7 @@
#include "kgroupeduca.h"
#include "kgroupeduca.moc"
#include "kcheckeduca.h"
#include "kradioeduca.h"
#include "tderadioeduca.h"
#include <klocale.h>
@ -66,7 +66,7 @@ void KGroupEduca::setType(ButtonType type)
_typeMode = type;
}
/** Clear all kradio or kcheck answers */
/** Clear all tderadio or kcheck answers */
void KGroupEduca::clearAnswers()
{
unsigned int maxButton = count();

@ -38,7 +38,7 @@ public:
void insertAnswer( const TQString& text);
/** Set type */
void setType(ButtonType Type);
/** Clear all kradio or kcheck answers */
/** Clear all tderadio or kcheck answers */
void clearAnswers();
/** Return if is checked radio or check buttons */
bool isChecked(int id);

@ -1,5 +1,5 @@
/***************************************************************************
kradioeduca.cpp - description
tderadioeduca.cpp - description
-------------------
begin : Wed Sep 6 2000
copyright : (C) 2000 by Javier Campos Morales
@ -15,10 +15,10 @@
* *
***************************************************************************/
#include "kradioeduca.h"
#include "kradioeduca.moc"
#include "tderadioeduca.h"
#include "tderadioeduca.moc"
#include <tqstyle.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>
TDERadioEduca::TDERadioEduca(TQWidget *parent, const char *name) : TQRadioButton(parent,name)
{

@ -1,5 +1,5 @@
/***************************************************************************
kradioeduca.h - description
tderadioeduca.h - description
-------------------
begin : Wed Sep 6 2000
copyright : (C) 2000 by Javier Campos Morales

@ -24,7 +24,7 @@
#include <kurlrequester.h>
#include <kcombobox.h>
#include <knuminput.h>
#include <klistview.h>
#include <tdelistview.h>
//#include <.h>
// TQt includes

@ -875,6 +875,6 @@
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

@ -20,10 +20,10 @@
#include "../libkeduca/fileread.h"
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <klistbox.h>
#include <kaction.h>
#include <tdelistbox.h>
#include <tdeaction.h>
#include <tqtextview.h>
#include <tqsplitter.h>

@ -46,7 +46,7 @@ KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * parent, const c
this, TQT_SLOT( slotChoiceChanged(int) ) );
}
/** based on code in kaction.cpp
/** based on code in tdeaction.cpp
*/
void KEducaEditorStartDialog::buildRecentFilesList()
{

@ -10,7 +10,7 @@
#include <stdlib.h> // for RAND_MAX
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>
#include <kapplication.h>
#include <klocale.h>
#include <kpushbutton.h>

@ -8,7 +8,7 @@
* (at your option) any later version. *
***************************************************************************/
#include <kaction.h>
#include <tdeaction.h>
#include <kdialog.h>
#include <klocale.h>
#include <kinputdialog.h>

@ -11,7 +11,7 @@
#ifndef KGEOGRAPHY_H
#define KGEOGRAPHY_H
#include <kmainwindow.h>
#include <tdemainwindow.h>
class TDEAction;
class KPushButton;

@ -32,16 +32,16 @@
#include <tqdir.h>
#include <kapplication.h>
#include <kactionclasses.h>
#include <tdeactionclasses.h>
#include <tdeconfigdialog.h>
#include <kdebug.h>
#include <klineedit.h>
#include <klocale.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <ktoolbarbutton.h>
#include <tdetoolbarbutton.h>
KHangMan::KHangMan()

@ -26,7 +26,7 @@
#include <config.h>
#endif
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include "khangmanview.h"

@ -27,7 +27,7 @@
#include <kstandarddirs.h>
#include <ktar.h>
#include <tqdir.h>
#include <kaction.h>
#include <tdeaction.h>
#include "prefs.h"
#include "khnewstuff.h"

@ -7,8 +7,8 @@
many points as times you pressed escape ( or perhaps the times you
pressed esc square or sth like that ). Anyway, this is due to how
Kig works with some strange Qt event loop stuff to make its modes
work, along with a strange way in kaccel of working. I have a
patch against tdecore/kaccel.cpp that should fix it, but the real
work, along with a strange way in tdeaccel of working. I have a
patch against tdecore/tdeaccel.cpp that should fix it, but the real
fix is to get rid of the entire event loop stuff and think of a
better way to manage all this. pino: seems pressing the stop button
n times, where n are the times you pressed escape, cancel all the

@ -19,7 +19,7 @@
#include "drgeo-filter-chooser.h"
#include "drgeo-filter-chooser.moc"
#include <klistbox.h>
#include <tdelistbox.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpushbutton.h>

@ -133,7 +133,7 @@ Please select which to import:</string>
</widget>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistbox.h</includehint>
<includehint>tdelistbox.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>

@ -42,7 +42,7 @@
#include <tqiconset.h>
#include <tqtextstream.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kiconloader.h>
#include <kimageio.h>
#include <klocale.h>

@ -24,7 +24,7 @@
#include <tqevent.h>
#include <tqtimer.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>

@ -43,7 +43,7 @@
#include <algorithm>
#include <functional>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kdebug.h>
#include <tdefiledialog.h>
@ -51,13 +51,13 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <klocale.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <kmessagebox.h>
#include <kmimetype.h>
#include <kprinter.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <tdeparts/genericfactory.h>
#include <tdeprint/kprintdialogpage.h>

@ -41,7 +41,7 @@
#include <klocale.h>
#include <kapplication.h>
#include <kstdaction.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kiconloader.h>
#include <cmath>

@ -26,7 +26,7 @@
#include <tqstring.h>
#include <tqcstring.h>
#include <kaction.h>
#include <tdeaction.h>
class GUIAction;
class KigPart;

@ -36,7 +36,7 @@
#include "popup.h"
#include <kcursor.h>
#include <kaction.h>
#include <tdeaction.h>
#include <algorithm>
#include <functional>

@ -24,7 +24,7 @@
#include <tqevent.h>
#include <tqglobal.h>
#include <kaction.h>
#include <tdeaction.h>
DragRectMode::DragRectMode( const TQPoint& start, KigPart& d, KigWidget& w )
: KigMode( d ), mstart( start ), mnc( true ), mstartselected( true ),

@ -36,7 +36,7 @@
#include <kcursor.h>
#include <kmessagebox.h>
#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>
#include <tqtextedit.h>
#include <kdebug.h>

@ -22,7 +22,7 @@
#include "../kig/kig_part.h"
#include <kaction.h>
#include <tdeaction.h>
void KigMode::enableActions()
{

@ -32,7 +32,7 @@
#include "typesdialog.h"
#include <kcursor.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kcommand.h>
#include <klocale.h>

@ -52,7 +52,7 @@
#include <tqregexp.h>
#include <tqvalidator.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kcolordialog.h>
#include <kglobal.h>
#include <kiconloader.h>

@ -21,7 +21,7 @@
#ifndef KIG_MODES_POPUP_H
#define KIG_MODES_POPUP_H
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <vector>

@ -27,7 +27,7 @@
#include <tqpopupmenu.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kiconloader.h>
class KigPart;

@ -328,7 +328,7 @@
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

@ -498,34 +498,34 @@ std::vector<Coordinate> computeConvexHull( const std::vector<Coordinate>& points
*/
if ( points.size() < 3 ) return points;
std::vector<Coordinate> worklist = points;
std::vector<Coordinate> wortdelist = points;
std::vector<Coordinate> result;
double ymin = worklist[0].y;
double ymin = wortdelist[0].y;
uint imin = 0;
for ( uint i = 1; i < worklist.size(); ++i )
for ( uint i = 1; i < wortdelist.size(); ++i )
{
if ( worklist[i].y < ymin )
if ( wortdelist[i].y < ymin )
{
ymin = worklist[i].y;
ymin = wortdelist[i].y;
imin = i;
}
}
// worklist[imin] is definitely on the convex hull, let's start from there
result.push_back( worklist[imin] );
Coordinate startpoint = worklist[imin];
Coordinate apoint = worklist[imin];
// wortdelist[imin] is definitely on the convex hull, let's start from there
result.push_back( wortdelist[imin] );
Coordinate startpoint = wortdelist[imin];
Coordinate apoint = wortdelist[imin];
double aangle = 0.0;
while ( ! worklist.empty() )
while ( ! wortdelist.empty() )
{
int besti = -1;
double anglemin = 10000.0;
for ( uint i = 0; i < worklist.size(); ++i )
for ( uint i = 0; i < wortdelist.size(); ++i )
{
if ( worklist[i] == apoint ) continue;
Coordinate v = worklist[i] - apoint;
if ( wortdelist[i] == apoint ) continue;
Coordinate v = wortdelist[i] - apoint;
double angle = std::atan2( v.y, v.x );
while ( angle < aangle ) angle += 2*M_PI;
if ( angle < anglemin )
@ -536,14 +536,14 @@ std::vector<Coordinate> computeConvexHull( const std::vector<Coordinate>& points
}
if ( besti < 0 ) return result; // this happens, e.g. if all points coincide
apoint = worklist[besti];
apoint = wortdelist[besti];
aangle = anglemin;
if ( apoint == startpoint )
{
return result;
}
result.push_back( apoint );
worklist.erase( worklist.begin() + besti, worklist.begin() + besti + 1 );
wortdelist.erase( wortdelist.begin() + besti, wortdelist.begin() + besti + 1 );
}
assert( false );
return result;

@ -23,14 +23,14 @@
#include <tqlabel.h>
#include <tqlayout.h>
//#include <kactionclasses.h>
//#include <kactioncollection.h>
//#include <tdeactionclasses.h>
//#include <tdeactioncollection.h>
// make it still work on old kde 3.1...
#include <kaction.h>
#include <tdeaction.h>
//
#include <kapplication.h>
#include <kglobalsettings.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <ktextedit.h>
#include <tdetexteditor/clipboardinterface.h>
#include <tdetexteditor/dynwordwrapinterface.h>

@ -539,12 +539,12 @@ void PythonScripter::saveErrors()
object printexcfunc = d->mainnamespace[ "traceback" ].attr( "format_exception" );
list tracebacklist = extract<list>( printexcfunc( exctype, excvalue, exctraceback ) )();
list tracebactdelist = extract<list>( printexcfunc( exctype, excvalue, exctraceback ) )();
str tracebackstr( "" );
while ( true )
{
try {
str s = extract<str>( tracebacklist.pop() );
str s = extract<str>( tracebactdelist.pop() );
tracebackstr += s;
}
catch( ... )

@ -19,7 +19,7 @@
**/
#include <kdebug.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tdefiledialog.h>
#include <tqpushbutton.h>
#include <tqstringlist.h>

@ -307,7 +307,7 @@
</widget>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

@ -28,6 +28,6 @@
</widget>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kfontdialog.h</includehint>
<includehint>tdefontdialog.h</includehint>
</includehints>
</UI>

@ -19,7 +19,7 @@
USA
**/
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <tdeconfigdialog.h>
@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <kkeydialog.h>
#include <klocale.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>

@ -19,11 +19,11 @@
USA
**/
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kdebug.h>
#include <tdefiledialog.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpushbutton.h>

@ -22,7 +22,7 @@
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <kapplication.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <tqsqlpropertymap.h>
#include "kiten.h"

@ -22,7 +22,7 @@
#include <kdebug.h>
#include <kapplication.h>
#include <tqvgroupbox.h>
#include <kfontdialog.h>
#include <tdefontdialog.h>
#include <tqtextcodec.h>
#include <klocale.h>
#include <tqcombobox.h>

@ -23,7 +23,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialog.h>
#include <klistbox.h>
#include <tdelistbox.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpushbutton.h>

@ -19,10 +19,10 @@
USA
**/
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kprinter.h>

@ -23,9 +23,9 @@
#include <tqguardedptr.h>
#include <kaction.h>
#include <tdeaction.h>
#include <klineedit.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <ktextbrowser.h>
class TDEListView;

@ -21,9 +21,9 @@
#include <config.h>
#endif
#include <kactionclasses.h>
#include <tdeactionclasses.h>
#include <klineedit.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include "klatinchoose.h"
#include "klatingrammar.h"

@ -33,6 +33,6 @@
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kfontdialog.h</includehint>
<includehint>tdefontdialog.h</includehint>
</includehints>
</UI>

@ -29,7 +29,7 @@
#include <tqwhatsthis.h>
//KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kcombobox.h>
#include <tdeconfigdialog.h>
@ -40,8 +40,8 @@
#include <knuminput.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <ktoolbar.h>
#include <ktoolbarbutton.h>
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
//Project includes
#include "klnewstuff.h"
#include "klettres.h"

@ -26,7 +26,7 @@
#include <config.h>
#endif
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include "klettresview.h"
#include "soundfactory.h"

@ -19,7 +19,7 @@
#include <kdebug.h>
#include <ktar.h>
#include <tqdir.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kstandarddirs.h>
#include "klnewstuff.h"

@ -29,7 +29,7 @@
// KDE includes
#include <kapplication.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpushbutton.h>

@ -419,6 +419,6 @@
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

@ -40,7 +40,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <ktempfile.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
// local includes

@ -32,9 +32,9 @@
#include <tqpicture.h>
// KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <tdefiledialog.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/part.h>

@ -33,13 +33,13 @@
#include <tqwhatsthis.h>
// KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kprogress.h>
// local includes

@ -32,9 +32,9 @@
// KDE includes
#include <dcopclient.h>
#include <kactionclasses.h>
#include <tdeactionclasses.h>
#include <kdebug.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kprinter.h>
#include <kprogress.h>
#include <kpushbutton.h>

@ -27,7 +27,7 @@
#include <kdebug.h>
#include <kinputdialog.h>
#include <klineedit.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>

@ -25,7 +25,7 @@
#include "kmplot.h"
#include <kaction.h>
#include <tdeaction.h>
#include <tdeconfig.h>
#include <kedittoolbar.h>
#include <kkeydialog.h>

@ -28,7 +28,7 @@
#include <tdefiledialog.h>
#include <kinputdialog.h>
#include <tdeio/netaccess.h>
#include <klistbox.h>
#include <tdelistbox.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpushbutton.h>

@ -29,7 +29,7 @@
#include <tqwhatsthis.h>
// KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kinputdialog.h>

@ -26,7 +26,7 @@
#ifndef KSLIDERWINDOW_H
#define KSLIDERWINDOW_H
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include "sliderwindow.h"

@ -198,6 +198,6 @@
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>