[Kstars-devel] KDE/kdeedu/kstars/kstars
Jason Harris
kstars at 30doradus.org
Mon Jan 28 17:59:13 CET 2008
SVN commit 767729 by harris:
Applying EBN fixes from Mederic. Thanks for the patch!
CCMAIL: kstars-devel at kde.org
M +1 -1 finddialog.cpp
M +1 -1 indiproperty.h
M +3 -3 indistd.cpp
M +2 -2 ksfilereader.cpp
M +1 -1 kstarsdata.cpp
M +2 -1 skycomponents/constellationboundary.cpp
M +2 -1 skycomponents/constellationboundarylines.cpp
M +2 -1 skycomponents/coordinategrid.cpp
M +1 -1 skycomponents/highpmstarlist.cpp
M +0 -1 skycomponents/horizoncomponent.cpp
M +2 -2 skycomponents/linelistcomponent.h
M +1 -1 skycomponents/linelistindex.cpp
M +1 -1 skycomponents/linelistlabel.cpp
M +1 -1 skycomponents/linelistlabel.h
M +2 -2 skycomponents/milkyway.cpp
M +1 -2 skycomponents/noprecessindex.cpp
M +2 -2 skycomponents/polylistindex.cpp
M +1 -0 skycomponents/polylistindex.h
M +2 -1 skycomponents/skiplistindex.cpp
M +2 -1 skycomponents/skylabeler.cpp
M +2 -2 skycomponents/skylabeler.h
M +4 -5 skycomponents/skymesh.cpp
M +2 -2 skycomponents/skymesh.h
M +4 -0 skycomponents/typedef.h
M +2 -2 tools/avtplotwidget.cpp
M +4 -4 tools/modcalcdaylength.cpp
M +1 -1 tools/modcalcjd.cpp
M +1 -1 tools/modcalcsidtime.cpp
M +1 -1 tools/scriptbuilder.cpp
M +1 -1 tools/scriptfunction.cpp
M +2 -3 widgets/fovwidget.cpp
--- trunk/KDE/kdeedu/kstars/kstars/finddialog.cpp #767728:767729
@@ -205,7 +205,7 @@
initSelection();
//Select the first item in the list that begins with the filter string
- QStringList mItems = fModel->stringList().filter( QRegExp( "^"+ui->SearchBox->text(), Qt::CaseInsensitive ) );
+ QStringList mItems = fModel->stringList().filter( QRegExp( '^'+ui->SearchBox->text(), Qt::CaseInsensitive ) );
mItems.sort();
if ( mItems.size() ) {
--- trunk/KDE/kdeedu/kstars/kstars/indiproperty.h #767728:767729
@@ -45,7 +45,7 @@
QString label; /* property label */
INDI_G *pg; /* parent group */
- INDIStdProperty *indistd; /* Assosciated std routines class */
+ INDIStdProperty *indistd; /* Associated std routines class */
double timeout; /* timeout, seconds */
PState state; /* state light code */
KLed *light; /* state LED */
--- trunk/KDE/kdeedu/kstars/kstars/indistd.cpp #767728:767729
@@ -121,10 +121,10 @@
QString currentDir = Options::fitsSaveDirectory();
int fd, nr, n=0;
- if (currentDir.endsWith("/"))
+ if (currentDir.endsWith('/'))
currentDir.truncate(sizeof(currentDir)-1);
- QString filename(currentDir + "/");
+ QString filename(currentDir + '/');
streamWindow->close();
@@ -171,7 +171,7 @@
}
else
{
- filename += QString("file_") + ts + "." + dataFormat;
+ filename += QString("file_") + ts + '.' + dataFormat;
//filename = currentDir + QString("/%1_%2_%3.fits").arg(seqPrefix).arg(seqCount, 2).arg(ts);
//strftime (ts, sizeof(ts), "/file-%Y-%m-%dT%H:%M:%S.", tp);
//strncat(filename, ts, sizeof(ts));
--- trunk/KDE/kdeedu/kstars/kstars/ksfilereader.cpp #767728:767729
@@ -15,6 +15,8 @@
* *
***************************************************************************/
+#include "ksfilereader.h"
+
#include <QApplication>
#include <QObject>
#include <QFile>
@@ -24,8 +26,6 @@
#include "kstarsdata.h"
#include "ksutils.h"
-#include "ksfilereader.h"
-
#ifndef MAXUINT
#define MAXUINT (~0)
#endif
--- trunk/KDE/kdeedu/kstars/kstars/kstarsdata.cpp #767728:767729
@@ -991,7 +991,7 @@
line.replace( "bool:", "");
//find a dbus line and extract the function name and its arguments
- //The function name starts after the last occurance of "org.kde.kstars."
+ //The function name starts after the last occurrence of "org.kde.kstars."
//or perhaps "org.kde.kstars.SimClock.".
if ( line.startsWith(QString("dbus-send")) ) {
QString funcprefix = "org.kde.kstars.SimClock.";
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/constellationboundary.cpp #767728:767729
@@ -15,6 +15,8 @@
* *
***************************************************************************/
+#include "constellationboundary.h"
+
#include <stdio.h>
#include <kdebug.h>
@@ -28,7 +30,6 @@
#include "skyobject.h"
#include "polylist.h"
-#include "constellationboundary.h"
#include "skymesh.h"
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/constellationboundarylines.cpp #767728:767729
@@ -15,6 +15,8 @@
* *
***************************************************************************/
+#include "constellationboundarylines.h"
+
#include <stdio.h>
#include <QPen>
@@ -35,7 +37,6 @@
#include "linelist.h"
#include "polylist.h"
#include "linelistindex.h"
-#include "constellationboundarylines.h"
#include "constellationboundary.h"
#include "skymesh.h"
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/coordinategrid.cpp #767728:767729
@@ -15,6 +15,8 @@
* *
***************************************************************************/
+#include "coordinategrid.h"
+
#include <QPen>
#include <QBrush>
#include <QColor>
@@ -23,7 +25,6 @@
#include "Options.h"
#include "kstarsdata.h"
#include "skymap.h"
-#include "coordinategrid.h"
#include "linelist.h"
#include "dms.h"
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/highpmstarlist.cpp #767728:767729
@@ -15,8 +15,8 @@
* *
***************************************************************************/
+#include "highpmstarlist.h"
#include "starobject.h"
-#include "highpmstarlist.h"
#include "kstarsdatetime.h"
#include "skymesh.h"
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/horizoncomponent.cpp #767728:767729
@@ -27,7 +27,6 @@
#include "skymap.h"
#include "skypoint.h"
#include "dms.h"
-#include "Options.h"
#include "skylabeler.h"
#define NCIRCLE 360 //number of points used to define equator, ecliptic and horizon
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/linelistcomponent.h #767728:767729
@@ -113,14 +113,14 @@
/* @short This routine does two things at once. It returns the QPointF
- * coresponding to pointList[i] and also computes the angle using
+ * corresponding to pointList[i] and also computes the angle using
* pointList[i] and pointList[i-1] therefore you MUST ensure that:
*
* 1 <= i < pointList.size().
*/
QPointF angleAt( SkyMap* map, int i, double *angle );
- /* @short Tries to draw the label at the position and angle specfied. If
+ /* @short Tries to draw the label at the position and angle specified. If
* the label would overlap an existing label it is not drawn and we
* return false, otherwise the label is drawn, its position is marked
* and we return true.
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/linelistindex.cpp #767728:767729
@@ -31,6 +31,7 @@
*
****************************************************************************/
+#include "linelistindex.h"
#include <QBrush>
#include <QPainter>
@@ -46,7 +47,6 @@
#include "skymesh.h"
#include "linelist.h"
-#include "linelistindex.h"
LineListIndex::LineListIndex( SkyComponent *parent, const QString& name )
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/linelistlabel.cpp #767728:767729
@@ -16,11 +16,11 @@
***************************************************************************/
+#include "linelistlabel.h"
#include "Options.h"
#include "skypoint.h"
#include "skymap.h"
#include "kstarsdata.h"
-#include "linelistlabel.h"
#include "skylabeler.h"
#include "linelist.h"
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/linelistlabel.h #767728:767729
@@ -69,7 +69,7 @@
float m_farLeft, m_farRight, m_farTop, m_farBot;
/* @short This routine does two things at once. It returns the QPointF
- * coresponding to pointList[i] and also computes the angle using
+ * corresponding to pointList[i] and also computes the angle using
* pointList[i] and pointList[i-1] therefore you MUST ensure that:
*
* 1 <= i < pointList.size().
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/milkyway.cpp #767728:767729
@@ -15,6 +15,8 @@
* *
***************************************************************************/
+#include "milkyway.h"
+
#include <QList>
#include <QPointF>
#include <QPolygonF>
@@ -31,9 +33,7 @@
#include "skymesh.h"
-#include "milkyway.h"
-
MilkyWay::MilkyWay( SkyComponent *parent ) :
SkipListIndex( parent, i18n("Milky Way") )
{}
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/noprecessindex.cpp #767728:767729
@@ -15,11 +15,10 @@
* *
***************************************************************************/
-
+#include "noprecessindex.h"
#include "Options.h"
#include "skypoint.h"
#include "kstarsdata.h"
-#include "noprecessindex.h"
#include "linelist.h"
NoPrecessIndex::NoPrecessIndex( SkyComponent *parent, const QString& name )
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/polylistindex.cpp #767728:767729
@@ -15,6 +15,8 @@
* *
***************************************************************************/
+#include "polylistindex.h"
+
#include <stdio.h>
#include <kdebug.h>
@@ -23,13 +25,11 @@
#include "Options.h"
#include "kstars.h"
-#include "kstarsdata.h"
#include "ksutils.h"
#include "skyobject.h"
#include "ksfilereader.h"
#include "polylist.h"
-#include "polylistindex.h"
#include "skymesh.h"
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/polylistindex.h #767728:767729
@@ -18,6 +18,7 @@
#ifndef POLYLISTINDEX_H
#define POLYLISTINDEX_H
+#include "kstarsdata.h"
#include "skycomposite.h"
#include <QHash>
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/skiplistindex.cpp #767728:767729
@@ -15,6 +15,8 @@
* *
***************************************************************************/
+#include "skiplistindex.h"
+
#include <QList>
#include <QPointF>
@@ -22,7 +24,6 @@
#include "skymesh.h"
#include "skiplist.h"
-#include "skiplistindex.h"
SkipListIndex::SkipListIndex( SkyComponent *parent, const QString& name )
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/skylabeler.cpp #767728:767729
@@ -15,13 +15,14 @@
* *
***************************************************************************/
+#include "skylabeler.h"
+
#include <stdio.h>
#include <QPainter>
#include "Options.h"
#include "kstarsdata.h" // MINZOOM
-#include "skylabeler.h"
#include "skymap.h"
//---------------------------------------------------------------------------//
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/skylabeler.h #767728:767729
@@ -96,7 +96,7 @@
* visible. This is why the addLabel() and draw() routines were created.
* They allow us to time-shift the drawing of labels and thus gives us control
* over their priority. The drawLabel() routines are still available but are
- * not being used. The addLabel() routines adds a label to a specfic buffer.
+ * not being used. The addLabel() routines adds a label to a specific buffer.
* Each type of label has its own buffer which lets us control the font and
* color as well as the priority. The priority is now manually set in the
* draw() routine by adjusting the order in which the various buffers get
@@ -215,7 +215,7 @@
float *right, float *top, float *bot );
/**
- * @short Tries to draw the text at the position and angle specfied. If
+ * @short Tries to draw the text at the position and angle specified. If
* the label would overlap an existing label it is not drawn and we
* return false, otherwise the label is drawn, its position is marked
* and we return true.
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/skymesh.cpp #767728:767729
@@ -15,20 +15,19 @@
* *
***************************************************************************/
-#include <QHash>
-#include <QPolygonF>
-#include <QPointF>
-
#include "skypoint.h"
#include "skymesh.h"
#include "starobject.h"
#include "ksnumbers.h"
+#include <QHash>
+#include <QPolygonF>
+#include <QPointF>
+
// these are just for the draw routine:
#include <QPainter>
#include "kstarsdata.h"
#include "skymap.h"
-#include "kstarsdata.h"
SkyMesh* SkyMesh::pinstance = 0;
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/skymesh.h #767728:767729
@@ -70,7 +70,7 @@
* circle. Then use a MeshIterator to iterate over the indices of the visible
* trixels. Look up each index in the top level QHash or QList data structure
* and the union of all the elements of the QList's returned will contain all
- * the objects visible in the circle in the sky specfied in the aperture()
+ * the objects visible in the circle in the sky specified in the aperture()
* call.
*
* The drawID is used for extended objects that may be covered by more than
@@ -171,7 +171,7 @@
*/
void index( const QPointF &p1, const QPointF &p2, const QPointF &p3 );
- /* @short Finds the trixels needed to cover the quadrilateral specifed
+ /* @short Finds the trixels needed to cover the quadrilateral specified
* by the four QPointF's.
*/
void index( const QPointF &p1, const QPointF &p2, const QPointF &p3,
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/typedef.h #767728:767729
@@ -25,6 +25,9 @@
* -- James B. Bowlin
*/
+#ifndef TYPEDEF_H_
+#define TYPEDEF_H_
+
#include <QHash>
#include <QVector>
@@ -45,3 +48,4 @@
typedef QHash< Trixel, LineListList*> LineListHash; // Wanted LineListIndex but
// that is used by a class.
+#endif
--- trunk/KDE/kdeedu/kstars/kstars/tools/avtplotwidget.cpp #767728:767729
@@ -15,6 +15,8 @@
* *
***************************************************************************/
+#include "avtplotwidget.h"
+
#include <QWidget>
#include <QMouseEvent>
#include <QPainter>
@@ -24,8 +26,6 @@
#include <KPlotObject>
#include <kdebug.h>
-#include "avtplotwidget.h"
-
AVTPlotWidget::AVTPlotWidget( QWidget *parent )
: KPlotWidget( parent )
{
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalcdaylength.cpp #767728:767729
@@ -202,10 +202,10 @@
lunarphaseString = Moon->phaseName()+" ("+QString::number( int( 100*Moon->illum() ) )+"%)";
//Fix length of Az strings
- if ( srAz.Degrees() < 100.0 ) srAzString = " "+srAzString;
- if ( ssAz.Degrees() < 100.0 ) ssAzString = " "+ssAzString;
- if ( mrAz.Degrees() < 100.0 ) mrAzString = " "+mrAzString;
- if ( msAz.Degrees() < 100.0 ) msAzString = " "+msAzString;
+ if ( srAz.Degrees() < 100.0 ) srAzString = ' '+srAzString;
+ if ( ssAz.Degrees() < 100.0 ) ssAzString = ' '+ssAzString;
+ if ( mrAz.Degrees() < 100.0 ) mrAzString = ' '+mrAzString;
+ if ( msAz.Degrees() < 100.0 ) msAzString = ' '+msAzString;
delete num;
delete Sun;
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalcjd.cpp #767728:767729
@@ -166,7 +166,7 @@
//Try to parse the second field as a time
if ( data.size() > 1 ) {
QString s = data[1];
- if ( s.length() == 4 ) s = "0"+s;
+ if ( s.length() == 4 ) s = '0'+s;
QTime t = QTime::fromString( s );
if ( t.isValid() ) dt.setTime( t );
}
--- trunk/KDE/kdeedu/kstars/kstars/tools/modcalcsidtime.cpp #767728:767729
@@ -288,7 +288,7 @@
//Parse one of the fields as the time
foreach ( QString s, fields ) {
if ( s.contains(':') ) {
- if ( s.length() == 4 ) s = "0"+s;
+ if ( s.length() == 4 ) s = '0'+s;
inTime = QTime::fromString( s );
if ( inTime.isValid() ) break;
}
--- trunk/KDE/kdeedu/kstars/kstars/tools/scriptbuilder.cpp #767728:767729
@@ -533,7 +533,7 @@
#endif
- //disbale some buttons
+ //disable some buttons
sb->CopyButton->setEnabled( false );
sb->AddButton->setEnabled( false );
sb->RemoveButton->setEnabled( false );
--- trunk/KDE/kdeedu/kstars/kstars/tools/scriptfunction.cpp #767728:767729
@@ -203,7 +203,7 @@
}
// Write DBus style prototype compatible with dbus-send format
- out += " " + ArgDBusType[i] + ":" + value;
+ out += ' ' + ArgDBusType[i] + ':' + value;
++i;
}
--- trunk/KDE/kdeedu/kstars/kstars/widgets/fovwidget.cpp #767728:767729
@@ -15,13 +15,12 @@
* *
***************************************************************************/
-#include <QPaintEvent>
-#include <QPainter>
-
#include "fovwidget.h"
#include "fovdialog.h"
#include "fov.h"
+#include <QPaintEvent>
+#include <QPainter>
FOVWidget::FOVWidget( QWidget *parent ) : QFrame( parent ), m_FOV(0)
{}
More information about the Kstars-devel
mailing list