-rw-r--r-- | libopie/colordialog.h | 1 | ||||
-rw-r--r-- | libopie/colorpopupmenu.h | 1 | ||||
-rw-r--r-- | libopie/oclickablelabel.h | 6 | ||||
-rw-r--r-- | libopie/ocolorbutton.h | 1 | ||||
-rw-r--r-- | libopie/odevicebutton.h | 4 | ||||
-rw-r--r-- | libopie/oprocess.h | 6 | ||||
-rw-r--r-- | libopie/orecurrancewidget.h | 3 | ||||
-rw-r--r-- | libopie/otabbar.h | 4 | ||||
-rw-r--r-- | libopie/otabinfo.h | 2 | ||||
-rw-r--r-- | libopie/otabwidget.h | 2 | ||||
-rw-r--r-- | libopie/oticker.h | 1 | ||||
-rw-r--r-- | libopie/otimepicker.h | 2 | ||||
-rw-r--r-- | libopie/owait.h | 3 | ||||
-rw-r--r-- | libopie/pim/otodoaccess.h | 5 | ||||
-rw-r--r-- | libopie/xmltree.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/xmltree.h | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/otodoaccess.h | 5 |
17 files changed, 41 insertions, 9 deletions
diff --git a/libopie/colordialog.h b/libopie/colordialog.h index 1a6a3fd..c825a83 100644 --- a/libopie/colordialog.h +++ b/libopie/colordialog.h @@ -47,43 +47,44 @@ class OColorDialogPrivate; /* * @class OColorDialog * @brief The OColorDialog class is a copy of QColorDialog for use in Opie. * * OColorDialog is a copy of TrollTech's QColorDialog for use in Opie. The default * build of QT/Embedded used by Opie does not include QColorDialog, so it is provided * here. It is renamed to prevent conflicts in the event the QColorDialog is included * at a later date in QP/E. * * See http://doc.trolltech.com/2.3/qcolordialog.html for complete documentation of * QColorDialog. */ class Q_EXPORT OColorDialog : public QDialog { Q_OBJECT public: static QColor getColor( const QColor&, QWidget *parent=0, const char* name=0 ); static QRgb getRgba( const QRgb&, bool* ok = 0, QWidget *parent=0, const char* name=0 ); private: ~OColorDialog(); + // FIXME add WFlags? -zecke OColorDialog( QWidget* parent=0, const char* name=0, bool modal=FALSE ); void setColor( const QColor& ); QColor color() const; private: void setSelectedAlpha( int ); int selectedAlpha() const; private: OColorDialogPrivate *d; friend class OColorDialogPrivate; private: // Disabled copy constructor and operator= #if defined(Q_DISABLE_COPY) OColorDialog( const OColorDialog & ); OColorDialog& operator=( const OColorDialog & ); #endif }; #endif diff --git a/libopie/colorpopupmenu.h b/libopie/colorpopupmenu.h index 3e90c5e..98d67cc 100644 --- a/libopie/colorpopupmenu.h +++ b/libopie/colorpopupmenu.h @@ -157,48 +157,49 @@ private: * OColorPopupMenu is a derivation of TrollTech's QPopupMenu and provides * a small color selection popup menu which can be attached to another control * such as a toolbar button of menu item. * * The popup menu displays 30 default colors available in a grid, and also * includes an option at the bottom to display a color selection dialog box for * finer color control. */ class OColorPopupMenu : public QPopupMenu { Q_OBJECT public: /** * @fn OColorPopupMenu( const QColor& color, QWidget* parent = 0, const char* name = 0 ) * @brief Object constructor. * * @param color Initial color selected in menu. * @param parent Pointer to parent of this control. * @param name Name of control. * * Constructs a new OColorPopupMenu control with parent, name and initial color selected. */ + // FIXME add Wflags? -zecke OColorPopupMenu( const QColor& color, QWidget* parent = 0, const char* name = 0 ); /** * @fn ~OColorPopupMenu() * @brief Object destructor. */ ~OColorPopupMenu(); private: class ColorPopupMenuPrivate; ColorPopupMenuPrivate *d; QColor m_color; QWidget* colorPanel; QGridLayout* colorLayout; /** * @fn addColor( const QColor& color, int row, int col ) * @brief Adds color selection option to popup menu. * * @param color Color to be displayed in menu. * @param row Row where color is to appear in menu. * @param col Column where color is to appear in menu. * * Adds a color selection option to popup menu. Used internally when diff --git a/libopie/oclickablelabel.h b/libopie/oclickablelabel.h index 6e7a123..f93ade0 100644 --- a/libopie/oclickablelabel.h +++ b/libopie/oclickablelabel.h @@ -28,37 +28,41 @@ class OClickableLabel: public QLabel Q_OBJECT public: OClickableLabel(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); void setToggleButton(bool t); protected: /** @internal */ void mousePressEvent( QMouseEvent *e ); /** @internal */ void mouseReleaseEvent( QMouseEvent *e ); /** @internal */ void mouseMoveEvent( QMouseEvent *e ); public slots: void setOn(bool on); signals: /** * emitted when the labels gets clicked */ void clicked(); /** * emitted when the labels gets toggled - * @param the new new state of the label + * @param on the new new state of the label */ void toggled(bool on); private: bool isToggle : 1; bool isDown : 1; bool textInverted : 1; void showState(bool on); void setInverted(bool on); + + private: + class Private; + Private *d; // private d pointer }; #endif diff --git a/libopie/ocolorbutton.h b/libopie/ocolorbutton.h index 7ff9cd2..6196c83 100644 --- a/libopie/ocolorbutton.h +++ b/libopie/ocolorbutton.h @@ -23,48 +23,49 @@ If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef __OPIE_OCOLORBUTTON_H__ #define __OPIE_OCOLORBUTTON_H__ #include <qpushbutton.h> class OColorButtonPrivate; class QColor; /** * * @short A Button which will show a OColorPopupMenu * @author Robert Griebl ( sandman@handhelds.org ) * @version 1.0 * @see QPushButton */ class OColorButton : public QPushButton { Q_OBJECT public: + // FIXME Wflags? -zecke OColorButton ( QWidget *parent = 0, const QColor & = black, const char *name = 0 ); virtual ~OColorButton ( ); QColor color ( ) const; signals: /** * emitted when a color gets selected */ void colorSelected ( const QColor & ); public slots: virtual void setColor ( const QColor & ); protected slots: /** * @internal */ virtual void updateColor ( const QColor & ); private: OColorButtonPrivate *d; }; diff --git a/libopie/odevicebutton.h b/libopie/odevicebutton.h index cf91bbd..abe27d6 100644 --- a/libopie/odevicebutton.h +++ b/libopie/odevicebutton.h @@ -29,73 +29,77 @@ namespace Opie { class OQCopMessage { public: OQCopMessage ( ); OQCopMessage ( const OQCopMessage © ); OQCopMessage ( const QCString &m_channel, const QCString &message, const QByteArray &args = QByteArray ( )); OQCopMessage &operator = ( const OQCopMessage &assign ); void setChannel ( const QCString &channel ); void setMessage ( const QCString &message ); void setData ( const QByteArray &ba ); QCString channel ( ) const; QCString message ( ) const; QByteArray data ( ) const; bool send ( ); private: void init ( const QCString &m_channel, const QCString &message, const QByteArray &args ); OQCopMessageData *d; + class Private; + Private* data; }; /** * This class represents a physical button on a Qtopia device. A device may * have n "user programmable" buttons, which are number 1..n. The location * and number of buttons will vary from device to device. userText() and pixmap() * may be used to describe this button to the user in help documentation. * * @version 1.0 * @author Trolltech * @short A representation of buttons */ class ODeviceButton { public: ODeviceButton(); virtual ~ODeviceButton(); ushort keycode ( ) const; QString userText ( ) const; QPixmap pixmap ( ) const; OQCopMessage factoryPresetPressedAction ( ) const; OQCopMessage pressedAction ( ) const; OQCopMessage factoryPresetHeldAction ( ) const; OQCopMessage heldAction ( ) const; void setKeycode ( ushort keycode ); void setUserText ( const QString& text ); void setPixmap ( const QPixmap& picture ); void setFactoryPresetPressedAction ( const OQCopMessage& qcopMessage ); void setPressedAction ( const OQCopMessage& qcopMessage ); void setFactoryPresetHeldAction ( const OQCopMessage& qcopMessage ); void setHeldAction ( const OQCopMessage& qcopMessage ); private: ushort m_Keycode; QString m_UserText; QPixmap m_Pixmap; OQCopMessage m_FactoryPresetPressedAction; OQCopMessage m_PressedAction; OQCopMessage m_FactoryPresetHeldAction; OQCopMessage m_HeldAction; + class Private; + Private *d; }; } #endif diff --git a/libopie/oprocess.h b/libopie/oprocess.h index f2853b0..af7cddb 100644 --- a/libopie/oprocess.h +++ b/libopie/oprocess.h @@ -285,54 +285,48 @@ public: * Stop the process (by sending it a signal). * * @param signo The signal to send. The default is SIGTERM. * @return @p true if the signal was delivered successfully. */ virtual bool kill(int signo = SIGTERM); /** @return @p true if the process is (still) considered to be running */ bool isRunning() const; /** Returns the process id of the process. * * If it is called after * the process has exited, it returns the process id of the last * child process that was created by this instance of OProcess. * * Calling it before any child process has been started by this * OProcess instance causes pid() to return 0. **/ pid_t pid() const; /** - * Use pid(). - * @deprecated - */ - pid_t getPid() const { return pid(); } - - /** * Suspend processing of data from stdout of the child process. */ void suspend(); /** * Resume processing of data from stdout of the child process. */ void resume(); /** * @return @p true if the process has already finished and has exited * "voluntarily", ie: it has not been killed by a signal. * * Note that you should check @ref OProcess::exitStatus() to determine * whether the process completed its task successful or not. */ bool normalExit() const; /** * Returns the exit status of the process. * * Please use * @ref OProcess::normalExit() to check whether the process has exited * cleanly (i.e., @ref OProcess::normalExit() returns @p true) before calling diff --git a/libopie/orecurrancewidget.h b/libopie/orecurrancewidget.h index a5d6489..37a57f0 100644 --- a/libopie/orecurrancewidget.h +++ b/libopie/orecurrancewidget.h @@ -63,28 +63,31 @@ private slots: void setupRepeatLabel( int ); void slotWeekLabel(); void slotMonthLabel( int ); void slotChangeStartOfWeek( bool onMonday ); private: void setupNone(); void setupDaily(); void setupWeekly(); void setupMonthly(); void setupYearly(); enum repeatButtons { None, Day, Week, Month, Year }; void init(); void hideExtras(); void showRepeatStuff(); QList<QToolButton> listRTypeButtons; QList<QToolButton> listExtra; QDate start; // only used in one spot... QDate end; repeatButtons currInterval; bool startWeekOnMonday : 1; DateBookMonth *repeatPicker; + + class Private; + Private *d; }; #endif diff --git a/libopie/otabbar.h b/libopie/otabbar.h index 0b353e2..668187b 100644 --- a/libopie/otabbar.h +++ b/libopie/otabbar.h @@ -50,27 +50,31 @@ class OTabBar : public QTabBar public: /** * @fn OTabBar( QWidget *parent = 0, const char *name = 0 ) * @brief Object constructor. * * @param parent Pointer to parent of this control. * @param name Name of control. * * Constructs a new OTabBar control with parent and name. */ // FIXME Allow WFlags? -zecke OTabBar( QWidget * = 0, const char * = 0 ); protected: /** * @fn paintLabel( QPainter* p, const QRect& br , QTab* t, bool has_focus)const * @brief Internal function to draw a tab's label. * * @param p Pointer to QPainter used for drawing. * @param br QRect providing region to draw label in. * @param t Tab to draw label for. * @param has_focus Boolean value not used, retained for compatibility reasons. */ void paintLabel( QPainter *, const QRect &, QTab *, bool ) const; + +private: + class Private; + Private *d; }; #endif diff --git a/libopie/otabinfo.h b/libopie/otabinfo.h index eebaf8e..00bb06d 100644 --- a/libopie/otabinfo.h +++ b/libopie/otabinfo.h @@ -100,33 +100,35 @@ public: * @fn control()const * @brief Returns pointer to widget. */ QWidget *control() const { return c; } /** * @fn icon()const * @brief Returns name of icon file. */ const QString &icon() const { return p; } /** * @fn setIcon( const QString &icon ) * @brief Set icon for tab. * * @param icon QString name of icon file. */ void setIcon( const QString &icon ) { p = icon; } private: int i; QWidget *c; QString p; QString l; + class Private; + Private *d; }; /** * @class OTabInfoList * @brief A list of OTabInfo objects used by OTabWidget. */ typedef QList<OTabInfo> OTabInfoList; #endif diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h index a67fe06..c140c0b 100644 --- a/libopie/otabwidget.h +++ b/libopie/otabwidget.h @@ -200,48 +200,50 @@ public: */ int currentTab(); protected: /** * @fn resizeEvent( QResizeEvent * ) * @brief Reimplemented for internal purposes. */ void resizeEvent( QResizeEvent * ); private: OTabInfoList tabs; OTabInfo *currTab; TabStyle tabBarStyle; TabPosition tabBarPosition; QWidgetStack *tabBarStack; OTabBar *tabBar; QComboBox *tabList; QWidgetStack *widgetStack; + class Private; + Private* d; /** * @fn loadSmooth( const QString &name ) * @brief Loads icon for widget. * * @param name Name of icon image file. */ QPixmap loadSmooth( const QString & ); /** * @fn selectTab( OTabInfo *tab ) * @brief Internal function to select desired widget. * * @param tab Pointer to data for widget. */ void selectTab( OTabInfo * ); /** * @fn setUpLayout() * @brief Internal function to adjust layout. */ void setUpLayout(); diff --git a/libopie/oticker.h b/libopie/oticker.h index c848654..c52e317 100644 --- a/libopie/oticker.h +++ b/libopie/oticker.h @@ -65,48 +65,49 @@ public: * @brief Object destructor. */ ~OTicker(); /*! * @fn setText(const QString& ) * @brief sets text to be displayed * @param text QString text to be displayed. * */ void setText( const QString& text ) ; /*! * @fn setBackgroundColor(QColor color) * @brief sets color of the ticker's background * @param color QColor color to be set. * */ //FIXME const QColor& please -zecke void setBackgroundColor(QColor color); /*! * @fn setForegroundColor(QColor color) * @brief sets color of text * @param color QColor color of text * */ + // FIXME const QColor& please -zecke void setForegroundColor(QColor color); /*! * @fn setFrame(int style) * @brief sets frame style * @param style int Frame style to be see. See Qt::WidgetFlags. * */ void setFrame(int style); /*! * @fn setUpdateTime(int timeout) * @brief sets time of update * @param timeout int time in milliseconds between updates. * */ void setUpdateTime(int timeout); /*! * @fn setScrollLength(int length) * @brief sets amount of scrolling default is 1 * @param length int scroll length. * */ void setScrollLength(int length); signals: /*! diff --git a/libopie/otimepicker.h b/libopie/otimepicker.h index d501a95..6a9e040 100644 --- a/libopie/otimepicker.h +++ b/libopie/otimepicker.h @@ -56,26 +56,28 @@ class OTimePicker: public QWidget { /** * * @short A small dialog to pick a time * @version 1.0 * @author Stefan Eilers */ class OTimePickerDialog: public OTimePickerDialogBase { Q_OBJECT public: OTimePickerDialog ( QWidget* parent = 0, const char* name = NULL, WFlags fl = 0 ); ~OTimePickerDialog() { }; QTime time()const; public slots: void setTime( const QTime& time ); void setHour( const QString& hour ); void setMinute( const QString& minute ); private: QTime m_time; + class Private; + Private* d; }; #endif diff --git a/libopie/owait.h b/libopie/owait.h index 6217e31..cbfc8d6 100644 --- a/libopie/owait.h +++ b/libopie/owait.h @@ -18,57 +18,60 @@ */ #ifndef WAITPOPUP_H #define WAITPOPUP_H #include <qdialog.h> #include <qpixmap.h> #include <qlabel.h> #include <qtimer.h> /** * This class displays a animated waiting icon in the middle of the screen. * * @short modal hour glass dialog * @see QDialog * @author Maximilian Reiß */ class OWait : public QDialog { Q_OBJECT public: + // FIXME Wflags -zecke? OWait(QWidget *parent=0,const char* name=0, bool dispIcon=TRUE); ~OWait(); /** * reimplemented for control reasons */ void show(); /** * Set the time before the icon will be automaticly hidden * The timer will be started once the widget will be shown. * @param length - time in seconds */ void setTimerLength( int length ); public slots: /** * reimplemented for control reasons */ void hide(); private: void timerEvent( QTimerEvent * ) ; void paintEvent( QPaintEvent * ); QPixmap m_pix; QLabel *m_lb; QTimer *m_waitTimer; int m_timerLength; int m_aniSize; + class Private; + Private *d; }; #endif diff --git a/libopie/pim/otodoaccess.h b/libopie/pim/otodoaccess.h index 2bb87dc..a626731 100644 --- a/libopie/pim/otodoaccess.h +++ b/libopie/pim/otodoaccess.h @@ -55,33 +55,36 @@ public: * return overdue OTodos */ List overDue(); /** * */ List sorted( bool ascending, int sortOrder, int sortFilter, int cat ); /** * merge a list of OTodos into * the resource */ void mergeWith( const QValueList<OTodo>& ); /** * delete all already completed items */ void removeAllCompleted(); signals: /** * if the OTodoAccess was changed */ - void signalChanged( const OTodoAccess* ); + void changed( const OTodoAccess* ); + void changed( const OTodoAccess*, int uid ); + void added( const OTodoAccess*, int uid ); + void removed( const OTodoAccess*, int uid ); private: int m_cat; OTodoAccessBackend* m_todoBackEnd; class OTodoAccessPrivate; OTodoAccessPrivate* d; }; #endif diff --git a/libopie/xmltree.h b/libopie/xmltree.h index 4a6b6d9..4b6bdfa 100644 --- a/libopie/xmltree.h +++ b/libopie/xmltree.h @@ -89,29 +89,31 @@ public: QString attribute( const QString & ) const; void setAttribute( const QString &attr, const QString &value ); void save( QTextStream &stream, uint indent = 0 ); XMLElement *namedItem( const QString &name ); XMLElement *clone() const; static XMLElement *load( const QString &fileName ); private: QString m_tag; QString m_value; AttributeMap m_attributes; XMLElement *m_parent; XMLElement *m_next; XMLElement *m_prev; XMLElement *m_first; XMLElement *m_last; XMLElement( const XMLElement &rhs ); XMLElement &operator=( const XMLElement &rhs ); + class Private; + Private* d; }; } // namespace Opie #endif diff --git a/libopie2/opiecore/xmltree.h b/libopie2/opiecore/xmltree.h index 4a6b6d9..4b6bdfa 100644 --- a/libopie2/opiecore/xmltree.h +++ b/libopie2/opiecore/xmltree.h @@ -89,29 +89,31 @@ public: QString attribute( const QString & ) const; void setAttribute( const QString &attr, const QString &value ); void save( QTextStream &stream, uint indent = 0 ); XMLElement *namedItem( const QString &name ); XMLElement *clone() const; static XMLElement *load( const QString &fileName ); private: QString m_tag; QString m_value; AttributeMap m_attributes; XMLElement *m_parent; XMLElement *m_next; XMLElement *m_prev; XMLElement *m_first; XMLElement *m_last; XMLElement( const XMLElement &rhs ); XMLElement &operator=( const XMLElement &rhs ); + class Private; + Private* d; }; } // namespace Opie #endif diff --git a/libopie2/opiepim/core/otodoaccess.h b/libopie2/opiepim/core/otodoaccess.h index 2bb87dc..a626731 100644 --- a/libopie2/opiepim/core/otodoaccess.h +++ b/libopie2/opiepim/core/otodoaccess.h @@ -55,33 +55,36 @@ public: * return overdue OTodos */ List overDue(); /** * */ List sorted( bool ascending, int sortOrder, int sortFilter, int cat ); /** * merge a list of OTodos into * the resource */ void mergeWith( const QValueList<OTodo>& ); /** * delete all already completed items */ void removeAllCompleted(); signals: /** * if the OTodoAccess was changed */ - void signalChanged( const OTodoAccess* ); + void changed( const OTodoAccess* ); + void changed( const OTodoAccess*, int uid ); + void added( const OTodoAccess*, int uid ); + void removed( const OTodoAccess*, int uid ); private: int m_cat; OTodoAccessBackend* m_todoBackEnd; class OTodoAccessPrivate; OTodoAccessPrivate* d; }; #endif |