naming convention

[quassel.git] / src / qtui / chatscene.h

diff --git a/src/qtui/chatscene.h b/src/qtui/chatscene.h
index 0418232..9ac653b 100644 (file)
--- a/src/qtui/chatscene.h
+++ b/src/qtui/chatscene.h
@@ -51,8 +51,8 @@ public:
   inline bool containsBuffer(const BufferId &id) const;
   inline ChatLine *chatLine(int row) { return (row < _lines.count()) ? _lines[row] : 0; }
 
   inline bool containsBuffer(const BufferId &id) const;
   inline ChatLine *chatLine(int row) { return (row < _lines.count()) ? _lines[row] : 0; }
 

-  inline ColumnHandleItem *firstColumnHandle() const { return firstColHandle; }
-  inline ColumnHandleItem *secondColumnHandle() const { return secondColHandle; }
+  inline ColumnHandleItem *firstColumnHandle() const { return _firstColHandle; }
+  inline ColumnHandleItem *secondColumnHandle() const { return _secondColHandle; }

 
 public slots:
   void updateForViewport(qreal width, qreal height);
 
 public slots:
   void updateForViewport(qreal width, qreal height);


@@ -84,8 +84,8 @@ protected slots:
 
 private slots:
   void handlePositionChanged(qreal xpos);
 
 private slots:
   void handlePositionChanged(qreal xpos);

-  void showWebPreview();
-  void clearWebPreviewEvent();
+  void showWebPreviewEvent();
+  void deleteWebPreviewEvent();

 
 private:
   void setHandleXLimits();
 
 private:
   void setHandleXLimits();


@@ -106,8 +106,8 @@ private:
   void updateSceneRect(const QRectF &rect);
   qreal _viewportHeight;
 
   void updateSceneRect(const QRectF &rect);
   qreal _viewportHeight;
 

-  ColumnHandleItem *firstColHandle, *secondColHandle;
-  qreal firstColHandlePos, secondColHandlePos;
+  ColumnHandleItem *_firstColHandle, *_secondColHandle;
+  qreal _firstColHandlePos, _secondColHandlePos;

 
   ChatItem *_selectingItem;
   int _selectionStartCol, _selectionMinCol;
 
   ChatItem *_selectingItem;
   int _selectionStartCol, _selectionMinCol;


@@ -120,10 +120,11 @@ private:
 
   struct WebPreview {
     ChatItem *parentItem;
 
   struct WebPreview {
     ChatItem *parentItem;

-    WebPreviewItem *previewItem;
+    QGraphicsItem *previewItem;

     QString url;
     QRectF urlRect;
     QTimer delayTimer;
     QString url;
     QRectF urlRect;
     QTimer delayTimer;

+    QTimer deleteTimer;

     WebPreview() : parentItem(0), previewItem(0) {}
   };
   WebPreview webPreview;
     WebPreview() : parentItem(0), previewItem(0) {}
   };
   WebPreview webPreview;