← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to libs/imageproperties/worldmapwidget.h

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/imageproperties/worldmapwidget.h
55
55
public:
56
56
 
57
57
    GPSInfo()
58
 
    : latitude(0.0),
59
 
      longitude(0.0),
60
 
      altitude(0.0),
61
 
      dateTime(),
62
 
      rating(0),
63
 
      url(),
64
 
      dimensions()
 
58
        : latitude(0.0),
 
59
          longitude(0.0),
 
60
          altitude(0.0),
 
61
          dateTime(),
 
62
          rating(0),
 
63
          url(),
 
64
          dimensions()
65
65
    {
66
66
    };
67
67
 
95
95
 
96
96
public:
97
97
 
98
 
    WorldMapWidget(int w, int h, QWidget *parent);
 
98
    WorldMapWidget(int w, int h, QWidget* parent);
99
99
    virtual ~WorldMapWidget();
100
100
 
101
101
    void   setGPSPositions(const GPSInfoList& list);
139
139
    void slotZoomIn();
140
140
    void slotZoomOut();
141
141
    void slotZoomChanged(int zoom);
142
 
    void slotSetSelectedImages(const GPSInfoList &infoList);
 
142
    void slotSetSelectedImages(const GPSInfoList& infoList);
143
143
    void slotMapMarkerSelectionChanged();
144
144
    void slotMapMarkerSoloChanged();
145
145
    void slotSetAllowItemSelection(const bool allow);
147
147
    void slotSetFocusOnAddedItems(const bool doIt);
148
148
    void slotSetEnableTooltips(const bool doIt);
149
149
    void slotThumbnailLoaded(const LoadingDescription& loadingDescription, const QPixmap& pix);
150
 
//#ifdef HAVE_MARBLEWIDGET
151
 
//    MarkerClusterHolder* getMarkerClusterHolder() const;
152
 
//#endif // HAVE_MARBLEWIDGET
 
150
    //#ifdef HAVE_MARBLEWIDGET
 
151
    //    MarkerClusterHolder* getMarkerClusterHolder() const;
 
152
    //#endif // HAVE_MARBLEWIDGET
153
153
 
154
154
protected:
155
155
 
176
176
 
177
177
public:
178
178
 
179
 
    WorldMapThemeBtn(WorldMapWidget *map, QWidget *parent);
 
179
    WorldMapThemeBtn(WorldMapWidget* map, QWidget* parent);
180
180
    virtual ~WorldMapThemeBtn();
181
181
 
182
182
private Q_SLOTS: