Fixed "extra qualification" syntax errors.
--- a/calendarengines/caldav/inc/caldavutils.h Sun Mar 14 13:09:26 2010 +0000
+++ b/calendarengines/caldav/inc/caldavutils.h Sun Mar 28 16:36:17 2010 +0100
@@ -234,7 +234,7 @@
static void GetFileName(const TDesC8 &aIcs, TDes8 &aUrl);
static HBufC8* EnsureSlashL(HBufC8* aIn);
- static HBufC8* CalDavUtils::EnsureSlashL(const TDesC8 &aIn);
+ static HBufC8* EnsureSlashL(const TDesC8 &aIn);
private:
--- a/calendarengines/calenlauncher/inc/CalenLauncherImpl.h Sun Mar 14 13:09:26 2010 +0000
+++ b/calendarengines/calenlauncher/inc/CalenLauncherImpl.h Sun Mar 28 16:36:17 2010 +0100
@@ -37,7 +37,7 @@
* Creates an instance of CCalenLauncherImpl and places it
* on the cleanup stack before passing ownership to the caller.
*/
- static CCalenLauncherImpl* CCalenLauncherImpl::NewLC();
+ static CCalenLauncherImpl* NewLC();
/**
* Class destructor
--- a/calendarengines/versit2/inc/ICalProperty.h Sun Mar 14 13:09:26 2010 +0000
+++ b/calendarengines/versit2/inc/ICalProperty.h Sun Mar 28 16:36:17 2010 +0100
@@ -55,7 +55,7 @@
IMPORT_C const RPointerArray<CICalValue>& Values() const;
IMPORT_C const CICalPropertyParam* FindParam(const TDesC& aType) const;
- CICalPropertyParam& CICalProperty::AddPropertyParamL();
+ CICalPropertyParam& AddPropertyParamL();
void RemovePropertyParamL(const CICalPropertyParam& aParam);
void ExternalizeL(CICalContentLineWriter& aWriter);
--- a/calendarui/caldav/inc/caldavsettingitems.h Sun Mar 14 13:09:26 2010 +0000
+++ b/calendarui/caldav/inc/caldavsettingitems.h Sun Mar 28 16:36:17 2010 +0100
@@ -132,7 +132,7 @@
{
public:
static CCalDavAccessPointSettingItem*
- CCalDavAccessPointSettingItem::NewL( TInt aSettingId, CCalDavSession* aSession, const TDesC &aCalendar);
+ NewL( TInt aSettingId, CCalDavSession* aSession, const TDesC &aCalendar);
~CCalDavAccessPointSettingItem();
private:
CCalDavAccessPointSettingItem ( TInt aSettingId, CCalDavSession* aSession);
--- a/calendarui/controller/inc/calenstate.h Sun Mar 14 13:09:26 2010 +0000
+++ b/calendarui/controller/inc/calenstate.h Sun Mar 28 16:36:17 2010 +0100
@@ -62,7 +62,7 @@
/**
* Interface to get the current state
*/
- CCalenStateMachine::TCalenStateIndex CCalenState::GetCurrentState(
+ CCalenStateMachine::TCalenStateIndex GetCurrentState(
CCalenStateMachine& aStateMachine);
/**
--- a/calendarui/views/inc/calendayview.h Sun Mar 14 13:09:26 2010 +0000
+++ b/calendarui/views/inc/calendayview.h Sun Mar 28 16:36:17 2010 +0100
@@ -63,7 +63,7 @@
virtual void CancelPopulation();
virtual TCyclePosition CyclePosition() const;
virtual const TDesC& LocalisedViewNameL( CCalenView::TViewName aViewName );
- virtual CGulIcon* CCalenDayView::ViewIconL() const;
+ virtual CGulIcon* ViewIconL() const;
protected: // From CCalenNativeView
/**
--- a/calendarui/views/inc/calendummyview.h Sun Mar 14 13:09:26 2010 +0000
+++ b/calendarui/views/inc/calendummyview.h Sun Mar 28 16:36:17 2010 +0100
@@ -75,7 +75,7 @@
/**
* Returns view icon
*/
- virtual CGulIcon* CCalenDummyView::ViewIconL() const;
+ virtual CGulIcon* ViewIconL() const;
protected: // From CCalenNativeView
@@ -158,4 +158,4 @@
TPopulationStep iPopulationStep;
};
-#endif // CALENDUMMYVIEW_H
\ No newline at end of file
+#endif // CALENDUMMYVIEW_H
--- a/calendarui/views/inc/caleneventview.h Sun Mar 14 13:09:26 2010 +0000
+++ b/calendarui/views/inc/caleneventview.h Sun Mar 28 16:36:17 2010 +0100
@@ -52,7 +52,7 @@
virtual void CancelPopulation();
virtual TCyclePosition CyclePosition() const;
virtual const TDesC& LocalisedViewNameL( CCalenView::TViewName aViewName );
- virtual CGulIcon* CCalenEventView::ViewIconL() const;
+ virtual CGulIcon* ViewIconL() const;
protected: // From CCalenNativeView
/**
--- a/calendarui/views/inc/calenmissedalarmsview.h Sun Mar 14 13:09:26 2010 +0000
+++ b/calendarui/views/inc/calenmissedalarmsview.h Sun Mar 28 16:36:17 2010 +0100
@@ -81,7 +81,7 @@
/**
* Returns view icon
*/
- virtual CGulIcon* CCalenMissedAlarmsView::ViewIconL() const;
+ virtual CGulIcon* ViewIconL() const;
protected: // From CCalenNativeView
@@ -208,4 +208,4 @@
TInt iHighlightedRowNumber;
};
-#endif // CALENMISSEDALARMSVIEW_H
\ No newline at end of file
+#endif // CALENMISSEDALARMSVIEW_H
--- a/calendarui/views/inc/calenmissedeventview.h Sun Mar 14 13:09:26 2010 +0000
+++ b/calendarui/views/inc/calenmissedeventview.h Sun Mar 28 16:36:17 2010 +0100
@@ -64,7 +64,7 @@
virtual void CancelPopulation();
virtual TCyclePosition CyclePosition() const;
virtual const TDesC& LocalisedViewNameL( CCalenView::TViewName aViewName );
- virtual CGulIcon* CCalenMissedEventView::ViewIconL() const;
+ virtual CGulIcon* ViewIconL() const;
protected: // From CCalenNativeView
--- a/calendarui/views/inc/calenmonthview.h Sun Mar 14 13:09:26 2010 +0000
+++ b/calendarui/views/inc/calenmonthview.h Sun Mar 28 16:36:17 2010 +0100
@@ -63,7 +63,7 @@
virtual void CancelPopulation();
virtual TCyclePosition CyclePosition() const;
virtual const TDesC& LocalisedViewNameL( CCalenView::TViewName aViewName );
- virtual CGulIcon* CCalenMonthView::ViewIconL() const;
+ virtual CGulIcon* ViewIconL() const;
protected: // From CCalenNativeView
/**
--- a/calendarui/views/inc/calentodoview.h Sun Mar 14 13:09:26 2010 +0000
+++ b/calendarui/views/inc/calentodoview.h Sun Mar 28 16:36:17 2010 +0100
@@ -125,7 +125,7 @@
virtual void CancelPopulation();
virtual TCyclePosition CyclePosition() const;
virtual const TDesC& LocalisedViewNameL( CCalenView::TViewName aViewName );
- virtual CGulIcon* CCalenTodoView::ViewIconL() const;
+ virtual CGulIcon* ViewIconL() const;
void CleanupInstancesL();
--- a/pimappsupport/vcardandvcal/inc/vstaticutils.h Sun Mar 14 13:09:26 2010 +0000
+++ b/pimappsupport/vcardandvcal/inc/vstaticutils.h Sun Mar 28 16:36:17 2010 +0100
@@ -66,7 +66,7 @@
private:
static void AddEscapedString(TBool aIsShiftJis,TDes& aDestination,const TDesC& aTextToEscape);
- static const TDesC &VersitUtils::EscapeChar(TBool aIsShiftJis);
+ static const TDesC &EscapeChar(TBool aIsShiftJis);
};
inline TBool VersitUtils::IsWhiteSpace(TUint aChar)
--- a/searchfw/coresearchfw/client/inc/searchclientsessionimp.h Sun Mar 14 13:09:26 2010 +0000
+++ b/searchfw/coresearchfw/client/inc/searchclientsessionimp.h Sun Mar 28 16:36:17 2010 +0100
@@ -138,7 +138,7 @@
/**
* Continues asking Light results
*/
- void CSearchClientSessionImp::ContinueSearchingLightL();
+ void ContinueSearchingLightL();
// Functions from base classes
/**
--- a/searchfw/plugins/calendarplugin/inc/calendarsearcher.h Sun Mar 14 13:09:26 2010 +0000
+++ b/searchfw/plugins/calendarplugin/inc/calendarsearcher.h Sun Mar 28 16:36:17 2010 +0100
@@ -62,7 +62,7 @@
ESearching
};
- static CCalendarSearcher* CCalendarSearcher::NewL(
+ static CCalendarSearcher* NewL(
const RArray<TUid>& aContentIdArray,
const CSearchCondition& aCondition,
const TUid& aPluginId,
@@ -205,7 +205,7 @@
*
* @param aPluginId Plug-in's ID.
*/
- CCalendarSearcher::CCalendarSearcher( const TUid& aPluginId );
+ CCalendarSearcher( const TUid& aPluginId );
private: // new functions
/**
--- a/searchfw/plugins/notessearchplugin/inc/notessearcher.h Sun Mar 14 13:09:26 2010 +0000
+++ b/searchfw/plugins/notessearchplugin/inc/notessearcher.h Sun Mar 28 16:36:17 2010 +0100
@@ -73,7 +73,7 @@
* Check if the entry exists in notes
*
*/
- TBool CNotesSearcher::CheckIfEntryExistsL (TInt aNoteKey);
+ TBool CheckIfEntryExistsL (TInt aNoteKey);
/**
* Cleanup internal resource
*
--- a/searchui/searchapp/srchuicommon/inc/srchuiresfolder.h Sun Mar 14 13:09:26 2010 +0000
+++ b/searchui/searchapp/srchuicommon/inc/srchuiresfolder.h Sun Mar 28 16:36:17 2010 +0100
@@ -287,7 +287,7 @@
* Reset all folders
*
*/
- IMPORT_C void CSrchUiResFolder::ResetAllFolders();
+ IMPORT_C void ResetAllFolders();
/**
* Retuns the number of heavy results
@@ -373,4 +373,4 @@
#endif // C_SEARCH_RESULT_FOLDER_H
-// End of File
\ No newline at end of file
+// End of File
--- a/searchui/searchapp/srchuigenui/inc/srchuimaincontainer.h Sun Mar 14 13:09:26 2010 +0000
+++ b/searchui/searchapp/srchuigenui/inc/srchuimaincontainer.h Sun Mar 28 16:36:17 2010 +0100
@@ -164,7 +164,7 @@
* Returns an array of icons for use in the listbox.
* @return an array of icons.
*/
- CArrayPtr<CGulIcon>* CSrchUiMainContainer::ListBoxIconsArrayL();
+ CArrayPtr<CGulIcon>* ListBoxIconsArrayL();
/**
* Constructs the item text array.
--- a/searchui/searchapp/srchuigenui/inc/srchuiservicecontainer.h Sun Mar 14 13:09:26 2010 +0000
+++ b/searchui/searchapp/srchuigenui/inc/srchuiservicecontainer.h Sun Mar 28 16:36:17 2010 +0100
@@ -201,7 +201,7 @@
/**
* Returns an array of icons for use in the listbox.
*/
- CArrayPtr<CGulIcon>* CSrchUiServiceContainer::ListBoxIconsArrayL();
+ CArrayPtr<CGulIcon>* ListBoxIconsArrayL();
/**
* Updates the "All in device" selection.
@@ -212,7 +212,7 @@
*
* @param aIncludedContentTypes
*/
- void CSrchUiServiceContainer::UpdateAllInDeviceSelection(
+ void UpdateAllInDeviceSelection(
RArray<TBool>& aIncludedContentTypes );
/**