From kde-commits Thu Sep 30 23:44:24 2010 From: Sergio Luis Martins Date: Thu, 30 Sep 2010 23:44:24 +0000 To: kde-commits Subject: KDE/kdepim/calendarsupport Message-Id: <20100930234424.2BCEFAC894 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=128589031031500 SVN commit 1181422 by smartins: Make "QWidget *parent" the last function argument so it's consistent with other signatures we have. M +19 -21 attachmenthandler.cpp M +33 -27 attachmenthandler.h --- trunk/KDE/kdepim/calendarsupport/attachmenthandler.cpp #1181421:1181422 @@ -45,9 +45,9 @@ namespace CalendarSupport { -Attachment::Ptr AttachmentHandler::find( QWidget *parent, - const QString &attachmentName, - const Incidence::Ptr &incidence ) +Attachment::Ptr AttachmentHandler::find( const QString &attachmentName, + const Incidence::Ptr &incidence, + QWidget *parent ) { if ( !incidence ) { return Attachment::Ptr(); @@ -85,9 +85,8 @@ return a; } -Attachment::Ptr AttachmentHandler::find( QWidget *parent, - const QString &attachmentName, - onst QString &uid ) +Attachment::Ptr AttachmentHandler::find( const QString &attachmentName, + const QString &uid, QWidget *parent ) { if ( uid.isEmpty() ) { return Attachment::Ptr(); @@ -108,9 +107,8 @@ return find( parent, attachmentName, incidence ); } -Attachment::Ptr AttachmentHandler::find( QWidget *parent, - const QString &attachmentName, - ScheduleMessage *message ) +Attachment::Ptr AttachmentHandler::find( const QString &attachmentName, + ScheduleMessage *message, QWidget *parent ) { if ( !message ) { return Attachment::Ptr(); @@ -156,7 +154,7 @@ return url; } -bool AttachmentHandler::view( QWidget *parent, const Attachment::Ptr &attachment ) +bool AttachmentHandler::view( const Attachment::Ptr &attachment, QWidget *parent ) { if ( !attachment ) { return false; @@ -182,24 +180,24 @@ return stat; } -bool AttachmentHandler::view( QWidget *parent, const QString &attachmentName, - const Incidence::Ptr &incidence ) +bool AttachmentHandler::view( const QString &attachmentName, + const Incidence::Ptr &incidence, QWidget *parent ) { return view( parent, find( parent, attachmentName, incidence ) ); } -bool AttachmentHandler::view( QWidget *parent, const QString &attachmentName, const QString &uid ) +bool AttachmentHandler::view( const QString &attachmentName, const QString &uid, QWidget *parent ) { return view( parent, find( parent, attachmentName, uid ) ); } -bool AttachmentHandler::view( QWidget *parent, const QString &attachmentName, - ScheduleMessage *message ) +bool AttachmentHandler::view( const QString &attachmentName, + ScheduleMessage *message, QWidget *parent ) { return view( parent, find( parent, attachmentName, message ) ); } -bool AttachmentHandler::saveAs( QWidget *parent, const Attachment::Ptr &attachment ) +bool AttachmentHandler::saveAs( const Attachment::Ptr &attachment, QWidget *parent ) { // get the saveas file name QString saveAsFile = KFileDialog::getSaveFileName( attachment->label(), QString(), parent, @@ -237,19 +235,19 @@ return stat; } -bool AttachmentHandler::saveAs( QWidget *parent, const QString &attachmentName, - const Incidence::Ptr &incidence ) +bool AttachmentHandler::saveAs( const QString &attachmentName, + const Incidence::Ptr &incidence, QWidget *parent ) { return saveAs( parent, find( parent, attachmentName, incidence ) ); } -bool AttachmentHandler::saveAs( QWidget *parent, const QString &attachmentName, const QString &uid ) +bool AttachmentHandler::saveAs( const QString &attachmentName, const QString &uid, QWidget *parent ) { return saveAs( parent, find( parent, attachmentName, uid ) ); } -bool AttachmentHandler::saveAs( QWidget *parent, const QString &attachmentName, - ScheduleMessage *message ) +bool AttachmentHandler::saveAs( const QString &attachmentName, + ScheduleMessage *message, QWidget *parent ) { return saveAs( parent, find( parent, attachmentName, message ) ); } --- trunk/KDE/kdepim/calendarsupport/attachmenthandler.h #1181421:1181422 @@ -49,133 +49,139 @@ /** Finds the attachment in the user's calendar, by @p attachmentName and @p incidence. - @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param incidence is a pointer to a valid Incidence object containing the attachment. + @param parent is the parent widget for the dialogs used in this function. @return a pointer to the Attachment object located; 0 if no such attachment could be found. */ - KCalCore::Attachment::Ptr find( QWidget *parent, const QString &attachmentName, - const KCalCore::Incidence::Ptr &incidence ); + KCalCore::Attachment::Ptr find( const QString &attachmentName, + const KCalCore::Incidence::Ptr &incidence, + QWidget *parent ); /** Finds the attachment in the user's calendar, by @p attachmentName and a scheduler message; in other words, this function is intended to retrieve attachments from calendar invitations. - @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param message is a pointer to a valid ScheduleMessage object containing the attachment. + @param parent is the parent widget for the dialogs used in this function. @return a pointer to the Attachment object located; 0 if no such attachment could be found. */ - KCalCore::Attachment::Ptr find( QWidget *parent, const QString &attachmentName, - KCalCore::ScheduleMessage *message ); + KCalCore::Attachment::Ptr find( const QString &attachmentName, + KCalCore::ScheduleMessage *message, + QWidget *parent ); /** Finds the attachment in the user's calendar, by @p attachmentName and @p uid. - @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param uid is a QString containing a UID of the incidence containing the attachment. + @param parent is the parent widget for the dialogs used in this function. @return a pointer to the Attachment object located; 0 if no such attachment could be found. */ - KCalCore::Attachment::Ptr find( QWidget *parent, const QString &attachmentName, - const QString &uid ); + KCalCore::Attachment::Ptr find( const QString &attachmentName, + const QString &uid, + QWidget *parent ); /** Launches a viewer on the specified attachment. + @param attachment is a pointer to a valid Attachment object. @param parent is the parent widget for the dialogs used in this function. - @param attachment is a pointer to a valid Attachment object. @return true if the viewer program successfully launched; false otherwise. */ - bool view( QWidget *parent, const KCalCore::Attachment::Ptr &attachment ); + bool view( const KCalCore::Attachment::Ptr &attachment, + QWidget *parent ); /** Launches a viewer on the specified attachment. - @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param incidence is a pointer to a valid Incidence object containing the attachment. + @param parent is the parent widget for the dialogs used in this function. @return true if the attachment could be found and the viewer program successfully launched; false otherwise. */ - bool view( QWidget *parent, const QString &attachmentName, - const KCalCore::Incidence::Ptr &incidence ); + bool view( const QString &attachmentName, + const KCalCore::Incidence::Ptr &incidence, + QWidget *parent ); /** Launches a viewer on the specified attachment. - @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param uid is a QString containing a UID of the incidence containing the attachment. + @param parent is the parent widget for the dialogs used in this function. @return true if the attachment could be found and the viewer program successfully launched; false otherwise. */ - bool view( QWidget *parent, const QString &attachmentName, const QString &uid ); + bool view( const QString &attachmentName, const QString &uid, QWidget *parent ); /** Launches a viewer on the specified attachment. - @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param message is a pointer to a valid ScheduleMessage object containing the attachment. + @param parent is the parent widget for the dialogs used in this function. @return true if the attachment could be found and the viewer program successfully launched; false otherwise. */ - bool view( QWidget *parent, const QString &attachmentName, KCalCore::ScheduleMessage *message ); + bool view( const QString &attachmentName, KCalCore::ScheduleMessage *message, QWidget *parent ); /** Saves the specified attachment to a file of the user's choice. + @param attachment is a pointer to a valid Attachment object. @param parent is the parent widget for the dialogs used in this function. - @param attachment is a pointer to a valid Attachment object. @return true if the save operation was successful; false otherwise. */ - bool saveAs( QWidget *parent, const KCalCore::Attachment::Ptr &attachment ); + bool saveAs( const KCalCore::Attachment::Ptr &attachment, QWidget *parent ); /** Saves the specified attachment to a file of the user's choice. - @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param incidence is a pointer to a valid Incidence object containing the attachment. + @param parent is the parent widget for the dialogs used in this function. @return true if the attachment could be found and the save operation was successful; false otherwise. */ - bool saveAs( QWidget *parent, const QString &attachmentName, - const KCalCore::Incidence::Ptr &incidence ); + bool saveAs( const QString &attachmentName, + const KCalCore::Incidence::Ptr &incidence, + QWidget *parent ); /** Saves the specified attachment to a file of the user's choice. - @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param uid is a QString containing a UID of the incidence containing the attachment. + @param parent is the parent widget for the dialogs used in this function. @return true if the attachment could be found and the save operation was successful; false otherwise. */ - bool saveAs( QWidget *parent, const QString &attachmentName, const QString &uid ); + bool saveAs( const QString &attachmentName, const QString &uid, QWidget *parent ); /** Saves the specified attachment to a file of the user's choice. - @param parent is the parent widget for the dialogs used in this function. @param attachmentName is the name of the attachment @param message is a pointer to a valid ScheduleMessage object containing the attachment. + @param parent is the parent widget for the dialogs used in this function. @return true if the attachment could be found and the save operation was successful; false otherwise. */ - bool saveAs( QWidget *parent, const QString &attachmentName, KCalCore::ScheduleMessage *message ); + bool saveAs( const QString &attachmentName, KCalCore::ScheduleMessage *message, QWidget *parent ); } }